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

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

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

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

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