diff --git a/.gitignore b/.gitignore index afc13f6..1635e12 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,8 @@ dist dist-ssr .history *.local +*.zip +*.rar # Editor directories and files .vscode/* diff --git a/main/.env.development b/main/.env.development index 4054b6b..d95c820 100644 --- a/main/.env.development +++ b/main/.env.development @@ -18,3 +18,4 @@ VITE_APP_UPLOAD_API = '/uploadApis' # 内网接口地址 VITE_APP_BASE_URL = 'http://192.168.18.9:8080' VITE_APP_UPLOAD_URL = 'http://192.168.18.9:9300' +VITE_APP_VIST_URL = 'http://192.168.18.99' \ No newline at end of file diff --git a/main/.env.pre b/main/.env.pre index 896c31f..a1ff2ac 100644 --- a/main/.env.pre +++ b/main/.env.pre @@ -6,6 +6,7 @@ VITE_APP_SUB_OA = '//localhost:8090/sub-operation-admin/' VITE_APP_SUB_GAS = '//localhost:8090/sub-government-affairs-service/' VITE_APP_SUB_GAA = '//localhost:8090/sub-government-admin/' VITE_APP_SUB_GSS = '//localhost:8090/sub-government-screen-service/' +VITE_APP_VIST_URL = 'http://localhost' # 接口 VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = '' diff --git a/main/.env.production b/main/.env.production index fe0fac2..b62b46b 100644 --- a/main/.env.production +++ b/main/.env.production @@ -12,4 +12,5 @@ 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' diff --git a/main/.env.test b/main/.env.test index f22cfe4..bf0f722 100644 --- a/main/.env.test +++ b/main/.env.test @@ -12,3 +12,4 @@ 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.99' \ No newline at end of file diff --git a/main/src/micro/app.js b/main/src/micro/app.js index ba575ae..2ad4af2 100644 --- a/main/src/micro/app.js +++ b/main/src/micro/app.js @@ -1,6 +1,6 @@ import actions from './actions'; -const { VITE_APP_SUB_OS, VITE_APP_SUB_OA, VITE_APP_SUB_ADMIN, VITE_APP_SUB_GAS, VITE_APP_SUB_GSS, VITE_APP_SUB_GSR } = import.meta.env; +const { VITE_APP_SUB_OS, VITE_APP_SUB_OA, VITE_APP_SUB_ADMIN, VITE_APP_SUB_GAS, VITE_APP_SUB_GSS, VITE_APP_SUB_GSR, VITE_APP_VIST_URL } = import.meta.env; export const leftApps = [ { @@ -13,7 +13,7 @@ export const leftApps = [ { name: 'sub-operation-admin', entry: VITE_APP_SUB_OA, - activeRule: 'http://192.168.18.99:82/login?loginType=2', + activeRule: `${VITE_APP_VIST_URL}:82/login`, title: '管理后台', icon: 'images/platform/icon-admin.png', }, @@ -44,7 +44,7 @@ export const rightApps = [ { name: 'sub-government-admin', entry: VITE_APP_SUB_GAS, - activeRule: 'http://192.168.18.99:81/login?loginType=1', + activeRule: `${VITE_APP_VIST_URL}:81/login`, title: '管理后台', icon: 'images/platform/icon-admin.png', }, diff --git a/new-digital-agriculture-screen/.env.production b/new-digital-agriculture-screen/.env.production index 956fefa..b772ff3 100644 --- a/new-digital-agriculture-screen/.env.production +++ b/new-digital-agriculture-screen/.env.production @@ -7,6 +7,7 @@ VITE_APP_MIAN = 'daimp-front-main' VITE_APP_MIAN_URL = 'http://47.109.205.240:88' VITE_APP_NAME = 'new-digital-agriculture-screen' +VITE_APP_TITLE = '政务云数字农业智慧大屏' # 接口 VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = '' diff --git a/new-digital-agriculture-screen/.gitignore b/new-digital-agriculture-screen/.gitignore index c199e5e..0b23a9f 100644 --- a/new-digital-agriculture-screen/.gitignore +++ b/new-digital-agriculture-screen/.gitignore @@ -64,6 +64,8 @@ web_modules/ # Output of 'npm pack' *.tgz +*.zip +*.rar # Yarn Integrity file .yarn-integrity diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js index be10e20..cb2d0d5 100644 --- a/sub-operation-service/src/router/index.js +++ b/sub-operation-service/src/router/index.js @@ -236,6 +236,12 @@ export const constantRoutes = [ name: 'packagingMain', meta: { title: '包装首页' }, }, + { + path: '/sub-operation-service/packaging/details', + component: () => import('@/views/packaging/details.vue'), + name: 'detailsMain', + meta: { title: '详情页' }, + }, ], }, { diff --git a/sub-operation-service/src/views/packaging/details.vue b/sub-operation-service/src/views/packaging/details.vue new file mode 100644 index 0000000..dd87e0d --- /dev/null +++ b/sub-operation-service/src/views/packaging/details.vue @@ -0,0 +1,359 @@ + + + + + 首选商家: + {{ route.description }} + + + 选择服务: + {{ route.title }} + + + + + + + kg + + + + + + + + + + + + + + + + + + + + + {{ route.data[2] == '绿色' ? '分拣' : '包装' }} · 查看详情 + + + + + + + + {{ route.title }} + {{ route.description }} + + {{ route.data[0] }} + {{ route.data[1] }} + {{ route.data[2] }} + + 联系人:李涛 + 联系电话:13888569833 + + {{ route.location }} + + + + + 报价: + ¥{{ route.price }}/m + + + + 留下信息 + + + + + + 产品详细介绍 + + {{ route.description }} 目前暂无介绍哦~ + + + + + + + + + + diff --git a/sub-operation-service/src/views/packaging/index.vue b/sub-operation-service/src/views/packaging/index.vue index edad294..460137b 100644 --- a/sub-operation-service/src/views/packaging/index.vue +++ b/sub-operation-service/src/views/packaging/index.vue @@ -222,10 +222,11 @@ const currentChange = (current) => { }; const toLink = (row) => { - // router.push({ - // path: '/sub-operation-service/warehouse-detail', - // query: { id: row?.id ?? '100' }, - // }); + row.data = ['高品质', '食品级', '塑料']; + router.push({ + path: '/sub-operation-service/packaging/details', + query: row, + }); };
{{ route.description }}
联系人:李涛
联系电话:13888569833
+ {{ route.location }} +
{{ route.description }} 目前暂无介绍哦~