diff --git a/sub-operation-service/src/assets/images/carton.png b/sub-operation-service/src/assets/images/carton.png new file mode 100644 index 0000000..7c68fae Binary files /dev/null and b/sub-operation-service/src/assets/images/carton.png differ diff --git a/sub-operation-service/src/assets/images/film.png b/sub-operation-service/src/assets/images/film.png new file mode 100644 index 0000000..40004c3 Binary files /dev/null and b/sub-operation-service/src/assets/images/film.png differ diff --git a/sub-operation-service/src/assets/images/fruit.png b/sub-operation-service/src/assets/images/fruit.png new file mode 100644 index 0000000..856ccbb Binary files /dev/null and b/sub-operation-service/src/assets/images/fruit.png differ diff --git a/sub-operation-service/src/assets/images/metal.png b/sub-operation-service/src/assets/images/metal.png new file mode 100644 index 0000000..2ef6874 Binary files /dev/null and b/sub-operation-service/src/assets/images/metal.png differ diff --git a/sub-operation-service/src/assets/images/plastics.png b/sub-operation-service/src/assets/images/plastics.png new file mode 100644 index 0000000..ad37172 Binary files /dev/null and b/sub-operation-service/src/assets/images/plastics.png differ diff --git a/sub-operation-service/src/assets/images/vegetable.png b/sub-operation-service/src/assets/images/vegetable.png new file mode 100644 index 0000000..a6f453c Binary files /dev/null and b/sub-operation-service/src/assets/images/vegetable.png differ diff --git a/sub-operation-service/src/views/packaging/components/leftMenu.vue b/sub-operation-service/src/views/packaging/components/leftMenu.vue index a644a56..434d587 100644 --- a/sub-operation-service/src/views/packaging/components/leftMenu.vue +++ b/sub-operation-service/src/views/packaging/components/leftMenu.vue @@ -66,7 +66,7 @@ const leftMenu = reactive([ name: 'control', title: '包装', icon: 'menu3.png', - path: '/sub-operation-service/packaging/sorting', + path: '/sub-operation-service/packaging/index', isOpen: false, children: [], }, diff --git a/sub-operation-service/src/views/packaging/index.vue b/sub-operation-service/src/views/packaging/index.vue index 8626435..a4de7cf 100644 --- a/sub-operation-service/src/views/packaging/index.vue +++ b/sub-operation-service/src/views/packaging/index.vue @@ -1,19 +1,306 @@ + + + gap: 16px; + &-top { + @include flex-row; + + align-items: center; + } +} +.storage-image { + margin-right: 16px; + width: 120px; + height: 120px; + border-radius: 8px; + object-fit: cover; +} +.storage-info { + padding-right: 50px; + flex: 1; + cursor: pointer; +} +.storage-title, +.storage-desc, +.storage-tags, +.storage-location { + overflow: hidden; + margin: 10px 0; + width: 100%; + text-align: left; +} +.storage-title { + font-size: 20px; + font-weight: 700; + color: #000000; + @include ellipsis; +} +.storage-desc { + font-size: 16px; + color: #999999; + @include ellipsis; + i { + display: inline-block; + width: 20px; + height: 20px; + } +} +.storage-tags { + span { + margin-right: 10px; + } +} +.storage-location { + display: flex; + align-items: center; + font-size: 16px; + font-weight: 400; + color: #000000; +} +.storage-price { + display: flex; + justify-content: space-between; + align-items: center; + &-left { + color: #25bf82; + } +} +.price-label { + margin-right: 10px; + font-size: 16px; + color: #999999; +} +.price-amount { + font-size: 20px; + font-weight: 700; + color: #25bf82; +} +.contact-btn { + width: 152px; + height: 48px; + font-size: 20px; + border-radius: 8px; + background: #25bf82 !important; + :deep(.el-icon) { + margin-right: 10px; + } +} +.rank-badge { + position: absolute; + top: 0; + right: 20px; + width: 80px; + height: 80px; +} + diff --git a/sub-operation-service/src/views/packaging/sorting.vue b/sub-operation-service/src/views/packaging/sorting.vue index 1583740..1a58613 100644 --- a/sub-operation-service/src/views/packaging/sorting.vue +++ b/sub-operation-service/src/views/packaging/sorting.vue @@ -3,14 +3,44 @@
@@ -69,6 +100,9 @@ import Common from './components/common.vue'; const route = useRoute(); const router = useRouter(); +const tab1 = reactive(['叶菜类', '豆菜类', '根茎类', '茄果菜类', '食用菌类', '其他类蔬菜']); +const tab2 = reactive(['甘蔗', '热带水果', '其他类水果']); +const tab3 = reactive(['水产', '其他类']); const state = reactive({ menus: warehouseLogisticsRoutes[0].children, query: { @@ -76,57 +110,51 @@ const state = reactive({ }, data: [ { - imageUrl: '/storage1.jpg', - title: '果蔬保鲜仓储', - description: '绿鲜蔬选果蔬仓储中心 ', + title: '蔬菜分拣服务', + description: '绿鲜甄选蔬菜分拣中心 ', location: '临沧市-耿马县', - price: '600.0', + price: '150', rank: '1', + imageUrl: 'images/vegetable.png', }, { - imageUrl: '/storage2.jpg', - title: '果蔬保鲜仓储', - description: '绿鲜蔬选果蔬仓储中心', + title: '水果分拣服务', + description: '果韵鲜享分拣站', location: '临沧市-耿马县', - price: '600.0', + price: '150', rank: '2', + imageUrl: 'images/fruit.png', }, { - imageUrl: '/storage3.jpg', - title: '果蔬保鲜仓储', - description: '绿鲜蔬选果蔬仓储中心 ', + title: '水果分拣服务', + description: '好果分拣站 ', location: '临沧市-耿马县', - price: '600.0', + price: '150', rank: '3', + imageUrl: 'images/fruit.png', }, { - imageUrl: '/storage3.jpg', - title: '果蔬保鲜仓储', - description: '绿鲜蔬选果蔬仓储中心 ', + title: '水果分拣服务', + description: '果美分拣站 ', location: '临沧市-耿马县', - price: '600.0', + price: '150', rank: '', + imageUrl: 'images/fruit.png', }, { - imageUrl: '/storage3.jpg', - title: '果蔬保鲜仓储', - description: '绿鲜蔬选果蔬仓储中心 ', + title: '水果分拣服务', + description: '好果存分拣站 ', location: '临沧市-耿马县', - price: '600.0', - rank: '', - }, - { - imageUrl: '/storage3.jpg', - title: '果蔬保鲜仓储', - description: '绿鲜蔬选果蔬仓储中心 ', - location: '临沧市-耿马县', - price: '600.0', + price: '150', rank: '', + imageUrl: 'images/fruit.png', }, ], }); -const currentTab = ref(0); +const currentTab1 = ref(0); +const currentTab2 = ref(0); +const currentTab3 = ref(0); const currentChange = (current) => { state.query.current = current; @@ -141,13 +169,41 @@ const toLink = (row) => {