This commit is contained in:
N 2024-01-20 23:17:50 +08:00
parent af1a1a25f0
commit c1e0c75bca

View File

@ -868,6 +868,7 @@
goodsAmount:0, goodsAmount:0,
// //
goodsTotal:0, goodsTotal:0,
cardFavorableId:"",
// //
rise:[ rise:[
{value:"¥100"}, {value:"¥100"},
@ -1318,6 +1319,7 @@
this.countAmountFull(); this.countAmountFull();
this.isUseBalance = false; this.isUseBalance = false;
} }
this.getOilCoupon()
}, },
handleCheckAllChange5(val) { handleCheckAllChange5(val) {
if (val){ if (val){
@ -1976,9 +1978,9 @@
discount.discount = res.data.cardFavorableAmount discount.discount = res.data.cardFavorableAmount
_this.couponDiscount.push(discount) _this.couponDiscount.push(discount)
if(!this.isOilStorageCard) { if(!this.isOilStorageCard) {
_this.cardFavorableId = res.data.cardFavorableId
_this.couponAmount = res.data.cardFavorableAmount _this.couponAmount = res.data.cardFavorableAmount
_this.checkAll5 = true _this.checkAll5 = true
_this.checkedCities5.push(discount.gunName)
} }
} }
if (res.data.activeFavorableAmount){ if (res.data.activeFavorableAmount){
@ -1992,11 +1994,17 @@
} }
} }
// } // }
console.log(_this.couponAmount,222) // console.log(_this.couponAmount,222)
if(!this.isOilStorageCard){ if(!this.isOilStorageCard){
this.countAmountFull() this.countAmountFull()
} }
console.log(discount,_this.gradeDiscount,_this.couponDiscount,_this.fullReduceDiscount,"1264") if (type==1){
this.countAmountUnBalance()
}
if (type==0){
this.countAmountFull()
}
// console.log(discount,_this.gradeDiscount,_this.couponDiscount,_this.fullReduceDiscount,"1264")
}) })
}) })
}, },
@ -2661,7 +2669,7 @@
for (let i =0;i<_this.oilPreferentialData.length;i++){ for (let i =0;i<_this.oilPreferentialData.length;i++){
_this.oilPreferentialData[i].oilPreferential.storeId = response.data.oilOrder.storeId _this.oilPreferentialData[i].oilPreferential.storeId = response.data.oilOrder.storeId
_this.oilPreferentialData[i].oilPreferential.userId = response.data.oilOrder.userId _this.oilPreferentialData[i].oilPreferential.userId = response.data.oilOrder.userId
_this.oilPreferentialData[i].oilPreferential.cardFavorableId = _this.oilPreferentialData[_this.oilPreferentialData.length-1].cardFavorableId _this.oilPreferentialData[i].oilPreferential.cardFavorableId = _this.cardFavorableId
usePaymentActive(_this.oilPreferentialData[i].oilPreferential).then(res => {}) usePaymentActive(_this.oilPreferentialData[i].oilPreferential).then(res => {})
} }
return; return;