bug修复
This commit is contained in:
parent
840d26197f
commit
dd9722862f
@ -1,5 +1,5 @@
|
|||||||
import { ref, computed } from 'vue'
|
import { ref, computed } from 'vue'
|
||||||
import { onShow, onUnload } from '@dcloudio/uni-app'
|
import { onShow, onUnload, onLoad } from '@dcloudio/uni-app'
|
||||||
import api from '@/utils/api.js'
|
import api from '@/utils/api.js'
|
||||||
import useTeamStore from '@/store/team.js'
|
import useTeamStore from '@/store/team.js'
|
||||||
|
|
||||||
@ -47,12 +47,12 @@ export default function useGroupChat(groupID) {
|
|||||||
// 如果找不到成员信息,根据是否为团队成员返回默认头像
|
// 如果找不到成员信息,根据是否为团队成员返回默认头像
|
||||||
return isTeamMember(userId) ? '/static/home/avatar.svg' : '/static/default-patient-avatar.png'
|
return isTeamMember(userId) ? '/static/home/avatar.svg' : '/static/default-patient-avatar.png'
|
||||||
}
|
}
|
||||||
|
|
||||||
// 如果有头像且不为空字符串,返回头像
|
// 如果有头像且不为空字符串,返回头像
|
||||||
if (member.avatar && member.avatar.trim() !== '') {
|
if (member.avatar && member.avatar.trim() !== '') {
|
||||||
return member.avatar
|
return member.avatar
|
||||||
}
|
}
|
||||||
|
|
||||||
// 否则根据是否为团队成员返回默认头像
|
// 否则根据是否为团队成员返回默认头像
|
||||||
return member.isTeamMember ? '/static/home/avatar.svg' : '/static/default-patient-avatar.png'
|
return member.isTeamMember ? '/static/home/avatar.svg' : '/static/default-patient-avatar.png'
|
||||||
}
|
}
|
||||||
@ -61,11 +61,11 @@ export default function useGroupChat(groupID) {
|
|||||||
async function getGroupInfo() {
|
async function getGroupInfo() {
|
||||||
const gid = typeof groupID === 'string' ? groupID : groupID.value
|
const gid = typeof groupID === 'string' ? groupID : groupID.value
|
||||||
if (!gid) return
|
if (!gid) return
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// 1. 获取群聊基本信息
|
// 1. 获取群聊基本信息
|
||||||
const groupResult = await api('getGroupListByGroupId', { groupId: gid })
|
const groupResult = await api('getGroupListByGroupId', { groupId: gid })
|
||||||
|
|
||||||
if (groupResult && groupResult.success && groupResult.data) {
|
if (groupResult && groupResult.success && groupResult.data) {
|
||||||
groupInfo.value = {
|
groupInfo.value = {
|
||||||
groupID: gid,
|
groupID: gid,
|
||||||
@ -73,14 +73,14 @@ export default function useGroupChat(groupID) {
|
|||||||
status: groupResult.data.orderStatus || 'active',
|
status: groupResult.data.orderStatus || 'active',
|
||||||
teamId: groupResult.data.teamId
|
teamId: groupResult.data.teamId
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. 如果有teamId,获取团队成员头像和名称
|
// 2. 如果有teamId,获取团队成员头像和名称
|
||||||
if (groupResult.data.teamId) {
|
if (groupResult.data.teamId) {
|
||||||
const memberMap = await teamStore.getTeamMemberAvatarsAndName(groupResult.data.teamId)
|
const memberMap = await teamStore.getTeamMemberAvatarsAndName(groupResult.data.teamId)
|
||||||
|
|
||||||
// 3. 存储团队成员ID列表
|
// 3. 存储团队成员ID列表
|
||||||
teamMemberIds.value = Object.keys(memberMap)
|
teamMemberIds.value = Object.keys(memberMap)
|
||||||
|
|
||||||
// 4. 构建团队成员列表(从返回的 { userId: { avatar, name } } 中提取)
|
// 4. 构建团队成员列表(从返回的 { userId: { avatar, name } } 中提取)
|
||||||
members.value = teamMemberIds.value.map(userId => {
|
members.value = teamMemberIds.value.map(userId => {
|
||||||
const memberInfo = memberMap[userId] || {}
|
const memberInfo = memberMap[userId] || {}
|
||||||
@ -91,7 +91,7 @@ export default function useGroupChat(groupID) {
|
|||||||
isTeamMember: true
|
isTeamMember: true
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
// 5. 添加患者信息(使用默认患者头像)
|
// 5. 添加患者信息(使用默认患者头像)
|
||||||
if (groupResult.data.patient) {
|
if (groupResult.data.patient) {
|
||||||
const pid = groupResult.data.patientId?.toString() || ''
|
const pid = groupResult.data.patientId?.toString() || ''
|
||||||
@ -115,6 +115,7 @@ export default function useGroupChat(groupID) {
|
|||||||
getGroupInfo()
|
getGroupInfo()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
onUnload(() => {
|
onUnload(() => {
|
||||||
// 清理资源
|
// 清理资源
|
||||||
})
|
})
|
||||||
|
|||||||
@ -883,16 +883,8 @@ onShow(() => {
|
|||||||
timChatManager.tim &&
|
timChatManager.tim &&
|
||||||
timChatManager.isLoggedIn &&
|
timChatManager.isLoggedIn &&
|
||||||
chatInfo.value.conversationID
|
chatInfo.value.conversationID
|
||||||
) {
|
)
|
||||||
// 页面从后台返回时,重新加载消息列表
|
startIMMonitoring(30000);
|
||||||
console.log("页面从后台返回,重新加载消息列表");
|
|
||||||
messageList.value = [];
|
|
||||||
isCompleted.value = false;
|
|
||||||
lastFirstMessageId.value = "";
|
|
||||||
// loadMessageList();
|
|
||||||
}
|
|
||||||
|
|
||||||
startIMMonitoring(30000);
|
|
||||||
|
|
||||||
// 监听回访任务发送事件
|
// 监听回访任务发送事件
|
||||||
uni.$on("send-followup-message", handleSendFollowUpMessage);
|
uni.$on("send-followup-message", handleSendFollowUpMessage);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user