订单支付

pages/AggregateOrders/components/header.vue

@@ -155,9 +155,12 @@
 				})
 			},
 			goBack() {
-				uni.navigateBack({
-					delta: -1
+				uni.navigateTo({
+					url: `/pages/user-center/userVip-center`
 				})
+				// uni.navigateBack({
+				// 	delta: -1
+				// })
 			}
 		}
 	}

pages/bus/order.vue

@@ -341,7 +341,7 @@
 		<u-modal :border-radius="16" 
 		@confirm="nativageToOrderHandle" 
 		title="订单提醒" 
-		content="订单创建成功,请您在5分钟内完成付款,否则将会被取消." 
+		content="订单创建成功,请您在订单列表查询支付." 
 		@cancel="navigatorToHomeHandle" 
 		v-model="successVisible" confirm-text='查看订单' cancel-text='返回首页' 
 		confirm-color='#DEBF7B' cancel-color='#080A09' :show-cancel-button="true"></u-modal>
@@ -612,24 +612,25 @@
 					},
 					fail: function(err) {
 						that.submit = true;
-						uni.showToast({
-							title: "支付失败",
-							icon: "none",
-						});
+						that.successVisible = true
+						// uni.showToast({
+						// 	title: "支付失败",
+						// 	icon: "none",
+						// });
 						setTimeout(() => {
 							// uni.redirectTo({
 							// 	url: "/pages/bus/orderdetails?orderId=" + that.ErpOrderId,
 							// });
-							let OrderTypeStr = ''
-							// #ifdef MP-DI
-								OrderTypeStr = '12,13,14'
-							// #endif
-							// #ifdef MP-AG
-								OrderTypeStr = '5'
-							// #endif
-							uni.redirectTo({
-								url: `/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=${OrderTypeStr}`,
-							});
+							// let OrderTypeStr = ''
+							// // #ifdef MP-DI
+							// 	OrderTypeStr = '12,13,14'
+							// // #endif
+							// // #ifdef MP-AG
+							// 	OrderTypeStr = '5'
+							// // #endif
+							// uni.redirectTo({
+							// 	url: `/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=${OrderTypeStr}`,
+							// });
 						}, 100);
 					},
 				});
@@ -992,9 +993,10 @@
 									title: '订单创建成功.',
 									icon: 'none'
 								})
-								uni.redirectTo({
-									url: `/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=5`,
-								});
+								this.successVisible = true
+								// uni.redirectTo({
+								// 	url: `/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=5`,
+								// });
 							// #endif
 						} else {
 							uni.showToast({