diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index 987815cb9..0d4372997 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -868,6 +868,7 @@ goodsAmount:0, // 商品订单数 goodsTotal:0, + cardFavorableId:"", // 加油金额 rise:[ {value:"¥100"}, @@ -1318,6 +1319,7 @@ this.countAmountFull(); this.isUseBalance = false; } + this.getOilCoupon() }, handleCheckAllChange5(val) { if (val){ @@ -1976,9 +1978,9 @@ discount.discount = res.data.cardFavorableAmount _this.couponDiscount.push(discount) if(!this.isOilStorageCard) { + _this.cardFavorableId = res.data.cardFavorableId _this.couponAmount = res.data.cardFavorableAmount _this.checkAll5 = true - _this.checkedCities5.push(discount.gunName) } } if (res.data.activeFavorableAmount){ @@ -1992,11 +1994,17 @@ } } // } - console.log(_this.couponAmount,222) + // console.log(_this.couponAmount,222) if(!this.isOilStorageCard){ 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++){ _this.oilPreferentialData[i].oilPreferential.storeId = response.data.oilOrder.storeId _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 => {}) } return;