diff --git a/src/pages.json b/src/pages.json index 1474d3ee..2ee38372 100644 --- a/src/pages.json +++ b/src/pages.json @@ -104,28 +104,28 @@ } }, { - "path": "pages/home/home", + "path": "pages/tabbar/home", "style": { "navigationBarTitleText": "首页", "navigationStyle": "custom" } }, { - "path": "pages/moments/moments", + "path": "pages/tabbar/moments", "style": { "navigationBarTitleText": "动态", "navigationStyle": "custom" } }, { - "path": "pages/message/message", + "path": "pages/tabbar/message", "style": { "navigationBarTitleText": "消息", "navigationStyle": "custom" } }, { - "path": "pages/profile/profile", + "path": "pages/tabbar/profile", "style": { "navigationBarTitleText": "我的", "navigationStyle": "custom" @@ -993,25 +993,25 @@ /* #ifndef MP-WEIXIN */ "list": [ { - "pagePath": "pages/home/home", + "pagePath": "pages/tabbar/home", "text": "首页", "iconPath": "static/tabbar/home.png", "selectedIconPath": "static/tabbar/home-active.png" }, { - "pagePath": "pages/moments/moments", + "pagePath": "pages/tabbar/moments", "text": "动态", "iconPath": "static/tabbar/moments.png", "selectedIconPath": "static/tabbar/moments-active.png" }, { - "pagePath": "pages/message/message", + "pagePath": "pages/tabbar/message", "text": "消息", "iconPath": "static/tabbar/message.png", "selectedIconPath": "static/tabbar/message-active.png" }, { - "pagePath": "pages/profile/profile", + "pagePath": "pages/tabbar/profile", "text": "我的", "iconPath": "static/tabbar/profile.png", "selectedIconPath": "static/tabbar/profile-active.png" @@ -1019,4 +1019,4 @@ ] /* #endif MP-WEIXIN */ } -} \ No newline at end of file +} diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index fd9b6e8a..240eb6f3 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -121,7 +121,7 @@ const { code } = await AuthUtil.smsRegister({ mobile: phone.value, code: smsCode.value }); if (code === 0) { - uni.reLaunch({ url: '/pages/home/home' }); + uni.reLaunch({ url: '/pages/tabbar/home' }); getApp().$vm.init(); return; } diff --git a/src/pages/message/friend.vue b/src/pages/message/friend.vue index 98e88883..82516fc0 100644 --- a/src/pages/message/friend.vue +++ b/src/pages/message/friend.vue @@ -67,7 +67,7 @@ }, methods: { onAddNewFriends() { - uni.switchTab({ url: '/pages/home/home' }); + uni.switchTab({ url: '/pages/tabbar/home' }); }, firstLetter(strText) { // 使用pinyin-pro库将中文转换为拼音 diff --git a/src/pages/profile/gender-choose.vue b/src/pages/profile/gender-choose.vue index a8940b98..1ecf798e 100644 --- a/src/pages/profile/gender-choose.vue +++ b/src/pages/profile/gender-choose.vue @@ -142,7 +142,7 @@ await sheep.$store('user').getInfo(); sheep.$helper.toast('保存成功'); setTimeout(() => { - uni.reLaunch({ url: '/pages/home/home' }); + uni.reLaunch({ url: '/pages/tabbar/home' }); }, 300); }; diff --git a/src/pages/moments/components/scroll-moment.vue b/src/pages/tabbar/components/scroll-moment.vue similarity index 100% rename from src/pages/moments/components/scroll-moment.vue rename to src/pages/tabbar/components/scroll-moment.vue diff --git a/src/pages/home/components/scroll-user.vue b/src/pages/tabbar/components/scroll-user.vue similarity index 100% rename from src/pages/home/components/scroll-user.vue rename to src/pages/tabbar/components/scroll-user.vue diff --git a/src/pages/profile/components/user-ablum.vue b/src/pages/tabbar/components/user-ablum.vue similarity index 100% rename from src/pages/profile/components/user-ablum.vue rename to src/pages/tabbar/components/user-ablum.vue diff --git a/src/pages/home/home.vue b/src/pages/tabbar/home.vue similarity index 95% rename from src/pages/home/home.vue rename to src/pages/tabbar/home.vue index d1e3f60e..db80aedc 100644 --- a/src/pages/home/home.vue +++ b/src/pages/tabbar/home.vue @@ -27,7 +27,7 @@ - + 邀请福利 邀请用户领会员 - + 查看福利 @@ -186,7 +190,7 @@