|
|
@@ -477,7 +477,7 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { getFamilyMembers, getChildren, getPendingReviewTasks, getPendingWishes, approveTask, rejectTask, getChildCompletionStats, getParentDashboard, getFamilyEnergySandbox, getEnergySandbox, getUnlockStatus, getEnergyOverview, getVisibleFamilyMembers, getActivityList, getProductsByDomain, getContactList, getFeaturedArticles, getActiveAlerts, dismissAlert, getFamilyRanking, getChallengeList, getCircleRanking, getInviteQrCode, switchToFamilyMember } 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, getCircleRanking, getInviteQrCode, switchToFamilyMember } from '../../utils/api.js'
|
|
|
import store from '../../store/index.js'
|
|
|
import PageBanner from '../../components/PageBanner.vue'
|
|
|
import PlayfulCard from '../../components/PlayfulCard.vue'
|
|
|
@@ -726,10 +726,11 @@ export default {
|
|
|
if (!dashboardLoaded) {
|
|
|
try {
|
|
|
const currentUserId = uni.getStorageSync('userId')
|
|
|
- const membersRes = await getFamilyMembers()
|
|
|
+ const membersRes = await getFamilyMemberList({ visibleOnly: true, includeFamily: true })
|
|
|
const data = membersRes.data || {}
|
|
|
- const parents = (data.parents || []).filter(function(p) { return p && p.id && p.id !== currentUserId }).map(function(p) { return { ...p, role: 'parent' } })
|
|
|
- const children = (data.children || []).filter(function(c) { return c && c.id }).map(function(c) { return { ...c, role: 'child' } })
|
|
|
+ const members = data.members || []
|
|
|
+ const parents = members.filter(function(p) { return p.source === 'parent' && p.id && p.id !== currentUserId }).map(function(p) { return { ...p, role: 'parent' } })
|
|
|
+ const children = members.filter(function(c) { return c.source !== 'parent' && c.id }).map(function(c) { return { ...c, role: 'child' } })
|
|
|
this.familyMembers = [].concat(parents, children)
|
|
|
// 不自动选孩子:默认显示家长自己,等待用户从 FamilyMemberStrip 选择
|
|
|
// 保存 familyId 用于后续请求
|
|
|
@@ -934,7 +935,7 @@ export default {
|
|
|
// 加载可见家庭成员
|
|
|
async loadFamilyMembersVisible() {
|
|
|
try {
|
|
|
- var res = await getVisibleFamilyMembers()
|
|
|
+ var res = await getFamilyMemberList({ visibleOnly: true })
|
|
|
this.familyMembersVisible = res.data || []
|
|
|
} catch (e) {
|
|
|
console.log('获取可见家庭成员失败', e)
|