Web/daimp-front
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🎈 perf(主程序全局变量调整；运营云个人中心优化；permission验证跳转优化；):

Browse Source
This commit is contained in:
郭永超 2025-08-27 11:11:59 +08:00
parent 32556723bb
commit ea0b10da08
13 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main/.env.production
View File

@ -1,16 +1,16 @@
# 正式环境 # 正式环境
VITE_APP_NAME = 'daimp-front-main' VITE_APP_NAME = 'daimp-front-main'
VITE_APP_TITLE = '全域数字农业产业运营管理平台' VITE_APP_TITLE = '全域数字农业产业运营管理平台'
VITE_APP_SUB_OS = '//http://47.109.205.240/sub-operation-service/' VITE_APP_SUB_OS = '//https://app.yingyijt.com/sub-operation-service/'
VITE_APP_SUB_OA = '//http://47.109.205.240/sub-operation-admin/' VITE_APP_SUB_OA = '//https://app.yingyijt.com/sub-operation-admin/'
VITE_APP_SUB_GAS = '//http://47.109.205.240/sub-government-affairs-service/' VITE_APP_SUB_GAS = '//https://app.yingyijt.com/sub-government-affairs-service/'
VITE_APP_SUB_GAA = '//http://47.109.205.240/sub-government-affairs-admin/' VITE_APP_SUB_GAA = '//https://app.yingyijt.com/sub-government-affairs-admin/'
VITE_APP_SUB_GSS = '//http://47.109.205.240/sub-government-screen-service/' VITE_APP_SUB_GSS = '//https://app.yingyijt.com/sub-government-screen-service/'
VITE_APP_SUB_GSR = '//http://47.109.205.240/new-digital-agriculture-screen/' VITE_APP_SUB_GSR = '//https://app.yingyijt.com/new-digital-agriculture-screen/'
# 接口 # 接口
VITE_APP_BASE_API = '/apis' VITE_APP_BASE_API = '/apis'
VITE_APP_BASE_URL = '' VITE_APP_BASE_URL = ''
VITE_APP_UPLOAD_API = '/uploadApis' VITE_APP_UPLOAD_API = '/uploadApis'
VITE_APP_UPLOAD_URL = '' VITE_APP_UPLOAD_URL = ''
VITE_APP_VIST_URL = 'http://47.109.205.240' VITE_APP_VIST_URL = 'https://app.yingyijt.com'

14
main/.env.test
View File

@ -1,15 +1,15 @@
# 测试环境 # 测试环境
VITE_APP_NAME = 'daimp-front-main' VITE_APP_NAME = 'daimp-front-main'
VITE_APP_TITLE = '全域数字农业产业管理平台' VITE_APP_TITLE = '全域数字农业产业管理平台'
VITE_APP_SUB_OS = '//192.168.18.88/sub-operation-service/' VITE_APP_SUB_OS = '//192.168.18.99/sub-operation-service/'
VITE_APP_SUB_OA = '//192.168.18.88/sub-operation-admin/' VITE_APP_SUB_OA = '//192.168.18.99/sub-operation-admin/'
VITE_APP_SUB_GAS = '//192.168.18.88/sub-government-affairs-service/' VITE_APP_SUB_GAS = '//192.168.18.99/sub-government-affairs-service/'
VITE_APP_SUB_GAA = '//192.168.18.88/sub-government-admin/' VITE_APP_SUB_GAA = '//192.168.18.99/sub-government-admin/'
VITE_APP_SUB_GSS = '//192.168.18.88/sub-government-screen-service/' VITE_APP_SUB_GSS = '//192.168.18.99/sub-government-screen-service/'
VITE_APP_SUB_GSR = '//192.168.18.88/new-digital-agriculture-screen/' VITE_APP_SUB_GSR = '//192.168.18.99/new-digital-agriculture-screen/'
# 接口 # 接口
VITE_APP_BASE_API = '/apis' VITE_APP_BASE_API = '/apis'
VITE_APP_BASE_URL = '' VITE_APP_BASE_URL = ''
VITE_APP_UPLOAD_API = '/uploadApis' VITE_APP_UPLOAD_API = '/uploadApis'
VITE_APP_UPLOAD_URL = '' VITE_APP_UPLOAD_URL = ''
VITE_APP_VIST_URL = 'http://192.168.18.88' VITE_APP_VIST_URL = 'http://192.168.18.99'

4
main/src/micro/app.js
View File

