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

pages/my/order/jointElectronicTicket/jointElectronicTicket.vue

@@ -334,7 +334,7 @@
 			<text v-if="mainRefundBtn" @click="mainRefund(orderInfo.id)">申请退票</text>
 			<!-- 以子订单为准 -->
 			<text v-if="subRefundBtn" @click="showSubRefund()">申请退票</text>
-			<text>再次预订</text>
+			<text @click="orderAgain()">再次预订</text>
 		</view>
 		<!-- 是否重新排号 -->
 		<u-modal 
@@ -423,7 +423,7 @@ export default {
     }
   },
   onLoad(option) {
-    this.orderId=option.orderId
+    this.orderId= option.orderId
   },
   onShow() {
     this.getDetail()
@@ -612,7 +612,10 @@ export default {
 							        }
 							        let refundTimeNumber=new Date(refundTime.replace(/-/g, '/')).getTime()
 							        //refundDateType退款时间0之前1之后2至（用于区间）
+											
 							        if(item2.refundDateType==0){
+                        console.log(nowTimeNumber)
+                        console.log(refundTimeNumber)
 							          if(nowTimeNumber<refundTimeNumber){
 												  this.subRefundBtn=true
                           //增加字段用于弹窗展示该产品是否可退
@@ -843,7 +846,8 @@ export default {
             if(dataObj.pays.length>0){
               item.companyIdCopy = dataObj.pays[0].companyId
             }
-            item.sorts=dataObj.sorts||[]
+            //由于页面不显示历史排号，所以只取第一个最新的排号信息
+            item.sorts=dataObj.sorts.slice(0,1)||[]
 		        if(item.sorts[0].sortFair==4||item.sorts[0].sortFair==5){
               //时间判断，用于返程或第一次取号时，是否可以显示取号按钮
               let presentTime = new Date().getTime()
@@ -964,8 +968,15 @@ export default {
       uni.navigateTo({
 			  url: '/pages/my/order/afterSale/applyAfterSale/applyAfterSale?orderId='+this.refundOrderId
       })
+    },
+    //---再次预订
+    orderAgain(){
+      let query = '?merchantId='+this.orderInfo.merchantId+'&productId=' +this.orderInfo.id +'&orderSource=3'
+      uni.navigateTo({
+        url: '/pages/scenic/scenicJointOrder/scenicJointOrder' + query
+      })
     }
-  },
+  }
   
 }
 </script>

pages/scenic/scenicComponents/chooseArea.vue

@@ -71,15 +71,6 @@
 								</text>
 							</view>
 						</template>
-						<!-- <view>
-							<text>
-								退票规则：
-							</text>
-						
-							<text>
-								不可退
-							</text>
-						</view> -->
 						<view>
 						  返程时，根据现场情况需重新取号
 						</view>
@@ -132,15 +123,6 @@
 			
 			  	</text>
 			  </view>
-				<!-- <view>
-					<text>
-						退票规则：
-					</text>
-				
-					<text>
-						不可退
-					</text>
-				</view> -->
 			  <view>
 			    <image src="../static/scenic/chooseArea.jpg" mode="widthFix"></image>
 			  </view>
@@ -149,6 +131,9 @@
 			    <a class="btn" @click="closeSon()">确定</a>
 			  </view>
 			</view>
+			<view class="number-detail">
+				长江索道排号详情可在公众号查询
+			</view>
 		</view>
 		
 	</view>
@@ -338,4 +323,10 @@ export default {
 		font-weight: bolder;
 		color:$red;
 	}
+	.number-detail{
+		font-size:32rpx;
+		color:#FC6703;
+		text-align: center;
+		margin-top: 20rpx;
+	}
 </style>