样式和bug处理

pages.json

@@ -268,7 +268,9 @@
 					"style" : 
 					{
 						"navigationBarTitleText" : "电子门票",
-						"enablePullDownRefresh": false
+						"enablePullDownRefresh": false,
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#F7F8FA"
 					}
 				}
 			]

pages/combination/distributionCombiChoose/distributionCombiChoose.vue

@@ -10,9 +10,19 @@
 				</u-swiper>
 			</view>
 			<view class="middle">
-				<view class="detail">
+				<view class="merchant-info">
+					<view class="merchant-name">
+						长江索道
+					</view>
+					<view>
+						<view class="merchant-time">
+							
+						</view>
+						<view class="merchant-address">
 							
 						</view>
+					</view>
+				</view>
 				<checkbox-group @change="checkboxChange" class="checkbox-box">
 					<view class="merchant" v-for="(item, index) in scenicList" :key="index">
 						<view class="merchant-title" @click="clikDetail(item.id)">

pages/my/order/jointElectronicTicket/jointElectronicTicket.vue

@@ -100,12 +100,12 @@
 							</view>
 						</view>
 						<!-- 4-可返程取号(仅胖丁显示),5-第一次取号(仅胖丁显示)-->
-						<view v-else-if="item2.sortFair==4||item2.sortFair==5">
+						<view v-else-if="item2.sortFair==4||item2.sortFair==5" style="padding-top: 16rpx;">
 							<view class="current-number">
 								当前排队区间<text style="color: #FE6600;">{{item2.showStart}}-{{item2.showEnd}}</text>号
 							</view>
 							<!-- 1购票返程允许取号 -->
-							<view v-if="item2.config.paReturnTripNumEnable==1" style="margin-top: 20rpx;" >
+							<view v-if="item2.config.paReturnTripNumEnable==1" style="margin-top: 30rpx;" >
 								<text v-if="canTakeNumber" @click="sortAgain(item)" class="number-btn2">取号</text>
 								<text v-else>
 									<text style="color: #FE6600;font-weight: bold;">{{minute}}</text>分
@@ -113,7 +113,7 @@
 								</text>
 							</view>
 							<!-- 1购票返程不允许取号,仅提示 -->
-							<view v-if="item2.config.paReturnTripNumEnable==0" style="margin-top: 20rpx;">
+							<view v-if="item2.config.paReturnTripNumEnable==0" style="margin-top: 30rpx;">
 								{{item.config.paReturnTripHint}}
 							</view>
 						</view>
@@ -209,7 +209,7 @@
 			
 			<view class="rufundRule">
 				<!-- 等于3退票规则以子订单为准 -->
-				<view style="padding: 32rpx;" v-if="orderInfo.isRefund==3">
+				<view style="padding: 32rpx 32rpx 0 32rpx;" v-if="orderInfo.isRefund==3">
 					<view v-for="(item,index) in orderInfo.childs" :key="index" >
 						<view class="rule-title">
 							{{item.productName}}退改规则
@@ -849,20 +849,20 @@ export default {
 		      if(res.data.length>0){
             //防止代码bug进入catch里面，一直请求接口影响性能
             try{
-              //显示排号信息
-              item.showSortInfo=true
               let dataObj=res.data[0]
-              //子产品获取公司Id,用于重排号传参
-              if(dataObj.pays.length>0){
-							  item.companyIdCopy = dataObj.pays[0].companyId
-              }
               //由于页面不显示历史排号，所以只取第一个最新的排号信息
               item.sorts=dataObj.sorts.slice(0,1)||[]
-              if(item.sorts[0].sortFair==4||item.sorts[0].sortFair==5){
+              item.sorts.forEach(item2=>{
+                //sceneSortStatus，1上架
+                if(item2.config.sceneSortStatus==1){
+								  //显示排号信息
+								  item.showSortInfo=true
+                }
+                if(item2.sortFair==4||item2.sortFair==5){
 								  //时间判断，用于返程或第一次取号时，是否可以显示取号按钮
 								  let presentTime = new Date().getTime()
-							  let time1=new Date((item.sorts[0].createDate).replace(/-/g, '/')).getTime()
-							  let time2=parseInt((item.sorts[0].config.paReturnTripTime)*60*1000) 
+								  let time1=new Date((item2.createDate).replace(/-/g, '/')).getTime()
+								  let time2=parseInt((item2.config.paReturnTripTime)*60*1000) 
 								  let takeNumberTime=time1+time2
 								  if(presentTime>takeNumberTime){
 								    this.canTakeNumber =true
@@ -882,6 +882,17 @@ export default {
 								    },1000)
 								  }
                 }
+              })
+              //子产品获取公司Id,用于重排号传参
+              if(dataObj.pays.length>0){
+							  item.merchantCodeCopy = dataObj.pays[0].companyId
+              }
+              //子产品获取三方Id,用于重排号传参
+              item.thirdIdCopy=dataObj.order.orderId
+              //子产品获取站点编码,用于重排号传参
+              if(item.sorts.length>0){
+                item.areaCodeCopy=item.sorts[0].projectId
+              }
               this.$forceUpdate() 
             }catch(e){
               uni.showToast({
@@ -911,10 +922,10 @@ export default {
     sortAgain(item){
 		  let data={
 		    againNumber:1,
-		    thirdId:item.thirdOrderId,//三方订单id
-		    areaCode:item.areaCode,//站点
+		    thirdId:item.thirdIdCopy,//三方订单id
+		    areaCode:item.areaCodeCopy,//站点
 		    userId:this.openid,
-		    merchantCode:item.companyIdCopy,
+		    merchantCode:item.merchantCodeCopy,
 		  }
 		  this.$request('distribution/distribution/newFetchNumber',data).then((res)=>{
 		    if(res.code=='00'){
@@ -1038,6 +1049,7 @@ export default {
 .product-name{
 	display: flex;
 	justify-content: space-between;
+	align-items: center;
 	font-size: 36rpx;
 	font-weight: 600;
 	text:first-child{
@@ -1059,7 +1071,7 @@ export default {
 	}
 }
 .product-number{
-	padding: 0 32rpx;
+	padding: 0 20rpx;
 	border-radius: 16rpx;
 	background: #FFFFFF;
 	margin-top: 20rpx;
@@ -1150,6 +1162,9 @@ export default {
 	margin-top: 20rpx;
 	color: $red;
 }
+.product-useknow{
+	padding: 0 32rpx;
+}
 .useknow-list{
 	display: flex;
 	margin-top: 28rpx;
@@ -1185,7 +1200,7 @@ export default {
 	}
 }
 .rule-list{
-	margin-top:30rpx;
+	margin:30rpx 0;
 }
 .rule-service{
 	display: flex;