From 24202cd2f1ca18464287127b7bed1ec06eaf517a Mon Sep 17 00:00:00 2001
From: ctw <example@email.com>
Date: Tue, 9 Dec 2025 17:12:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=B0=83=E6=95=B4=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                 | 18 +++++++++---------
 src/pages/login/login.vue                      |  2 +-
 src/pages/message/friend.vue                   |  2 +-
 src/pages/profile/gender-choose.vue            |  2 +-
 .../components/scroll-moment.vue               |  0
 .../components/scroll-user.vue                 |  0
 .../components/user-ablum.vue                  |  0
 src/pages/{home => tabbar}/home.vue            |  2 +-
 src/pages/{message => tabbar}/message.vue      |  0
 src/pages/{moments => tabbar}/moments.vue      |  0
 src/pages/{profile => tabbar}/profile.vue      | 10 +++++++---
 11 files changed, 20 insertions(+), 16 deletions(-)
 rename src/pages/{moments => tabbar}/components/scroll-moment.vue (100%)
 rename src/pages/{home => tabbar}/components/scroll-user.vue (100%)
 rename src/pages/{profile => tabbar}/components/user-ablum.vue (100%)
 rename src/pages/{home => tabbar}/home.vue (95%)
 rename src/pages/{message => tabbar}/message.vue (100%)
 rename src/pages/{moments => tabbar}/moments.vue (100%)
 rename src/pages/{profile => tabbar}/profile.vue (97%)

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);
   };
 </script>
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 @@
     </swiper>
   </wd-config-provider>
 
-  <navigator url="/pages/wechat/index" open-type="navigate" hover-class="navigator-hover">
+  <navigator url="/pages/wechat-tabbar/index" open-type="navigate" hover-class="navigator-hover">
     <image
       class="size-120rpx fixed right-0 bottom-160"
       src="@/static/invitation-activity.png"
diff --git a/src/pages/message/message.vue b/src/pages/tabbar/message.vue
similarity index 100%
rename from src/pages/message/message.vue
rename to src/pages/tabbar/message.vue
diff --git a/src/pages/moments/moments.vue b/src/pages/tabbar/moments.vue
similarity index 100%
rename from src/pages/moments/moments.vue
rename to src/pages/tabbar/moments.vue
diff --git a/src/pages/profile/profile.vue b/src/pages/tabbar/profile.vue
similarity index 97%
rename from src/pages/profile/profile.vue
rename to src/pages/tabbar/profile.vue
index 3c54ccf2..e7a93865 100644
--- a/src/pages/profile/profile.vue
+++ b/src/pages/tabbar/profile.vue
@@ -110,7 +110,11 @@
             <text class="text-xs ml-2">邀请福利</text>
             <text class="text-20rpx ml-4 mt-2rpx">邀请用户领会员</text>
           </view>
-          <navigator url="/pages/wechat/index" open-type="navigate" hover-class="navigator-hover">
+          <navigator
+            url="/pages/wechat-tabbar/index"
+            open-type="navigate"
+            hover-class="navigator-hover"
+          >
             <view class="bg-color-theme text-xs rounded-full py-1 px-3">查看福利</view>
           </navigator>
         </view>
@@ -186,7 +190,7 @@
 <script setup lang="ts">
   import { computed, reactive, ref } from 'vue';
   import UserAblum from './components/user-ablum.vue';
-  import useAblum from './use-ablum';
+  import useAblum from '../profile/use-ablum';
   // @ts-ignore
   import sheep from '@/sheep';
   import RecentApi from '@/sheep/api/member/recent';
@@ -269,7 +273,7 @@
 
   // 菜单
   const MenuCellList = [
-    { title: '我的收益', value: '', icon: 'wallet', to: '/pages/wechat/index' },
+    { title: '我的收益', value: '', icon: 'wallet', to: '/pages/wechat-tabbar/index' },
     { title: '访客记录√', value: '', icon: 'browse', to: '/pages/profile/view-record' },
     { title: '认证中心', value: '', icon: 'user', to: '/pages/profile/verify-status' },
     { title: '我的动态√', value: '', icon: 'star', to: '/pages/profile/my-moment' },