Merge remote-tracking branch 'origin/master'

pages/shopping/paymentOrder.vue

@@ -336,11 +336,12 @@
 								 url: '/pages_user/user/storeOrderDetail?id=' + that.order.id
 							   });
 							 }else{
-								 clearInterval(that.checkTimer);
-								 
-								 uni.navigateTo({
-								 	 url: '/pages_user/user/storeOrderDetail?id=' + that.order.id
-								 });
+								 setTimeout(()=>{
+									 clearInterval(that.checkTimer);
+									 uni.navigateTo({
+									 	 url: '/pages_user/user/storeOrderDetail?id=' + that.order.id
+									 });
+								 },10000)
 							 }
 						   }
 						 });

pages_user/user/otherPaymentOrder.vue

@@ -158,10 +158,12 @@
 											   });
 											 }else{
 												 clearInterval(that.checkTimer);
+												 setTimeout(()=>{
+													 uni.navigateTo({
+													 		 url: '/pages_user/user/storeOrderDetail?id=' + that.order.id
+													 });
+												 },10000)
 												 
-												 uni.navigateTo({
-													 url: '/pages_user/user/storeOrderDetail?id=' + that.order.id
-												 });
 											 }
 										   }
 										 });

pages_user/user/pay.vue

@@ -129,7 +129,7 @@
 							 checkpayment(data).then(res => {
 							   if (res.code == 200) {
 								   console.log(res)
-								 if (res.status == 3) {
+								 if (res.status == 1) {
 								   // 跳转前清除定时器
 								   clearInterval(that.checkTimer);
 								   uni.navigateTo({
@@ -142,7 +142,7 @@
 										 		icon:'none',
 										 		title: "用户未支付",
 										 	});
-									 },500)
+									 },10000)
 								 }
 							   }
 							 });