修复

pages/jiuzhai/jz_LineDetail.vue

@@ -1307,6 +1307,7 @@
 					const v = this.userVipRights
 					if(v.DiscountType==1) discount += ((money-discount)*(1-v.DiscountValue))
 					else discount+=v.DiscountValue
+					discount=Number(discount.toFixed(2))
 				}
 				return discount
 			}

pages/jiuzhai/jz_Reserve.vue

@@ -641,21 +641,13 @@
 			if (option.CreateBy) {
 				this.CreateBy = option.CreateBy
 			}
-			this.getUserCouponList();
+			
 		},
 		methods: {
 			submitB2COrderHandler(OrderId) {
-				let productType = 0
-				if (this.currentPriceInfo.teamType == "0") {
-					//跟团游
-					productType = 2;
-				} else if (this.currentPriceInfo.teamType == "1") {
-					//小包团
-					productType = 10;
-				} else if (this.currentPriceInfo.teamType == "2") {
-					//当地游
-					productType = 8;
-				}
+				const pts = [2,1,3]
+				const productType = pts[this.currentPriceInfo.teamType]
+				
 				let guestInfo = `成人x${this.orderMsg.ManNum}; `;
 				if (this.orderMsg.ChirdNeedBedNum > 0) {
 					guestInfo += `占床儿童${this.orderMsg.ChirdNeedBedNum}; `;
@@ -678,7 +670,7 @@
 					GoodsType: productType,
 					OrderMake: `${this.currentPriceInfo.startDate}从${startCityName}出发 ${guestInfo}`,
 					TotalPrice: this.price,
-					PreferentialPrice: this.currentCoupon.discountMoney,
+					PreferentialPrice: this.currentCoupon.discountMoney+this.vipDiscountMoney,
 					ErpOrderId: OrderId,
 					Country: 0,
 					PlatformTax: 0,
@@ -904,7 +896,7 @@
 							this.currentPriceInfo.visaPrice = res.data.currentPriceInfo.visaPrice
 							this.calcMoney()
 							this.getCouponActivityHandler(res.data)
-							
+							this.getUserCouponList();
 						}
 					},
 					(err) => {
@@ -1056,20 +1048,15 @@
 				} else if(this.customer.contactNumber&&this.customer.contactNumber.length!=11){
 					msg = '请输入正确的电话号码'
 				}else if(this.customer.Mailbox==''||!this.customer.Mailbox){
-					uni.showToast({
-				      title: `请输入邮箱地址`,
-				      icon: "none",
-				    });
+					msg = '请输入邮箱地址'
 				}else if (!email.test(this.customer.Mailbox)) {
-					uni.showToast({
-				      title: `请输入正确的邮箱地址`,
-				      icon: "none",
-				    });
+					msg = '请输入正确的邮箱地址'
 				}
 				return msg
 			},
 			//去支付
 			goPay() {
+				// #ifdef MP-DI
 				const error = this.validate()
 				if(error!=''){
 					uni.showToast({
@@ -1078,6 +1065,7 @@
 					})
 					return
 				}
+				// #endif
 				this.submit = true;
 				this.userInfo = uni.getStorageSync("mall_UserInfo");
 				this.basedataObj = uni.getStorageSync("basedata").mall;
@@ -1223,18 +1211,6 @@
 								});
 							// #endif
 							
-							// let data = res.data;
-							// data.CoverImg = this.currentPriceInfo.CoverImg;
-							// let myData = JSON.stringify(data);
-							// this.orderData = encodeURIComponent(myData);
-							// #ifdef MP-WEIXIN
-							// 去掉支付
-							//this.queren(data.OrderId);
-							// #endif
-							// #ifdef MP-ALIPAY
-							//去掉支付
-							//this.querenAli(data);
-							// #endif
 						} else {
 							uni.showToast({
 								title:res.message,