@ -13,7 +13,7 @@ export const leftApps = [
{ {
name: 'sub-operation-admin', name: 'sub-operation-admin',
entry: VITE_APP_SUB_OA, entry: VITE_APP_SUB_OA,
activeRule: `${VITE_APP_VIST_URL}:82/login`, activeRule: `/sub-operation-admin`,
title: '管理后台', title: '管理后台',
icon: 'images/platform/icon-admin.png', icon: 'images/platform/icon-admin.png',
}, },
@ -44,7 +44,7 @@ export const rightApps = [
{ {
name: 'sub-government-admin', name: 'sub-government-admin',
entry: VITE_APP_SUB_GAS, entry: VITE_APP_SUB_GAS,
activeRule: `${VITE_APP_VIST_URL}:81/login`, activeRule: `/sub-government-admin`,
title: '管理后台', title: '管理后台',
icon: 'images/platform/icon-admin.png', icon: 'images/platform/icon-admin.png',
}, },

2
main/src/utils/permission.js
View File

@ -48,9 +48,7 @@ router.beforeEach(async (to, from, next) => {
} }
} }
} else { } else {
next(); next();
// if (whiteList.indexOf(to.path) !== -1) { // if (whiteList.indexOf(to.path) !== -1) {
// next(); // next();
// } else { // } else {

5
main/src/views/index.vue
View File

@ -46,9 +46,9 @@ const gotoPage = (row) => {
background-size: cover; background-size: cover;
.platform-title { .platform-title {
height: 156px; height: 156px;
line-height: 50px; line-height: 80px;
width: 98%; width: 98%;
font-size: 100px; font-size: 90px;
text-align: center; text-align: center;
color: #fff; color: #fff;
transform: skewX(-10deg); /* 沿X轴倾斜-15度 */ transform: skewX(-10deg); /* 沿X轴倾斜-15度 */
@ -141,7 +141,6 @@ const gotoPage = (row) => {
height: 100px; height: 100px;
line-height: 80px; line-height: 80px;
padding-top: 80px; padding-top: 80px;
margin-bottom: 0;
} }
.platform-panel-item .icon { .platform-panel-item .icon {
width: 200px; width: 200px;

1
new-digital-agriculture-screen/components.d.ts vendored
View File

@ -12,6 +12,7 @@ declare module 'vue' {
'CenterMap copy': typeof import('./src/components/centerMap copy.vue')['default'] 'CenterMap copy': typeof import('./src/components/centerMap copy.vue')['default']
CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default'] CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default']
Components: typeof import('./src/components/index.js')['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'] CurrentTime: typeof import('./src/components/currentTime.vue')['default']
CustomBack: typeof import('./src/components/customBack.vue')['default'] CustomBack: typeof import('./src/components/customBack.vue')['default']
CustomCarouselPicture: typeof import('./src/components/custom-carousel-picture/index.vue')['default'] CustomCarouselPicture: typeof import('./src/components/custom-carousel-picture/index.vue')['default']

4
sub-government-affairs-service/.env.production
View File

@ -1,8 +1,8 @@
# 生产环境 # 生产环境
VITE_MODE = 'PRO' VITE_MODE = 'PRO'
VITE_APP_MIAN = 'daimp-front-main' VITE_APP_MIAN = 'daimp-front-main'
# VITE_APP_MIAN_URL = 'http://47.109.205.240:88' VITE_APP_MIAN_URL = 'http://47.109.205.240'
VITE_APP_MIAN_URL = 'http://192.168.18.14:8080' # VITE_APP_MIAN_URL = 'http://192.168.18.14:8080'
VITE_APP_NAME = 'sub-government-affairs-service' VITE_APP_NAME = 'sub-government-affairs-service'
# 接口 # 接口
VITE_APP_BASE_API = '/apis' VITE_APP_BASE_API = '/apis'

1
sub-government-affairs-service/src/utils/permission.js
View File

@ -52,7 +52,6 @@ router.beforeEach(async (to, from, next) => {
// next(`/login?redirect=${to.path}`); // next(`/login?redirect=${to.path}`);
window.location.href = `/login?redirect=${encodeURIComponent(to.fullPath)}`; window.location.href = `/login?redirect=${encodeURIComponent(to.fullPath)}`;
} }
} }
}); });

2
sub-operation-service/src/utils/permission.js
View File

