From 0f971b096e53be6d911cd9c887f758d47866b1e0 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 3 Jul 2024 15:01:14 +0800 Subject: [PATCH] bug --- fuintAdmin/.env.production | 2 +- .../src/layout/components/Sidebar/index.vue | 2 +- fuintAdmin/src/views/integral/gift/index.vue | 2 +- .../src/views/oilConfig/oilPrice/index.vue | 4 ++-- .../src/views/oilConfig/oilSuppliers/list.vue | 2 +- fuintAdmin/src/views/setting/print/index.vue | 2 +- fuintAdmin_zt/.env.production | 4 ++-- .../src/layout/components/Sidebar/index.vue | 1 - .../mapper/xml/StockStatisticMapper.xml | 1 + .../integral/mapper/xml/IntegralGiftMapper.xml | 1 + .../business/member/utils/QrCodeUtils.java | 4 +++- .../order/mapper/xml/CreditUnitMapper.xml | 1 + .../order/service/impl/OilOrderServiceImpl.java | 5 +++-- .../mapper/xml/OilPresetPricesMapper.xml | 1 + .../service/impl/QRCodeServiceImpl.java | 2 +- .../src/main/resources/application.properties | 6 +++--- .../resources/static/qrCodeImg/mendian_bg1.png | Bin 0 -> 68997 bytes .../resources/static/qrCodeImg/mendian_bg2.png | Bin 0 -> 79679 bytes fuintCashierWeb/.env.production | 2 +- .../views/cashier/NewComponents/homeindex.vue | 2 +- pos-uni/config.js | 3 ++- 21 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 fuintBackend/fuint-application/src/main/resources/static/qrCodeImg/mendian_bg1.png create mode 100644 fuintBackend/fuint-application/src/main/resources/static/qrCodeImg/mendian_bg2.png diff --git a/fuintAdmin/.env.production b/fuintAdmin/.env.production index 9dce606a9..37ba2ed4a 100644 --- a/fuintAdmin/.env.production +++ b/fuintAdmin/.env.production @@ -11,4 +11,4 @@ VUE_APP_BASE_API = '/fuint-application/' VUE_APP_PUBLIC_PATH = '/fuintAdmin/' # 后端接口地址 -VUE_APP_SERVER_URL = 'https://www.tuofeng.cc/oilAdmin/' +VUE_APP_SERVER_URL = 'https://www.youkerr.com/oilAdmin/' diff --git a/fuintAdmin/src/layout/components/Sidebar/index.vue b/fuintAdmin/src/layout/components/Sidebar/index.vue index 248f917a0..9f96fd8cb 100644 --- a/fuintAdmin/src/layout/components/Sidebar/index.vue +++ b/fuintAdmin/src/layout/components/Sidebar/index.vue @@ -17,7 +17,7 @@ style="margin-bottom: 80px;" > - +