Merge branch 'yongpxu-dev' into develop

Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageRecord/MessageRecord.module.scss

@@ -33,25 +33,6 @@
   font-size: 12px;
   margin: 8px 0;
   position: relative;
-
-  &::before {
-    content: '';
-    position: absolute;
-    top: 50%;
-    left: 0;
-    right: 0;
-    height: 1px;
-    background: #e8e8e8;
-    z-index: 0;
-  }
-
-  &::after {
-    content: attr(data-time);
-    background: #f5f5f5;
-    padding: 0 12px;
-    position: relative;
-    z-index: 1;
-  }
 }
 
 // 消息项
@@ -235,4 +216,4 @@
     max-width: 150px;
     max-height: 150px;
   }
-}
+}

Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageRecord/index.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useRef } from "react";
-import { Avatar } from "antd";
+import { Avatar, Divider } from "antd";
 import { UserOutlined } from "@ant-design/icons";
 import { ChatRecord, ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 import { formatWechatTime } from "@/utils/common";
@@ -18,7 +18,6 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
   );
 
   useEffect(() => {
-    console.log(currentMessages);
     scrollToBottom();
   }, [currentMessages]);
 
@@ -195,7 +194,9 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
     <div className={styles.messagesContainer}>
       {groupMessagesByTime(currentMessages).map((group, groupIndex) => (
         <React.Fragment key={`group-${groupIndex}`}>
-          <div className={styles.messageTime}>{group.time}</div>
+          <Divider>
+            <div className={styles.messageTime}>{group.time}</div>
+          </Divider>
           {group.messages.map(renderMessage)}
         </React.Fragment>
       ))}

Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx

@@ -11,10 +11,11 @@ interface MessageListProps {}
 
 const MessageList: React.FC<MessageListProps> = () => {
   const { setCurrentContact, currentContract } = useWeChatStore();
-  const chatSessions = useCkChatStore(state => state.chatSessions);
+  const chatSessions = useCkChatStore(state => state.getChatSessions());
   const onContactClick = (session: ContractData | weChatGroup) => {
     setCurrentContact(session, true);
   };
+
   return (
     <div className={styles.messageList}>
       <List

Cunkebao/src/pages/pc/ckbox/data.ts

@@ -115,16 +115,19 @@ export interface weChatGroup {
   config?: {
     chat: boolean;
   };
-  labels: string[];
+  labels?: string[];
   unreadCount: number;
   notice: string;
   selfDisplyName: string;
+  wechatChatroomId: number;
+  serverId?: number;
   [key: string]: any;
 }
 
 // 联系人数据接口
 export interface ContractData {
   id?: number;
+  serverId?: number;
   wechatAccountId: number;
   wechatId: string;
   alias: string;

Cunkebao/src/pages/pc/ckbox/main.ts

@@ -233,6 +233,13 @@ export const getUniqueWechatAccountIds = (
     }
   });
 
+  // 遍历联系人列表，将每个wechatAccountId添加到Set中
+  groupList.forEach(group => {
+    if (group && group.wechatAccountId) {
+      uniqueAccountIdsSet.add(group.wechatAccountId);
+    }
+  });
+
   // 将Set转换为数组并返回
   return Array.from(uniqueAccountIdsSet);
 };