Browse Source

feat(home): 首页区块顺序调整为 1-2-9-7-8-5-6-4-3-10-11

顺序:自测→沙盘→家庭动态→会员→快捷入口→我的任务→家庭挑战→今日任务→上传报告→阅读→商品
iwt 1 month ago
parent
commit
5230b63b9e
1 changed files with 64 additions and 53 deletions
  1. 64 53
      cfc-frontend/pages/index-home/index.vue

+ 64 - 53
cfc-frontend/pages/index-home/index.vue

@@ -59,6 +59,7 @@
     </view>
     </view>
 
 
     <!-- ② 发现区 — 能量沙盘 — Canvas 五行星图(未测评时显示引导卡) -->
     <!-- ② 发现区 — 能量沙盘 — Canvas 五行星图(未测评时显示引导卡) -->
+
     <GateLock v-if="sandboxLocked && sandboxLockGate" :gate="sandboxLockGate" />
     <GateLock v-if="sandboxLocked && sandboxLockGate" :gate="sandboxLockGate" />
     <WuxingSandbox
     <WuxingSandbox
       v-else-if="sandboxData"
       v-else-if="sandboxData"
@@ -70,18 +71,60 @@
       starHeight="480rpx" />
       starHeight="480rpx" />
 
 
     <!-- ② 发现区 — 上传报告 -->
     <!-- ② 发现区 — 上传报告 -->
+
+    <FamilyFeed
+      :items="familyFeed"
+      :notices="notices"
+      :showHeader="true" />
+
+    <!-- ④ 内容区 — 推荐文章 -->
+
+    <view v-if="showMemberEntry" class="member-entry" @click="goMembership">
+      <view class="member-entry-icon-wrap">
+        <text class="member-entry-icon">👑</text>
+      </view>
+      <view class="member-entry-texts">
+        <text class="member-entry-title">{{ memberEntryTitle }}</text>
+        <text class="member-entry-desc">{{ memberEntryDesc }}</text>
+      </view>
+      <view class="member-entry-btn">
+        <text class="member-entry-btn-text">{{ memberEntryBtn }}</text>
+      </view>
+    </view>
+
+    <!-- ④ 内容区 — 快捷功能入口(单排) -->
+
     <view class="section">
     <view class="section">
-      <ReportUploadCard
-        title="上传报告"
-        desc="体检报告 · 菌群检测 · 认知测评 · 心理测评 · 情绪打卡"
-        :tags="['体检报告', '菌群检测', '认知测评', '心理测评', '情绪打卡']"
-        @click="goToUploadReport" />
+      <view class="quick-bar">
+        <view class="quick-item" @click="navTo('/pages/tasks/tasks')">
+          <view class="quick-icon" style="background:rgba(99,102,241,0.15)"><text>📋</text></view>
+          <text class="quick-label">任务</text>
+        </view>
+        <view class="quick-item" @click="navTo('/pages/action-detail/interaction-log')">
+          <view class="quick-icon" style="background:rgba(16,185,129,0.15)"><text>💬</text></view>
+          <text class="quick-label">互动</text>
+        </view>
+        <view class="quick-item" @click="navTo('/pages/mind-detail/family-dashboard')">
+          <view class="quick-icon" style="background:rgba(139,92,246,0.15)"><text>🏠</text></view>
+          <text class="quick-label">天盘</text>
+        </view>
+        <view class="quick-item" @click="navTo('/pages/profile-extra/family-members')">
+          <view class="quick-icon" style="background:rgba(245,158,11,0.15)"><text>👨‍👩‍👧‍👦</text></view>
+          <text class="quick-label">成员</text>
+        </view>
+        <view class="quick-item" @click="navTo('/pages/discover/circles')">
+          <view class="quick-icon" style="background:rgba(255,107,157,0.15)"><text>🤝</text></view>
+          <text class="quick-label">圈子</text>
+        </view>
+        <view class="quick-item" @click="navTo('/pages/shop/index/index')">
+          <view class="quick-icon" style="background:rgba(249,115,22,0.15)"><text>🛒</text></view>
+          <text class="quick-label">商城</text>
+        </view>
+      </view>
     </view>
     </view>
 
 
-    <!-- ③ 行动区 — 今日任务 -->
-    <DailyTaskCard />
+    <!-- ④ 内容区 — 家庭动态 -->
 
 
-    <!-- ③ 行动区 — 我的任务(仅当有待完成时显示) -->
     <view v-if="hasPendingTasks" class="section">
     <view v-if="hasPendingTasks" class="section">
       <view class="section-header">
       <view class="section-header">
         <text class="section-title">📝 我的任务</text>
         <text class="section-title">📝 我的任务</text>
