diff --git a/pages.config.ts b/pages.config.ts index e3a2b28..9bf1230 100644 --- a/pages.config.ts +++ b/pages.config.ts @@ -49,17 +49,11 @@ export default defineUniPages({ // iconType: 'local', // }, { - pagePath: 'pages/my/index', + pagePath: 'pages/mine/index', text: '我的', icon: 'iconfont icon-my', iconType: 'iconfont', }, - { - iconPath: 'static/tabbar/personal.png', - selectedIconPath: 'static/tabbar/personalHL.png', - pagePath: 'pages/mine/index', - text: '我的', - }, ], }, }) diff --git a/src/pages.json b/src/pages.json index c806f18..63f31e6 100644 --- a/src/pages.json +++ b/src/pages.json @@ -38,16 +38,10 @@ "iconType": "unocss" }, { - "pagePath": "pages/my/index", + "pagePath": "pages/mine/index", "text": "我的", "icon": "iconfont icon-my", "iconType": "iconfont" - }, - { - "iconPath": "static/tabbar/personal.png", - "selectedIconPath": "static/tabbar/personalHL.png", - "pagePath": "pages/mine/index", - "text": "我的" } ] }, @@ -81,6 +75,7 @@ { "path": "pages/mine/index", "type": "page", + "layout": "tabbar", "style": { "navigationBarTitleText": "我的" } diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue index c22773c..8dd5567 100644 --- a/src/pages/mine/index.vue +++ b/src/pages/mine/index.vue @@ -1,5 +1,6 @@ { + layout: 'tabbar', style: { navigationBarTitleText: '我的', }, diff --git a/src/pages/my/index.vue b/src/pages/my/index.vue deleted file mode 100644 index 169627b..0000000 --- a/src/pages/my/index.vue +++ /dev/null @@ -1,20 +0,0 @@ - -{ - layout: 'tabbar', - style: { - navigationBarTitleText: '我的', - }, -} - - - - - - - diff --git a/src/types/components.d.ts b/src/types/components.d.ts index 842ef29..baadcc9 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -8,6 +8,7 @@ export {} declare module 'vue' { export interface GlobalComponents { FgNavbar: typeof import('./../components/fg-navbar/fg-navbar.vue')['default'] + FgTabbar: typeof import('./../components/fg-tabbar/fg-tabbar.vue')['default'] PrivacyPopup: typeof import('./../components/privacy-popup/privacy-popup.vue')['default'] } } diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index b0ead03..47d231e 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -6,7 +6,6 @@ interface NavigateToOptions { url: "/pages/index/index" | "/pages/about/about" | - "/pages/my/index"| "/pages/login/index" | "/pages/mine/index" | "/pages/mine/about/index" | @@ -16,7 +15,7 @@ interface NavigateToOptions { interface RedirectToOptions extends NavigateToOptions {} interface SwitchTabOptions { - url: "/pages/index/index" | "/pages/about/about" | "/pages/my/index"|"/pages/mine/index" + url: "/pages/index/index" | "/pages/about/about" | "/pages/mine/index" } type ReLaunchOptions = NavigateToOptions | SwitchTabOptions;