From 2f513f7b8fa3307cb678b544758a63befec3a0fe Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 6 May 2026 20:51:45 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(im):=20=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E7=BE=A4=E7=94=B3=E8=AF=B7=20v0.2=EF=BC=9A=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=89=E6=8A=8A=20review?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../conversation/components/message/MessagePanel.vue     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/im/home/pages/conversation/components/message/MessagePanel.vue b/src/views/im/home/pages/conversation/components/message/MessagePanel.vue
index d9e8b8dfe..2f6c26a50 100644
--- a/src/views/im/home/pages/conversation/components/message/MessagePanel.vue
+++ b/src/views/im/home/pages/conversation/components/message/MessagePanel.vue
@@ -63,6 +63,11 @@
           :group-id="conversationStore.activeConversation.targetId"
           @locate="handleLocate"
         />
+        <!-- 群顶部「待处理加群申请」横幅：仅群聊 + owner / admin + count > 0 时显示 -->
+        <ConversationGroupRequestPending
+          v-if="isGroup && conversationStore.activeConversation"
+          :group-id="conversationStore.activeConversation.targetId"
+        />
         <!-- 私聊：对方不再是有效好友（我删了对方 / 从未加过；单边设计下「被对方删除」本端 friendStore 不更新故不会触发）；胶囊嵌在 header 内（跟群置顶同级），点击弹 UserInfoCard -->
         <div v-if="showNotFriendBanner" class="message-panel__not-friend-container">
           <div class="message-panel__not-friend" @click="handleNotFriendClick">
@@ -179,6 +184,7 @@ import MessageInput from '../input/MessageInput.vue'
 import MessageHistory from './MessageHistory.vue'
 import ConversationGroupSide from '../conversation/ConversationGroupSide.vue'
 import ConversationGroupPinned from './ConversationGroupPinned.vue'
+import ConversationGroupRequestPending from './ConversationGroupRequestPending.vue'
 import ConversationPrivateSide from '../conversation/ConversationPrivateSide.vue'
 import type { FriendLite, GroupLite } from '../../../../types'
 import type { GroupMemberLite } from '../../../../components/group/GroupMember.vue'
@@ -279,7 +285,8 @@ const groupInfo = computed<
     notice: group?.notice,
     groupRemark: group?.groupRemark,
     ownerId: group?.ownerUserId,
-    memberCount: group?.memberCount
+    memberCount: group?.memberCount,
+    joinApproval: group?.joinApproval
   }
 })