Kaynağa Gözat

revert(frontend): 撤销 tabbar 入口页移至 pages/tabs/ 的改动

liaoxg 1 ay önce
ebeveyn
işleme
0fb564c5dd

+ 5 - 5
cfc-frontend/custom-tab-bar/index.vue

@@ -70,15 +70,15 @@ export default {
       showDimOverlay: false,
       mainTabs: [
         { text: '首页', pagePath: '/pages/index-home/index', icon: '/static/tab-action.png', selectedIcon: '/static/tab-action-active.png' },
-        { text: '健康', pagePath: '/pages/tabs/health-index', icon: '/static/tab-body.png', selectedIcon: '/static/tab-body-active.png' },
-        { text: '成长', pagePath: '/pages/tabs/growth-index', icon: '/static/tab-growth.png', selectedIcon: '/static/tab-growth-active.png' },
-        { text: '我的', pagePath: '/pages/tabs/profile-page', icon: '/static/tab-profile.png', selectedIcon: '/static/tab-profile-active.png' }
+        { text: '健康', pagePath: '/pages/health-pkg/index', icon: '/static/tab-body.png', selectedIcon: '/static/tab-body-active.png' },
+        { text: '成长', pagePath: '/pages/growth-pkg/index', icon: '/static/tab-growth.png', selectedIcon: '/static/tab-growth-active.png' },
+        { text: '我的', pagePath: '/pages/profile-pkg/profile', icon: '/static/tab-profile.png', selectedIcon: '/static/tab-profile-active.png' }
       ],
       teacherTabs: [
         { text: '首页', pagePath: '/pages/teacher/index', icon: '/static/tab-action.png', selectedIcon: '/static/tab-action-active.png' },
         { text: '家庭', pagePath: '/pages/teacher/families', icon: '/static/tab-family.png', selectedIcon: '/static/tab-family-active.png' },
         { text: '团队', pagePath: '/pages/teacher/team', icon: '/static/tab-team.png', selectedIcon: '/static/tab-team-active.png' },
-        { text: '成长档案', pagePath: '/pages/tabs/growth-index', icon: '/static/tab-growth.png', selectedIcon: '/static/tab-growth-active.png' },
+        { text: '成长档案', pagePath: '/pages/growth-pkg/index', icon: '/static/tab-growth.png', selectedIcon: '/static/tab-growth-active.png' },
         { text: '我的', pagePath: '/pages/teacher/teacher-profile', icon: '/static/tab-profile.png', selectedIcon: '/static/tab-profile-active.png' }
       ],
       dimensions: [
@@ -130,7 +130,7 @@ export default {
     switchTab(item, index) {
       this.currentIndex = index
       // 只有 TabBar 注册页才能用 switchTab
-      const nativeTabPages = ['/pages/index-home/index', '/pages/tabs/health-index', '/pages/tabs/growth-index', '/pages/tabs/profile-page']
+      const nativeTabPages = ['/pages/index-home/index', '/pages/health-pkg/index', '/pages/growth-pkg/index', '/pages/profile-pkg/profile']
       if (nativeTabPages.includes(item.pagePath)) {
         uni.switchTab({ url: item.pagePath })
       } else {

+ 7 - 7
cfc-frontend/pages.json

@@ -7,19 +7,19 @@
       }
     },
     {
-      "path": "pages/tabs/health-index",
+      "path": "pages/health-pkg/index",
       "style": {
         "navigationBarTitleText": "健康"
       }
     },
     {
-      "path": "pages/tabs/growth-index",
+      "path": "pages/growth-pkg/index",
       "style": {
         "navigationBarTitleText": "成长"
       }
     },
     {
-      "path": "pages/tabs/profile-page",
+      "path": "pages/profile-pkg/profile",
       "style": {
         "navigationBarTitleText": "我的"
       }
@@ -1493,19 +1493,19 @@
         "selectedIconPath": "static/tab-action-active.png"
       },
       {
-        "pagePath": "pages/tabs/health-index",
+        "pagePath": "pages/health-pkg/index",
         "text": "健康",
         "iconPath": "/static/tab-body.png",
         "selectedIconPath": "/static/tab-body-active.png"
       },
       {
-        "pagePath": "pages/tabs/growth-index",
+        "pagePath": "pages/growth-pkg/index",
         "text": "成长",
         "iconPath": "static/tab-growth.png",
         "selectedIconPath": "static/tab-growth-active.png"
       },
       {
-        "pagePath": "pages/tabs/profile-page",
+        "pagePath": "pages/profile-pkg/profile",
         "text": "我的",
         "iconPath": "static/tab-profile.png",
         "selectedIconPath": "static/tab-profile-active.png"
@@ -1518,4 +1518,4 @@
       "pages/*": "components/@dcloudio/uni-$2/components/uni-$1/uni-$1.vue"
     }
   }
-}
+}

