过号BUG修复

pages/my/order/electronicTicket/electronicTicket.vue

@@ -38,7 +38,7 @@
 					</view>
 			</view>
 		</template>
-		<view class="order-queueUp order-allType order-positionTop" v-if="orderInfo.isFetch==1&&sortsInfo">
+		<view class="order-queueUp order-allType order-positionTop" v-if="orderInfo.isFetch==1&&sortsInfo&&sortData[0].config.sceneSortStatus==1">
 		    <view class="alltype-title">
 		        <!-- <view class="title-line">
 		            <view></view>
@@ -108,10 +108,14 @@
 									<text class="list-name">正排队号区间：</text>
 									<view class="list-value3">{{item.showStart}} ~ {{item.showEnd}}<text style="font-size: 28rpx;margin-left: 8rpx;line-height: 56rpx;">({{item.projectName}})</text></view>
 							</view>
-							<view class="rowNumber-list rowNumber-list2">
+							
+							<view class="rowNumber-list rowNumber-list2" v-if="item.config.paPassedNumEnable==1">
 								<view class="rowNumber-signOver">您排队号已过</view>
 								<view class="rowNumber-takeNum2" v-if="item.sortFair===3" @click="signOverFun(item)">取号</view>
 							</view>
+							<view class="rowNumber-list rowNumber-list2" v-else>
+								<view class="rowNumber-signOver">{{item.config.paPassedNumHint}}</view>
+							</view>
 					</view>
 				</template>
 				<!-- 历史排号 -->
@@ -216,11 +220,11 @@
 					温馨提示
 				</view>
 				<view class="case-body">
-					如您已通过查验进入排队区，则无需取号，取号将重排号
+					{{overSignedData.config.paPassedNumTakeTypeHint}}
 				</view>
 				<view class="case-btn">
 					<view class="btn-typeAll btn-type1" @click="sortAgain(overSignedData)">取号</view>
-					<view class="btn-typeAll btn-type2" @click="maskType==false">返回</view>
+					<view class="btn-typeAll btn-type2" @click="maskType=false">返回</view>
 				</view>
 			</view>
 		</view>
@@ -440,8 +444,8 @@
 		onLoad(option) {
 			this.id = option.orderId
 			//this.id = "z00167956572219584dc15634b62cf75"
-			this.openId = uni.getStorageSync("openid") //openid
-			//this.openId = "oh2UV1lyYABHMZ1rMlgjhVHyyYDQ"
+			this.openId = uni.getStorageSync("openid") //openid oroHZ5FaUQ_SOOC_uQQP92fJpBRE oh2UV1lyYABHMZ1rMlgjhVHyyYDQ
+			//this.openId = "oroHZ5FaUQ_SOOC_uQQP92fJpBRE"
 			this.getDetail();
 			
 		},
@@ -613,7 +617,11 @@
 			signOverFun(item){//过号遮罩显示
 				this.overSignedData = {};
 				this.overSignedData = item
-				this.maskType = true
+				if(item.config.paPassedNumTakeType==1){
+					this.maskType = true;
+				}else{
+					this.sortAgain(item);
+				}
 			},
 			dynamicCodeRefresh(){
 				// 获取当前显示第几个二维码