save

.hbuilderx/launch.json

@@ -2,10 +2,15 @@
   // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
     "version": "0.0",
     "configurations": [{
-            "type": "uniCloud",
-            "default": {
-                "launchtype": "remote"
-            }
-        }
+     	"default" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"type" : "uniCloud"
+     }
     ]
 }

pages.json

@@ -734,5 +734,15 @@
 			// #endif
 		}
 
+	},
+	"condition" : { //模式配置，仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [
+			{
+				"name": "", //模式名称
+				"path": "", //启动页面，必选
+				"query": "" //启动参数，在页面的onLoad函数里面得到
+			}
+		]
 	}
 }
\ No newline at end of file

pages/jiuzhai/jz_LineDetail.vue

@@ -566,7 +566,7 @@
                   {{ subItem.childItem.descriptionText }}
                 </view>
               </template>
-              <view class="jz_Place">温馨提示</view>
+              <view v-if="item.type6" class="jz_Place">温馨提示</view>
               <view class="jz_Rermark">
                 <template
                   v-for="(subItem, sIndex) in item.dayArray"
@@ -585,7 +585,7 @@
                     v-for="(subItem, sIndex2) in item.dayArray"
                     v-if="subItem.type == 4"
                   >
-                    <text
+                    <text 
                       style="margin-right: 20px"
                       :key="sIndex2"
                       v-if="subItem.childItem.useDinnerType == '1'"
@@ -604,7 +604,7 @@
               </view>
               <view class="jz_Place">
                 <view class="jz_ComDian"></view>
-                <text class="jz_Canyin">酒店</text>
+                <text v-if="item.type3" class="jz_Canyin">酒店</text>
                 <text class="jz_CanInner">
                   <template
                     v-for="(subItem, sIndex3) in item.dayArray"
@@ -613,13 +613,13 @@
                     <text :key="sIndex3"
                       >{{ subItem.childItem.hotelName
                       }}<text
-                        v-if="index != dataList.dayList.length - 1"
+                        v-if="item.type3 && index != dataList.dayList.length - 1"
                         style="margin: 0 5px"
                         >/</text
                       ></text
                     >
                   </template>
-                  <text v-if="index != dataList.dayList.length - 1"
+                  <text v-if="item.type3 && index != dataList.dayList.length - 1"
                     >或同级</text
                   >
                 </text>
@@ -1299,7 +1299,23 @@ export default {
             	//this.dataList.productRecommend=this.dataList.productRecommend.split('\n').join('&hc')
             	console.log(this.dataList.productRecommend);
             	this.dataList.dayList.forEach((x) => {
+					x.type6 = false
+					x.type4 = false
+					x.type3 = false
             	  x.dayArray.forEach((y) => {
+					 if (y.type == 6) {
+					  if(y.childItem.descriptionText) {
+						  x.type6 = true
+					  }
+            	    }
+					if (y.type == 4 && [1,2,3, '1','2','3'].includes(y.childItem.useDinnerType) && y.childItem.dinnerName) {
+						  x.type4 = true
+            	    }
+					if (y.type == 3) {
+					  if(y.childItem.hotelName) {
+						  x.type3 = true
+					  }
+            	    }
             	    if (y.type == 2) {
             	      this.scenicNum++;
             	    }
@@ -1315,6 +1331,8 @@ export default {
             	  });
             	});
             	this.currentPrice = this.dataList.currentPriceInfo;
+				
+				console.log('this.dataList>>>',this.dataList);
             	if (this.currentPrice.remainNum == 0) {
             	  let temp = this.dataList.priceList.find((x) => x.remainNum > 0);
             	  if (temp) {

plugin/api.js

@@ -2,10 +2,10 @@ export default {
 	install(Vue, options) {
 		Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
 
-		Vue.prototype.host2 = "http://192.168.20.17:8020"
-		// Vue.prototype.host2 = "https://erpmallapi.oytour.com"
-		Vue.prototype.host3 = "http://192.168.20.17:8015"
-		// Vue.prototype.host3 = "https://reborn.oytour.com"
+		// Vue.prototype.host2 = "http://192.168.20.17:8020"
+		Vue.prototype.host2 = "https://erpmallapi.oytour.com"
+		// Vue.prototype.host3 = "http://192.168.20.17:8015"
+		Vue.prototype.host3 = "https://reborn.oytour.com"
 
 		Vue.prototype.request = function (param, success, failed) {
 			//网络请求