|
@@ -9,7 +9,7 @@
|
|
|
<template #title>
|
|
|
<div class="text-2xl text-black-3 text-semibold flex items-center">
|
|
|
<div style="min-width: 50px; max-width: 200px" class="inline-block line-clamp-1">
|
|
|
- {{ memberInfo?.groupRemark }}
|
|
|
+ {{ groupRemark }}
|
|
|
</div>
|
|
|
<span
|
|
|
v-if="memberInfo?.isNotDisturb"
|
|
@@ -70,8 +70,8 @@
|
|
|
<script setup>
|
|
|
import ChatMessage from './components/chat-message'
|
|
|
import ChatInput from './components/chat-input'
|
|
|
-import {findHyperlinks} from '~/pages/chat/components/chat-message/link-message/handle'
|
|
|
-import {XYWebSocket} from '~/utils/XYWebSocket'
|
|
|
+import { findHyperlinks } from '~/pages/chat/components/chat-message/link-message/handle'
|
|
|
+import { XYWebSocket } from '~/utils/XYWebSocket'
|
|
|
|
|
|
const route = useRoute()
|
|
|
const router = useRouter()
|
|
@@ -83,6 +83,7 @@ const { userInfo } = storeToRefs(userInfoStore)
|
|
|
|
|
|
// 对方成员的信息
|
|
|
const memberInfo = ref({})
|
|
|
+const groupRemark = ref(route.query?.groupRemark)
|
|
|
|
|
|
// 聊天列表
|
|
|
const chatListRef = ref(null)
|
|
@@ -103,7 +104,7 @@ const initGroupId = async () => {
|
|
|
const res = await chatsStore.getCurrConversationId(getUserId.value)
|
|
|
await handleResponse(res)
|
|
|
groupId.value = res.data
|
|
|
- memberInfo.value = await getAnnouncement();
|
|
|
+ memberInfo.value = await getAnnouncement()
|
|
|
await getChatList('init')
|
|
|
await getFollowStatus()
|
|
|
} catch (e) {
|
|
@@ -339,8 +340,8 @@ const getAnnouncement = async () => {
|
|
|
return new Promise((resolve) => {
|
|
|
request('/website/tourMember/getOneWayMember', {
|
|
|
query: { groupId: groupId.value }
|
|
|
- }).then(({data = []}) => {
|
|
|
- resolve(data.find(o => o.partnerId === getUserId.value) ?? {})
|
|
|
+ }).then(({ data = [] }) => {
|
|
|
+ resolve(data.find((o) => o.partnerId === getUserId.value) ?? {})
|
|
|
})
|
|
|
})
|
|
|
}
|