From ae65985f609bd2cbdb08affe0c0ace1d659906d1 Mon Sep 17 00:00:00 2001
From: bob <312777916@qq.com>
Date: Thu, 21 Nov 2024 18:07:03 +0800
Subject: [PATCH] =?UTF-8?q?groupcard=E5=92=8C=E9=80=9A=E8=AE=AF=E5=BD=95?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=B0=83=E6=95=B4=E5=88=B0=E7=BE=A4=E7=BB=84?=
 =?UTF-8?q?=E7=9A=84=E8=81=8A=E5=A4=A9=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/card/GroupCard.vue             | 20 ++++++++++++++++++-
 .../group/components/ContactListGroupItem.vue | 18 +++++++----------
 src/views/message/MessageLayout.vue           | 15 ++++++++++++++
 3 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/src/components/card/GroupCard.vue b/src/components/card/GroupCard.vue
index 1714dcc..a11ba11 100644
--- a/src/components/card/GroupCard.vue
+++ b/src/components/card/GroupCard.vue
@@ -27,6 +27,7 @@ import {
   groupUpdateMuteService
 } from '@/api/group'
 import { MsgType } from '@/proto/msg'
+import router from '@/router'
 
 const groupData = groupStore()
 const userData = userStore()
@@ -70,6 +71,17 @@ watch(
   }
 )
 
+const goToSessionTab = () => {
+  router.push({
+    path: '/message',
+    query: {
+      sessionId: sessionInfo.value.sessionId
+    }
+  })
+  groupCardData.setIsShow(false)
+  groupCardData.setGroupId('')
+}
+
 const groupInfo = computed(() => {
   return groupData.groupInfoList[groupCardData.groupId] || {}
 })
@@ -910,7 +922,13 @@ const onConfirmSingleSelect = (selected) => {
         </el-tabs>
       </div>
       <div class="group-card-send-msg">
-        <el-button type="primary" size="large" round style="width: 200px; font-size: 16px">
+        <el-button
+          type="primary"
+          size="large"
+          round
+          style="width: 200px; font-size: 16px"
+          @click="goToSessionTab"
+        >
           发送消息
         </el-button>
       </div>
diff --git a/src/views/contactList/group/components/ContactListGroupItem.vue b/src/views/contactList/group/components/ContactListGroupItem.vue
index 708b031..9afabda 100644
--- a/src/views/contactList/group/components/ContactListGroupItem.vue
+++ b/src/views/contactList/group/components/ContactListGroupItem.vue
@@ -1,10 +1,7 @@
 <script setup>
-// import { ref } from 'vue'
 import { ChatRound, Phone, VideoCamera } from '@element-plus/icons-vue'
 import GroupItem from '@/components/item/GroupItem.vue'
-// import { sessionShowTime } from '@/js/utils/common'
-// import router from '@/router'
-// import { messageStore } from '@/stores'
+import router from '@/router'
 
 const props = defineProps(['groupInfo', 'keyWords'])
 const emit = defineEmits(['showGroupCard'])
@@ -14,13 +11,12 @@ const onShowGroupCard = () => {
 }
 
 const goToSessionTab = () => {
-  console.log('goToSessionTab')
-  // router.push({
-  //   path: '/message',
-  //   query: {
-  //     sessionId: props.session.sessionId
-  //   }
-  // })
+  router.push({
+    path: '/message',
+    query: {
+      sessionId: props.groupInfo.groupId
+    }
+  })
 }
 </script>
 
diff --git a/src/views/message/MessageLayout.vue b/src/views/message/MessageLayout.vue
index af52ca7..e34a9a0 100644
--- a/src/views/message/MessageLayout.vue
+++ b/src/views/message/MessageLayout.vue
@@ -356,6 +356,12 @@ const pullMsg = async (mode = 0, ref = -1) => {
 const handleSelectedSession = async (sessionId) => {
   if (selectedSessionId.value !== sessionId) {
     selectedSessionId.value = sessionId
+    router.push({
+      path: '/message',
+      query: {
+        sessionId: sessionId
+      }
+    })
     initSession(sessionId)
     locateSession(sessionId)
 
@@ -600,6 +606,15 @@ watch(
   }
 )
 
+watch(
+  () => router.currentRoute.value.query.sessionId,
+  (newValue) => {
+    if (newValue) {
+      handleSelectedSession(newValue)
+    }
+  }
+)
+
 const sessionItemRefCollection = ref({})
 const setSessionItemRef = (sessionId, el) => {
   sessionItemRefCollection.value[sessionId] = el