Explorar el Código

fix(family-members): 修复 isAdmin 恒为 false 的 bug,并清理新增的修改关系入口

- 修复 userId 取值:storage 里 userInfo 字段是 userId(非 id),原代码读取 .id 导致永远为 0,isAdmin 判断失效
- 移除修改关系弹窗及入口:用户确认改用编辑资料,清理相关代码
- 恢复 GenerationPicker 注册(编辑资料流程必需)
- add-member.vue: modal-link 颜色改为品牌橙 #F97316
liaoxg hace 1 día
padre
commit
65969e662f

+ 1 - 1
cfc-frontend/pages/family/add-member.vue

@@ -392,7 +392,7 @@ this.submitting = false
 }
 .modal-link {
   font-size: 24rpx;
-  color: #667eea;
+  color: #F97316;
   display: block;
   text-align: center;
   margin-bottom: 24rpx;

+ 11 - 8
cfc-frontend/pages/profile-extra/family-members.vue

@@ -106,8 +106,8 @@
           <button class="detail-action-btn action-questionnaire" @click="doQuestionnaire(detailMember)">关系问卷</button>
           <button class="detail-action-btn action-interaction" @click="recordInteraction(detailMember)">记录互动</button>
           <button class="detail-action-btn action-kick" @click="confirmKick(detailMember)" v-if="isAdmin && detailMember && !detailMember.isSelf">删除成员</button>
-        </view>
-      </view>
+       </view>
+     </view>
     </view>
 
     <!-- ===== 底部操作栏 ===== -->
@@ -138,9 +138,10 @@ import {
   rejectJoinRequest, reportAppEnter
 } from '../../utils/api.js'
 import store from '../../store/index.js'
+import GenerationPicker from '@/pages/family/components/GenerationPicker.vue'
 
 export default {
-  components: {},
+  components: { GenerationPicker },
   data() {
     return {
       userId: 0,
@@ -160,8 +161,9 @@ export default {
 
       inviteToken: '',
       joinRequests: [],
-      shareCardImage: ''
-    }
+      shareCardImage: '',
+
+      }
   },
   computed: {
     isSelfView() {
@@ -189,7 +191,8 @@ export default {
     reportAppEnter('members');
     
     var userInfo = uni.getStorageSync('userInfo')
-    this.userId = (userInfo && userInfo.id) || 0
+    // storage 里的 key 是 userId(utils/api.js 设的是 userId),切勿写 .id(永远为 0)
+    this.userId = (userInfo && userInfo.userId) || (uni.getStorageSync('userId')) || 0
     this.userNickname = uni.getStorageSync('nickname') || (userInfo && userInfo.nickname) || ''
     this.userAvatar = uni.getStorageSync('avatar') || (userInfo && userInfo.avatar) || ''
     // 家庭在用户注册时已由后端创建(登录接口另有兜底),此处不再触发建家庭逻辑;
@@ -1006,8 +1009,8 @@ export default {
   color: #67c23a;
 }
 .action-questionnaire {
-  background: #f3e8ff;
-  color: #8b5cf6;
+  background: #EEF0FF;
+  color: #6366F1;
 }
 .action-interaction {
   background: #fff7ed;