diff --git a/src/api/knowledge.js b/src/api/knowledge.js
index 5b92883..95e430d 100644
--- a/src/api/knowledge.js
+++ b/src/api/knowledge.js
@@ -44,7 +44,7 @@ export function postKnowledgeEdit(data) {
 export function postKnowledgeDelete(data) {
   return request({ url: '/knowledge/delete', method: 'post', data })
 }
-// 知识库文件-分享文件s
+// 知识库文件-分享文件
 export function postMessagePushToUser(data) {
   return request({ url: '/messages/push/to/user', method: 'post', data })
 }
diff --git a/src/api/message/index.js b/src/api/message/index.js
index 7c94e61..f0ab460 100644
--- a/src/api/message/index.js
+++ b/src/api/message/index.js
@@ -7,7 +7,7 @@ export function getLatestContacts(data) {
     data
   })
 }
-
+// 发送消息
 export function sendPrivateMessage(data) {
   return request({
     url: '/messages/push/to/user',
@@ -24,13 +24,6 @@ export function sendMultiChatMessage(data) {
   })
 }
 
-export function pullPrivateMessages(data) {
-  return request({
-    url: '/messages/pull',
-    method: 'post',
-    data
-  })
-}
 
 export function pullMultiChatMessages(data) {
   return request({
@@ -63,19 +56,52 @@ export function searchGroups(data) {
     data
   })
 }
-
-export function getMessagesFileList(data) {
+// 聊天记录-图片
+export function postMessagesFileList(data) {
   return request({
     url: '/messages/file/list',
     method: 'post',
     data
   })
 }
-
-export function searchMessages(data) {
+// 聊天记录
+export function postMessagesSearch(data) {
   return request({
     url: '/messages/search',
     method: 'post',
     data
   })
 }
+
+// 个人消息-列表
+export function postMessagesPull(data) {
+  return request({
+    url: '/messages/pull',
+    method: 'post',
+    data
+  })
+}
+// 系统通知-列表
+export function postNotifyPull(data) {
+  return request({
+    url: '/notify/pull',
+    method: 'post',
+    data
+  })
+}
+// 系统通知-发消息
+export function postNotifyPush(data) {
+  return request({
+    url: '/notify/push',
+    method: 'post',
+    data
+  })
+}
+// 系统通知-已读
+export function postNotifyRead(data) {
+  return request({
+    url: '/notify/read',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/multichat.js b/src/api/multichat.js
index 6ea599a..4a1e933 100644
--- a/src/api/multichat.js
+++ b/src/api/multichat.js
@@ -3,15 +3,15 @@ import request from '@/utils/request'
 
 export function createMultiChat(data) {
   return request({
-    url: '/api/v1/multichat/create',
+    url: '/multichat/create',
     method: 'post',
     data
   })
 }
-
+// 修改群名
 export function editMultiChatName(data) {
   return request({
-    url: '/api/v1/multichat/edit_name',
+    url: '/multichat/edit_name',
     method: 'post',
     data
   })
@@ -19,7 +19,7 @@ export function editMultiChatName(data) {
 
 export function editMultiChatAvatar(data) {
   return request({
-    url: '/api/v1/multichat/edit_avatar',
+    url: '/multichat/edit_avatar',
     method: 'post',
     data
   })
@@ -27,39 +27,39 @@ export function editMultiChatAvatar(data) {
 
 export function updateMultiChatNotice(data) {
   return request({
-    url: '/api/v1/multichat/notice',
+    url: '/multichat/notice',
     method: 'post',
     data
   })
 }
 
-export function getMultiChatInfo(params) {
+export function getMultiChatInfo(data) {
   return request({
-    url: '/api/v1/multichat/info',
-    method: 'get',
-    params
+    url: '/multichat/info',
+    method: 'post',
+    data
   })
 }
-
+// 邀请加入群聊
 export function inviteToMultiChat(data) {
   return request({
-    url: '/api/v1/multichat/invite',
+    url: '/multichat/invite',
     method: 'post',
     data
   })
 }
-
+// 移除群聊成员-退出群聊
 export function quitMultiChat(data) {
   return request({
-    url: '/api/v1/multichat/quit',
+    url: '/multichat/quit',
     method: 'post',
     data
   })
 }
-
+// 解散群聊
 export function dismissMultiChat(data) {
   return request({
-    url: '/api/v1/multichat/dismiss',
+    url: '/multichat/dismiss',
     method: 'post',
     data
   })
@@ -67,7 +67,7 @@ export function dismissMultiChat(data) {
 
 export function pullMultiChatMessages(params) {
   return request({
-    url: '/api/v1/multichat/message/pull',
+    url: '/multichat/message/pull',
     method: 'get',
     params
   })
diff --git a/src/api/system.js b/src/api/system.js
deleted file mode 100644
index 57d8d62..0000000
--- a/src/api/system.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import request from '@/utils/request'
-
-export function getSystemNotify(data) {
-  return request({ url: '/api/v1/notify/pull', method: 'post', data })
-}
-
-export function pushSystemNotify(data) {
-  return request({ url: '/api/v1/notify/push', method: 'post', data })
-}
-
-export function readSystemNotify(data) {
-  return request({ url: '/api/v1/notify/read', method: 'post', data })
-}
diff --git a/src/utils/constants.js b/src/utils/constants.js
index debb3b2..ac92a0e 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -103,7 +103,8 @@ export const MessageFileType = {
 export const ContactsScene = {
   ALL: 0,
   PRIVATE: 1,
-  GROUP: 4
+  GROUP: 4,
+  NOTIFY: 6
 }
 
 // MQTT 主题
diff --git a/src/views/message/components/CreateGroupDialog.vue b/src/views/message/components/CreateGroupDialog.vue
index 633fcbd..c8321ea 100644
--- a/src/views/message/components/CreateGroupDialog.vue
+++ b/src/views/message/components/CreateGroupDialog.vue
@@ -45,7 +45,10 @@
                   >
                     <div class="member-item-label">
                       <el-avatar
-                        :src="member.avatar"
+                        :src="
+                          $store.state.user.netConfig.MINIO_ENDPOINT_HTTPS +
+                          member.avatar
+                        "
                         icon="el-icon-user-solid"
                       />
                       <span class="member-name">{{ member.name }}</span>
@@ -70,7 +73,13 @@
                     :class="{ expanded: group.expanded }"
                     @click="toggleGroupExpand(group)"
                   >
-                    <el-avatar :size="32" :src="group.avatar" />
+                    <el-avatar
+                      :size="32"
+                      :src="
+                        $store.state.user.netConfig.MINIO_ENDPOINT_HTTPS +
+                        group.avatar
+                      "
+                    />
                     <span class="group-name">{{ group.name }}</span>
                     <i class="el-icon-arrow-right expand-icon" />
                   </div>
@@ -86,7 +95,7 @@
                         v-model="group.allSelected"
                         @change="toggleGroupAllSelect(group)"
                       />
-                      <span class="member-name">全选</span>
+                      <span class="member-name"> 全选 </span>
                     </div>
                     <!-- 成员列表 -->
                     <div
@@ -107,7 +116,13 @@
                         @change="toggleSelect(member)"
                       >
                         <div class="member-item-label">
-                          <el-avatar :size="32" :src="member.avatar" />
+                          <el-avatar
+                            :size="32"
+                            :src="
+                              $store.state.user.netConfig.MINIO_ENDPOINT_HTTPS +
+                              member.avatar
+                            "
+                          />
                           <span class="member-name">{{ member.name }}</span>
                         </div>
                       </el-checkbox>
@@ -206,7 +221,13 @@
               :key="member.id"
               class="selected-item"
             >
-              <el-avatar :size="40" :src="member.avatar" />
+              <el-avatar
+                :size="40"
+                :src="
+                  $store.state.user.netConfig.MINIO_ENDPOINT_HTTPS +
+                  member.avatar
+                "
+              />
               <span class="selected-name">{{ member.name }}</span>
               <span class="remove-btn" @click="removeSelected(member)">
                 <i class="el-icon-close" />
@@ -250,6 +271,7 @@ import {
   getGroupsListUser,
   searchUsers,
 } from "@/api/contacts/index.js";
+import { getMultiChatInfo } from "@/api/multichat";
 
 export default {
   name: "CreateGroupDialog",
@@ -264,7 +286,7 @@ export default {
     },
     maxSelectCount: {
       type: Number,
-      default: 1,
+      default: 500,
     },
     confirmCallback: {
       type: Function,
@@ -329,7 +351,7 @@ export default {
           full_group: item.full_group,
           avatar: item.avatar,
           online: item.online === 1 || item.online === true,
-          selected: false,
+          selected: this.isSelected(item.id),
         }));
       } catch (e) {
         console.error("获取最近联系人失败", e);
@@ -455,7 +477,7 @@ export default {
           full_group: item.full_group,
           avatar: item.avatar,
           online: item.online === 1 || item.online === true,
-          selected: false,
+          selected: this.isSelected(item.id),
         }));
       } catch (e) {
         console.error("搜索联系人失败", e);
@@ -490,7 +512,7 @@ export default {
               name: item.name,
               avatar: item.avatar,
               online: item.online === 1 || item.online === true,
-              selected: false,
+              selected: this.isSelected(item.id),
             }));
           } catch (e) {
             console.error(`获取群组 ${group.name} 成员失败`, e);
@@ -504,21 +526,20 @@ export default {
     async toggleGroupExpand(group) {
       group.expanded = !group.expanded;
       if (group.expanded) {
-        if (!group.members || group.members.length === 0) {
-          try {
-            const res = await getGroupsListUser({ group_id: group.id });
-            const list = res.data?.list || [];
-            group.members = list.map((item) => ({
-              id: item.id,
-              name: item.name,
-              avatar: item.avatar,
-              online: item.online === 1 || item.online === true,
-              selected: this.isSelected(item.id),
-            }));
-          } catch (e) {
-            console.error(`获取群组 ${group.name} 成员失败`, e);
-            group.members = [];
-          }
+        // 调用 getMultiChatInfo 接口获取群详细信息
+        try {
+          const res = await getMultiChatInfo({ multi_chat_id: group.id });
+          const data = res.data || {};
+          // 使用接口返回的成员列表，过滤掉与 user_id 相同的用户
+          const userList = data.user_list || [];
+          // 获取当前用户ID，用于过滤掉自己
+          group.members = userList
+            .filter((item) => item.id !== data.user_id)
+            .map((item) => {
+              return { ...item, selected: this.isSelected(item.id) };
+            });
+        } catch (e) {
+          group.members = [];
         }
         group.allSelected = group.members.every((m) => m.selected);
       }
@@ -967,9 +988,38 @@ export default {
     align-items: center;
     gap: 10px;
     padding: 8px 16px;
-    cursor: pointer;
-    transition: background 0.2s;
-    position: relative;
+  }
+
+  // 群组详细信息样式
+  .group-detail-info {
+    padding: 12px 16px;
+    margin: 8px 0;
+    background: #f5f7fa;
+    border-radius: 6px;
+    border-left: 3px solid #409eff;
+
+    .group-detail-row {
+      display: flex;
+      align-items: flex-start;
+      margin-bottom: 8px;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+
+      .group-detail-label {
+        color: #909399;
+        font-size: 13px;
+        flex-shrink: 0;
+      }
+
+      .group-detail-value {
+        color: #606266;
+        font-size: 13px;
+        word-break: break-all;
+        line-height: 1.5;
+      }
+    }
   }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/message/components/GroupSetting.vue b/src/views/message/components/GroupSetting.vue
index 0bf8588..cd4d822 100644
--- a/src/views/message/components/GroupSetting.vue
+++ b/src/views/message/components/GroupSetting.vue
@@ -9,11 +9,16 @@
       <div class="group-setting">
         <!-- 群头像和名称 -->
         <div class="group-info">
-          <el-avatar :size="60" :src="groupInfo.avatar" class="group-avatar">
-            <img v-if="groupInfo.avatar" :src="groupInfo.avatar" />
-            <span v-else class="avatar-text">{{
-              (groupInfo.name || "群聊").slice(0, 2)
-            }}</span>
+          <el-avatar
+            :size="40"
+            :src="
+              $store.state.user.netConfig.MINIO_ENDPOINT_HTTPS +
+              groupInfo.avatar
+            "
+            class="group-avatar"
+            :icon="'el-icon-s-custom'"
+          >
+            <span class="avatar-text"> {{ groupInfo.name }}</span>
           </el-avatar>
           <div class="group-detail">
             <div class="group-name">{{ groupInfo.name }}</div>
@@ -26,21 +31,36 @@
           />
         </div>
         <div class="section">
-          <div class="section-title">
-            群成员 {{ (groupInfo.members && groupInfo.members.length) || 0 }}人
-          </div>
+          <div class="section-title">群成员 {{ groupInfo.user_num }}人</div>
           <div class="member-list">
+            <div class="member-item" @click="showAddMember">
+              <el-icon
+                class="el-icon-circle-plus-outline"
+                style="font-size: 40px"
+              />
+              <span class="member-name">添加成员</span>
+            </div>
             <div
-              v-for="member in groupInfo.members"
+              v-for="member in groupInfo.user_list"
               :key="member.id"
               class="member-item"
               @mouseenter="showDeleteBtn = member.id"
               @mouseleave="showDeleteBtn = null"
             >
               <div class="avatar-wrapper">
-                <el-avatar :size="40" :src="member.avatar" />
+                <el-avatar
+                  :size="40"
+                  :src="
+                    $store.state.user.netConfig.MINIO_ENDPOINT_HTTPS +
+                    member.avatar
+                  "
+                />
                 <span
-                  v-if="showDeleteBtn === member.id && isAdmin"
+                  v-if="
+                    userInfo.id === groupInfo.user_id &&
+                    userInfo.id !== member.id &&
+                    showDeleteBtn === member.id
+                  "
                   class="delete-btn"
                   @click.stop="handleRemoveMember(member)"
                 >
@@ -48,145 +68,131 @@
                 </span>
               </div>
               <span class="member-name">{{ member.name }}</span>
-              <span v-if="member.isAdmin" class="admin-tag">管理员</span>
-            </div>
-            <div class="member-item" @click="showAddMember">
-              <el-icon
-                class="el-icon-circle-plus-outline"
-                style="font-size: 40px"
-              />
-              <span class="member-name">添加成员</span>
             </div>
           </div>
         </div>
-
         <!-- 群管理员 -->
-        <div v-if="groupInfo.members.some((m) => m.isAdmin)" class="section">
+        <div
+          v-if="groupInfo.user_list.some((m) => m.id === groupInfo.user_id)"
+          class="section"
+        >
           <div class="section-title">群管理员</div>
           <div class="member-list">
             <div
-              v-for="member in groupInfo.members.filter((m) => m.isAdmin)"
+              v-for="member in groupInfo.user_list.filter(
+                (m) => m.id === groupInfo.user_id
+              )"
               :key="member.id"
               class="member-item"
             >
-              <el-avatar :size="40" :src="member.avatar" />
+              <el-avatar
+                :size="40"
+                :src="
+                  $store.state.user.netConfig.MINIO_ENDPOINT_HTTPS +
+                  member.avatar
+                "
+              />
               <span class="member-name">{{ member.name }}</span>
             </div>
           </div>
         </div>
-        <!-- 查找聊天记录 -->
-        <div class="section">
-          <div class="search-record-btn" @click="showSearchRecord">
-            <i class="el-icon-search" />
-            <span class="btn-text">查找聊天记录</span>
-            <span class="btn-desc">图片、视频、文件等</span>
-            <i class="el-icon-arrow-right" />
-          </div>
-        </div>
         <!-- 操作按钮 -->
         <div class="actions">
-          <el-button type="danger" @click="handleQuitGroup" v-if="!isAdmin">
+          <el-button type="danger" @click="handleQuitGroup">
             退出群组
           </el-button>
-          <template v-else>
-            <el-button type="danger" @click="handleQuitGroup"
-              >退出群组</el-button
-            >
-            <el-button type="danger" plain @click="handleDismissGroup">
-              解散群组</el-button
-            >
-          </template>
+          <el-button
+            type="danger"
+            plain
+            @click="handleDismissGroup"
+            v-show="userInfo.id === groupInfo.user_id"
+          >
+            解散群组
+          </el-button>
         </div>
       </div>
     </el-dialog>
 
-    <!-- 查找聊天记录弹窗 -->
-    <SearchRecord
-      :visible.sync="isSearchVisible"
-      :chat="chat"
-      @locate="handleLocateMessage"
+    <!-- 添加成员弹窗 -->
+    <CreateGroupDialog
+      ref="addMemberDialog"
+      title="添加成员"
+      :minSelectCount="1"
+      @confirm="handleAddMembers"
     />
   </div>
 </template>
 
 <script>
-import SearchRecord from "./SearchRecord.vue";
+import {
+  getMultiChatInfo,
+  inviteToMultiChat,
+  editMultiChatName,
+  quitMultiChat,
+  dismissMultiChat,
+} from "@/api/multichat";
+import CreateGroupDialog from "./CreateGroupDialog.vue";
 
 export default {
   name: "GroupSetting",
 
   components: {
-    SearchRecord,
+    CreateGroupDialog,
   },
 
   props: {
-    visible: Boolean,
     chat: Object,
   },
 
   data() {
     return {
+      visible: false,
       isSearchVisible: false,
-      groupInfo: {
-        name: "",
-        avatar: "",
-        members: [],
-      },
+      groupInfo: {},
       isAdmin: false,
       showDeleteBtn: null,
+      currentUserId: this.$store.state.user.userInfo?.id,
     };
   },
-
-  watch: {
-    visible(val) {
-      if (val && this.chat) {
-        this.loadGroupInfo();
-      }
+  computed: {
+    userInfo() {
+      return this.$store.state.user.userInfo;
     },
   },
-
   methods: {
-    loadGroupInfo() {
-      // Mock数据
-      const mockGroups = {
-        group1: {
-          name: "基层医生、会诊专家、郭君",
-          avatar: "",
-          members: [
-            { id: "user1", name: "会诊专家", avatar: "", isAdmin: true },
-            { id: "user2", name: "基层医生", avatar: "", isAdmin: true },
-            { id: "user3", name: "郭君", avatar: "", isAdmin: false },
-          ],
-        },
-        group2: {
-          name: "会诊专家、基层医生",
-          avatar: "",
-          members: [
-            { id: "user1", name: "会诊专家", avatar: "", isAdmin: true },
-            { id: "user2", name: "基层医生", avatar: "", isAdmin: false },
-          ],
-        },
-      };
-
-      this.groupInfo = mockGroups[this.chat.id] || {
-        name: this.chat.name,
-        avatar: this.chat.avatar,
-        members: [],
-      };
-
-      // 判断当前用户是否是管理员（假设当前用户是第一个成员）
-      this.isAdmin = this.groupInfo.members[0].isAdmin || false;
+    async loadGroupInfo() {
+      this.visible = true;
+      if (this.chat) {
+        if (!this.chat?.id) return;
+        try {
+          const res = await getMultiChatInfo({ multi_chat_id: this.chat.id });
+          this.groupInfo = {
+            ...res.data,
+            user_list: res.data.user_list.sort((a, b) => a.id - b.id),
+          };
+        } catch (e) {
+          console.error("获取群信息失败", e);
+        }
+      }
     },
 
     editGroupName() {
+      let multi_chat_id = this.chat.id;
       this.$prompt("请输入新的群名称", "修改群名称", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         inputValue: this.groupInfo.name,
       })
         .then(({ value }) => {
-          this.groupInfo.name = value;
-          this.$message.success("群名称修改成功");
+          editMultiChatName({
+            multi_chat_id: multi_chat_id,
+            name: value,
+          }).then(() => {
+            this.groupInfo.name = value;
+            this.$message.success("群名称修改成功");
+            // 触发刷新列表事件
+            this.$emit("refresh-list");
+          });
         })
         .catch(() => {
           this.$message.info("已取消修改");
@@ -202,26 +208,45 @@ export default {
     },
 
     showAddMember() {
-      this.$message.info("添加成员功能");
+      this.$refs.addMemberDialog.show();
+    },
+    async handleAddMembers(selectedMembers) {
+      await inviteToMultiChat({
+        multi_chat_id: this.chat.id,
+        invite_users: selectedMembers.map((m) => m.id),
+      });
+      // 重新加载群信息
+      await this.loadGroupInfo();
+      // 触发刷新列表事件
+      this.$emit("refresh-list");
+      this.$message.success("添加成员成功");
     },
-
     handleRemoveMember(member) {
-      this.$confirm(`确定要移除 "${member.name}" 吗？`, "提示", {
+      this.$confirm(`确定要将该成员踢出群聊吗？`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.groupInfo.members = this.groupInfo.members.filter(
-            (m) => m.id !== member.id
-          );
-          this.$message.success("移除成功");
+          quitMultiChat({
+            // 固定值：移除成员
+            invite_type_detail: 9,
+            // 群聊ID
+            multi_chat_id: this.chat.id,
+            // 被移除成员ID
+            user_id: member.id,
+          }).then(() => {
+            this.$message.success("移除成功");
+            // 重新加载群信息
+            this.loadGroupInfo();
+            // 触发刷新列表事件
+            this.$emit("refresh-list");
+          });
         })
         .catch(() => {
           this.$message.info("已取消移除");
         });
     },
-
     handleQuitGroup() {
       this.$confirm("确定要退出该群组吗？", "提示", {
         confirmButtonText: "确定",
@@ -229,25 +254,40 @@ export default {
         type: "warning",
       })
         .then(() => {
-          this.$message.success("退出成功");
-          this.$emit("quit-group", this.chat);
-          this.$emit("update:visible", false);
+          quitMultiChat({
+            // 固定值：退出群聊
+            invite_type_detail: 8,
+            // // 群聊ID
+            multi_chat_id: this.chat.id,
+            // 当前登录用户ID
+            user_id: this.currentUserId,
+          }).then(() => {
+            this.$message.success("退出成功");
+            // 触发刷新列表事件
+            this.visible = false;
+            this.$emit("quit-group", this.chat);
+          });
         })
         .catch(() => {
           this.$message.info("已取消退出");
         });
     },
-
     handleDismissGroup() {
-      this.$confirm("确定要解散该群组吗？此操作不可撤销！", "提示", {
+      this.$confirm("确定要解散群组吗？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "error",
       })
         .then(() => {
-          this.$message.success("解散成功");
-          this.$emit("dismiss-group", this.chat);
-          this.$emit("update:visible", false);
+          dismissMultiChat({
+            // 群聊ID
+            multi_chat_id: this.chat.id,
+          }).then(() => {
+            this.$message.success("解散成功");
+            // 触发刷新列表事件
+            this.visible = false;
+            this.$emit("dismiss-group", this.chat);
+          });
         })
         .catch(() => {
           this.$message.info("已取消解散");
@@ -258,16 +298,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.group-setting {
-  padding: 20px 0;
-}
-
 .group-info {
   display: flex;
   align-items: center;
-  padding: 15px;
-  background: #f5f7fa;
-  border-radius: 8px;
   margin-bottom: 20px;
 
   .group-avatar {
@@ -282,13 +315,6 @@ export default {
   .group-detail {
     flex: 1;
 
-    .group-name {
-      font-size: 16px;
-      font-weight: 600;
-      color: #303133;
-      margin-bottom: 4px;
-    }
-
     .group-member-count {
       font-size: 12px;
       color: #909399;
@@ -301,8 +327,6 @@ export default {
 }
 
 .section {
-  margin-bottom: 20px;
-
   .section-title {
     font-size: 14px;
     font-weight: 600;
@@ -313,14 +337,13 @@ export default {
   .member-list {
     display: flex;
     flex-wrap: wrap;
-    gap: 15px;
   }
 
   .member-item {
     display: flex;
     flex-direction: column;
     align-items: center;
-    width: calc((100% - 30px) / 3);
+    width: calc(100% / 5);
 
     .avatar-wrapper {
       position: relative;
@@ -353,6 +376,7 @@ export default {
 
     .member-name {
       margin-top: 6px;
+      margin-bottom: 6px;
       font-size: 12px;
       color: #606266;
       text-align: center;
diff --git a/src/views/message/components/MessageDisplay.vue b/src/views/message/components/MessageDisplay.vue
index cadec3d..1571182 100644
--- a/src/views/message/components/MessageDisplay.vue
+++ b/src/views/message/components/MessageDisplay.vue
@@ -3,13 +3,10 @@
     <!-- 聊天头部 -->
     <div class="chat-header">
       <div class="chat-title">
-        <span class="name">{{ chatName }}</span>
-        <el-tag
-          v-if="currentChat && currentChat.scene === 4"
-          size="mini"
-          type="info"
-          >({{ currentChat.members.length }})</el-tag
-        >
+        <span class="name" v-if="currentChat">{{ currentChat.name }}</span>
+        <span v-if="currentChat && currentChat.scene === 4">
+          ({{ currentChat.user_num }})
+        </span>
       </div>
       <div class="chat-actions">
         <el-button
@@ -18,10 +15,10 @@
           @click="handleSearchRecord"
         />
         <el-button
-          v-if="currentChat && currentChat.scene === 4"
           type="text"
-          icon="el-icon-s-unfold"
+          icon="el-icon-s-tools"
           @click="handleGroupSetting"
+          v-if="currentChat && currentChat.scene === 4"
         />
       </div>
     </div>
@@ -45,18 +42,46 @@
         v-for="(msg, index) in currentMessages"
         :key="msg.message_id || msg.id || index"
         :class="['message-item', msg.is_self ? 'self' : 'other']"
-        :data-message-id="msg.message_id || msg.id"
       >
         <!-- 时间分割线 -->
-        <div v-if="shouldShowTime(index)" class="time-divider">
-          {{ formatMessageTime(msg.timestamp || msg.create_time) }}
+        <div class="time-divider">
+          {{ formatMessageTime(msg.create_time) }}
         </div>
-
-        <div class="message-content-wrap">
+        <div
+          v-if="msg.type === MessageType.MULTI_CHAT_INIT_JOIN"
+          class="time-divider"
+        >
+          {{
+            currentChat.user_num > 0
+              ? `${currentChat.source_name || "成员"}邀请了${
+                  currentChat.user_num
+                }人加入群聊`
+              : `${currentChat.source_name || "成员"}加入了群聊`
+          }}
+        </div>
+        <div
+          v-if="msg.type === MessageType.MULTI_CHAT_QUIT"
+          class="time-divider"
+        >
+          {{ msg.source_name || "成员" }}退出了群聊
+        </div>
+        <div
+          class="message-content-wrap"
+          v-if="
+            msg.type !== MessageType.MULTI_CHAT_INIT_JOIN &&
+            msg.type !== MessageType.MULTI_CHAT_QUIT
+          "
+        >
           <!-- 头像 -->
           <el-avatar
             :size="36"
-            :src="msg.is_self ? $store.state.user.avatar : msg.sender_avatar"
+            :src="
+              msg.is_self
+                ? $store.state.user.netConfig.MINIO_ENDPOINT_HTTPS +
+                  $store.state.user.userInfo.avatar
+                : $store.state.user.netConfig.MINIO_ENDPOINT_HTTPS +
+                  currentChat.avatar
+            "
             :icon="msg.is_self ? 'el-icon-user-solid' : 'el-icon-user'"
             class="message-avatar"
           />
@@ -64,12 +89,11 @@
           <div class="message-body">
             <!-- 发送者名称（群聊且非自己） -->
             <div
+              class="message-name"
               v-if="!msg.is_self && currentChat && currentChat.scene === 4"
-              class="sender-name"
             >
               {{ msg.sender_name || msg.source_name || "未知用户" }}
             </div>
-
             <!-- 消息气泡 -->
             <div :class="['message-bubble', msg.type]">
               <!-- 文本消息 -->
@@ -84,18 +108,23 @@
               <!-- 图片消息 -->
               <div
                 v-else-if="msg.type === MessageType.IMAGE"
-                class="image-message"
+                class="text-message"
               >
-                <img
-                  :src="getFileUrl(msg.payload || msg.content)"
-                  alt="图片"
-                  @click="handlePreviewImage(msg)"
-                  @load="scrollToBottomIfNeeded"
+                <el-image
+                  :src="
+                    $store.state.user.netConfig.MINIO_ENDPOINT_HTTPS +
+                    msg.file_path
+                  "
+                  :alt="msg.file_name"
+                  :preview-src-list="[
+                    $store.state.user.netConfig.MINIO_ENDPOINT_HTTPS +
+                      msg.file_path,
+                  ]"
                 />
               </div>
 
               <!-- 视频消息 -->
-              <div
+              <!-- <div
                 v-else-if="msg.type === MessageType.VIDEO"
                 class="video-message"
               >
@@ -105,114 +134,122 @@
                   preload="metadata"
                   @loadedmetadata="scrollToBottomIfNeeded"
                 />
-              </div>
+              </div> -->
 
               <!-- 语音消息 -->
-              <div
+              <!-- <div
                 v-else-if="msg.type === MessageType.AUDIO"
                 class="audio-message"
               >
                 <audio :src="getFileUrl(msg.payload || msg.content)" controls />
-              </div>
+              </div> -->
 
               <!-- 文件消息 -->
               <div
                 v-else-if="msg.type === MessageType.FILE"
-                class="card-message"
+                class="file-message"
               >
-                <div class="card-content" @click="handleDownloadFile(msg)">
-                  <i :class="getFileIcon(msg) + ' card-icon notify'" />
-                  <div class="card-info">
-                    <div class="card-title">{{ getFileName(msg) }}</div>
-                    <div class="card-desc">{{ getFileSize(msg) }}</div>
+                <div class="file-card" @click="handleDownloadFile(msg)">
+                  <div class="file-thumb">
+                    <i
+                      :class="getFileIconClass(msg.file_name) + ' file-icon'"
+                    />
+                  </div>
+                  <div class="file-info">
+                    <div class="file-name">{{ msg.file_name }}</div>
+                    <div class="file-size">
+                      {{ formatFileSize(msg.file_size) }}
+                    </div>
+                    <div class="file-status">
+                      <el-button
+                        type="text"
+                        :underline="false"
+                        @click="handleDownload(msg)"
+                      >
+                        打开
+                      </el-button>
+                      <el-button
+                        type="text"
+                        :underline="false"
+                        @click="handleOpenLocation(msg)"
+                      >
+                        打开目录
+                      </el-button>
+                    </div>
                   </div>
-                  <i
-                    v-if="msg.isUploading"
-                    class="el-icon-loading card-status"
-                  />
-                  <i v-else class="el-icon-download card-status" />
                 </div>
               </div>
 
-              <!-- 报告分享 -->
+              <!-- 病例库分享 -->
               <div
                 v-else-if="msg.type === MessageType.REPORT_SHARE"
-                class="share-message"
+                class="text-message"
               >
-                <div class="share-card" @click="handleOpenReport(msg)">
-                  <i class="el-icon-document" />
-                  <div class="share-info">
-                    <div class="share-title">
-                      {{ msg.payload.title || "报告分享" }}
-                    </div>
-                    <div class="share-desc">
-                      {{ msg.payload.description || "点击查看详情" }}
-                    </div>
-                  </div>
-                </div>
+                病例分享: 姓名:{{ JSON.parse(msg.content).name }}, 年龄:{{
+                  JSON.parse(msg.content).age
+                }}, 性别:{{ JSON.parse(msg.content).sex }},
+                <el-link
+                  type="primary"
+                  :underline="false"
+                  @click="handleOpenReport(msg)"
+                >
+                  病例ID:{{ JSON.parse(msg.content).report_id }}
+                </el-link>
               </div>
 
               <!-- 知识分享 -->
               <div
                 v-else-if="msg.type === MessageType.KNOWLEDGE_SHARE"
-                class="share-message"
+                class="text-message"
               >
-                <div class="share-card" @click="handleOpenKnowledge(msg)">
-                  <i class="el-icon-collection" />
-                  <div class="share-info">
-                    <div class="share-title">
-                      {{ msg.payload.title || "知识分享" }}
-                    </div>
-                    <div class="share-desc">
-                      {{ msg.payload.description || "点击查看详情" }}
-                    </div>
-                  </div>
-                </div>
+                知识库分享:
+                <el-link
+                  type="primary"
+                  :underline="false"
+                  @click="handleOpenKnowledge(msg)"
+                >
+                  资源名称:{{ JSON.parse(msg.content).file_name }}
+                </el-link>
               </div>
-
-              <!-- 会诊邀请 -->
               <div
                 v-else-if="msg.type === MessageType.CONSULTATION_MESSAGE_INVITE"
-                class="invite-message"
+                class="text-message"
               >
-                <div class="invite-card">
-                  <div class="invite-title">会诊邀请</div>
-                  <div class="invite-content">
-                    {{ msg.payload.title || "您收到一个会诊邀请" }}
-                  </div>
-                  <el-button
-                    type="primary"
-                    size="small"
-                    @click="handleJoinConsultation(msg)"
-                    >加入会诊</el-button
-                  >
-                </div>
+                视讯邀请:{{ JSON.parse(msg.content).name }}邀请您参加会诊
+                <el-link
+                  type="primary"
+                  :underline="false"
+                  @click="handleOpenConsultationInvite(msg)"
+                >
+                  会诊口令:{{ JSON.parse(msg.content).room_id }}
+                </el-link>
               </div>
-
               <!-- 系统通知 -->
               <div
                 v-else-if="msg.type === MessageType.NOTIFY_CONTENT"
-                class="card-message"
+                class="file-message"
               >
-                <div class="card-content" @click="handleOpenNotify(msg)">
-                  <i class="el-icon-bell card-icon notify" />
-                  <div class="card-info">
-                    <div class="card-title">
-                      {{ msg.payload.title || "系统通知" }}
+                <div class="file-card">
+                  <div class="file-info">
+                    <div class="file-name">
+                      标题:{{ JSON.parse(msg.content).title }}
+                    </div>
+                    <div class="file-size">
+                      内容:{{ JSON.parse(msg.content).content }}
                     </div>
-                    <div class="card-desc">
-                      {{ msg.payload.description || "" }}
+                    <div class="file-status">
+                      <el-link
+                        type="primary"
+                        :underline="false"
+                        @click="handleOpenNotify(msg)"
+                      >
+                        进入阅读
+                      </el-link>
                     </div>
                   </div>
                 </div>
               </div>
-
-              <!-- 未知类型 -->
-              <div v-else class="text-message">
-                {{ msg.payload || msg.content || "[不支持的消息类型]" }}
-              </div>
             </div>
-
             <!-- 消息状态 -->
             <div v-if="msg.is_self" class="message-status">
               <span v-if="msg.sending" class="status-sending">发送中...</span>
@@ -222,8 +259,9 @@
               <span
                 v-else-if="msg.read_status === 1 || msg.read"
                 class="status-read"
-                >已读</span
               >
+                已读
+              </span>
               <span v-else class="status-unread">{{
                 currentChat.scene === 4
                   ? msg.unread_count
@@ -258,26 +296,24 @@
       "
     />
     <!-- 查找聊天记录 -->
-    <SearchRecord
-      :visible.sync="searchRecordVisible"
-      :chat="currentChat"
-      :messages="currentMessages"
-      @locate="handleLocateMessage"
-    />
+    <SearchRecord ref="searchRecordRef" @locate="handleLocateMessage" />
   </div>
 </template>
 
 <script>
 import { mapGetters, mapActions } from "vuex";
 import {
-  pullPrivateMessages,
+  postMessagesPull,
   pullMultiChatMessages,
   markMessagesRead,
+  postNotifyPull,
+  postNotifyPush,
+  postNotifyRead,
 } from "@/api/message";
 import { getPresignedUrl } from "@/utils/requestMinio";
 import { MessageType, ContactsScene, MinioPaths } from "@/utils/constants";
 import SearchRecord from "./SearchRecord.vue";
-
+import { meetingModes } from "@/api/videoCommunication";
 export default {
   name: "MessageDisplay",
   components: {
@@ -289,24 +325,20 @@ export default {
       MessageType,
       loadingHistory: false,
       hasMoreHistory: true,
+      loadingNewer: false,
+      hasMoreNewer: true,
       baseMessageId: 0,
-      pageSize: 20,
+      pageSize: 4,
       previewVisible: false,
       previewImageUrl: "",
       isNearBottom: true,
       lastScrollTop: 0,
-      searchRecordVisible: false,
+      meetingModes: meetingModes(),
     };
   },
 
   computed: {
-    ...mapGetters(["currentChat", "messages"]),
-
-    chatName() {
-      if (!this.currentChat) return "";
-      return this.currentChat.name || "";
-    },
-
+    ...mapGetters(["currentChat", "messages", "userInfo"]),
     messageKey() {
       if (!this.currentChat) return null;
       return `${this.currentChat.scene}-${this.currentChat.id}`;
@@ -314,7 +346,9 @@ export default {
 
     currentMessages() {
       if (!this.messageKey) return [];
-      return this.messages[this.messageKey] || [];
+      const messages = this.messages[this.messageKey] || [];
+      // 反转消息列表，使最新消息显示在顶部（倒序）
+      return [...messages];
     },
   },
 
@@ -322,7 +356,6 @@ export default {
     currentChat: {
       immediate: true,
       handler(newChat, oldChat) {
-        console.log(newChat, oldChat);
         if (
           newChat &&
           (!oldChat ||
@@ -340,568 +373,108 @@ export default {
 
     async switchToChat(chat) {
       this.hasMoreHistory = true;
+      this.hasMoreNewer = true;
       this.baseMessageId = 0;
       this.isNearBottom = true;
       const key = `${chat.scene}-${chat.id}`;
       this.setMessages({ key, messages: [] });
-      await this.loadHistoryMessages();
+      // 默认 base_message_id 为 0，加载最新消息
+      await this.loadMessages({ up: 1, baseMessageId: 0 });
       this.$nextTick(() => {
         this.scrollToBottom();
       });
       this.markAsRead();
     },
 
-    async loadHistoryMessages() {
-      if (!this.currentChat || this.loadingHistory || !this.hasMoreHistory)
-        return;
-      this.loadingHistory = true;
+    // 通用消息加载方法
+    // up: 0 表示加载更新消息（向下滚动），1 表示加载历史消息（向上滚动）
+    async loadMessages({ up, baseMessageId }) {
+      if (!this.currentChat) return;
+
+      // 检查是否正在加载或没有更多数据
+      if (up === 0) {
+        if (this.loadingNewer || !this.hasMoreNewer) return;
+        this.loadingNewer = true;
+      } else {
+        if (this.loadingHistory || !this.hasMoreHistory) return;
+        this.loadingHistory = true;
+      }
+
       try {
-        let res;
+        const key = this.messageKey;
+        const existing = this.messages[key] || [];
+
+        // 确定基准消息ID
+        let currentBaseMessageId = baseMessageId || 0;
+        if (existing.length > 0) {
+          if (up === 0) {
+            // 加载更新消息：使用最新消息（尾部）的ID
+            const latestMessage = existing[existing.length - 1];
+            currentBaseMessageId =
+              latestMessage.message_id || latestMessage.id || 0;
+          } else {
+            // 加载历史消息：使用最早消息（头部）的ID
+            const earliestMessage = existing[0];
+            currentBaseMessageId =
+              earliestMessage.message_id || earliestMessage.id || 0;
+          }
+        }
+
         const params = {
-          base_message_id: this.baseMessageId,
+          base_message_id: currentBaseMessageId,
           page: 1,
           size: this.pageSize,
-          up: 1,
+          up: up,
+          target_id: this.currentChat.id,
         };
+
+        let res;
         if (this.currentChat.scene === ContactsScene.PRIVATE) {
-          params.target_id = this.currentChat.id;
-          res = await pullPrivateMessages(params);
+          res = await postMessagesPull(params);
         } else if (this.currentChat.scene === ContactsScene.GROUP) {
-          params.target_id = this.currentChat.id;
           res = await pullMultiChatMessages(params);
+        } else if (this.currentChat.scene === ContactsScene.NOTIFY) {
+          res = await postNotifyPull(params);
         } else {
           return;
         }
-        const list = res.data.list || res.data || [];
+
+        const list = res.data.list.reverse() || res.data.reverse() || [];
+
+        // 判断是否还有更多数据
         if (list.length < this.pageSize) {
-          this.hasMoreHistory = false;
-        }
-        if (list.length > 0) {
-          this.baseMessageId = list[0].message_id || list[0].id;
+          if (up === 0) {
+            this.hasMoreNewer = false;
+          } else {
+            this.hasMoreHistory = false;
+          }
         }
-        const key = this.messageKey;
-        const existing = this.messages[key] || [];
+
         const processed = list.map((m) => this.processMessage(m));
-        const merged = [...processed, ...existing];
+        let merged;
+
+        if (up === 0) {
+          // 加载更新消息：追加到尾部
+          merged = [...existing, ...processed];
+        } else {
+          // 加载历史消息：插入到头部
+          merged = [...processed, ...existing];
+        }
+
         this.setMessages({ key, messages: merged });
       } catch (e) {
-        console.error("加载历史消息失败", e);
+        console.error(up === 0 ? "加载更新消息失败" : "加载历史消息失败", e);
       } finally {
-        const key = this.messageKey;
-        const currentMsgs = this.currentMessages;
-        if (!currentMsgs || currentMsgs.length === 0) {
-          const mockList = this.getMockMessages(key);
-          if (mockList.length > 0) {
-            this.baseMessageId = mockList[0].message_id || mockList[0].id;
-            const processed = mockList.map((m) => this.processMessage(m));
-            this.setMessages({ key, messages: processed });
-          }
+        if (up === 0) {
+          this.loadingNewer = false;
+        } else {
+          this.loadingHistory = false;
         }
-        this.loadingHistory = false;
-        this.$nextTick(() => {
-          this.scrollToBottom();
-        });
       }
     },
 
-    getMockMessages(messageKey) {
-      const now = Date.now();
-      const mockMessages = {
-        "1-user1": [
-          {
-            message_id: "1",
-            source_id: "user1",
-            sender_name: "王医生",
-            type: MessageType.TEXT,
-            payload: "您好，请问有什么需要帮助的吗？",
-            timestamp: new Date(now - 7200000).toISOString(),
-          },
-          {
-            message_id: "2",
-            source_id: "self",
-            sender_name: "我",
-            type: MessageType.TEXT,
-            payload: "医生你好，我想咨询一下最近的身体状况",
-            timestamp: new Date(now - 7100000).toISOString(),
-            is_self: true,
-          },
-          {
-            message_id: "3",
-            source_id: "user1",
-            sender_name: "王医生",
-            type: MessageType.TEXT,
-            payload: "好的，请详细描述一下您的症状",
-            timestamp: new Date(now - 7000000).toISOString(),
-          },
-          {
-            message_id: "4",
-            source_id: "self",
-            sender_name: "我",
-            type: MessageType.TEXT,
-            payload: "最近总是感觉疲劳，睡眠质量也不太好",
-            timestamp: new Date(now - 6900000).toISOString(),
-            is_self: true,
-          },
-          {
-            message_id: "5",
-            source_id: "user1",
-            sender_name: "王医生",
-            type: MessageType.TEXT,
-            payload: "这样啊，您这种情况持续多久了？",
-            timestamp: new Date(now - 6800000).toISOString(),
-          },
-          {
-            message_id: "6",
-            source_id: "self",
-            sender_name: "我",
-            type: MessageType.TEXT,
-            payload: "大概有两周了，而且最近食欲也下降了",
-            timestamp: new Date(now - 6700000).toISOString(),
-            is_self: true,
-          },
-          {
-            message_id: "7",
-            source_id: "user1",
-            sender_name: "王医生",
-            type: MessageType.IMAGE,
-            payload:
-              "https://via.placeholder.com/400x300/4CAF50/FFFFFF?text=健康饮食建议",
-            timestamp: new Date(now - 6600000).toISOString(),
-          },
-          {
-            message_id: "8",
-            source_id: "user1",
-            sender_name: "王医生",
-            type: MessageType.TEXT,
-            payload: "建议您注意饮食调理，这是一些健康饮食的建议图片",
-            timestamp: new Date(now - 6500000).toISOString(),
-          },
-          {
-            message_id: "9",
-            source_id: "user1",
-            sender_name: "王医生",
-            type: MessageType.REPORT_SHARE,
-            payload: {
-              title: "健康评估报告",
-              description: "根据您的症状分析，建议进行以下健康检查",
-              report_id: "report001",
-            },
-            timestamp: new Date(now - 6400000).toISOString(),
-          },
-          {
-            message_id: "10",
-            source_id: "self",
-            sender_name: "我",
-            type: MessageType.TEXT,
-            payload: "好的，我会去做检查的，谢谢医生！",
-            timestamp: new Date(now - 6300000).toISOString(),
-            is_self: true,
-          },
-          {
-            message_id: "11",
-            source_id: "user1",
-            sender_name: "王医生",
-            type: MessageType.TEXT,
-            payload:
-              "另外，您可以参考这个健康指南网站：https://www.healthline.com",
-            timestamp: new Date(now - 6200000).toISOString(),
-          },
-        ],
-        "1-user2": [
-          {
-            message_id: "g1",
-            source_id: "user2",
-            sender_name: "李护士",
-            type: MessageType.TEXT,
-            payload: "在吗？有个事情想跟你说",
-            timestamp: new Date(now - 14400000).toISOString(),
-          },
-          {
-            message_id: "g2",
-            source_id: "self",
-            sender_name: "我",
-            type: MessageType.TEXT,
-            payload: "在的，什么事？",
-            timestamp: new Date(now - 14300000).toISOString(),
-            is_self: true,
-          },
-          {
-            message_id: "g3",
-            source_id: "user2",
-            sender_name: "李护士",
-            type: MessageType.FILE,
-            payload: {
-              file_name: "患者护理记录表.xlsx",
-              file_size: 102400,
-              path: "/uploads/nursing_record.xlsx",
-            },
-            timestamp: new Date(now - 14200000).toISOString(),
-          },
-          {
-            message_id: "g4",
-            source_id: "user2",
-            sender_name: "李护士",
-            type: MessageType.TEXT,
-            payload: "这是今天的护理记录，请查收",
-            timestamp: new Date(now - 14100000).toISOString(),
-          },
-          {
-            message_id: "g5",
-            source_id: "self",
-            sender_name: "我",
-            type: MessageType.TEXT,
-            payload: "好的，我马上查看",
-            timestamp: new Date(now - 14000000).toISOString(),
-            is_self: true,
-          },
-          {
-            message_id: "g6",
-            source_id: "user2",
-            sender_name: "李护士",
-            type: MessageType.AUDIO,
-            payload: "/uploads/voice_note.mp3",
-            timestamp: new Date(now - 13900000).toISOString(),
-          },
-          {
-            message_id: "g7",
-            source_id: "self",
-            sender_name: "我",
-            type: MessageType.TEXT,
-            payload: "收到，我听一下",
-            timestamp: new Date(now - 13800000).toISOString(),
-            is_self: true,
-          },
-          {
-            message_id: "g8",
-            source_id: "user2",
-            sender_name: "李护士",
-            type: MessageType.KNOWLEDGE_SHARE,
-            payload: {
-              title: "护理操作规范",
-              description: "最新的护理操作规范和注意事项",
-              knowledge_id: "knowledge001",
-            },
-            timestamp: new Date(now - 13700000).toISOString(),
-          },
-        ],
-        "1-user3": [
-          {
-            message_id: "y1",
-            source_id: "user3",
-            sender_name: "张主任",
-            type: MessageType.TEXT,
-            payload: "明天上午10点有个会诊，你参加一下",
-            timestamp: new Date(now - 21600000).toISOString(),
-          },
-          {
-            message_id: "y2",
-            source_id: "self",
-            sender_name: "我",
-            type: MessageType.TEXT,
-            payload: "好的，收到",
-            timestamp: new Date(now - 21500000).toISOString(),
-            is_self: true,
-          },
-          {
-            message_id: "y3",
-            source_id: "user3",
-            sender_name: "张主任",
-            type: MessageType.VIDEO,
-            payload:
-              "https://sample-videos.com/video123/mp4/720/big_buck_bunny_720p_1mb.mp4",
-            timestamp: new Date(now - 21400000).toISOString(),
-          },
-          {
-            message_id: "y4",
-            source_id: "user3",
-            sender_name: "张主任",
-            type: MessageType.TEXT,
-            payload: "这是上次会诊的视频回放，你可以先看一下",
-            timestamp: new Date(now - 21300000).toISOString(),
-          },
-          {
-            message_id: "y5",
-            source_id: "user3",
-            sender_name: "张主任",
-            type: MessageType.CONSULTATION_MESSAGE_INVITE,
-            payload: {
-              title: "疑难病例会诊",
-              description: "关于患者XXX的疑难病例会诊邀请，请准时参加",
-              consultation_id: "consult001",
-            },
-            timestamp: new Date(now - 21200000).toISOString(),
-          },
-          {
-            message_id: "y6",
-            source_id: "self",
-            sender_name: "我",
-            type: MessageType.TEXT,
-            payload: "收到邀请，我会准时参加",
-            timestamp: new Date(now - 21100000).toISOString(),
-            is_self: true,
-          },
-        ],
-        "4-group1": [
-          {
-            message_id: "gr1",
-            source_id: "user1",
-            sender_name: "王医生",
-            type: MessageType.TEXT,
-            payload: "@所有人 今天下午3点准时开会",
-            timestamp: new Date(now - 3600000).toISOString(),
-          },
-          {
-            message_id: "gr2",
-            source_id: "user2",
-            sender_name: "李护士",
-            type: MessageType.TEXT,
-            payload: "收到，准时参加",
-            timestamp: new Date(now - 3500000).toISOString(),
-          },
-          {
-            message_id: "gr3",
-            source_id: "user3",
-            sender_name: "张主任",
-            type: MessageType.TEXT,
-            payload: "今天讨论一下下周的工作计划",
-            timestamp: new Date(now - 3400000).toISOString(),
-          },
-          {
-            message_id: "gr4",
-            source_id: "self",
-            sender_name: "我",
-            type: MessageType.TEXT,
-            payload: "好的，我会准备好汇报材料",
-            timestamp: new Date(now - 3300000).toISOString(),
-            is_self: true,
-          },
-          {
-            message_id: "gr5",
-            source_id: "user1",
-            sender_name: "王医生",
-            type: MessageType.IMAGE,
-            payload:
-              "https://via.placeholder.com/500x400/2196F3/FFFFFF?text=工作安排表",
-            timestamp: new Date(now - 3200000).toISOString(),
-          },
-          {
-            message_id: "gr6",
-            source_id: "user2",
-            sender_name: "李护士",
-            type: MessageType.TEXT,
-            payload: "表格做得很详细，辛苦了！",
-            timestamp: new Date(now - 3100000).toISOString(),
-          },
-          {
-            message_id: "gr7",
-            source_id: "user3",
-            sender_name: "张主任",
-            type: MessageType.FILE,
-            payload: {
-              file_name: "会议议程.pdf",
-              file_size: 51200,
-              path: "/uploads/meeting_agenda.pdf",
-            },
-            timestamp: new Date(now - 3000000).toISOString(),
-          },
-          {
-            message_id: "gr8",
-            source_id: "system",
-            sender_name: "系统",
-            type: MessageType.NOTIFY_CONTENT,
-            payload: {
-              title: "系统通知",
-              description: "本次会议已被张主任设置为重要会议，请准时参加",
-            },
-            timestamp: new Date(now - 2900000).toISOString(),
-          },
-        ],
-        "4-group2": [
-          {
-            message_id: "g2r1",
-            source_id: "user1",
-            sender_name: "王医生",
-            type: MessageType.TEXT,
-            payload:
-              "大家好，分享一个医学研究网站：https://pubmed.ncbi.nlm.nih.gov",
-            timestamp: new Date(now - 43200000).toISOString(),
-          },
-          {
-            message_id: "g2r2",
-            source_id: "user2",
-            sender_name: "李护士",
-            type: MessageType.TEXT,
-            payload: "这个网站很有用，收藏了！",
-            timestamp: new Date(now - 43100000).toISOString(),
-          },
-          {
-            message_id: "g2r3",
-            source_id: "self",
-            sender_name: "我",
-            type: MessageType.TEXT,
-            payload: "谢谢分享！",
-            timestamp: new Date(now - 43000000).toISOString(),
-            is_self: true,
-          },
-          {
-            message_id: "g2r4",
-            source_id: "user3",
-            sender_name: "张主任",
-            type: MessageType.TEXT,
-            payload: "大家可以多关注最新的医学研究进展",
-            timestamp: new Date(now - 42900000).toISOString(),
-          },
-          {
-            message_id: "g2r5",
-            source_id: "user1",
-            sender_name: "王医生",
-            type: MessageType.AUDIO,
-            payload: "/uploads/medical_tips.mp3",
-            timestamp: new Date(now - 42800000).toISOString(),
-          },
-          {
-            message_id: "g2r6",
-            source_id: "user2",
-            sender_name: "李护士",
-            type: MessageType.REPORT_SHARE,
-            payload: {
-              title: "最新医学研究报告",
-              description: "2024年度医学研究成果汇总",
-              report_id: "report002",
-            },
-            timestamp: new Date(now - 42700000).toISOString(),
-          },
-          {
-            message_id: "g2r7",
-            source_id: "system",
-            sender_name: "系统",
-            type: MessageType.NOTIFY_CONTENT,
-            payload: {
-              title: "新成员加入",
-              description: "欢迎赵医生加入本群",
-            },
-            timestamp: new Date(now - 42600000).toISOString(),
-          },
-        ],
-        "1-user4": [
-          {
-            message_id: "z1",
-            source_id: "user4",
-            sender_name: "赵医生",
-            type: MessageType.TEXT,
-            payload: "你好，我是新来的赵医生，以后请多关照！",
-            timestamp: new Date(now - 86400000).toISOString(),
-          },
-          {
-            message_id: "z2",
-            source_id: "self",
-            sender_name: "我",
-            type: MessageType.TEXT,
-            payload: "欢迎欢迎！有什么需要帮助的随时找我",
-            timestamp: new Date(now - 86300000).toISOString(),
-            is_self: true,
-          },
-          {
-            message_id: "z3",
-            source_id: "user4",
-            sender_name: "赵医生",
-            type: MessageType.IMAGE,
-            payload:
-              "https://via.placeholder.com/300x300/FF9800/FFFFFF?text=自我介绍",
-            timestamp: new Date(now - 86200000).toISOString(),
-          },
-          {
-            message_id: "z4",
-            source_id: "user4",
-            sender_name: "赵医生",
-            type: MessageType.TEXT,
-            payload: "这是我的个人介绍，希望能和大家合作愉快！",
-            timestamp: new Date(now - 86100000).toISOString(),
-          },
-          {
-            message_id: "z5",
-            source_id: "self",
-            sender_name: "我",
-            type: MessageType.TEXT,
-            payload: "很高兴认识你！以后一起交流学习",
-            timestamp: new Date(now - 86000000).toISOString(),
-            is_self: true,
-          },
-          {
-            message_id: "z6",
-            source_id: "user4",
-            sender_name: "赵医生",
-            type: MessageType.TEXT,
-            payload: "对了，我刚看到一个用药指南分享给你",
-            timestamp: new Date(now - 85900000).toISOString(),
-          },
-          {
-            message_id: "z7",
-            source_id: "user4",
-            sender_name: "赵医生",
-            type: MessageType.KNOWLEDGE_SHARE,
-            payload: {
-              title: "临床用药指南",
-              description: "2024年最新临床用药指南，请参考",
-              knowledge_id: "knowledge003",
-            },
-            timestamp: new Date(now - 85800000).toISOString(),
-          },
-          {
-            message_id: "z8",
-            source_id: "self",
-            sender_name: "我",
-            type: MessageType.TEXT,
-            payload: "好的，我会注意的，谢谢提醒",
-            timestamp: new Date(now - 85000000).toISOString(),
-            is_self: true,
-          },
-        ],
-        "1-user5": [
-          {
-            message_id: "m1",
-            source_id: "user5",
-            sender_name: "马药师",
-            type: MessageType.TEXT,
-            payload: "关于患者的用药方案，我有一些建议",
-            timestamp: new Date(now - 172800000).toISOString(),
-          },
-          {
-            message_id: "m2",
-            source_id: "self",
-            sender_name: "我",
-            type: MessageType.TEXT,
-            payload: "好的，请说",
-            timestamp: new Date(now - 172700000).toISOString(),
-            is_self: true,
-          },
-          {
-            message_id: "m3",
-            source_id: "user5",
-            sender_name: "马药师",
-            type: MessageType.FILE,
-            payload: {
-              file_name: "用药指导说明书.pdf",
-              file_size: 153600,
-              path: "/uploads/medication_guide.pdf",
-            },
-            timestamp: new Date(now - 172600000).toISOString(),
-          },
-          {
-            message_id: "m4",
-            source_id: "user5",
-            sender_name: "马药师",
-            type: MessageType.TEXT,
-            payload: "这是用药指导说明书，请查收",
-            timestamp: new Date(now - 172500000).toISOString(),
-          },
-        ],
-      };
-      return mockMessages[messageKey] || [];
-    },
-
     processMessage(msg) {
-      const userId = this.$store.state.user.id;
+      const userId = this.userInfo.id;
       const isSelf = msg.source_id === userId || msg.is_self;
       return {
         ...msg,
@@ -912,14 +485,24 @@ export default {
 
     handleScroll(e) {
       const el = e.target;
-      this.isNearBottom =
-        el.scrollTop + el.clientHeight >= el.scrollHeight - 50;
-      if (el.scrollTop <= 30 && this.hasMoreHistory && !this.loadingHistory) {
-        const oldHeight = el.scrollHeight;
-        this.loadHistoryMessages().then(() => {
+      const scrollTop = el.scrollTop;
+      const clientHeight = el.clientHeight;
+      const scrollHeight = el.scrollHeight;
+      const isNearBottom = scrollTop + clientHeight >= scrollHeight - 50;
+      const isNearTop = scrollTop <= 30;
+
+      // 向下滚动到底部 → 加载更新消息（最新的数据）
+      if (isNearBottom && this.hasMoreNewer && !this.loadingNewer) {
+        this.loadMessages({ up: 1 });
+      }
+
+      // 向上滚动到顶部 → 加载历史消息（更早的消息）
+      if (isNearTop && this.hasMoreHistory && !this.loadingHistory) {
+        const oldHeight = scrollHeight;
+        this.loadMessages({ up: 1 }).then(() => {
           this.$nextTick(() => {
             const newHeight = el.scrollHeight;
-            el.scrollTop = newHeight - oldHeight + el.scrollTop;
+            el.scrollTop = newHeight - oldHeight;
           });
         });
       }
@@ -928,6 +511,9 @@ export default {
     scrollToBottom() {
       const container = this.$refs.messageContainer;
       if (container) {
+        // 消息列表是正序显示的（最早消息在头部，最新消息在尾部）
+        // scrollTop = 0 表示滚动到顶部（最早消息）
+        // scrollTop = scrollHeight 表示滚动到底部（最新消息）
         container.scrollTop = container.scrollHeight;
       }
     },
@@ -940,43 +526,43 @@ export default {
       }
     },
 
-    shouldShowTime(index) {
-      if (index === 0) return true;
-      const curr = this.currentMessages[index];
-      const prev = this.currentMessages[index - 1];
-      const currTime = new Date(curr.timestamp || curr.create_time).getTime();
-      const prevTime = new Date(prev.timestamp || prev.create_time).getTime();
-      return currTime - prevTime > 5 * 60 * 1000;
-    },
-
     formatMessageTime(timeStr) {
       if (!timeStr) return "";
       const date = new Date(timeStr);
       const now = new Date();
-      const isToday = date.toDateString() === now.toDateString();
-      if (isToday) {
-        return date.toLocaleTimeString("zh-CN", {
-          hour: "2-digit",
-          minute: "2-digit",
-        });
+
+      // 重置到当天0点计算天数差
+      const dateDay = new Date(
+        date.getFullYear(),
+        date.getMonth(),
+        date.getDate()
+      );
+      const nowDay = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+      const diffDays = Math.floor((nowDay - dateDay) / (24 * 60 * 60 * 1000));
+
+      // 今天：显示 HH:mm
+      if (diffDays === 0) {
+        const hour = date.getHours().toString().padStart(2, "0");
+        const minute = date.getMinutes().toString().padStart(2, "0");
+        return `${hour}:${minute}`;
       }
-      const yesterday = new Date(now);
-      yesterday.setDate(yesterday.getDate() - 1);
-      if (date.toDateString() === yesterday.toDateString()) {
-        return (
-          "昨天 " +
-          date.toLocaleTimeString("zh-CN", {
-            hour: "2-digit",
-            minute: "2-digit",
-          })
-        );
+
+      // 今年的消息：显示 MM-dd HH:mm
+      if (date.getFullYear() === now.getFullYear()) {
+        const month = (date.getMonth() + 1).toString().padStart(2, "0");
+        const day = date.getDate().toString().padStart(2, "0");
+        const hour = date.getHours().toString().padStart(2, "0");
+        const minute = date.getMinutes().toString().padStart(2, "0");
+        return `${month}-${day} ${hour}:${minute}`;
       }
-      return date.toLocaleString("zh-CN", {
-        month: "2-digit",
-        day: "2-digit",
-        hour: "2-digit",
-        minute: "2-digit",
-      });
+
+      // 非今年的消息：显示 yyyy-MM-dd HH:mm
+      const year = date.getFullYear();
+      const month = (date.getMonth() + 1).toString().padStart(2, "0");
+      const day = date.getDate().toString().padStart(2, "0");
+      const hour = date.getHours().toString().padStart(2, "0");
+      const minute = date.getMinutes().toString().padStart(2, "0");
+      return `${year}-${month}-${day} ${hour}:${minute}`;
     },
 
     formatTextContent(content) {
@@ -1016,63 +602,80 @@ export default {
       return payload.split("/").pop() || "未知文件";
     },
 
-    getFileSize(msg) {
-      const payload = msg.payload || msg.content;
-      const size = typeof payload === "object" ? payload.file_size : 0;
-      if (!size) return "";
-      if (size < 1024) return size + " B";
-      if (size < 1024 * 1024) return (size / 1024).toFixed(1) + " KB";
-      return (size / 1024 / 1024).toFixed(1) + " MB";
+    getFileIconClass(fileName) {
+      if (!fileName) return "el-icon-document";
+      const suffix = fileName.split(".").pop().toLowerCase();
+      const iconMap = {
+        txt: "el-icon-tickets",
+        pdf: "el-icon-document-copy",
+        mp3: "el-icon-headset",
+        wav: "el-icon-headset",
+        avi: "el-icon-video-camera",
+        mp4: "el-icon-video-camera",
+        wmv: "el-icon-video-camera",
+        mov: "el-icon-video-camera",
+        zip: "el-icon-folder-opened",
+        rar: "el-icon-folder-opened",
+        ppt: "el-icon-data-board",
+        pps: "el-icon-data-board",
+        xls: "el-icon-s-grid",
+        xlsx: "el-icon-s-grid",
+        doc: "el-icon-document",
+        docx: "el-icon-document",
+        jpg: "el-icon-picture",
+        jpeg: "el-icon-picture",
+        jpe: "el-icon-picture",
+        bmp: "el-icon-picture",
+        gif: "el-icon-picture",
+        png: "el-icon-picture",
+        tif: "el-icon-picture",
+        tiff: "el-icon-picture",
+      };
+      return iconMap[suffix] || "el-icon-document";
     },
-
-    getFileIcon(msg) {
-      const name = this.getFileName(msg).toLowerCase();
-      if (name.endsWith(".pdf")) return "el-icon-document file-icon pdf";
-      if (name.endsWith(".doc") || name.endsWith(".docx"))
-        return "el-icon-document file-icon word";
-      if (name.endsWith(".xls") || name.endsWith(".xlsx"))
-        return "el-icon-document file-icon excel";
-      if (name.endsWith(".ppt") || name.endsWith(".pptx"))
-        return "el-icon-document file-icon ppt";
-      if (name.endsWith(".zip") || name.endsWith(".rar"))
-        return "el-icon-box file-icon zip";
-      return "el-icon-document file-icon";
+    formatFileSize(size) {
+      if (!size || size < 0) return "0.00B";
+      if (size >= 1024 * 1024) {
+        return (size / (1024.0 * 1024.0)).toFixed(2) + "M";
+      } else if (size >= 1024) {
+        return (size / 1024.0).toFixed(2) + "K";
+      }
+      return size.toFixed(2) + "B";
     },
-
-    async handleDownloadFile(msg) {
-      if (msg.isUploading) return;
-      try {
-        const payload = msg.payload || msg.content;
-        const objectName =
-          typeof payload === "object"
-            ? payload.object_name || payload.path
-            : payload;
-        if (!objectName) {
-          this.$message.warning("文件路径不存在");
-          return;
-        }
-        const url = await getPresignedUrl("utalk", objectName, 24 * 60 * 60);
-        const a = document.createElement("a");
-        a.href = url;
-        a.download = this.getFileName(msg);
-        a.click();
-      } catch (e) {
-        this.$message.error("下载失败: " + e.message);
+    // 下载文件
+    handleDownload(item) {
+      if (item.file_path) {
+        window.open(this.$store.state.user.netConfig.MINIO_ENDPOINT_HTTPS + item.file_path, "_blank");
+      } else {
+        this.$message.warning("文件链接不可用");
       }
     },
-
-    handlePreviewImage(msg) {
-      const url = this.getFileUrl(msg.payload || msg.content);
-      if (url) {
-        this.previewImageUrl = url;
-        this.previewVisible = true;
+    // 打开文件位置
+    handleOpenLocation(item) {
+      if (item.file_path) {
+        this.$modal.msg("浏览器安全限制：请下载文件后在下载列表中打开文件夹");
+        // 先触发下载
+        const a = document.createElement("a");
+        a.href = this.$store.state.user.netConfig.MINIO_ENDPOINT_HTTPS + item.file_path;
+        a.download = item.file_name;
+        a.target = "_blank";
+        document.body.appendChild(a);
+        a.click();
+        document.body.removeChild(a);
+      } else {
+        this.$message.warning("文件路径不可用");
       }
     },
-
+    // 病例库分享
     handleOpenReport(msg) {
-      const reportId = msg.payload.report_id;
+      const reportId = JSON.parse(msg.content).report_id;
       if (reportId) {
-        this.$router.push(`/report-center?id=${reportId}`);
+        this.$tab.openPage(
+          JSON.parse(msg.content).name +
+            "-" +
+            JSON.parse(msg.content).report_id,
+          "/cases/detail/" + JSON.parse(msg.content).report_id
+        );
       }
     },
 
@@ -1082,14 +685,18 @@ export default {
         this.$router.push(`/knowledge-base?id=${knowledgeId}`);
       }
     },
-
-    handleJoinConsultation(msg) {
-      const consultationId = msg.payload.consultation_id;
-      if (consultationId) {
-        this.$router.push(`/meeting?id=${consultationId}`);
-      }
+    handleOpenConsultationInvite(msg) {
+      this.$router.push({
+        name: this.meetingModes.find(
+          (item) => item.type === JSON.parse(msg.content).vision_type
+        ).routeName,
+        query: {
+          consultation_id: JSON.parse(msg.content).consultation_id,
+          from_history: 0,
+          room_id: JSON.parse(msg.content).room_id,
+        },
+      });
     },
-
     handleOpenNotify(msg) {
       const notifyId = msg.payload.notify_id || msg.payload.id;
       if (notifyId) {
@@ -1102,15 +709,16 @@ export default {
     handleGroupSetting() {
       this.$emit("group-setting", this.currentChat);
     },
-
     handleSearchRecord() {
-      this.searchRecordVisible = true;
+      this.$refs.searchRecordRef.show(this.currentChat);
     },
     handleLocateMessage(result) {
       const messageContainer = this.$refs.messageContainer;
       if (!messageContainer || !result.message_id) return;
 
-      const messageItem = messageContainer.querySelector(`[data-message-id="${result.message_id}"]`);
+      const messageItem = messageContainer.querySelector(
+        `[data-message-id="${result.message_id}"]`
+      );
       if (messageItem) {
         messageItem.scrollIntoView({ behavior: "smooth", block: "center" });
         messageItem.classList.add("highlight-message");
@@ -1132,9 +740,20 @@ export default {
     async markAsRead() {
       if (!this.currentChat) return;
       try {
-        const scene = this.currentChat.scene === ContactsScene.GROUP ? 4 : 1;
-        await markMessagesRead({ scene, target_id: this.currentChat.id });
-        this.$emit("clear-unread", this.currentChat.id, this.currentChat.scene);
+        const scene = this.currentChat.scene;
+        if (scene === ContactsScene.NOTIFY) {
+          await postNotifyRead({
+            target_id: this.currentChat.id,
+          });
+        } else {
+          const sceneNum = scene === ContactsScene.GROUP ? 4 : 1;
+          await markMessagesRead({
+            message_ids: [],
+            scene: sceneNum,
+            target_id: this.currentChat.id,
+          });
+        }
+        this.$emit("clear-unread", this.currentChat.id, scene);
       } catch (e) {
         console.error("标记已读失败", e);
       }
@@ -1286,7 +905,12 @@ export default {
         text-decoration: underline;
       }
     }
-
+    .message-name {
+      font-size: 11px;
+      margin-bottom: 4px;
+      text-align: left;
+      color: #909399;
+    }
     .message-status {
       font-size: 11px;
       margin-top: 4px;
@@ -1318,79 +942,34 @@ export default {
   font-size: 12px;
   color: #c0c4cc;
 }
-
 .text-message {
   white-space: pre-wrap;
 }
 
-.image-message {
-  img {
-    max-width: 240px;
-    max-height: 200px;
-    border-radius: 8px;
-    cursor: pointer;
-    object-fit: cover;
-  }
-}
-
-.video-message {
-  video {
-    max-width: 240px;
-    max-height: 200px;
-    border-radius: 8px;
-  }
-}
-
-.audio-message {
-  audio {
-    max-width: 240px;
-  }
-}
-
-.card-message {
-  .card-content {
+.file-message {
+  .file-card {
     display: flex;
     align-items: center;
-    gap: 10px;
-    padding: 10px;
-    background: rgba(255, 255, 255, 0.6);
-    border-radius: 8px;
-    cursor: pointer;
+    white-space: pre-wrap;
     min-width: 200px;
-
-    &:hover {
-      background: rgba(255, 255, 255, 0.9);
-    }
-
-    .card-icon {
-      font-size: 36px;
-      color: #409eff;
-
-      &.pdf {
-        color: #f56c6c;
-      }
-      &.word {
-        color: #409eff;
-      }
-      &.excel {
-        color: #67c23a;
-      }
-      &.ppt {
-        color: #e6a23c;
-      }
-      &.zip {
-        color: #909399;
-      }
-      &.notify {
-        color: #e6a23c;
-      }
+    cursor: pointer;
+    .file-thumb {
+      width: 60px;
+      height: 60px;
+      border-radius: 6px;
+      background: #655dd4;
+      color: #fff;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 30px;
+      margin-right: 10px;
     }
 
-    .card-info {
+    .file-info {
       flex: 1;
       min-width: 0;
-
-      .card-title {
+      .file-name {
         font-size: 14px;
         color: #303133;
         white-space: nowrap;
@@ -1398,57 +977,15 @@ export default {
         text-overflow: ellipsis;
       }
 
-      .card-desc {
+      .file-size {
         font-size: 12px;
         color: #909399;
         margin-top: 2px;
       }
-    }
-
-    .card-status {
-      font-size: 18px;
-      color: #909399;
-    }
-  }
-}
-
-.share-message {
-  .share-card {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    padding: 10px;
-    background: rgba(255, 255, 255, 0.6);
-    border-radius: 8px;
-    cursor: pointer;
-    min-width: 220px;
-
-    &:hover {
-      background: rgba(255, 255, 255, 0.9);
-    }
-
-    i {
-      font-size: 36px;
-      color: #409eff;
-    }
-
-    .share-info {
-      flex: 1;
-      min-width: 0;
-
-      .share-title {
-        font-size: 14px;
-        color: #303133;
-        font-weight: 500;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-
-      .share-desc {
-        font-size: 12px;
+      .file-status {
+        text-align: right;
+        font-size: 18px;
         color: #909399;
-        margin-top: 2px;
       }
     }
   }
@@ -1495,22 +1032,4 @@ export default {
     font-size: 14px;
   }
 }
-
-.highlight-message {
-  animation: highlight-pulse 1s ease-in-out;
-  background-color: rgba(64, 158, 255, 0.1) !important;
-  border-radius: 8px;
-}
-
-@keyframes highlight-pulse {
-  0% {
-    box-shadow: 0 0 0 0 rgba(64, 158, 255, 0.4);
-  }
-  50% {
-    box-shadow: 0 0 0 8px rgba(64, 158, 255, 0);
-  }
-  100% {
-    box-shadow: 0 0 0 0 rgba(64, 158, 255, 0);
-  }
-}
 </style>
diff --git a/src/views/message/components/MessageList.vue b/src/views/message/components/MessageList.vue
index 7d3a8c6..06c66d9 100644
--- a/src/views/message/components/MessageList.vue
+++ b/src/views/message/components/MessageList.vue
@@ -33,7 +33,12 @@
           class="search-item"
           @click="handleSelectSearchResult(user, 1)"
         >
-          <el-avatar :size="36" :src="user.avatar" />
+          <el-avatar
+            :size="36"
+            :src="
+              $store.state.user.netConfig.MINIO_ENDPOINT_HTTPS + user.avatar
+            "
+          />
           <div class="search-item-info">
             <div class="search-item-name">{{ user.name }}</div>
             <div class="search-item-dept">{{ user.department }}</div>
@@ -48,10 +53,16 @@
           class="search-item"
           @click="handleSelectSearchResult(group, 4)"
         >
-          <el-avatar :size="36" :src="group.avatar" icon="el-icon-s-custom" />
+          <el-avatar
+            :size="36"
+            :src="
+              $store.state.user.netConfig.MINIO_ENDPOINT_HTTPS + group.avatar
+            "
+            icon="el-icon-s-custom"
+          />
           <div class="search-item-info">
             <div class="search-item-name">{{ group.name }}</div>
-            <div class="search-item-dept">{{ group.member_count }}人</div>
+            <div class="search-item-dept">{{ group.user_num }}人</div>
           </div>
         </div>
       </div>
@@ -68,60 +79,76 @@
         <div class="contact-avatar-wrap">
           <el-avatar
             :size="44"
-            :src="contact.avatar"
+            :src="
+              $store.state.user.netConfig.MINIO_ENDPOINT_HTTPS + contact.avatar
+            "
             :icon="
               contact.scene === 4 ? 'el-icon-s-custom' : 'el-icon-user-solid'
             "
           />
           <el-badge
-            v-if="contact.unread_count > 0"
-            :value="contact.unread_count"
+            v-if="contact.un_read_count > 0"
+            :value="contact.un_read_count"
             class="unread-badge"
           />
         </div>
         <div class="contact-info">
           <div class="contact-top">
             <span class="contact-name">{{ contact.name }}</span>
-            <span class="contact-time">{{
-              formatTime(contact.last_message_time)
-            }}</span>
+            <span class="contact-time">
+              {{ formatTime(contact.update_time) }}
+            </span>
           </div>
           <div class="contact-bottom">
-            <span class="contact-last-msg">{{
-              formatLastMessage(contact)
-            }}</span>
-            <i v-if="contact.is_pinned" class="el-icon-top pin-icon" />
+            <span class="contact-last-msg">
+              {{ contact.last_message_read === 0 ? "[对方未读]" : "" }}
+              {{ formatLastMessage(contact) }}
+            </span>
+            <!-- 置顶 1-是 0-否 -->
+            <i v-if="contact.top === 1" class="el-icon-top pin-icon" />
+            <!-- 免打扰 1-是 0-否 -->
+            <i
+              v-if="contact.quiet === 1"
+              class="el-icon-close-notification pin-icon"
+            />
           </div>
         </div>
       </div>
 
-      <div v-if="!sortedContacts.length" class="empty-contacts">
+      <div v-if="!sortedContacts.length && !loading" class="empty-contacts">
         <i class="el-icon-chat-line-square" />
         <p>暂无消息</p>
       </div>
+
+      <!-- 加载更多提示 -->
+      <div v-if="loading" class="loading-tip">
+        <i class="el-icon-loading" />
+        <span>加载中...</span>
+      </div>
+
+      <!-- 没有更多数据提示 -->
+      <div v-if="!hasMore && sortedContacts.length > 0" class="no-more-tip">
+        <span>没有更多数据了</span>
+      </div>
     </div>
 
-    <!-- 引入发起群聊弹窗组件 -->
+    <!-- 创建群聊弹窗 -->
     <CreateGroupDialog
-      :visible.sync="createGroupVisible"
-      :recentContacts="recentContacts"
-      :recentGroups="recentGroups"
-      @create-success="handleCreateGroupSuccess"
+      ref="createGroupDialogRef"
+      title="创建群聊"
+      :min-select-count="1"
+      @confirm="confirmCreateGroup"
     />
   </div>
 </template>
 
 <script>
 import { mapGetters, mapActions } from "vuex";
-import {
-  getLatestContacts,
-  searchUsers,
-  searchGroups,
-} from "@/api/message/index";
-import { MessageType, ContactsScene } from "@/utils/constants";
+import { getLatestContacts, searchUsers, searchGroups } from "@/api/message";
+import { createMultiChat } from "@/api/multichat";
+import { MessageType, ContactsScene, MqttTopics } from "@/utils/constants";
 // 引入子组件
 import CreateGroupDialog from "./CreateGroupDialog.vue";
-
 export default {
   name: "MessageList",
   components: { CreateGroupDialog },
@@ -132,7 +159,11 @@ export default {
       searchUsers: [],
       searchGroups: [],
       searchTimer: null,
-      createGroupVisible: false,
+      // 分页相关
+      currentPage: 1,
+      pageSize: 20,
+      hasMore: true,
+      loading: false,
     };
   },
   computed: {
@@ -145,7 +176,9 @@ export default {
     sortedContacts() {
       const list = [...this.latestContacts];
       return list.sort((a, b) => {
-        if (a.is_pinned !== b.is_pinned) return b.is_pinned - a.is_pinned;
+        if (a.is_pinned !== b.is_pinned) {
+          return b.is_pinned - a.is_pinned;
+        }
         const timeA = a.last_message_time
           ? new Date(a.last_message_time).getTime()
           : 0;
@@ -155,16 +188,6 @@ export default {
         return timeB - timeA;
       });
     },
-    // 最近联系人
-    recentContacts() {
-      return this.latestContacts.filter(
-        (c) => c.scene === ContactsScene.PRIVATE
-      );
-    },
-    // 最近群组
-    recentGroups() {
-      return this.latestContacts.filter((c) => c.scene === ContactsScene.GROUP);
-    },
   },
   mounted() {
     this.loadContacts();
@@ -173,72 +196,116 @@ export default {
     ...mapActions("message", ["setLatestContacts", "setCurrentChat"]),
     ...mapActions("mqtt", ["subscribe"]),
 
-    async loadContacts() {
+    async loadContacts(scene = ContactsScene.ALL, isLoadMore = false) {
+      if (this.loading) return;
+
+      // 首次加载时重置分页状态
+      if (!isLoadMore) {
+        this.currentPage = 1;
+        this.hasMore = true;
+      }
+
+      this.loading = true;
       try {
-        this.setLatestContacts([
-          {
-            id: "user1",
-            name: "王医生",
-            avatar: "",
-            scene: 1,
-            unread_count: 0,
-            last_message: "建议您注意饮食调理",
-            last_message_time: new Date(Date.now() - 6500000).toISOString(),
-            is_online: true,
-          },
-          {
-            id: "user2",
-            name: "李护士",
-            avatar: "",
-            scene: 1,
-            unread_count: 1,
-            last_message: "这是今天的护理记录",
-            last_message_time: new Date(Date.now() - 14100000).toISOString(),
-            is_online: true,
-          },
-          {
-            id: "user3",
-            name: "张主任",
-            avatar: "",
-            scene: 1,
-            unread_count: 0,
-            last_message: "这是上次会诊的视频",
-            last_message_time: new Date(Date.now() - 21300000).toISOString(),
-            is_online: false,
-          },
-          {
-            id: "group1",
-            name: "医疗会诊群",
-            avatar: "",
-            scene: 4,
-            unread_count: 3,
-            last_message: "本次会议已被设置为重要",
-            last_message_time: new Date().toISOString(),
-            expanded: false,
-            allSelected: false,
-            members: [
-              { id: "user1", name: "王医生" },
-              { id: "user2", name: "李护士" },
-            ],
-          },
-          {
-            id: "group2",
-            name: "基层医生交流群",
-            avatar: "",
-            scene: 4,
-            unread_count: 0,
-            last_message: "欢迎赵医生加入",
-            last_message_time: new Date(Date.now() - 42600000).toISOString(),
-            expanded: false,
-            allSelected: false,
-            members: [
-              { id: "user1", name: "王医生" },
-              { id: "user2", name: "李护士" },
-            ],
-          },
-        ]);
+        const res = await getLatestContacts({
+          scene,
+          page: this.currentPage,
+          size: this.pageSize,
+        });
+        const contacts = res.data?.list || res.data || [];
+
+        if (isLoadMore) {
+          // 加载更多：追加数据
+          const existingContacts = [...this.latestContacts];
+          this.setLatestContacts([...existingContacts, ...contacts]);
+        } else {
+          // 首次加载：重置数据
+          this.setLatestContacts(contacts);
+        }
+        // 默认选中第一个联系人
+        if (contacts.length > 0 && !this.currentChat) {
+          this.handleSelectContact(contacts[0]);
+        }
+
+        // 判断是否还有更多数据
+        if (contacts.length < this.pageSize) {
+          this.hasMore = false;
+        }
       } catch (e) {
-        console.error("获取联系人失败", e);
+        console.error("获取联系人列表失败", e);
+      } finally {
+        this.loading = false;
+      }
+    },
+    // 滚动加载更多
+    handleScroll(e) {
+      const el = e.target;
+      const scrollTop = el.scrollTop;
+      const clientHeight = el.clientHeight;
+      const scrollHeight = el.scrollHeight;
+
+      console.log("滚动事件触发:", {
+        scrollTop,
+        clientHeight,
+        scrollHeight,
+        hasMore: this.hasMore,
+        loading: this.loading,
+        currentPage: this.currentPage,
+      });
+
+      // 滚动到底部时加载更多
+      if (scrollTop + clientHeight >= scrollHeight - 50) {
+        if (this.hasMore && !this.loading) {
+          console.log(
+            "触发加载下一页, 当前页:",
+            this.currentPage,
+            "下一页:",
+            this.currentPage + 1
+          );
+          this.currentPage++;
+          this.loadContacts(ContactsScene.ALL, true);
+        }
+      }
+    },
+    // 公开方法：刷新列表
+    // options: { selectFirst: true打开第一个, keepCurrent: true保持当前选中 }
+    async refreshList(options = {}) {
+      const { selectFirst = false, keepCurrent = false } = options;
+      // 保存当前选中的聊天
+      const currentChatBackup = { ...this.currentChat };
+      // 重置分页
+      this.currentPage = 1;
+      this.hasMore = true;
+      // 重新加载列表
+      this.loading = true;
+      try {
+        const res = await getLatestContacts({
+          scene: ContactsScene.ALL,
+          page: 1,
+          size: this.pageSize,
+        });
+        const contacts = res.data?.list || res.data || [];
+        this.setLatestContacts(contacts);
+        
+        if (selectFirst && contacts.length > 0) {
+          // 新建群聊场景：打开第一个
+          this.handleSelectContact(contacts[0]);
+        } else if (keepCurrent && currentChatBackup && contacts.length > 0) {
+          // 群设置修改场景：尝试保持当前选中
+          const found = contacts.find(
+            (c) => c.id === currentChatBackup.id && c.scene === currentChatBackup.scene
+          );
+          if (found) {
+            this.handleSelectContact(found);
+          } else if (contacts.length > 0) {
+            // 当前聊天不在列表中，选择第一个
+            this.handleSelectContact(contacts[0]);
+          }
+        }
+      } catch (e) {
+        console.error("刷新联系人列表失败", e);
+      } finally {
+        this.loading = false;
       }
     },
     handleSearchInput() {
@@ -248,23 +315,44 @@ export default {
         this.searchGroups = [];
         return;
       }
-      this.searchTimer = setTimeout(() => this.doSearch(), 300);
+      this.searchTimer = setTimeout(() => {
+        this.doSearch();
+      }, 300);
     },
+
     async doSearch() {
-      this.searchUsers = [
-        { id: "user1", name: "基层医生", department: "在线" },
-        { id: "user2", name: "郭君" },
-      ];
-      this.searchGroups = [{ id: "group1", name: "基层医生、会诊专家、郭君" }];
+      const key = this.searchKey.trim();
+      if (!key) return;
+      try {
+        const [userRes, groupRes] = await Promise.all([
+          searchUsers({ search_key: key, page: 1, size: 10 }),
+          searchGroups({ search_key: key, page: 1, size: 10 }),
+        ]);
+        this.searchUsers = userRes.data?.list || userRes.data || [];
+        this.searchGroups = groupRes.data?.list || groupRes.data || [];
+      } catch (e) {
+        console.error("搜索失败", e);
+      }
     },
     handleSearchBlur() {
       setTimeout(() => {
         this.isSearching = false;
         this.searchKey = "";
+        this.searchUsers = [];
+        this.searchGroups = [];
       }, 200);
     },
     handleSelectSearchResult(item, scene) {
-      this.handleSelectContact({ ...item, scene });
+      const contact = {
+        id: item.id,
+        name: item.name,
+        avatar: item.avatar,
+        scene: scene,
+        unread_count: 0,
+        last_message: "",
+        last_message_time: new Date().toISOString(),
+      };
+      this.handleSelectContact(contact);
       this.isSearching = false;
       this.searchKey = "";
     },
@@ -279,73 +367,213 @@ export default {
         this.currentChat.scene === contact.scene
       );
     },
+    // 格式化日期 - 统一显示为 yyyy-MM-dd 格式
     formatTime(timeStr) {
       if (!timeStr) return "";
       const date = new Date(timeStr);
       const now = new Date();
-      if (date.toDateString() === now.toDateString())
-        return date.toLocaleTimeString("zh-CN", {
-          hour: "2-digit",
-          minute: "2-digit",
-        });
-      const yesterday = new Date(now);
-      yesterday.setDate(yesterday.getDate() - 1);
-      if (date.toDateString() === yesterday.toDateString()) return "昨天";
-      return date.toLocaleDateString("zh-CN", {
-        month: "2-digit",
-        day: "2-digit",
-      });
+
+      // 重置到当天0点计算天数差
+      const dateDay = new Date(
+        date.getFullYear(),
+        date.getMonth(),
+        date.getDate()
+      );
+      const nowDay = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+      const diffDays = Math.floor((nowDay - dateDay) / (24 * 60 * 60 * 1000));
+
+      // 今天：显示 HH:mm
+      if (diffDays === 0) {
+        const hour = date.getHours().toString().padStart(2, "0");
+        const minute = date.getMinutes().toString().padStart(2, "0");
+        return `${hour}:${minute}`;
+      }
+
+      // 今年的消息：显示 MM-dd HH:mm
+      if (date.getFullYear() === now.getFullYear()) {
+        const month = (date.getMonth() + 1).toString().padStart(2, "0");
+        const day = date.getDate().toString().padStart(2, "0");
+        const hour = date.getHours().toString().padStart(2, "0");
+        const minute = date.getMinutes().toString().padStart(2, "0");
+        return `${month}-${day} ${hour}:${minute}`;
+      }
+
+      // 非今年的消息：显示 yyyy-MM-dd HH:mm
+      const year = date.getFullYear();
+      const month = (date.getMonth() + 1).toString().padStart(2, "0");
+      const day = date.getDate().toString().padStart(2, "0");
+      const hour = date.getHours().toString().padStart(2, "0");
+      const minute = date.getMinutes().toString().padStart(2, "0");
+      return `${year}-${month}-${day} ${hour}:${minute}`;
     },
+    // 格式化最后一条消息
     formatLastMessage(contact) {
-      const msg = contact.last_message || "";
+      const msg = contact.last_message;
+      if (!msg) return "";
+
       try {
-        const parsed = JSON.parse(msg);
+        const lastMsg = typeof msg === "string" ? JSON.parse(msg) : msg;
+        const msgType = contact.last_message_type;
         const typeMap = {
-          [MessageType.TEXT]: parsed.payload,
-          [MessageType.IMAGE]: "[图片]",
-          [MessageType.VIDEO]: "[视频]",
+          [MessageType.TEXT]: () => {
+            const content = lastMsg.content || lastMsg.payload || "";
+            return content.length > 30
+              ? content.slice(0, 30) + "..."
+              : content || "[文本消息]";
+          },
+          [MessageType.IMAGE]: () => "[图片]",
+          [MessageType.VIDEO]: () => {
+            const fileName = lastMsg.file_name || "[视频文件]";
+            return `[视频] ${
+              fileName.length > 20 ? fileName.slice(0, 20) + "..." : fileName
+            }`;
+          },
+          [MessageType.AUDIO]: () => "[语音]",
+          [MessageType.FILE]: () => {
+            const fileName = lastMsg.file_name || "[文件]";
+            return `[文件] ${
+              fileName.length > 20 ? fileName.slice(0, 20) + "..." : fileName
+            }`;
+          },
+          [MessageType.KNOWLEDGE_SHARE]: () => "[知识库分享]",
+          [MessageType.REPORT_SHARE]: () => "[病例分享]",
+          [MessageType.MULTI_CHAT_INIT_JOIN]: () => {
+            try {
+              const payload =
+                typeof lastMsg.content === "string"
+                  ? JSON.parse(lastMsg.content)
+                  : lastMsg.content;
+              const userIds = payload?.invited_user_ids || [];
+              if (userIds.length > 0) {
+                return `${contact.source_name || "成员"}邀请了${
+                  userIds.length
+                }人加入群聊`;
+              }
+              return `${contact.source_name || "成员"}加入了群聊`;
+            } catch (e) {
+              return `${contact.source_name || "成员"}加入了群聊`;
+            }
+          },
+          [MessageType.MULTI_CHAT_JOIN]: () =>
+            `${contact.source_name || "成员"}加入了群聊`,
+          [MessageType.MULTI_CHAT_QUIT]: () =>
+            `${contact.source_name || "成员"}退出了群聊`,
+          [MessageType.MULTI_CHAT_NOTICE]: () => "[群公告]",
+          [MessageType.CONSULTATION_MESSAGE_INVITE]: () => "[会诊邀请]",
+          [MessageType.NOTIFY_CONTENT]: () => {
+            try {
+              const payload =
+                typeof lastMsg.content === "string"
+                  ? JSON.parse(lastMsg.content)
+                  : lastMsg.content;
+              return payload.title || "[系统通知]";
+            } catch (e) {
+              return "[系统通知]";
+            }
+          },
         };
-        return typeMap[parsed.type] || msg;
+
+        if (typeMap[msgType]) {
+          return typeMap[msgType]();
+        }
+        // 默认处理：显示content或文件名称
+        if (
+          lastMsg.content &&
+          typeof lastMsg.content === "string" &&
+          lastMsg.content.length > 0
+        ) {
+          return lastMsg.content.length > 30
+            ? lastMsg.content.slice(0, 30) + "..."
+            : lastMsg.content;
+        }
+        if (lastMsg.file_name) {
+          return `[文件] ${
+            lastMsg.file_name.length > 20
+              ? lastMsg.file_name.slice(0, 20) + "..."
+              : lastMsg.file_name
+          }`;
+        }
+        return "[消息]";
       } catch (e) {
-        return msg;
+        // 如果解析失败，直接显示原始内容
+        const strMsg = typeof msg === "string" ? msg : JSON.stringify(msg);
+        return strMsg.length > 30 ? strMsg.slice(0, 30) + "..." : strMsg;
       }
     },
-    handleScroll() {},
-
-    // 打开创建群聊
+    // 发起群聊
     handleCreateGroup() {
-      this.createGroupVisible = true;
+      this.$refs.createGroupDialogRef.show();
+    },
+    // 发起群聊确认
+    async confirmCreateGroup(selectedMembers) {
+      try {
+        const res = await createMultiChat({
+          name:
+            this.userInfo.name +
+            "、" +
+            selectedMembers.map((member) => member.name).join("、"),
+          avatar: "",
+          init_users: selectedMembers.map((member) => member.id),
+        });
+        // 刷新列表并打开第一个
+        await this.refreshList({ selectFirst: true });
+        await this.subscribe(MqttTopics.MULTI_CHAT + res.data.multi_chat_id);
+        this.$message.success("创建成功");
+      } catch (e) {
+        this.$message.error("创建失败: " + (e.message || "未知错误"));
+      }
+    },
+    // 外部调用：更新联系人最后消息
+    updateContactLastMessage(contactId, scene, message, time) {
+      const contacts = [...this.latestContacts];
+      const idx = contacts.findIndex(
+        (c) => c.id === contactId && c.scene === scene
+      );
+      if (idx >= 0) {
+        contacts[idx].last_message =
+          typeof message === "string" ? message : JSON.stringify(message);
+        contacts[idx].last_message_time = time || new Date().toISOString();
+        if (!this.isActiveContact(contacts[idx])) {
+          contacts[idx].unread_count = (contacts[idx].unread_count || 0) + 1;
+        }
+        this.setLatestContacts(contacts);
+      } else {
+        // 新联系人，需要刷新列表
+        this.loadContacts();
+      }
     },
 
-    // 群聊创建成功
-    handleCreateGroupSuccess(selectedMembers) {
-      const memberNames = selectedMembers.slice(0, 3).map((m) => m.name);
-      const groupName =
-        memberNames.join("、") +
-        (selectedMembers.length > 3 ? `、等${selectedMembers.length}人` : "");
-      const contact = {
-        id: "group_" + Date.now(),
-        name: groupName,
-        avatar: "",
-        scene: ContactsScene.GROUP,
-        unread_count: 0,
-        last_message: "",
-        last_message_time: new Date().toISOString(),
-      };
-      this.$message.success("群聊创建成功");
-      this.loadContacts();
-      this.handleSelectContact(contact);
+    // 外部调用：清除未读
+    clearUnread(contactId, scene) {
+      const contacts = [...this.latestContacts];
+      const idx = contacts.findIndex(
+        (c) => c.id === contactId && c.scene === scene
+      );
+      if (idx >= 0) {
+        contacts[idx].unread_count = 0;
+        this.setLatestContacts(contacts);
+      }
     },
 
-    updateContactLastMessage() {},
-    clearUnread() {},
-    removeContact() {},
+    // 外部调用：删除联系人
+    removeContact(contactId, scene) {
+      const contacts = this.latestContacts.filter(
+        (c) => !(c.id === contactId && c.scene === scene)
+      );
+      this.setLatestContacts(contacts);
+      if (
+        this.currentChat &&
+        this.currentChat.id === contactId &&
+        this.currentChat.scene === scene
+      ) {
+        this.setCurrentChat(null);
+      }
+    },
   },
 };
 </script>
 
 <style lang="scss" scoped>
-/* 样式完全保留不变 */
 .message-list {
   width: 280px;
   height: 100%;
@@ -354,44 +582,54 @@ export default {
   border-right: 1px solid #ebeef5;
   background: #fff;
 }
+
 .list-header {
   padding: 12px;
   display: flex;
   align-items: center;
   gap: 8px;
   border-bottom: 1px solid #ebeef5;
+
   .el-input {
     flex: 1;
   }
+
   .create-group-btn {
     flex-shrink: 0;
   }
 }
+
 .search-dropdown {
   flex: 1;
   overflow-y: auto;
   background: #fff;
+
   .search-section {
     padding: 8px 0;
+
     .search-title {
       padding: 4px 12px;
       font-size: 12px;
       color: #909399;
       font-weight: 500;
     }
+
     .search-item {
       display: flex;
       align-items: center;
       padding: 8px 12px;
       cursor: pointer;
       transition: background 0.2s;
+
       &:hover {
         background: #f5f7fa;
       }
+
       .search-item-info {
         margin-left: 10px;
         flex: 1;
         min-width: 0;
+
         .search-item-name {
           font-size: 14px;
           color: #303133;
@@ -399,6 +637,7 @@ export default {
           overflow: hidden;
           text-overflow: ellipsis;
         }
+
         .search-item-dept {
           font-size: 12px;
           color: #909399;
@@ -408,9 +647,11 @@ export default {
     }
   }
 }
+
 .contact-list {
   flex: 1;
   overflow-y: auto;
+
   .contact-item {
     display: flex;
     align-items: center;
@@ -418,29 +659,36 @@ export default {
     cursor: pointer;
     transition: background 0.2s;
     position: relative;
+
     &:hover {
       background: #f5f7fa;
     }
+
     &.active {
       background: #ecf5ff;
     }
+
     .contact-avatar-wrap {
       position: relative;
       flex-shrink: 0;
+
       .unread-badge {
         position: absolute;
         top: -4px;
         right: -4px;
       }
     }
+
     .contact-info {
       flex: 1;
       margin-left: 10px;
       min-width: 0;
+
       .contact-top {
         display: flex;
         justify-content: space-between;
         align-items: center;
+
         .contact-name {
           font-size: 14px;
           color: #303133;
@@ -450,17 +698,20 @@ export default {
           text-overflow: ellipsis;
           max-width: 140px;
         }
+
         .contact-time {
           font-size: 12px;
           color: #c0c4cc;
           flex-shrink: 0;
         }
       }
+
       .contact-bottom {
         display: flex;
         justify-content: space-between;
         align-items: center;
         margin-top: 4px;
+
         .contact-last-msg {
           font-size: 12px;
           color: #909399;
@@ -469,6 +720,7 @@ export default {
           text-overflow: ellipsis;
           max-width: 170px;
         }
+
         .pin-icon {
           color: #409eff;
           font-size: 12px;
@@ -476,17 +728,44 @@ export default {
       }
     }
   }
+
   .empty-contacts {
     text-align: center;
     padding: 60px 20px;
     color: #c0c4cc;
+
     i {
       font-size: 48px;
       margin-bottom: 12px;
     }
+
     p {
       font-size: 14px;
     }
   }
+
+  .loading-tip {
+    text-align: center;
+    padding: 10px;
+    color: #909399;
+    font-size: 12px;
+
+    i {
+      margin-right: 4px;
+    }
+  }
+
+  .no-more-tip {
+    text-align: center;
+    padding: 10px;
+    color: #c0c4cc;
+    font-size: 12px;
+  }
+}
+
+.select-user-option {
+  display: flex;
+  align-items: center;
+  gap: 8px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/message/components/SearchRecord.vue b/src/views/message/components/SearchRecord.vue
index fcfaba3..82f750f 100644
--- a/src/views/message/components/SearchRecord.vue
+++ b/src/views/message/components/SearchRecord.vue
@@ -1,206 +1,289 @@
 <template>
   <el-dialog
-    title="查找聊天记录"
+    title="聊天记录"
     :visible.sync="visible"
     width="40%"
     append-to-body
+    :close-on-click-modal="true"
+    destroy-on-close
+    :before-close="() => (visible = false)"
   >
     <div class="search-record">
-      <!-- 搜索框 -->
-      <div class="search-header">
-        <el-input
-          v-model="searchKeyword"
-          placeholder="搜索"
-          class="search-input"
-          @input="handleSearch"
-          prefix-icon="el-icon-search"
-        />
-      </div>
-
       <!-- 分类标签 -->
       <div class="category-tabs">
-        <el-tabs v-model="activeTab" @tab-change="handleTabChange">
-          <el-tab-pane label="综合" name="all" />
-          <el-tab-pane label="文件" name="file" />
-          <el-tab-pane label="图片与视频" name="media" />
-          <el-tab-pane label="链接" name="link" />
-          <el-tab-pane label="日期" name="date" />
+        <el-tabs v-model="activeTab" @tab-click="handleTabClick">
+          <el-tab-pane label="图片" name="image" />
+          <el-tab-pane label="聊天记录" name="chat" />
         </el-tabs>
       </div>
 
-      <!-- 搜索结果列表 -->
-      <div class="result-list">
-        <div
-          v-for="(result, index) in filteredResults"
-          :key="result.message_id || result.id || index"
-          class="result-item"
-          @click="handleLocate(result)"
-        >
-          <el-avatar :size="40" :src="result.avatar" class="result-avatar">
-            <span v-if="!result.avatar">{{ result.sender_name.slice(0, 1) || '?' }}</span>
-          </el-avatar>
-          <div class="result-content">
-            <div class="result-name">{{ result.sender_name }}</div>
-            <div class="result-text">{{ result.displayText }}</div>
+      <!-- 列表容器 -->
+      <div class="result-list" ref="scrollWrap" @scroll="handleScroll">
+        <!-- 图片布局：一行4张 -->
+        <div v-if="activeTab === 'image'" class="image-grid">
+          <div v-for="(item, index) in list" :key="index" class="image-item">
+            <el-image
+              class="img-box"
+              :src="getImgUrl(item.file_path)"
+              :alt="item.file_name"
+              :preview-src-list="[getImgUrl(item.file_path)]"
+            />
+          </div>
+        </div>
+
+        <!-- 聊天记录布局 -->
+        <div v-else>
+          <div class="search-header">
+            <el-input
+              v-model="searchKeyword"
+              placeholder="搜索"
+              class="search-input"
+              @input="handleSearch"
+              prefix-icon="el-icon-search"
+            />
           </div>
-          <div class="result-right">
-            <div class="result-time">{{ result.displayTime }}</div>
-            <span v-if="result.type === 'link'" class="result-tag">链接</span>
-            <span v-if="result.type === 'file'" class="result-tag">文件</span>
-            <span v-if="result.type === 'media'" class="result-tag">图片</span>
-            <span v-if="result.type === 'audio'" class="result-tag">语音</span>
+          <div class="chat-list">
+            <!-- 根据 identity 类型匹配用户信息 -->
+            <div v-for="(item, index) in list" :key="item.id || index" class="result-item">
+              <el-avatar
+                :size="40"
+                :src="getImgUrl(item.sender_avatar)"
+                class="result-avatar"
+              >
+                {{ getFirstChar(item.sender_name) }}
+              </el-avatar>
+              <div class="result-content">
+                <div class="result-name">{{ item.sender_name || '未知用户' }}</div>
+                <div v-if="item.file_type === 'image'" class="result-text">[图片]</div>
+                <div v-else class="result-text">{{ item.content || '' }}</div>
+              </div>
+              <div class="result-right">
+                <div class="result-time">{{ item.create_time || item.update_time || '' }}</div>
+              </div>
+            </div>
           </div>
         </div>
 
         <!-- 空状态 -->
-        <div v-if="filteredResults.length === 0" class="empty-state">
+        <div v-if="list.length === 0 && !loadingMore" class="empty-state">
           <i class="el-icon-search" />
           <span>未找到相关消息</span>
         </div>
+
+        <!-- 加载更多提示 -->
+        <div v-if="loadingMore" class="loading-tip">
+          <i class="el-icon-loading"></i> 加载中...
+        </div>
+        <div v-if="isNoMore && list.length > 0" class="no-more-tip">
+          没有更多了
+        </div>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import { MessageType } from "@/utils/constants";
+import { getMultiChatInfo } from "@/api/multichat";
+import { postMessagesFileList, postMessagesSearch } from "@/api/message";
+import { mapGetters } from "vuex";
 export default {
   name: "SearchRecord",
-  props: {
-    visible: Boolean,
-    chat: Object,
-    messages: Array,
-  },
   data() {
     return {
+      visible: false,
       searchKeyword: "",
-      activeTab: "all",
+      activeTab: "image",
+      query: {},
+      list: [],
+      page: 1,
+      size: 60,
+      loadingMore: false,
+      isNoMore: false,
+      // 用户信息缓存
+      groupMembers: {}, // key: groupId, value: { userId: memberInfo }
     };
   },
 
   computed: {
-    searchResults() {
-      if (!this.messages || this.messages.length === 0) return [];
-      return this.messages.map((msg) => {
-        let displayText = "";
-        let type = "text";
-
-        switch (msg.type) {
-          case MessageType.TEXT:
-            displayText = msg.payload;
-            type = this.isUrl(msg.payload) ? "link" : "text";
-            break;
-          case MessageType.IMAGE:
-            displayText = "[图片]";
-            type = "media";
-            break;
-          case MessageType.VIDEO:
-            displayText = "[视频]";
-            type = "media";
-            break;
-          case MessageType.AUDIO:
-            displayText = "[语音消息]";
-            type = "audio";
-            break;
-          case MessageType.FILE:
-            displayText = `[文件] ${msg.payload.file_name || "附件"}`;
-            type = "file";
-            break;
-          case MessageType.REPORT_SHARE:
-            displayText = `[报告] ${msg.payload.title || "报告分享"}`;
-            type = "file";
-            break;
-          case MessageType.KNOWLEDGE_SHARE:
-            displayText = `[知识] ${msg.payload.title || "知识分享"}`;
-            type = "file";
-            break;
-          case MessageType.CONSULTATION_MESSAGE_INVITE:
-            displayText = `[会诊邀请] ${msg.payload.title || "会诊邀请"}`;
-            type = "text";
-            break;
-          case MessageType.NOTIFY_CONTENT:
-            displayText = `[系统通知] ${msg.payload.description || msg.payload.title || "系统通知"}`;
-            type = "text";
-            break;
-          default:
-            displayText = String(msg.payload || "[未知消息]");
-            type = "text";
-        }
-        return {
-          ...msg,
-          displayText,
-          type,
-          displayTime: this.formatTime(msg.timestamp || msg.create_time),
-          avatar: "",
-          sender_name: msg.sender_name || (msg.is_self ? "我" : "未知"),
-        };
+    ...mapGetters(["userInfo", "latestContacts"]),
+  },
+
+  methods: {
+    // 打开弹窗
+    show(chat) {
+      this.query = { ...chat };
+      this.visible = true;
+      this.resetPage();
+      this.searchKeyword = "";
+      this.groupMembers = {};
+      this.$nextTick(() => {
+        this.getListData();
       });
     },
 
-    filteredResults() {
-      let results = this.searchResults;
-
-      // 按标签过滤
-      if (this.activeTab !== "all") {
-        if (this.activeTab === "file") {
-          results = results.filter((r) => r.type === "file");
-        } else if (this.activeTab === "media") {
-          results = results.filter((r) => r.type === "media");
-        } else if (this.activeTab === "link") {
-          results = results.filter((r) => r.type === "link");
-        } else if (this.activeTab === "date") {
-          // 日期模式显示全部，按日期分组
+    // 重置分页、列表、滚动条
+    resetPage() {
+      this.page = 1;
+      this.isNoMore = false;
+      this.loadingMore = false;
+      this.list = [];
+      if (this.$refs.scrollWrap) {
+        this.$refs.scrollWrap.scrollTop = 0;
+      }
+    },
+
+    // 标签点击切换
+    handleTabClick() {
+      this.resetPage();
+      this.getListData();
+    },
+
+    // 搜索输入
+    handleSearch() {
+      this.resetPage();
+      this.getListData();
+    },
+
+    // 统一请求数据
+    async getListData() {
+      if (this.loadingMore || this.isNoMore) return;
+      this.loadingMore = true;
+      let request;
+      if (this.activeTab === "image") {
+        request = postMessagesFileList({
+          file_types: ["image"],
+          page: this.page,
+          scene: this.query.scene,
+          size: this.size,
+          target_id: this.query.id,
+          type: "image",
+        });
+      } else {
+        request = postMessagesSearch({
+          datetime_end: "",
+          datetime_start: "",
+          file_types: [],
+          is_at_self: 0,
+          page: this.page,
+          scene: this.query.scene,
+          search_key: this.searchKeyword,
+          size: this.size,
+          source_id: 0,
+          target_id: this.query.id,
+          type: "text",
+        });
+      }
+
+      try {
+        const res = await request;
+        const data = res.data.list || [];
+        // 处理每条消息的用户信息
+        const processedData = await this.processMessagesWithUserInfo(data);
+        this.list = this.page === 1 ? processedData : [...this.list, ...processedData];
+        if (data.length < this.size) {
+          this.isNoMore = true;
         }
+      } catch (e) {
+        this.$message.error("数据加载失败");
+      } finally {
+        this.loadingMore = false;
       }
+    },
 
-      // 按关键词过滤
-      if (this.searchKeyword) {
-        const keyword = this.searchKeyword.toLowerCase();
-        results = results.filter(
-          (r) =>
-            (r.sender_name && r.sender_name.toLowerCase().includes(keyword)) ||
-            (r.displayText && r.displayText.toLowerCase().includes(keyword))
-        );
+    // 处理消息列表，匹配用户信息
+    async processMessagesWithUserInfo(messages) {
+      for (const msg of messages) {
+        const userInfo = await this.searchChat(msg);
+        msg.sender_avatar = userInfo.avatar;
+        msg.sender_name = userInfo.name;
       }
+      return messages;
+    },
 
-      // 按时间倒序排列
-      return results.sort((a, b) => {
-        const timeA = new Date(a.timestamp || a.create_time).getTime();
-        const timeB = new Date(b.timestamp || b.create_time).getTime();
-        return timeB - timeA;
-      });
+    // 根据消息获取发送者信息
+    async searchChat(msg) {
+      const identity = msg.identity || "";
+      const sourceId = msg.source_id;
+      const targetId = msg.target_id;
+
+      // 群聊：identity 包含 "multi_chat"
+      if (identity.includes("multi_chat")) {
+        return await this.getGroupMemberInfo(targetId, sourceId);
+      }
+
+      // 私聊：identity 包含 "chat" 或其他
+      return this.getPrivateChatUserInfo(sourceId);
     },
-  },
 
-  methods: {
-    isUrl(text) {
-      if (!text) return false;
-      const urlPattern = /https?:\/\/[^\s]+/;
-      return urlPattern.test(text);
+    // 获取群成员信息
+    async getGroupMemberInfo(groupId, userId) {
+      // 检查缓存
+      if (!this.groupMembers[groupId]) {
+        try {
+          const res = await getMultiChatInfo({ multi_chat_id: groupId });
+          const members = res.data.user_list || [];
+          const memberMap = {};
+          members.forEach((member) => {
+            memberMap[member.id] = {
+              avatar: member.avatar,
+              name: member.name,
+            };
+          });
+          this.groupMembers[groupId] = memberMap;
+        } catch (e) {
+          console.error("获取群成员列表失败", e);
+          this.groupMembers[groupId] = {};
+        }
+      }
+
+      const member = this.groupMembers[groupId][userId];
+      return member || { avatar: "", name: "未知成员" };
     },
 
-    formatTime(timestamp) {
-      if (!timestamp) return "";
-      const date = new Date(timestamp);
-      const year = date.getFullYear();
-      const month = String(date.getMonth() + 1).padStart(2, "0");
-      const day = String(date.getDate()).padStart(2, "0");
-      const hours = String(date.getHours()).padStart(2, "0");
-      const minutes = String(date.getMinutes()).padStart(2, "0");
-      return `${year}年${month}月${day}日 ${hours}:${minutes}`;
+    // 获取私聊用户信息
+    getPrivateChatUserInfo(sourceId) {
+      const currentUserId = this.userInfo?.id;
+
+      // 是当前用户发送的消息
+      if (sourceId === currentUserId) {
+        return {
+          avatar: this.userInfo?.avatar || "",
+          name: this.userInfo?.name || "我",
+        };
+      }
+
+      // 从最近联系人列表查找
+      const contact = this.latestContacts.find((c) => c.id === sourceId);
+      if (contact) {
+        return {
+          avatar: contact.avatar || "",
+          name: contact.name || "未知用户",
+        };
+      }
+
+      return { avatar: "", name: "未知用户" };
     },
 
-    handleSearch() {
-      // 搜索逻辑已在 computed 中处理
+    // 滚动触底加载
+    handleScroll() {
+      const wrap = this.$refs.scrollWrap;
+      if (!wrap || this.loadingMore || this.isNoMore) return;
+      const { scrollTop, scrollHeight, clientHeight } = wrap;
+      if (scrollTop + clientHeight >= scrollHeight - 20) {
+        this.page++;
+        this.getListData();
+      }
     },
 
-    handleTabChange() {
-      // 标签切换逻辑已在 computed 中处理
+    // 拼接图片地址
+    getImgUrl(path) {
+      if (!path) return "";
+      return this.$store.state.user.netConfig.MINIO_ENDPOINT_HTTPS + path;
     },
 
-    handleLocate(result) {
-      this.$emit("locate", result);
-      this.$emit("update:visible", false);
+    // 获取名字首字符（头像兜底）
+    getFirstChar(name) {
+      return name ? name.slice(0, 1) : "?";
     },
   },
 };
@@ -233,61 +316,81 @@ export default {
   padding: 10px 0;
 }
 
-.result-item {
-  display: flex;
-  align-items: center;
-  padding: 12px 15px;
-  cursor: pointer;
-  transition: background-color 0.2s;
-
-  &:hover {
-    background-color: #f5f7fa;
-  }
-}
-
-.result-avatar {
-  margin-right: 12px;
-}
-
-.result-content {
-  flex: 1;
-  min-width: 0;
+/* 图片网格 一行4张 */
+.image-grid {
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  gap: 10px;
+  padding: 0 10px;
 }
-
-.result-name {
-  font-size: 14px;
-  font-weight: 500;
-  color: #303133;
-  margin-bottom: 4px;
-}
-
-.result-text {
-  font-size: 13px;
-  color: #606266;
+.image-item {
+  border-radius: 6px;
   overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+  cursor: pointer;
+  background: #f5f5f5;
+  aspect-ratio: 1 / 1;
 }
-
-.result-right {
-  text-align: right;
-  margin-left: 15px;
+.img-box {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  transition: transform 0.2s;
 }
-
-.result-time {
-  font-size: 12px;
-  color: #909399;
-  margin-bottom: 4px;
+.image-item:hover .img-box {
+  transform: scale(1.05);
 }
 
-.result-tag {
-  font-size: 11px;
-  padding: 2px 6px;
-  border-radius: 4px;
-  background-color: #ecf5ff;
-  color: #409eff;
+/* 聊天列表样式 */
+.chat-list {
+  .result-item {
+    display: flex;
+    align-items: center;
+    padding: 12px 15px;
+    cursor: pointer;
+    transition: background-color 0.2s;
+    &:hover {
+      background-color: #f5f7fa;
+    }
+  }
+  .result-avatar {
+    margin-right: 12px;
+  }
+  .result-content {
+    flex: 1;
+    min-width: 0;
+  }
+  .result-name {
+    font-size: 14px;
+    font-weight: 500;
+    color: #303133;
+    margin-bottom: 4px;
+  }
+  .result-text {
+    font-size: 13px;
+    color: #606266;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .result-right {
+    text-align: right;
+    margin-left: 15px;
+  }
+  .result-time {
+    font-size: 12px;
+    color: #909399;
+    margin-bottom: 4px;
+  }
+  .result-tag {
+    font-size: 11px;
+    padding: 2px 6px;
+    border-radius: 4px;
+    background-color: #ecf5ff;
+    color: #409eff;
+  }
 }
 
+/* 空状态 */
 .empty-state {
   display: flex;
   flex-direction: column;
@@ -295,10 +398,18 @@ export default {
   justify-content: center;
   padding: 40px 0;
   color: #909399;
-
   i {
     font-size: 48px;
     margin-bottom: 16px;
   }
 }
-</style>
+
+/* 加载/无更多 */
+.loading-tip,
+.no-more-tip {
+  text-align: center;
+  padding: 10px 0;
+  font-size: 12px;
+  color: #999;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index 9b0c662..d5751e1 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -1,17 +1,14 @@
 <template>
   <div class="message-main">
-    <MessageList
-      ref="messageList"
-      @select-contact="handleSelectContact"
-    />
+    <MessageList ref="messageList" @select-contact="handleSelectContact" />
     <div class="message-right">
-       <MessageDisplay
+      <MessageDisplay
         ref="messageDisplay"
         @clear-unread="handleClearUnread"
         @send-files="handleSendFiles"
         @group-setting="handleGroupSetting"
       />
-      
+
       <MessageEditor
         ref="messageEditor"
         @send-message="handleSendMessage"
@@ -21,60 +18,61 @@
 
     <!-- 群设置弹窗 -->
     <GroupSetting
-      :visible.sync="groupSettingVisible"
+      ref="groupSettingRef"
       :chat="currentChat"
       @quit-group="handleQuitGroup"
       @dismiss-group="handleDismissGroup"
+      @refresh-list="handleRefreshList"
     />
   </div>
 </template>
 
 <script>
-import { mapGetters, mapActions } from 'vuex'
-import MessageList from './components/MessageList.vue'
-import MessageDisplay from './components/MessageDisplay.vue'
-import GroupSetting from './components/GroupSetting.vue'
-import MessageEditor from './components/MessageEditor.vue'
-// import { getMultiChatInfo } from '@/api/multichat'
-import { MessageType, ContactsScene, MqttTopics } from '@/utils/constants'
+import { mapGetters, mapActions } from "vuex";
+import MessageList from "./components/MessageList.vue";
+import MessageDisplay from "./components/MessageDisplay.vue";
+import GroupSetting from "./components/GroupSetting.vue";
+import MessageEditor from "./components/MessageEditor.vue";
+import { getMultiChatInfo, editMultiChatName } from '@/api/multichat'
+import { MessageType, ContactsScene, MqttTopics } from "@/utils/constants";
 
 export default {
-  name: 'MessageMain',
+  name: "MessageMain",
 
   components: {
     MessageList,
     MessageDisplay,
     GroupSetting,
-    MessageEditor
+    MessageEditor,
   },
 
   data() {
     return {
-      groupSettingVisible: false
-    }
+    };
   },
 
   computed: {
-    ...mapGetters(['mqttMessages', 'currentChat', 'userInfo', 'mqttConnected'])
+    ...mapGetters(["mqttMessages", "currentChat", "userInfo", "mqttConnected"]),
   },
 
   watch: {
     mqttMessages: {
       deep: true,
       handler(newMessages, oldMessages) {
-        const oldLen = oldMessages ? oldMessages.length : 0
-        const newLen = newMessages ? newMessages.length : 0
+        const oldLen = oldMessages ? oldMessages.length : 0;
+        const newLen = newMessages ? newMessages.length : 0;
         if (newLen > oldLen) {
           for (let i = oldLen; i < newLen; i++) {
-            this.handleMqttMessage(newMessages[i])
+            this.handleMqttMessage(newMessages[i]);
           }
         }
-      }
-    }
+      },
+    },
   },
 
   mounted() {
-    this.initMqttSubscriptions()
+    this.initMqttSubscriptions();
+    this.handleUrlParams();
   },
 
   beforeDestroy() {
@@ -82,21 +80,46 @@ export default {
   },
 
   methods: {
-    ...mapActions('mqtt', ['subscribe', 'unsubscribe']),
+    ...mapActions("mqtt", ["subscribe", "unsubscribe"]),
+    ...mapActions("message", ["setCurrentChat"]),
+
+    // 处理URL参数，实现从通讯录发消息联动
+    handleUrlParams() {
+      const { contactId, contactName, scene } = this.$route.query;
+      if (contactId && scene) {
+        const chat = {
+          id: contactId,
+          name: contactName || "未知联系人",
+          scene: parseInt(scene),
+          avatar: "",
+          unread_count: 0,
+          last_message: "",
+          last_message_time: new Date().toISOString(),
+        };
+        // 设置当前聊天
+        this.setCurrentChat(chat);
+        // 如果是群聊，订阅MQTT主题
+        if (parseInt(scene) === ContactsScene.GROUP) {
+          this.subscribe(MqttTopics.MULTI_CHAT + contactId);
+        }
+        // 清除URL参数
+        this.$router.replace({ query: {} });
+      }
+    },
 
     async initMqttSubscriptions() {
       // 订阅个人消息主题
       if (this.userInfo?.id) {
-        await this.subscribe(MqttTopics.PRIVATE_CHAT + this.userInfo.id)
+        await this.subscribe(MqttTopics.PRIVATE_CHAT + this.userInfo.id);
       }
     },
 
     handleMqttMessage(msg) {
-      const type = msg.type || msg.message_type
+      const type = msg.type || msg.message_type;
       switch (type) {
         case MessageType.READ:
-          this.handleReadMessage(msg)
-          break
+          this.handleReadMessage(msg);
+          break;
         case MessageType.TEXT:
         case MessageType.IMAGE:
         case MessageType.VIDEO:
@@ -105,54 +128,62 @@ export default {
         case MessageType.REPORT_SHARE:
         case MessageType.KNOWLEDGE_SHARE:
         case MessageType.CONSULTATION_MESSAGE_INVITE:
-          this.handleBaseMessage(msg)
-          break
+          this.handleBaseMessage(msg);
+          break;
         case MessageType.MULTI_CHAT_INVITE:
-          this.handleMultiChatInvite(msg)
-          break
+          this.handleMultiChatInvite(msg);
+          break;
         case MessageType.MULTI_CHAT_JOIN:
-          this.handleMultiChatJoin(msg)
-          break
+          this.handleMultiChatJoin(msg);
+          break;
         case MessageType.MULTI_CHAT_EDIT:
-          this.handleMultiChatEdit(msg)
-          break
+          this.handleMultiChatEdit(msg);
+          break;
         case MessageType.MULTI_CHAT_QUIT:
-          this.handleMultiChatQuit(msg)
-          break
+          this.handleMultiChatQuit(msg);
+          break;
         case MessageType.MULTI_CHAT_DISMISS:
-          this.handleMultiChatDismiss(msg)
-          break
+          this.handleMultiChatDismiss(msg);
+          break;
         case MessageType.NOTIFY_CONTENT:
-          this.handleNotifyContent(msg)
-          break
+          this.handleNotifyContent(msg);
+          break;
         default:
-          console.log('未处理的MQTT消息类型:', type, msg)
+          console.log("未处理的MQTT消息类型:", type, msg);
       }
     },
 
     handleReadMessage(msg) {
       // 更新消息已读状态
       if (this.$refs.messageDisplay) {
-        this.$refs.messageDisplay.updateMessageStatus(msg.message_id, { read: true, read_status: 1 })
+        this.$refs.messageDisplay.updateMessageStatus(msg.message_id, {
+          read: true,
+          read_status: 1,
+        });
       }
     },
 
     handleBaseMessage(msg) {
-      const isSelf = msg.source_id === this.userInfo?.id
-      const scene = msg.scene || (msg.multi_chat_id ? ContactsScene.GROUP : ContactsScene.PRIVATE)
-      const targetId = msg.target_id || msg.source_id
-      const contactId = isSelf ? targetId : msg.source_id
+      const isSelf = msg.source_id === this.userInfo?.id;
+      const scene =
+        msg.scene ||
+        (msg.multi_chat_id ? ContactsScene.GROUP : ContactsScene.PRIVATE);
+      const targetId = msg.target_id || msg.source_id;
+      const contactId = isSelf ? targetId : msg.source_id;
 
       // 如果当前正在查看该会话，展示消息
-      if (this.currentChat &&
-          this.currentChat.id === (scene === ContactsScene.GROUP ? msg.multi_chat_id : contactId) &&
-          this.currentChat.scene === scene) {
+      if (
+        this.currentChat &&
+        this.currentChat.id ===
+          (scene === ContactsScene.GROUP ? msg.multi_chat_id : contactId) &&
+        this.currentChat.scene === scene
+      ) {
         if (this.$refs.messageDisplay) {
-          this.$refs.messageDisplay.addChatMessage(msg)
+          this.$refs.messageDisplay.addChatMessage(msg);
         }
         // 标记已读
         if (!isSelf) {
-          this.handleClearUnread(this.currentChat.id, this.currentChat.scene)
+          this.handleClearUnread(this.currentChat.id, this.currentChat.scene);
         }
       }
 
@@ -163,112 +194,126 @@ export default {
           scene,
           msg,
           msg.timestamp || new Date().toISOString()
-        )
+        );
       }
     },
 
     async handleMultiChatInvite(msg) {
-      const payload = msg.payload || {}
-      const multiChatId = payload.multi_chat_id || msg.multi_chat_id
-      if (!multiChatId) return
+      const payload = msg.payload || {};
+      const multiChatId = payload.multi_chat_id || msg.multi_chat_id;
+      if (!multiChatId) return;
       // 订阅群主题
-      await this.subscribe(MqttTopics.MULTI_CHAT + multiChatId)
+      await this.subscribe(MqttTopics.MULTI_CHAT + multiChatId);
       // 获取群详情
       try {
-        const res = await getMultiChatInfo({ multi_chat_id: multiChatId })
-        const group = res.data
+        const res = await getMultiChatInfo({ multi_chat_id: multiChatId });
+        const group = res.data;
         if (group && this.$refs.messageList) {
-          this.$refs.messageList.loadContacts()
+          this.$refs.messageList.loadContacts();
         }
       } catch (e) {
-        console.error('获取群详情失败', e)
+        console.error("获取群详情失败", e);
       }
     },
 
     async handleMultiChatJoin(msg) {
-      const multiChatId = msg.multi_chat_id || msg.payload?.multi_chat_id
-      if (!multiChatId) return
+      const multiChatId = msg.multi_chat_id || msg.payload?.multi_chat_id;
+      if (!multiChatId) return;
       try {
-        await getMultiChatInfo({ multi_chat_id: multiChatId })
+        await getMultiChatInfo({ multi_chat_id: multiChatId });
         if (this.$refs.messageList) {
-          this.$refs.messageList.loadContacts()
+          this.$refs.messageList.loadContacts();
         }
       } catch (e) {
-        console.error('获取群详情失败', e)
+        console.error("获取群详情失败", e);
       }
     },
 
     async handleMultiChatEdit(msg) {
-      const multiChatId = msg.multi_chat_id || msg.payload?.multi_chat_id
-      if (!multiChatId) return
+      const multiChatId = msg.multi_chat_id || msg.payload?.multi_chat_id;
+      if (!multiChatId) return;
       try {
-        await getMultiChatInfo({ multi_chat_id: multiChatId })
+        await getMultiChatInfo({ multi_chat_id: multiChatId });
         if (this.$refs.messageList) {
-          this.$refs.messageList.loadContacts()
+          this.$refs.messageList.loadContacts();
         }
         // 如果当前正在该群聊，刷新标题
-        if (this.currentChat && this.currentChat.id === multiChatId && this.currentChat.scene === ContactsScene.GROUP) {
-          this.$refs.messageList.loadContacts()
+        if (
+          this.currentChat &&
+          this.currentChat.id === multiChatId &&
+          this.currentChat.scene === ContactsScene.GROUP
+        ) {
+          this.$refs.messageList.loadContacts();
         }
       } catch (e) {
-        console.error('获取群详情失败', e)
+        console.error("获取群详情失败", e);
       }
     },
 
     handleMultiChatQuit(msg) {
-      const payload = msg.payload || {}
-      const multiChatId = payload.multi_chat_id || msg.multi_chat_id
-      const quitUserId = payload.user_id || msg.source_id
-      if (!multiChatId) return
+      const payload = msg.payload || {};
+      const multiChatId = payload.multi_chat_id || msg.multi_chat_id;
+      const quitUserId = payload.user_id || msg.source_id;
+      if (!multiChatId) return;
       if (quitUserId === this.userInfo?.id) {
         // 自己退出，取消订阅并删除列表项
-        this.unsubscribe(MqttTopics.MULTI_CHAT + multiChatId)
+        this.unsubscribe(MqttTopics.MULTI_CHAT + multiChatId);
         if (this.$refs.messageList) {
-          this.$refs.messageList.removeContact(multiChatId, ContactsScene.GROUP)
+          this.$refs.messageList.removeContact(
+            multiChatId,
+            ContactsScene.GROUP
+          );
         }
       } else {
         // 他人退出，更新列表
         if (this.$refs.messageList) {
-          this.$refs.messageList.loadContacts()
+          this.$refs.messageList.loadContacts();
         }
       }
     },
 
     handleMultiChatDismiss(msg) {
-      const multiChatId = msg.multi_chat_id || msg.payload?.multi_chat_id
-      if (!multiChatId) return
-      this.unsubscribe(MqttTopics.MULTI_CHAT + multiChatId)
+      const multiChatId = msg.multi_chat_id || msg.payload?.multi_chat_id;
+      if (!multiChatId) return;
+      this.unsubscribe(MqttTopics.MULTI_CHAT + multiChatId);
       if (this.$refs.messageList) {
-        this.$refs.messageList.removeContact(multiChatId, ContactsScene.GROUP)
+        this.$refs.messageList.removeContact(multiChatId, ContactsScene.GROUP);
+      }
+    },
+
+    // 群设置修改后刷新列表
+    handleRefreshList() {
+      if (this.$refs.messageList) {
+        this.$refs.messageList.refreshList({ keepCurrent: true });
       }
     },
 
     handleNotifyContent(msg) {
       // 系统通知处理
       this.$notify({
-        title: '系统通知',
-        message: msg.payload?.content || msg.content || '新通知',
-        type: 'info',
-        duration: 5000
-      })
+        title: "系统通知",
+        message: msg.payload?.content || msg.content || "新通知",
+        type: "info",
+        duration: 5000,
+      });
     },
 
     handleSelectContact(contact) {
       // 如果是群聊，订阅MQTT主题
       if (contact.scene === ContactsScene.GROUP) {
-        this.subscribe(MqttTopics.MULTI_CHAT + contact.id)
+        this.subscribe(MqttTopics.MULTI_CHAT + contact.id);
       }
     },
 
     handleClearUnread(contactId, scene) {
       if (this.$refs.messageList) {
-        this.$refs.messageList.clearUnread(contactId, scene)
+        this.$refs.messageList.clearUnread(contactId, scene);
       }
     },
 
     handleSendMessage(message) {
       if (this.$refs.messageDisplay) {
-        this.$refs.messageDisplay.addChatMessage(message)
+        this.$refs.messageDisplay.addChatMessage(message);
       }
       // 更新联系人列表
       if (this.$refs.messageList) {
@@ -277,47 +322,52 @@ export default {
           message.scene,
           message,
           new Date().toISOString()
-        )
+        );
       }
     },
 
     handleUpdateMessageStatus(messageId, updates) {
       if (this.$refs.messageDisplay) {
-        this.$refs.messageDisplay.updateMessageStatus(messageId, updates)
+        this.$refs.messageDisplay.updateMessageStatus(messageId, updates);
       }
     },
 
     handleSendFiles(files) {
       if (this.$refs.messageEditor) {
-        files.forEach(file => {
-          const type = file.type.startsWith('image/') ? 'image'
-            : file.type.startsWith('video/') ? 'video'
-            : file.type.startsWith('audio/') ? 'audio'
-            : 'file'
-          this.$refs.messageEditor.sendFileMessage(file, type)
-        })
+        files.forEach((file) => {
+          const type = file.type.startsWith("image/")
+            ? "image"
+            : file.type.startsWith("video/")
+            ? "video"
+            : file.type.startsWith("audio/")
+            ? "audio"
+            : "file";
+          this.$refs.messageEditor.sendFileMessage(file, type);
+        });
       }
     },
 
-    handleGroupSetting(chat) {
-      this.groupSettingVisible = true
+    handleGroupSetting() {
+      this.$refs.groupSettingRef.loadGroupInfo();
     },
 
     handleQuitGroup(chat) {
       // 退出群组逻辑
       if (this.$refs.messageList) {
-        this.$refs.messageList.removeContact(chat.id, chat.scene)
+        // 刷新列表并打开第一个
+        this.$refs.messageList.refreshList({ selectFirst: true });
       }
     },
 
     handleDismissGroup(chat) {
       // 解散群组逻辑
       if (this.$refs.messageList) {
-        this.$refs.messageList.removeContact(chat.id, chat.scene)
+        // 刷新列表并打开第一个
+        this.$refs.messageList.refreshList({ selectFirst: true });
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>