确认订单中 增加商品数量修改 运费
This commit is contained in:
@@ -276,7 +276,10 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="bottom jf_box" v-if="v.type == 4&&initData.user.jf>0">
|
||||
<view
|
||||
class="bottom jf_box"
|
||||
v-if="v.type == 4 && initData.user.jf > 0"
|
||||
>
|
||||
<view class="jf_box">
|
||||
<text style="color: #258feb; font-weight: 600"
|
||||
>可用积分({{ jfNumberMax }}分)</text
|
||||
@@ -599,7 +602,6 @@
|
||||
v-if="showCouponPup"
|
||||
:sumMeony="totalPrice"
|
||||
:selectcouponList="selectcouponList"
|
||||
:addressId="addressId"
|
||||
:curCouponId="curCouponId"
|
||||
:list="couponHistoryList"
|
||||
ref="orderCoupon"
|
||||
@@ -966,7 +968,12 @@ export default {
|
||||
title: res.errMsg,
|
||||
icon: "none",
|
||||
});
|
||||
await this.getTotalPrice();
|
||||
if (this.isShowAddress) {
|
||||
await this.getUserAddress();
|
||||
} else {
|
||||
await this.getTotalPrice();
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
if (res.code == 0) {
|
||||
@@ -1006,7 +1013,11 @@ export default {
|
||||
}
|
||||
|
||||
this.$forceUpdate();
|
||||
await this.getTotalPrice();
|
||||
if (this.isShowAddress) {
|
||||
await this.getUserAddress();
|
||||
} else {
|
||||
await this.getTotalPrice();
|
||||
}
|
||||
// await that.getDetailInfo();
|
||||
})
|
||||
.catch((e) => {
|
||||
@@ -1153,6 +1164,10 @@ export default {
|
||||
console.log("res at line 374:", res);
|
||||
if (res.code == 0) {
|
||||
this.initData = res.data;
|
||||
console.log(
|
||||
"this.initData at line 初始化课程订单信息:",
|
||||
this.initData
|
||||
);
|
||||
this.isShowAddress = res.data.is_course ? false : true;
|
||||
if (!this.isShowAddress && !this.options.isFudu) {
|
||||
this.priceBreakdownList.push({
|
||||
@@ -1162,11 +1177,7 @@ export default {
|
||||
});
|
||||
}
|
||||
|
||||
if (this.isShowAddress) {
|
||||
await this.getUserAddress();
|
||||
} else {
|
||||
// await this.getTotalPrice();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
this.$forceUpdate();
|
||||
@@ -1230,6 +1241,7 @@ export default {
|
||||
this.addressData = this.defaultAddressList;
|
||||
}
|
||||
console.log("this.addressData at line 742:", this.addressData);
|
||||
|
||||
if (this.defaultAddressList.id) {
|
||||
console.log("有默认地址");
|
||||
await this.getFreightNum();
|
||||
@@ -1319,14 +1331,13 @@ export default {
|
||||
this.jfNumberMax = that.totalPrice - couponAmount;
|
||||
console.log("this.jfNumberMax at line 1303:", this.jfNumberMax);
|
||||
} else {
|
||||
if(this.initData.user.jf>=couponAmount){
|
||||
this.jfNumber = this.initData.user.jf - couponAmount;
|
||||
this.jfNumberMax = this.initData.user.jf - couponAmount;
|
||||
}else{
|
||||
this.jfNumber=this.initData.user.jf
|
||||
this.jfNumberMax=this.initData.user.jf
|
||||
if (this.initData.user.jf >= couponAmount) {
|
||||
this.jfNumber = this.initData.user.jf - couponAmount;
|
||||
this.jfNumberMax = this.initData.user.jf - couponAmount;
|
||||
} else {
|
||||
this.jfNumber = this.initData.user.jf;
|
||||
this.jfNumberMax = this.initData.user.jf;
|
||||
}
|
||||
|
||||
}
|
||||
if (that.jfNumber == 0 || that.jfNumber == null) {
|
||||
that.jfNumberShow = "0.00";
|
||||
@@ -1337,7 +1348,7 @@ export default {
|
||||
}
|
||||
that.actualPayment = that.actualPayment + that.freightNum;
|
||||
} else {
|
||||
that.actualPayment = that.totalPrice + that.freightNum;
|
||||
that.actualPayment = that.totalPrice + that.freightNum - couponAmount;
|
||||
}
|
||||
|
||||
// console.log('couponAmount优惠券金额',couponAmount);
|
||||
|
||||
Reference in New Issue
Block a user