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

pages/my/order/electronicTicket/electronicTicket.vue

@@ -823,8 +823,9 @@ export default {
 							    
 							  }else{
                   //还未取号的，显示取号按钮.
+                  if(this.orderInfo.subOrderType!=8){
                     this.showNumberBtn=true
-                  console.log(this.showNumberBtn)
+                  }
 							  }
               }