diff --git a/sub-operation-service/src/apis/agricultural.js b/sub-operation-service/src/apis/agricultural.js index 1d17497..0dc4ba4 100644 --- a/sub-operation-service/src/apis/agricultural.js +++ b/sub-operation-service/src/apis/agricultural.js @@ -27,9 +27,9 @@ export function getGoodDetail(id, params) { } // 获取用户评价列表 -export function agriculturalContent(params) { +export function agriculturalContent(data = {}) { return request('goods/goodInfoManage/contentPage', { method: 'POST', - params, + data, }); } diff --git a/sub-operation-service/src/assets/images/avatar.jfif b/sub-operation-service/src/assets/images/avatar.jfif new file mode 100644 index 0000000..6ac1872 Binary files /dev/null and b/sub-operation-service/src/assets/images/avatar.jfif differ diff --git a/sub-operation-service/src/assets/images/avatar.webp b/sub-operation-service/src/assets/images/avatar.webp new file mode 100644 index 0000000..09d44a7 Binary files /dev/null and b/sub-operation-service/src/assets/images/avatar.webp differ diff --git a/sub-operation-service/src/assets/images/smartFarm/deep.png b/sub-operation-service/src/assets/images/smartFarm/deep.png new file mode 100644 index 0000000..6724f05 Binary files /dev/null and b/sub-operation-service/src/assets/images/smartFarm/deep.png differ diff --git a/sub-operation-service/src/assets/images/smartFarm/testPic2.png b/sub-operation-service/src/assets/images/smartFarm/testPic2.png new file mode 100644 index 0000000..ce7abd4 Binary files /dev/null and b/sub-operation-service/src/assets/images/smartFarm/testPic2.png differ diff --git a/sub-operation-service/src/assets/images/smartFarm/testPic3.png b/sub-operation-service/src/assets/images/smartFarm/testPic3.png new file mode 100644 index 0000000..b21e026 Binary files /dev/null and b/sub-operation-service/src/assets/images/smartFarm/testPic3.png differ diff --git a/sub-operation-service/src/components/centerMap.vue b/sub-operation-service/src/components/centerMap.vue index 92c68bd..f2fff6a 100644 --- a/sub-operation-service/src/components/centerMap.vue +++ b/sub-operation-service/src/components/centerMap.vue @@ -137,7 +137,7 @@ const chartsData = reactive({ trigger: 'item', formatter: function (params) { if (params.seriesType === 'effectScatter') { - return `${params.name}: (${params.value[0]}, ${params.value[1]})`; + return `${params.name}`; } return params.name; }, diff --git a/sub-operation-service/src/layouts/component/Header/index.vue b/sub-operation-service/src/layouts/component/Header/index.vue index 2a5e4a2..1d28edd 100644 --- a/sub-operation-service/src/layouts/component/Header/index.vue +++ b/sub-operation-service/src/layouts/component/Header/index.vue @@ -111,7 +111,7 @@ function Search() { const toHome = () => { console.info('toHome', router); - router.push('/sub-operation-service/home'); + router.push('/sub-operation-service'); }; const toUserCenter = () => { @@ -239,9 +239,9 @@ const toCart = () => { .search-warp { position: relative; padding-left: 36px; - width: 100%; + width: 80%; .el-input { - width: 100%; + width: 50%; height: 50px; font-size: 18px; flex-grow: 1; @@ -252,7 +252,7 @@ const toCart = () => { .el-button { position: absolute; top: 50%; - right: 8px; + right: 25%; padding: 0 24px; height: 42px; font-size: 18px; diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js index 825e730..fbf6107 100644 --- a/sub-operation-service/src/router/index.js +++ b/sub-operation-service/src/router/index.js @@ -232,10 +232,16 @@ export const constantRoutes = [ children: [ { path: '/sub-operation-service/ruralFinance/index', - component: () => import('@/views/ruralFinance/index.vue'), + component: () => import('@/views/error/blank.vue'), name: 'ruralFinanceMain', meta: { title: '涉农金融首页' }, }, + // { + // path: '/sub-operation-service/ruralFinance/index', + // component: () => import('@/views/ruralFinance/index.vue'), + // name: 'ruralFinanceMain', + // meta: { title: '涉农金融首页' }, + // }, ], }, { @@ -247,16 +253,28 @@ export const constantRoutes = [ children: [ { path: '/sub-operation-service/packaging/sorting', - component: () => import('@/views/packaging/sorting.vue'), + component: () => import('@/views/error/blank.vue'), name: 'sortingMain', meta: { title: '分拣首页' }, }, + // { + // path: '/sub-operation-service/packaging/sorting', + // component: () => import('@/views/packaging/sorting.vue'), + // name: 'sortingMain', + // meta: { title: '分拣首页' }, + // }, { path: '/sub-operation-service/packaging/index', - component: () => import('@/views/packaging/index.vue'), + component: () => import('@/views/error/blank.vue'), name: 'packagingMain', meta: { title: '包装首页' }, }, + // { + // path: '/sub-operation-service/packaging/index', + // component: () => import('@/views/packaging/index.vue'), + // name: 'packagingMain', + // meta: { title: '包装首页' }, + // }, { path: '/sub-operation-service/packaging/details', component: () => import('@/views/packaging/details.vue'), @@ -274,10 +292,16 @@ export const constantRoutes = [ children: [ { path: '/sub-operation-service/warehouse', - component: () => import('@/views/warehouseLogistics/warehouse/index.vue'), + component: () => import('@/views/error/blank.vue'), name: 'warehouseMain', meta: { title: '仓储首页' }, }, + // { + // path: '/sub-operation-service/warehouse', + // component: () => import('@/views/warehouseLogistics/warehouse/index.vue'), + // name: 'warehouseMain', + // meta: { title: '仓储首页' }, + // }, { path: '/sub-operation-service/warehouse-detail', component: () => import('@/views/warehouseLogistics/warehouse/detail.vue'), @@ -286,10 +310,16 @@ export const constantRoutes = [ }, { path: '/sub-operation-service/logistics', - component: () => import('@/views/warehouseLogistics/logistics/index.vue'), + component: () => import('@/views/error/blank.vue'), name: 'logistics-list', meta: { title: '物流首页' }, }, + // { + // path: '/sub-operation-service/logistics', + // component: () => import('@/views/warehouseLogistics/logistics/index.vue'), + // name: 'logistics-list', + // meta: { title: '物流首页' }, + // }, { path: '/sub-operation-service/logistics-detail', component: () => import('@/views/warehouseLogistics/logistics/detail.vue'), diff --git a/sub-operation-service/src/views/brand/components/ApplyList.vue b/sub-operation-service/src/views/brand/components/ApplyList.vue index b5f3052..7d00825 100644 --- a/sub-operation-service/src/views/brand/components/ApplyList.vue +++ b/sub-operation-service/src/views/brand/components/ApplyList.vue @@ -31,9 +31,9 @@ const products = ref([]); const applyData = [ { id: 1, title: '耿马绿色蔬菜', imgPath: 'images/brand/11.png' }, - { id: 2, title: '耿马云斛石斛', imgPath: 'images/brand/12.png' }, + // { id: 2, title: '耿马云斛石斛', imgPath: 'images/brand/12.png' }, { id: 3, title: '耿马蒸酶茶', imgPath: 'images/brand/15.png' }, - { id: 4, title: '孟定蔬菜', imgPath: 'images/brand/14.png' }, + // { id: 4, title: '孟定蔬菜', imgPath: 'images/brand/14.png' }, { id: 5, title: '耿马芒抗金丝凤梨', imgPath: 'images/brand/16.png' }, // { id: 6, name: '四川泡菜', imgPath: 'images/brand/16.png' }, ]; diff --git a/sub-operation-service/src/views/brand/components/Auth.vue b/sub-operation-service/src/views/brand/components/Auth.vue index e8ce17f..ec965e8 100644 --- a/sub-operation-service/src/views/brand/components/Auth.vue +++ b/sub-operation-service/src/views/brand/components/Auth.vue @@ -7,13 +7,13 @@
较上月上涨 7 件
+较上月上涨 13 件
较上月上涨 7 件
+较上月下降 5 件