Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop

pages/my/takeNumber/numberIndex/numberIndex.vue

@@ -83,6 +83,24 @@ export default {
       this.noNumberList=[]
       this.$request('distribution/distribution/getFetchInfoOta',data).then((res)=>{
 			  if(res.code=='00'){
+          //如果排号的数组里面有未使用的直接跳转电子门票页面
+          if(res.data&&res.data.length>0){
+            let arr1=res.data[0].sorts||[]
+            let arr2=res.data[0].uses||[]
+            let number=0
+            arr1.forEach(item=>{
+              arr2.forEach(item2=>{
+                if(item.projectId==item2.projectId){
+                  number+=1
+                }
+              })
+            })
+            if(arr1.length>number){
+              uni.navigateTo({
+                url:`/pages/my/order/electronicTicket/electronicTicket?orderId=${this.orderId}`
+              })
+            }
+          }
           //sortFair=3时可重排，排号状态:0-等待中,1-可进入,2-已过号,３-可重排,4-可返程取号(仅胖丁显示),5-第一次取号(仅胖丁显示),6-已过闸
           //计算时去除可重排的
           let sorts=[]