Forráskód Böngészése

fix(frontend): fix body goMoreProducts URL - was wrongly set to type=activity instead of type=product by rebase auto-merge

User 2 hónapja
szülő
commit
933eb610fe
1 módosított fájl, 12 hozzáadás és 26 törlés
  1. 12 26
      cfc-frontend/pages/body/index.vue

+ 12 - 26
cfc-frontend/pages/body/index.vue

@@ -149,29 +149,13 @@
       @activityClick="goActivityDetail"
       @moreActivities="goMoreActivities" />
 
-    <!-- 推荐阅读(无条件展示) -->
-    <view class="section" v-if="bodyArticles.length > 0">
-      <view class="section-header">
-        <text class="section-title">📖 推荐阅读</text>
-        <text class="section-more" @click="goMoreArticles">更多 ›</text>
-      </view>
-      <view class="article-list">
-        <view class="article-card" v-for="article in bodyArticles" :key="article.id" @click="goArticleDetail(article.id)">
-          <view class="article-category" :style="{ background: article.categoryColor }">
-            <text class="article-category-text">{{ article.category }}</text>
-          </view>
-          <text class="article-title">{{ article.title }}</text>
-          <text class="article-summary">{{ article.summary }}</text>
-          <view class="article-meta">
-            <view class="meta-item">
-              <text class="meta-icon">&#x1F4D6;</text>
-              <text class="meta-text">{{ article.views }}</text>
-            </view>
-            <text class="article-date">{{ article.date }}</text>
-          </view>
-        </view>
-      </view>
-    </view>
+    <!-- 推荐阅读 -->
+    <DimensionArticles
+      dimensionCode="body"
+      :articles="bodyArticles"
+      :isLoggedIn="isLoggedIn"
+      @articleClick="goArticleDetail"
+      @moreArticles="goMoreArticles" />
 
     <!-- 健康小贴士 -->
     <view class="section" v-if="sectionVisible('health_tips')">
@@ -217,6 +201,7 @@ import UserQuickEntry from '../../components/UserQuickEntry.vue'
 import DimensionTasks from '../../components/DimensionTasks.vue'
 import DimensionActivities from '../../components/DimensionActivities.vue'
 import DimensionProducts from '../../components/DimensionProducts.vue'
+import DimensionArticles from '../../components/DimensionArticles.vue'
 import FamilyRelationGraph from '../../components/FamilyRelationGraph.vue'
 import RadarChart from '../../components/RadarChart.vue'
 import { getVisibleSections, getEnergyOverview, getChildren, getTodayTasksByCategory, getActivityList, getProductsByDomain, getFamilyEnergySandbox, getVisibleFamilyMembers, getDimensionOverview, getFeaturedArticles } from '../../utils/api.js'
@@ -250,7 +235,7 @@ const healthRequest = function(url, data) {
 }
 
 export default {
-  components: { TabTransition, PageBanner, LoginGuideCard, HealthTips, FamilyEnergyBar, UserQuickEntry, DimensionTasks, DimensionActivities, DimensionProducts, FamilyRelationGraph, RadarChart },
+  components: { TabTransition, PageBanner, LoginGuideCard, HealthTips, FamilyEnergyBar, UserQuickEntry, DimensionTasks, DimensionActivities, DimensionProducts, DimensionArticles, FamilyRelationGraph, RadarChart },
   data() {
     return {
       isLoggedIn: false,
@@ -523,9 +508,10 @@ export default {
       uni.navigateTo({ url: '/pages/discover-detail/product-detail/product-detail?id=' + prod.id })
     },
     goMoreProducts: function() {
-      uni.navigateTo({ url: '/pages/discover/index?type=activity' })
+      uni.navigateTo({ url: '/pages/discover/index?type=product' })
     },
-    goArticleDetail: function(id) {
+    goArticleDetail: function(article) {
+      var id = article.id || article
       uni.navigateTo({ url: '/pages/mind-detail/article-detail?id=' + id })
     },
     goMoreArticles: function() {