dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
齐天大圣 2024-06-05 09:32:34 +08:00
parent 7160b12ab4
commit ebbc5dd4c9
1 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
View File

@ -3196,53 +3196,55 @@
_this.paymentActive.oilId = item.oilName _this.paymentActive.oilId = item.oilName
_this.paymentActive.storeId = item.storeId _this.paymentActive.storeId = item.storeId
getPaymentActive(_this.paymentActive).then(res => { getPaymentActive(_this.paymentActive).then(async res => {
item.activeId = res.data.activeId item.activeId = res.data.activeId
item.type = res.data.type item.type = res.data.type
let discount = {type:"",discount:0,oilName:item.oilName,gunName:item.gunName} let discount = { type: "", discount: 0, oilName: item.oilName, gunName: item.gunName }
let oilData = {oilName:item.oilName,oilPreferential: {}} let oilData = { oilName: item.oilName, oilPreferential: {} }
// this.preferentialData1 = res.data // this.preferentialData1 = res.data
oilData.oilPreferential = res.data oilData.oilPreferential = res.data
_this.oilPreferentialData.push(oilData) _this.oilPreferentialData.push(oilData)
// if (_this.consumeRefuelMoney==0){ // if (_this.consumeRefuelMoney==0){
if (res.data.memberFavorableAmount){ if (res.data.memberFavorableAmount) {
discount.discount = res.data.memberFavorableAmount discount.discount = res.data.memberFavorableAmount
_this.gradeDiscount.push(discount) _this.gradeDiscount.push(discount)
if(!this.isOilStorageCard) { if (!this.isOilStorageCard) {
_this.oilDiscount = res.data.memberFavorableAmount _this.oilDiscount = res.data.memberFavorableAmount
_this.checkAll2 = true _this.checkAll2 = true
this.checkedCities2.push(discount.gunName) this.checkedCities2.push(discount.gunName)
} }
} }
if (res.data.cardFavorableAmount){ if (res.data.cardFavorableAmount) {
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.cardFavorableId = res.data.cardFavorableId
_this.recordId = res.data.recordId _this.recordId = res.data.recordId
_this.couponAmount = res.data.cardFavorableAmount _this.couponAmount = res.data.cardFavorableAmount
_this.checkAll5 = true _this.checkAll5 = true
} }
} }
if (res.data.activeFavorableAmount){ if (res.data.activeFavorableAmount) {
discount.discount = res.data.activeFavorableAmount discount.discount = res.data.activeFavorableAmount
discount.type = res.data.type discount.type = res.data.type
_this.fullReduceDiscount.push(discount) _this.fullReduceDiscount.push(discount)
if(!this.isOilStorageCard) { if (!this.isOilStorageCard) {
_this.fullReduction = res.data.activeFavorableAmount _this.fullReduction = res.data.activeFavorableAmount
_this.checkAll1 = true _this.checkAll1 = true
this.checkedCities1.push(discount.gunName) this.checkedCities1.push(discount.gunName)
} }
} }
// } // }
if(this.isOilStorageCard){ console.log(_this.oilDiscount, 111)
this.countAmountFull() this.countAmountFull()
if (this.isOilStorageCard) {
await this.countAmountFull()
} }
if (type==1){ if (type == 1) {
this.countAmountUnBalance() await this.countAmountUnBalance()
} }
if (type==0){ if (type == 0) {
this.countAmountFull() await this.countAmountFull()
} }
}) })
}) })