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

chore: auto bump version and changelog [skip ci]

iwt 3 месяцев назад
Родитель
Сommit
3969f1477a
3 измененных файлов с 27 добавлено и 3 удалено
  1. 24 0
      cfc-frontend/pages/home-pages/parent-index.vue
  2. 1 1
      cfc-web/.last_build_commit
  3. 2 2
      cfc-web/package-lock.json

+ 24 - 0
cfc-frontend/pages/home-pages/parent-index.vue

@@ -527,6 +527,10 @@ export default {
     }
     }
   },
   },
   computed: {
   computed: {
+    isFamilyAdmin() {
+      if (!this.familyMembersVisible || this.familyMembersVisible.length === 0) return false
+      return this.familyMembersVisible[0].isAdmin === true
+    },
     topPendingTasks() {
     topPendingTasks() {
       return this.pendingTasks.slice(0, 3)
       return this.pendingTasks.slice(0, 3)
     },
     },
@@ -872,6 +876,26 @@ export default {
     onFamilyMemberSelect(member) {
     onFamilyMemberSelect(member) {
       this.selectedMemberId = member.id
       this.selectedMemberId = member.id
     },
     },
+    async onFamilyMemberSwitch(member) {
+      if (!member || !member.id) return
+      try {
+        var res = await switchToFamilyMember(member.id, member.source || 'family_member')
+        if (res.code === 200 && res.data) {
+          store.commit('switchToMember', {
+            memberId: res.data.memberId,
+            effectiveRole: res.data.effectiveRole
+          })
+          uni.showToast({ title: '已切换到' + (member.nickname || '该成员'), icon: 'success' })
+          setTimeout(function() {
+            uni.reLaunch({ url: '/pages/index-home/index' })
+          }, 1000)
+        } else {
+          uni.showToast({ title: res.message || '切换失败', icon: 'none' })
+        }
+      } catch (e) {
+        uni.showToast({ title: '切换失败', icon: 'none' })
+      }
+    },
     onMicroActionCompleted() {
     onMicroActionCompleted() {
       this.loadData()
       this.loadData()
       feedbackEngine.trigger('micro_action')
       feedbackEngine.trigger('micro_action')

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-3d966cb8b65d2d399f440f2c7de578b3747840a2
+04246c82f16fc1a2becb008210fdf7b3ac7c2ca3

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

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