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

chore: auto bump version and changelog [skip ci]

iwt 3 недель назад
Родитель
Сommit
8a1277824a
2 измененных файлов с 13 добавлено и 2 удалено
  1. 12 1
      cfc-frontend/pages/home-pages/parent-index.vue
  2. 1 1
      cfc-web/.last_build_commit

+ 12 - 1
cfc-frontend/pages/home-pages/parent-index.vue

@@ -14,6 +14,7 @@
   :members="familyMembersVisible"
   :selectedMemberId="selectedMemberId"
   :isParent="isFamilyAdmin"
+  :pendingCounts="memberPendingCounts"
   @select="onFamilyMemberSelect"
   @switch="onFamilyMemberSwitch"
   @removed="loadFamilyMembersVisible" />
@@ -492,7 +493,7 @@
 </template>
 
 <script>
-import { getFamilyMemberList, getChildren, getPendingReviewTasks, getPendingWishes, approveTask, rejectTask, getChildCompletionStats, getParentDashboard, getFamilyEnergySandbox, getEnergySandbox, getUnlockStatus, getEnergyOverview, getActivityList, getProductsByDomain, getContactList, getFeaturedArticles, getActiveAlerts, dismissAlert, getFamilyRanking, getChallengeList, getCircleList, getCircleRanking, getInviteQrCode, switchToFamilyMember, getSelfCheckStatus } from '../../utils/api.js'
+import { getFamilyMemberList, getChildren, getPendingReviewTasks, getPendingWishes, approveTask, rejectTask, getChildCompletionStats, getParentDashboard, getFamilyEnergySandbox, getEnergySandbox, getUnlockStatus, getEnergyOverview, getActivityList, getProductsByDomain, getContactList, getFeaturedArticles, getActiveAlerts, dismissAlert, getFamilyRanking, getChallengeList, getCircleList, getCircleRanking, getInviteQrCode, switchToFamilyMember, getSelfCheckStatus, getTodayTasks } from '../../utils/api.js'
 import store from '../../store/index.js'
 import { BrandColors } from '../../utils/brand-colors.js'
 import PlayfulCard from '../../components/PlayfulCard.vue'
@@ -535,6 +536,7 @@ export default {
       pendingReviewWishes: [],
       pendingWishesCount: 0,
       pendingTasks: [],
+      memberPendingCounts: {},
       hotActivityCount: 0,
       hasNewReport: false,
       myCompletionRate: 0,
@@ -914,6 +916,15 @@ export default {
           this.errorEnergy = true
         }
 
+        // 加载全家今日任务(用于成员待完成数角标)
+        getTodayTasks(null, { familyWide: true }).then(function(res) {
+          if (res.code === 200 && Array.isArray(res.data)) {
+            self.memberPendingCounts = self._countTasksByMember(res.data)
+          }
+        }).catch(function() {
+          self.memberPendingCounts = {}
+        })
+
         // 加载推荐活动
         this.loadRecommendedActivities()
         // 加载推荐商品

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-576b015bff3579530541f5e2c61fc6cdd95122c7
+946f2dbf8ac57b87cc2384beae83e5714651112b