Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel

pages/jiuzhai/jz_LineDetail.vue

@@ -528,9 +528,9 @@
                       v-if="subItem.childItem.useDinnerType == '2'"
                       >午餐：{{ subItem.childItem.dinnerName }}</text
                     >
-                    <text v-if="subItem.childItem.useDinnerType == '3'">晚餐：{{
-                      subItem.childItem.dinnerName
-                    }}</text>
+                    <text v-if="subItem.childItem.useDinnerType == '3'"
+                      >晚餐：{{ subItem.childItem.dinnerName }}</text
+                    >
                   </template>
                 </text>
               </view>
@@ -1287,12 +1287,10 @@ export default {
         url:
           "/pages/jiuzhai/jz_Reserve?currentPriceInfo=" +
           encodeURIComponent(myCurr) +
-          "&ln=" +
-          this.dataList.ltName +
           "&seat=" +
           encodeURIComponent(JSON.stringify(ren)) +
-          "&tips=" +
-          encodeURIComponent(this.dataList.feature.importantTipText),
+          "&tcid=" +
+          this.delMsg.tcid,
       });
     },
 

pages/jiuzhai/jz_Reserve.vue

@@ -501,21 +501,38 @@ export default {
     });
   },
   onLoad(option) {
-    if (option.currentPriceInfo) {
+    console.log(504, option);
+    if (option.seat) {
       this.currentPriceInfo = JSON.parse(
         decodeURIComponent(option.currentPriceInfo)
       );
-      let t = JSON.parse(decodeURIComponent(option.seat));
+      let t = JSON.parse(option.seat);
       this.orderMsg.ManNum = t.crCount;
       this.orderMsg.ChirdNeedBedNum = t.etCount;
       this.orderMsg.ChirdNoBedNum = t.etbCount;
       this.orderMsg.BabyNum = t.yeCount;
-      this.tips = decodeURIComponent(option.tips);
       this.calcMoney();
-      this.ltName = option.ln;
+    }
+    if (option.tcid) {
+      this.getDetails(option.tcid);
     }
   },
   methods: {
+    //获取详情
+    getDetails(id) {
+      this.apipost(
+        "b2b_get_GetB2BTravelInfoNoDesV1",
+        { tcid: id },
+        (res) => {
+          if (res.resultCode == 1) {
+            // this.currentPriceInfo = res.data;
+            this.tips = res.data.feature.importantTipText;
+            this.ltName = res.data.ltName;
+          }
+        },
+        null
+      );
+    },
     updateUser() {
       uni.navigateBack({
         delta: 1,