From 21e8a5f3fedb52bece514627ae049c0dc473248c Mon Sep 17 00:00:00 2001
From: bob <312777916@qq.com>
Date: Mon, 24 Feb 2025 14:43:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E5=85=AC=E5=91=8A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E8=BF=9B=E5=85=A5=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/card/GroupCard.vue                      | 4 +++-
 src/views/message/components/MessageGroupRightSide.vue | 5 +----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/card/GroupCard.vue b/src/components/card/GroupCard.vue
index f7f7d10..c635e6b 100644
--- a/src/components/card/GroupCard.vue
+++ b/src/components/card/GroupCard.vue
@@ -55,7 +55,9 @@ watch(
   () => groupCardData.isShow,
   (newValue) => {
     if (newValue) {
-      groupCardData.setShowModel('info')
+      if (!groupCardData.showModel) {
+        groupCardData.setShowModel('info')
+      }
       newMyNickNameInGroup.value = showMembers.value[myAccount.value].nickName
       settingOption.value = 'chatSetting'
       isJoinGroupApproval.value = groupInfo.value.joinGroupApproval
diff --git a/src/views/message/components/MessageGroupRightSide.vue b/src/views/message/components/MessageGroupRightSide.vue
index 65e3253..80fc2bf 100644
--- a/src/views/message/components/MessageGroupRightSide.vue
+++ b/src/views/message/components/MessageGroupRightSide.vue
@@ -98,11 +98,8 @@ const onAnnouncementInSideHeightDragUpdate = ({ height }) => {
 }
 
 const onEditAnnouncement = () => {
+  groupCardData.setShowModel('editAnnouncement')
   emit('showGroupCard', { groupId: groupId.value })
-  setTimeout(() => {
-    // 这里要延迟打开，否则会与GroupCard的初始化ShowModel冲突
-    groupCardData.setShowModel('editAnnouncement')
-  }, 100)
 }
 
 const onSwitchSearchMode = () => {