Commit 0eeabf4c authored by 罗超's avatar 罗超

修复

parent 2a3448e1
...@@ -1307,6 +1307,7 @@ ...@@ -1307,6 +1307,7 @@
const v = this.userVipRights const v = this.userVipRights
if(v.DiscountType==1) discount += ((money-discount)*(1-v.DiscountValue)) if(v.DiscountType==1) discount += ((money-discount)*(1-v.DiscountValue))
else discount+=v.DiscountValue else discount+=v.DiscountValue
discount=Number(discount.toFixed(2))
} }
return discount return discount
} }
......
...@@ -641,21 +641,13 @@ ...@@ -641,21 +641,13 @@
if (option.CreateBy) { if (option.CreateBy) {
this.CreateBy = option.CreateBy this.CreateBy = option.CreateBy
} }
this.getUserCouponList();
}, },
methods: { methods: {
submitB2COrderHandler(OrderId) { submitB2COrderHandler(OrderId) {
let productType = 0 const pts = [2,1,3]
if (this.currentPriceInfo.teamType == "0") { const productType = pts[this.currentPriceInfo.teamType]
//跟团游
productType = 2;
} else if (this.currentPriceInfo.teamType == "1") {
//小包团
productType = 10;
} else if (this.currentPriceInfo.teamType == "2") {
//当地游
productType = 8;
}
let guestInfo = `成人x${this.orderMsg.ManNum}; `; let guestInfo = `成人x${this.orderMsg.ManNum}; `;
if (this.orderMsg.ChirdNeedBedNum > 0) { if (this.orderMsg.ChirdNeedBedNum > 0) {
guestInfo += `占床儿童${this.orderMsg.ChirdNeedBedNum}; `; guestInfo += `占床儿童${this.orderMsg.ChirdNeedBedNum}; `;
...@@ -678,7 +670,7 @@ ...@@ -678,7 +670,7 @@
GoodsType: productType, GoodsType: productType,
OrderMake: `${this.currentPriceInfo.startDate}从${startCityName}出发 ${guestInfo}`, OrderMake: `${this.currentPriceInfo.startDate}从${startCityName}出发 ${guestInfo}`,
TotalPrice: this.price, TotalPrice: this.price,
PreferentialPrice: this.currentCoupon.discountMoney, PreferentialPrice: this.currentCoupon.discountMoney+this.vipDiscountMoney,
ErpOrderId: OrderId, ErpOrderId: OrderId,
Country: 0, Country: 0,
PlatformTax: 0, PlatformTax: 0,
...@@ -904,7 +896,7 @@ ...@@ -904,7 +896,7 @@
this.currentPriceInfo.visaPrice = res.data.currentPriceInfo.visaPrice this.currentPriceInfo.visaPrice = res.data.currentPriceInfo.visaPrice
this.calcMoney() this.calcMoney()
this.getCouponActivityHandler(res.data) this.getCouponActivityHandler(res.data)
this.getUserCouponList();
} }
}, },
(err) => { (err) => {
...@@ -1056,20 +1048,15 @@ ...@@ -1056,20 +1048,15 @@
} else if(this.customer.contactNumber&&this.customer.contactNumber.length!=11){ } else if(this.customer.contactNumber&&this.customer.contactNumber.length!=11){
msg = '请输入正确的电话号码' msg = '请输入正确的电话号码'
}else if(this.customer.Mailbox==''||!this.customer.Mailbox){ }else if(this.customer.Mailbox==''||!this.customer.Mailbox){
uni.showToast({ msg = '请输入邮箱地址'
title: `请输入邮箱地址`,
icon: "none",
});
}else if (!email.test(this.customer.Mailbox)) { }else if (!email.test(this.customer.Mailbox)) {
uni.showToast({ msg = '请输入正确的邮箱地址'
title: `请输入正确的邮箱地址`,
icon: "none",
});
} }
return msg return msg
}, },
//去支付 //去支付
goPay() { goPay() {
// #ifdef MP-DI
const error = this.validate() const error = this.validate()
if(error!=''){ if(error!=''){
uni.showToast({ uni.showToast({
...@@ -1078,6 +1065,7 @@ ...@@ -1078,6 +1065,7 @@
}) })
return return
} }
// #endif
this.submit = true; this.submit = true;
this.userInfo = uni.getStorageSync("mall_UserInfo"); this.userInfo = uni.getStorageSync("mall_UserInfo");
this.basedataObj = uni.getStorageSync("basedata").mall; this.basedataObj = uni.getStorageSync("basedata").mall;
...@@ -1223,18 +1211,6 @@ ...@@ -1223,18 +1211,6 @@
}); });
// #endif // #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 { } else {
uni.showToast({ uni.showToast({
title:res.message, title:res.message,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment