diff --git a/sub-operation-service/src/assets/images/smartFarm/logo2.png b/sub-operation-service/src/assets/images/smartFarm/logo2.png new file mode 100644 index 0000000..f1628a9 Binary files /dev/null and b/sub-operation-service/src/assets/images/smartFarm/logo2.png differ diff --git a/sub-operation-service/src/assets/images/smartFarm/message.png b/sub-operation-service/src/assets/images/smartFarm/message.png new file mode 100644 index 0000000..2dc2daf Binary files /dev/null and b/sub-operation-service/src/assets/images/smartFarm/message.png differ diff --git a/sub-operation-service/src/assets/images/smartFarm/position.png b/sub-operation-service/src/assets/images/smartFarm/position.png new file mode 100644 index 0000000..e0d30f6 Binary files /dev/null and b/sub-operation-service/src/assets/images/smartFarm/position.png differ diff --git a/sub-operation-service/src/assets/images/smartFarm/优先级.png b/sub-operation-service/src/assets/images/smartFarm/优先级.png new file mode 100644 index 0000000..fa17cef Binary files /dev/null and b/sub-operation-service/src/assets/images/smartFarm/优先级.png differ diff --git a/sub-operation-service/src/assets/images/smartFarm/认证.png b/sub-operation-service/src/assets/images/smartFarm/认证.png new file mode 100644 index 0000000..6125c4b Binary files /dev/null and b/sub-operation-service/src/assets/images/smartFarm/认证.png differ diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js index 571aa99..6fbefbd 100644 --- a/sub-operation-service/src/router/index.js +++ b/sub-operation-service/src/router/index.js @@ -248,7 +248,7 @@ export const constantRoutes = [ meta: { title: '使用申请' }, }, { - path: 'apply/:id', + path: 'brandApplyDetail', name: 'brandApplyDetail', component: () => import('@/views/brand/components/ApplyDetail.vue'), meta: { title: '产品申请' }, diff --git a/sub-operation-service/src/views/brand/components/ApplyDetail.vue b/sub-operation-service/src/views/brand/components/ApplyDetail.vue index d1af96f..350fa50 100644 --- a/sub-operation-service/src/views/brand/components/ApplyDetail.vue +++ b/sub-operation-service/src/views/brand/components/ApplyDetail.vue @@ -19,7 +19,7 @@ 点击上传 diff --git a/sub-operation-service/src/views/brand/components/ApplyList.vue b/sub-operation-service/src/views/brand/components/ApplyList.vue index ba2b99a..ec3eb5e 100644 --- a/sub-operation-service/src/views/brand/components/ApplyList.vue +++ b/sub-operation-service/src/views/brand/components/ApplyList.vue @@ -24,9 +24,9 @@ const router = useRouter(); const products = ref([]); // 获取商品数据 -getApplyList().then((res) => { - products.value = res.data; -}); +// getApplyList().then((res) => { +// products.value = res.data; +// }); const applyData = [ { id: 1, name: '耿马绿色蔬菜', imageUrl: 'images/brand/11.png' }, @@ -44,7 +44,7 @@ const applyData = [ ]; function gotoApplication(id) { - router.push(`/sub-operation-service/brand/apply/${id}`); + router.push('/sub-operation-service/brand/brandApplyDetail?id=' + id); } // TODO: 对接口需要删除这个方法 diff --git a/sub-operation-service/src/views/brand/index.vue b/sub-operation-service/src/views/brand/index.vue index 34fea47..899c12f 100644 --- a/sub-operation-service/src/views/brand/index.vue +++ b/sub-operation-service/src/views/brand/index.vue @@ -52,7 +52,7 @@ const menuMap = { // 获取当前菜单激活项 const activeMenu = computed(() => { const matched = Object.entries(menuMap).find(([key, names]) => names.includes(route.name)); - console.log(matched[0]); + // console.log(matched[0]); return matched ? matched[0] : ''; }); // 菜单切换处理 diff --git a/sub-operation-service/src/views/ecommerce/components/goodSource.vue b/sub-operation-service/src/views/ecommerce/components/goodSource.vue new file mode 100644 index 0000000..f76c64f --- /dev/null +++ b/sub-operation-service/src/views/ecommerce/components/goodSource.vue @@ -0,0 +1,134 @@ + + + + + diff --git a/sub-operation-service/src/views/ecommerce/components/marketCharts.vue b/sub-operation-service/src/views/ecommerce/components/marketCharts.vue index 158996a..dd53421 100644 --- a/sub-operation-service/src/views/ecommerce/components/marketCharts.vue +++ b/sub-operation-service/src/views/ecommerce/components/marketCharts.vue @@ -139,7 +139,7 @@ const chartsData = reactive({ color: 'rgba(255, 255, 255, .6)', }, }, - extraCssText: 'box-shadow: 2px 2px 16px 1px rgba(0, 39, 102, 0.16)', + extraCssText: 'box-shadow: 2px 2px 16px 1px rgba(0, 39, 102, 0.16);z-index: 1', formatter: function (params) { let content = `
${params[0].name}
`; if (Array.isArray(params)) { diff --git a/sub-operation-service/src/views/ecommerce/components/purchaserPopup.vue b/sub-operation-service/src/views/ecommerce/components/purchaserPopup.vue index 3263031..881ddb7 100644 --- a/sub-operation-service/src/views/ecommerce/components/purchaserPopup.vue +++ b/sub-operation-service/src/views/ecommerce/components/purchaserPopup.vue @@ -1,52 +1,99 @@