OTA排号修改

pages/combination/distributionCombiChoose/distributionCombiChoose.vue

@@ -608,16 +608,19 @@ 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/numberIndex/numberIndex.vue

@@ -2,7 +2,7 @@
 	<view class="wrap">
 		<view>
 			<view class="first">
-				<input placeholder="请输入购票预留手机号/身份证号" v-model="search" />
+				<input placeholder="请输入购票预留手机号/身份证号" v-model="credentialNumber" />
 			</view>
 			<view class="query">
 				<text class="button" @click="clickQuery()">查询订单</text>
@@ -33,10 +33,13 @@ export default {
   data() {
     return {
       showMark: false ,//是否显示遮罩层
-      search:'',//输入框的值
+      credentialNumber:'',//输入框的值
       noNumberList:[],//未排号站点列表
       orderId:'',//订单Id
-      merchantCode:''//商户码
+      merchantCode:'',//商户码
+      thirdOrderId:'',//三方Id
+      channelName:'',//渠道名称
+      productName:'',//产品名称
     }
   },
   onLoad(option) {
@@ -49,7 +52,7 @@ export default {
     },
     //---查询订单
     queryList(){
-      if(!this.search){
+      if(!this.credentialNumber){
         uni.showToast({
 				  title:'请输入手机号或者身份证号',
 				  icon: 'none'
@@ -57,7 +60,7 @@ export default {
         return
       }
       let data={
-        search:this.search,//输入框的值
+        credentialNumber:this.credentialNumber,//输入框的值
         userId:uni.getStorageSync('openid')||'',
         merchantCode:this.merchantCode,
         startPlayDate:new Date().Format('yyyy-MM-dd')+' 00:00:00',//开始日期
@@ -69,10 +72,13 @@ export default {
           if(list.length==0){
             this.showMark=true
           }else{
-            this.orderId=list[0].id
-            let thirdId=list[0].thirdOrderId||''
-            let merchantId=list[0].merchantId||''
-            this.getFetchInfo(thirdId,merchantId)
+            //下面参数需要传给下一个页面
+            this.orderId=list[0].id||''
+            this.thirdOrderId=list[0].thirdOrderId||''
+            this.merchantCode=list[0].merchantCode||''
+            this.channelName=list[0].channelName||''
+            this.productName=list[0].productName||''
+            this.getFetchInfo()
           }
 			  }else{
 			    uni.showToast({
@@ -83,10 +89,10 @@ export default {
       })
     },
     //---获取排号信息
-    getFetchInfo(thirdId,merchantId){
+    getFetchInfo(){
       let data={
-			  thirdId,
-        merchantId
+			  thirdId:this.thirdOrderId,
+        merchantCode:this.merchantCode
       }
       this.noNumberList=[]
       this.$request('distribution/distribution/getFetchInfoOta',data).then((res)=>{
@@ -165,7 +171,7 @@ export default {
           if(this.noNumberList.length==1){
             let chooseArea=JSON.stringify(this.noNumberList[0])
             uni.navigateTo({
-              url:`/pages/my/takeNumber/rowNumber/rowNumber?chooseArea=${chooseArea}&orderId=${this.orderId}`
+              url:`/pages/my/takeNumber/rowNumber/rowNumber?chooseArea=${chooseArea}&orderId=${this.orderId}&thirdOrderId=${this.thirdOrderId}&merchantCode=${this.merchantCode}&channelName=${this.channelName}&productName=${this.productName}`
             })
           }
           if(this.noNumberList.length>1){

pages/my/takeNumber/rowNumber/rowNumber.vue

@@ -79,44 +79,25 @@
 export default {
   data() {
     return {
-      merchantCode:'',//商家编号
       chooseArea:'',//站点信息
-      numberInfo:'',//排号信息
+      merchantCode:'',//商家编号
       channelName:'',//渠道名称
       productName:'',//产品名称
       thirdOrderId:'',//三方订单Id
       orderId:'',//订单Id
-      ticketPhone:'',//联系人电话
+      numberInfo:'',//排号信息
     }
   },
   onLoad(option) {
     this.chooseArea=option.chooseArea?JSON.parse(option.chooseArea):''
     this.orderId=option.orderId||''
-    this.query()
+    this.merchantCode=option.merchantCode||''
+    this.channelName=option.channelName||''
+    this.productName=option.productName||''
+    this.thirdOrderId=option.thirdOrderId||''
+    this.getNumberInfo()
   },
   methods: {
-    //---查询订单信息
-    query(){
-		  let data={
-		    search:this.orderId
-		  }
-		  this.$request('order/userOrder/findOrderPageListByCode',data).then((res)=>{
-			  if(res.code=='00'){
-			    let list=res.data||[]
-          this.thirdOrderId=list[0].thirdOrderId
-          this.merchantCode=list[0].merchantCode
-          this.channelName=list[0].channelName
-          this.productName=list[0].productName
-          this.ticketPhone=list[0].ticketPhone
-          this.getNumberInfo()
-			  }else{
-			    uni.showToast({
-			      title: res.message,
-			      icon: 'none'
-			    })
-			  }
-		  })
-    },
     //---获取排号信息
     getNumberInfo(){
 		  let data={
@@ -147,7 +128,7 @@ export default {
     },
     //---立即取号
     rowNumber(){
-      if(!this.merchantCode||!this.chooseArea.projectIds||!this.thirdOrderId||!this.ticketPhone||!this.orderId){
+      if(!this.merchantCode||!this.chooseArea.projectIds||!this.thirdOrderId||!this.orderId){
         uni.showToast({
 				  title:'缺少取号参数',
 				  icon: 'none'
@@ -159,7 +140,6 @@ export default {
         areaCode:this.chooseArea.projectIds,//站点编号
         thirdId:this.thirdOrderId,//三方订单id
         userId:uni.getStorageSync('openid')||'',
-        ticketPhone:this.ticketPhone,//电话号码
         orderId:this.orderId,//订单Id
       }
       this.$request('distribution/distribution/newFetchNumber',data).then((res)=>{
@@ -210,8 +190,8 @@ export default {
 	border-bottom: 1px solid #ececec;
 }
 .address{
-		font-weight: bold;
-		color: #3688FF;
+	font-weight: bold;
+	color: #3688FF;
 }
 .middle{
 	display: flex;

pages/scenic/scenicCombiOrder/scenicCombiOrder.vue

@@ -639,6 +639,7 @@ export default {
 		      })
           this.productList.forEach((item)=>{
 					  item.contactTotal=JSON.parse(JSON.stringify(contactTotal))
+            //数据不出现问题
             this.$forceUpdate()
           })
 		      //编辑成功重新调该方法时，把之前选中的游客，设为选中状态
@@ -839,7 +840,23 @@ export default {
     },
     //---联系人列表弹窗确认选中---已修改
     contactListConfig(data){
-		  this.productList[moreContactIndex].chooseContact=data
+      let index=this.moreContactIndex
+      this.productList[index].chooseContact=data
+      this.productList[index].contactTotal.forEach(item=>{
+			  //在总的列表里面回去选中的联系人
+			  item.ifChoose=false
+			  this.productList[index].chooseContact.forEach(item2=>{
+			    if(item.id==item2.id){
+			      item.ifChoose=true
+			    }
+			  })
+      })
+      //选中的排在前面
+      this.productList[index].contactTotal.sort(function (a, b) {
+			  return b.ifChoose-a.ifChoose
+      })
+      //选中样式以及选中数据的更新
+      this.$forceUpdate()
     },
     //---游客选择---已修改
     visitorChoose(index,index2) {