diff --git a/sub-operation-service/src/App.vue b/sub-operation-service/src/App.vue index f69c268..680b269 100644 --- a/sub-operation-service/src/App.vue +++ b/sub-operation-service/src/App.vue @@ -34,7 +34,8 @@ body { --el-color-primary: #25bf82; --el-color-primary-light-3: #45dda1; --el-color-primary-light-5: #8cddbd; - + --el-color-primary-light-9: rgba(37, 191, 130, 0.1); + --el-color-primary-light-8: rgba(37, 191, 130, 0.5); .el-input { --el-input-focus-border-color: #25bf82; --el-input-focus-border: #25bf82; diff --git a/sub-operation-service/src/assets/images/ecommerce/banner3.png b/sub-operation-service/src/assets/images/ecommerce/banner3.png new file mode 100644 index 0000000..2e636eb Binary files /dev/null and b/sub-operation-service/src/assets/images/ecommerce/banner3.png differ diff --git a/sub-operation-service/src/assets/images/ecommerce/test01.png b/sub-operation-service/src/assets/images/ecommerce/test01.png new file mode 100644 index 0000000..e30c570 Binary files /dev/null and b/sub-operation-service/src/assets/images/ecommerce/test01.png differ diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js index bc70adb..e9a73ab 100644 --- a/sub-operation-service/src/router/index.js +++ b/sub-operation-service/src/router/index.js @@ -32,13 +32,13 @@ export const constantRoutes = [ name: 'layout', component: Layout, redirect: '/sub-operation-service/home', - meta: { title: '首页', icon: 'House' }, + meta: { title: '首页' }, children: [ { path: '/sub-operation-service/home', component: () => import('@/views/home/index.vue'), name: 'home', - meta: { title: '首页', icon: 'House' }, + meta: { title: '首页' }, }, ], }, @@ -46,32 +46,63 @@ export const constantRoutes = [ path: '/ecommerce', name: 'ecommerce', component: Layout, - redirect: '/ecommerce', - meta: { title: '首页', icon: 'House' }, + redirect: '/sub-operation-service/ecommerce', + meta: { title: '电商交易' }, children: [ { path: '/sub-operation-service/ecommerce', component: () => import('@/views/ecommerce/index.vue'), name: 'agricultural', - meta: { title: '农资交易', icon: 'House' }, + meta: { title: '农资交易' }, }, { - path: '/sub-operation-service/purchaser', - component: () => import('@/views/ecommerce/purchaser.vue'), - name: 'purchaser', - meta: { title: '采购商服务', icon: 'House' }, + path: '/purchaser', + component: Views, + redirect: '/sub-operation-service/purchaser', + name: 'purchaserParent', + meta: { title: '采购商服务' }, + children: [ + { + path: '/sub-operation-service/purchaser', + component: () => import('@/views/ecommerce/purchaser.vue'), + name: 'purchaser', + meta: { title: '采购商服务' }, + }, + { + path: '/sub-operation-service/purchaserDetail', + component: () => import('@/views/ecommerce/purchaserDetail.vue'), + name: 'purchaserDetail', + meta: { title: '采购详情' }, + }, + ], }, + { path: '/sub-operation-service/supplier', component: () => import('@/views/ecommerce/supplier.vue'), name: 'supplier', - meta: { title: '供应商服务', icon: 'House' }, + meta: { title: '供应商服务' }, }, { - path: '/sub-operation-service/land', - component: () => import('@/views/ecommerce/land.vue'), - name: 'land', - meta: { title: '土地交易', icon: 'House' }, + path: '/land', + component: Views, + redirect: '/sub-operation-service/land', + name: 'landParent', + meta: { title: '土地交易' }, + children: [ + { + path: '/sub-operation-service/land', + component: () => import('@/views/ecommerce/land.vue'), + name: 'land', + meta: { title: '土地交易' }, + }, + { + path: '/sub-operation-service/landDetail', + component: () => import('@/views/ecommerce/landDetail.vue'), + name: 'landDetail', + meta: { title: '土地详情' }, + }, + ], }, ], }, diff --git a/sub-operation-service/src/styles/global.scss b/sub-operation-service/src/styles/global.scss index eec2e32..9c091aa 100644 --- a/sub-operation-service/src/styles/global.scss +++ b/sub-operation-service/src/styles/global.scss @@ -2,6 +2,7 @@ $legacy-ie: 10; $color-main:#25BF82; $color-main-table-header:rgba(37,191,130,0.1); +$color-main-border:rgba(37, 191, 130, 0.5); $color-5a:#5A5A5A; $color-000:#000; $color-fff:#fff; @@ -25,7 +26,7 @@ $color-gray: #d3dce6; $color-gray-light: #e5e9f2; $color-gray-lighter: #eff2f7; $color-333: #333333; -$color-666: #333333; +$color-666: #666; $color-999: #999999; $color-border-gray: #d1dbe5; $color-input-border: #dcdfe6; diff --git a/sub-operation-service/src/styles/style.scss b/sub-operation-service/src/styles/style.scss index 766cecc..6536e99 100644 --- a/sub-operation-service/src/styles/style.scss +++ b/sub-operation-service/src/styles/style.scss @@ -30,7 +30,7 @@ max-height: calc(1.5em * 1); } -.clamp1{ +.clamp2{ -webkit-line-clamp: 2; line-height: 1.5; max-height: calc(1.5em * 2); diff --git a/sub-operation-service/src/views/ecommerce/components/filtertop.vue b/sub-operation-service/src/views/ecommerce/components/filtertop.vue index 21e40d7..fc6ceb1 100644 --- a/sub-operation-service/src/views/ecommerce/components/filtertop.vue +++ b/sub-operation-service/src/views/ecommerce/components/filtertop.vue @@ -112,12 +112,16 @@ const selectItem = (index, key, item) => { if (key && item.id) { currentLevel.value = index || 0; select[key] = { id: item.id, pId: item.pId ? item.pId : null }; + emit('select', select); } }; const selectAll = (key) => { select[key].id = ''; + emit('select', select); }; + +const emit = defineEmits(['select']); diff --git a/sub-operation-service/src/views/ecommerce/components/typetop.vue b/sub-operation-service/src/views/ecommerce/components/typetop.vue new file mode 100644 index 0000000..df3f35e --- /dev/null +++ b/sub-operation-service/src/views/ecommerce/components/typetop.vue @@ -0,0 +1,125 @@ + + + diff --git a/sub-operation-service/src/views/ecommerce/land.vue b/sub-operation-service/src/views/ecommerce/land.vue index 22a2d80..90d42fa 100644 --- a/sub-operation-service/src/views/ecommerce/land.vue +++ b/sub-operation-service/src/views/ecommerce/land.vue @@ -1,12 +1,328 @@ + diff --git a/sub-operation-service/src/views/ecommerce/landDetail.vue b/sub-operation-service/src/views/ecommerce/landDetail.vue new file mode 100644 index 0000000..dc70084 --- /dev/null +++ b/sub-operation-service/src/views/ecommerce/landDetail.vue @@ -0,0 +1,113 @@ + + + diff --git a/sub-operation-service/src/views/ecommerce/purchaser.vue b/sub-operation-service/src/views/ecommerce/purchaser.vue index 06821d4..47c8359 100644 --- a/sub-operation-service/src/views/ecommerce/purchaser.vue +++ b/sub-operation-service/src/views/ecommerce/purchaser.vue @@ -31,7 +31,7 @@ - + @@ -39,7 +39,7 @@ @@ -60,6 +60,9 @@ import marketCharts from './components/marketCharts.vue'; import purchaserPopup from './components/purchaserPopup.vue'; import { ref, reactive, onMounted, watch, computed } from 'vue'; import { getRegion } from '@/apis/index'; +import { useRoute, useRouter } from 'vue-router'; +const route = useRoute(); +const router = useRouter(); let treeList = reactive([ { @@ -204,16 +207,20 @@ let filter = ref({ }); let tableData = reactive([ - { title: '西红柿', region: '耿马镇', buyer: '盛源农业', buyNum: 5000, time: '2025-04-02 12:25:36' }, - { title: '白菜', region: '孟定镇', buyer: '星悦农业', buyNum: 6000, time: '2025-04-01 12:25:36' }, - { title: '西蓝花', region: '孟勇镇', buyer: '盛源农业', buyNum: 7000, time: '2025-04-02 13:25:36' }, - { title: '鸡蛋', region: '勐简乡', buyer: '上好佳农业', buyNum: 8000, time: '2025-04-02 12:25:36' }, - { title: '牛肉', region: '四排山乡', buyer: '尚嘉农业', buyNum: 5000, time: '2025-03-31 12:25:36' }, - { title: '氮肥', region: '大兴乡', buyer: '信誉农资', buyNum: 6000, time: '2025-04-02 12:25:36' }, - { title: '白菜种子', region: '贺派乡', buyer: '佳佳农业', buyNum: 5000, time: '2025-04-02 12:25:36' }, - { title: '西红柿种子', region: '勐撒镇', buyer: '佳佳农业', buyNum: 8000, time: '2025-04-02 12:25:36' }, + { id: '01', title: '西红柿', region: '耿马镇', buyer: '盛源农业', buyNum: 5000, time: '2025-04-02 12:25:36' }, + { id: '02', title: '白菜', region: '孟定镇', buyer: '星悦农业', buyNum: 6000, time: '2025-04-01 12:25:36' }, + { id: '03', title: '西蓝花', region: '孟勇镇', buyer: '盛源农业', buyNum: 7000, time: '2025-04-02 13:25:36' }, + { id: '04', title: '鸡蛋', region: '勐简乡', buyer: '上好佳农业', buyNum: 8000, time: '2025-04-02 12:25:36' }, + { id: '05', title: '牛肉', region: '四排山乡', buyer: '尚嘉农业', buyNum: 5000, time: '2025-03-31 12:25:36' }, + { id: '06', title: '氮肥', region: '大兴乡', buyer: '信誉农资', buyNum: 6000, time: '2025-04-02 12:25:36' }, + { id: '07', title: '白菜种子', region: '贺派乡', buyer: '佳佳农业', buyNum: 5000, time: '2025-04-02 12:25:36' }, + { id: '08', title: '西红柿种子', region: '勐撒镇', buyer: '佳佳农业', buyNum: 8000, time: '2025-04-02 12:25:36' }, ]); +const rowClick = (data) => { + router.push('/sub-operation-service/purchaserDetail?id=' + data.id); +}; + onMounted(() => { console.info('onMounted'); getTree(); diff --git a/sub-operation-service/src/views/ecommerce/purchaserDetail.vue b/sub-operation-service/src/views/ecommerce/purchaserDetail.vue new file mode 100644 index 0000000..f7df363 --- /dev/null +++ b/sub-operation-service/src/views/ecommerce/purchaserDetail.vue @@ -0,0 +1,484 @@ + + +