@ -49,7 +49,7 @@ router.beforeEach(async (to, from, next) => {
} else { } else {
if (whiteList.indexOf(to.path) !== -1) { if (whiteList.indexOf(to.path) !== -1) {
// next(); // next();
window.location.href = `/login?redirect=${encodeURIComponent(to.fullPath)}`; window.location.href = `/login?redirect=${encodeURIComponent(to.fullPath)}`;
} else { } else {
next(`/login?redirect=${to.path}`); next(`/login?redirect=${to.path}`);
} }

5
sub-operation-service/src/views/shoppingCarts/components/leftMenu.vue
View File

@ -2,7 +2,7 @@
<div class="ecommerce-left-menu-warp"> <div class="ecommerce-left-menu-warp">
<div class="left-menu"> <div class="left-menu">
<div> <div>
<img :src="getAssetsFile('images/logo3.png')?.href" style="width: 90%" /> <img :src="getAssetsFile('images/logo3.png')?.href" style="width: 90%; cursor: pointer" @click="toHome" />
</div> </div>
<view <view
v-for="(n, index) in leftMenu" v-for="(n, index) in leftMenu"
@ -39,6 +39,9 @@ const leftMenu = reactive([
// { name: 'myBrand', title: '我的品牌', icon: 'menu6-1.png', path: '/sub-operation-service/myBrand' }, // { name: 'myBrand', title: '我的品牌', icon: 'menu6-1.png', path: '/sub-operation-service/myBrand' },
// { name: 'addressList', title: '我的地址', icon: 'menu7-1.png', path: '/sub-operation-service/addressList' }, // { name: 'addressList', title: '我的地址', icon: 'menu7-1.png', path: '/sub-operation-service/addressList' },
]); ]);
const toHome = () => {
router.push('/sub-operation-service/smartFarm/main');
};
let currentIndex = ref(0); let currentIndex = ref(0);

4
sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue
View File

@ -60,9 +60,9 @@
<div class="num"> <div class="num">
<div class="right-item"> <div class="right-item">
<el-input-number v-model="g.quantity" :min="1" @change="numberChange(g.quantity, index, indexg)"> <el-input-number v-model="g.quantity" :min="1" @change="numberChange(g.quantity, index, indexg)">
<template #suffix> <!-- <template #suffix>
<span>{{ g.unit }}</span> <span>{{ g.unit }}</span>
</template> </template> -->
</el-input-number> </el-input-number>
</div> </div>
</div> </div>

6
sub-operation-service/src/views/userCenter/components/leftMenu.vue
View File

@ -2,7 +2,7 @@
<div class="ecommerce-left-menu-warp"> <div class="ecommerce-left-menu-warp">
<div class="left-menu"> <div class="left-menu">
<div> <div>
<img :src="getAssetsFile('images/logo3.png')?.href" style="width: 90%" /> <img :src="getAssetsFile('images/logo3.png')?.href" style="width: 90%; cursor: pointer" @click="toHome" />
</div> </div>
<view <view
v-for="(n, index) in leftMenu" v-for="(n, index) in leftMenu"
@ -40,6 +40,10 @@ const leftMenu = reactive([
{ name: 'addressList', title: '我的地址', icon: 'menu7-1.png', path: '/sub-operation-service/addressList' }, { name: 'addressList', title: '我的地址', icon: 'menu7-1.png', path: '/sub-operation-service/addressList' },
]); ]);
const toHome = () => {
router.push('/sub-operation-service/smartFarm/main');
};
let currentIndex = ref(0); let currentIndex = ref(0);
watch( watch(

3
sub-operation-service/src/views/userCenter/userOrders.vue
View File

@ -37,7 +37,7 @@
</div> </div>
<div v-if="o.orderItemInfos && o.orderItemInfos.length > 0" class="order-item-content"> <div v-if="o.orderItemInfos && o.orderItemInfos.length > 0" class="order-item-content">
<div class="content-list"> <div class="content-list">
<div v-for="(g, indexg) in o.orderItemInfos" :key="indexg" class="good-item"> <div v-for="(g, indexg) in o.orderItemInfos" :key="indexg" class="good-item" @click="goInfo(o.id)">
<div class="good-img"> <div class="good-img">
<img class="good-img" :src="g.productImage" alt="" /> <img class="good-img" :src="g.productImage" alt="" />
<!-- <costomImg <!-- <costomImg
@ -388,6 +388,7 @@ const doCancel = (id) => {
padding-left: 16px; padding-left: 16px;
width: 100%; width: 100%;
gap: 16px; gap: 16px;
cursor: pointer;
} }
.good-img, .good-img,
.good-info, .good-info,