取号往返票bug处理

pages/combination/distributionCombiChoose/distributionCombiChoose.vue

@@ -608,19 +608,16 @@ export default {
           return item.id
         })
         let query ='?productIdList=' + JSON.stringify(productIdList) + '&groupId=' + this.groupId + '&groupChannelId=' + this.groupChannelId + '&orderSource=3'
-        uni.navigateTo({
-          url: '/pages/combination/combiOrder/combiOrder' + query
-        })
         //如果有联票
-        //  if(this.chooseProduct.find(item=>item.ticketType==2)){
-        //    uni.navigateTo({
-					  // url: '/pages/combination/combiOrder/combiOrder' + query
-        //    })
-        //  }else{
-        //    uni.navigateTo({
-					  // url: '/pages/scenic/scenicCombiOrder/scenicCombiOrder' + query
-        //    })
-        //  }
+			 if(this.chooseProduct.find(item=>item.ticketType==2)){
+				 uni.navigateTo({
+            url: '/pages/combination/combiOrder/combiOrder' + query
+				 })
+			 }else{
+				 uni.navigateTo({
+            url: '/pages/scenic/scenicCombiOrder/scenicCombiOrder' + query
+				 })
+			 }
       }
     },
     //---跳转影集页面

pages/my/takeNumber/numberChoose/numberChoose.vue

@@ -45,11 +45,19 @@ export default {
       active:100,//下标
       chooseArea:'',//选中的站点
       orderId:'',//订单Id
+      merchantCode:'',//商户码
+      thirdOrderId:'',//三方Id
+      channelName:'',//渠道名称
+      productName:'',//产品名称
     }
   },
   onLoad(option) {
 	  this.list=option.list?JSON.parse(option.list):''
     this.orderId=option.orderId||''
+    this.merchantCode=option.merchantCode||''
+    this.channelName=option.channelName||''
+    this.productName=option.productName||''
+    this.thirdOrderId=option.thirdOrderId||''
   },
   methods: {
     //---站点选择
@@ -67,7 +75,7 @@ export default {
         return
       }
       uni.navigateTo({
-			  url:`/pages/my/takeNumber/rowNumber/rowNumber?chooseArea=${this.chooseArea}&orderId=${this.orderId}`
+			  url:`/pages/my/takeNumber/rowNumber/rowNumber?chooseArea=${this.chooseArea}&orderId=${this.orderId}&thirdOrderId=${this.thirdOrderId}&merchantCode=${this.merchantCode}&channelName=${this.channelName}&productName=${this.productName}`
       })
     },
     //---取消站点

pages/my/takeNumber/numberIndex/numberIndex.vue

@@ -177,7 +177,7 @@ export default {
           if(this.noNumberList.length>1){
             let list=JSON.stringify(this.noNumberList)
             uni.navigateTo({
-						  url:`/pages/my/takeNumber/numberChoose/numberChoose?list=${list}&orderId=${this.orderId}`
+						  url:`/pages/my/takeNumber/numberChoose/numberChoose?list=${list}&orderId=${this.orderId}&thirdOrderId=${this.thirdOrderId}&merchantCode=${this.merchantCode}&channelName=${this.channelName}&productName=${this.productName}`
             })
           }
 			  }else{

pages/scenic/scenicCombiOrder/scenicCombiOrder.vue

@@ -200,7 +200,7 @@
 							<view
 								class="plus-list"
 								:class="{on:item2.ifChoose}"
-								v-for="(item2, index2) of item.contactTotal.slice(0, 3)"
+								v-for="(item2, index2) of item.contactTotal.slice(0,3)"
 								@click="visitorChoose(index,index2)"
 								:key="index2"
 							>
@@ -647,7 +647,8 @@ export default {
             item.contactTotal.forEach(item2 => {
 						  item.chooseContact.forEach(item3 => {
 						    if (item2.id == item3.id) {
-						      item.ifChoose = true
+						      item2.ifChoose = true
+                  item3=JSON.parse(JSON.stringify(item2))
 						    }
 						  })
             })