优化支付提示

pages/jiuzhai/jz_Reserve.vue

@@ -552,6 +552,13 @@
 				</view>
 			</view>
 		</u-popup>
+		<u-modal :border-radius="16" 
+		@confirm="nativageToOrderHandle" 
+		title="订单提醒" 
+		content="订单创建成功,请您在订单列表查询." 
+		@cancel="navigatorToHomeHandle" 
+		v-model="successVisible" confirm-text='查看订单' cancel-text='返回首页' 
+		confirm-color='#DEBF7B' cancel-color='#080A09' :show-cancel-button="true"></u-modal>
 	</view>
 </template>
 
@@ -605,7 +612,8 @@
 				pzCoupon:null,
 				userInfo: {},
 				userVipRights:null,
-				vipDiscountMoney:0
+				vipDiscountMoney:0,
+				successVisible: false,
 			};
 		},
 		created() {
@@ -647,6 +655,23 @@
 			
 		},
 		methods: {
+			navigatorToHomeHandle() {
+				uni.redirectTo({
+					url: '/pages/index/index'
+				})
+			},
+			nativageToOrderHandle(){
+				let OrderTypeStr = ''
+				// #ifdef MP-DI
+					OrderTypeStr = '1,2,3'
+				// #endif
+				// #ifdef MP-AG
+					OrderTypeStr = '2'
+				// #endif
+				uni.redirectTo({
+					url: `/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=${OrderTypeStr}`,
+				});
+			},
 			submitB2COrderHandler(OrderId) {
 				const pts = [2,1,3]
 				const productType = pts[this.currentPriceInfo.teamType]
@@ -733,15 +758,16 @@
 					fail: function(err) {
 						console.log("fail:", err);
 						that.submit = false;
-						uni.showToast({
-							title: "支付失败",
-							icon: "none",
-						});
-						setTimeout(() => {
-							uni.redirectTo({
-								url: "/pages/jiuzhai/jz_SureOrder?OrderNo=" + OrderNo,
-							});
-						}, 100);
+						that.successVisible = true
+						// uni.showToast({
+						// 	title: "支付失败",
+						// 	icon: "none",
+						// });
+						// setTimeout(() => {
+						// 	uni.redirectTo({
+						// 		url: "/pages/jiuzhai/jz_SureOrder?OrderNo=" + OrderNo,
+						// 	});
+						// }, 100);
 					},
 				});
 			},

pages/visa/visa_Reserve.vue

@@ -781,6 +781,13 @@
 				</view>
 			</view>
 		</u-popup>
+		<u-modal :border-radius="16" 
+		@confirm="nativageToOrderHandle" 
+		title="订单提醒" 
+		content="订单创建成功,请您在订单列表查询." 
+		@cancel="navigatorToHomeHandle" 
+		v-model="successVisible" confirm-text='查看订单' cancel-text='返回首页' 
+		confirm-color='#DEBF7B' cancel-color='#080A09' :show-cancel-button="true"></u-modal>
 	</view>
 </template>
 
@@ -853,6 +860,7 @@
 				provinceList: [],
 				cityList: [],
 				userInfo:{},
+				successVisible: false,
 			};
 		},
 		created() {
@@ -893,6 +901,23 @@
 			this.initCountry()
 		},
 		methods: {
+			navigatorToHomeHandle() {
+				uni.redirectTo({
+					url: '/pages/index/index'
+				})
+			},
+			nativageToOrderHandle(){
+				let OrderTypeStr = ''
+				// #ifdef MP-DI
+					OrderTypeStr = '15'
+				// #endif
+				// #ifdef MP-AG
+					OrderTypeStr = '6'
+				// #endif
+				uni.redirectTo({
+					url: `/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=${OrderTypeStr}`,
+				});
+			},
 			submitB2COrderHandler(OrderId) {
 				let guestInfo = `${this.orderMsg.AdultPeopleNum} 人; `;
 				if (this.orderMsg.ChildPeopleNum > 0) {
@@ -963,15 +988,16 @@
 					fail: function(err) {
 						console.log("fail:", err);
 						that.submit = false;
-						uni.showToast({
-							title: "支付失败",
-							icon: "none",
-						});
-						setTimeout(() => {
-							uni.redirectTo({
-								url: "/pages/visa/visa_SureOrder?OrderNo=" + OrderNo,
-							});
-						}, 100);
+						that.successVisible = true
+						// uni.showToast({
+						// 	title: "支付失败",
+						// 	icon: "none",
+						// });
+						// setTimeout(() => {
+						// 	uni.redirectTo({
+						// 		url: "/pages/visa/visa_SureOrder?OrderNo=" + OrderNo,
+						// 	});
+						// }, 100);
 					},
 				});
 			},
@@ -1393,13 +1419,14 @@
 								this.submitB2COrderHandler(tempData.airOrderId)
 							// #endif
 							// #ifdef MP-AG
-								uni.showToast({
-									title: '订单创建成功.',
-									icon: 'none'
-								})
-								uni.redirectTo({
-									url: `/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=6`,
-								});
+								this.successVisible = true
+								// uni.showToast({
+								// 	title: '订单创建成功.',
+								// 	icon: 'none'
+								// })
+								// uni.redirectTo({
+								// 	url: `/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=6`,
+								// });
 							// #endif
 						} else {
 							uni.showToast({