diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageRecord/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageRecord/index.tsx index 3c059ad9..229f0cb2 100644 --- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageRecord/index.tsx +++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageRecord/index.tsx @@ -18,7 +18,6 @@ const MessageRecord: React.FC = ({ contract }) => { ); useEffect(() => { - console.log(currentMessages); scrollToBottom(); }, [currentMessages]); diff --git a/Cunkebao/src/pages/pc/ckbox/data.ts b/Cunkebao/src/pages/pc/ckbox/data.ts index 089d8935..1a5f14e6 100644 --- a/Cunkebao/src/pages/pc/ckbox/data.ts +++ b/Cunkebao/src/pages/pc/ckbox/data.ts @@ -119,6 +119,7 @@ export interface weChatGroup { unreadCount: number; notice: string; selfDisplyName: string; + wechatChatroomId: number; [key: string]: any; } diff --git a/Cunkebao/src/store/module/weChat/weChat.ts b/Cunkebao/src/store/module/weChat/weChat.ts index 4ab64187..fb25a99e 100644 --- a/Cunkebao/src/store/module/weChat/weChat.ts +++ b/Cunkebao/src/store/module/weChat/weChat.ts @@ -91,18 +91,10 @@ export const useWeChatStore = create()( const currentContract = useWeChatStore.getState().currentContract; //判断群还是好友 const getMessageId = - currentContract?.chatroomId || message.wechatFriendId; - const isGroup = currentContract?.chatroomId; + message?.wechatChatroomId || message.wechatFriendId; - if ( - currentContract && - currentContract.wechatAccountId == message.wechatAccountId && - currentContract.id == getMessageId - ) { - console.log("进入"); - if (isGroup) { - message.unreadCount = 1; - } + //当前选中聊天的群或好友 + if (currentContract && currentContract.id == getMessageId) { set(state => ({ currentMessages: [...state.currentMessages, message], })); @@ -113,6 +105,12 @@ export const useWeChatStore = create()( if (session) { session.unreadCount = Number(session.unreadCount) + 1; updateChatSession(session); + } else { + // 新增会话 + addChatSession({ + ...session, + unreadCount: 1, + }); } } },