Merge branch 'B2C' of http://gitlab.oytour.com/zk123/jz_travel into B2C

pages/visa/visa_Reserve.vue

@@ -888,7 +888,6 @@
 			},
 			goPayHandler(OrderNo) {
 				let that = this;
-				var price = (this.price-this.currentCoupon.discountMoney).toFixed(2)
 				uni.requestPayment({
 					provider: "wxpay",
 					timeStamp: this.orderInfo.timeStamp,
@@ -903,20 +902,11 @@
 							title: "支付成功",
 						});
 						setTimeout(() => {
-							// #ifdef MP-DI
-								uni.redirectTo({
-									url: "/pages/jiuzhai/paysuccess?PreferPrice=" +
-									price +
-										"&isFrom=3",
-								});
-							// #endif
-							// #ifdef MP-AG
-								uni.redirectTo({
-									url: "/pages/jiuzhai/paysuccess?PreferPrice=" +
-									this.price +
-										"&isFrom=3",
-								});
-							// #endif
+							uni.redirectTo({
+								url: "/pages/jiuzhai/paysuccess?PreferPrice=" +
+								(that.price-that.currentCoupon.discountMoney).toFixed(2)+
+									"&isFrom=3",
+							});
 							
 						}, 100);
 					},

pages/visa/visa_SureOrder.vue

@@ -645,21 +645,12 @@
 							title: "支付成功",
 						});
 						setTimeout(() => {
-							// #ifdef MP-DI
-								uni.redirectTo({
-									url: "/pages/jiuzhai/paysuccess?PreferPrice=" +
-									that.orderData.model.DueInMoney +
-										"&isFrom=3",
-								});
-							// #endif
-							// #ifdef MP-AG
 							uni.redirectTo({
 									url: "/pages/jiuzhai/paysuccess?PreferPrice=" +
-									that.price +
+									((that.orderData.OrderModel.TotalPrice -that.orderData.OrderModel.DiscountMoney).toFixed(2)) +
 										"&isFrom=3",
 								});
-							// #endif
-						}, 100);
+							}, 100);
 					},
 					fail: function(err) {
 						console.log("fail:", err);