From 712310817ac126b1564e3b279ebeeed43851c7c3 Mon Sep 17 00:00:00 2001 From: "DESKTOP-369JRHT\\12997" <9> Date: Mon, 30 Sep 2024 10:30:55 +0800 Subject: [PATCH] 9.30 --- fuintAdmin/.env.development | 2 +- .../src/main/resources/application.properties | 6 +- .../views/cashier/NewComponents/Integral.vue | 41 +++++--- .../views/cashier/NewComponents/credit.vue | 98 ++++++++----------- .../views/cashier/NewComponents/homeindex.vue | 72 +++++--------- .../views/cashier/NewComponents/newHome.vue | 13 ++- 6 files changed, 111 insertions(+), 121 deletions(-) diff --git a/fuintAdmin/.env.development b/fuintAdmin/.env.development index 41a54452d..89b6b1bdb 100644 --- a/fuintAdmin/.env.development +++ b/fuintAdmin/.env.development @@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/dev-api' VUE_APP_PUBLIC_PATH = '/' # 后端接口地址 -VUE_APP_SERVER_URL = 'http://127.0.0.1:8080/' +VUE_APP_SERVER_URL = 'http://192.168.31.178:8080/' # http://192.168.0.121:8080/ diff --git a/fuintBackend/fuint-application/src/main/resources/application.properties b/fuintBackend/fuint-application/src/main/resources/application.properties index 1ce626a3f..cced9dbc1 100644 --- a/fuintBackend/fuint-application/src/main/resources/application.properties +++ b/fuintBackend/fuint-application/src/main/resources/application.properties @@ -1,11 +1,11 @@ # \u57FA\u672C\u914D\u7F6E server.port=8080 env.profile=dev -#env.properties.path=D:/my_project/oil-station/fuintBackend/configure/ -env.properties.path=D:/Code/yuzhan/oil-station/fuintBackend/configure/ +#env.properties.path=D:/workspaces/oil-stations/fuintBackend/configure/ #env.properties.path=F:/work/oilSystem/fuintBackend/configure/ #env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/ -#env.properties.path=D:/work/oilSystem/fuintBackend/configure/ +env.properties.path=D:/code/bulidmap/oil-station/fuintBackend/configure +#env.properties.path=D:/Code/yuzhan/oil-station/fuintBackend/configure #env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/ # \u6570\u636E\u5E93\u914D\u7F6E diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue index bd9c12bac..c660a200e 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue @@ -121,16 +121,16 @@ -
- -
+ - +
+ +
- +
@@ -155,7 +155,7 @@
- +
@@ -1383,6 +1383,7 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print"; overflow: hidden; margin: 0px 10px; height: 98vh; + background: #fff; /*background: white;*/ } .center-top{ @@ -1685,7 +1686,7 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print"; } .wrap-right{ width: 100%; - height: 78vh; + background: white; overflow: auto; } @@ -1695,16 +1696,20 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print"; } .wrap-right-box{ - width: 205px; + width: 20%; height: 270px; /*margin-right: 10px;*/ /*margin-bottom: 10px;*/ - margin: 5px; + + display: flex; + align-items: center; + justify-content: center; + } .box-six{ - width: 100%; - height: 160px; + width: 164px; + height: 150px; img{ width: 100%; height: 100%; @@ -1778,4 +1783,18 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print"; margin: 8px 10px; cursor: pointer; } + .new_card{ + border: 1px solid #eceff1; + box-sizing: border-box; + padding: 10px; + border-radius: 8px; + } +// + .center-left{ + width: 33%; + border-radius: 8px; + overflow: hidden; + height: 98vh; + position: relative; + } diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue index 8fe68ea0e..2027ca9c2 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue @@ -9,7 +9,7 @@ v-model="queryParams2.unitName" placeholder="单位名称" clearable - style="width: 240px;" + style="width: 200px;" @keyup.enter.native="handleQuery" /> @@ -18,7 +18,7 @@ v-model="queryParams2.personCredit" placeholder="挂账人" clearable - style="width: 240px;" + style="width: 200px;" @keyup.enter.native="handleQuery" /> @@ -27,7 +27,7 @@ v-model="queryParams2.contactMobile" placeholder="联系电话" clearable - style="width: 240px;" + style="width: 200px;" @keyup.enter.native="handleQuery" /> @@ -36,7 +36,7 @@ v-model="queryParams2.status" placeholder="状态" clearable - style="width: 240px" + style="width: 200px" > @@ -67,67 +67,43 @@
-
-
{{ total3 }}
-
-
挂账单位总数
-
- -
+
+
+ {{total3 || 0 }} +
+
+
+
挂账单位总数
-
-
-
{{ allCreditLimit || 0 }}
-
-
预设挂账总额
-
- -
+
+
+ {{allCreditLimit || 0 }} +
+
+
+
预设挂账总额
- -
-
{{ allUsedCreditLimit || 0 }}
-
-
已使用挂账总额
-
- -
+
+
+ {{allUsedCreditLimit || 0 }} +
+
+
+
已使用挂账总额
-
-
{{ allResidueCreditLimit || 0 }}
-
-
剩余可挂账总额
-
- -
+
+
+ {{allResidueCreditLimit || 0 }} +
+
+
+
剩余可挂账总额
- - - - - - - - - - - - - - - - - - - - - -
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index 882aae8a7..5cf3d4a60 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -48,6 +48,7 @@
+
油品:￥{{ oilAmount.toFixed(2) }}
商品:￥{{ goodsAmount.toFixed(2) }}
@@ -56,15 +57,10 @@
- - - - 囤油卡
（{{ item.type }}卡 锁价：{{ item.lockupPrice ? item.lockupPrice : 0.00 }}元/L） -
- ￥{{ oilCardAmount }}
@@ -118,8 +114,6 @@
{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}
-￥{{ item.discount }}
- -
@@ -129,7 +123,7 @@ - + 等级优惠
@@ -152,20 +146,6 @@ placement="bottom-start" width="400" trigger="click"> - - - - - - - - - - - - - -
-
储值卡 @@ -4808,6 +4784,27 @@ border: 1px solid #30a1ff; } + .center-left-bottom{ + width: 100%; + background-color: white; + border-radius: 8px; + box-sizing: border-box; + padding: 10px; + display: flex; + align-items: center; + justify-content: space-between; + } + .center-left-lv{ + width: 60%; + height: 80px; + background: linear-gradient( 312deg, #FF945B 0%, #FEB37C 100%); + color: white; + border-radius: 10px; + display: flex; + align-items: center; + justify-content: center; + font-size: 22px; + } .wrap-box2{ background: #30a1ff !important; color: white; @@ -4844,16 +4841,7 @@ box-sizing: border-box; overflow: auto; } - .center-left-bottom{ - width: 100%; - background-color: white; - border-radius: 8px; - box-sizing: border-box; - padding: 10px; - display: flex; - align-items: center; - justify-content: space-between; - } + .bottom-qk{ border: 1px solid #99a9bf; box-sizing: border-box; @@ -4904,17 +4892,7 @@ .price-red{ color: red; } - .center-left-lv{ - width: 60%; - height: 80px; - background: linear-gradient( 312deg, #FF945B 0%, #FEB37C 100%); - color: white; - border-radius: 10px; - display: flex; - align-items: center; - justify-content: center; - font-size: 22px; - } + .th-box{ width: 100%; display: flex; diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue index 041807ce9..e6ce345b3 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue @@ -17,7 +17,7 @@ placement="bottom" - trigger="click"> + trigger="hover">
储值卡：￥1000.00
储值卡：￥1000.00
储值卡：￥1000.00
@@ -214,7 +214,9 @@
操作
+
+
{{ item.name }} @@ -222,7 +224,7 @@
{{ item.stock }}
{{ item.retailPrice }}
{{ item.retailPrice }}
-
+
删除
@@ -647,6 +649,7 @@ export default { num: '0' }, ], + nums:0, payList: [ ], //油枪数据 初始化容器 @@ -808,6 +811,9 @@ export default { }, methods: { + handleCilone(value){ + console.log(value) + }, /** * 获取优惠总金额 * */ @@ -1165,6 +1171,7 @@ export default { restVipUser(){ this.userInfo = false this.chooseVipUser = {} + this.userMobile = '' this.getActivity() this.getCoupon() }, @@ -2121,7 +2128,7 @@ input { } .left_input { - width: 70%; + width: 80%; overflow: hidden; box-sizing: border-box; display: flex;