|
@@ -19,25 +19,31 @@ const getInitData = async list => {
|
|
|
});
|
|
|
const group = await imGroupQueryDetail(tempList);
|
|
|
const tempGroup = group.data || [];
|
|
|
+
|
|
|
+ const temp = [];
|
|
|
list.forEach(item => {
|
|
|
+ const tempItem = {};
|
|
|
const findItem = tempGroup.find(item2 => item2.id === item.targetId);
|
|
|
|
|
|
if (item == ConversationType.GROUP) {
|
|
|
- item.memberCount = 0; // memberCount 为群成员数量
|
|
|
+ tempItem.memberCount = 0; // memberCount 为群成员数量
|
|
|
}
|
|
|
- if (findItem) {
|
|
|
- item.name = findItem.name;
|
|
|
- item.portraitUri =
|
|
|
+ // console.log(findItem, "findItem items");
|
|
|
+ if (findItem.id) {
|
|
|
+ tempItem.name = findItem.name;
|
|
|
+ tempItem.portraitUri =
|
|
|
findItem.avatar || item.conversationType === 1
|
|
|
? teacherLogo
|
|
|
: groupLogo;
|
|
|
} else {
|
|
|
- item.name = "";
|
|
|
- item.portraitUri =
|
|
|
+ tempItem.name = "";
|
|
|
+ tempItem.portraitUri =
|
|
|
item.conversationType === 1 ? teacherLogo : groupLogo;
|
|
|
}
|
|
|
+ console.log({ ...item, ...tempItem }, "tempItem");
|
|
|
+ temp.push({ ...item, ...tempItem });
|
|
|
});
|
|
|
- return list;
|
|
|
+ return temp;
|
|
|
} catch {
|
|
|
//
|
|
|
return [];
|