From cfe09ba8b06903b7805a6ed3d09deb08916e400d 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: Tue, 9 Apr 2024 09:28:04 +0800
Subject: [PATCH] bug
---
fuintAdmin_zt/src/views/Site/index.vue | 107 ++++++++++++++++++
.../views/cashier/NewComponents/homeindex.vue | 6 +-
2 files changed, 112 insertions(+), 1 deletion(-)
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index f50c8b2e1..6a8cf022f 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -443,6 +443,113 @@
+
+
+
+
+
+
+ 无限制
+ 时间限制
+
+
+
+
+ 无限制
+ 时间限制
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+
+
+
+
+
+ 万元
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 个
+
+
+
+ {{ruleForm.storeNums || 0}}
+
+
+
+
+
+
+
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index 31f46b73f..7029eeed9 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -3151,7 +3151,11 @@
if (this.consumeRefuelMoney>0){
type = 1;
}else {
- type = 0;
+ if (this.consumeAmount>0){
+ type = 0;
+ }else {
+ type = 2;
+ }
}
// 数据清零
this.oilDiscount = 0