|
@@ -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()
|
|
@@ -103,7 +103,7 @@ const initGroupId = async () => {
|
|
|
const res = await chatsStore.getCurrConversationId(getUserId.value)
|
|
|
await handleResponse(res)
|
|
|
groupId.value = res.data
|
|
|
- getAnnouncement()
|
|
|
+ memberInfo.value = await getAnnouncement();
|
|
|
await getChatList('init')
|
|
|
await getFollowStatus()
|
|
|
} catch (e) {
|
|
@@ -136,7 +136,7 @@ const getChatList = async (type = 'init') => {
|
|
|
})
|
|
|
pageNum.value = page
|
|
|
await handleResponse(res)
|
|
|
- let resList = chatsStore.handleMessageList(res.data?.data)
|
|
|
+ let resList = chatsStore.handleMessageList(res.data?.data, memberInfo.value.headImage)
|
|
|
totalCount.value = res.data.count
|
|
|
|
|
|
if (type === 'more') {
|
|
@@ -335,19 +335,16 @@ onMounted(() => {
|
|
|
watchEffect(() => {})
|
|
|
|
|
|
// 会话好友的信息
|
|
|
-async function getAnnouncement() {
|
|
|
- let { data } = await request('/website/tourMember/getOneWayMember', {
|
|
|
- query: { groupId: groupId.value }
|
|
|
- })
|
|
|
-
|
|
|
- if (Array.isArray(data) && data?.length) {
|
|
|
- data.map((el) => {
|
|
|
- if (el.partnerId == getUserId.value) {
|
|
|
- memberInfo.value = el
|
|
|
- }
|
|
|
+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) ?? {})
|
|
|
})
|
|
|
- }
|
|
|
+ })
|
|
|
}
|
|
|
+
|
|
|
// async function getAnnouncement() {
|
|
|
// let { data } = await request('/website/tourMember/getGroupUserListVo', {
|
|
|
// query: { groupId: groupId.value }
|