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

pages/jiuzhai/jz_SureOrder.vue

@@ -446,7 +446,7 @@
 			</view>
 			<view class="jz_form" style="margin: 40rpx 0; padding: 0">
 				<view class="form-items">
-					<view class="label"> 在线支付 </view>
+					<view class="label"> 商品总价 </view>
 					<view class="val f14 regular" style="text-align: right">
 						<text style="margin-right: 30rpx">{{ orderData.model.GuestNum }}人</text>
 						<text class="red">￥{{ orderData.model.PreferPrice }}</text>

pages/visa/visa_Reserve.vue

@@ -888,6 +888,7 @@
 			},
 			goPayHandler(OrderNo) {
 				let that = this;
+				var price = (this.price-this.currentCoupon.discountMoney).toFixed(2)
 				uni.requestPayment({
 					provider: "wxpay",
 					timeStamp: this.orderInfo.timeStamp,
@@ -902,11 +903,21 @@
 							title: "支付成功",
 						});
 						setTimeout(() => {
-							uni.redirectTo({
-								url: "/pages/jiuzhai/paysuccess?PreferPrice=" +
-								that.price +
-									"&isFrom=1",
-							});
+							// #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
+							
 						}, 100);
 					},
 					fail: function(err) {

pages/visa/visa_SureOrder.vue

@@ -645,11 +645,20 @@
 							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 +
-									"&isFrom=3",
-							});
+									url: "/pages/jiuzhai/paysuccess?PreferPrice=" +
+									that.price +
+										"&isFrom=3",
+								});
+							// #endif
 						}, 100);
 					},
 					fail: function(err) {