Просмотр исходного кода

chore: auto bump version and changelog [skip ci]

iwt 1 месяц назад
Родитель
Сommit
9337f79f2b

+ 4 - 54
cfc-frontend/pages/body-detail/index.vue

@@ -92,38 +92,6 @@
 
       </view>
 
-    <!-- 维度任务 -->
-    <DimensionTasks
-      v-if="isLoggedIn"
-      dimensionCode="body"
-      :tasks="dimensionTasks"
-      @taskClick="onTaskClick"
-      @moreTasks="goTasks" />
-
-    <!-- 维度活动 -->
-    <DimensionActivities
-      dimensionCode="body"
-      :activities="dimensionActivities"
-      :isLoggedIn="isLoggedIn"
-      @activityClick="goActivityDetail"
-      @moreActivities="goMoreActivities" />
-
-    <!-- 商品推荐 -->
-    <DimensionProducts
-      dimensionCode="body"
-      :familyId="activeChildId"
-      :products="dimensionProducts"
-      title="推荐商品"
-      @productClick="goProductDetail"
-      @moreProducts="goMoreProducts" />
-
-    <!-- 推荐阅读 -->
-    <ArticleBookshelf
-      :articles="bodyArticles"
-      :isLoggedIn="isLoggedIn"
-      @articleClick="goArticleDetail"
-      @moreArticles="goMoreArticles" />
-
     <!-- 底部占位 -->
     <view class="bottom-spacer"></view>
     <AIFloatingAvatar />
@@ -139,17 +107,13 @@ import TabTransition from '../../components/tab-transition.vue'
 import PageBanner from '../../components/PageBanner.vue'
 import LoginGuideCard from '../../components/LoginGuideCard.vue'
 import FamilyEnergyBar from '../../components/FamilyEnergyBar.vue'
-import DimensionTasks from '../../components/DimensionTasks.vue'
-import DimensionActivities from '../../components/DimensionActivities.vue'
-import DimensionProducts from '../../components/DimensionProducts.vue'
-import ArticleBookshelf from '../../components/ArticleBookshelf.vue'
 import RadarChart from '../../components/RadarChart.vue'
 import AIFloatingAvatar from '../../components/AIFloatingAvatar.vue'
 import FamilyMemberStrip from '../../components/FamilyMemberStrip.vue'
