Merge branch 'develop' of http://192.168.0.204/panyongping/uni-pdtravel into develop

common/request.js

@@ -5,12 +5,11 @@ if(process.env.NODE_ENV === 'development'){//开发环境
 }else{
   baseUrl= 'https://manager.pangdly.com/'
 }
-
 const request = (url = '', data = {},showLoad) => {
   data.reqId = new Date().getTime() //获取时间戳
-  let show=showLoad||true
+  let show=showLoad||false
   return new Promise((resolve, reject) => {
-    if(show){
+    if(!show){
       uni.showLoading({
         title:'加载中',
         mask:true

pages/combination/distributionCombiChoose/distributionCombiChoose.vue

@@ -328,7 +328,10 @@ export default {
     //清空之前选中的数据以及状态
     this.detailData=''
     this.chooseProduct=[]
-    this.$refs.detail.showPop = false
+    if(this.$refs.detail){
+      //解决支付宝小程序报错问题
+      this.$refs.detail.showPop = false
+    }
     let token = uni.getStorageSync('token')
     if (token) {
       uni.getLocation({
@@ -608,6 +611,16 @@ export default {
         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
+        //    })
+        //  }
       }
     },
     //---跳转影集页面

pages/indexs/center/center.vue

@@ -134,14 +134,14 @@
 							我的影集
 						</view>
 					</view>
-					<view class="middle3-list" @click="goshopping()">
+					<!-- <view class="middle3-list" @click="goshopping()">
 						<view>
 							<image src="@/static/img/my/center/shopping.png"></image>
 						</view>
 						<view>
 							购物车
 						</view>
-					</view>
+					</view> -->
 					<view class="middle3-list" @click="goTravelList()">
 						<view>
 							<image src="@/static/img/my/center/schedule.png"></image>

pages/my/takeNumber/numberChoose/numberChoose.vue

@@ -144,7 +144,7 @@ export default {
 }
 .btn{
 	display: inline-block;
-	line-height: 60rpx;
+	line-height: 76rpx;
 	width: 212rpx;
 	height: 80rpx;
 	background: #3688FF;

pages/my/takeNumber/numberIndex/numberIndex.vue

@@ -2,10 +2,10 @@
 	<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="query()">查询订单</text>
+				<text class="button" @click="clickQuery()">查询订单</text>
 			</view>
 		</view>
 
@@ -33,19 +33,26 @@ export default {
   data() {
     return {
       showMark: false ,//是否显示遮罩层
-      search:'',//输入框的值
+      credentialNumber:'',//输入框的值
       noNumberList:[],//未排号站点列表
       orderId:'',//订单Id
-      merchantCode:''//商户码
+      merchantCode:'',//商户码
+      thirdOrderId:'',//三方Id
+      channelName:'',//渠道名称
+      productName:'',//产品名称
     }
   },
   onLoad(option) {
 	  this.merchantCode=this.$commonjs.getKey(option,'merchantCode')
   },
   methods: {
+    //---点击查询
+    clickQuery(){
+      uni.$u.throttle(this.queryList,3000)
+    },
     //---查询订单
-    query(){
-      if(!this.search){
+    queryList(){
+      if(!this.credentialNumber){
         uni.showToast({
 				  title:'请输入手机号或者身份证号',
 				  icon: 'none'
@@ -53,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',//开始日期
@@ -65,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({
@@ -79,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)=>{
@@ -161,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,12 +128,18 @@ export default {
     },
     //---立即取号
     rowNumber(){
+      if(!this.merchantCode||!this.chooseArea.projectIds||!this.thirdOrderId||!this.orderId){
+        uni.showToast({
+				  title:'缺少取号参数',
+				  icon: 'none'
+        })
+        return
+      }
       let data={
         merchantCode:this.merchantCode,//商户编号
         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)=>{
@@ -203,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-old.vue

-<template>
-	<view>
-		<web-view :src="outUrl"></web-view>
-	</view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      enterUrl:'',//进入页面路由
-      outUrl:'',//跳出页面路由
-    }
-  },
-  onLoad(option){
-    let groupId=option.groupId||''
-    let groupChannelId=option.groupChannelId||''
-    let companyId=option.companyId||''
-    let productIdList=option.productIdList||''
-    let orderSource=option.orderSource||''
-    let ifyukuaiCode=option.ifyukuaiCode||''//是否是渝快码跳入，渝快码跳入需要在H5端另外走流程
-    let pdOpenid=uni.getStorageSync('openid')//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
-    let pdToken=uni.getStorageSync('token')
-    let pdCreateUserId=uni.getStorageSync('createUserId')
-    let pdUserId=uni.getStorageSync('userId')
-    let baseUrl=this.$wxurl+'combiOrder?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
-    let url='&groupId='+groupId+'&groupChannelId='+groupChannelId+'&productIdList='+productIdList+'&orderSource='+orderSource+'&companyId='+companyId+'&ifyukuaiCode='+ifyukuaiCode
-    this.outUrl=baseUrl+url
-  },
-  methods: {
-			
-  }
-}
-</script>
-
-<style>
-
-</style>

pages/scenic/scenicComponents/contactList.vue

@@ -94,18 +94,13 @@ export default {
     //---确定选中的联系人
     config() { 
       this.showPop = false
-      //选中的排在前面
-      this.listTotal.sort(function (a, b) {
-			  return b.ifChoose-a.ifChoose
-      })
-      this.$parent.contactTotal=this.listTotal
       let chooseArr=[]
       this.listTotal.forEach(item=>{
         if(item.ifChoose){
           chooseArr.push(item)
         }
       })
-      this.$parent.chooseContact=chooseArr
+      this.$emit('contactListConfig', chooseArr)
     },
     //---联系人姓名变化
     chooseContactChange(e){

pages/scenic/scenicComponents/editContacts.vue

@@ -45,7 +45,7 @@
 
 <script>
 export default {
-  props: ['editContact','contactTotal'],
+  props: ['editContactData'],
   data() {
     return {
       showPop: false, //控制组件显示隐藏
@@ -56,9 +56,8 @@ export default {
     }
   },
   watch: {
-    editContact: { 
+    editContactData: { 
       handler(newValue, oldValue) {
-        console.log(this.reviseContactId)
         this.name = newValue.name||''
         this.credentialNumber = newValue.credentialNumber||''
         this.reviseContactId = newValue.id||''

pages/scenic/scenicSingleOrder/scenicSingleOrder.vue

@@ -344,11 +344,12 @@
 			:defaultAreaCode="defaultAreaCode"
 		></chooseArea>
 		<times ref="times" :chooseTimeList="timeList" @timeConfig="timeConfig" :timeActive="timeActive"></times>
-		<editContacts ref="editContacts" :editContact="editContact" :contactTotal="contactTotal"></editContacts>
+		<editContacts ref="editContacts" :editContactData="editContactData"></editContacts>
 		<contactList
 			ref="contactList"
 			:contactTotal="contactTotal"
 			:contactNum="contactNum"
+			@contactListConfig='contactListConfig'
 		></contactList>
 		<orderCoupon :couponData="couponData" ref="orderCoupon" @couponChoose="couponChoose" :chooseCouponObj="chooseCouponObj"></orderCoupon>
 		<!--一个站点时获取排队信息弹窗-->
@@ -418,7 +419,7 @@ export default {
       dateList: [], //日期列表
       timeList: [], //时间列表
       buyKnowData: '', //购买须知数据
-      editContact: '', //编辑联系人传值对象
+      editContactData: '', //编辑联系人传值对象
       productId: '', //产品Id
       merchantId: '', //商户Id
       ticketPhone: '', //联系电话
@@ -828,31 +829,51 @@ export default {
     showEdit(data) {
       let obj=data||''
       this.$refs.editContacts.showPop = true
-      this.editContact = obj
+      this.editContactData = obj
     },
     //---展示新增联系人，并获取联系人列表
     showContacts() {
       this.$refs.contactList.showPop = true
     },
+    //---联系人列表弹窗确认选中
+    contactListConfig(data){
+      this.chooseContact=data
+      this.contactTotal.forEach(item=>{
+        //在总的列表里面回去选中的联系人
+        item.ifChoose=false
+        this.chooseContact.forEach(item2=>{
+          if(item.id==item2.id){
+            item.ifChoose=true
+          }
+        })
+      })
+      //选中的排在前面
+      this.contactTotal.sort(function (a, b) {
+        return b.ifChoose-a.ifChoose
+      })
+    },
     //---游客选择
     visitorChoose(i) {
-      let chooseList = this.chooseContact
-      let data = this.contactTotal
-      data[i].ifChoose = !data[i].ifChoose
-      if (data[i].ifChoose) {
-        if (chooseList.length == this.contactNum) {
+      //直接传入item,会造成item.ifChoose值变，但是this.contactTotal[i].ifChoose没变，故选择传入下标
+      let item = this.contactTotal[i]
+      item.ifChoose = !item.ifChoose
+      if (item.ifChoose) {
+        if (this.chooseContact.length == this.contactNum) {
           //需要人数满足时，点击增加联系人时，删除最后一个，增加点击的那个人
-          chooseList[chooseList.length - 1].ifChoose = false
-          chooseList.splice(chooseList.length - 1, 1)
+          this.contactTotal.forEach(item2=>{
+            if(item2.id==this.chooseContact[this.chooseContact.length - 1].id){
+              item2.ifChoose=false
+            }
+          })
+          this.chooseContact.splice(this.chooseContact.length - 1, 1)
         }
-        chooseList.push(data[i]) //加入数组
+        this.chooseContact.push(item) //加入数组
       } else {
-        let index = chooseList.findIndex(items => {
-          return items.id == data[i].id
+        let index = this.chooseContact.findIndex(items => {
+          return items.id == item.id
         })
-        chooseList.splice(index, 1) //删除数组
+        this.chooseContact.splice(index, 1) //删除数组
       }
-      this.$forceUpdate()
     },
     //---订单数量变化
     buyNumChange(e) {
@@ -965,7 +986,7 @@ export default {
 		    merchantId: this.merchantId, //商户Id
 		    openid:this.openid
 		  }
-		  this.$request('wechatUser/myPage/usableCouponList', data).then((res) => {
+		  this.$request('wechatUser/myPage/usableCouponList', data,true).then((res) => {
 		    if (res.code == '00') {
 		      this.couponData = res.data
 		      let masterSlaveCouponList=res.data.masterSlaveCouponList
@@ -992,7 +1013,7 @@ export default {
 		        this.savedMoney=this.chooseCouponObj.savedMoney
 		      } else {
 		        if (res.data.unusableCouponList.length > 0) {
-		          res.data.unusableCouponList.forEach((item, i) => { //没有可用优惠券，有达到条件可以用的优惠券，先显示条件，达到条件时显示可用优惠券
+		          res.data.unusableCouponList.forEach((item) => { //没有可用优惠券，有达到条件可以用的优惠券，先显示条件，达到条件时显示可用优惠券
 		            if (item.isProduct == 1) {
 		              this.ableConpon = item
 		            }
@@ -1143,12 +1164,11 @@ export default {
         //下架状态，点击无效
         return
       }
-      if (this.productIfo.tripTemplateFlag != 2) {
-        //需要填写电话号码
-        if (!this.$commonjs.phoneReg().test(this.ticketPhone) && this.productIfo.tripTemplateFlag != 2) {
-          //未填写正确手机号码
+      if (this.productIfo.isFetch == 1 && this.areaUp) {
+        //需要选择站点的票种，必须选择站点
+        if (!this.areaObj.areaCode) {
           uni.showToast({
-            title: '请填写正确的手机号码',
+            title: '请选择站点',
             icon: 'none'
           })
           return
@@ -1161,25 +1181,6 @@ export default {
         })
         return
       }
-      if (this.productIfo.tripTemplateFlag == 1) {
-        //实名制
-        if (this.chooseContact.length != this.buyNum) {
-          uni.showToast({
-            title: '需要添加' + this.buyNum + '位出行人',
-            icon: 'none'
-          })
-          return
-        }
-      } else if (this.productIfo.tripTemplateFlag == 0) {
-        //非实名制
-        if (this.chooseContact.length < 1) {
-          uni.showToast({
-            title: '需要添加一位出行人',
-            icon: 'none'
-          })
-          return
-        }
-      }
       if (this.productIfo.productType == 3) {
         //如果为班次票，需要选择班次
         if (this.cruisePlanId == '') {
@@ -1190,15 +1191,23 @@ export default {
           return
         }
       }
-      if (this.productIfo.isFetch == 1 && this.areaUp) {
-        //需要选择站点的票种，必须选择站点
-        if (!this.areaObj.areaCode) {
-          uni.showToast({
-            title: '请选择站点',
-            icon: 'none'
-          })
-          return
-        }
+      if (this.chooseContact.length != this.contactNum) {
+        uni.showToast({
+          title: '需要添加' + this.contactNum + '位出行人',
+          icon: 'none'
+        })
+        return
+      }
+      if (this.productIfo.tripTemplateFlag != 2) {
+			  //需要填写电话号码
+			  if (!this.$commonjs.phoneReg().test(this.ticketPhone) && this.productIfo.tripTemplateFlag != 2) {
+			    //未填写正确手机号码
+			    uni.showToast({
+			      title: '请填写正确的手机号码',
+			      icon: 'none'
+			    })
+			    return
+			  }
       }
       this.preOrder()
     },