mirror of
https://gitee.com/lab1024/smart-admin.git
synced 2025-11-22 02:16:53 +08:00
Order displaying & coupon calculating issue fixed
This commit is contained in:
@@ -287,12 +287,13 @@ export default {
|
||||
checkResult = false;
|
||||
}
|
||||
if(checkResult) {
|
||||
this.discountedProductCode = this.goldmedal[0].productCode
|
||||
if(this.curCoupon.couponAmount && this.curCoupon.couponAmount>0) {
|
||||
this.discountAmount = this.curCoupon.couponAmount;
|
||||
return this.sumPrice - this.curCoupon.couponAmount;
|
||||
} else if(this.curCoupon.discount && this.curCoupon.discount>0) {
|
||||
this.discountAmount = this.sumPrice*(1-this.curCoupon.discount);
|
||||
return this.sumPrice * this.curCoupon.discount;
|
||||
this.discountAmount = this.sumPrice*this.curCoupon.discount;
|
||||
return this.sumPrice * ( 1 - this.curCoupon.discount );
|
||||
}
|
||||
} else {
|
||||
return this.sumPrice;
|
||||
@@ -330,7 +331,7 @@ export default {
|
||||
break;
|
||||
case 3: //Limited product % discount
|
||||
case 4: //% discount
|
||||
total = total + (itemInCart.productPrice * itemInCart.buyCount) * (1-this.curCoupon.discount);
|
||||
total = total + (itemInCart.productPrice * itemInCart.buyCount) * ( 1 - this.curCoupon.discount );
|
||||
this.discountAmount = (itemInCart.productPrice * itemInCart.buyCount) * this.curCoupon.discount;
|
||||
this.discountedProductCode = itemInCart.productCode;
|
||||
couponUsed=true;
|
||||
@@ -536,6 +537,8 @@ export default {
|
||||
addressDetailInfo: orderAddress[0].detailAddress,
|
||||
},
|
||||
};
|
||||
console.log(this.curCoupon,item.productCode,this.discountedProductCode);
|
||||
debugger;
|
||||
if(this.curCoupon.couponId && item.productCode == this.discountedProductCode) {
|
||||
oneProduct.couponId = this.curCoupon.couponId;
|
||||
oneProduct.couponTypeId = this.curCoupon.couponTypeId;
|
||||
|
||||
Reference in New Issue
Block a user