From 29e9b31c71f313b1a3bb9bdc125d055e75b557cb 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: Mon, 29 Apr 2024 16:12:49 +0800
Subject: [PATCH] bug

---
 fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue | 2 ++
 .../src/views/cashier/orderComponents/order_Cashier.vue       | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index e3d46bd71..06bb95774 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -3934,6 +3934,8 @@
         this.map.recordId = this.recordId
         this.map.userId = this.member.id
         this.map.payUser = this.member.mobile
+        this.map.levelAmount = this.oilDiscount
+        this.map.activeAmount = this.fullReduction
 
         let _this = this;
         if (this.payType=="APPLET_CODE"){
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
index 37fde0817..e2e5f9fb8 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
@@ -215,10 +215,10 @@
             <span v-if="oilInfo.length>0">{{ oilInfo[0].couponAmount || 0 }}</span>
           </el-descriptions-item>
           <el-descriptions-item label="油品满减/折扣活动优惠">
-            <span v-if="oilInfo.length>0">{{ oilInfo[0].deductionAmount || 0 }}</span>
+            <span v-if="oilInfo.length>0">{{ oilInfo[0].activeAmount || 0 }}</span>
           </el-descriptions-item>
           <el-descriptions-item label="油品会员等级优惠">
-            <span v-if="oilInfo.length>0">{{ cashierOrder.oilDiscountAmount - oilInfo[0].deductionAmount - oilInfo[0].couponAmount || 0 }}</span>
+            <span v-if="oilInfo.length>0">{{ oilInfo[0].levelAmount || 0}}</span>
           </el-descriptions-item>
           <el-descriptions-item label="油品优惠总额">{{ cashierOrder.oilDiscountAmount }}</el-descriptions-item>
           <el-descriptions-item label="商品优惠总额">{{ cashierOrder.goodsDiscountAmount }}</el-descriptions-item>