-import { getVisibleSections, getEnergyOverview, getChildren, getTodayTasksByCategory, getActivityList, getProductsByDomain, getFamilyEnergySandbox, getVisibleFamilyMembers, getDimensionOverview, getFeaturedArticles } from '../../utils/api.js'
+import { getVisibleSections, getEnergyOverview, getChildren, getFamilyEnergySandbox, getVisibleFamilyMembers, getDimensionOverview } from '../../utils/api.js'
 
 export default {
-  components: { TabTransition, PageBanner, LoginGuideCard, FamilyEnergyBar, DimensionTasks, DimensionActivities, DimensionProducts, ArticleBookshelf, RadarChart, AIFloatingAvatar, FamilyMemberStrip },
+  components: { TabTransition, PageBanner, LoginGuideCard, FamilyEnergyBar, RadarChart, AIFloatingAvatar, FamilyMemberStrip },
   data() {
     return {
       isLoggedIn: false,
@@ -167,11 +131,6 @@ export default {
       sandboxData: null,
       dualDimension: null,
       visibleSections: [],
-
-      dimensionTasks: [],
-      dimensionActivities: [],
-      dimensionProducts: [],
-      bodyArticles: [],
       dimensionData: null,
       /** Mock 平均值(7维):生长发育/睡眠质量/视力健康/免疫力/营养均衡/肠胃健康/运动活力 */
       radarAvgScores: [72, 68, 75, 70, 73, 69, 71],
@@ -254,10 +213,7 @@ export default {
       this.loadFamilyMembersVisible()
     }
     // 游客也能浏览活动和商品
-    this.loadDimensionActivities()
-    this.loadDimensionProducts()
     // 游客也能浏览文章
-    this.loadFeaturedArticles()
     this._watchPageReady()
   },
   methods: {
@@ -313,9 +269,6 @@ export default {
     loadDashboardData: function() {
       if (!this.activeChildId) return
       this.loadEnergyData()
-      this.loadDimensionTasks()
-      this.loadDimensionActivities()
-      this.loadDimensionProducts()
       this.loadSandboxData()
       this.loadHealthDimensions()
     },
@@ -522,11 +475,8 @@ export default {
       var self = this
       var unwatch = this.$watch(function() {
         if (self.isLoggedIn) {
-          return !!(self.dualDimension || self.sandboxData || (self.dimensionTasks && self.dimensionTasks.length > 0))
-        }
-        return !!(self.dimensionActivities && self.dimensionActivities.length > 0) ||
-               !!(self.dimensionProducts && self.dimensionProducts.length > 0)
-      }, function(val) {
+          return !!(self.dualDimension || self.sandboxData)
+        }      }, function(val) {
         if (val) {
           if (unwatch) unwatch()
           if (self.$refs.tabTransition) self.$refs.tabTransition.markReady()

+ 6 - 46
cfc-frontend/pages/mind-detail/index.vue

@@ -114,35 +114,9 @@
           <FamilyEmptyState type="card" />
         </view>
 
-    <!-- ===== 底部:维度任务/活动/商品 ===== -->
-    <DimensionTasks
-      v-if="isLoggedIn"
-      :dimensionCode="currentDimensionCode"
-      :tasks="dimensionTasks"
-      @taskClick="onTaskClick"
-      @moreTasks="goTasks" />
-
-    <DimensionActivities
-      :dimensionCode="currentDimensionCode"
-      :activities="dimensionActivities"
-      :isLoggedIn="isLoggedIn"
-      @activityClick="goActivityDetail"
-      @moreActivities="goMoreActivities" />
-
-    <DimensionProducts
-      dimensionCode="mind"
-      :familyId="currentChildId"
-      :products="dimensionProducts"
-      title="推荐商品"
-      @productClick="goProductDetail"
-      @moreProducts="goMoreProducts" />
+    
 
-    <!-- 推荐阅读 -->
-    <ArticleBookshelf
-      :articles="emotionArticles"
-      :isLoggedIn="isLoggedIn"
-      @articleClick="goArticleDetail"
-      @moreArticles="goArticles" />
+    
 
     <!-- ===== Phase 1.2: 心理告警横幅 ===== -->
     <PsychCrisisBanner v-if="isLoggedIn" :memberId="currentChildId" source="screening" />
@@ -181,20 +155,16 @@ import PageBanner from '../../components/PageBanner.vue'
 import LoginGuideCard from '../../components/LoginGuideCard.vue'
 import RadarChart from '../../components/RadarChart.vue'
 import FamilyEnergyBar from '../../components/FamilyEnergyBar.vue'
-import DimensionTasks from '../../components/DimensionTasks.vue'
-import DimensionActivities from '../../components/DimensionActivities.vue'
-import DimensionProducts from '../../components/DimensionProducts.vue'
-import ArticleBookshelf from '../../components/ArticleBookshelf.vue'
 import PsychCrisisBanner from '../../components/PsychCrisisBanner.vue'
 import AIFloatingAvatar from '../../components/AIFloatingAvatar.vue'
 import FamilyTianpanCard from '../../components/FamilyTianpanCard.vue'
 import FamilyMemberStrip from '../../components/FamilyMemberStrip.vue'
-import { getVisibleSections, getFeaturedArticles, getEmiReport, getFamilyEnergySandbox, getTodayTasksByCategory, getActivityList, getProductsByDomain, getChildren, getVisibleFamilyMembers, getEnergyOverview, getContactList, getHealthAlerts, getMilestones, getDanReportByChild, getFamilyFortune } from '../../utils/api.js'
+import { getVisibleSections, getFamilyEnergySandbox, getChildren, getVisibleFamilyMembers, getEnergyOverview, getContactList, getHealthAlerts, getMilestones, getDanReportByChild, getFamilyFortune } from '../../utils/api.js'
 import config from '../../config.js'
 import { parseDate } from '../../utils/format.js'
 
 export default {
-components: { TabTransition, PageBanner, RadarChart, LoginGuideCard, FamilyEnergyBar, DimensionTasks, DimensionActivities, DimensionProducts, ArticleBookshelf, PsychCrisisBanner, AIFloatingAvatar, FamilyTianpanCard, FamilyMemberStrip },
+components: { TabTransition, PageBanner, RadarChart, LoginGuideCard, FamilyEnergyBar, PsychCrisisBanner, AIFloatingAvatar, FamilyTianpanCard, FamilyMemberStrip },
   data() {
     return {
       isLoggedIn: false,
@@ -258,9 +228,6 @@ components: { TabTransition, PageBanner, RadarChart, LoginGuideCard, FamilyEnerg
       userName: '',
       children: [],
       sandboxData: null,
-      dimensionTasks: [],
-      dimensionActivities: [],
-      dimensionProducts: [],
       contactList: [],
       healthAlerts: [],
       milestones: [],
@@ -452,7 +419,6 @@ components: { TabTransition, PageBanner, RadarChart, LoginGuideCard, FamilyEnerg
       this.userName = uni.getStorageSync('nickname') || uni.getStorageSync('userName') || '家长'
     }
     this.loadSectionConfig()
-    this.loadFeaturedArticles()
     if (this.isLoggedIn) {
       this.loadChildren()
       this.loadFamilyMembersVisible()
@@ -467,8 +433,6 @@ components: { TabTransition, PageBanner, RadarChart, LoginGuideCard, FamilyEnerg
       this.loadDanReports()
     }
     // 游客也能浏览活动和商品
-    this.loadDimensionActivities()
-    this.loadDimensionProducts()
     this.loadFamilyFortune()
     this._watchPageReady()
   },
@@ -739,8 +703,6 @@ components: { TabTransition, PageBanner, RadarChart, LoginGuideCard, FamilyEnerg
       })
     },
     loadDimensionData: function() {
-      this.loadDimensionTasks()
-      this.loadDimensionActivities()
       if (this.familyMembersVisible.length > 0) {
         this.loadCompatibilityData()
       }
@@ -928,10 +890,8 @@ components: { TabTransition, PageBanner, RadarChart, LoginGuideCard, FamilyEnerg
       var self = this
       var unwatch = this.$watch(function() {
         if (self.isLoggedIn) {
-          return !!(self.emiData || self.energyOverview || (self.dimensionActivities && self.dimensionActivities.length > 0))
-        }
-        return !!(self.dimensionActivities && self.dimensionActivities.length > 0)
-      }, function(val) {
+          return !!(self.emiData || self.energyOverview)
+        }      }, function(val) {
         if (val) {
           if (unwatch) unwatch()
           if (self.$refs.tabTransition) self.$refs.tabTransition.markReady()

+ 2 - 91
cfc-frontend/pages/wealth/index.vue

@@ -9,13 +9,6 @@
         tagline="利他创富 · 价值共享"
         quote="富足源于利他与坚持" />
 
-      <!-- 推荐阅读 -->
-      <ArticleBookshelf
-        :articles="wealthArticles"
-        :loading="articlesLoading"
-        @articleClick="goArticleDetail"
-        @moreArticles="goMoreArticles" />
-
       <!-- 登录引导 -->
       <view class="login-guide-section">
         <text class="login-guide-text">登录后查看财富能量、推广收益、邀请返利等更多内容</text>
@@ -162,30 +155,6 @@
         </view>
       </view>
 
-      <!-- 商品推荐 -->
-      <DimensionProducts
-        dimensionCode="wealth"
-        :familyId="activeChildId"
-        :products="dimensionProducts"
-        title="推荐商品"
-        @productClick="goProductDetail"
-        @moreProducts="goMoreProducts" />
-
-      <!-- 推荐活动 -->
-      <DimensionActivities
-        dimensionCode="wealth"
-        :activities="dimensionActivities"
-        :isLoggedIn="isLoggedIn"
-        @activityClick="goActivityDetail"
-        @moreActivities="goMoreActivities" />
-
-      <!-- 推荐阅读 -->
-      <ArticleBookshelf
-        :articles="wealthArticles"
-        :loading="articlesLoading"
-        @articleClick="goArticleDetail"
-        @moreArticles="goMoreArticles" />
-
       <!-- 底部菜单 -->
       <view class="menu-list">
         <view class="menu-item" @click="goToProfile">
@@ -208,9 +177,6 @@
 <script>
 import TabTransition from '../../components/tab-transition.vue'
 import PageBanner from '../../components/PageBanner.vue'
-import ArticleBookshelf from '../../components/ArticleBookshelf.vue'
-import DimensionProducts from '../../components/DimensionProducts.vue'
-import DimensionActivities from '../../components/DimensionActivities.vue'
 import WealthSubScores from '../../components/WealthSubScores.vue'
 import BodyWealthAlert from '../../components/BodyWealthAlert.vue'
 import FamilyMemberStrip from '../../components/FamilyMemberStrip.vue'
@@ -221,14 +187,11 @@ import {
   getReferralCode,
   getReferralSummary,
   getCommissionSummary,
-  getVisibleFamilyMembers,
-  getFeaturedArticles,
-  getActivityList,
-  getProductsByDomain
+  getVisibleFamilyMembers
 } from '../../utils/api.js'
 
 export default {
-  components: { TabTransition, PageBanner, DimensionProducts, DimensionActivities, WealthSubScores, BodyWealthAlert, FamilyMemberStrip, ArticleBookshelf },
+  components: { TabTransition, PageBanner, WealthSubScores, BodyWealthAlert, FamilyMemberStrip },
   data() {
     return {
       showTabTransition: true,
@@ -266,10 +229,7 @@ export default {
       children: [],
       familyMembersVisible: [],
       selectedMemberId: null,
-      wealthArticles: [],
       articlesLoading: false,
-      dimensionActivities: [],
-      dimensionProducts: []
     }
   },
   computed: {
@@ -303,9 +263,6 @@ export default {
     this.loadWealthDetail()
     this.loadWealthData()
     this.loadFamilyMembersVisible()
-    this.loadWealthArticles()
-    this.loadDimensionActivities()
-    this.loadDimensionProducts()
     this._watchPageReady()
   },
   methods: {
@@ -319,52 +276,6 @@ export default {
     goMoreProducts: function() {
       uni.navigateTo({ url: '/pages/shop/index/index' })
     },
-    loadDimensionActivities: function() {
-      var self = this
-      getActivityList({ dimensionCode: 'wealth', page: 1, size: 3 }).then(function(res) {
-        if (res && res.data) {
-          var list = Array.isArray(res.data) ? res.data : (res.data.records || [])
-          self.dimensionActivities = list.slice(0, 3)
-        }
-      }).catch(function() { self.dimensionActivities = [] })
-    },
-    loadDimensionProducts: function() {
-      var self = this
-      getProductsByDomain('wealth', 1, 4).then(function(res) {
-        if (res && res.data) {
-          var list = Array.isArray(res.data) ? res.data : (res.data.records || [])
-          self.dimensionProducts = list.slice(0, 4)
-        }
-      }).catch(function() { self.dimensionProducts = [] })
-    },
-    goActivityDetail: function(act) {
-      if (!act || !act.id) return
-      uni.navigateTo({ url: '/pages/activity/activity-detail/activity-detail?id=' + act.id })
-    },
-    goMoreActivities: function() {
-      uni.navigateTo({ url: '/pages/discover/index?type=activity' })
-    },
-    loadWealthArticles: function() {
-      var self = this
-      self.articlesLoading = true
-      getFeaturedArticles({ size: 5, dimensionCode: 'wealth' }).then(function(res) {
-        if (res.code === 200 && res.data) {
-          var list = Array.isArray(res.data) ? res.data : (res.data.records || [])
-          self.wealthArticles = list.slice(0, 5)
-        }
-      }).catch(function() {
-        self.wealthArticles = []
-      }).then(function() {
-        self.articlesLoading = false
-      })
-    },
-    goArticleDetail: function(article) {
-      var id = article && article.id ? article.id : article
-      uni.navigateTo({ url: '/pages/article-center/article-detail?id=' + id })
-    },
-    goMoreArticles: function() {
-      uni.navigateTo({ url: '/pages/article-center/index?dimension=wealth' })
-    },
     loadFamilyMembersVisible() {
       var self = this
       getVisibleFamilyMembers().then(function(res) {

+ 3 - 49
cfc-frontend/pages/wisdom-detail/index.vue

@@ -83,39 +83,6 @@
       </view>
     </view>
 
-    <!-- 7. 维度任务 -->
-    <DimensionTasks
-      v-if="isLoggedIn"
-      dimensionCode="wisdom"
-      :tasks="dimensionTasks"
-      @taskClick="onTaskClick"
-      @moreTasks="goTasks" />
-
-    <!-- 8. 维度活动 -->
-    <DimensionActivities
-      dimensionCode="wisdom"
-      :activities="dimensionActivities"
-      :isLoggedIn="isLoggedIn"
-      @activityClick="goActivityDetail"
-      @moreActivities="goMoreActivities" />
-
-    <!-- 9. 维度商品 -->
-    <DimensionProducts
-      dimensionCode="wisdom"
-      :familyId="activeChildId"
-      :products="dimensionProducts"
-      title="推荐商品"
-      @productClick="goProductDetail"
-      @moreProducts="goMoreProducts" />
-
-    <!-- 10. 推荐阅读 -->
-    <ArticleBookshelf
-      v-if="sectionVisible('recommended_reading')"
-      :articles="wisdomArticles"
-      :isLoggedIn="isLoggedIn"
-      @articleClick="goArticleDetail"
-      @moreArticles="goMoreArticles" />
-
     <!-- 11. 快捷操作按钮 -->
     <view class="section quick-actions" v-if="isLoggedIn">
       <view class="action-btn" @click="goCognitiveReport">
@@ -149,17 +116,13 @@ import PageBanner from '../../components/PageBanner.vue'
 import LoginGuideCard from '../../components/LoginGuideCard.vue'
 import RadarChart from '../../components/RadarChart.vue'
 import FamilyEnergyBar from '../../components/FamilyEnergyBar.vue'
-import DimensionTasks from '../../components/DimensionTasks.vue'
-import DimensionActivities from '../../components/DimensionActivities.vue'
-import DimensionProducts from '../../components/DimensionProducts.vue'
-import ArticleBookshelf from '../../components/ArticleBookshelf.vue'
 import AIFloatingAvatar from '../../components/AIFloatingAvatar.vue'
 import FamilyMemberStrip from '../../components/FamilyMemberStrip.vue'
-import { getVisibleSections, getChildren, getTodayTasksByCategory, getActivityList, getProductsByDomain, getFamilyEnergySandbox, getAssessmentLatestResult, getFeaturedArticles, getDanReportByChild } from '../../utils/api.js'
+import { getVisibleSections, getChildren, getFamilyEnergySandbox, getAssessmentLatestResult, getDanReportByChild } from '../../utils/api.js'
 import { parseDate } from '../../utils/format.js'
 
 export default {
-  components: { TabTransition, PageBanner, LoginGuideCard, RadarChart, FamilyEnergyBar, DimensionTasks, DimensionActivities, DimensionProducts, ArticleBookshelf, AIFloatingAvatar, FamilyMemberStrip },
+  components: { TabTransition, PageBanner, LoginGuideCard, RadarChart, FamilyEnergyBar, AIFloatingAvatar, FamilyMemberStrip },
   data() {
     return {
       isLoggedIn: false,
@@ -175,9 +138,6 @@ export default {
       dualDimension: null,
       visibleSections: [],
       cognitiveReport: null,
-      dimensionTasks: [],
-      dimensionActivities: [],
-      dimensionProducts: [],
       articles: [],
       /** Mock 平均值(6维认知):感知/专注/记忆/逻辑/空间/加工速度 */
       cognitiveAvgScores: [70, 65, 72, 68, 66, 71],
@@ -239,10 +199,7 @@ export default {
       this.loadCognitiveReport()
       this.loadDanReports()
     }
-    this.loadDimensionActivities()
-    this.loadDimensionProducts()
     // 游客也能浏览文章
-    this.loadFeaturedArticles()
     this._watchPageReady()
   },
   methods: {
@@ -453,10 +410,7 @@ export default {
       var unwatch = this.$watch(function() {
         if (self.isLoggedIn) {
           return !!(self.cognitiveReport || self.sandboxData)
-        }
-        return !!(self.dimensionActivities && self.dimensionActivities.length > 0) ||
-               !!(self.dimensionProducts && self.dimensionProducts.length > 0)
-      }, function(val) {
+        }      }, function(val) {
         if (val) {
           if (unwatch) unwatch()
           if (self.$refs.tabTransition) self.$refs.tabTransition.markReady()

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-d7a55c7dae0bb81a6ca58f83409fd2d3d4980c17
+c7015fc654d2b0c1d66925ab3f44d78861c0a95d

+ 2 - 2
cfc-web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "cfc-web",
-  "version": "1.0.878",
+  "version": "1.0.879",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cfc-web",
-      "version": "1.0.878",
+      "version": "1.0.879",
       "dependencies": {
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^1.0.2",

+ 1 - 1
cfc-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfc-web",
-  "version": "1.0.879",
+  "version": "1.0.880",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",

+ 6 - 0
cfc-web/public/CHANGELOG-v1.0.md

@@ -4,6 +4,12 @@
 
 ---
 
+## v1.0.880 (2026-08-08)
+
+### Bug 修复
+- adjust position of heart icon and update tab icons
+
+
 ## v1.0.879 (2026-08-08)
 
 ### 新功能

+ 7 - 1
cfc-web/public/CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.879
+> 当前版本: v1.0.880
 
 ## 历史版本
 
@@ -8,6 +8,12 @@
 
 ---
 
+## v1.0.880 (2026-08-08)
+
+### Bug 修复
+- adjust position of heart icon and update tab icons
+
+
 ## v1.0.879 (2026-08-08)
 
 ### 新功能