diff --git a/sub-operation-admin/index.html b/sub-operation-admin/index.html index e1d7b64..4844de2 100644 --- a/sub-operation-admin/index.html +++ b/sub-operation-admin/index.html @@ -5,7 +5,7 @@ - 政务服务 + 运营服务 @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/menu1.png b/sub-operation-service/src/assets/images/warehouseLogistics/menu1.png new file mode 100644 index 0000000..27ac5b2 Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/menu1.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/menu3.png b/sub-operation-service/src/assets/images/warehouseLogistics/menu3.png new file mode 100644 index 0000000..a14e4f8 Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/menu3.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/position.png b/sub-operation-service/src/assets/images/warehouseLogistics/position.png new file mode 100644 index 0000000..e0d30f6 Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/position.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/top1.png b/sub-operation-service/src/assets/images/warehouseLogistics/top1.png new file mode 100644 index 0000000..1422ace Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/top1.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/top2.png b/sub-operation-service/src/assets/images/warehouseLogistics/top2.png new file mode 100644 index 0000000..dae777c Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/top2.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/top3.png b/sub-operation-service/src/assets/images/warehouseLogistics/top3.png new file mode 100644 index 0000000..cb8c0f4 Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/top3.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/优先级.png b/sub-operation-service/src/assets/images/warehouseLogistics/优先级.png new file mode 100644 index 0000000..fa17cef Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/优先级.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/认证.png b/sub-operation-service/src/assets/images/warehouseLogistics/认证.png new file mode 100644 index 0000000..6125c4b Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/认证.png differ diff --git a/sub-operation-service/src/layouts/component/Menu/SubItem.vue b/sub-operation-service/src/layouts/component/Menu/SubItem.vue index 966e14b..30e215d 100644 --- a/sub-operation-service/src/layouts/component/Menu/SubItem.vue +++ b/sub-operation-service/src/layouts/component/Menu/SubItem.vue @@ -10,14 +10,15 @@ @@ -30,6 +31,7 @@ import { ref } from 'vue'; // import { isExternal } from '@/utils/validate.js'; import LayoutLink from './Link'; import LayoutIcon from './Icon'; +import { getAssetsFile } from '@/utils/index.js'; // import path from 'path-browserify'; defineProps({ @@ -65,7 +67,6 @@ const hasOneShowingChild = (children = [], parent) => { onlyOneChild.value = { ...parent, noShowingChildren: true }; return true; } - return false; }; diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js index 6fbefbd..8259e22 100644 --- a/sub-operation-service/src/router/index.js +++ b/sub-operation-service/src/router/index.js @@ -218,14 +218,20 @@ export const constantRoutes = [ path: '/sub-operation-service/warehouseLogistics', name: 'warehouseLogistics', component: Layout, - redirect: '/sub-operation-service/warehouseLogistics/index', + redirect: '/sub-operation-service/warehouse', meta: { title: '仓储物流' }, children: [ { - path: '/sub-operation-service/warehouseLogistics/index', - component: () => import('@/views/warehouseLogistics/index.vue'), - name: 'warehouseLogisticsMain', - meta: { title: '仓储物流首页' }, + path: '/sub-operation-service/warehouse', + component: () => import('@/views/warehouseLogistics/warehouse/index.vue'), + name: 'warehouseMain', + meta: { title: '仓储首页' }, + }, + { + path: '/sub-operation-service/logistics', + component: () => import('@/views/warehouseLogistics/logistics/index.vue'), + name: 'logistics-list', + meta: { title: '物流首页' }, }, ], }, diff --git a/sub-operation-service/src/router/modules/warehouseLogistics.js b/sub-operation-service/src/router/modules/warehouseLogistics.js index 20bdccb..680dc2c 100644 --- a/sub-operation-service/src/router/modules/warehouseLogistics.js +++ b/sub-operation-service/src/router/modules/warehouseLogistics.js @@ -43,7 +43,7 @@ export default [ path: '/sub-operation-service/logistics-list', component: () => import('@/views/warehouseLogistics/logistics/index.vue'), name: 'logistics-list', - meta: { title: '物流列表', icon: '' }, + meta: { title: '物流', icon: '' }, hidden: true, }, { @@ -55,27 +55,27 @@ export default [ }, ], }, - { - path: '/sub-operation-service/test', - component: Views, - redirect: '/sub-operation-service/test1', - name: 'test', - meta: { title: '测试', icon: 'images/ecommerce/menu3.png' }, - children: [ - { - path: '/sub-operation-service/test1', - component: () => import('@/views/warehouseLogistics/test/test1.vue'), - name: 'test1', - meta: { title: '子菜单1', icon: '' }, - }, - { - path: '/sub-operation-service/test2', - component: () => import('@/views/warehouseLogistics/test/test1.vue'), - name: 'test2', - meta: { title: '子菜单2', icon: '' }, - }, - ], - }, + // { + // path: '/sub-operation-service/test', + // component: Views, + // redirect: '/sub-operation-service/test1', + // name: 'test', + // meta: { title: '测试', icon: 'images/ecommerce/menu3.png' }, + // children: [ + // { + // path: '/sub-operation-service/test1', + // component: () => import('@/views/warehouseLogistics/test/test1.vue'), + // name: 'test1', + // meta: { title: '子菜单1', icon: '' }, + // }, + // { + // path: '/sub-operation-service/test2', + // component: () => import('@/views/warehouseLogistics/test/test1.vue'), + // name: 'test2', + // meta: { title: '子菜单2', icon: '' }, + // }, + // ], + // }, ], }, ]; diff --git a/sub-operation-service/src/views/warehouseLogistics/warehouse/index.vue b/sub-operation-service/src/views/warehouseLogistics/warehouse/index.vue index a8bd236..542541f 100644 --- a/sub-operation-service/src/views/warehouseLogistics/warehouse/index.vue +++ b/sub-operation-service/src/views/warehouseLogistics/warehouse/index.vue @@ -10,11 +10,12 @@

{{ item.title }}

{{ item.description }} - + +
- 延长仓储 - 保鲜储存 + 延长仓储 + 保鲜储存
@@ -33,7 +34,8 @@
- {{ item.rank }} + +
@@ -72,7 +74,7 @@ const state = reactive({ description: '绿鲜蔬选果蔬仓储中心', location: '临沧市-耿马县', price: '600.0', - rank: '', + rank: '2', }, { imageUrl: '/storage3.jpg',