From cdc81391c8dc05e3af2ce3030446a70b7442833a Mon Sep 17 00:00:00 2001 From: "DESKTOP-369JRHT\\12997" <9> Date: Sun, 8 Sep 2024 17:38:26 +0800 Subject: [PATCH] 9.8 --- fuintAdmin/.env.development | 2 +- fuintAdmin/public/index.html | 2 +- fuintAdmin/src/assets/styles/btn.scss | 2 +- .../src/assets/styles/element-variables.scss | 2 +- .../src/layout/components/TagsView/index.vue | 4 +-- .../ManageCard/SaveBlock/index.vue | 2 +- .../views/EventMarketing/giftBlock/index.vue | 2 +- .../EventMarketing/newCertificate/index.vue | 26 +++++++------------ .../src/views/EventMarketing/online/index.vue | 2 +- .../openCardGift/TimeLimited.vue | 2 +- .../EventMarketing/openCardGift/separate.vue | 2 +- .../EventMarketing/storeOilBlock/index.vue | 2 +- .../views/financialStatement/buy/tab/em.vue | 2 +- .../financialStatement/buy/tab/goods.vue | 2 +- .../views/financialStatement/buy/tab/gun.vue | 2 +- .../financialStatement/buy/tab/inter.vue | 2 +- .../views/financialStatement/buy/tab/oil.vue | 2 +- .../reconciliation/tab/favourable.vue | 2 +- .../reconciliation/tab/ref.vue | 2 +- .../reconciliation/tab/trading.vue | 2 +- .../runningWater/tab/day.vue | 2 +- .../runningWater/tab/oilDepot.vue | 2 +- .../src/views/handover/info/rec/ref.vue | 2 +- .../src/views/handover/info/rec/trading.vue | 2 +- fuintAdmin/src/views/integral/order/index.vue | 2 +- .../views/integral/order/pointsCashier.vue | 2 +- fuintAdmin/src/views/member/index.vue | 4 +-- .../src/views/oilConfig/oilPrice/index.vue | 2 +- .../src/views/oilConfig/oilPrice/index1.vue | 4 +-- fuintAdmin/src/views/order/order_Added.vue | 2 +- fuintAdmin/src/views/order/order_Cashier.vue | 2 +- fuintAdmin/src/views/order/order_Goods.vue | 2 +- fuintAdmin/src/views/order/order_Oil.vue | 2 +- fuintAdmin/src/views/order/order_Vip.vue | 2 +- fuintAdmin/src/views/power/payment/index.vue | 14 +++++----- fuintAdmin/src/views/power/receiptPrint.vue | 2 +- fuintAdmin/src/views/shopowner.vue | 8 +++--- .../src/views/staff/storeInfo/index.vue | 4 +-- fuintAdmin/src/views/system/dict/index.vue | 2 +- fuintAdmin_zt/public/index.html | 2 +- fuintAdmin_zt/src/assets/styles/btn.scss | 2 +- .../src/assets/styles/element-variables.scss | 2 +- .../src/layout/components/TagsView/index.vue | 4 +-- fuintAdmin_zt/src/views/Service/index.vue | 4 +-- fuintAdmin_zt/src/views/Site/index.vue | 2 +- .../src/views/components/Service/payment.vue | 12 ++++----- .../src/views/components/Service/peizhi.vue | 2 +- .../reconciliation/tab/ref.vue | 2 +- .../reconciliation/tab/trading.vue | 2 +- .../runningWater/tab/day.vue | 2 +- .../runningWater/tab/instituion.vue | 2 +- .../runningWater/tab/oilDepot.vue | 2 +- .../src/views/homeComponents/agent.vue | 6 ++--- .../src/views/homeComponents/manage.vue | 4 +-- .../src/views/homeComponents/shopowner.vue | 4 +-- fuintAdmin_zt/src/views/oilPrice/index.vue | 4 +-- fuintAdmin_zt/src/views/system/dict/index.vue | 2 +- .../controller/ActivePriceRuleController.java | 2 +- fuintCashierWeb/public/index.html | 2 +- fuintCashierWeb/src/assets/styles/btn.scss | 2 +- .../views/cashier/NewComponents/WriteOff.vue | 2 +- .../views/cashier/NewComponents/credit.vue | 2 +- .../views/cashier/NewComponents/homeindex.vue | 2 +- .../integralOrder/pointsCashier.vue | 2 +- .../integralComponents/pointsCashier.vue | 2 +- .../cashier/orderComponents/order_Added.vue | 2 +- .../cashier/orderComponents/order_Cashier.vue | 8 +++--- .../cashier/orderComponents/order_Goods.vue | 6 ++--- .../cashier/orderComponents/order_Oil.vue | 6 ++--- .../cashier/orderComponents/order_Vip.vue | 2 +- .../cashier/vipComponents/balanceList.vue | 2 +- .../views/cashier/vipComponents/vipList.vue | 4 +-- 72 files changed, 114 insertions(+), 120 deletions(-) diff --git a/fuintAdmin/.env.development b/fuintAdmin/.env.development index bbd9ea05c..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:8081/' +VUE_APP_SERVER_URL = 'http://192.168.31.178:8080/' # http://192.168.0.121:8080/ diff --git a/fuintAdmin/public/index.html b/fuintAdmin/public/index.html index 016395fe2..704ecf88e 100644 --- a/fuintAdmin/public/index.html +++ b/fuintAdmin/public/index.html @@ -113,7 +113,7 @@ top: 0; width: 51%; height: 100%; - background: #409EFF; + background: #fe8c4a; z-index: 1000; -webkit-transform: translateX(0); -ms-transform: translateX(0); diff --git a/fuintAdmin/src/assets/styles/btn.scss b/fuintAdmin/src/assets/styles/btn.scss index d854b658f..1c02e68ea 100644 --- a/fuintAdmin/src/assets/styles/btn.scss +++ b/fuintAdmin/src/assets/styles/btn.scss @@ -98,7 +98,7 @@ border-radius: 4px; } .el-button--warning{ - background: linear-gradient( 90deg, #409EFF 0%, #409EFF 100%) !important; + background: linear-gradient( 90deg, #fe8c4a 0%, #fe8c4a 100%) !important; color: white !important; border: 0px !important; } diff --git a/fuintAdmin/src/assets/styles/element-variables.scss b/fuintAdmin/src/assets/styles/element-variables.scss index 0a9b7b7ea..9f3daaa80 100644 --- a/fuintAdmin/src/assets/styles/element-variables.scss +++ b/fuintAdmin/src/assets/styles/element-variables.scss @@ -4,7 +4,7 @@ **/ /* theme color */ -$--color-primary:#409EFF; +$--color-primary:#fe8c4a; $--color-success: #13ce66; $--color-warning: #ffba00; $--color-danger: #ff4949; diff --git a/fuintAdmin/src/layout/components/TagsView/index.vue b/fuintAdmin/src/layout/components/TagsView/index.vue index 7bc08c32e..c8e9a6c6d 100644 --- a/fuintAdmin/src/layout/components/TagsView/index.vue +++ b/fuintAdmin/src/layout/components/TagsView/index.vue @@ -82,8 +82,8 @@ export default { activeStyle(tag) { if (!this.isActive(tag)) return {}; return { - "background-color": '#409EFF', - "border-color": '#409EFF', + "background-color": '#fe8c4a', + "border-color": '#fe8c4a', }; }, isAffix(tag) { diff --git a/fuintAdmin/src/views/EventMarketing/ManageCard/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/ManageCard/SaveBlock/index.vue index 0849fd61e..0d6ab3673 100644 --- a/fuintAdmin/src/views/EventMarketing/ManageCard/SaveBlock/index.vue +++ b/fuintAdmin/src/views/EventMarketing/ManageCard/SaveBlock/index.vue @@ -93,7 +93,7 @@ v-model="scope.row.activeStatus" :active-value="'1'" :inactive-value="'2'" - active-color="#409EFF" + active-color="#fe8c4a" inactive-color="#909399" @change="posteid(scope.row)" > diff --git a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue index 9ccfb524b..329f74873 100644 --- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue +++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue @@ -697,7 +697,7 @@ import { .butoon{ box-sizing: border-box; padding: 6px 10px; - border: 1px solid #409eff; + border: 1px solid #fe8c4a; border-radius: 6px; font-size: 16px; margin-left: 15px; diff --git a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue index 50262ce53..ca88bc56d 100644 --- a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue +++ b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue @@ -169,15 +169,14 @@ 不限 自定义 - + - - +
@@ -256,21 +255,14 @@
- - - 每周 + 每周 - 每月 + 每月 @@ -280,6 +272,7 @@
时间段
- 每周 + 每周 - - 每月 + + 每月 @@ -317,6 +310,7 @@
时间段
未生效 - 使用中 + 使用中 已失效 diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue index 84fd8b082..b20b45b04 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue @@ -179,7 +179,7 @@ > diff --git a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue index 2721121e1..2536ab172 100644 --- a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue +++ b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue @@ -107,7 +107,7 @@ v-model="scope.row.activeStatus" active-value="1" inactive-value="2" - active-color="#409EFF" + active-color="#fe8c4a" inactive-color="#909399" @change="posteid(scope.row)" > diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/em.vue b/fuintAdmin/src/views/financialStatement/buy/tab/em.vue index 4a159cb8c..8f7a53162 100644 --- a/fuintAdmin/src/views/financialStatement/buy/tab/em.vue +++ b/fuintAdmin/src/views/financialStatement/buy/tab/em.vue @@ -371,7 +371,7 @@ import {getgetInfoByEmApi} from "@/api/order/oilorder"; height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .size-hui{ display: flex; diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/goods.vue b/fuintAdmin/src/views/financialStatement/buy/tab/goods.vue index b1fd18e21..b7d88091d 100644 --- a/fuintAdmin/src/views/financialStatement/buy/tab/goods.vue +++ b/fuintAdmin/src/views/financialStatement/buy/tab/goods.vue @@ -403,7 +403,7 @@ export default { height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .el-form--inline .el-form-item { margin-right: 44px; diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue b/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue index fd9e8ebed..0c575b2f2 100644 --- a/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue +++ b/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue @@ -352,7 +352,7 @@ import {getInfoByOilGunApi} from "@/api/order/oilorder"; height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .el-form--inline .el-form-item { margin-right: 44px; diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/inter.vue b/fuintAdmin/src/views/financialStatement/buy/tab/inter.vue index 2ef1fb950..f8c4c45cc 100644 --- a/fuintAdmin/src/views/financialStatement/buy/tab/inter.vue +++ b/fuintAdmin/src/views/financialStatement/buy/tab/inter.vue @@ -370,7 +370,7 @@ export default { height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .el-form--inline .el-form-item { margin-right: 44px; diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue b/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue index 84180f89a..3228cf615 100644 --- a/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue +++ b/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue @@ -389,7 +389,7 @@ import {getInfoByOilTypeApi} from "@/api/order/oilorder"; height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .el-form--inline .el-form-item { margin-right: 44px; diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue index 84cee69ca..2586d16f0 100644 --- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue +++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue @@ -195,7 +195,7 @@ export default { height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .el-form--inline .el-form-item { margin-right: 44px; diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue index 5fdbf2e6d..3ffd9863a 100644 --- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue +++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue @@ -416,7 +416,7 @@ import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTrading height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .size-hui{ diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue index 886090475..b2d64f09a 100644 --- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue +++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue @@ -502,7 +502,7 @@ import { height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .size-hui{ diff --git a/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue b/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue index cd85db8d4..10475e7b7 100644 --- a/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue +++ b/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue @@ -318,7 +318,7 @@ import { height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .el-form--inline .el-form-item { margin-right: 44px; diff --git a/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue b/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue index b49f14486..134cced4b 100644 --- a/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue +++ b/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue @@ -346,7 +346,7 @@ import { height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .el-form--inline .el-form-item { margin-right: 44px; diff --git a/fuintAdmin/src/views/handover/info/rec/ref.vue b/fuintAdmin/src/views/handover/info/rec/ref.vue index f6dda3db4..d72b92ca6 100644 --- a/fuintAdmin/src/views/handover/info/rec/ref.vue +++ b/fuintAdmin/src/views/handover/info/rec/ref.vue @@ -428,7 +428,7 @@ import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTrading height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .size-hui{ diff --git a/fuintAdmin/src/views/handover/info/rec/trading.vue b/fuintAdmin/src/views/handover/info/rec/trading.vue index f3d0959ab..29a520f13 100644 --- a/fuintAdmin/src/views/handover/info/rec/trading.vue +++ b/fuintAdmin/src/views/handover/info/rec/trading.vue @@ -530,7 +530,7 @@ import { height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .size-hui{ diff --git a/fuintAdmin/src/views/integral/order/index.vue b/fuintAdmin/src/views/integral/order/index.vue index f5c207513..687238b57 100644 --- a/fuintAdmin/src/views/integral/order/index.vue +++ b/fuintAdmin/src/views/integral/order/index.vue @@ -250,7 +250,7 @@ export default { height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .el-form--inline .el-form-item { margin-right: 44px; diff --git a/fuintAdmin/src/views/integral/order/pointsCashier.vue b/fuintAdmin/src/views/integral/order/pointsCashier.vue index c8c6b61ed..56bb96e59 100644 --- a/fuintAdmin/src/views/integral/order/pointsCashier.vue +++ b/fuintAdmin/src/views/integral/order/pointsCashier.vue @@ -306,7 +306,7 @@ export default { height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .el-form--inline .el-form-item { margin-right: 44px; diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue index adfca0a9a..1dd450188 100644 --- a/fuintAdmin/src/views/member/index.vue +++ b/fuintAdmin/src/views/member/index.vue @@ -195,7 +195,7 @@ @@ -1318,7 +1318,7 @@ export default { .k-three { width: 19%; border-radius: 10px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; background: rgba(64, 158, 255, 0.1); box-sizing: border-box; padding: 20px; diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/index.vue b/fuintAdmin/src/views/oilConfig/oilPrice/index.vue index 3b3875ea9..265d57350 100644 --- a/fuintAdmin/src/views/oilConfig/oilPrice/index.vue +++ b/fuintAdmin/src/views/oilConfig/oilPrice/index.vue @@ -94,7 +94,7 @@ left: 0px; background-color: #e1ecfc; padding: 3px 7px; - color: #409eff; + color: #fe8c4a; font-size: 13px; border-bottom-right-radius: 6px; } diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/index1.vue b/fuintAdmin/src/views/oilConfig/oilPrice/index1.vue index 22aa25ff1..2dfaebbdf 100644 --- a/fuintAdmin/src/views/oilConfig/oilPrice/index1.vue +++ b/fuintAdmin/src/views/oilConfig/oilPrice/index1.vue @@ -16,7 +16,7 @@
{{item.state}}
-
+
{{item.allOil}}
油站价:
@@ -908,7 +908,7 @@ import { left: 0px; background-color: #e1ecfc; padding: 3px 7px; - color: #409eff; + color: #fe8c4a; font-size: 13px; border-bottom-right-radius: 6px; } diff --git a/fuintAdmin/src/views/order/order_Added.vue b/fuintAdmin/src/views/order/order_Added.vue index 230ce0f15..922bd32e0 100644 --- a/fuintAdmin/src/views/order/order_Added.vue +++ b/fuintAdmin/src/views/order/order_Added.vue @@ -470,7 +470,7 @@ export default { height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .el-form--inline .el-form-item { margin-right: 44px; diff --git a/fuintAdmin/src/views/order/order_Cashier.vue b/fuintAdmin/src/views/order/order_Cashier.vue index 09f05f948..e2d86d266 100644 --- a/fuintAdmin/src/views/order/order_Cashier.vue +++ b/fuintAdmin/src/views/order/order_Cashier.vue @@ -707,7 +707,7 @@ import {refundApi} from "@/api/order/refund"; height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .el-form--inline .el-form-item { margin-right: 44px; diff --git a/fuintAdmin/src/views/order/order_Goods.vue b/fuintAdmin/src/views/order/order_Goods.vue index 2111813f5..29738f086 100644 --- a/fuintAdmin/src/views/order/order_Goods.vue +++ b/fuintAdmin/src/views/order/order_Goods.vue @@ -533,7 +533,7 @@ export default { height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .el-form--inline .el-form-item { diff --git a/fuintAdmin/src/views/order/order_Oil.vue b/fuintAdmin/src/views/order/order_Oil.vue index 7c09485ae..fce6b8fa4 100644 --- a/fuintAdmin/src/views/order/order_Oil.vue +++ b/fuintAdmin/src/views/order/order_Oil.vue @@ -699,7 +699,7 @@ height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .el-form--inline .el-form-item { margin-right: 44px; diff --git a/fuintAdmin/src/views/order/order_Vip.vue b/fuintAdmin/src/views/order/order_Vip.vue index 185a93e9b..584537783 100644 --- a/fuintAdmin/src/views/order/order_Vip.vue +++ b/fuintAdmin/src/views/order/order_Vip.vue @@ -448,7 +448,7 @@ export default { height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .el-form--inline .el-form-item { margin-right: 44px; diff --git a/fuintAdmin/src/views/power/payment/index.vue b/fuintAdmin/src/views/power/payment/index.vue index c66a9172b..9ef8483ed 100644 --- a/fuintAdmin/src/views/power/payment/index.vue +++ b/fuintAdmin/src/views/power/payment/index.vue @@ -283,7 +283,7 @@ width="100" label="操作"> @@ -336,7 +336,7 @@ align="center" width="120"> - + @@ -397,10 +397,10 @@ label="操作"> @@ -1364,7 +1364,7 @@ export default { box-sizing: border-box; padding: 5px 20px; background: #F2F6FC; - color: #409EFF; + color: #fe8c4a; font-weight: bold; margin: 0px 5px; border-radius: 4px; diff --git a/fuintAdmin/src/views/power/receiptPrint.vue b/fuintAdmin/src/views/power/receiptPrint.vue index ba29644a4..b10fb01b3 100644 --- a/fuintAdmin/src/views/power/receiptPrint.vue +++ b/fuintAdmin/src/views/power/receiptPrint.vue @@ -308,7 +308,7 @@ avatar-uploader .el-upload { overflow: hidden; } .avatar-uploader .el-upload:hover { - border-color: #409EFF; + border-color: #fe8c4a; } .avatar-uploader-icon { font-size: 28px; diff --git a/fuintAdmin/src/views/shopowner.vue b/fuintAdmin/src/views/shopowner.vue index 978640ae6..80248be6a 100644 --- a/fuintAdmin/src/views/shopowner.vue +++ b/fuintAdmin/src/views/shopowner.vue @@ -395,7 +395,7 @@ export default { const option1 = { color: [ '#3B6ADE', - '#409eff', + '#fe8c4a', ], tooltip: { trigger: 'item' @@ -570,7 +570,7 @@ export default { }, { name: '会员消费金额', - color: '#409EFF', + color: '#fe8c4a', type: 'bar', tooltip: { valueFormatter: function (value) { @@ -725,7 +725,7 @@ export default { }, { name: '会员消费金额', - color: '#409EFF', + color: '#fe8c4a', type: 'bar', tooltip: { valueFormatter: function (value) { @@ -860,7 +860,7 @@ export default { height: 120px; box-sizing: border-box; border-radius: 8px; - background: #409eff; + background: #fe8c4a; margin: 15px 0px; margin-right: 15px; box-sizing: border-box; diff --git a/fuintAdmin/src/views/staff/storeInfo/index.vue b/fuintAdmin/src/views/staff/storeInfo/index.vue index 2547d4960..f2894c15c 100644 --- a/fuintAdmin/src/views/staff/storeInfo/index.vue +++ b/fuintAdmin/src/views/staff/storeInfo/index.vue @@ -65,10 +65,10 @@ @click="handleDownloadqrCode('collection')"> 下载图片 - 切换样式 + 切换样式
- 切换样式 + 切换样式
diff --git a/fuintAdmin/src/views/system/dict/index.vue b/fuintAdmin/src/views/system/dict/index.vue index 22491d0c4..c5d11b776 100644 --- a/fuintAdmin/src/views/system/dict/index.vue +++ b/fuintAdmin/src/views/system/dict/index.vue @@ -86,7 +86,7 @@ - {{ scope.row.dictType }} + {{ scope.row.dictType }} diff --git a/fuintAdmin_zt/public/index.html b/fuintAdmin_zt/public/index.html index 6a93d4e3c..cea9bf65a 100644 --- a/fuintAdmin_zt/public/index.html +++ b/fuintAdmin_zt/public/index.html @@ -113,7 +113,7 @@ top: 0; width: 51%; height: 100%; - background: #409EFF; + background: #fe8c4a; z-index: 1000; -webkit-transform: translateX(0); -ms-transform: translateX(0); diff --git a/fuintAdmin_zt/src/assets/styles/btn.scss b/fuintAdmin_zt/src/assets/styles/btn.scss index dc76d7f1a..95afc85a6 100644 --- a/fuintAdmin_zt/src/assets/styles/btn.scss +++ b/fuintAdmin_zt/src/assets/styles/btn.scss @@ -100,7 +100,7 @@ .el-button--warning{ color: white !important; - background: linear-gradient( 90deg, #409EFF 0%, #409EFF 100%) !important; + background: linear-gradient( 90deg, #fe8c4a 0%, #fe8c4a 100%) !important; color: white !important; border: 0px !important; } diff --git a/fuintAdmin_zt/src/assets/styles/element-variables.scss b/fuintAdmin_zt/src/assets/styles/element-variables.scss index 79510b849..fe3ae88dd 100644 --- a/fuintAdmin_zt/src/assets/styles/element-variables.scss +++ b/fuintAdmin_zt/src/assets/styles/element-variables.scss @@ -4,7 +4,7 @@ **/ /* theme color */ -$--color-primary: #409EFF; +$--color-primary: #fe8c4a; $--color-success: #13ce66; $--color-warning: #ffba00; $--color-danger: #ff4949; diff --git a/fuintAdmin_zt/src/layout/components/TagsView/index.vue b/fuintAdmin_zt/src/layout/components/TagsView/index.vue index e1614c1d3..f6adfe9e3 100644 --- a/fuintAdmin_zt/src/layout/components/TagsView/index.vue +++ b/fuintAdmin_zt/src/layout/components/TagsView/index.vue @@ -78,8 +78,8 @@ export default { activeStyle(tag) { if (!this.isActive(tag)) return {}; return { - "background-color": '#409EFF', - "border-color": '#409EFF', + "background-color": '#fe8c4a', + "border-color": '#fe8c4a', }; }, isAffix(tag) { diff --git a/fuintAdmin_zt/src/views/Service/index.vue b/fuintAdmin_zt/src/views/Service/index.vue index b66175e00..8ae9464b4 100644 --- a/fuintAdmin_zt/src/views/Service/index.vue +++ b/fuintAdmin_zt/src/views/Service/index.vue @@ -151,8 +151,8 @@ label="操作"> diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/controller/ActivePriceRuleController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/controller/ActivePriceRuleController.java index b5624feba..5b943d6ab 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/controller/ActivePriceRuleController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/controller/ActivePriceRuleController.java @@ -25,7 +25,7 @@ public class ActivePriceRuleController extends BaseController { /** - * 分页查询活动规则（分时优惠/限时特价通用接口） + * 分页查询活动规则（分时优惠/-/） * * @param pageNo 分页参数 * @param pageSize 分页参数 diff --git a/fuintCashierWeb/public/index.html b/fuintCashierWeb/public/index.html index 9bf5a5172..cea9bf65a 100644 --- a/fuintCashierWeb/public/index.html +++ b/fuintCashierWeb/public/index.html @@ -113,7 +113,7 @@ top: 0; width: 51%; height: 100%; - background: #409eff; + background: #fe8c4a; z-index: 1000; -webkit-transform: translateX(0); -ms-transform: translateX(0); diff --git a/fuintCashierWeb/src/assets/styles/btn.scss b/fuintCashierWeb/src/assets/styles/btn.scss index a46937d33..a4ee64f15 100644 --- a/fuintCashierWeb/src/assets/styles/btn.scss +++ b/fuintCashierWeb/src/assets/styles/btn.scss @@ -99,7 +99,7 @@ } .el-button--warning{ color: white !important; - background: linear-gradient( 90deg, #409EFF 0%, #409EFF 100%) !important; + background: linear-gradient( 90deg, #fe8c4a 0%, #fe8c4a 100%) !important; border: 0px !important; } .el-button--primary{ diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/WriteOff.vue b/fuintCashierWeb/src/views/cashier/NewComponents/WriteOff.vue index c5ef4be91..50eeaf2b3 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/WriteOff.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/WriteOff.vue @@ -169,7 +169,7 @@ export default { align-items: center; justify-content: center; background: #ecf5ff; - color: #409EFF; + color: #fe8c4a; width: 100px; border-radius: 6px; margin: 5px auto; diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue index 8b27b270b..520db7c4a 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue @@ -1799,7 +1799,7 @@ import {getLodop} from "@/api/LodopFuncs"; height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .el-form--inline .el-form-item { margin-right: 44px; diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index a9a0b5fb6..92c5f8d70 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -1499,7 +1499,7 @@ leftindex:0, oilList:[], colorList:[ - {color:'#e5f0ff',border:"#409EFF"}, + {color:'#e5f0ff',border:"#fe8c4a"}, {color:'#fff2e5',border:"#FF9655"}, {color:'#ecfae5',border:"#0DC291"}, {color:'#fff8e7',border:"#FFB519"} diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue b/fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue index 2da1f40c9..a0bc3888d 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue @@ -312,7 +312,7 @@ export default { height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .el-form--inline .el-form-item { margin-right: 44px; diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/pointsCashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/pointsCashier.vue index 856b340ce..5726ea8b6 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/pointsCashier.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/pointsCashier.vue @@ -293,7 +293,7 @@ export default { height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .el-form--inline .el-form-item { margin-right: 44px; diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue index 94c84838c..145ad144f 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue @@ -551,7 +551,7 @@ import {exportExcelCashierApi, exportExcelHangBillApi} from "@/api/order/exportE height: 60px; background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; - border: 1px solid #409EFF; + border: 1px solid #fe8c4a; } .el-form--inline .el-form-item { margin-right: 44px; diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue index 463716777..e3be50f3e 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue @@ -266,15 +266,15 @@