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

pages/my/order/electronicTicket/electronicTicket.vue

@@ -91,11 +91,9 @@
 			</view>
 		</template>
 		<!-- 预售票当日取票-->
-		<template v-if="showNumberBtn==true">
-			<view class="sameDayCollection" v-for="(item,index) in sortData" :key="index">
-				<view class="collectionBtn" @click="sortFirst(item)">取号</view>
-			</view>
-		</template>
+		<view class="sameDayCollection" v-if="showNumberBtn==true">
+			<view class="collectionBtn" @click="sortFirst()">取号</view>
+		</view>
 		<!--sceneSortStatus  是否上下架 1是上架-->
 		<view class="order-queueUp order-allType order-positionTop" v-if="orderInfo.isFetch==1&&sortsInfo&&sortData[0].config.sceneSortStatus==1&&orderInfo.orderStatus==4||orderInfo.isFetch==1&&sortsInfo&&sortData[0].config.sceneSortStatus==1&&orderInfo.orderStatus==2||orderInfo.isFetch==1&&sortsInfo&&sortData[0].config.sceneSortStatus==1&&orderInfo.orderStatus==5||orderInfo.isFetch==1&&sortsInfo&&sortData[0].config.sceneSortStatus==1&&orderInfo.orderStatus==7">
 		    <view class="alltype-title">
@@ -807,7 +805,7 @@ export default {
                       this.qrCodeType=true
                     }
 										
-                  }else if(this.orderInfo.exchangeMode==1){
+                  }else if(this.orderInfo.exchangeMode==1||this.orderInfo.exchangeMode==4||this.orderInfo.exchangeMode==5){
                     this.qecode()
                     this.qrCodeType=false
                   }
@@ -817,16 +815,16 @@ export default {
           }
           if(this.orderInfo.isFetch==1){//isFetch==1需要排队 
             if(this.orderInfo.orderStatus==2||this.orderInfo.orderStatus==4||this.orderInfo.orderStatus==5||this.orderInfo.orderStatus==7){ //订单状态==2 4 5 7才可以调用排号接口
-              //console.log(this.orderInfo.orderStatus)
               //为了提高性能，游玩时间等于今天才获取排号信息
               if(this.orderInfo.playDate.substr(0,10)==this.$commonjs.today()){
 							  if(this.orderInfo.fetchNumberVoList&&this.orderInfo.fetchNumberVoList.length>0){
-							  //购买的当天票已经取号
+                  //购买的当天票已经取号
 							    this.getSortInfo()
 							    
 							  }else{
-							  //还未取号的，显示取号按钮
+                  //还未取号的，显示取号按钮.
 							    this.showNumberBtn=true
+                  console.log(this.showNumberBtn)
 							  }
               }
               
@@ -1042,13 +1040,13 @@ export default {
       })
     },
     //---购票时未排号，第一次排号
-    sortFirst(item){
+    sortFirst(){
 		  let data={
 			  againNumber:0,//是否重排
 		    userId:this.openId,
-			  thirdId:this.sortsInfo.order.orderId,//三方订单id
-			  areaCode:item.projectId,//站点
-			  merchantCode:this.companyId,
+			  thirdId:this.orderInfo.thirdOrderId,//三方订单id
+			  areaCode:this.orderInfo.areaCode,//站点
+			  merchantCode:this.orderInfo.merchantCode,
 		    orderId:this.orderInfo.id,//订单id
 		    orderNum:this.orderInfo.orderNum,//订单数量
 		  }
@@ -1056,7 +1054,7 @@ export default {
 			  if(res.code=='00'){
 			    //隐藏取号按钮
 			    this.showNumberBtn=false
-			    this.getSortInfo(item)
+			    this.getSortInfo()
 			  }else{
 			    uni.showToast({
 			      title: res.message,

pages/my/order/orderList/orderList.vue

@@ -120,7 +120,7 @@
 					</view>
 					<view class="block-main">
 						<view class="mian-InfoWrap">
-							<view class="InfoWrap-mb30">订单时间：{{item.playDate.substr(0,10)}}</view>
+							<view class="InfoWrap-mb30">游玩时间：{{item.playDate.substr(0,10)}}</view>
 							<view>
 								购买数量：
 								<template v-if="item.orderType==1&&item.subOrderType!=4">{{item.orderNum}}张</template>