|
@@ -737,22 +737,29 @@ export default {
|
|
|
if (dashData.familyId) {
|
|
if (dashData.familyId) {
|
|
|
this._familyId = dashData.familyId
|
|
this._familyId = dashData.familyId
|
|
|
}
|
|
}
|
|
|
|
|
+ // 从仪表盘同步设置 familyMembersVisible(含家长本人),避免后续 loadFamilyMembersVisible() 再调 getFamilyMemberList
|
|
|
|
|
+ var dashMembers = dashData.members || dashData.familyMembers || filteredChildren
|
|
|
|
|
+ this.familyMembersVisible = dashMembers
|
|
|
|
|
+ _membersVisibleSet = true
|
|
|
dashboardLoaded = true
|
|
dashboardLoaded = true
|
|
|
}
|
|
}
|
|
|
} catch (e) {
|
|
} catch (e) {
|
|
|
console.log('获取仪表盘数据失败,降级到单独接口', e)
|
|
console.log('获取仪表盘数据失败,降级到单独接口', e)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // 降级:使用原有单独接口
|
|
|
|
|
|
|
+ // 降级:使用原有单独接口(仅调用一次 getFamilyMemberList,合并 children 与 familyMembers 派生)
|
|
|
if (!dashboardLoaded) {
|
|
if (!dashboardLoaded) {
|
|
|
try {
|
|
try {
|
|
|
const currentUserId = uni.getStorageSync('userId')
|
|
const currentUserId = uni.getStorageSync('userId')
|
|
|
const membersRes = await getFamilyMemberList({ visibleOnly: true, includeFamily: true })
|
|
const membersRes = await getFamilyMemberList({ visibleOnly: true, includeFamily: true })
|
|
|
const data = membersRes.data || {}
|
|
const data = membersRes.data || {}
|
|
|
- const members = data.members || []
|
|
|
|
|
|
|
+ var members = data.members || data || []
|
|
|
|
|
+ if (!Array.isArray(members)) members = []
|
|
|
const parents = members.filter(function(p) { return p.source === 'parent' && p.id && p.id !== currentUserId }).map(function(p) { return { ...p, role: 'parent' } })
|
|
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' } })
|
|
const children = members.filter(function(c) { return c.source !== 'parent' && c.id }).map(function(c) { return { ...c, role: 'child' } })
|
|
|
this.familyMembers = [].concat(parents, children)
|
|
this.familyMembers = [].concat(parents, children)
|
|
|
|
|
+ // 从同一响应派生 children,避免再调 getChildren()(= getFamilyMemberList({}))
|
|
|
|
|
+ this.children = children
|
|
|
// 同步设置 familyMembersVisible,避免 loadFamilyMembersVisible() 重复调用 getFamilyMemberList
|
|
// 同步设置 familyMembersVisible,避免 loadFamilyMembersVisible() 重复调用 getFamilyMemberList
|
|
|
this.familyMembersVisible = members
|
|
this.familyMembersVisible = members
|
|
|
_membersVisibleSet = true
|
|
_membersVisibleSet = true
|
|
@@ -764,17 +771,6 @@ export default {
|
|
|
} catch (e) {
|
|
} catch (e) {
|
|
|
console.log('获取家庭成员失败', e)
|
|
console.log('获取家庭成员失败', e)
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- if (this.children.length === 0) {
|
|
|
|
|
- try {
|
|
|
|
|
- const childrenRes = await getChildren()
|
|
|
|
|
- const rawChildren = childrenRes.data || []
|
|
|
|
|
- this.children = rawChildren
|
|
|
|
|
- // 不自动选孩子:默认显示家长自己,等待用户从 FamilyMemberStrip 选择
|
|
|
|
|
- } catch (e) {
|
|
|
|
|
- console.log('获取孩子列表失败', e)
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
const reviewRes = await getPendingReviewTasks()
|
|
const reviewRes = await getPendingReviewTasks()
|