diff --git a/sub-operation-service/src/assets/images/userCenter/menu1-1.png b/sub-operation-service/src/assets/images/userCenter/menu1-1.png index 7c0e779..0416f07 100644 Binary files a/sub-operation-service/src/assets/images/userCenter/menu1-1.png and b/sub-operation-service/src/assets/images/userCenter/menu1-1.png differ diff --git a/sub-operation-service/src/assets/images/userCenter/menu1.png b/sub-operation-service/src/assets/images/userCenter/menu1.png index ea12279..1e4dd15 100644 Binary files a/sub-operation-service/src/assets/images/userCenter/menu1.png and b/sub-operation-service/src/assets/images/userCenter/menu1.png differ diff --git a/sub-operation-service/src/assets/images/userCenter/menu2-1.png b/sub-operation-service/src/assets/images/userCenter/menu2-1.png index 03e88b5..f581cbc 100644 Binary files a/sub-operation-service/src/assets/images/userCenter/menu2-1.png and b/sub-operation-service/src/assets/images/userCenter/menu2-1.png differ diff --git a/sub-operation-service/src/assets/images/userCenter/menu2.png b/sub-operation-service/src/assets/images/userCenter/menu2.png index cf2e9a2..07767fa 100644 Binary files a/sub-operation-service/src/assets/images/userCenter/menu2.png and b/sub-operation-service/src/assets/images/userCenter/menu2.png differ diff --git a/sub-operation-service/src/assets/images/userCenter/menu3-1.png b/sub-operation-service/src/assets/images/userCenter/menu3-1.png index b02c8ae..904cc55 100644 Binary files a/sub-operation-service/src/assets/images/userCenter/menu3-1.png and b/sub-operation-service/src/assets/images/userCenter/menu3-1.png differ diff --git a/sub-operation-service/src/assets/images/userCenter/menu3.png b/sub-operation-service/src/assets/images/userCenter/menu3.png index 45d173a..32b21ba 100644 Binary files a/sub-operation-service/src/assets/images/userCenter/menu3.png and b/sub-operation-service/src/assets/images/userCenter/menu3.png differ diff --git a/sub-operation-service/src/assets/images/userCenter/menu4-1.png b/sub-operation-service/src/assets/images/userCenter/menu4-1.png new file mode 100644 index 0000000..e175387 Binary files /dev/null and b/sub-operation-service/src/assets/images/userCenter/menu4-1.png differ diff --git a/sub-operation-service/src/assets/images/userCenter/menu4.png b/sub-operation-service/src/assets/images/userCenter/menu4.png new file mode 100644 index 0000000..faceeb3 Binary files /dev/null and b/sub-operation-service/src/assets/images/userCenter/menu4.png differ diff --git a/sub-operation-service/src/assets/images/userCenter/menu5-1.png b/sub-operation-service/src/assets/images/userCenter/menu5-1.png new file mode 100644 index 0000000..a8de146 Binary files /dev/null and b/sub-operation-service/src/assets/images/userCenter/menu5-1.png differ diff --git a/sub-operation-service/src/assets/images/userCenter/menu5.png b/sub-operation-service/src/assets/images/userCenter/menu5.png new file mode 100644 index 0000000..ecf49a7 Binary files /dev/null and b/sub-operation-service/src/assets/images/userCenter/menu5.png differ diff --git a/sub-operation-service/src/assets/images/userCenter/menu6-1.png b/sub-operation-service/src/assets/images/userCenter/menu6-1.png new file mode 100644 index 0000000..70b8941 Binary files /dev/null and b/sub-operation-service/src/assets/images/userCenter/menu6-1.png differ diff --git a/sub-operation-service/src/assets/images/userCenter/menu6.png b/sub-operation-service/src/assets/images/userCenter/menu6.png new file mode 100644 index 0000000..e9f6788 Binary files /dev/null and b/sub-operation-service/src/assets/images/userCenter/menu6.png differ diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js index e1567fa..f7edeb6 100644 --- a/sub-operation-service/src/router/index.js +++ b/sub-operation-service/src/router/index.js @@ -85,6 +85,12 @@ export const constantRoutes = [ name: 'myFinance', meta: { title: '我的金融' }, }, + { + path: '/sub-operation-service/myBrand', + component: () => import('@/views/userCenter/myBrand.vue'), + name: 'myBrand', + meta: { title: '我的品牌' }, + }, ], }, diff --git a/sub-operation-service/src/views/userCenter/components/leftMenu.vue b/sub-operation-service/src/views/userCenter/components/leftMenu.vue index dd85883..6e0edc7 100644 --- a/sub-operation-service/src/views/userCenter/components/leftMenu.vue +++ b/sub-operation-service/src/views/userCenter/components/leftMenu.vue @@ -34,8 +34,9 @@ const leftMenu = reactive([ { name: 'agricultural', title: '我的购物车', icon: 'menu1.png', path: '/sub-operation-service/userCenter' }, { name: 'supplier', title: '我的订单', icon: 'menu2-1.png', path: '/sub-operation-service/userOrders' }, // { name: 'purchaser', title: '我的土地', icon: 'menu3-1.png', path: '/sub-operation-service/userLands' }, - { name: 'mySource', title: '我的溯源', icon: 'menu3-1.png', path: '/sub-operation-service/mySource' }, - { name: 'myFinance', title: '我的金融', icon: 'menu3-1.png', path: '/sub-operation-service/myFinance' }, + { name: 'mySource', title: '我的溯源', icon: 'menu4-1.png', path: '/sub-operation-service/mySource' }, + { name: 'myFinance', title: '我的金融', icon: 'menu5-1.png', path: '/sub-operation-service/myFinance' }, + { name: 'myBrand', title: '我的品牌', icon: 'menu6-1.png', path: '/sub-operation-service/myBrand' }, ]); let currentIndex = ref(0); @@ -114,15 +115,20 @@ const toLink = (n, index) => { } .item-img { display: inline-block; - width: 32px; - height: 32px; + width: 40px; + height: 40px; + img { + width: 100%; + height: auto; + display: block; + } } .item-title { display: -webkit-inline-box; font-size: 20px; font-weight: 400; line-height: 40px; - padding-left: 20px; + padding-left: 10px; } } } diff --git a/sub-operation-service/src/views/userCenter/components/tableComponent.vue b/sub-operation-service/src/views/userCenter/components/tableComponent.vue index 03b63cc..6b10cc7 100644 --- a/sub-operation-service/src/views/userCenter/components/tableComponent.vue +++ b/sub-operation-service/src/views/userCenter/components/tableComponent.vue @@ -29,7 +29,7 @@ :prop="column.prop" :label="column.label" :width="column.width" - :align="column.align || 'center'" + :align="column.align || 'left'" :sortable="column.sortable" :header-class-name="column.headerClassName" > diff --git a/sub-operation-service/src/views/userCenter/myBrand.vue b/sub-operation-service/src/views/userCenter/myBrand.vue new file mode 100644 index 0000000..6185e15 --- /dev/null +++ b/sub-operation-service/src/views/userCenter/myBrand.vue @@ -0,0 +1,407 @@ + + + diff --git a/sub-operation-service/src/views/userCenter/myFinance.vue b/sub-operation-service/src/views/userCenter/myFinance.vue index 8e41880..d2bc72f 100644 --- a/sub-operation-service/src/views/userCenter/myFinance.vue +++ b/sub-operation-service/src/views/userCenter/myFinance.vue @@ -1,6 +1,6 @@