@@ -103,6 +146,7 @@
     </view>
     </view>
 
 
     <!-- ③ 行动区 — 家庭挑战任务 -->
     <!-- ③ 行动区 — 家庭挑战任务 -->
+
     <view class="section">
     <view class="section">
       <view class="section-header">
       <view class="section-header">
         <text class="section-title">🔥 家庭挑战</text>
         <text class="section-title">🔥 家庭挑战</text>
@@ -123,56 +167,21 @@
     </view>
     </view>
 
 
     <!-- ③ 行动区 — 会员入口:非会员显示开通 / 快到期显示续费 -->
     <!-- ③ 行动区 — 会员入口:非会员显示开通 / 快到期显示续费 -->
-    <view v-if="showMemberEntry" class="member-entry" @click="goMembership">
-      <view class="member-entry-icon-wrap">
-        <text class="member-entry-icon">👑</text>
-      </view>
-      <view class="member-entry-texts">
-        <text class="member-entry-title">{{ memberEntryTitle }}</text>
-        <text class="member-entry-desc">{{ memberEntryDesc }}</text>
-      </view>
-      <view class="member-entry-btn">
-        <text class="member-entry-btn-text">{{ memberEntryBtn }}</text>
-      </view>
-    </view>
 
 
-    <!-- ④ 内容区 — 快捷功能入口(单排) -->
+    <DailyTaskCard />
+
+    <!-- ③ 行动区 — 我的任务(仅当有待完成时显示) -->
+
     <view class="section">
     <view class="section">
-      <view class="quick-bar">
-        <view class="quick-item" @click="navTo('/pages/tasks/tasks')">
-          <view class="quick-icon" style="background:rgba(99,102,241,0.15)"><text>📋</text></view>
-          <text class="quick-label">任务</text>
-        </view>
-        <view class="quick-item" @click="navTo('/pages/action-detail/interaction-log')">
-          <view class="quick-icon" style="background:rgba(16,185,129,0.15)"><text>💬</text></view>
-          <text class="quick-label">互动</text>
-        </view>
-        <view class="quick-item" @click="navTo('/pages/mind-detail/family-dashboard')">
-          <view class="quick-icon" style="background:rgba(139,92,246,0.15)"><text>🏠</text></view>
-          <text class="quick-label">天盘</text>
-        </view>
-        <view class="quick-item" @click="navTo('/pages/profile-extra/family-members')">
-          <view class="quick-icon" style="background:rgba(245,158,11,0.15)"><text>👨‍👩‍👧‍👦</text></view>
-          <text class="quick-label">成员</text>
-        </view>
-        <view class="quick-item" @click="navTo('/pages/discover/circles')">
-          <view class="quick-icon" style="background:rgba(255,107,157,0.15)"><text>🤝</text></view>
-          <text class="quick-label">圈子</text>
-        </view>
-        <view class="quick-item" @click="navTo('/pages/shop/index/index')">
-          <view class="quick-icon" style="background:rgba(249,115,22,0.15)"><text>🛒</text></view>
-          <text class="quick-label">商城</text>
-        </view>
-      </view>
+      <ReportUploadCard
+        title="上传报告"
+        desc="体检报告 · 菌群检测 · 认知测评 · 心理测评 · 情绪打卡"
+        :tags="['体检报告', '菌群检测', '认知测评', '心理测评', '情绪打卡']"
+        @click="goToUploadReport" />
     </view>
     </view>
 
 
-    <!-- ④ 内容区 — 家庭动态 -->
-    <FamilyFeed
-      :items="familyFeed"
-      :notices="notices"
-      :showHeader="true" />
+    <!-- ③ 行动区 — 今日任务 -->
 
 
-    <!-- ④ 内容区 — 推荐文章 -->
     <view class="section">
     <view class="section">
       <view class="section-header">
       <view class="section-header">
         <text class="section-title">📖 推荐阅读</text>
         <text class="section-title">📖 推荐阅读</text>
@@ -185,6 +194,7 @@
     </view>
     </view>
 
 
     <!-- ④ 内容区 — 推荐商品 -->
     <!-- ④ 内容区 — 推荐商品 -->
+
     <view class="section">
     <view class="section">
       <view class="section-header">
       <view class="section-header">
         <text class="section-title">🛍️ 推荐商品</text>
         <text class="section-title">🛍️ 推荐商品</text>
@@ -197,6 +207,7 @@
     </view>
     </view>
 
 
     <!-- 底部占位 -->
     <!-- 底部占位 -->
+
     <view class="bottom-spacer" style="height: 40rpx;"></view>
     <view class="bottom-spacer" style="height: 40rpx;"></view>
   </view>
   </view>