From 30edf8135a217aec02e9ac5f58ee2675ba8f04b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?kaizheng=28=E9=83=91=E5=87=AF=29?= <kaizheng@upchina.com>
Date: Wed, 12 Feb 2025 22:54:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../circle/detail/components/forbidSpeak.vue  |  6 +--
 .../circle/detail/components/newsList.vue     | 43 +++++++++++++------
 .../circle/detail/components/userList.vue     | 16 +++----
 .../detail/components/userLnteractList.vue    | 34 ++++++++-------
 4 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/src/views/circle/detail/components/forbidSpeak.vue b/src/views/circle/detail/components/forbidSpeak.vue
index 50deee9..7e6cb1f 100644
--- a/src/views/circle/detail/components/forbidSpeak.vue
+++ b/src/views/circle/detail/components/forbidSpeak.vue
@@ -21,11 +21,7 @@
   </el-dialog>
 </template>
 <script>
-import {
-  queryCommentBlackList,
-  addCommentBlack,
-  removeCommentBlack
-} from "@/api/videoLive";
+import { addCommentBlack } from "@/api/videoLive";
 export default {
   props: {
     productId: {
diff --git a/src/views/circle/detail/components/newsList.vue b/src/views/circle/detail/components/newsList.vue
index feaf450..461b58a 100644
--- a/src/views/circle/detail/components/newsList.vue
+++ b/src/views/circle/detail/components/newsList.vue
@@ -11,9 +11,9 @@
           <img
             v-if="item.userType === 1"
             :src="item.advisor ? item.advisor.avatar : defaultAvatar.teacher"
-          >
-          <img v-else-if="item.userType === 3" :src="defaultAvatar.assistant">
-          <img v-else-if="item.userType === 2" :src="defaultAvatar.student">
+          />
+          <img v-else-if="item.userType === 3" :src="defaultAvatar.assistant" />
+          <img v-else-if="item.userType === 2" :src="defaultAvatar.student" />
           <div class="news-info">
             <div class="news-info-top">
               <div class="news-user">
@@ -21,7 +21,8 @@
                 <label
                   v-if="[1, 3].includes(item.userType)"
                   :class="[item.userType === 1 ? 'blue' : 'orange']"
-                >{{ item.userType === 1 ? "老师" : "助教" }}</label>
+                  >{{ item.userType === 1 ? "老师" : "助教" }}</label
+                >
                 <span><i>1</i>/4</span>
                 <span>已读</span>
               </div>
@@ -30,19 +31,22 @@
                   v-if="type !== 5"
                   type="success"
                   @click="setMessageRecommend(item)"
-                >{{
-                  item.isRecommend === 1 ? "取消精选" : "设为精选"
-                }}</el-link>
+                  >{{
+                    item.isRecommend === 1 ? "取消精选" : "设为精选"
+                  }}</el-link
+                >
                 <el-link
                   v-if="item.userType === 2 && type !== 5"
                   type="success"
                   @click="setReplyMsg(item)"
-                >引用</el-link>
+                  >引用</el-link
+                >
                 <el-link
                   v-if="item.userType === 2 && item.status === 1"
                   type="success"
                   @click="updateMessageStatus(item)"
-                >通过审核</el-link>
+                  >通过审核</el-link
+                >
               </div>
             </div>
             <p>{{ item.createTime }}</p>
@@ -50,7 +54,7 @@
         </div>
         <div class="new-content">
           <p v-if="item.contentType === 1">{{ item.content }}</p>
-          <img v-else :src="item.content" alt="">
+          <img v-else :src="item.content" alt="" />
         </div>
       </li>
     </ul>
@@ -87,6 +91,7 @@ export default {
   data() {
     return {
       keyword: "",
+      msgIdsObj: {},
       list: [],
       loading: true,
       hasNext: true,
@@ -107,17 +112,24 @@ export default {
       this.searchMsg("");
     },
     newMsg(msg) {
-      if (
+      if (this.msgIdsObj[msg.id]) {
+        Object.assign(this.msgIdsObj[msg.id], msg);
+      } else if (
         this.type === 1 ||
         (this.type === 2 && msg.userType === 1) ||
         (this.type === 4 && msg.isRecommend === 1)
-      ) { this.list.unshift(msg); }
+      ) {
+        this.list.unshift(msg);
+        this.msgIdsObj[msg.id] = msg;
+      }
     },
     privateNewMsg(msg) {
       if (
         msg.userType !== 2 ||
         (msg.userType === 2 && this.privateNewMsg.privateUserId === this.userId)
-      ) { this.list.unshift(msg); }
+      ) {
+        this.list.unshift(msg);
+      }
     },
     userId(value) {
       if (value) {
@@ -142,7 +154,11 @@ export default {
         this.loading = false;
       });
       if (ret && ret.code === 0) {
+        let retList = ret.data.list;
         this.list = this.list.concat(ret.data.list);
+        retList.forEach(msg => {
+          this.msgIdsObj[msg.id] = msg;
+        });
         this.hasNext = ret.data.hasNext;
       }
       this.loading = false;
@@ -151,6 +167,7 @@ export default {
       if (this.groupId) {
         this.keyword = keyword;
         this.list = [];
+        this.msgIdsObj = {};
         this.getMessageList();
       }
     },
diff --git a/src/views/circle/detail/components/userList.vue b/src/views/circle/detail/components/userList.vue
index c35e23d..bcab336 100644
--- a/src/views/circle/detail/components/userList.vue
+++ b/src/views/circle/detail/components/userList.vue
@@ -17,7 +17,7 @@
         <div>操作</div>
       </dt>
       <dd v-for="(item, index) in list" :key="item.id">
-        <div><img src="" alt=""></div>
+        <div><img src="" alt="" /></div>
         <div>
           <!-- <p>{{ item.phone }}</p> -->
           <p>{{ item.userName }}</p>
@@ -33,17 +33,16 @@
             <el-link type="success" :underline="false">私聊</el-link>
           </div>
           <div>
-            <el-link
-              v-if="type === 1"
-              type="success"
-              :underline="false"
-            >根据用户的禁言状态来显示禁言还是取消禁言</el-link>
+            <el-link v-if="type === 1" type="success" :underline="false"
+              >根据用户的禁言状态来显示禁言还是取消禁言</el-link
+            >
             <el-link
               v-else-if="type === 2"
               type="success"
               :underline="false"
               @click="setCommentBlack(2, item)"
-            >取消禁言</el-link>
+              >取消禁言</el-link
+            >
           </div>
         </div>
       </dd>
@@ -95,7 +94,6 @@ export default {
           type: "warning"
         })
           .then(() => {
-            debugger;
             removeCommentBlack({
               userPhone: item.phone,
               productId: item.productId,
@@ -107,6 +105,7 @@ export default {
                   showClose: false,
                   type: "success"
                 });
+                this.searchMsg();
               }
             });
           })
@@ -122,6 +121,7 @@ export default {
           productId: this.groupId,
           userName: this.userName,
           productType: 41,
+          status: 0,
           userType: 3 // 作为何种角色访问 1:投顾 2:运营(非投顾) 3:忽略数据权限
         }).catch(() => {
           this.loading = false;
diff --git a/src/views/circle/detail/components/userLnteractList.vue b/src/views/circle/detail/components/userLnteractList.vue
index d0583fc..e496867 100644
--- a/src/views/circle/detail/components/userLnteractList.vue
+++ b/src/views/circle/detail/components/userLnteractList.vue
@@ -13,7 +13,7 @@
       >
         <li v-for="(item, index) in list" :key="index">
           <div class="new-header">
-            <img :src="defaultAvatar.student">
+            <img :src="defaultAvatar.student" />
             <div class="news-info">
               <div class="news-info-top">
                 <div class="news-user">
@@ -21,7 +21,8 @@
                   <label
                     v-if="[1, 3].includes(item.userType)"
                     :class="[item.userType === 1 ? 'blue' : 'orange']"
-                  >{{ item.userType === 1 ? "老师" : "助教" }}</label>
+                    >{{ item.userType === 1 ? "老师" : "助教" }}</label
+                  >
                   <span><i>1</i>/4</span>
                   <span>已读</span>
                 </div>
@@ -30,21 +31,20 @@
             </div>
             <div class="news-opt">
               <div class="flex">
-                <el-link
-                  type="success"
-                  @click="setReplyMsg(item)"
-                >引用</el-link>
+                <el-link type="success" @click="setReplyMsg(item)"
+                  >引用</el-link
+                >
                 <el-link
                   v-if="item.userType === 2 && item.status === 1"
                   type="success"
                   @click="updateMessageStatus(item)"
-                >通过审核</el-link>
+                  >通过审核</el-link
+                >
               </div>
               <div class="flex">
-                <el-link
-                  type="success"
-                  @click="toPrivateChat(item)"
-                >私聊</el-link>
+                <el-link type="success" @click="toPrivateChat(item)"
+                  >私聊</el-link
+                >
 
                 <el-link type="success" @click="prohibition(item)">{{
                   item.isForbidden === 1 ? "取消禁言" : "禁言"
@@ -54,7 +54,7 @@
           </div>
           <div class="new-content">
             <p v-if="item.contentType === 1">{{ item.content }}</p>
-            <img v-else :src="item.content" alt="">
+            <img v-else :src="item.content" alt="" />
           </div>
         </li>
       </ul>
@@ -110,10 +110,11 @@ export default {
     groupId() {
       this.keyword = "";
       this.list = [];
+      this.msgIdsObj = {};
       this.getMessageList();
     },
     newMsg(msg) {
-      if (msg.userType === 2) {
+      if (msg.userType === 2 && !this.msgIdsObj[msg.id]) {
         this.list.unshift(msg);
         this.msgIdsObj[msg.id] = msg;
         if (this.msgUserIdsObj[msg.userId]) {
@@ -121,6 +122,8 @@ export default {
         } else {
           this.msgUserIdsObj[msg.userId] = [msg];
         }
+      } else if (msg.userType === 2 && this.msgIdsObj[msg.id]) {
+        Object.assign(this.msgIdsObj[msg.id], msg);
       }
     }
   },
@@ -140,8 +143,9 @@ export default {
         this.loading = false;
       });
       if (ret && ret.code === 0) {
-        this.list = this.list.concat(ret.data.list);
-        this.list.forEach(msg => {
+        let retList = ret.data.list;
+        this.list = this.list.concat(retList);
+        retList.forEach(msg => {
           this.msgIdsObj[msg.id] = msg;
           if (this.msgUserIdsObj[msg.userId]) {
             this.msgUserIdsObj[msg.userId].push(msg);