From ea0b10da081f9708b0dab50ecb2641927de34c5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E6=B0=B8=E8=B6=85?= <2090205686@qq.com> Date: Wed, 27 Aug 2025 11:11:59 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf(=E4=B8=BB=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E5=8F=98=E9=87=8F=E8=B0=83=E6=95=B4=EF=BC=9B?= =?UTF-8?q?=E8=BF=90=E8=90=A5=E4=BA=91=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9Bpermission=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BC=98=E5=8C=96=EF=BC=9B):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/.env.production | 14 +++++++------- main/.env.test | 14 +++++++------- main/src/micro/app.js | 4 ++-- main/src/utils/permission.js | 2 -- main/src/views/index.vue | 5 ++--- new-digital-agriculture-screen/components.d.ts | 1 + sub-government-affairs-service/.env.production | 4 ++-- .../src/utils/permission.js | 1 - sub-operation-service/src/utils/permission.js | 2 +- .../views/shoppingCarts/components/leftMenu.vue | 5 ++++- .../src/views/shoppingCarts/shoppingCarts.vue | 4 ++-- .../src/views/userCenter/components/leftMenu.vue | 6 +++++- .../src/views/userCenter/userOrders.vue | 3 ++- 13 files changed, 35 insertions(+), 30 deletions(-) diff --git a/main/.env.production b/main/.env.production index fe55036..c1d39b7 100644 --- a/main/.env.production +++ b/main/.env.production @@ -1,16 +1,16 @@ # 正式环境 VITE_APP_NAME = 'daimp-front-main' VITE_APP_TITLE = '全域数字农业产业运营管理平台' -VITE_APP_SUB_OS = '//http://47.109.205.240/sub-operation-service/' -VITE_APP_SUB_OA = '//http://47.109.205.240/sub-operation-admin/' -VITE_APP_SUB_GAS = '//http://47.109.205.240/sub-government-affairs-service/' -VITE_APP_SUB_GAA = '//http://47.109.205.240/sub-government-affairs-admin/' -VITE_APP_SUB_GSS = '//http://47.109.205.240/sub-government-screen-service/' -VITE_APP_SUB_GSR = '//http://47.109.205.240/new-digital-agriculture-screen/' +VITE_APP_SUB_OS = '//https://app.yingyijt.com/sub-operation-service/' +VITE_APP_SUB_OA = '//https://app.yingyijt.com/sub-operation-admin/' +VITE_APP_SUB_GAS = '//https://app.yingyijt.com/sub-government-affairs-service/' +VITE_APP_SUB_GAA = '//https://app.yingyijt.com/sub-government-affairs-admin/' +VITE_APP_SUB_GSS = '//https://app.yingyijt.com/sub-government-screen-service/' +VITE_APP_SUB_GSR = '//https://app.yingyijt.com/new-digital-agriculture-screen/' # 接口 VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = '' VITE_APP_UPLOAD_API = '/uploadApis' VITE_APP_UPLOAD_URL = '' -VITE_APP_VIST_URL = 'http://47.109.205.240' +VITE_APP_VIST_URL = 'https://app.yingyijt.com' diff --git a/main/.env.test b/main/.env.test index 8b4631e..29cccd6 100644 --- a/main/.env.test +++ b/main/.env.test @@ -1,15 +1,15 @@ # 测试环境 VITE_APP_NAME = 'daimp-front-main' VITE_APP_TITLE = '全域数字农业产业管理平台' -VITE_APP_SUB_OS = '//192.168.18.88/sub-operation-service/' -VITE_APP_SUB_OA = '//192.168.18.88/sub-operation-admin/' -VITE_APP_SUB_GAS = '//192.168.18.88/sub-government-affairs-service/' -VITE_APP_SUB_GAA = '//192.168.18.88/sub-government-admin/' -VITE_APP_SUB_GSS = '//192.168.18.88/sub-government-screen-service/' -VITE_APP_SUB_GSR = '//192.168.18.88/new-digital-agriculture-screen/' +VITE_APP_SUB_OS = '//192.168.18.99/sub-operation-service/' +VITE_APP_SUB_OA = '//192.168.18.99/sub-operation-admin/' +VITE_APP_SUB_GAS = '//192.168.18.99/sub-government-affairs-service/' +VITE_APP_SUB_GAA = '//192.168.18.99/sub-government-admin/' +VITE_APP_SUB_GSS = '//192.168.18.99/sub-government-screen-service/' +VITE_APP_SUB_GSR = '//192.168.18.99/new-digital-agriculture-screen/' # 接口 VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = '' VITE_APP_UPLOAD_API = '/uploadApis' VITE_APP_UPLOAD_URL = '' -VITE_APP_VIST_URL = 'http://192.168.18.88' \ No newline at end of file +VITE_APP_VIST_URL = 'http://192.168.18.99' \ No newline at end of file diff --git a/main/src/micro/app.js b/main/src/micro/app.js index 60c9d7d..3ec68c9 100644 --- a/main/src/micro/app.js +++ b/main/src/micro/app.js @@ -13,7 +13,7 @@ export const leftApps = [ { name: 'sub-operation-admin', entry: VITE_APP_SUB_OA, - activeRule: `${VITE_APP_VIST_URL}:82/login`, + activeRule: `/sub-operation-admin`, title: '管理后台', icon: 'images/platform/icon-admin.png', }, @@ -44,7 +44,7 @@ export const rightApps = [ { name: 'sub-government-admin', entry: VITE_APP_SUB_GAS, - activeRule: `${VITE_APP_VIST_URL}:81/login`, + activeRule: `/sub-government-admin`, title: '管理后台', icon: 'images/platform/icon-admin.png', }, diff --git a/main/src/utils/permission.js b/main/src/utils/permission.js index 1d1b323..b9980f0 100644 --- a/main/src/utils/permission.js +++ b/main/src/utils/permission.js @@ -48,9 +48,7 @@ router.beforeEach(async (to, from, next) => { } } } else { - next(); - // if (whiteList.indexOf(to.path) !== -1) { // next(); // } else { diff --git a/main/src/views/index.vue b/main/src/views/index.vue index 6f28f02..28323b0 100644 --- a/main/src/views/index.vue +++ b/main/src/views/index.vue @@ -46,9 +46,9 @@ const gotoPage = (row) => { background-size: cover; .platform-title { height: 156px; - line-height: 50px; + line-height: 80px; width: 98%; - font-size: 100px; + font-size: 90px; text-align: center; color: #fff; transform: skewX(-10deg); /* 沿X轴倾斜-15度 */ @@ -141,7 +141,6 @@ const gotoPage = (row) => { height: 100px; line-height: 80px; padding-top: 80px; - margin-bottom: 0; } .platform-panel-item .icon { width: 200px; diff --git a/new-digital-agriculture-screen/components.d.ts b/new-digital-agriculture-screen/components.d.ts index 694dcaa..ca0fa36 100644 --- a/new-digital-agriculture-screen/components.d.ts +++ b/new-digital-agriculture-screen/components.d.ts @@ -12,6 +12,7 @@ declare module 'vue' { 'CenterMap copy': typeof import('./src/components/centerMap copy.vue')['default'] CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default'] Components: typeof import('./src/components/index.js')['default'] + copy: typeof import('./src/components/centerMap copy.vue')['default'] CurrentTime: typeof import('./src/components/currentTime.vue')['default'] CustomBack: typeof import('./src/components/customBack.vue')['default'] CustomCarouselPicture: typeof import('./src/components/custom-carousel-picture/index.vue')['default'] diff --git a/sub-government-affairs-service/.env.production b/sub-government-affairs-service/.env.production index 2a069ac..ba881bf 100644 --- a/sub-government-affairs-service/.env.production +++ b/sub-government-affairs-service/.env.production @@ -1,8 +1,8 @@ # 生产环境 VITE_MODE = 'PRO' VITE_APP_MIAN = 'daimp-front-main' -# VITE_APP_MIAN_URL = 'http://47.109.205.240:88' -VITE_APP_MIAN_URL = 'http://192.168.18.14:8080' +VITE_APP_MIAN_URL = 'http://47.109.205.240' +# VITE_APP_MIAN_URL = 'http://192.168.18.14:8080' VITE_APP_NAME = 'sub-government-affairs-service' # 接口 VITE_APP_BASE_API = '/apis' diff --git a/sub-government-affairs-service/src/utils/permission.js b/sub-government-affairs-service/src/utils/permission.js index 7a41171..ebca2b4 100644 --- a/sub-government-affairs-service/src/utils/permission.js +++ b/sub-government-affairs-service/src/utils/permission.js @@ -52,7 +52,6 @@ router.beforeEach(async (to, from, next) => { // next(`/login?redirect=${to.path}`); window.location.href = `/login?redirect=${encodeURIComponent(to.fullPath)}`; } - } }); diff --git a/sub-operation-service/src/utils/permission.js b/sub-operation-service/src/utils/permission.js index ea14692..2ce4284 100644 --- a/sub-operation-service/src/utils/permission.js +++ b/sub-operation-service/src/utils/permission.js @@ -49,7 +49,7 @@ router.beforeEach(async (to, from, next) => { } else { if (whiteList.indexOf(to.path) !== -1) { // next(); - window.location.href = `/login?redirect=${encodeURIComponent(to.fullPath)}`; + window.location.href = `/login?redirect=${encodeURIComponent(to.fullPath)}`; } else { next(`/login?redirect=${to.path}`); } diff --git a/sub-operation-service/src/views/shoppingCarts/components/leftMenu.vue b/sub-operation-service/src/views/shoppingCarts/components/leftMenu.vue index cab4b07..a3e0266 100644 --- a/sub-operation-service/src/views/shoppingCarts/components/leftMenu.vue +++ b/sub-operation-service/src/views/shoppingCarts/components/leftMenu.vue @@ -2,7 +2,7 @@
- +
{ + router.push('/sub-operation-service/smartFarm/main'); +}; let currentIndex = ref(0); diff --git a/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue b/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue index 6e54887..98df462 100644 --- a/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue +++ b/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue @@ -60,9 +60,9 @@
-