bug - 扫码延迟问题

pages/buytickets/confirm.js

@@ -3,7 +3,8 @@ import * as API from '@/apis/buytickets.js'
 
 export default {
 	data() {
-		return {
+		return {
+			noback:false,
 			id: '',
 			num: 0,
 			pic: '',
@@ -74,7 +75,12 @@ export default {
 			this.list = [];
 			API.upBusNoTicketList(this.subForm).then((res) => {
 
-				var list = res.data.data
+				var list = res.data.data;
+				if(!list.length){
+					this.$refs.common.alert2("无照片，请上车刷脸或联系司机");
+					return;
+				}
+				
 				for (var i in list) {
 					list[i].show = true;
 					list[i].ck = false;
@@ -103,8 +109,10 @@ export default {
 			})
 		}
 	},
-	onLoad(op) {
-
+	onLoad(op) {
+		if(op.back){
+			this.noback=op.back
+		}
 		this.id = op.id
 	},
 	onReady() {

pages/buytickets/confirm.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<car-common mytitle="确认身份" ref="common"></car-common>
+		<car-common mytitle="确认身份" :noback="noback" ref="common"></car-common>
 		
 		<view class="confirm">
 		

pages/buytickets/index.js

@@ -252,7 +252,10 @@ export default {
 				this.passengerInfo = response.data
 
 
-				var obj = this.carhelp.get("form");
+				var obj = this.carhelp.get("form");
+				if(!obj){
+					obj={}
+				}
 				obj.list = this.passengerInfo.list;
 				obj.name= 'buytickets';
 				obj.id= this.id;
@@ -260,7 +263,7 @@ export default {
 
 				if (!response.data.id) {
 					uni.redirectTo({
-						url: '/pages/buytickets/confirm?id=' + this.id
+						url: '/pages/buytickets/confirm?id=' + this.id+'&back=true'
 					})
 				} else {
 				

pages/index/index.js

@@ -104,9 +104,14 @@ export default {
 				})
 			},
 			getScan(){
-				WxJsApi.scanQRCode(0).then(function(url){
+				this.$refs.common.showLoading()
+				WxJsApi.scanQRCode(0,this.$refs.common).then(function(url){
 					console.log(url)
+					
 					window.location.href=url;
+				}).catch(error => {
+					this.$refs.common.showLoading(false,error)
+					
 				});
 			},
 			clickSwiper(index){

utils/wxJsApi.js

@@ -157,7 +157,7 @@ export function getLocation() {
 }
 
 //扫描二维码
-export function scanQRCode(needResult) {
+export function scanQRCode(needResult,obj) {
 	var needResult = needResult || 1;
 	let promise = new Promise((resolve, reject) => {
 		wx.scanQRCode({
@@ -170,11 +170,16 @@ export function scanQRCode(needResult) {
 			faile: function(res) {
 				reject(res);
 			},
+			
 			fail: function(res) {
 
 				reject(res);
 			},
-			complete() {}
+			complete() {
+				if(obj){
+					obj.showLoading(false)	
+				}
+			}
 		})
 	});
 	return promise;