diff --git a/src/store/modules/chat/chat.js b/src/store/modules/chat/chat.js index 73a66a4..8edd291 100644 --- a/src/store/modules/chat/chat.js +++ b/src/store/modules/chat/chat.js @@ -2,7 +2,7 @@ * @Author: ch * @Date: 2022-06-07 15:41:05 * @LastEditors: ch - * @LastEditTime: 2022-06-14 14:59:41 + * @LastEditTime: 2022-06-14 15:26:44 * @Description: file content */ import * as api from '@/api/chat'; @@ -49,7 +49,7 @@ const getters = { payload = '[撤回消息]'; } else if (type === 6 || type === 1) { if (payload.customType === 'transferWaiterSession') { - let str = `${payload.fromNickname}将会话转移给了---${payload.toNickname}`; + let str = `${payload.fromNickname}将会话转移给了${payload.toNickname}`; if (payload.reason) { str += `,并留言:${payload.reason}`; } diff --git a/src/views/chat/index.vue b/src/views/chat/index.vue index eeda704..30254be 100644 --- a/src/views/chat/index.vue +++ b/src/views/chat/index.vue @@ -146,13 +146,14 @@ const store = useStore(); store.dispatch('chat/queryCurCustomerService'); const socketInit = () => { - if (!store.state.chat.curCustomerService.waiterId) { + let waiterId = store.state.chat.curCustomerService.waiterId; + if (!waiterId) { setTimeout(() => { socketInit(); }, 1000); return false; } - ImInit(store.state.chat.curCustomerService.waiterId).then(() => { + ImInit(waiterId).then(() => { Im.getSessionList(); }); }; diff --git a/src/views/chat/message.vue b/src/views/chat/message.vue index b60ec27..343e8d5 100644 --- a/src/views/chat/message.vue +++ b/src/views/chat/message.vue @@ -4,7 +4,7 @@ :class="{ [`--${messageType[props.message.type]}`]: true, '--notify': messageType[props.message.type] === 'custom' && content.type === 'transferWaiterSession', - '--self': props.message.fromId !== props.session.fromId, + '--self': props.message.fromId == $store.state.chat.curCustomerService.waiterId, }" >