From ee406cd0d483104613ef535f242bc79cf9528469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Wed, 5 Jun 2024 13:37:21 +0800
Subject: [PATCH] bug

---
 fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue | 4 ++--
 pos-uni/pagesHome/Collection/Collection.vue                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index 6f6fa281a..069735c3f 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -3379,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(){
@@ -3895,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
diff --git a/pos-uni/pagesHome/Collection/Collection.vue b/pos-uni/pagesHome/Collection/Collection.vue
index 48fbf01b7..2c435de1d 100644
--- a/pos-uni/pagesHome/Collection/Collection.vue
+++ b/pos-uni/pagesHome/Collection/Collection.vue
@@ -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()