+ 1 - 1
cfc-frontend/pages/ai/chat.vue

@@ -208,7 +208,7 @@ export default {
           'pages/index/index': '首页',
           'pages/index/parent-index': '首页',
           'pages/index/child-index': '首页',
-          'pages/tabs/profile-page': '我的',
+          'pages/profile-pkg/profile': '我的',
           'pages/profile-pkg/children': '我的',
           'pages/shop/index': '商城',
           'pages/discover/index': '发现'

+ 0 - 0
cfc-frontend/pages/tabs/growth-index.vue → cfc-frontend/pages/growth-pkg/index.vue


+ 0 - 0
cfc-frontend/pages/tabs/health-index.vue → cfc-frontend/pages/health-pkg/index.vue


+ 1 - 1
cfc-frontend/pages/mind/index.vue

@@ -227,7 +227,7 @@ components: { TabTransition, PageBanner, RadarChart, LoginGuideCard, FamilyEnerg
       funcList: [
         { icon: '\u{1F4D6}', label: '阅读', needLogin: false, page: '/pages/mind-extra/articles' },
         { icon: '\u{1F4CA}', label: '测评报告', needLogin: true, page: '/pages/mind/emotion-report' },
-        { icon: '\u{1F4DD}', label: '成长档案', needLogin: true, page: '/pages/tabs/growth-index' },
+        { icon: '\u{1F4DD}', label: '成长档案', needLogin: true, page: '/pages/growth-pkg/index' },
         { icon: '\u{2728}', label: '情绪打卡', needLogin: true, page: '/pages/mind-detail/emotion-checkin' },
         { icon: '\u{1F4C8}', label: '情绪趋势', needLogin: true, page: '/pages/mind-detail/emotion-trend' },
         { icon: '\u{1F9E9}', label: '心理自评', needLogin: true, page: '/pages/mind-detail/screening' },

+ 1 - 1
cfc-frontend/pages/parent/child-detail.vue

@@ -200,7 +200,7 @@ export default {
     },
     goToGrowth() {
       uni.navigateTo({
-        url: '/pages/tabs/growth-index?memberId=' + this.memberId
+        url: '/pages/growth-pkg/index?memberId=' + this.memberId
       })
     },
     goToCompletionStats() {

+ 0 - 0
cfc-frontend/pages/tabs/profile-page.vue → cfc-frontend/pages/profile-pkg/profile.vue


+ 1 - 1
cfc-frontend/pages/teacher/teacher-home.vue

@@ -203,7 +203,7 @@ export default {
         team: '/pages/teacher/team',
         messages: '/pages/teacher/messages',
         orders: '/pages/teacher/orders',
-        growth: '/pages/tabs/growth-index'
+        growth: '/pages/growth-pkg/index'
       }
       uni.reLaunch({ url: routes[page] })
     }

+ 1 - 1
cfc-frontend/pages/teacher/teacher-profile.vue

@@ -129,7 +129,7 @@ export default {
       uni.navigateTo({ url: '/pages/user-edit/user-edit' })
     },
     goToGrowth() {
-      uni.reLaunch({ url: '/pages/tabs/growth-index' })
+      uni.reLaunch({ url: '/pages/growth-pkg/index' })
     },
     goToMessages() {
       uni.navigateTo({ url: '/pages/teacher/messages' })

+ 1 - 1
cfc-frontend/pages/wealth/index.vue

@@ -551,7 +551,7 @@ export default {
       })
     },
     goToProfile() {
-      uni.navigateTo({ url: '/pages/tabs/profile-page' })
+      uni.navigateTo({ url: '/pages/profile-pkg/profile' })
     },
     goToCheckin() {
       uni.navigateTo({ url: '/pages/wealth-sub/checkin' })

+ 3 - 3
cfc-frontend/utils/nav.js

@@ -4,9 +4,9 @@
  */
 var TAB_BAR_PAGES = [
   '/pages/index-home/index',
-  '/pages/tabs/health-index',
-  '/pages/tabs/growth-index',
-  '/pages/tabs/profile-page'
+  '/pages/health-pkg/index',
+  '/pages/growth-pkg/index',
+  '/pages/profile-pkg/profile'
 ]
 
 /**