diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/img14.png b/sub-operation-service/src/assets/images/warehouseLogistics/img14.png index 2c9ec2a..52d05b9 100644 Binary files a/sub-operation-service/src/assets/images/warehouseLogistics/img14.png and b/sub-operation-service/src/assets/images/warehouseLogistics/img14.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/img16.png b/sub-operation-service/src/assets/images/warehouseLogistics/img16.png index 321addd..1bf8558 100644 Binary files a/sub-operation-service/src/assets/images/warehouseLogistics/img16.png and b/sub-operation-service/src/assets/images/warehouseLogistics/img16.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/img17.png b/sub-operation-service/src/assets/images/warehouseLogistics/img17.png index 2f35885..a64c3e3 100644 Binary files a/sub-operation-service/src/assets/images/warehouseLogistics/img17.png and b/sub-operation-service/src/assets/images/warehouseLogistics/img17.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/img18.png b/sub-operation-service/src/assets/images/warehouseLogistics/img18.png index 3974b2f..6c235b5 100644 Binary files a/sub-operation-service/src/assets/images/warehouseLogistics/img18.png and b/sub-operation-service/src/assets/images/warehouseLogistics/img18.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/img19.png b/sub-operation-service/src/assets/images/warehouseLogistics/img19.png index d14fde0..7e625b0 100644 Binary files a/sub-operation-service/src/assets/images/warehouseLogistics/img19.png and b/sub-operation-service/src/assets/images/warehouseLogistics/img19.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/img21.png b/sub-operation-service/src/assets/images/warehouseLogistics/img21.png new file mode 100644 index 0000000..45ab3b6 Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/img21.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/img22.png b/sub-operation-service/src/assets/images/warehouseLogistics/img22.png new file mode 100644 index 0000000..87c29f6 Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/img22.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/img23.png b/sub-operation-service/src/assets/images/warehouseLogistics/img23.png new file mode 100644 index 0000000..d4d5b02 Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/img23.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/img24.png b/sub-operation-service/src/assets/images/warehouseLogistics/img24.png new file mode 100644 index 0000000..34ed788 Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/img24.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/img25.png b/sub-operation-service/src/assets/images/warehouseLogistics/img25.png new file mode 100644 index 0000000..21528ff Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/img25.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/img26.png b/sub-operation-service/src/assets/images/warehouseLogistics/img26.png new file mode 100644 index 0000000..8d1fbf4 Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/img26.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/img27.png b/sub-operation-service/src/assets/images/warehouseLogistics/img27.png new file mode 100644 index 0000000..cc83422 Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/img27.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/img28.png b/sub-operation-service/src/assets/images/warehouseLogistics/img28.png new file mode 100644 index 0000000..fda0c92 Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/img28.png differ diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js index 9984ab8..3a22efb 100644 --- a/sub-operation-service/src/router/index.js +++ b/sub-operation-service/src/router/index.js @@ -406,6 +406,24 @@ export const constantRoutes = [ name: 'detailsMain', meta: { title: '详情页' }, }, + { + path: '/sub-operation-service/packaging/details1', + component: () => import('@/views/packaging/details1.vue'), + name: 'detailsMain1', + meta: { title: '详情页' }, + }, + { + path: '/sub-operation-service/packaging/details2', + component: () => import('@/views/packaging/details2.vue'), + name: 'detailsMain2', + meta: { title: '详情页' }, + }, + { + path: '/sub-operation-service/packaging/apply', + component: () => import('@/views/packaging/apply.vue'), + name: 'apply', + meta: { title: '申请分拣' }, + }, ], }, { @@ -463,6 +481,18 @@ export const constantRoutes = [ name: 'logistics-detail', meta: { title: '物流详情' }, }, + { + path: '/sub-operation-service/logistics-shipping', + component: () => import('@/views/warehouseLogistics/logistics/shipping.vue'), + name: 'logistics-shipping', + meta: { title: '在线寄货' }, + }, + { + path: '/sub-operation-service/logistics-match', + component: () => import('@/views/warehouseLogistics/logistics/match.vue'), + name: 'logistics-match', + meta: { title: '匹配' }, + }, ], }, { diff --git a/sub-operation-service/src/views/farmingService/components/leftMenu.vue b/sub-operation-service/src/views/farmingService/components/leftMenu.vue index 81d9684..f74fd65 100644 --- a/sub-operation-service/src/views/farmingService/components/leftMenu.vue +++ b/sub-operation-service/src/views/farmingService/components/leftMenu.vue @@ -49,14 +49,14 @@ const router = useRouter(); const leftMenu = reactive([ { name: 'inspection', - title: '农事咨询', + title: '农事资讯', icon: 'menu1.png', path: '', isOpen: false, children: [ { name: 'farmPolicy', - title: '农业政策', + title: '农业政策资讯', icon: 'menu1.png', path: '/sub-operation-service/farmService/consult/policy', }, diff --git a/sub-operation-service/src/views/packaging/apply.vue b/sub-operation-service/src/views/packaging/apply.vue new file mode 100644 index 0000000..8a047ed --- /dev/null +++ b/sub-operation-service/src/views/packaging/apply.vue @@ -0,0 +1,329 @@ + + + + + diff --git a/sub-operation-service/src/views/packaging/details.vue b/sub-operation-service/src/views/packaging/details.vue index dd87e0d..226849e 100644 --- a/sub-operation-service/src/views/packaging/details.vue +++ b/sub-operation-service/src/views/packaging/details.vue @@ -1,55 +1,14 @@ @@ -179,9 +179,10 @@ import Common from './components/common.vue'; const route = useRoute(); const router = useRouter(); -const tab0 = reactive(['包装服务', '包装需求']); +// const tab0 = reactive(['包装服务', '包装需求']); +const tab0 = reactive(['包装服务']); const tab1 = reactive(['全部', '熟料容器', '金属容器', '纸类容器']); -const tab2 = reactive(['全部', '塑料袋', '塑料瓶', '塑料桶', '塑料盒']); +const tab2 = reactive(['全部', '塑料框', '纸箱', '泡沫箱', '冰瓶']); const tab3 = reactive(['水产', '其他类']); const state = reactive({ menus: warehouseLogisticsRoutes[0].children, @@ -271,8 +272,13 @@ const currentChange = (current) => { const toLink = (row) => { row.data = ['高品质', '杀菌灭毒', '绿色']; router.push({ - path: '/sub-operation-service/packaging/details', - query: row, + path: '/sub-operation-service/packaging/details1', + // query: row, + }); +}; +const applicationPackaging = () => { + router.push({ + path: '/sub-operation-service/packaging/details2', }); }; @@ -457,6 +463,7 @@ $border-color: #dcdfe6; // 边框颜色 height: auto; border-radius: 0; object-fit: cover; + cursor: pointer; } .storage-info { padding-right: 50px; diff --git a/sub-operation-service/src/views/packaging/sorting.vue b/sub-operation-service/src/views/packaging/sorting.vue index 8ab3f1d..c9f37e4 100644 --- a/sub-operation-service/src/views/packaging/sorting.vue +++ b/sub-operation-service/src/views/packaging/sorting.vue @@ -97,7 +97,7 @@
- +
@@ -106,7 +106,7 @@
- +
@@ -163,7 +163,7 @@
- 发布分拣{{ currentTab0 === 0 ? '服务' : '需求' }} + 发布需求
@@ -181,7 +181,8 @@ import Common from './components/common.vue'; const route = useRoute(); const router = useRouter(); -const tab0 = reactive(['分拣服务', '分拣需求']); +// const tab0 = reactive(['分拣服务', '分拣需求']); +const tab0 = reactive(['分拣服务']); const tab1 = reactive(['全部', '人工分拣', '自动化分拣']); const tab2 = reactive(['全部', '已完成', '分拣中', '已接单', '待接单']); const tab3 = reactive(['水产', '其他类']); @@ -277,6 +278,11 @@ const toLink = (row) => { query: row, }); }; +const handleApply = () => { + router.push({ + path: '/sub-operation-service/packaging/apply', + }); +}; diff --git a/sub-operation-service/src/views/warehouseLogistics/logistics/shipping.vue b/sub-operation-service/src/views/warehouseLogistics/logistics/shipping.vue new file mode 100644 index 0000000..0b8f2d2 --- /dev/null +++ b/sub-operation-service/src/views/warehouseLogistics/logistics/shipping.vue @@ -0,0 +1,356 @@ + + + diff --git a/sub-operation-service/src/views/warehouseLogistics/warehouse/allocation.vue b/sub-operation-service/src/views/warehouseLogistics/warehouse/allocation.vue index 2701ed3..1f440a8 100644 --- a/sub-operation-service/src/views/warehouseLogistics/warehouse/allocation.vue +++ b/sub-operation-service/src/views/warehouseLogistics/warehouse/allocation.vue @@ -66,7 +66,7 @@ -
+
@@ -269,6 +269,7 @@ $border-color: #dcdfe6; // 边框颜色 .p-4 { padding: 1rem; + padding-bottom: 0; } .flex { diff --git a/sub-operation-service/src/views/warehouseLogistics/warehouse/application.vue b/sub-operation-service/src/views/warehouseLogistics/warehouse/application.vue index 1fce086..6a8e4ef 100644 --- a/sub-operation-service/src/views/warehouseLogistics/warehouse/application.vue +++ b/sub-operation-service/src/views/warehouseLogistics/warehouse/application.vue @@ -65,7 +65,7 @@
-
+
提交 @@ -278,6 +278,7 @@ $border-color: #dcdfe6; // 边框颜色 .p-4 { padding: 1rem; + padding-bottom: 0; } .flex { diff --git a/sub-operation-service/src/views/warehouseLogistics/warehouse/detail.vue b/sub-operation-service/src/views/warehouseLogistics/warehouse/detail.vue index 9ed50bb..6816f7a 100644 --- a/sub-operation-service/src/views/warehouseLogistics/warehouse/detail.vue +++ b/sub-operation-service/src/views/warehouseLogistics/warehouse/detail.vue @@ -8,8 +8,26 @@ > 查看详情
-
- +
+
+ + + +
+ + + + +