|
|
@@ -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;
|