From 7ee83f2661b4b62b2f8214dda0457ff487a31d7c Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Wed, 25 Sep 2024 14:58:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=BA=95=E9=83=A8?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E5=8D=95=E7=8B=AC=E9=85=8D=E7=BD=AE=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/main/default/footer-nav.ts | 52 +++++++++++++++--- .../components/main/default/footer-nav.ts | 54 +++++++++++++++---- 2 files changed, 89 insertions(+), 17 deletions(-) diff --git a/src/views/layout/components/main/default/footer-nav.ts b/src/views/layout/components/main/default/footer-nav.ts index 3f075157..3740e7e5 100644 --- a/src/views/layout/components/main/default/footer-nav.ts +++ b/src/views/layout/components/main/default/footer-nav.ts @@ -3,8 +3,8 @@ import { online_url } from '@/utils'; const new_url = await online_url('/static/app/tabbar/').then((res) => res); interface DefaultFooterNav { content: { - nav_style: number; - nav_type: number; + nav_style: string; + nav_type: string; nav_content: { id: string; name: string; img: uploadList[]; img_checked: uploadList[]; link: object }[]; }; style: { @@ -15,13 +15,49 @@ interface DefaultFooterNav { } const defaultFooterNav = ref({ content: { - nav_style: 0, - nav_type: 0, + nav_style: '0', + nav_type: '0', nav_content: [ - { id: '1', name: '首页', img: [{ id: 1, url: new_url + 'home.png', original: '', title: '', ext: '.png', type: 'img' }], img_checked: [{ id: 2, url: new_url + 'active/home.png', original: '', title: '', ext: '.png', type: 'img' }], link: {} }, - { id: '2', name: '分类', img: [{ id: 3, url: new_url + 'category.png', original: '', title: '', ext: '.png', type: 'img' }], img_checked: [{ id: 4, url: new_url + 'active/category.png', original: '', title: '', ext: '.png', type: 'img' }], link: {} }, - { id: '3', name: '购物车', img: [{ id: 5, url: new_url + 'cart.png', original: '', title: '', ext: '.png', type: 'img' }], img_checked: [{ id: 6, url: new_url + 'active/cart.png', original: '', title: '', ext: '.png', type: 'img' }], link: {} }, - { id: '4', name: '我的', img: [{ id: 7, url: new_url + 'user.png', original: '', title: '', ext: '.png', type: 'img' }], img_checked: [{ id: 8, url: new_url + 'active/user.png', original: '', title: '', ext: '.png', type: 'img' }], link: {} }, + { + id: '1', + name: '首页', + img: [{ id: 1, url: new_url + 'home.png', original: '', title: '', ext: '.png', type: 'img' }], + img_checked: [{ id: 2, url: new_url + 'active/home.png', original: '', title: '', ext: '.png', type: 'img' }], + link: { + name: '商城首页', + page: '/pages/index/index', + }, + }, + { + id: '2', + name: '分类', + img: [{ id: 3, url: new_url + 'category.png', original: '', title: '', ext: '.png', type: 'img' }], + img_checked: [{ id: 4, url: new_url + 'active/category.png', original: '', title: '', ext: '.png', type: 'img' }], + link: { + name: '商品分类', + page: '/pages/goods-category/goods-category', + }, + }, + { + id: '3', + name: '购物车', + img: [{ id: 5, url: new_url + 'cart.png', original: '', title: '', ext: '.png', type: 'img' }], + img_checked: [{ id: 6, url: new_url + 'active/cart.png', original: '', title: '', ext: '.png', type: 'img' }], + link: { + name: '购物车', + page: '/pages/cart/cart', + }, + }, + { + id: '4', + name: '我的', + img: [{ id: 7, url: new_url + 'user.png', original: '', title: '', ext: '.png', type: 'img' }], + img_checked: [{ id: 8, url: new_url + 'active/user.png', original: '', title: '', ext: '.png', type: 'img' }], + link: { + name: '我的', + page: '/pages/user/user', + }, + }, ], }, style: { diff --git a/src/views/tabbar/components/main/default/footer-nav.ts b/src/views/tabbar/components/main/default/footer-nav.ts index 54841f10..3740e7e5 100644 --- a/src/views/tabbar/components/main/default/footer-nav.ts +++ b/src/views/tabbar/components/main/default/footer-nav.ts @@ -1,10 +1,10 @@ import defaultCommon from './index'; import { online_url } from '@/utils'; const new_url = await online_url('/static/app/tabbar/').then((res) => res); -export interface DefaultFooterNav { +interface DefaultFooterNav { content: { - nav_style: number; - nav_type: number; + nav_style: string; + nav_type: string; nav_content: { id: string; name: string; img: uploadList[]; img_checked: uploadList[]; link: object }[]; }; style: { @@ -15,13 +15,49 @@ export interface DefaultFooterNav { } const defaultFooterNav = ref({ content: { - nav_style: 0, - nav_type: 0, + nav_style: '0', + nav_type: '0', nav_content: [ - { id: '1', name: '首页', img: [{ id: 1, url: new_url + 'home.png', original: '', title: '', ext: '.png', type: 'img' }], img_checked: [{ id: 2, url: new_url + 'active/home.png', original: '', title: '', ext: '.png', type: 'img' }], link: {} }, - { id: '2', name: '分类', img: [{ id: 3, url: new_url + 'category.png', original: '', title: '', ext: '.png', type: 'img' }], img_checked: [{ id: 4, url: new_url + 'active/category.png', original: '', title: '', ext: '.png', type: 'img' }], link: {} }, - { id: '3', name: '购物车', img: [{ id: 5, url: new_url + 'cart.png', original: '', title: '', ext: '.png', type: 'img' }], img_checked: [{ id: 6, url: new_url + 'active/cart.png', original: '', title: '', ext: '.png', type: 'img' }], link: {} }, - { id: '4', name: '我的', img: [{ id: 7, url: new_url + 'user.png', original: '', title: '', ext: '.png', type: 'img' }], img_checked: [{ id: 8, url: new_url + 'active/user.png', original: '', title: '', ext: '.png', type: 'img' }], link: {} }, + { + id: '1', + name: '首页', + img: [{ id: 1, url: new_url + 'home.png', original: '', title: '', ext: '.png', type: 'img' }], + img_checked: [{ id: 2, url: new_url + 'active/home.png', original: '', title: '', ext: '.png', type: 'img' }], + link: { + name: '商城首页', + page: '/pages/index/index', + }, + }, + { + id: '2', + name: '分类', + img: [{ id: 3, url: new_url + 'category.png', original: '', title: '', ext: '.png', type: 'img' }], + img_checked: [{ id: 4, url: new_url + 'active/category.png', original: '', title: '', ext: '.png', type: 'img' }], + link: { + name: '商品分类', + page: '/pages/goods-category/goods-category', + }, + }, + { + id: '3', + name: '购物车', + img: [{ id: 5, url: new_url + 'cart.png', original: '', title: '', ext: '.png', type: 'img' }], + img_checked: [{ id: 6, url: new_url + 'active/cart.png', original: '', title: '', ext: '.png', type: 'img' }], + link: { + name: '购物车', + page: '/pages/cart/cart', + }, + }, + { + id: '4', + name: '我的', + img: [{ id: 7, url: new_url + 'user.png', original: '', title: '', ext: '.png', type: 'img' }], + img_checked: [{ id: 8, url: new_url + 'active/user.png', original: '', title: '', ext: '.png', type: 'img' }], + link: { + name: '我的', + page: '/pages/user/user', + }, + }, ], }, style: { From 6cd9bc6505b796b8ace18ef1e4f9606d748d1cbb Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Wed, 25 Sep 2024 15:17:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A6=81=E6=AD=A2=E9=87=8D=E5=A4=8D=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/layout/components/navbar/index.vue | 16 ++++++++++------ src/views/layout/index.vue | 13 ++++++++++--- src/views/tabbar/index.vue | 7 ++++++- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/views/layout/components/navbar/index.vue b/src/views/layout/components/navbar/index.vue index cde8e759..0f409b96 100644 --- a/src/views/layout/components/navbar/index.vue +++ b/src/views/layout/components/navbar/index.vue @@ -16,8 +16,8 @@ @@ -53,6 +53,12 @@