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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
齐天大圣 2024-06-05 14:47:12 +08:00
commit 15f571f44f
2 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3196,7 +3196,7 @@
_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 }
@ -3235,14 +3235,16 @@
} }
} }
// } // }
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()
} }
}) })
}) })
@ -3377,7 +3379,7 @@
}else { }else {
this.oilActualPay = this.oilAmount.toFixed(2) this.oilActualPay = this.oilAmount.toFixed(2)
} }
console.log("不使用囤油卡",this.oilAmount, this.oilDiscount,this.couponAmount,this.fullReduction,this.oilCardAmount) console.log("不使用囤油卡", this.consumeAmount ,this.oilAmount, this.oilDiscount,this.couponAmount,this.fullReduction,this.oilCardAmount)
}, },
// 不使用储值卡 // 不使用储值卡
countAmountUnBalance(){ countAmountUnBalance(){
@ -3893,7 +3895,7 @@
} }
}) })
// oilCardAmount // oilCardAmount
if (flag) amount = item.oilPrice * item.liters if (flag) amount = item.amount
oilAmount += amount oilAmount += amount
}) })
if (oilAmount>0) this.oilCardAmount = this.oilAmount - oilAmount if (oilAmount>0) this.oilCardAmount = this.oilAmount - oilAmount

2
pos-uni/pagesHome/Collection/Collection.vue
View File

@ -553,7 +553,7 @@
getspearIndex(num, data) { getspearIndex(num, data) {
this.spearIndex = num this.spearIndex = num
this.oilGunNum = data.id this.oilGunNum = data.id
this.oils = data.oilName this.oilName = data.oilName
this.tankId = data.tankId this.tankId = data.tankId
this.oilPrice = data.oilPrice this.oilPrice = data.oilPrice
this.getPaymentPreferential() this.getPaymentPreferential()