From 224965c7747ba26bd6c4f52d7d35f1c0f6b71718 Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Thu, 18 Jun 2026 17:29:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF-=E7=BE=A4=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/message/components/GroupSetting.vue | 28 +++++++++----
 .../message/components/MessageDisplay.vue     | 41 ++++++++++---------
 2 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/src/views/message/components/GroupSetting.vue b/src/views/message/components/GroupSetting.vue
index 3de6da1..1c23d66 100644
--- a/src/views/message/components/GroupSetting.vue
+++ b/src/views/message/components/GroupSetting.vue
@@ -9,7 +9,10 @@
     >
       <div class="group-setting">
         <!-- 群头像和名称 -->
-        <div class="group-info">
+        <div
+          class="group-info"
+          v-if="currentChat.scene === ContactsScene.GROUP"
+        >
           <el-avatar
             :size="40"
             :src="
@@ -34,7 +37,11 @@
         <div class="section">
           <div class="section-title">群成员 {{ groupInfo.user_num }}人</div>
           <div class="member-list">
-            <div class="member-item" @click="showAddMember">
+            <div
+              class="member-item"
+              @click="showAddMember"
+              v-if="currentChat.scene === ContactsScene.GROUP"
+            >
               <el-icon
                 class="el-icon-circle-plus-outline"
                 style="font-size: 40px"
@@ -68,13 +75,18 @@
                   <i class="el-icon-minus" />
                 </span>
               </div>
-              <span class="member-name" :title="member.name">{{ member.name }}</span>
+              <span class="member-name" :title="member.name">{{
+                member.name
+              }}</span>
             </div>
           </div>
         </div>
         <!-- 群管理员 -->
         <div
-          v-if="groupInfo.user_list.some((m) => m.id === groupInfo.user_id)"
+          v-if="
+            groupInfo.user_list.some((m) => m.id === groupInfo.user_id) &&
+            currentChat.scene === ContactsScene.GROUP
+          "
           class="section"
         >
           <div class="section-title">群管理员</div>
@@ -93,12 +105,14 @@
                   member.avatar
                 "
               />
-              <span class="member-name" :title="member.name">{{ member.name }}</span>
+              <span class="member-name" :title="member.name">{{
+                member.name
+              }}</span>
             </div>
           </div>
         </div>
         <!-- 操作按钮 -->
-        <div class="actions">
+        <div class="actions" v-if="currentChat.scene === ContactsScene.GROUP">
           <el-button type="danger" @click="handleQuitGroup">
             退出群组
           </el-button>
@@ -369,7 +383,7 @@ export default {
       font-size: 12px;
       color: #606266;
       text-align: center;
-       width: 100%;
+      width: 100%;
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
diff --git a/src/views/message/components/MessageDisplay.vue b/src/views/message/components/MessageDisplay.vue
index 5e2fc2a..ac39ba8 100644
--- a/src/views/message/components/MessageDisplay.vue
+++ b/src/views/message/components/MessageDisplay.vue
@@ -19,7 +19,7 @@
           type="text"
           icon="el-icon-s-tools"
           @click="handleGroupSetting"
-          v-if="currentChat && currentChat.scene === ContactsScene.GROUP"
+          v-if="currentChat"
         />
       </div>
     </div>
@@ -676,14 +676,11 @@ export default {
       text = text.replace(/\n/g, "<br>");
       // @高亮 - 添加 data 属性存储用户名和索引
       let atIndex = 0;
-      text = text.replace(
-        /@([^\s@]+)/g,
-        (match, username) => {
-          const result = `<span class="at-highlight" data-username="${username}" data-at-index="${atIndex}">@${username}</span>`;
-          atIndex++;
-          return result;
-        }
-      );
+      text = text.replace(/@([^\s@]+)/g, (match, username) => {
+        const result = `<span class="at-highlight" data-username="${username}" data-at-index="${atIndex}">@${username}</span>`;
+        atIndex++;
+        return result;
+      });
       // URL链接
       text = text.replace(
         /(https?:\/\/[^\s]+)/g,
@@ -697,11 +694,11 @@ export default {
       if (target.classList.contains("at-highlight")) {
         const username = target.dataset.username;
         const atIndex = parseInt(target.dataset.atIndex, 10);
-        
+
         // 从 at_users（tp_ids）中根据顺序取出对应的用户 ID
         const tpIds = msg.at_users || msg.tp_ids || [];
         const userId = tpIds[atIndex];
-        
+
         if (userId) {
           this.getUserInfoById(userId);
         } else if (username) {
@@ -713,9 +710,9 @@ export default {
     async getUserInfoById(userId) {
       try {
         const response = await this.$http.get(`/api/v1/users/info`, {
-          params: { user_id: userId }
+          params: { user_id: userId },
         });
-        
+
         if (response.data.code === 200) {
           const userInfo = response.data.data;
           this.showUserInfoModal(userInfo);
@@ -729,19 +726,25 @@ export default {
     },
 
     showUserInfoModal(userInfo) {
-      this.$alert(`
+      this.$alert(
+        `
         <div style="text-align: left;">
-          <h3 style="margin-bottom: 15px;">${userInfo.name || userInfo.username}</h3>
+          <h3 style="margin-bottom: 15px;">${
+            userInfo.name || userInfo.username
+          }</h3>
           <p><strong>账号：</strong>${userInfo.username}</p>
           <p><strong>手机：</strong>${userInfo.phone || "-"}</p>
           <p><strong>邮箱：</strong>${userInfo.email || "-"}</p>
           <p><strong>部门：</strong>${userInfo.department || "-"}</p>
           <p><strong>职位：</strong>${userInfo.position || "-"}</p>
         </div>
-      `, '用户信息', {
-        dangerouslyUseHTMLString: true,
-        confirmButtonText: '关闭'
-      });
+      `,
+        "用户信息",
+        {
+          dangerouslyUseHTMLString: true,
+          confirmButtonText: "关闭",
+        }
+      );
     },
 
     getFileUrl(pathOrUrl) {