|
@@ -247,6 +247,22 @@ const fileChangeMsg = async (val) => {
|
|
|
sendId.value = val.id;
|
|
|
websoctStore.sendMessage(message);
|
|
|
};
|
|
|
+const getNewMsgList=async ()=>{
|
|
|
+ const resFriend = await msgFriend();
|
|
|
+ personList.data = resFriend.rows;
|
|
|
+ //圆点======
|
|
|
+ searchData.value.map((i) => {
|
|
|
+ personList.data.map((v)=>{
|
|
|
+ if (v.fromId == websoctStore.messOne?.fromId) {
|
|
|
+ v.showCircel = true;
|
|
|
+ }
|
|
|
+ if(i.msgId==v.msgId){
|
|
|
+ i=v
|
|
|
+ }
|
|
|
+ })
|
|
|
+ });
|
|
|
+ console.log('searchData.value', searchData.value)
|
|
|
+}
|
|
|
//点击发送文件图标
|
|
|
const fileUserTreeData = reactive({ data: {} });
|
|
|
const sendFileClick = async () => {
|
|
@@ -258,15 +274,15 @@ const sendFileClick = async () => {
|
|
|
//获取用户聊天记录
|
|
|
const handleNewMessage = async () => {
|
|
|
if (websoctStore.newMessage) {
|
|
|
- msgRecordEvent(sendCont.data.toId); //获取用户的聊天记录
|
|
|
- getMsgList();
|
|
|
+ msgRecordEvent(sendCont.data.toId); //获取用户的聊天记录
|
|
|
+ getNewMsgList();
|
|
|
websoctStore.newMessage = false; // 重置新消息标记
|
|
|
}
|
|
|
};
|
|
|
watchEffect(() => {
|
|
|
if (websoctStore.messOne?.fromId) {
|
|
|
msgRecordEvent(websoctStore.messOne.fromId);
|
|
|
- getMsgList();
|
|
|
+ getNewMsgList();
|
|
|
}
|
|
|
});
|
|
|
// 滚动翻页========
|
|
@@ -427,6 +443,7 @@ onMounted(() => {
|
|
|
class="head-sculpture"
|
|
|
v-if="item.toId == userIds.uid && item.fromAvatar"
|
|
|
/>
|
|
|
+ <img :src="item.avatar " alt="" v-else-if="item.avatar"/>
|
|
|
<img
|
|
|
:src="wangzhi + item.toAvatar"
|
|
|
class="head-sculpture"
|
|
@@ -443,7 +460,8 @@ onMounted(() => {
|
|
|
"
|
|
|
class="head-sculpture"
|
|
|
v-else
|
|
|
- >{{ item.toId == userIds.uid? item.fromName?.slice(0, 1): item.toName?.slice(0, 1) }}</span>
|
|
|
+ >{{ item.nickName
|
|
|
+ ? item.nickName?.slice(0, 1):item.toId == userIds.uid? item.fromName?.slice(0, 1): item.toName?.slice(0, 1) }}</span>
|
|
|
</div>
|
|
|
<div class="spill">
|
|
|
<span class="person-name">{{
|