Преглед на файлове

fix: body-detail navigation to unregistered pages; resolve action-detail merge conflict

liaoxg преди 5 дни
родител
ревизия
2e26400524
променени са 2 файла, в които са добавени 3 реда и са изтрити 5 реда
  1. 1 3
      cfc-frontend/pages/action-detail/index.vue
  2. 2 2
      cfc-frontend/pages/body-detail/index.vue

+ 1 - 3
cfc-frontend/pages/action-detail/index.vue

@@ -422,7 +422,6 @@ export default {
       }
       return scores
     },
-<<<<<<< Updated upstream
 
     /** 关系解读状态:good(≥80) | warn(≥60) | bad(<60) */
     scoreExplainLevel: function() {
@@ -435,7 +434,7 @@ export default {
     /** 关系解读卡片状态类(用于 :class 绑定) */
     scoreExplainClass: function() {
       return 'score-explain-' + this.scoreExplainLevel
-=======
+    },
     actionPortrait: function() {
       var self = this
       if (!this.isLoggedIn) return null
@@ -501,7 +500,6 @@ export default {
         result.tip = '建议寻求专业家庭辅导,或从简单的家庭对话开始改善'
       }
       return result
->>>>>>> Stashed changes
     }
   },
   onShow() {

+ 2 - 2
cfc-frontend/pages/body-detail/index.vue

@@ -279,9 +279,9 @@ export default {
         { name: '心率', icon: '❤️', unit: '次/分', value: null, trend: 'stable', trendIcon: '─', trendDesc: '' }
       ],
       funcList: [
-        { icon: '\u{1F3C3}', label: '运动', needLogin: true, page: '/pages/body/exercise-record' },
+        { icon: '\u{1F3C3}', label: '运动', needLogin: true, page: '/pages/health/meditation-index' },
         { icon: '\u{1F957}', label: '饮食', needLogin: true, page: '/pages/diet/index' },
-        { icon: '\u{1F634}', label: '作息', needLogin: true, page: '/pages/body/sleep-record' },
+        { icon: '\u{1F634}', label: '作息', needLogin: true, page: '/pages/health/meditation-index' },
         { icon: '\u{1F9D8}', label: '冥想', needLogin: true, page: '/pages/health/meditation-index' },
         { icon: '\u{1F4CA}', label: '舌诊', needLogin: true, page: '/pages/health/report-upload?reportType=tongue' },
         { icon: '\u{1F9EC}', label: '健康维度', needLogin: true, page: 'health-dimensions' }