From 7cf28d106bbe65054158281306ed804514048d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?kaizheng=28=E9=83=91=E5=87=AF=29?= <kaizheng@upchina.com>
Date: Fri, 14 Feb 2025 14:19:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/circle/detail/components/newsList.vue  |  2 +-
 .../circle/detail/components/privateChat.vue     |  8 +++-----
 .../circle/detail/components/privateList.vue     | 11 +++++------
 src/views/circle/detail/index.vue                | 16 +++++++++++-----
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/views/circle/detail/components/newsList.vue b/src/views/circle/detail/components/newsList.vue
index 5e6775e..a16f349 100644
--- a/src/views/circle/detail/components/newsList.vue
+++ b/src/views/circle/detail/components/newsList.vue
@@ -139,7 +139,7 @@ export default {
     privateNewMsg(msg) {
       if (
         msg.userType !== 2 ||
-        (msg.userType === 2 && this.privateNewMsg.privateUserId === this.userId)
+        (msg.userType === 2 && msg.privateUserId === this.userId)
       ) {
         this.list.unshift(msg);
       }
diff --git a/src/views/circle/detail/components/privateChat.vue b/src/views/circle/detail/components/privateChat.vue
index edb4f1c..1444c83 100644
--- a/src/views/circle/detail/components/privateChat.vue
+++ b/src/views/circle/detail/components/privateChat.vue
@@ -2,11 +2,9 @@
   <div class="privat-chat">
     <div class="header">
       <div class="left">
-        <el-button
-          size="mini"
-          type="primary"
-          @click="closePrivateChat"
-        >返回群聊</el-button>
+        <el-button size="mini" type="primary" @click="closePrivateChat"
+          >返回群聊</el-button
+        >
         <h5>{{ userInfo.userName }}</h5>
       </div>
       <div>私聊中</div>
diff --git a/src/views/circle/detail/components/privateList.vue b/src/views/circle/detail/components/privateList.vue
index fffba01..1d8dc45 100644
--- a/src/views/circle/detail/components/privateList.vue
+++ b/src/views/circle/detail/components/privateList.vue
@@ -19,7 +19,7 @@
             <!-- <el-badge is-dot class="item"
               ><img :src="defaultAvatar.student" alt="" />
             </el-badge> -->
-            <img :src="defaultAvatar.student" alt="">
+            <img :src="defaultAvatar.student" alt="" />
           </div>
           <div class="user-info">
             <p>
@@ -76,10 +76,10 @@ export default {
     privateNewMsg(msg) {
       if (this.userIdsMsgObj[msg.privateUserId]) {
         Object.assign(this.userIdsMsgObj[msg.privateUserId], msg);
-        this.$set(msg, "newMsgTip", true);
+        this.$set(this.userIdsMsgObj[msg.privateUserId], "newMsgTip", true);
       } else {
         this.list.unshift(msg);
-        this.$set(msg, "newMsgTip", true);
+        this.$set(this.userIdsMsgObj[msg.privateUserId], "newMsgTip", true);
       }
       this.list = this.list.sort((x, y) => {
         return (
@@ -113,15 +113,14 @@ export default {
       }
       this.loading = false;
     },
-    searchMsg() {
+    async searchMsg() {
+      await this.getPrivateChatList();
       if (this.keyword) {
         this.filterList = this.list.filter(item => {
           const userName =
             item.userType !== 2 ? item.privateUserName : item.userName;
           return userName.includes(this.keyword);
         });
-      } else {
-        this.filterList = this.list;
       }
     }
   }
diff --git a/src/views/circle/detail/index.vue b/src/views/circle/detail/index.vue
index 3c9b482..2b076ee 100644
--- a/src/views/circle/detail/index.vue
+++ b/src/views/circle/detail/index.vue
@@ -321,10 +321,17 @@ export default {
         });
     },
     toPrivateChat(userInfo) {
-      this.privateUserInfo = Object.assign({
-        privateUserId: userInfo.userId,
-        privateUserName: userInfo.userName
-      });
+      this.privateUserInfo = Object.assign(
+        userInfo.userType === 2
+          ? {
+              privateUserId: userInfo.userId,
+              privateUserName: userInfo.userName
+            }
+          : {
+              privateUserId: userInfo.privateUserId,
+              privateUserName: userInfo.privateUserName
+            }
+      );
       this.chatType = 2;
     },
     closePrivateChat() {
@@ -382,7 +389,6 @@ export default {
       }
     },
     handlePrivateChatTopic(msg) {
-      debugger;
       console.log("handlePrivateChatTopic", msg);
       const body = JSON.parse(msg.body);
       if ([1].includes(body.type)) {