From 806df16a0b5dc87fd4e3c66765660c1cca10e0ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Tue, 14 Oct 2025 14:34:50 +0800
Subject: [PATCH 01/72] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=A4=87=E6=B3=A8=E6=B6=88=E6=81=AF=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=B9=B6=E5=9C=A8=E6=B6=88=E6=81=AF=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=B8=AD=E5=A4=84=E7=90=86=E8=AF=A5=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=9B=E4=BC=98=E5=8C=96=E6=9C=AA=E8=AF=BB?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=AE=A1=E6=95=B0=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E7=A1=AE=E4=BF=9D=E6=AD=A3=E7=A1=AE=E6=98=BE=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index.module.scss                         | 24 +++++++
 .../SystemRecommendRemarkMessage/index.tsx    | 66 +++++++++++++++++++
 .../components/MessageRecord/index.tsx        |  4 ++
 .../SidebarMenu/MessageList/index.tsx         |  4 +-
 4 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/SystemRecommendRemarkMessage/index.module.scss
 create mode 100644 Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/SystemRecommendRemarkMessage/index.tsx

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/SystemRecommendRemarkMessage/index.module.scss b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/SystemRecommendRemarkMessage/index.module.scss
new file mode 100644
index 00000000..99c88d3a
--- /dev/null
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/SystemRecommendRemarkMessage/index.module.scss
@@ -0,0 +1,24 @@
+// 系统推荐备注消息样式
+.systemRecommendRemarkMessage {
+  .systemMessageText {
+    font-size: 14px;
+    font-weight: 500;
+    color: #8c8c8c;
+    line-height: 1.4;
+    word-break: break-word;
+    padding: 8px 12px;
+    border-radius: 8px;
+    max-width: 320px;
+  }
+}
+
+// 响应式设计
+@media (max-width: 768px) {
+  .systemRecommendRemarkMessage {
+    .systemMessageText {
+      font-size: 13px;
+      padding: 6px 10px;
+      max-width: 280px;
+    }
+  }
+}
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/SystemRecommendRemarkMessage/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/SystemRecommendRemarkMessage/index.tsx
new file mode 100644
index 00000000..83d8bccc
--- /dev/null
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/SystemRecommendRemarkMessage/index.tsx
@@ -0,0 +1,66 @@
+import React from "react";
+import styles from "./index.module.scss";
+import { WarningOutlined } from "@ant-design/icons";
+
+interface SystemRecommendRemarkMessageProps {
+  content: string;
+}
+
+const SystemRecommendRemarkMessage: React.FC<
+  SystemRecommendRemarkMessageProps
+> = ({ content }) => {
+  // 解析XML内容
+  const parseSystemMessage = (xmlContent: string) => {
+    try {
+      // 使用正则表达式提取关键信息
+      const templateMatch = xmlContent.match(
+        /<template><!\[CDATA\[(.*?)\]\]><\/template>/,
+      );
+      const phoneMatch = xmlContent.match(/<phone>(.*?)<\/phone>/);
+      const talkerMatch = xmlContent.match(/<talker>(.*?)<\/talker>/);
+      const remarkMatch = xmlContent.match(/<remark>(.*?)<\/remark>/);
+
+      const template = templateMatch ? templateMatch[1] : "";
+      const phone = phoneMatch ? phoneMatch[1] : "";
+      const talker = talkerMatch ? talkerMatch[1] : "";
+      const remark = remarkMatch ? remarkMatch[1] : "";
+
+      // 处理模板文本，替换占位符
+      let displayText = template;
+      if (phone) {
+        displayText = displayText.replace(/\$remark_msg_native_url\$/, phone);
+      }
+
+      return {
+        template: displayText,
+        phone,
+        talker,
+        remark,
+        hasRemark: !!remark.trim(),
+      };
+    } catch (error) {
+      console.warn("解析系统推荐备注消息失败:", error);
+      return {
+        template: "系统推荐添加备注",
+        phone: "",
+        talker: "",
+        remark: "",
+        hasRemark: false,
+      };
+    }
+  };
+
+  const messageData = parseSystemMessage(content);
+
+  return (
+    <div className={styles.systemRecommendRemarkMessage}>
+      <div className={styles.systemMessageText}>
+        <WarningOutlined style={{ fontSize: 16 }} />
+        &nbsp;
+        {messageData.template}
+      </div>
+    </div>
+  );
+};
+
+export default SystemRecommendRemarkMessage;
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
index fee0dbd3..d5dd6df1 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
@@ -6,6 +6,7 @@ import SmallProgramMessage from "./components/SmallProgramMessage";
 import VideoMessage from "./components/VideoMessage";
 import ClickMenu from "./components/ClickMeau";
 import LocationMessage from "./components/LocationMessage";
+import SystemRecommendRemarkMessage from "./components/SystemRecommendRemarkMessage/index";
 import { ChatRecord, ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 import { formatWechatTime } from "@/utils/common";
 import { getEmojiPath } from "@/components/EmojiSeclection/wechatEmoji";
@@ -277,6 +278,9 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
       case 49: // 小程序/文章/其他：图文、文件
         return <SmallProgramMessage content={content || ""} />;
 
+      case 10002: // 系统推荐备注消息
+        return <SystemRecommendRemarkMessage content={content || ""} />;
+
       default: {
         // 兼容旧版本和未知消息类型的处理逻辑
         if (typeof content !== "string" || !content.trim()) {
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index a8ec6eea..f2262519 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -14,6 +14,8 @@ const MessageList: React.FC<MessageListProps> = () => {
   const getChatSessions = useCkChatStore(state => state.chatSessions);
   const kfSelected = useCkChatStore(state => state.kfSelected);
   const onContactClick = (session: ContractData | weChatGroup) => {
+    console.log(session);
+
     setCurrentContact(session, true);
   };
   const [chatSessions, setChatSessions] = useState<
@@ -55,7 +57,7 @@ const MessageList: React.FC<MessageListProps> = () => {
             onClick={() => onContactClick(session)}
           >
             <div className={styles.messageInfo}>
-              <Badge count={session.unreadCount} size="small">
+              <Badge count={session.unreadCount || 0} size="small">
                 <Avatar
                   size={48}
                   src={session.avatar || session.chatroomAvatar}

From 892e82c1d6898955e1c89f32266ec3f62c34dab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Tue, 14 Oct 2025 15:29:17 +0800
Subject: [PATCH 02/72] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E8=AF=BB?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=AE=A1=E6=95=B0=E9=80=BB=E8=BE=91=EF=BC=9A?=
 =?UTF-8?q?=E5=B0=86=E6=9C=AA=E8=AF=BB=E6=B6=88=E6=81=AF=E8=AE=A1=E6=95=B0?=
 =?UTF-8?q?=E4=BB=8E=20session.unreadCount=20=E7=A7=BB=E5=8A=A8=E5=88=B0?=
 =?UTF-8?q?=20session.config.unreadCount=EF=BC=8C=E7=A1=AE=E4=BF=9D?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=8A=B6=E6=80=81=E6=AD=A3=E7=A1=AE=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weChat/components/SidebarMenu/MessageList/index.tsx     | 6 +++---
 Touchkebao/src/store/module/weChat/weChat.ts                | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index f2262519..45ed52cf 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -57,7 +57,7 @@ const MessageList: React.FC<MessageListProps> = () => {
             onClick={() => onContactClick(session)}
           >
             <div className={styles.messageInfo}>
-              <Badge count={session.unreadCount || 0} size="small">
+              <Badge count={session.config.unreadCount || 0} size="small">
                 <Avatar
                   size={48}
                   src={session.avatar || session.chatroomAvatar}
@@ -77,7 +77,7 @@ const MessageList: React.FC<MessageListProps> = () => {
                     {formatWechatTime(session?.lastUpdateTime)}
                   </div>
                 </div>
-                <div className={styles.messageContent}>
+                {/* <div className={styles.messageContent}>
                   <div
                     className={styles.lastMessage}
                     data-count={
@@ -88,7 +88,7 @@ const MessageList: React.FC<MessageListProps> = () => {
                   >
                     {session?.lastMessage}
                   </div>
-                </div>
+                </div> */}
               </div>
             </div>
           </List.Item>
diff --git a/Touchkebao/src/store/module/weChat/weChat.ts b/Touchkebao/src/store/module/weChat/weChat.ts
index 5290b5eb..5ef7f24e 100644
--- a/Touchkebao/src/store/module/weChat/weChat.ts
+++ b/Touchkebao/src/store/module/weChat/weChat.ts
@@ -317,7 +317,7 @@ export const useWeChatStore = create<WeChatState>()(
           const chatSessions = useCkChatStore.getState().chatSessions;
           const session = chatSessions.find(item => item.id == getMessageId);
           if (session) {
-            session.unreadCount = Number(session.unreadCount) + 1;
+            session.config.unreadCount = Number(session.config.unreadCount) + 1;
             updateChatSession(session);
             // 将接收到新消息的会话置顶到列表顶部
             pinChatSessionToTop(getMessageId);
@@ -328,7 +328,7 @@ export const useWeChatStore = create<WeChatState>()(
               if (group) {
                 addChatSession({
                   ...group,
-                  unreadCount: 1,
+                  config: { unreadCount: 1 },
                 });
                 // 新创建的会话会自动添加到列表顶部，无需额外置顶
               }
@@ -336,7 +336,7 @@ export const useWeChatStore = create<WeChatState>()(
               const [user] = await contractService.findByIds(getMessageId);
               addChatSession({
                 ...user,
-                unreadCount: 1,
+                config: { unreadCount: 1 },
               });
               // 新创建的会话会自动添加到列表顶部，无需额外置顶
             }

From da63930f5ed552a429762038637152adff6961dd Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Tue, 14 Oct 2025 17:03:05 +0800
Subject: [PATCH 03/72] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/AccountController.php      |  63 +++--
 .../controller/WechatChatroomController.php   |  83 +++----
 Server/application/common.php                 |  32 +++
 Server/application/cunkebao/config/route.php  |   6 +-
 .../cunkebao/controller/RFMController.php     |  55 +++++
 .../cunkebao/controller/TrafficController.php |  68 ++++++
 ...PotentialListWithInCompanyV1Controller.php |  32 ---
 .../application/job/WorkbenchMomentsJob.php   | 216 +++++++++++-------
 .../Adapters/ChuKeBao/Adapter.php             |   2 +-
 9 files changed, 369 insertions(+), 188 deletions(-)
 create mode 100644 Server/application/cunkebao/controller/RFMController.php
 create mode 100644 Server/application/cunkebao/controller/TrafficController.php

diff --git a/Server/application/api/controller/AccountController.php b/Server/application/api/controller/AccountController.php
index f239be00..02281e17 100644
--- a/Server/application/api/controller/AccountController.php
+++ b/Server/application/api/controller/AccountController.php
@@ -62,9 +62,7 @@ class AccountController extends BaseController
 
             // 保存数据到数据库
             if (!empty($response['results'])) {
-                foreach ($response['results'] as $item) {
-                    $this->saveAccount($item);
-                }
+                $this->saveAccount($response['results']);
             }
 
             if ($isInner) {
@@ -703,42 +701,41 @@ class AccountController extends BaseController
      * 保存账号数据到数据库
      * @param array $item 账号数据
      */
-    private function saveAccount($item)
+    private function saveAccount($data)
     {
         // 将日期时间字符串转换为时间戳
         $createTime = isset($item['createTime']) ? strtotime($item['createTime']) : null;
         $deleteTime = isset($item['deleteTime']) ? strtotime($item['deleteTime']) : null;
+        $sqlData = [];
+        foreach ($data as $item) {
+            $sqlData[] = [
+                'id' => $item['id'],
+                'accountType' => isset($item['accountType']) ? $item['accountType'] : 0,
+                'status' => isset($item['status']) ? $item['status'] : 0,
+                'tenantId' => isset($item['tenantId']) ? $item['tenantId'] : 0,
+                'userName' => isset($item['userName']) ? $item['userName'] : '',
+                'realName' => isset($item['realName']) ? $item['realName'] : '',
+                'nickname' => isset($item['nickname']) ? $item['nickname'] : '',
+                'avatar' => isset($item['avatar']) ? $item['avatar'] : '',
+                'phone' => isset($item['phone']) ? $item['phone'] : '',
+                'memo' => isset($item['memo']) ? $item['memo'] : '',
+                'createTime' => $createTime,
+                'creator' => isset($item['creator']) ? $item['creator'] : 0,
+                'creatorUserName' => isset($item['creatorUserName']) ? $item['creatorUserName'] : '',
+                'creatorRealName' => isset($item['creatorRealName']) ? $item['creatorRealName'] : '',
+                'departmentId' => isset($item['departmentId']) ? $item['departmentId'] : 0,
+                'departmentName' => isset($item['departmentName']) ? $item['departmentName'] : '',
+                'privilegeIds' => isset($item['privilegeIds']) ? json_encode($item['privilegeIds']) : json_encode([]),
+                'alive' => isset($item['alive']) ? $item['alive'] : false,
+                'hasXiakeAccount' => isset($item['hasXiakeAccount']) ? $item['hasXiakeAccount'] : false,
+                'isDeleted' => isset($item['isDeleted']) ? $item['isDeleted'] : false,
+                'deleteTime' => $deleteTime
+            ];
+        }
 
-        $data = [
-            'id' => $item['id'],
-            'accountType' => isset($item['accountType']) ? $item['accountType'] : 0,
-            'status' => isset($item['status']) ? $item['status'] : 0,
-            'tenantId' => isset($item['tenantId']) ? $item['tenantId'] : 0,
-            'userName' => isset($item['userName']) ? $item['userName'] : '',
-            'realName' => isset($item['realName']) ? $item['realName'] : '',
-            'nickname' => isset($item['nickname']) ? $item['nickname'] : '',
-            'avatar' => isset($item['avatar']) ? $item['avatar'] : '',
-            'phone' => isset($item['phone']) ? $item['phone'] : '',
-            'memo' => isset($item['memo']) ? $item['memo'] : '',
-            'createTime' => $createTime,
-            'creator' => isset($item['creator']) ? $item['creator'] : 0,
-            'creatorUserName' => isset($item['creatorUserName']) ? $item['creatorUserName'] : '',
-            'creatorRealName' => isset($item['creatorRealName']) ? $item['creatorRealName'] : '',
-            'departmentId' => isset($item['departmentId']) ? $item['departmentId'] : 0,
-            'departmentName' => isset($item['departmentName']) ? $item['departmentName'] : '',
-            'privilegeIds' => isset($item['privilegeIds']) ? json_encode($item['privilegeIds']) : json_encode([]),
-            'alive' => isset($item['alive']) ? $item['alive'] : false,
-            'hasXiakeAccount' => isset($item['hasXiakeAccount']) ? $item['hasXiakeAccount'] : false,
-            'isDeleted' => isset($item['isDeleted']) ? $item['isDeleted'] : false,
-            'deleteTime' => $deleteTime
-        ];
 
         // 使用tenantId作为唯一性判断
-        $account = CompanyAccountModel::where('id', $item['id'])->find();
-        if ($account) {
-            $account->save($data);
-        } else {
-            CompanyAccountModel::create($data);
-        }
+        $account = new CompanyAccountModel();
+        $account->saveAll($account);
     }
 } 
\ No newline at end of file
diff --git a/Server/application/api/controller/WechatChatroomController.php b/Server/application/api/controller/WechatChatroomController.php
index 744ad822..af43bfe5 100644
--- a/Server/application/api/controller/WechatChatroomController.php
+++ b/Server/application/api/controller/WechatChatroomController.php
@@ -54,11 +54,9 @@ class WechatChatroomController extends BaseController
             // 保存数据到数据库
             if (!empty($response['results'])) {
                 $isUpdate = false;
-                foreach ($response['results'] as $item) {
-                    $updated = $this->saveChatroom($item);
-                    if($updated && $isDel == 0){
-                        $isUpdate = true;
-                    }
+                $updated = $this->saveChatroom($response['results']);
+                if($updated && $isDel == 0){
+                    $isUpdate = true;
                 }
             }
 
@@ -80,44 +78,51 @@ class WechatChatroomController extends BaseController
      * 保存群聊数据到数据库
      * @param array $item 群聊数据
      */
-    private function saveChatroom($item)
+    private function saveChatroom($data)
     {
-        $data = [
-            'id' => $item['id'],
-            'wechatAccountId' => $item['wechatAccountId'],
-            'wechatAccountAlias' => $item['wechatAccountAlias'],
-            'wechatAccountWechatId' => $item['wechatAccountWechatId'],
-            'wechatAccountAvatar' => $item['wechatAccountAvatar'],
-            'wechatAccountNickname' => $item['wechatAccountNickname'],
-            'chatroomId' => $item['chatroomId'],
-            'hasMe' => $item['hasMe'],
-            'chatroomOwnerNickname' => isset($item['chatroomOwnerNickname']) ? $item['chatroomOwnerNickname'] : '',
-            'chatroomOwnerAvatar' => isset($item['chatroomOwnerAvatar']) ? $item['chatroomOwnerAvatar'] : '',
-            'conRemark' => isset($item['conRemark']) ? $item['conRemark'] : '',
-            'nickname' => isset($item['nickname']) ? $item['nickname'] : '',
-            'pyInitial' => isset($item['pyInitial']) ? $item['pyInitial'] : '',
-            'quanPin' => isset($item['quanPin']) ? $item['quanPin'] : '',
-            'chatroomAvatar' => isset($item['chatroomAvatar']) ? $item['chatroomAvatar'] : '',
-            'members' => is_array($item['members']) ? json_encode($item['members']) : json_encode([]),
-            'isDeleted' => isset($item['isDeleted']) ? $item['isDeleted'] : 0,
-            'deleteTime' => !empty($item['isDeleted']) ? strtotime($item['deleteTime']) : 0,
-            'createTime' => isset($item['createTime']) ? strtotime($item['createTime']) : 0,
-            'accountId' => isset($item['accountId']) ? $item['accountId'] : 0,
-            'accountUserName' => isset($item['accountUserName']) ? $item['accountUserName'] : '',   
-            'accountRealName' => isset($item['accountRealName']) ? $item['accountRealName'] : '',
-            'accountNickname' => isset($item['accountNickname']) ? $item['accountNickname'] : '',
-            'groupId' => isset($item['groupId']) ? $item['groupId'] : 0,
-            'updateTime' => time()
-        ];
+
+        $sqlData = [];
+        foreach ($data as $item) {
+            $sqlData[] = [
+                'id' => $item['id'],
+                'wechatAccountId' => $item['wechatAccountId'],
+                'wechatAccountAlias' => $item['wechatAccountAlias'],
+                'wechatAccountWechatId' => $item['wechatAccountWechatId'],
+                'wechatAccountAvatar' => $item['wechatAccountAvatar'],
+                'wechatAccountNickname' => $item['wechatAccountNickname'],
+                'chatroomId' => $item['chatroomId'],
+                'hasMe' => $item['hasMe'],
+                'chatroomOwnerNickname' => isset($item['chatroomOwnerNickname']) ? $item['chatroomOwnerNickname'] : '',
+                'chatroomOwnerAvatar' => isset($item['chatroomOwnerAvatar']) ? $item['chatroomOwnerAvatar'] : '',
+                'conRemark' => isset($item['conRemark']) ? $item['conRemark'] : '',
+                'nickname' => isset($item['nickname']) ? $item['nickname'] : '',
+                'pyInitial' => isset($item['pyInitial']) ? $item['pyInitial'] : '',
+                'quanPin' => isset($item['quanPin']) ? $item['quanPin'] : '',
+                'chatroomAvatar' => isset($item['chatroomAvatar']) ? $item['chatroomAvatar'] : '',
+                'members' => is_array($item['members']) ? json_encode($item['members']) : json_encode([]),
+                'isDeleted' => isset($item['isDeleted']) ? $item['isDeleted'] : 0,
+                'deleteTime' => !empty($item['isDeleted']) ? strtotime($item['deleteTime']) : 0,
+                'createTime' => isset($item['createTime']) ? strtotime($item['createTime']) : 0,
+                'accountId' => isset($item['accountId']) ? $item['accountId'] : 0,
+                'accountUserName' => isset($item['accountUserName']) ? $item['accountUserName'] : '',
+                'accountRealName' => isset($item['accountRealName']) ? $item['accountRealName'] : '',
+                'accountNickname' => isset($item['accountNickname']) ? $item['accountNickname'] : '',
+                'groupId' => isset($item['groupId']) ? $item['groupId'] : 0,
+                'updateTime' => time()
+            ];
+        }
 
         // 使用chatroomId和wechatAccountId的组合作为唯一性判断
-        $chatroom = WechatChatroomModel::where('id',$item['id'])->find();
-
+        $chatroom = new WechatChatroomModel();
+        $chatroom->saveAll($sqlData);
         if ($chatroom) {
-            $chatroom->save($data);
-            return true;
-        } else {
-            WechatChatroomModel::create($data);
+            if ($chatroom->isUpdate()){
+                return true;
+            }else{
+                return false;
+            }
+
+        }else{
             return false;
         }
 
diff --git a/Server/application/common.php b/Server/application/common.php
index 3f0239ca..37a12739 100644
--- a/Server/application/common.php
+++ b/Server/application/common.php
@@ -488,6 +488,38 @@ if (!function_exists('getUserAction')) {
     }
 }
 
+if (!function_exists('formatRelativeTime')) {
+    /**
+     * 将时间戳格式化为相对时间（中文）
+     * 例：半年前 / 1个月前 / 3周前 / 1天前 / 5小时前 / 5分钟前 / 刚刚
+     * @param int $timestamp Unix 时间戳（秒）
+     * @return string
+     */
+    function formatRelativeTime($timestamp)
+    {
+        if (empty($timestamp) || !is_numeric($timestamp)) {
+            return '';
+        }
+        $now = time();
+        $diff = max(0, $now - (int)$timestamp);
+
+        $minute = 60;
+        $hour = 60 * $minute;
+        $day = 24 * $hour;
+        $week = 7 * $day;
+        $month = 30 * $day; // 近似
+        $halfYear = 6 * $month; // 近似
+
+        if ($diff >= $halfYear) return '半年前';
+        if ($diff >= $month)   return floor($diff / $month) . '个月前';
+        if ($diff >= $week)    return floor($diff / $week) . '周前';
+        if ($diff >= $day)     return floor($diff / $day) . '天前';
+        if ($diff >= $hour)    return floor($diff / $hour) . '小时前';
+        if ($diff >= $minute)  return floor($diff / $minute) . '分钟前';
+        return '刚刚';
+    }
+}
+
 
 if (!function_exists('exit_data')) {
 
diff --git a/Server/application/cunkebao/config/route.php b/Server/application/cunkebao/config/route.php
index 1843f07b..02519844 100644
--- a/Server/application/cunkebao/config/route.php
+++ b/Server/application/cunkebao/config/route.php
@@ -62,14 +62,18 @@ Route::group('v1/', function () {
 
     // 流量池相关
     Route::group('traffic/pool', function () {
+        Route::get('getPackage', 'app\cunkebao\controller\TrafficController@getPackage');
+
+
         Route::get('', 'app\cunkebao\controller\traffic\GetPotentialListWithInCompanyV1Controller@index');
         Route::get('getUserJourney', 'app\cunkebao\controller\traffic\GetPotentialListWithInCompanyV1Controller@getUserJourney');
         Route::get('getUserTags', 'app\cunkebao\controller\traffic\GetPotentialListWithInCompanyV1Controller@getUserTags');
         Route::get('getUserInfo', 'app\cunkebao\controller\traffic\GetPotentialListWithInCompanyV1Controller@getUser');
-        Route::get('getPackage', 'app\cunkebao\controller\traffic\GetPotentialListWithInCompanyV1Controller@getPackage');
         Route::post('addPackage', 'app\cunkebao\controller\traffic\GetPotentialListWithInCompanyV1Controller@addPackage');
 
 
+
+
         Route::get('converted', 'app\cunkebao\controller\traffic\GetConvertedListWithInCompanyV1Controller@index');
         Route::get('types', 'app\cunkebao\controller\traffic\GetPotentialTypeSectionV1Controller@index');
         Route::get('sources', 'app\cunkebao\controller\traffic\GetTrafficSourceSectionV1Controller@index');
diff --git a/Server/application/cunkebao/controller/RFMController.php b/Server/application/cunkebao/controller/RFMController.php
new file mode 100644
index 00000000..d6f0b42e
--- /dev/null
+++ b/Server/application/cunkebao/controller/RFMController.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace app\cunkebao\controller;
+
+class RFMController extends BaseController
+{
+    /**
+     * 计算 RFM 评分（默认规则）
+     * @param int|null $recencyDays 最近购买天数
+     * @param int $frequency 购买次数
+     * @param float $monetary 购买金额
+     * @return array{R:int,F:int,M:int}
+     */
+    public static function calcRfmScores($recencyDays, $frequency, $monetary)
+    {
+        $recencyDays = is_numeric($recencyDays) ? (int)$recencyDays : 9999;
+        $frequency = max(0, (int)$frequency);
+        $monetary = max(0, (float)$monetary);
+        return [
+            'R' => self::scoreR_Default($recencyDays),
+            'F' => self::scoreF_Default($frequency),
+            'M' => self::scoreM_Default($monetary),
+        ];
+    }
+
+    // 默认规则
+    protected static function scoreR_Default(int $days): int
+    {
+        if ($days <= 30) return 5;
+        if ($days <= 60) return 4;
+        if ($days <= 90) return 3;
+        if ($days <= 120) return 2;
+        return 1;
+    }
+    protected static function scoreF_Default(int $times): int
+    {
+        if ($times >= 10) return 5;
+        if ($times >= 6) return 4;
+        if ($times >= 3) return 3;
+        if ($times >= 2) return 2;
+        if ($times >= 1) return 1;
+        return 0;
+    }
+    protected static function scoreM_Default(float $amount): int
+    {
+        if ($amount >= 2000) return 5;
+        if ($amount >= 1000) return 4;
+        if ($amount >= 500) return 3;
+        if ($amount >= 200) return 2;
+        if ($amount > 0) return 1;
+        return 0;
+    }
+}
+
+
diff --git a/Server/application/cunkebao/controller/TrafficController.php b/Server/application/cunkebao/controller/TrafficController.php
new file mode 100644
index 00000000..4dfa1441
--- /dev/null
+++ b/Server/application/cunkebao/controller/TrafficController.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace app\cunkebao\controller;
+
+use library\ResponseHelper;
+use think\Db;
+use app\cunkebao\controller\RFMController;
+
+class TrafficController extends BaseController
+{
+
+    public function getPackage()
+    {
+
+        $page = $this->request->param('page', 1);
+        $limit = $this->request->param('limit', 10);
+        $keyword = $this->request->param('keyword', '');
+
+        $companyId = $this->getUserInfo('companyId');
+        $package = Db::name('traffic_source_package')->alias('tsp')
+            ->join('traffic_source_package_item tspi', 'tspi.packageId=tsp.id', 'left')
+            ->whereIn('tsp.companyId', [$companyId, 0])
+            ->field('tsp.id,tsp.name,tsp.description,tsp.pic,tsp.isSys as type,tsp.createTime,count(tspi.id) as num')
+            ->group('tsp.id');
+
+        if (!empty($keyword)) {
+            $package->where('tsp.name|tsp.description', 'like', '%' . $keyword . '%');
+        }
+
+        $list = $package->page($page, $limit)->order('isSys ASC,id DESC')->select();
+        $total = $package->count();
+
+        $rfmRule = 'default';
+        foreach ($list as $k => &$v) {
+            if ($v['type'] != 1) {
+                $v['createTime'] = !empty($v['createTime']) ? formatRelativeTime($v['createTime']) : '';
+            }else{
+                $v['createTime'] = '';
+            }
+
+            // RFM 评分（示例：以创建时间近似最近活跃，num 近似频次；金额若无则为 0）
+            $recencyDays = isset($v['createTime']) && is_numeric($v['createTime']) ? floor((time() - (int)$v['createTime']) / 86400) : null;
+            // 如果上方被格式化为文本，则尝试从原始结果集取原值
+            if (!is_numeric($recencyDays) || $recencyDays === null) {
+                $rawCreate = isset($list[$k]['createTime']) ? $list[$k]['createTime'] : null;
+                $recencyDays = is_numeric($rawCreate) ? floor((time() - (int)$rawCreate) / 86400) : 9999;
+            }
+            $frequency = (int)($v['num'] ?? 0);
+            $monetary = (float)($v['monetary'] ?? 0);
+
+            $scores = RFMController::calcRfmScores($recencyDays, $frequency, $monetary);
+            $v['R'] = $scores['R'];
+            $v['F'] = $scores['F'];
+            $v['M'] = $scores['M'];
+            $v['RFM'] = $scores['R'] + $scores['F'] + $scores['M'];
+
+        }
+        unset($v);
+
+        $data = [
+            'total' => $total,
+            'list' => $list,
+        ];
+
+        return ResponseHelper::success($data);
+    }
+
+}
\ No newline at end of file
diff --git a/Server/application/cunkebao/controller/traffic/GetPotentialListWithInCompanyV1Controller.php b/Server/application/cunkebao/controller/traffic/GetPotentialListWithInCompanyV1Controller.php
index 84137be8..434a1281 100644
--- a/Server/application/cunkebao/controller/traffic/GetPotentialListWithInCompanyV1Controller.php
+++ b/Server/application/cunkebao/controller/traffic/GetPotentialListWithInCompanyV1Controller.php
@@ -359,39 +359,7 @@ class GetPotentialListWithInCompanyV1Controller extends BaseController
     }
 
 
-    public function getPackage()
-    {
 
-        $page = $this->request->param('page', 1);
-        $limit = $this->request->param('limit', 10);
-        $keyword = $this->request->param('keyword', '');
-
-        $companyId = $this->getUserInfo('companyId');
-        $package = Db::name('traffic_source_package')->alias('tsp')
-            ->join('traffic_source_package_item tspi', 'tspi.packageId=tsp.id', 'left')
-            ->whereIn('tsp.companyId', [$companyId, 0])
-            ->field('tsp.id,tsp.name,tsp.description,tsp.createTime,count(tspi.id) as num')
-            ->group('tsp.id');
-
-        if (!empty($keyword)) {
-            $package->where('tsp.name|tsp.description', 'like', '%' . $keyword . '%');
-        }
-
-        $list = $package->page($page, $limit)->select();
-        $total = $package->count();
-
-        foreach ($list as $k => &$v) {
-            $v['createTime'] = !empty($v['createTime']) ? date('Y-m-d H:i:s', $v['createTime']) : '';
-        }
-        unset($v);
-
-        $data = [
-            'total' => $total,
-            'list' => $list,
-        ];
-
-        return ResponseHelper::success($data);
-    }
 
 
     public function addPackage()
diff --git a/Server/application/job/WorkbenchMomentsJob.php b/Server/application/job/WorkbenchMomentsJob.php
index 4d82739c..6a3bb474 100644
--- a/Server/application/job/WorkbenchMomentsJob.php
+++ b/Server/application/job/WorkbenchMomentsJob.php
@@ -108,93 +108,33 @@ class WorkbenchMomentsJob
     public function execute2()
     {
         try {
-            // 每日重置发送次数（允许10分钟误差）
-            $now = time();
-            $todayStart = strtotime(date('Y-m-d 00:00:00'));
-            if ($now - $todayStart >= 0 && $now - $todayStart <= 600) {
-                $cacheKey = 'moments_settings_reset_' . date('Ymd');
-                if (!Cache::has($cacheKey)) {
-                    Db::table('ck_kf_moments_settings')->where('sendNum', '<>', 0)
-                        ->update(['sendNum' => 0, 'updateTime' => $now]);
-                    Cache::set($cacheKey, 1, 7200); // 2小时缓存，防止重复重置
-                }
-            }
-            // 获取所有工作台
-            $kfMoments = KfMoments::where(['isSend' => 0, 'isDel' => 0])->where('sendTime', '<=', time() + 120)->order('id desc')->select();
+            // 1) 每日重置
+            $this->resetDailyCountersIfNeeded();
+
+            // 2) 获取发送窗口内的任务
+            [$nowTs, $kfMoments] = $this->getWindowTasks();
             foreach ($kfMoments as $val) {
-                $sendData = json_decode($val->sendData,true);
-                $endTime = strtotime($sendData['endTime']);
-                if ($endTime <= time() + 1800){
-                    $endTime = time() + 3600;
-                    $sendData['endTime'] = date('Y-m-d H:i:s', $endTime);
-                }
-                switch ($sendData['momentContentType']) {
-                    case 1:
-                        $sendData['link'] = ['image' => ''];
-                        $sendData['picUrlList'] = [];
-                        $sendData['videoUrl'] = '';
-                        break;
-                    case 2:
-                        $sendData['link'] = ['image' => ''];
-                        $sendData['videoUrl'] = '';
-                        break;
-                    case 3:
-                        $sendData['link'] = ['image' => ''];
-                        $sendData['picUrlList'] = [];
-                        break;
-                    case 4:
-                        $sendData['picUrlList'] = [];
-                        $sendData['videoUrl'] = '';
-                        break;
-                    default:
-                        $sendData['link'] = ['image' => ''];
-                        $sendData['picUrlList'] = [];
-                        $sendData['videoUrl'] = '';
-                        break;
-                }
+                $companyId = (int)($val['companyId'] ?? 0);
+                $userId = (int)($val['userId'] ?? 0);
+
+                // 2.1) 数据规范化
+                $sendData = json_decode($val->sendData, true);
+                $sendData = $this->normalizeSendData($sendData);
+
+                // 2.2) 账号额度过滤
+                $items = $sendData['jobPublishWechatMomentsItems'] ?? [];
+                if (empty($items)) { continue; }
+                $allowed = $this->filterAccountsByQuota($companyId, $userId, $items);
+                if (empty($allowed)) { continue; }
+                $sendData['jobPublishWechatMomentsItems'] = $allowed;
+
+                // 3) 下发
                 $moments = new Moments();
                 $moments->addJob($sendData);
                 KfMoments::where(['id' => $val['id']])->update(['isSend' => 1]);
 
-                // 统计发送次数（ck_kf_moments_settings）
-                try {
-                    $nowTs = time();
-                    $companyId = (int)($val['companyId'] ?? 0);
-                    $userId = (int)($val['userId'] ?? 0);
-                    $items = $sendData['jobPublishWechatMomentsItems'] ?? [];
-                    foreach ($items as $it) {
-                        $wechatId = (int)($it['wechatAccountId'] ?? 0);
-                        if ($wechatId <= 0) { continue; }
-
-                        $cond = [
-                            'companyId' => $companyId,
-                            'userId' => $userId,
-                            'wechatId' => $wechatId,
-                        ];
-
-                        $setting = Db::table('ck_kf_moments_settings')->where($cond)->find();
-                        if ($setting) {
-                            Db::table('ck_kf_moments_settings')
-                                ->where('id', $setting['id'])
-                                ->update([
-                                    'sendNum' => Db::raw('sendNum + 1'),
-                                    'updateTime' => $nowTs,
-                                ]);
-                        } else {
-                            Db::table('ck_kf_moments_settings')->insert([
-                                'companyId' => $companyId,
-                                'userId' => $userId,
-                                'wechatId' => $wechatId,
-                                'max' => 5,
-                                'sendNum' => 1,
-                                'createTime' => $nowTs,
-                                'updateTime' => $nowTs,
-                            ]);
-                        }
-                    }
-                } catch (\Throwable $statE) {
-                    Log::error('朋友圈发送统计失败: ' . $statE->getMessage());
-                }
+                // 4) 统计
+                $this->incrementSendStats($companyId, $userId, $allowed);
             }
         } catch (\Exception $e) {
             Log::error("朋友圈同步任务异常: " . $e->getMessage());
@@ -202,6 +142,118 @@ class WorkbenchMomentsJob
         }
     }
 
+    protected function resetDailyCountersIfNeeded()
+    {
+        $now = time();
+        $todayStart = strtotime(date('Y-m-d 00:00:00'));
+        if ($now - $todayStart >= 0 && $now - $todayStart <= 600) {
+            $cacheKey = 'moments_settings_reset_' . date('Ymd');
+            if (!Cache::has($cacheKey)) {
+                Db::table('ck_kf_moments_settings')->where('sendNum', '<>', 0)
+                    ->update(['sendNum' => 0, 'updateTime' => $now]);
+                Cache::set($cacheKey, 1, 7200);
+            }
+        }
+    }
+
+    protected function getWindowTasks()
+    {
+        $nowTs = time();
+        $windowStart = $nowTs - 300;
+        $windowEnd = $nowTs + 300;
+        $kfMoments = KfMoments::where(['isSend' => 0, 'isDel' => 0])
+            ->whereBetween('sendTime', [$windowStart, $windowEnd])
+            ->order('id desc')->select();
+        return [$nowTs, $kfMoments];
+    }
+
+    protected function normalizeSendData(array $sendData)
+    {
+        $endTime = strtotime($sendData['endTime'] ?? '');
+        if ($endTime <= time() + 1800) {
+            $endTime = time() + 3600;
+            $sendData['endTime'] = date('Y-m-d H:i:s', $endTime);
+        }
+        switch ($sendData['momentContentType'] ?? 1) {
+            case 1:
+                $sendData['link'] = ['image' => ''];
+                $sendData['picUrlList'] = [];
+                $sendData['videoUrl'] = '';
+                break;
+            case 2:
+                $sendData['link'] = ['image' => ''];
+                $sendData['videoUrl'] = '';
+                break;
+            case 3:
+                $sendData['link'] = ['image' => ''];
+                $sendData['picUrlList'] = [];
+                break;
+            case 4:
+                $sendData['picUrlList'] = [];
+                $sendData['videoUrl'] = '';
+                break;
+            default:
+                $sendData['link'] = ['image' => ''];
+                $sendData['picUrlList'] = [];
+                $sendData['videoUrl'] = '';
+                break;
+        }
+        return $sendData;
+    }
+
+    protected function filterAccountsByQuota(int $companyId, int $userId, array $items)
+    {
+        $wechatIds = array_values(array_filter(array_map(function($it){ return (int)($it['wechatAccountId'] ?? 0); }, $items)));
+        if (empty($wechatIds)) { return []; }
+        $settings = Db::table('ck_kf_moments_settings')
+            ->where('companyId', $companyId)
+            ->where('userId', $userId)
+            ->whereIn('wechatId', $wechatIds)
+            ->column('id,max,sendNum', 'wechatId');
+        $allowed = [];
+        foreach ($items as $it) {
+            $wid = (int)($it['wechatAccountId'] ?? 0);
+            if ($wid <= 0) { continue; }
+            if (isset($settings[$wid])) {
+                $max = (int)$settings[$wid]['max'];
+                $sent = (int)$settings[$wid]['sendNum'];
+                if ($sent < ($max > 0 ? $max : 5)) { $allowed[] = $it; }
+            } else {
+                $allowed[] = $it;
+            }
+        }
+        return $allowed;
+    }
+
+    protected function incrementSendStats(int $companyId, int $userId, array $items)
+    {
+        try {
+            $nowTs = time();
+            foreach ($items as $it) {
+                $wechatId = (int)($it['wechatAccountId'] ?? 0);
+                if ($wechatId <= 0) { continue; }
+                $cond = ['companyId' => $companyId, 'userId' => $userId, 'wechatId' => $wechatId];
+                $setting = Db::table('ck_kf_moments_settings')->where($cond)->find();
+                if ($setting) {
+                    Db::table('ck_kf_moments_settings')->where('id', $setting['id'])
+                        ->update(['sendNum' => Db::raw('sendNum + 1'), 'updateTime' => $nowTs]);
+                } else {
+                    Db::table('ck_kf_moments_settings')->insert([
+                        'companyId' => $companyId,
+                        'userId' => $userId,
+                        'wechatId' => $wechatId,
+                        'max' => 5,
+                        'sendNum' => 1,
+                        'createTime' => $nowTs,
+                        'updateTime' => $nowTs,
+                    ]);
+                }
+            }
+        } catch (\Throwable $e) {
+            Log::error('朋友圈发送统计失败: ' . $e->getMessage());
+        }
+    }
+
 
     /**
      * 处理内容发送
diff --git a/Server/extend/WeChatDeviceApi/Adapters/ChuKeBao/Adapter.php b/Server/extend/WeChatDeviceApi/Adapters/ChuKeBao/Adapter.php
index 7c347c42..08f720ea 100644
--- a/Server/extend/WeChatDeviceApi/Adapters/ChuKeBao/Adapter.php
+++ b/Server/extend/WeChatDeviceApi/Adapters/ChuKeBao/Adapter.php
@@ -157,7 +157,7 @@ class Adapter implements WeChatServiceInterface
     {
         $task = Db::name('customer_acquisition_task')
             ->where(['status' => 1, 'deleteTime' => 0])
-            ->whereRaw("id % $process_count_for_status_0 = {$current_worker_id}")
+          /*  ->whereRaw("id % $process_count_for_status_0 = {$current_worker_id}")*/
             ->order('id desc')
             ->select();
 

From 8908da5baf0c49420756c5bae4addbfdfb95699d Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Tue, 14 Oct 2025 17:45:03 +0800
Subject: [PATCH 04/72] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Server/application/common/TaskServer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Server/application/common/TaskServer.php b/Server/application/common/TaskServer.php
index 5af9303e..8684c42c 100644
--- a/Server/application/common/TaskServer.php
+++ b/Server/application/common/TaskServer.php
@@ -71,8 +71,8 @@ class TaskServer extends Server
             });
         }
 
-        // 3个进程处理获客新任务
-        if ($current_worker_id < 3) {
+        // 进程处理获客新任务
+        if ($current_worker_id  == 2) {
             Timer::add(1, function () use ($current_worker_id, $process_count_for_status_0, $adapter) {
                 $adapter->handleCustomerTaskWithStatusIsNew($current_worker_id, $process_count_for_status_0);
             });

From 811ebff52f3cbc87fa0f5048416e08ec02e3fd04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Tue, 14 Oct 2025 18:13:38 +0800
Subject: [PATCH 05/72] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=BC=E8=88=AA=E7=BB=84=E4=BB=B6=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E5=92=8C=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BE=AE=E4=BF=A1=E9=A1=B5=E9=9D=A2=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E9=80=BB=E8=BE=91=EF=BC=8C=E7=A7=BB=E9=99=A4ProfileCa?=
 =?UTF-8?q?rd=E7=BB=84=E4=BB=B6=E4=B8=AD=E7=9A=84=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pc/ckbox/components/NavCommon/index.tsx   | 28 ++++++++++-------
 Touchkebao/src/pages/pc/ckbox/data.ts         |  2 ++
 .../powerCenter/content-management/index.tsx  | 31 +------------------
 .../components/ProfileCard/index.tsx          |  1 -
 .../src/pages/pc/ckbox/weChat/index.tsx       |  6 ++--
 5 files changed, 23 insertions(+), 45 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.tsx b/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.tsx
index 8c7f13ad..dedc91e3 100644
--- a/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.tsx
@@ -16,7 +16,8 @@ import {
   LogoutOutlined,
   ThunderboltOutlined,
   SettingOutlined,
-  WechatOutlined,
+  CalendarOutlined,
+  RetweetOutlined,
 } from "@ant-design/icons";
 import { noticeList, readMessage, readAll } from "./api";
 import { useUserStore } from "@/store/module/user";
@@ -64,8 +65,8 @@ const NavCommon: React.FC<NavCommonProps> = ({ title = "触客宝" }) => {
   }, []);
 
   // 处理菜单图标点击：在两个路由之间切换
-  const handleMenuClick = (index: number) => {
-    if (index === 0) {
+  const handleMenuClick = () => {
+    if (!location.pathname.startsWith("/pc/powerCenter")) {
       navigate("/pc/powerCenter");
     } else {
       navigate("/pc/weChat");
@@ -205,24 +206,27 @@ const NavCommon: React.FC<NavCommonProps> = ({ title = "触客宝" }) => {
       onClick: handleLogout,
     },
   ];
-
+  const handleContentManagementClick = () => {
+    navigate("/pc/powerCenter/content-management");
+  };
   return (
     <>
       <Header className={styles.header}>
         <div className={styles.headerLeft}>
           <Button
-            icon={<BarChartOutlined />}
-            type={!isWeChat() ? "primary" : "default"}
-            onClick={() => handleMenuClick(0)}
+            icon={<BarChartOutlined style={{ fontSize: 18 }} />}
+            type="primary"
+            onClick={handleMenuClick}
           >
-            功能中心
+            切换到{isWeChat() ? "功能中心" : "Ai智能客服"}
+            <RetweetOutlined style={{ fontSize: 18 }} />
           </Button>
+
           <Button
-            icon={<WechatOutlined />}
-            type={isWeChat() ? "primary" : "default"}
-            onClick={() => handleMenuClick(1)}
+            icon={<CalendarOutlined />}
+            onClick={handleContentManagementClick}
           >
-            Ai智能客服
+            内容管理
           </Button>
           <span className={styles.title}>{title}</span>
         </div>
diff --git a/Touchkebao/src/pages/pc/ckbox/data.ts b/Touchkebao/src/pages/pc/ckbox/data.ts
index 13403280..b0861eeb 100644
--- a/Touchkebao/src/pages/pc/ckbox/data.ts
+++ b/Touchkebao/src/pages/pc/ckbox/data.ts
@@ -82,6 +82,8 @@ export interface KfUserListData {
   labels: string[];
   lastUpdateTime: string;
   isOnline?: boolean;
+  momentsMax: number;
+  momentsNum: number;
   [key: string]: any;
 }
 
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/index.tsx b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/index.tsx
index ead8b0bc..144c04ae 100644
--- a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/index.tsx
@@ -30,19 +30,6 @@ const ContentManagement: React.FC = () => {
     { key: "keyword", label: "关键词回复" },
   ];
 
-  // 按钮点击处理函数
-  const handleAddMaterial = () => {
-    setMaterialModalVisible(true);
-  };
-
-  const handleAddSensitiveWord = () => {
-    setSensitiveWordModalVisible(true);
-  };
-
-  const handleAddKeyword = () => {
-    setKeywordModalVisible(true);
-  };
-
   // 弹窗成功回调
   const handleModalSuccess = () => {
     console.log("handleModalSuccess");
@@ -94,23 +81,7 @@ const ContentManagement: React.FC = () => {
         subtitle="可以讲聊天过程的信息收录到素材库中,也调用。"
         showBackButton={true}
         backButtonText="返回功能中心"
-        rightContent={
-          <div className={styles.headerActions}>
-            <Button
-              icon={<PlusOutlined />}
-              type="primary"
-              onClick={handleAddMaterial}
-            >
-              添加素材
-            </Button>
-            <Button icon={<PlusOutlined />} onClick={handleAddSensitiveWord}>
-              添加敏感词
-            </Button>
-            <Button icon={<PlusOutlined />} onClick={handleAddKeyword}>
-              添加关键词回复
-            </Button>
-          </div>
-        }
+        rightContent={<div className={styles.headerActions}></div>}
       />
 
       <div className={styles.tabsSection}>
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/ProfileCard/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/ProfileCard/index.tsx
index e52479a3..d738db4b 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/ProfileCard/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/ProfileCard/index.tsx
@@ -16,7 +16,6 @@ interface PersonProps {
 const Person: React.FC<PersonProps> = ({ contract }) => {
   const [activeKey, setActiveKey] = useState("profile");
   const isGroup = "chatroomId" in contract;
-  console.log(contract);
   return (
     <Sider width={330} className={styles.profileSider}>
       <LayoutFiexd
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/index.tsx
index 88c3e84a..25fc7774 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/index.tsx
@@ -9,14 +9,16 @@ import styles from "./index.module.scss";
 const { Content, Sider } = Layout;
 import { chatInitAPIdata, initSocket } from "./main";
 import { useWeChatStore } from "@/store/module/weChat/weChat";
-
+import { getIsLoadWeChat } from "@/store/module/ckchat/ckchat";
 const CkboxPage: React.FC = () => {
   // 不要在组件初始化时获取sendCommand，而是在需要时动态获取
   const [loading, setLoading] = useState(false);
   const currentContract = useWeChatStore(state => state.currentContract);
   useEffect(() => {
     // 方法一：使用 Promise 链式调用处理异步函数
-    setLoading(true);
+    if (!getIsLoadWeChat()) {
+      setLoading(true);
+    }
     chatInitAPIdata()
       .then(() => {
         // 数据加载完成后初始化WebSocket连接

From 038c4149d8e9b6b6557b501c3c4dc85ffb17c0c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Tue, 14 Oct 2025 18:20:51 +0800
Subject: [PATCH 06/72] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=92=8C=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=85=88=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A4=87=E6=B3=A8=E5=90=8D=EF=BC=88conRemark?=
 =?UTF-8?q?=EF=BC=89=E8=80=8C=E9=9D=9E=E6=98=B5=E7=A7=B0=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E5=8D=87=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E5=87=86=E7=A1=AE=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ckbox/weChat/components/ChatWindow/index.tsx |  2 +-
 .../components/SidebarMenu/MessageList/index.tsx | 16 +++-------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/index.tsx
index 9be82d10..d571fc19 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/index.tsx
@@ -108,7 +108,7 @@ const ChatWindow: React.FC<ChatWindowProps> = ({ contract }) => {
             />
             <div className={styles.chatHeaderDetails}>
               <div className={styles.chatHeaderName}>
-                {contract.nickname || contract.name}
+                {contract.conRemark || contract.nickname}
               </div>
             </div>
           </div>
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index 45ed52cf..b387d298 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -72,23 +72,13 @@ const MessageList: React.FC<MessageListProps> = () => {
               </Badge>
               <div className={styles.messageDetails}>
                 <div className={styles.messageHeader}>
-                  <div className={styles.messageName}>{session.nickname}</div>
+                  <div className={styles.messageName}>
+                    {session.conRemark || session.nickname}
+                  </div>
                   <div className={styles.messageTime}>
                     {formatWechatTime(session?.lastUpdateTime)}
                   </div>
                 </div>
-                {/* <div className={styles.messageContent}>
-                  <div
-                    className={styles.lastMessage}
-                    data-count={
-                      session.config.unreadCount > 0
-                        ? session.config.unreadCount
-                        : ""
-                    }
-                  >
-                    {session?.lastMessage}
-                  </div>
-                </div> */}
               </div>
             </div>
           </List.Item>

From f11bc7f68601646f01288843dd62455df793a173 Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Wed, 15 Oct 2025 10:47:48 +0800
Subject: [PATCH 07/72] =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WechatChatroomController.php   |  50 +++-----
 .../api/controller/WechatFriendController.php | 110 ++++++++++--------
 2 files changed, 76 insertions(+), 84 deletions(-)

diff --git a/Server/application/api/controller/WechatChatroomController.php b/Server/application/api/controller/WechatChatroomController.php
index af43bfe5..a038dee6 100644
--- a/Server/application/api/controller/WechatChatroomController.php
+++ b/Server/application/api/controller/WechatChatroomController.php
@@ -125,13 +125,6 @@ class WechatChatroomController extends BaseController
         }else{
             return false;
         }
-
-        // // 同时保存群成员数据
-        // if (!empty($item['members'])) {
-        //     foreach ($item['members'] as $member) {
-        //         $this->saveChatroomMember($member, $item['chatroomId']);
-        //     }
-        // }
     }
 
     /**
@@ -179,9 +172,7 @@ class WechatChatroomController extends BaseController
 
             // 保存数据到数据库
             if (!empty($response)) {
-                foreach ($response as $item) {
-                    $this->saveChatroomMember($item, $chatroomId);
-                }
+                $this->saveChatroomMember($response, $chatroomId);
             }
             
             if($isInner){
@@ -203,31 +194,24 @@ class WechatChatroomController extends BaseController
      * @param array $item 群成员数据
      * @param string $wechatChatroomId 微信群ID
      */
-    private function saveChatroomMember($item, $wechatChatroomId)
+    private function saveChatroomMember($data, $wechatChatroomId)
     {
-        $data = [
-            'chatroomId' => $wechatChatroomId,
-            'wechatId' => isset($item['wechatId']) ? $item['wechatId'] : '',
-            'nickname' => isset($item['nickname']) ? $item['nickname'] : '',
-            'avatar' => isset($item['avatar']) ? $item['avatar'] : '',
-            'conRemark' => isset($item['conRemark']) ? $item['conRemark'] : '',
-            'alias' => isset($item['alias']) ? $item['alias'] : '',
-            'friendType' => isset($item['friendType']) ? $item['friendType'] : false,
-            'updateTime' => time()
-        ];
-
-        // 使用chatroomId和wechatId的组合作为唯一性判断
-        $member = WechatChatroomMemberModel::where([
-            ['chatroomId', '=', $wechatChatroomId],
-            ['wechatId', '=', $item['wechatId']]
-        ])->find();
-
-        if ($member) {
-            $member->save($data);
-        } else {
-            $data['createTime'] = time();
-            WechatChatroomMemberModel::create($data);
+        $sqlData = [];
+        foreach ($data as $item) {
+            $sqlData[] = [
+                'chatroomId' => $wechatChatroomId,
+                'wechatId' => isset($item['wechatId']) ? $item['wechatId'] : '',
+                'nickname' => isset($item['nickname']) ? $item['nickname'] : '',
+                'avatar' => isset($item['avatar']) ? $item['avatar'] : '',
+                'conRemark' => isset($item['conRemark']) ? $item['conRemark'] : '',
+                'alias' => isset($item['alias']) ? $item['alias'] : '',
+                'friendType' => isset($item['friendType']) ? $item['friendType'] : false,
+                'updateTime' => time()
+            ];
         }
+
+        $member = new WechatChatroomMemberModel();
+        $member->saveAll($sqlData);
     }
 
     /**
diff --git a/Server/application/api/controller/WechatFriendController.php b/Server/application/api/controller/WechatFriendController.php
index 2d747689..1bb1d0bc 100644
--- a/Server/application/api/controller/WechatFriendController.php
+++ b/Server/application/api/controller/WechatFriendController.php
@@ -79,12 +79,17 @@ class WechatFriendController extends BaseController
             // 保存数据到数据库
             if (is_array($response)) {
                 $isUpdate = false;
-                foreach ($response as $item) {
+                $updated = $this->saveFriend($response);
+                if($updated && $isDel == 0){
+                    $isUpdate = true;
+                }
+
+                /*foreach ($response as $item) {
                     $updated = $this->saveFriend($item);
                     if($updated && $isDel == 0){
                         $isUpdate = true;
                     }
-                }
+                }*/
             }
             
             if ($isInner) {
@@ -107,58 +112,61 @@ class WechatFriendController extends BaseController
      * @param array $item 微信好友数据
      * @return bool 是否创建或更新了记录
      */
-    private function saveFriend($item)
+    private function saveFriend($data)
     {
-        $data = [
-            'id' => $item['id'],
-            'wechatAccountId' => $item['wechatAccountId'],
-            'alias' => $item['alias'],
-            'wechatId' => $item['wechatId'],
-            'conRemark' => $item['conRemark'],
-            'nickname' => $item['nickname'],
-            'pyInitial' => $item['pyInitial'],
-            'quanPin' => $item['quanPin'],
-            'avatar' => $item['avatar'],
-            'gender' => $item['gender'],
-            'region' => $item['region'],
-            'addFrom' => $item['addFrom'],
-            'labels' => is_array($item['labels']) ? json_encode($item['labels']) : json_encode([]),
-            'siteLabels' => json_encode([]),
-            'signature' => $item['signature'],
-            'isDeleted' => $item['isDeleted'],
-            'isPassed' => $item['isPassed'],
-            'deleteTime' => !empty($item['isDeleted']) ? strtotime($item['deleteTime']) : 0,
-            'accountId' => $item['accountId'],
-            'extendFields' => is_array($item['extendFields']) ? json_encode($item['extendFields']) : json_encode([]),
-            'accountUserName' => $item['accountUserName'],
-            'accountRealName' => $item['accountRealName'],
-            'accountNickname' => $item['accountNickname'],
-            'ownerAlias' => $item['ownerAlias'],
-            'ownerWechatId' => $item['ownerWechatId'],
-            'ownerNickname' => $item['ownerNickname'],
-            'ownerAvatar' => $item['ownerAvatar'],
-            'phone' => $item['phone'],
-            'thirdParty' => is_array($item['thirdParty']) ? json_encode($item['thirdParty']) : json_encode([]),
-            'groupId' => $item['groupId'],
-            'passTime' => !empty($item['isPassed']) && $item['passTime'] != '0001-01-01T00:00:00' ? strtotime($item['passTime']) : 0,
-            'additionalPicture' => $item['additionalPicture'],
-            'desc' => $item['desc'],
-            'country' => $item['country'],
-            'privince' => isset($item['privince']) ? $item['privince'] : '',
-            'city' => isset($item['city']) ? $item['city'] : '',
-            'createTime' => isset($item['createTime']) ? strtotime($item['createTime']) : 0,
-            'updateTime' => time()
-        ];
-
-        // 使用ID作为唯一性判断
-        $friend = WechatFriendModel::where('id', $item['id'])->find();
+        $sqlData = [];
+        foreach ($data as $item) {
+            $sqlData[] = [
+                'id' => $item['id'],
+                'wechatAccountId' => $item['wechatAccountId'],
+                'alias' => $item['alias'],
+                'wechatId' => $item['wechatId'],
+                'conRemark' => $item['conRemark'],
+                'nickname' => $item['nickname'],
+                'pyInitial' => $item['pyInitial'],
+                'quanPin' => $item['quanPin'],
+                'avatar' => $item['avatar'],
+                'gender' => $item['gender'],
+                'region' => $item['region'],
+                'addFrom' => $item['addFrom'],
+                'labels' => is_array($item['labels']) ? json_encode($item['labels']) : json_encode([]),
+                'siteLabels' => json_encode([]),
+                'signature' => $item['signature'],
+                'isDeleted' => $item['isDeleted'],
+                'isPassed' => $item['isPassed'],
+                'deleteTime' => !empty($item['isDeleted']) ? strtotime($item['deleteTime']) : 0,
+                'accountId' => $item['accountId'],
+                'extendFields' => is_array($item['extendFields']) ? json_encode($item['extendFields']) : json_encode([]),
+                'accountUserName' => $item['accountUserName'],
+                'accountRealName' => $item['accountRealName'],
+                'accountNickname' => $item['accountNickname'],
+                'ownerAlias' => $item['ownerAlias'],
+                'ownerWechatId' => $item['ownerWechatId'],
+                'ownerNickname' => $item['ownerNickname'],
+                'ownerAvatar' => $item['ownerAvatar'],
+                'phone' => $item['phone'],
+                'thirdParty' => is_array($item['thirdParty']) ? json_encode($item['thirdParty']) : json_encode([]),
+                'groupId' => $item['groupId'],
+                'passTime' => !empty($item['isPassed']) && $item['passTime'] != '0001-01-01T00:00:00' ? strtotime($item['passTime']) : 0,
+                'additionalPicture' => $item['additionalPicture'],
+                'desc' => $item['desc'],
+                'country' => $item['country'],
+                'privince' => isset($item['privince']) ? $item['privince'] : '',
+                'city' => isset($item['city']) ? $item['city'] : '',
+                'createTime' => isset($item['createTime']) ? strtotime($item['createTime']) : 0,
+                'updateTime' => time()
+            ];
+        }
 
+        $friend = new WechatFriendModel();
+        $friend->saveAll($sqlData);
         if ($friend) {
-            unset($data['siteLabels']);
-            $friend->save($data);
-            return true;
-        } else {
-            WechatFriendModel::create($data);
+            if ($friend->isUpdate()){
+                return true;
+            }else{
+                return false;
+            }
+        }else{
             return false;
         }
     }

From 7091adb6a071da6b078af3e0631282aa6d977cf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Wed, 15 Oct 2025 10:49:44 +0800
Subject: [PATCH 08/72] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20weChatGroup=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=96=B0=E5=A2=9E=20top=20=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=B8=BA=E5=8F=AF=E9=80=89=E9=A1=B9=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=20unreadCount=20=E5=AD=97=E6=AE=B5=E4=B8=BA=E5=8F=AF?=
 =?UTF-8?q?=E9=80=89=EF=BC=9B=E4=BF=AE=E6=94=B9=20getNewContractList=20?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9E=8B=E4=B8=BA?=
 =?UTF-8?q?=20Promise=EF=BC=9B=E6=96=B0=E5=A2=9E=20addCtrlUser=20=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E4=BB=A5=E6=8E=A7=E5=88=B6=E7=BB=88=E7=AB=AF=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=EF=BC=9B=E4=BF=AE=E5=A4=8D=20deleteChatSession=20?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B=E4=B8=BA?=
 =?UTF-8?q?=20number=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Touchkebao/src/pages/pc/ckbox/data.ts             |  3 ++-
 Touchkebao/src/pages/pc/ckbox/weChat/data.ts      |  2 +-
 Touchkebao/src/store/module/ckchat/ckchat.data.ts |  2 +-
 Touchkebao/src/store/module/ckchat/ckchat.ts      | 14 ++++++++++----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/data.ts b/Touchkebao/src/pages/pc/ckbox/data.ts
index b0861eeb..367a8ee6 100644
--- a/Touchkebao/src/pages/pc/ckbox/data.ts
+++ b/Touchkebao/src/pages/pc/ckbox/data.ts
@@ -115,8 +115,9 @@ export interface weChatGroup {
   chatroomAvatar: string;
   groupId: number;
   config?: {
+    top?: false;
     chat?: boolean;
-    unreadCount: number;
+    unreadCount?: number;
   };
   labels?: string[];
   notice: string;
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/data.ts b/Touchkebao/src/pages/pc/ckbox/weChat/data.ts
index 4fb95faa..52605792 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/data.ts
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/data.ts
@@ -113,11 +113,11 @@ export interface weChatGroup {
   chatroomAvatar: string;
   groupId: number;
   config?: {
+    top?: false;
     chat?: boolean;
     unreadCount: number;
   };
   labels?: string[];
-
   notice: string;
   selfDisplyName: string;
   wechatChatroomId: number;
diff --git a/Touchkebao/src/store/module/ckchat/ckchat.data.ts b/Touchkebao/src/store/module/ckchat/ckchat.data.ts
index 9eeebffa..d406fbe7 100644
--- a/Touchkebao/src/store/module/ckchat/ckchat.data.ts
+++ b/Touchkebao/src/store/module/ckchat/ckchat.data.ts
@@ -46,7 +46,7 @@ export interface CkChatState {
   newContractList: ContactGroupByLabel[];
   getContractList: () => ContractData[];
   getSomeContractList: (kfSelected: number) => ContractData[];
-  getNewContractList: () => ContactGroupByLabel[];
+  getNewContractList: () => Promise<ContactGroupByLabel[]>;
   setSearchKeyword: (keyword: string) => void;
   clearSearchKeyword: () => void;
   asyncKfSelected: (data: number) => void;
diff --git a/Touchkebao/src/store/module/ckchat/ckchat.ts b/Touchkebao/src/store/module/ckchat/ckchat.ts
index 73e9c2ad..8f8840b3 100644
--- a/Touchkebao/src/store/module/ckchat/ckchat.ts
+++ b/Touchkebao/src/store/module/ckchat/ckchat.ts
@@ -37,7 +37,7 @@ export const useCkChatStore = createPersistStore<CkChatState>(
       set({ kfUserList: data });
     },
     // 获取客服列表
-    getkfUserList: async () => {
+    getkfUserList: () => {
       const state = useCkChatStore.getState();
       return state.kfUserList;
     },
@@ -330,6 +330,12 @@ export const useCkChatStore = createPersistStore<CkChatState>(
     clearkfUserList: () => {
       set({ kfUserList: [] });
     },
+    // 添加控制终端用户
+    addCtrlUser: (user: KfUserListData) => {
+      set(state => ({
+        kfUserList: [...state.kfUserList, user],
+      }));
+    },
     // 获取聊天会话 - 使用缓存避免无限循环
     getChatSessions: (() => {
       let cachedResult: any = null;
@@ -492,8 +498,8 @@ export const useCkChatStore = createPersistStore<CkChatState>(
       isLoggedIn: state.isLoggedIn,
       kfUserList: state.kfUserList,
     }),
-    onRehydrateStorage: () => state => {
-      // console.log("CkChat store hydrated:", state);
+    onRehydrateStorage: () => () => {
+      // console.log("CkChat store hydrated");
     },
   },
 );
@@ -510,7 +516,7 @@ export const addChatSession = (session: ContractData | weChatGroup) =>
   useCkChatStore.getState().addChatSession(session);
 export const updateChatSession = (session: ContractData | weChatGroup) =>
   useCkChatStore.getState().updateChatSession(session);
-export const deleteChatSession = (sessionId: string) =>
+export const deleteChatSession = (sessionId: number) =>
   useCkChatStore.getState().deleteChatSession(sessionId);
 export const getkfUserList = () => useCkChatStore.getState().kfUserList;
 export const addCtrlUser = (user: KfUserListData) =>

From 0275eea6e7e2a674ed019ac12ac79893d800468f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Wed, 15 Oct 2025 14:08:53 +0800
Subject: [PATCH 09/72] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E6=8E=92=E5=BA=8F=E9=80=BB=E8=BE=91=EF=BC=9A?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=89=E7=BD=AE=E9=A1=B6=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BC=98=E5=85=88?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=BD=AE=E9=A1=B6=E4=BC=9A=E8=AF=9D=EF=BC=8C?=
 =?UTF-8?q?=E5=85=B6=E6=AC=A1=E6=8C=89=E6=9C=AA=E8=AF=BB=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=92=8C=E6=98=BE=E7=A4=BA=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=8C=E6=8F=90=E5=8D=87=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BD=93=E9=AA=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Touchkebao/src/pages/pc/ckbox/weChat/main.ts | 27 +++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/main.ts b/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
index 93bee0a9..917118fb 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
@@ -70,19 +70,40 @@ export const chatInitAPIdata = async () => {
     const filterGroupSessions = groupList?.filter(
       v => v?.config && v.config?.chat,
     );
+    // 获取显示名称的辅助函数（优先 conRemark，其次 nickname）
+    const getDisplayName = (session: any) => {
+      return session.conRemark || session.nickname || "";
+    };
+
     //排序功能
     const sortedSessions = [...filterUserSessions, ...filterGroupSessions].sort(
       (a, b) => {
-        // 获取未读消息数量
+        // 获取置顶状态
+        const aTop = a.config?.top || false;
+        const bTop = b.config?.top || false;
+
+        // 首先按置顶状态排序（置顶的排在前面）
+        if (aTop !== bTop) {
+          return aTop ? -1 : 1;
+        }
+
+        // 如果都是置顶或都不是置顶，则按未读消息数量降序排列（未读消息多的排在前面）
         const aUnread = a.config?.unreadCount || 0;
         const bUnread = b.config?.unreadCount || 0;
 
-        // 首先按未读消息数量降序排列（未读消息多的排在前面）
         if (aUnread !== bUnread) {
           return bUnread - aUnread;
         }
 
-        // 如果未读消息数量相同，则按时间降序排列（最新的在前面）
+        // 如果未读消息数量相同，则按显示名称排序（字母排序）
+        const aName = getDisplayName(a).toLowerCase();
+        const bName = getDisplayName(b).toLowerCase();
+
+        if (aName !== bName) {
+          return aName.localeCompare(bName, "zh-CN");
+        }
+
+        // 如果名称也相同，则按时间降序排列（最新的在前面）
         // 如果lastUpdateTime不存在，则将其排在最后
         if (!a.lastUpdateTime) return 1;
         if (!b.lastUpdateTime) return -1;

From d26e5a324d48b41e0b25abbda405168f5ef562da Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Wed, 15 Oct 2025 14:08:56 +0800
Subject: [PATCH 10/72] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/WechatFriendController.php | 112 ++++++++----------
 1 file changed, 52 insertions(+), 60 deletions(-)

diff --git a/Server/application/api/controller/WechatFriendController.php b/Server/application/api/controller/WechatFriendController.php
index 1bb1d0bc..18fbe438 100644
--- a/Server/application/api/controller/WechatFriendController.php
+++ b/Server/application/api/controller/WechatFriendController.php
@@ -75,21 +75,16 @@ class WechatFriendController extends BaseController
             // 发送请求获取好友列表
             $result = requestCurl($this->baseUrl . 'api/WechatFriend/friendlistData', $params, 'POST', $header, 'json');
             $response = handleApiResponse($result);
-            
+
             // 保存数据到数据库
             if (is_array($response)) {
                 $isUpdate = false;
-                $updated = $this->saveFriend($response);
-                if($updated && $isDel == 0){
-                    $isUpdate = true;
-                }
-
-                /*foreach ($response as $item) {
+                foreach ($response as $item) {
                     $updated = $this->saveFriend($item);
                     if($updated && $isDel == 0){
                         $isUpdate = true;
                     }
-                }*/
+                }
             }
             
             if ($isInner) {
@@ -112,61 +107,58 @@ class WechatFriendController extends BaseController
      * @param array $item 微信好友数据
      * @return bool 是否创建或更新了记录
      */
-    private function saveFriend($data)
+    private function saveFriend($item)
     {
-        $sqlData = [];
-        foreach ($data as $item) {
-            $sqlData[] = [
-                'id' => $item['id'],
-                'wechatAccountId' => $item['wechatAccountId'],
-                'alias' => $item['alias'],
-                'wechatId' => $item['wechatId'],
-                'conRemark' => $item['conRemark'],
-                'nickname' => $item['nickname'],
-                'pyInitial' => $item['pyInitial'],
-                'quanPin' => $item['quanPin'],
-                'avatar' => $item['avatar'],
-                'gender' => $item['gender'],
-                'region' => $item['region'],
-                'addFrom' => $item['addFrom'],
-                'labels' => is_array($item['labels']) ? json_encode($item['labels']) : json_encode([]),
-                'siteLabels' => json_encode([]),
-                'signature' => $item['signature'],
-                'isDeleted' => $item['isDeleted'],
-                'isPassed' => $item['isPassed'],
-                'deleteTime' => !empty($item['isDeleted']) ? strtotime($item['deleteTime']) : 0,
-                'accountId' => $item['accountId'],
-                'extendFields' => is_array($item['extendFields']) ? json_encode($item['extendFields']) : json_encode([]),
-                'accountUserName' => $item['accountUserName'],
-                'accountRealName' => $item['accountRealName'],
-                'accountNickname' => $item['accountNickname'],
-                'ownerAlias' => $item['ownerAlias'],
-                'ownerWechatId' => $item['ownerWechatId'],
-                'ownerNickname' => $item['ownerNickname'],
-                'ownerAvatar' => $item['ownerAvatar'],
-                'phone' => $item['phone'],
-                'thirdParty' => is_array($item['thirdParty']) ? json_encode($item['thirdParty']) : json_encode([]),
-                'groupId' => $item['groupId'],
-                'passTime' => !empty($item['isPassed']) && $item['passTime'] != '0001-01-01T00:00:00' ? strtotime($item['passTime']) : 0,
-                'additionalPicture' => $item['additionalPicture'],
-                'desc' => $item['desc'],
-                'country' => $item['country'],
-                'privince' => isset($item['privince']) ? $item['privince'] : '',
-                'city' => isset($item['city']) ? $item['city'] : '',
-                'createTime' => isset($item['createTime']) ? strtotime($item['createTime']) : 0,
-                'updateTime' => time()
-            ];
-        }
+        $data = [
+            'id' => $item['id'],
+            'wechatAccountId' => $item['wechatAccountId'],
+            'alias' => $item['alias'],
+            'wechatId' => $item['wechatId'],
+            'conRemark' => $item['conRemark'],
+            'nickname' => $item['nickname'],
+            'pyInitial' => $item['pyInitial'],
+            'quanPin' => $item['quanPin'],
+            'avatar' => $item['avatar'],
+            'gender' => $item['gender'],
+            'region' => $item['region'],
+            'addFrom' => $item['addFrom'],
+            'labels' => is_array($item['labels']) ? json_encode($item['labels']) : json_encode([]),
+            'siteLabels' => json_encode([]),
+            'signature' => $item['signature'],
+            'isDeleted' => $item['isDeleted'],
+            'isPassed' => $item['isPassed'],
+            'deleteTime' => !empty($item['isDeleted']) ? strtotime($item['deleteTime']) : 0,
+            'accountId' => $item['accountId'],
+            'extendFields' => is_array($item['extendFields']) ? json_encode($item['extendFields']) : json_encode([]),
+            'accountUserName' => $item['accountUserName'],
+            'accountRealName' => $item['accountRealName'],
+            'accountNickname' => $item['accountNickname'],
+            'ownerAlias' => $item['ownerAlias'],
+            'ownerWechatId' => $item['ownerWechatId'],
+            'ownerNickname' => $item['ownerNickname'],
+            'ownerAvatar' => $item['ownerAvatar'],
+            'phone' => $item['phone'],
+            'thirdParty' => is_array($item['thirdParty']) ? json_encode($item['thirdParty']) : json_encode([]),
+            'groupId' => $item['groupId'],
+            'passTime' => !empty($item['isPassed']) && $item['passTime'] != '0001-01-01T00:00:00' ? strtotime($item['passTime']) : 0,
+            'additionalPicture' => $item['additionalPicture'],
+            'desc' => $item['desc'],
+            'country' => $item['country'],
+            'privince' => isset($item['privince']) ? $item['privince'] : '',
+            'city' => isset($item['city']) ? $item['city'] : '',
+            'createTime' => isset($item['createTime']) ? strtotime($item['createTime']) : 0,
+            'updateTime' => time()
+        ];
+
+        // 使用ID作为唯一性判断
+        $friend = WechatFriendModel::where('id', $item['id'])->find();
 
-        $friend = new WechatFriendModel();
-        $friend->saveAll($sqlData);
         if ($friend) {
-            if ($friend->isUpdate()){
-                return true;
-            }else{
-                return false;
-            }
-        }else{
+            unset($data['siteLabels']);
+            $friend->save($data);
+            return true;
+        } else {
+            WechatFriendModel::create($data);
             return false;
         }
     }

From edf5abcec998e2e0696f18f93f22d3850309ce56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Wed, 15 Oct 2025 14:37:24 +0800
Subject: [PATCH 11/72] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=BB=84=E4=BB=B6=E5=AF=B9=E7=89=B9=E5=AE=9A?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E6=94=AF=E6=8C=81=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?JSON=E6=A0=BC=E5=BC=8F=E5=86=85=E5=AE=B9=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=85=88=E6=98=BE=E7=A4=BA=E8=A7=A3=E6=9E=90=E5=90=8E=E7=9A=84?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=EF=BC=9B=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=EF=BC=8C=E7=A1=AE=E4=BF=9D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E5=B1=95=E7=A4=BA=E6=B6=88=E6=81=AF=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/MessageRecord/index.tsx        | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
index d5dd6df1..0d31d6aa 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
@@ -757,9 +757,34 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
                 dangerouslySetInnerHTML={{ __html: msg.content }}
               ></div>
             ))}
+
+          {group.messages
+            .filter(v => [570425393].includes(v.msgType))
+            .map(msg => {
+              // 解析JSON字符串
+              let displayContent = msg.content;
+              try {
+                const parsedContent = JSON.parse(msg.content);
+                if (
+                  parsedContent &&
+                  typeof parsedContent === "object" &&
+                  parsedContent.content
+                ) {
+                  displayContent = parsedContent.content;
+                }
+              } catch (error) {
+                // 如果解析失败，使用原始内容
+                displayContent = msg.content;
+              }
+              return (
+                <div key={`divider-${msg.id}`} className={styles.messageTime}>
+                  {displayContent}
+                </div>
+              );
+            })}
           <div className={styles.messageTime}>{group.time}</div>
           {group.messages
-            .filter(v => ![10000].includes(v.msgType))
+            .filter(v => ![10000, 570425393].includes(v.msgType))
             .map(msg => {
               return renderMessage(msg);
             })}

From a716315311cbcd892b37ab108aee34ae388d0fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Wed, 15 Oct 2025 15:04:48 +0800
Subject: [PATCH 12/72] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=B3=E9=94=AE?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E7=BD=AE=E9=A1=B6=E3=80=81=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=92=8C=E4=BF=AE=E6=94=B9=E5=A4=87=E6=B3=A8=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=EF=BC=9B=E6=9B=B4=E6=96=B0=E6=A0=B7=E5=BC=8F=E4=BB=A5=E6=8F=90?=
 =?UTF-8?q?=E5=8D=87=E7=94=A8=E6=88=B7=E4=BA=A4=E4=BA=92=E4=BD=93=E9=AA=8C?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BC=9A=E8=AF=9D=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=80=BB=E8=BE=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MessageList/MessageList.module.scss       |  37 +++
 .../SidebarMenu/MessageList/data.ts           |   2 +
 .../SidebarMenu/MessageList/index.tsx         | 213 +++++++++++++++++-
 3 files changed, 247 insertions(+), 5 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss
index e70717c2..380bf42d 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss
@@ -120,6 +120,43 @@
   }
 }
 
+// 右键菜单样式
+.contextMenu {
+  background: white;
+  border: 1px solid #d9d9d9;
+  border-radius: 6px;
+  box-shadow:
+    0 6px 16px 0 rgba(0, 0, 0, 0.08),
+    0 3px 6px -4px rgba(0, 0, 0, 0.12),
+    0 9px 28px 8px rgba(0, 0, 0, 0.05);
+  padding: 4px 0;
+  min-width: 120px;
+  z-index: 1000;
+
+  .menuItem {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    padding: 8px 12px;
+    cursor: pointer;
+    font-size: 14px;
+    color: #262626;
+    transition: background-color 0.2s;
+
+    &:hover {
+      background-color: #f5f5f5;
+    }
+
+    &:active {
+      background-color: #e6f7ff;
+    }
+
+    .anticon {
+      font-size: 14px;
+    }
+  }
+}
+
 // 响应式设计
 @media (max-width: 768px) {
   .messageList {
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/data.ts b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/data.ts
index 620e4073..5aa5c726 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/data.ts
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/data.ts
@@ -27,6 +27,7 @@ export interface ContractData {
   lastMessageTime: number;
   config: {
     unreadCount: number;
+    top?: boolean;
   };
   duplicate: boolean;
   [key: string]: any;
@@ -43,6 +44,7 @@ export interface ChatSession {
   lastTime: string;
   config: {
     unreadCount: number;
+    top?: boolean;
   };
   online: boolean;
   members?: string[];
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index b387d298..8eb34d68 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -1,10 +1,16 @@
-import React, { useEffect, useState } from "react";
-import { List, Avatar, Badge } from "antd";
-import { UserOutlined, TeamOutlined } from "@ant-design/icons";
+import React, { useEffect, useState, useRef } from "react";
+import { List, Avatar, Badge, Modal, Input, message } from "antd";
+import {
+  UserOutlined,
+  TeamOutlined,
+  PushpinOutlined,
+  DeleteOutlined,
+  EditOutlined,
+} from "@ant-design/icons";
 import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 import { useWeChatStore } from "@/store/module/weChat/weChat";
 import { useCkChatStore } from "@/store/module/ckchat/ckchat";
-
+import { updateConfig } from "@/pages/pc/ckbox/api";
 import styles from "./MessageList.module.scss";
 import { formatWechatTime } from "@/utils/common";
 interface MessageListProps {}
@@ -22,6 +28,138 @@ const MessageList: React.FC<MessageListProps> = () => {
     (ContractData | weChatGroup)[]
   >([]);
   const searchKeyword = useCkChatStore(state => state.searchKeyword);
+
+  // 右键菜单相关状态
+  const [contextMenu, setContextMenu] = useState<{
+    visible: boolean;
+    x: number;
+    y: number;
+    session: ContractData | weChatGroup | null;
+  }>({
+    visible: false,
+    x: 0,
+    y: 0,
+    session: null,
+  });
+
+  // 修改备注相关状态
+  const [editRemarkModal, setEditRemarkModal] = useState<{
+    visible: boolean;
+    session: ContractData | weChatGroup | null;
+    remark: string;
+  }>({
+    visible: false,
+    session: null,
+    remark: "",
+  });
+
+  const contextMenuRef = useRef<HTMLDivElement>(null);
+
+  // 右键菜单事件处理
+  const handleContextMenu = (
+    e: React.MouseEvent,
+    session: ContractData | weChatGroup,
+  ) => {
+    e.preventDefault();
+    e.stopPropagation();
+
+    setContextMenu({
+      visible: true,
+      x: e.clientX,
+      y: e.clientY,
+      session,
+    });
+  };
+
+  // 隐藏右键菜单
+  const hideContextMenu = () => {
+    setContextMenu({
+      visible: false,
+      x: 0,
+      y: 0,
+      session: null,
+    });
+  };
+
+  // 置顶/取消置顶
+  const handleTogglePin = (session: ContractData | weChatGroup) => {
+    const isPinned = (session.config as any)?.top || true;
+    updateConfig({
+      id: session.id,
+      config: { top: isPinned, chat: true },
+    })
+      .then(() => {
+        message.success(`${isPinned ? "取消置顶" : "置顶"}成功`);
+        //更新当前这个item的config的top值
+        //并把当前的Item移动到聊天列表的最上方
+      })
+      .catch(() => {
+        message.error(`${isPinned ? "取消置顶" : "置顶"}失败`);
+        //更新当前这个item的config的top值
+        //先计算一下最后一个置顶的坐标，并把当前的Item移动到最后一个置顶的 Item下边
+      });
+    hideContextMenu();
+  };
+
+  // 删除会话
+  const handleDelete = (session: ContractData | weChatGroup) => {
+    Modal.confirm({
+      title: "确认删除",
+      content: `确定要删除与 ${session.conRemark || session.nickname} 的会话吗？`,
+      onOk: () => {
+        // TODO: 调用API删除会话
+        console.log("删除会话", session);
+        message.success("删除成功");
+        hideContextMenu();
+      },
+    });
+  };
+
+  // 修改备注
+  const handleEditRemark = (session: ContractData | weChatGroup) => {
+    setEditRemarkModal({
+      visible: true,
+      session,
+      remark: session.conRemark || "",
+    });
+    hideContextMenu();
+  };
+
+  // 保存备注
+  const handleSaveRemark = () => {
+    if (!editRemarkModal.session) return;
+
+    // TODO: 调用API更新备注
+    console.log("更新备注", editRemarkModal.session, editRemarkModal.remark);
+    message.success("备注更新成功");
+
+    setEditRemarkModal({
+      visible: false,
+      session: null,
+      remark: "",
+    });
+  };
+
+  // 点击外部隐藏菜单
+  useEffect(() => {
+    const handleClickOutside = (event: MouseEvent) => {
+      if (
+        contextMenuRef.current &&
+        !contextMenuRef.current.contains(event.target as Node)
+      ) {
+        hideContextMenu();
+      }
+    };
+
+    if (contextMenu.visible) {
+      document.addEventListener("mousedown", handleClickOutside);
+    }
+
+    return () => {
+      document.removeEventListener("mousedown", handleClickOutside);
+    };
+  }, [contextMenu.visible]);
+
   useEffect(() => {
     let filteredSessions = getChatSessions;
 
@@ -55,6 +193,7 @@ const MessageList: React.FC<MessageListProps> = () => {
               currentContract?.id === session.id ? styles.active : ""
             }`}
             onClick={() => onContactClick(session)}
+            onContextMenu={e => handleContextMenu(e, session)}
           >
             <div className={styles.messageInfo}>
               <Badge count={session.config.unreadCount || 0} size="small">
@@ -73,7 +212,7 @@ const MessageList: React.FC<MessageListProps> = () => {
               <div className={styles.messageDetails}>
                 <div className={styles.messageHeader}>
                   <div className={styles.messageName}>
-                    {session.conRemark || session.nickname}
+                    {session.conRemark || session.nickname || session.wechatId}
                   </div>
                   <div className={styles.messageTime}>
                     {formatWechatTime(session?.lastUpdateTime)}
@@ -84,6 +223,70 @@ const MessageList: React.FC<MessageListProps> = () => {
           </List.Item>
         )}
       />
+
+      {/* 右键菜单 */}
+      {contextMenu.visible && contextMenu.session && (
+        <div
+          ref={contextMenuRef}
+          className={styles.contextMenu}
+          style={{
+            position: "fixed",
+            left: contextMenu.x,
+            top: contextMenu.y,
+            zIndex: 1000,
+          }}
+        >
+          <div
+            className={styles.menuItem}
+            onClick={() => handleTogglePin(contextMenu.session!)}
+          >
+            <PushpinOutlined />
+            {(contextMenu.session.config as any)?.top ? "取消置顶" : "置顶"}
+          </div>
+          <div
+            className={styles.menuItem}
+            onClick={() => handleEditRemark(contextMenu.session!)}
+          >
+            <EditOutlined />
+            修改备注
+          </div>
+          <div
+            className={styles.menuItem}
+            onClick={() => handleDelete(contextMenu.session!)}
+          >
+            <DeleteOutlined />
+            删除
+          </div>
+        </div>
+      )}
+
+      {/* 修改备注Modal */}
+      <Modal
+        title="修改备注"
+        open={editRemarkModal.visible}
+        onOk={handleSaveRemark}
+        onCancel={() =>
+          setEditRemarkModal({
+            visible: false,
+            session: null,
+            remark: "",
+          })
+        }
+        okText="保存"
+        cancelText="取消"
+      >
+        <Input
+          value={editRemarkModal.remark}
+          onChange={e =>
+            setEditRemarkModal(prev => ({
+              ...prev,
+              remark: e.target.value,
+            }))
+          }
+          placeholder="请输入备注"
+          maxLength={20}
+        />
+      </Modal>
     </div>
   );
 };

From d751bbfcd4137e93b4f536f7ac995bde6d50f51e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Wed, 15 Oct 2025 15:50:31 +0800
Subject: [PATCH 13/72] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=9A=E8=AF=9D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B6=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=87=E6=8D=A2=E9=80=BB=E8=BE=91=E5=B9=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E4=BC=9A=E8=AF=9D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=9B=E6=96=B0=E5=A2=9E=E6=A0=B7=E5=BC=8F=E4=BB=A5?=
 =?UTF-8?q?=E7=AA=81=E5=87=BA=E7=BD=AE=E9=A1=B6=E4=BC=9A=E8=AF=9D=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E5=8D=87=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MessageList/MessageList.module.scss       | 20 +++++
 .../SidebarMenu/MessageList/index.tsx         | 39 ++++++---
 Touchkebao/src/store/module/ckchat/ckchat.ts  | 84 +++++++++++++++++++
 3 files changed, 130 insertions(+), 13 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss
index 380bf42d..a3bad297 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss
@@ -18,6 +18,26 @@
       border-right: 3px solid #1890ff;
     }
 
+    &.pinned {
+      background-color: #fff7e6;
+      border-left: 3px solid #faad14;
+      position: relative;
+
+      &::before {
+        content: "📌";
+        position: absolute;
+        top: 8px;
+        right: 8px;
+        font-size: 12px;
+        opacity: 0.7;
+      }
+
+      .messageName {
+        color: #d46b08;
+        font-weight: 600;
+      }
+    }
+
     &:last-child {
       border-bottom: none;
     }
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index 8eb34d68..e36d7c0e 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -9,7 +9,11 @@ import {
 } from "@ant-design/icons";
 import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 import { useWeChatStore } from "@/store/module/weChat/weChat";
-import { useCkChatStore } from "@/store/module/ckchat/ckchat";
+import {
+  useCkChatStore,
+  toggleChatSessionPin,
+  deleteChatSession,
+} from "@/store/module/ckchat/ckchat";
 import { updateConfig } from "@/pages/pc/ckbox/api";
 import styles from "./MessageList.module.scss";
 import { formatWechatTime } from "@/utils/common";
@@ -83,20 +87,20 @@ const MessageList: React.FC<MessageListProps> = () => {
 
   // 置顶/取消置顶
   const handleTogglePin = (session: ContractData | weChatGroup) => {
-    const isPinned = (session.config as any)?.top || true;
+    const currentPinned = (session.config as any)?.top || false;
+    const newPinned = !currentPinned; // 切换置顶状态
+
     updateConfig({
       id: session.id,
-      config: { top: isPinned, chat: true },
+      config: { top: newPinned, chat: true },
     })
       .then(() => {
-        message.success(`${isPinned ? "取消置顶" : "置顶"}成功`);
-        //更新当前这个item的config的top值
-        //并把当前的Item移动到聊天列表的最上方
+        // API调用成功，更新本地状态
+        toggleChatSessionPin(session.id!, newPinned);
+        message.success(`${newPinned ? "置顶" : "取消置顶"}成功`);
       })
       .catch(() => {
-        message.error(`${isPinned ? "取消置顶" : "置顶"}失败`);
-        //更新当前这个item的config的top值
-        //先计算一下最后一个置顶的坐标，并把当前的Item移动到最后一个置顶的 Item下边
+        message.error(`${newPinned ? "置顶" : "取消置顶"}失败`);
       });
     hideContextMenu();
   };
@@ -107,9 +111,18 @@ const MessageList: React.FC<MessageListProps> = () => {
       title: "确认删除",
       content: `确定要删除与 ${session.conRemark || session.nickname} 的会话吗？`,
       onOk: () => {
-        // TODO: 调用API删除会话
-        console.log("删除会话", session);
-        message.success("删除成功");
+        updateConfig({
+          id: session.id,
+          config: { chat: false },
+        })
+          .then(() => {
+            message.success(`删除成功`);
+            //根据id删除会话里Item
+            deleteChatSession(session.id);
+          })
+          .catch(() => {
+            message.error(`删除失败`);
+          });
         hideContextMenu();
       },
     });
@@ -191,7 +204,7 @@ const MessageList: React.FC<MessageListProps> = () => {
             key={session.id}
             className={`${styles.messageItem} ${
               currentContract?.id === session.id ? styles.active : ""
-            }`}
+            } ${(session.config as any)?.top ? styles.pinned : ""}`}
             onClick={() => onContactClick(session)}
             onContextMenu={e => handleContextMenu(e, session)}
           >
diff --git a/Touchkebao/src/store/module/ckchat/ckchat.ts b/Touchkebao/src/store/module/ckchat/ckchat.ts
index 8f8840b3..2bd1c391 100644
--- a/Touchkebao/src/store/module/ckchat/ckchat.ts
+++ b/Touchkebao/src/store/module/ckchat/ckchat.ts
@@ -429,6 +429,88 @@ export const useCkChatStore = createPersistStore<CkChatState>(
         };
       });
     },
+    // 切换会话置顶状态
+    toggleChatSessionPin: (sessionId: number, isPinned: boolean) => {
+      set(state => {
+        const updatedSessions = state.chatSessions.map(item => {
+          if (item.id === sessionId) {
+            return {
+              ...item,
+              config: {
+                ...item.config,
+                top: isPinned,
+              },
+            };
+          }
+          return item;
+        });
+
+        // 如果置顶，将会话移到顶部
+        if (isPinned) {
+          const sessionIndex = updatedSessions.findIndex(
+            item => item.id === sessionId,
+          );
+          if (sessionIndex !== -1) {
+            const session = updatedSessions[sessionIndex];
+            const otherSessions = updatedSessions.filter(
+              item => item.id !== sessionId,
+            );
+            return {
+              chatSessions: [session, ...otherSessions],
+            };
+          }
+        } else {
+          // 如果取消置顶，重新排序（置顶>未读>名称>时间）
+          const sortedSessions = updatedSessions.sort((a, b) => {
+            // 获取置顶状态
+            const aTop = (a.config as any)?.top || false;
+            const bTop = (b.config as any)?.top || false;
+
+            // 首先按置顶状态排序（置顶的排在前面）
+            if (aTop !== bTop) {
+              return aTop ? -1 : 1;
+            }
+
+            // 如果都是置顶或都不是置顶，则按未读消息数量降序排列
+            const aUnread = a.config?.unreadCount || 0;
+            const bUnread = b.config?.unreadCount || 0;
+
+            if (aUnread !== bUnread) {
+              return bUnread - aUnread;
+            }
+
+            // 如果未读消息数量相同，则按显示名称排序
+            const getDisplayName = (session: any) => {
+              return session.conRemark || session.nickname || "";
+            };
+            const aName = getDisplayName(a).toLowerCase();
+            const bName = getDisplayName(b).toLowerCase();
+
+            if (aName !== bName) {
+              return aName.localeCompare(bName, "zh-CN");
+            }
+
+            // 如果名称也相同，则按时间降序排列
+            if (!a.lastUpdateTime) return 1;
+            if (!b.lastUpdateTime) return -1;
+
+            const timeCompare =
+              new Date(b.lastUpdateTime).getTime() -
+              new Date(a.lastUpdateTime).getTime();
+
+            return timeCompare;
+          });
+
+          return {
+            chatSessions: sortedSessions,
+          };
+        }
+
+        return {
+          chatSessions: updatedSessions,
+        };
+      });
+    },
     // 设置用户信息
     setUserInfo: (userInfo: CkUserInfo) => {
       set({ userInfo, isLoggedIn: true });
@@ -561,3 +643,5 @@ export const updateIsLoadWeChat = (isLoadWeChat: boolean) =>
   useCkChatStore.getState().updateIsLoadWeChat(isLoadWeChat);
 export const getIsLoadWeChat = () =>
   useCkChatStore.getState().getIsLoadWeChat();
+export const toggleChatSessionPin = (sessionId: number, isPinned: boolean) =>
+  useCkChatStore.getState().toggleChatSessionPin(sessionId, isPinned);

From db221008465610557119439084d301cd4d08964f Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Wed, 15 Oct 2025 16:39:10 +0800
Subject: [PATCH 14/72] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/AccountController.php      |  27 +++-
 .../controller/WechatChatroomController.php   |  73 ++++++++--
 .../api/controller/WechatFriendController.php | 135 ++++++++++--------
 .../api/model/WechatFriendModel.php           |   5 +
 Server/application/job/WechatFriendJob.php    |   2 +-
 5 files changed, 166 insertions(+), 76 deletions(-)

diff --git a/Server/application/api/controller/AccountController.php b/Server/application/api/controller/AccountController.php
index 02281e17..d2819b65 100644
--- a/Server/application/api/controller/AccountController.php
+++ b/Server/application/api/controller/AccountController.php
@@ -708,7 +708,7 @@ class AccountController extends BaseController
         $deleteTime = isset($item['deleteTime']) ? strtotime($item['deleteTime']) : null;
         $sqlData = [];
         foreach ($data as $item) {
-            $sqlData[] = [
+            $rows[] = [
                 'id' => $item['id'],
                 'accountType' => isset($item['accountType']) ? $item['accountType'] : 0,
                 'status' => isset($item['status']) ? $item['status'] : 0,
@@ -733,9 +733,28 @@ class AccountController extends BaseController
             ];
         }
 
+        // 拆分插入/更新：按主键 id 判断
+        $ids = array_column($rows, 'id');
+        $existingIds = CompanyAccountModel::whereIn('id', $ids)->column('id');
+        $existSet = array_flip($existingIds);
 
-        // 使用tenantId作为唯一性判断
-        $account = new CompanyAccountModel();
-        $account->saveAll($account);
+        $toInsert = [];
+        $toUpdate = [];
+        foreach ($rows as $r) {
+            if (isset($existSet[$r['id']])) $toUpdate[] = $r; else $toInsert[] = $r;
+        }
+
+        $changed = false;
+        if (!empty($toInsert)) {
+            $m = new CompanyAccountModel();
+            $m->insertAll($toInsert, true); // 允许外部主键
+            $changed = true;
+        }
+        if (!empty($toUpdate)) {
+            $m = new CompanyAccountModel();
+            $res = $m->saveAll($toUpdate);
+            if ($res) $changed = true;
+        }
+        return $changed;
     }
 } 
\ No newline at end of file
diff --git a/Server/application/api/controller/WechatChatroomController.php b/Server/application/api/controller/WechatChatroomController.php
index a038dee6..82d28691 100644
--- a/Server/application/api/controller/WechatChatroomController.php
+++ b/Server/application/api/controller/WechatChatroomController.php
@@ -80,7 +80,6 @@ class WechatChatroomController extends BaseController
      */
     private function saveChatroom($data)
     {
-
         $sqlData = [];
         foreach ($data as $item) {
             $sqlData[] = [
@@ -112,19 +111,38 @@ class WechatChatroomController extends BaseController
             ];
         }
 
-        // 使用chatroomId和wechatAccountId的组合作为唯一性判断
-        $chatroom = new WechatChatroomModel();
-        $chatroom->saveAll($sqlData);
-        if ($chatroom) {
-            if ($chatroom->isUpdate()){
-                return true;
-            }else{
-                return false;
-            }
-
-        }else{
+        if (empty($sqlData)) {
             return false;
         }
+
+        // 先查已存在ID，拆分插入与更新两批（参考 WechatFriendController）
+        $ids = array_column($sqlData, 'id');
+        $existingIds = WechatChatroomModel::whereIn('id', $ids)->column('id');
+        $existingSet = array_flip($existingIds);
+
+        $toInsert = [];
+        $toUpdate = [];
+        foreach ($sqlData as $row) {
+            if (isset($existingSet[$row['id']])) {
+                $toUpdate[] = $row;
+            } else {
+                $toInsert[] = $row;
+            }
+        }
+
+        $isUpdate = false;
+        if (!empty($toInsert)) {
+            $m = new WechatChatroomModel();
+            // 批量插入（允许外部主键）
+            $m->insertAll($toInsert, true);
+            $isUpdate = false;
+        }
+        if (!empty($toUpdate)) {
+            $m = new WechatChatroomModel();
+            $m->saveAll($toUpdate);
+            $isUpdate = true;
+        }
+        return $isUpdate;
     }
 
     /**
@@ -210,8 +228,35 @@ class WechatChatroomController extends BaseController
             ];
         }
 
-        $member = new WechatChatroomMemberModel();
-        $member->saveAll($sqlData);
+        if (empty($sqlData)) {
+            return false;
+        }
+
+        // 使用 (chatroomId, wechatId) 组合作为唯一性判断，拆分插入与更新
+        $existing = WechatChatroomMemberModel::where('chatroomId', $wechatChatroomId)
+            ->column('id,wechatId', 'wechatId');
+
+        $toInsert = [];
+        $toUpdate = [];
+        foreach ($sqlData as $row) {
+            $wid = $row['wechatId'];
+            if ($wid !== '' && isset($existing[$wid])) {
+                // 带上主键以便 saveAll 根据主键更新
+                $row['id'] = $existing[$wid]['id'] ?? $existing[$wid];
+                $toUpdate[] = $row;
+            } else {
+                $toInsert[] = $row;
+            }
+        }
+
+        if (!empty($toInsert)) {
+            $m = new WechatChatroomMemberModel();
+            $m->insertAll($toInsert, true);
+        }
+        if (!empty($toUpdate)) {
+            $m = new WechatChatroomMemberModel();
+            $m->saveAll($toUpdate);
+        }
     }
 
     /**
diff --git a/Server/application/api/controller/WechatFriendController.php b/Server/application/api/controller/WechatFriendController.php
index 18fbe438..6bc2874b 100644
--- a/Server/application/api/controller/WechatFriendController.php
+++ b/Server/application/api/controller/WechatFriendController.php
@@ -3,6 +3,7 @@
 namespace app\api\controller;
 
 use app\api\model\WechatFriendModel;
+use think\Db;
 use think\facade\Request;
 use think\facade\Log;
 
@@ -75,15 +76,12 @@ class WechatFriendController extends BaseController
             // 发送请求获取好友列表
             $result = requestCurl($this->baseUrl . 'api/WechatFriend/friendlistData', $params, 'POST', $header, 'json');
             $response = handleApiResponse($result);
-
             // 保存数据到数据库
             if (is_array($response)) {
                 $isUpdate = false;
-                foreach ($response as $item) {
-                    $updated = $this->saveFriend($item);
-                    if($updated && $isDel == 0){
-                        $isUpdate = true;
-                    }
+                $updated = $this->saveFriend($response);
+                if($updated && $isDel == 0){
+                    $isUpdate = true;
                 }
             }
             
@@ -107,59 +105,82 @@ class WechatFriendController extends BaseController
      * @param array $item 微信好友数据
      * @return bool 是否创建或更新了记录
      */
-    private function saveFriend($item)
+    private function saveFriend($data)
     {
-        $data = [
-            'id' => $item['id'],
-            'wechatAccountId' => $item['wechatAccountId'],
-            'alias' => $item['alias'],
-            'wechatId' => $item['wechatId'],
-            'conRemark' => $item['conRemark'],
-            'nickname' => $item['nickname'],
-            'pyInitial' => $item['pyInitial'],
-            'quanPin' => $item['quanPin'],
-            'avatar' => $item['avatar'],
-            'gender' => $item['gender'],
-            'region' => $item['region'],
-            'addFrom' => $item['addFrom'],
-            'labels' => is_array($item['labels']) ? json_encode($item['labels']) : json_encode([]),
-            'siteLabels' => json_encode([]),
-            'signature' => $item['signature'],
-            'isDeleted' => $item['isDeleted'],
-            'isPassed' => $item['isPassed'],
-            'deleteTime' => !empty($item['isDeleted']) ? strtotime($item['deleteTime']) : 0,
-            'accountId' => $item['accountId'],
-            'extendFields' => is_array($item['extendFields']) ? json_encode($item['extendFields']) : json_encode([]),
-            'accountUserName' => $item['accountUserName'],
-            'accountRealName' => $item['accountRealName'],
-            'accountNickname' => $item['accountNickname'],
-            'ownerAlias' => $item['ownerAlias'],
-            'ownerWechatId' => $item['ownerWechatId'],
-            'ownerNickname' => $item['ownerNickname'],
-            'ownerAvatar' => $item['ownerAvatar'],
-            'phone' => $item['phone'],
-            'thirdParty' => is_array($item['thirdParty']) ? json_encode($item['thirdParty']) : json_encode([]),
-            'groupId' => $item['groupId'],
-            'passTime' => !empty($item['isPassed']) && $item['passTime'] != '0001-01-01T00:00:00' ? strtotime($item['passTime']) : 0,
-            'additionalPicture' => $item['additionalPicture'],
-            'desc' => $item['desc'],
-            'country' => $item['country'],
-            'privince' => isset($item['privince']) ? $item['privince'] : '',
-            'city' => isset($item['city']) ? $item['city'] : '',
-            'createTime' => isset($item['createTime']) ? strtotime($item['createTime']) : 0,
-            'updateTime' => time()
-        ];
-
-        // 使用ID作为唯一性判断
-        $friend = WechatFriendModel::where('id', $item['id'])->find();
-
-        if ($friend) {
-            unset($data['siteLabels']);
-            $friend->save($data);
-            return true;
-        } else {
-            WechatFriendModel::create($data);
+        $sqlData = [];
+        foreach ($data as $item) {
+            $sqlData[] = [
+                'id' => $item['id'],
+                'wechatAccountId' => $item['wechatAccountId'],
+                'alias' => $item['alias'],
+                'wechatId' => $item['wechatId'],
+                'conRemark' => $item['conRemark'],
+                'nickname' => $item['nickname'],
+                'pyInitial' => $item['pyInitial'],
+                'quanPin' => $item['quanPin'],
+                'avatar' => $item['avatar'],
+                'gender' => $item['gender'],
+                'region' => $item['region'],
+                'addFrom' => $item['addFrom'],
+                'labels' => is_array($item['labels']) ? json_encode($item['labels']) : json_encode([]),
+                'siteLabels' => json_encode([]),
+                'signature' => $item['signature'],
+                'isDeleted' => $item['isDeleted'],
+                'isPassed' => $item['isPassed'],
+                'deleteTime' => !empty($item['isDeleted']) ? strtotime($item['deleteTime']) : 0,
+                'accountId' => $item['accountId'],
+                'extendFields' => is_array($item['extendFields']) ? json_encode($item['extendFields']) : json_encode([]),
+                'accountUserName' => $item['accountUserName'],
+                'accountRealName' => $item['accountRealName'],
+                'accountNickname' => $item['accountNickname'],
+                'ownerAlias' => $item['ownerAlias'],
+                'ownerWechatId' => $item['ownerWechatId'],
+                'ownerNickname' => $item['ownerNickname'],
+                'ownerAvatar' => $item['ownerAvatar'],
+                'phone' => $item['phone'],
+                'thirdParty' => is_array($item['thirdParty']) ? json_encode($item['thirdParty']) : json_encode([]),
+                'groupId' => $item['groupId'],
+                'passTime' => !empty($item['isPassed']) && $item['passTime'] != '0001-01-01T00:00:00' ? strtotime($item['passTime']) : 0,
+                'additionalPicture' => $item['additionalPicture'],
+                'desc' => $item['desc'],
+                'country' => $item['country'],
+                'privince' => isset($item['privince']) ? $item['privince'] : '',
+                'city' => isset($item['city']) ? $item['city'] : '',
+                'createTime' => isset($item['createTime']) ? strtotime($item['createTime']) : 0,
+                'updateTime' => time()
+            ];
+        }
+        if (empty($sqlData)) {
             return false;
         }
+
+        // 先查已存在ID，拆分插入与更新两批
+        $ids = array_column($sqlData, 'id');
+        $existingIds = WechatFriendModel::whereIn('id', $ids)->column('id');
+        $existingSet = array_flip($existingIds);
+
+        $toInsert = [];
+        $toUpdate = [];
+        foreach ($sqlData as $row) {
+            if (isset($existingSet[$row['id']])) {
+                $toUpdate[] = $row;
+            } else {
+                $toInsert[] = $row;
+            }
+        }
+
+        $isUpdate = false;
+        if (!empty($toInsert)) {
+            $m = new WechatFriendModel();
+            $m->insertAll($toInsert,true);
+            $isUpdate = false;
+        }
+        if (!empty($toUpdate)) {
+            // 批量更新使用 saveAll（按主键更新）
+            $m = new WechatFriendModel();
+            $m->saveAll($toUpdate);
+            $isUpdate = true;
+        }
+        return $isUpdate;
     }
 } 
\ No newline at end of file
diff --git a/Server/application/api/model/WechatFriendModel.php b/Server/application/api/model/WechatFriendModel.php
index 43c9c6cc..e99dd476 100644
--- a/Server/application/api/model/WechatFriendModel.php
+++ b/Server/application/api/model/WechatFriendModel.php
@@ -8,4 +8,9 @@ class WechatFriendModel extends Model
 {
     // 设置表名
     protected $table = 's2_wechat_friend';
+    protected $pk = 'id';
+
+    /*protected $pk = [
+        'uk_owner_wechat_account' => ['ownerWechatId', 'wechatId','wechatAccountId'] // uk_owner_wechat_account 是数据库中组合唯一键的名称
+    ];*/
 } 
\ No newline at end of file
diff --git a/Server/application/job/WechatFriendJob.php b/Server/application/job/WechatFriendJob.php
index 88bbd1da..e6af5fdc 100644
--- a/Server/application/job/WechatFriendJob.php
+++ b/Server/application/job/WechatFriendJob.php
@@ -79,7 +79,7 @@ class WechatFriendJob
                 'preFriendId' => $preFriendId,
             ], true, $isDel);
             $response = json_decode($result, true);
-            
+
             // 判断是否成功
             if ($response['code'] == 200) {
                 $data = $response['data'];

From 10838225135ffe17bf68e5643c1c2c6044849bbe Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Thu, 16 Oct 2025 10:59:08 +0800
Subject: [PATCH 15/72] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/AccountController.php      |  82 ++++----
 .../controller/WechatChatroomController.php   | 176 +++++++-----------
 .../api/controller/WechatFriendController.php | 135 ++++++--------
 3 files changed, 161 insertions(+), 232 deletions(-)

diff --git a/Server/application/api/controller/AccountController.php b/Server/application/api/controller/AccountController.php
index d2819b65..f239be00 100644
--- a/Server/application/api/controller/AccountController.php
+++ b/Server/application/api/controller/AccountController.php
@@ -62,7 +62,9 @@ class AccountController extends BaseController
 
             // 保存数据到数据库
             if (!empty($response['results'])) {
-                $this->saveAccount($response['results']);
+                foreach ($response['results'] as $item) {
+                    $this->saveAccount($item);
+                }
             }
 
             if ($isInner) {
@@ -701,60 +703,42 @@ class AccountController extends BaseController
      * 保存账号数据到数据库
      * @param array $item 账号数据
      */
-    private function saveAccount($data)
+    private function saveAccount($item)
     {
         // 将日期时间字符串转换为时间戳
         $createTime = isset($item['createTime']) ? strtotime($item['createTime']) : null;
         $deleteTime = isset($item['deleteTime']) ? strtotime($item['deleteTime']) : null;
-        $sqlData = [];
-        foreach ($data as $item) {
-            $rows[] = [
-                'id' => $item['id'],
-                'accountType' => isset($item['accountType']) ? $item['accountType'] : 0,
-                'status' => isset($item['status']) ? $item['status'] : 0,
-                'tenantId' => isset($item['tenantId']) ? $item['tenantId'] : 0,
-                'userName' => isset($item['userName']) ? $item['userName'] : '',
-                'realName' => isset($item['realName']) ? $item['realName'] : '',
-                'nickname' => isset($item['nickname']) ? $item['nickname'] : '',
-                'avatar' => isset($item['avatar']) ? $item['avatar'] : '',
-                'phone' => isset($item['phone']) ? $item['phone'] : '',
-                'memo' => isset($item['memo']) ? $item['memo'] : '',
-                'createTime' => $createTime,
-                'creator' => isset($item['creator']) ? $item['creator'] : 0,
-                'creatorUserName' => isset($item['creatorUserName']) ? $item['creatorUserName'] : '',
-                'creatorRealName' => isset($item['creatorRealName']) ? $item['creatorRealName'] : '',
-                'departmentId' => isset($item['departmentId']) ? $item['departmentId'] : 0,
-                'departmentName' => isset($item['departmentName']) ? $item['departmentName'] : '',
-                'privilegeIds' => isset($item['privilegeIds']) ? json_encode($item['privilegeIds']) : json_encode([]),
-                'alive' => isset($item['alive']) ? $item['alive'] : false,
-                'hasXiakeAccount' => isset($item['hasXiakeAccount']) ? $item['hasXiakeAccount'] : false,
-                'isDeleted' => isset($item['isDeleted']) ? $item['isDeleted'] : false,
-                'deleteTime' => $deleteTime
-            ];
-        }
 
-        // 拆分插入/更新：按主键 id 判断
-        $ids = array_column($rows, 'id');
-        $existingIds = CompanyAccountModel::whereIn('id', $ids)->column('id');
-        $existSet = array_flip($existingIds);
+        $data = [
+            'id' => $item['id'],
+            'accountType' => isset($item['accountType']) ? $item['accountType'] : 0,
+            'status' => isset($item['status']) ? $item['status'] : 0,
+            'tenantId' => isset($item['tenantId']) ? $item['tenantId'] : 0,
+            'userName' => isset($item['userName']) ? $item['userName'] : '',
+            'realName' => isset($item['realName']) ? $item['realName'] : '',
+            'nickname' => isset($item['nickname']) ? $item['nickname'] : '',
+            'avatar' => isset($item['avatar']) ? $item['avatar'] : '',
+            'phone' => isset($item['phone']) ? $item['phone'] : '',
+            'memo' => isset($item['memo']) ? $item['memo'] : '',
+            'createTime' => $createTime,
+            'creator' => isset($item['creator']) ? $item['creator'] : 0,
+            'creatorUserName' => isset($item['creatorUserName']) ? $item['creatorUserName'] : '',
+            'creatorRealName' => isset($item['creatorRealName']) ? $item['creatorRealName'] : '',
+            'departmentId' => isset($item['departmentId']) ? $item['departmentId'] : 0,
+            'departmentName' => isset($item['departmentName']) ? $item['departmentName'] : '',
+            'privilegeIds' => isset($item['privilegeIds']) ? json_encode($item['privilegeIds']) : json_encode([]),
+            'alive' => isset($item['alive']) ? $item['alive'] : false,
+            'hasXiakeAccount' => isset($item['hasXiakeAccount']) ? $item['hasXiakeAccount'] : false,
+            'isDeleted' => isset($item['isDeleted']) ? $item['isDeleted'] : false,
+            'deleteTime' => $deleteTime
+        ];
 
-        $toInsert = [];
-        $toUpdate = [];
-        foreach ($rows as $r) {
-            if (isset($existSet[$r['id']])) $toUpdate[] = $r; else $toInsert[] = $r;
+        // 使用tenantId作为唯一性判断
+        $account = CompanyAccountModel::where('id', $item['id'])->find();
+        if ($account) {
+            $account->save($data);
+        } else {
+            CompanyAccountModel::create($data);
         }
-
-        $changed = false;
-        if (!empty($toInsert)) {
-            $m = new CompanyAccountModel();
-            $m->insertAll($toInsert, true); // 允许外部主键
-            $changed = true;
-        }
-        if (!empty($toUpdate)) {
-            $m = new CompanyAccountModel();
-            $res = $m->saveAll($toUpdate);
-            if ($res) $changed = true;
-        }
-        return $changed;
     }
 } 
\ No newline at end of file
diff --git a/Server/application/api/controller/WechatChatroomController.php b/Server/application/api/controller/WechatChatroomController.php
index 82d28691..13e6f2b3 100644
--- a/Server/application/api/controller/WechatChatroomController.php
+++ b/Server/application/api/controller/WechatChatroomController.php
@@ -54,9 +54,11 @@ class WechatChatroomController extends BaseController
             // 保存数据到数据库
             if (!empty($response['results'])) {
                 $isUpdate = false;
-                $updated = $this->saveChatroom($response['results']);
-                if($updated && $isDel == 0){
-                    $isUpdate = true;
+                foreach ($response['results'] as $item) {
+                    $updated = $this->saveChatroom($item);
+                    if($updated && $isDel == 0){
+                        $isUpdate = true;
+                    }
                 }
             }
 
@@ -78,71 +80,53 @@ class WechatChatroomController extends BaseController
      * 保存群聊数据到数据库
      * @param array $item 群聊数据
      */
-    private function saveChatroom($data)
+    private function saveChatroom($item)
     {
-        $sqlData = [];
-        foreach ($data as $item) {
-            $sqlData[] = [
-                'id' => $item['id'],
-                'wechatAccountId' => $item['wechatAccountId'],
-                'wechatAccountAlias' => $item['wechatAccountAlias'],
-                'wechatAccountWechatId' => $item['wechatAccountWechatId'],
-                'wechatAccountAvatar' => $item['wechatAccountAvatar'],
-                'wechatAccountNickname' => $item['wechatAccountNickname'],
-                'chatroomId' => $item['chatroomId'],
-                'hasMe' => $item['hasMe'],
-                'chatroomOwnerNickname' => isset($item['chatroomOwnerNickname']) ? $item['chatroomOwnerNickname'] : '',
-                'chatroomOwnerAvatar' => isset($item['chatroomOwnerAvatar']) ? $item['chatroomOwnerAvatar'] : '',
-                'conRemark' => isset($item['conRemark']) ? $item['conRemark'] : '',
-                'nickname' => isset($item['nickname']) ? $item['nickname'] : '',
-                'pyInitial' => isset($item['pyInitial']) ? $item['pyInitial'] : '',
-                'quanPin' => isset($item['quanPin']) ? $item['quanPin'] : '',
-                'chatroomAvatar' => isset($item['chatroomAvatar']) ? $item['chatroomAvatar'] : '',
-                'members' => is_array($item['members']) ? json_encode($item['members']) : json_encode([]),
-                'isDeleted' => isset($item['isDeleted']) ? $item['isDeleted'] : 0,
-                'deleteTime' => !empty($item['isDeleted']) ? strtotime($item['deleteTime']) : 0,
-                'createTime' => isset($item['createTime']) ? strtotime($item['createTime']) : 0,
-                'accountId' => isset($item['accountId']) ? $item['accountId'] : 0,
-                'accountUserName' => isset($item['accountUserName']) ? $item['accountUserName'] : '',
-                'accountRealName' => isset($item['accountRealName']) ? $item['accountRealName'] : '',
-                'accountNickname' => isset($item['accountNickname']) ? $item['accountNickname'] : '',
-                'groupId' => isset($item['groupId']) ? $item['groupId'] : 0,
-                'updateTime' => time()
-            ];
-        }
+        $data = [
+            'id' => $item['id'],
+            'wechatAccountId' => $item['wechatAccountId'],
+            'wechatAccountAlias' => $item['wechatAccountAlias'],
+            'wechatAccountWechatId' => $item['wechatAccountWechatId'],
+            'wechatAccountAvatar' => $item['wechatAccountAvatar'],
+            'wechatAccountNickname' => $item['wechatAccountNickname'],
+            'chatroomId' => $item['chatroomId'],
+            'hasMe' => $item['hasMe'],
+            'chatroomOwnerNickname' => isset($item['chatroomOwnerNickname']) ? $item['chatroomOwnerNickname'] : '',
+            'chatroomOwnerAvatar' => isset($item['chatroomOwnerAvatar']) ? $item['chatroomOwnerAvatar'] : '',
+            'conRemark' => isset($item['conRemark']) ? $item['conRemark'] : '',
+            'nickname' => isset($item['nickname']) ? $item['nickname'] : '',
+            'pyInitial' => isset($item['pyInitial']) ? $item['pyInitial'] : '',
+            'quanPin' => isset($item['quanPin']) ? $item['quanPin'] : '',
+            'chatroomAvatar' => isset($item['chatroomAvatar']) ? $item['chatroomAvatar'] : '',
+            'members' => is_array($item['members']) ? json_encode($item['members']) : json_encode([]),
+            'isDeleted' => isset($item['isDeleted']) ? $item['isDeleted'] : 0,
+            'deleteTime' => !empty($item['isDeleted']) ? strtotime($item['deleteTime']) : 0,
+            'createTime' => isset($item['createTime']) ? strtotime($item['createTime']) : 0,
+            'accountId' => isset($item['accountId']) ? $item['accountId'] : 0,
+            'accountUserName' => isset($item['accountUserName']) ? $item['accountUserName'] : '',
+            'accountRealName' => isset($item['accountRealName']) ? $item['accountRealName'] : '',
+            'accountNickname' => isset($item['accountNickname']) ? $item['accountNickname'] : '',
+            'groupId' => isset($item['groupId']) ? $item['groupId'] : 0,
+            'updateTime' => time()
+        ];
 
-        if (empty($sqlData)) {
+        // 使用chatroomId和wechatAccountId的组合作为唯一性判断
+        $chatroom = WechatChatroomModel::where('id',$item['id'])->find();
+
+        if ($chatroom) {
+            $chatroom->save($data);
+            return true;
+        } else {
+            WechatChatroomModel::create($data);
             return false;
         }
 
-        // 先查已存在ID，拆分插入与更新两批（参考 WechatFriendController）
-        $ids = array_column($sqlData, 'id');
-        $existingIds = WechatChatroomModel::whereIn('id', $ids)->column('id');
-        $existingSet = array_flip($existingIds);
-
-        $toInsert = [];
-        $toUpdate = [];
-        foreach ($sqlData as $row) {
-            if (isset($existingSet[$row['id']])) {
-                $toUpdate[] = $row;
-            } else {
-                $toInsert[] = $row;
-            }
-        }
-
-        $isUpdate = false;
-        if (!empty($toInsert)) {
-            $m = new WechatChatroomModel();
-            // 批量插入（允许外部主键）
-            $m->insertAll($toInsert, true);
-            $isUpdate = false;
-        }
-        if (!empty($toUpdate)) {
-            $m = new WechatChatroomModel();
-            $m->saveAll($toUpdate);
-            $isUpdate = true;
-        }
-        return $isUpdate;
+        // // 同时保存群成员数据
+        // if (!empty($item['members'])) {
+        //     foreach ($item['members'] as $member) {
+        //         $this->saveChatroomMember($member, $item['chatroomId']);
+        //     }
+        // }
     }
 
     /**
@@ -190,7 +174,9 @@ class WechatChatroomController extends BaseController
 
             // 保存数据到数据库
             if (!empty($response)) {
-                $this->saveChatroomMember($response, $chatroomId);
+                foreach ($response as $item) {
+                    $this->saveChatroomMember($item, $chatroomId);
+                }
             }
             
             if($isInner){
@@ -212,50 +198,30 @@ class WechatChatroomController extends BaseController
      * @param array $item 群成员数据
      * @param string $wechatChatroomId 微信群ID
      */
-    private function saveChatroomMember($data, $wechatChatroomId)
+    private function saveChatroomMember($item, $wechatChatroomId)
     {
-        $sqlData = [];
-        foreach ($data as $item) {
-            $sqlData[] = [
-                'chatroomId' => $wechatChatroomId,
-                'wechatId' => isset($item['wechatId']) ? $item['wechatId'] : '',
-                'nickname' => isset($item['nickname']) ? $item['nickname'] : '',
-                'avatar' => isset($item['avatar']) ? $item['avatar'] : '',
-                'conRemark' => isset($item['conRemark']) ? $item['conRemark'] : '',
-                'alias' => isset($item['alias']) ? $item['alias'] : '',
-                'friendType' => isset($item['friendType']) ? $item['friendType'] : false,
-                'updateTime' => time()
-            ];
-        }
+        $data = [
+            'chatroomId' => $wechatChatroomId,
+            'wechatId' => isset($item['wechatId']) ? $item['wechatId'] : '',
+            'nickname' => isset($item['nickname']) ? $item['nickname'] : '',
+            'avatar' => isset($item['avatar']) ? $item['avatar'] : '',
+            'conRemark' => isset($item['conRemark']) ? $item['conRemark'] : '',
+            'alias' => isset($item['alias']) ? $item['alias'] : '',
+            'friendType' => isset($item['friendType']) ? $item['friendType'] : false,
+            'updateTime' => time()
+        ];
 
-        if (empty($sqlData)) {
-            return false;
-        }
+        // 使用chatroomId和wechatId的组合作为唯一性判断
+        $member = WechatChatroomMemberModel::where([
+            ['chatroomId', '=', $wechatChatroomId],
+            ['wechatId', '=', $item['wechatId']]
+        ])->find();
 
-        // 使用 (chatroomId, wechatId) 组合作为唯一性判断，拆分插入与更新
-        $existing = WechatChatroomMemberModel::where('chatroomId', $wechatChatroomId)
-            ->column('id,wechatId', 'wechatId');
-
-        $toInsert = [];
-        $toUpdate = [];
-        foreach ($sqlData as $row) {
-            $wid = $row['wechatId'];
-            if ($wid !== '' && isset($existing[$wid])) {
-                // 带上主键以便 saveAll 根据主键更新
-                $row['id'] = $existing[$wid]['id'] ?? $existing[$wid];
-                $toUpdate[] = $row;
-            } else {
-                $toInsert[] = $row;
-            }
-        }
-
-        if (!empty($toInsert)) {
-            $m = new WechatChatroomMemberModel();
-            $m->insertAll($toInsert, true);
-        }
-        if (!empty($toUpdate)) {
-            $m = new WechatChatroomMemberModel();
-            $m->saveAll($toUpdate);
+        if ($member) {
+            $member->savea($data);
+        } else {
+            $data['createTime'] = time();
+            WechatChatroomMemberModel::create($data);
         }
     }
 
diff --git a/Server/application/api/controller/WechatFriendController.php b/Server/application/api/controller/WechatFriendController.php
index 6bc2874b..18fbe438 100644
--- a/Server/application/api/controller/WechatFriendController.php
+++ b/Server/application/api/controller/WechatFriendController.php
@@ -3,7 +3,6 @@
 namespace app\api\controller;
 
 use app\api\model\WechatFriendModel;
-use think\Db;
 use think\facade\Request;
 use think\facade\Log;
 
@@ -76,12 +75,15 @@ class WechatFriendController extends BaseController
             // 发送请求获取好友列表
             $result = requestCurl($this->baseUrl . 'api/WechatFriend/friendlistData', $params, 'POST', $header, 'json');
             $response = handleApiResponse($result);
+
             // 保存数据到数据库
             if (is_array($response)) {
                 $isUpdate = false;
-                $updated = $this->saveFriend($response);
-                if($updated && $isDel == 0){
-                    $isUpdate = true;
+                foreach ($response as $item) {
+                    $updated = $this->saveFriend($item);
+                    if($updated && $isDel == 0){
+                        $isUpdate = true;
+                    }
                 }
             }
             
@@ -105,82 +107,59 @@ class WechatFriendController extends BaseController
      * @param array $item 微信好友数据
      * @return bool 是否创建或更新了记录
      */
-    private function saveFriend($data)
+    private function saveFriend($item)
     {
-        $sqlData = [];
-        foreach ($data as $item) {
-            $sqlData[] = [
-                'id' => $item['id'],
-                'wechatAccountId' => $item['wechatAccountId'],
-                'alias' => $item['alias'],
-                'wechatId' => $item['wechatId'],
-                'conRemark' => $item['conRemark'],
-                'nickname' => $item['nickname'],
-                'pyInitial' => $item['pyInitial'],
-                'quanPin' => $item['quanPin'],
-                'avatar' => $item['avatar'],
-                'gender' => $item['gender'],
-                'region' => $item['region'],
-                'addFrom' => $item['addFrom'],
-                'labels' => is_array($item['labels']) ? json_encode($item['labels']) : json_encode([]),
-                'siteLabels' => json_encode([]),
-                'signature' => $item['signature'],
-                'isDeleted' => $item['isDeleted'],
-                'isPassed' => $item['isPassed'],
-                'deleteTime' => !empty($item['isDeleted']) ? strtotime($item['deleteTime']) : 0,
-                'accountId' => $item['accountId'],
-                'extendFields' => is_array($item['extendFields']) ? json_encode($item['extendFields']) : json_encode([]),
-                'accountUserName' => $item['accountUserName'],
-                'accountRealName' => $item['accountRealName'],
-                'accountNickname' => $item['accountNickname'],
-                'ownerAlias' => $item['ownerAlias'],
-                'ownerWechatId' => $item['ownerWechatId'],
-                'ownerNickname' => $item['ownerNickname'],
-                'ownerAvatar' => $item['ownerAvatar'],
-                'phone' => $item['phone'],
-                'thirdParty' => is_array($item['thirdParty']) ? json_encode($item['thirdParty']) : json_encode([]),
-                'groupId' => $item['groupId'],
-                'passTime' => !empty($item['isPassed']) && $item['passTime'] != '0001-01-01T00:00:00' ? strtotime($item['passTime']) : 0,
-                'additionalPicture' => $item['additionalPicture'],
-                'desc' => $item['desc'],
-                'country' => $item['country'],
-                'privince' => isset($item['privince']) ? $item['privince'] : '',
-                'city' => isset($item['city']) ? $item['city'] : '',
-                'createTime' => isset($item['createTime']) ? strtotime($item['createTime']) : 0,
-                'updateTime' => time()
-            ];
-        }
-        if (empty($sqlData)) {
+        $data = [
+            'id' => $item['id'],
+            'wechatAccountId' => $item['wechatAccountId'],
+            'alias' => $item['alias'],
+            'wechatId' => $item['wechatId'],
+            'conRemark' => $item['conRemark'],
+            'nickname' => $item['nickname'],
+            'pyInitial' => $item['pyInitial'],
+            'quanPin' => $item['quanPin'],
+            'avatar' => $item['avatar'],
+            'gender' => $item['gender'],
+            'region' => $item['region'],
+            'addFrom' => $item['addFrom'],
+            'labels' => is_array($item['labels']) ? json_encode($item['labels']) : json_encode([]),
+            'siteLabels' => json_encode([]),
+            'signature' => $item['signature'],
+            'isDeleted' => $item['isDeleted'],
+            'isPassed' => $item['isPassed'],
+            'deleteTime' => !empty($item['isDeleted']) ? strtotime($item['deleteTime']) : 0,
+            'accountId' => $item['accountId'],
+            'extendFields' => is_array($item['extendFields']) ? json_encode($item['extendFields']) : json_encode([]),
+            'accountUserName' => $item['accountUserName'],
+            'accountRealName' => $item['accountRealName'],
+            'accountNickname' => $item['accountNickname'],
+            'ownerAlias' => $item['ownerAlias'],
+            'ownerWechatId' => $item['ownerWechatId'],
+            'ownerNickname' => $item['ownerNickname'],
+            'ownerAvatar' => $item['ownerAvatar'],
+            'phone' => $item['phone'],
+            'thirdParty' => is_array($item['thirdParty']) ? json_encode($item['thirdParty']) : json_encode([]),
+            'groupId' => $item['groupId'],
+            'passTime' => !empty($item['isPassed']) && $item['passTime'] != '0001-01-01T00:00:00' ? strtotime($item['passTime']) : 0,
+            'additionalPicture' => $item['additionalPicture'],
+            'desc' => $item['desc'],
+            'country' => $item['country'],
+            'privince' => isset($item['privince']) ? $item['privince'] : '',
+            'city' => isset($item['city']) ? $item['city'] : '',
+            'createTime' => isset($item['createTime']) ? strtotime($item['createTime']) : 0,
+            'updateTime' => time()
+        ];
+
+        // 使用ID作为唯一性判断
+        $friend = WechatFriendModel::where('id', $item['id'])->find();
+
+        if ($friend) {
+            unset($data['siteLabels']);
+            $friend->save($data);
+            return true;
+        } else {
+            WechatFriendModel::create($data);
             return false;
         }
-
-        // 先查已存在ID，拆分插入与更新两批
-        $ids = array_column($sqlData, 'id');
-        $existingIds = WechatFriendModel::whereIn('id', $ids)->column('id');
-        $existingSet = array_flip($existingIds);
-
-        $toInsert = [];
-        $toUpdate = [];
-        foreach ($sqlData as $row) {
-            if (isset($existingSet[$row['id']])) {
-                $toUpdate[] = $row;
-            } else {
-                $toInsert[] = $row;
-            }
-        }
-
-        $isUpdate = false;
-        if (!empty($toInsert)) {
-            $m = new WechatFriendModel();
-            $m->insertAll($toInsert,true);
-            $isUpdate = false;
-        }
-        if (!empty($toUpdate)) {
-            // 批量更新使用 saveAll（按主键更新）
-            $m = new WechatFriendModel();
-            $m->saveAll($toUpdate);
-            $isUpdate = true;
-        }
-        return $isUpdate;
     }
 } 
\ No newline at end of file

From 8bf6cbe1d493f97a46ea02aa6f30f13417d48af7 Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Thu, 16 Oct 2025 11:42:59 +0800
Subject: [PATCH 16/72] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Server/application/command/WechatChatroomCommand.php            | 1 +
 Server/application/command/WechatFriendCommand.php              | 1 +
 .../cunkebao/controller/plan/PlanSceneV1Controller.php          | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Server/application/command/WechatChatroomCommand.php b/Server/application/command/WechatChatroomCommand.php
index b751435b..e770b4b4 100644
--- a/Server/application/command/WechatChatroomCommand.php
+++ b/Server/application/command/WechatChatroomCommand.php
@@ -38,6 +38,7 @@ class WechatChatroomCommand extends Command
             
             // 检查队列是否已经在运行
             $queueLockKey = "queue_lock:{$this->queueName}:{$isDel}";
+            Cache::rm($queueLockKey);
             if (Cache::get($queueLockKey)) {
                 $output->writeln("队列 {$this->queueName} 已经在运行中，删除状态:{$isDel}，跳过执行");
                 Log::warning("队列 {$this->queueName} 已经在运行中，删除状态:{$isDel}，跳过执行");
diff --git a/Server/application/command/WechatFriendCommand.php b/Server/application/command/WechatFriendCommand.php
index 3978f218..71a20e6a 100644
--- a/Server/application/command/WechatFriendCommand.php
+++ b/Server/application/command/WechatFriendCommand.php
@@ -38,6 +38,7 @@ class WechatFriendCommand extends Command
             
             // 检查队列是否已经在运行
             $queueLockKey = "queue_lock:{$this->queueName}:{$isDel}";
+            Cache::rm($queueLockKey);
             if (Cache::get($queueLockKey)) {
                 $output->writeln("队列 {$this->queueName} 已经在运行中，删除状态:{$isDel}，跳过执行");
                 Log::warning("队列 {$this->queueName} 已经在运行中，删除状态:{$isDel}，跳过执行");
diff --git a/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php b/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php
index c4cd7e08..c71643ee 100644
--- a/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php
+++ b/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php
@@ -458,7 +458,7 @@ class PlanSceneV1Controller extends BaseController
         $total = $query->count();
         $list  = $query->page($page, $pageSize)->order('id', 'desc')->select();
         foreach ($list as &$item) {
-            unset($item['fail_reason'],$item['processed_wechat_ids'],$item['task_id']);
+            unset($item['processed_wechat_ids'],$item['task_id']);
             $userinfo = Db::table('s2_wechat_friend')
                 ->field('alias,wechatId,nickname,avatar')
                 ->where('alias|wechatId|phone|conRemark','like','%'.$item['phone'].'%')

From d31926434930ac3c209f5b0f6fe6ca1d1c2332a8 Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Thu, 16 Oct 2025 15:36:44 +0800
Subject: [PATCH 17/72] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Server/application/chukebao/config/route.php  |  1 +
 .../chukebao/controller/DataProcessing.php    | 82 +++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 Server/application/chukebao/controller/DataProcessing.php

diff --git a/Server/application/chukebao/config/route.php b/Server/application/chukebao/config/route.php
index 1af6fa36..9dd32c2c 100644
--- a/Server/application/chukebao/config/route.php
+++ b/Server/application/chukebao/config/route.php
@@ -166,6 +166,7 @@ Route::group('v1/', function () {
         });
 
 
+        Route::post('dataProcessing', 'app\chukebao\controller\DataProcessing@index'); // 修改数据
 
     });
 
diff --git a/Server/application/chukebao/controller/DataProcessing.php b/Server/application/chukebao/controller/DataProcessing.php
new file mode 100644
index 00000000..46e7e68a
--- /dev/null
+++ b/Server/application/chukebao/controller/DataProcessing.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace app\chukebao\controller;
+
+use library\ResponseHelper;
+use app\api\model\WechatFriendModel;
+
+class DataProcessing extends BaseController
+{
+    public function index()
+    {
+        $userId = $this->getUserInfo('id');
+        $companyId = $this->getUserInfo('companyId');
+        $type = $this->request->param('type', '');
+        $wechatAccountId = $this->request->param('wechatAccountId', '');
+        //微信好友
+        $toAccountId = $this->request->param('toAccountId', '');
+        $wechatFriendId = $this->request->param('wechatFriendId', '');
+        $newRemark = $this->request->param('newRemark', '');
+        $labels = $this->request->param('labels', []);
+        //微信群
+        $wechatChatroomId = $this->request->param('wechatChatroomId', '');
+        $typeData = [
+            'CmdModifyFriendRemark', //好友修改备注  {newRemark、wechatAccountId、wechatFriendId}
+            'CmdModifyFriendLabel', //好友修改标签  {labels、wechatAccountId、wechatFriendId}
+            'CmdAllotFriend', //转让好友  {labels、wechatAccountId、wechatFriendId}
+            'CmdChatroomOperate', //修改群信息  {chatroomName（群名）、announce（公告）、extra（公告）、wechatAccountId、wechatChatroomId}
+        ];
+
+        if (empty($type) || empty($wechatAccountId)) {
+            return ResponseHelper::error('参数缺失');
+        }
+
+        if (!in_array($type, $typeData)) {
+            return ResponseHelper::error('类型错误');
+        }
+        $msg = '';
+        switch ($type) {
+            case 'CmdModifyFriendRemark': //修改好友备注
+                if(empty($wechatFriendId) || empty($newRemark)){
+                    return ResponseHelper::error('参数缺失');
+                }
+                $friend = WechatFriendModel::where(['id' => $wechatFriendId,'wechatAccountId' => $wechatAccountId])->find();
+                if(empty($friend)){
+                    return ResponseHelper::error('好友不存在');
+                }
+                $friend->conRemark = $newRemark;
+                $friend->updateTime = time();
+                $friend->save();
+                $msg = '修改备成功';
+                break;
+            case 'CmdModifyFriendLabel': //修改好友标签
+                if(empty($wechatFriendId)){
+                    return ResponseHelper::error('参数缺失');
+                }
+                $friend = WechatFriendModel::where(['id' => $wechatFriendId,'wechatAccountId' => $wechatAccountId])->find();
+                if(empty($friend)){
+                    return ResponseHelper::error('好友不存在');
+                }
+                $friend->labels = json_encode($labels,256);
+                $friend->updateTime = time();
+                $friend->save();
+                $msg = '修标签成功';
+                break;
+            case 'CmdAllotFriend':
+                if(empty($toAccountId)){
+                    return ResponseHelper::error('参数缺失');
+                }
+
+                $friend = WechatFriendModel::where(['id' => $wechatFriendId,'wechatAccountId' => $wechatAccountId])->find();
+                if(empty($friend)){
+                    return ResponseHelper::error('好友不存在');
+                }
+                $friend->accountId = $toAccountId;
+                $friend->updateTime = time();
+                $friend->save();
+                $msg = '好友转移成功';
+                break;
+        }
+        return ResponseHelper::success('',$msg);
+    }
+}
\ No newline at end of file

From 87bf284943b5938815363cb6c758421c2ea0cbae Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Thu, 16 Oct 2025 16:04:53 +0800
Subject: [PATCH 18/72] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WechatFriendController.php     | 51 +++++++++++--------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/Server/application/chukebao/controller/WechatFriendController.php b/Server/application/chukebao/controller/WechatFriendController.php
index 32325c7d..0dce6dc2 100644
--- a/Server/application/chukebao/controller/WechatFriendController.php
+++ b/Server/application/chukebao/controller/WechatFriendController.php
@@ -9,24 +9,24 @@ use think\Db;
 class WechatFriendController extends BaseController
 {
 
-    public function getList(){
+    public function getList()
+    {
         $page = $this->request->param('page', 1);
-        $limit =  $this->request->param('limit', 10);
+        $limit = $this->request->param('limit', 10);
         $accountId = $this->getUserInfo('s2_accountId');
-        if (empty($accountId)){
+        if (empty($accountId)) {
             return ResponseHelper::error('请先登录');
         }
         $query = Db::table('s2_wechat_friend')
-            ->where(['accountId' => $accountId,'isDeleted' => 0])
+            ->where(['accountId' => $accountId, 'isDeleted' => 0])
             ->order('id desc');
         $total = $query->count();
         $list = $query->page($page, $limit)->select();
 
 
-
         // 提取所有好友ID
         $friendIds = array_column($list, 'id');
-        
+
         // 一次性查询所有好友的未读消息数量
         $unreadCounts = [];
         if (!empty($friendIds)) {
@@ -36,12 +36,13 @@ class WechatFriendController extends BaseController
                 ->where('isRead', 0)
                 ->group('wechatFriendId')
                 ->select();
-            
-            foreach ($unreadResults as $result) {
-                $unreadCounts[$result['wechatFriendId']] = $result['count'];
+            if (!empty($unreadResults)) {
+                foreach ($unreadResults as $result) {
+                    $unreadCounts[$result['wechatFriendId']] = $result['count'];
+                }
             }
         }
-        
+
         // 一次性查询所有好友的最新消息
         $latestMessages = [];
         if (!empty($friendIds)) {
@@ -51,17 +52,23 @@ class WechatFriendController extends BaseController
                 ->where('wechatFriendId', 'in', $friendIds)
                 ->group('wechatFriendId')
                 ->buildSql();
-            
-            // 查询最新消息的详细信息
-            $messageResults = Db::table('s2_wechat_message')
-                ->alias('m')
-                ->join([$subQuery => 'sub'], 'm.id = sub.max_id')
-                ->field('m.*, sub.wechatFriendId')
-                ->select();
-            
-            foreach ($messageResults as $message) {
-                $latestMessages[$message['wechatFriendId']] = $message;
+
+            if (!empty($subQuery)) {
+                // 查询最新消息的详细信息
+                $messageResults = Db::table('s2_wechat_message')
+                    ->alias('m')
+                    ->join([$subQuery => 'sub'], 'm.id = sub.max_id')
+                    ->field('m.*, sub.wechatFriendId')
+                    ->select();
+
+                if (!empty($messageResults)) {
+                    foreach ($messageResults as $message) {
+                        $latestMessages[$message['wechatFriendId']] = $message;
+                    }
+                }
             }
+
+
         }
 
 
@@ -85,13 +92,13 @@ class WechatFriendController extends BaseController
                 'chat' => isset($latestMessages[$v['id']]),
                 'msgTime' => isset($latestMessages[$v['id']]) ? $latestMessages[$v['id']]['wechatTime'] : 0
             ];
-            
+
             // 将消息配置添加到好友数据中
             $v['config'] = $config;
             $v['aiType'] = isset($aiTypeData[$v['id']]) ? $aiTypeData[$v['id']] : 0;
         }
         unset($v);
 
-        return ResponseHelper::success(['list'=>$list,'total'=>$total]);
+        return ResponseHelper::success(['list' => $list, 'total' => $total]);
     }
 }
\ No newline at end of file

From 527d5341db3c62e326ddf932a1f17b884e30884d Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Mon, 20 Oct 2025 14:22:20 +0800
Subject: [PATCH 19/72] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chukebao/controller/DataProcessing.php    |   2 +-
 .../common/model/TrafficSourcePackage.php     |  17 ++
 .../common/model/TrafficSourcePackageItem.php |  17 ++
 Server/application/cunkebao/config/route.php  |  11 +-
 .../cunkebao/controller/RFMController.php     |   2 +-
 .../cunkebao/controller/TrafficController.php | 259 +++++++++++++++++-
 .../PostCreateAddFriendPlanV1Controller.php   |   1 -
 .../PostUpdateAddFriendPlanV1Controller.php   |   1 -
 8 files changed, 301 insertions(+), 9 deletions(-)
 create mode 100644 Server/application/common/model/TrafficSourcePackage.php
 create mode 100644 Server/application/common/model/TrafficSourcePackageItem.php

diff --git a/Server/application/chukebao/controller/DataProcessing.php b/Server/application/chukebao/controller/DataProcessing.php
index 46e7e68a..04344a74 100644
--- a/Server/application/chukebao/controller/DataProcessing.php
+++ b/Server/application/chukebao/controller/DataProcessing.php
@@ -62,7 +62,7 @@ class DataProcessing extends BaseController
                 $friend->save();
                 $msg = '修标签成功';
                 break;
-            case 'CmdAllotFriend':
+            case 'CmdAllotFriend': //迁移好友
                 if(empty($toAccountId)){
                     return ResponseHelper::error('参数缺失');
                 }
diff --git a/Server/application/common/model/TrafficSourcePackage.php b/Server/application/common/model/TrafficSourcePackage.php
new file mode 100644
index 00000000..c9c5e611
--- /dev/null
+++ b/Server/application/common/model/TrafficSourcePackage.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace app\common\model;
+
+use think\Model;
+
+/**
+ * 流量池模型类
+ */
+class TrafficSourcePackage extends Model
+{
+
+    // 设置数据表名
+    protected $name = 'traffic_source_package';
+
+
+} 
\ No newline at end of file
diff --git a/Server/application/common/model/TrafficSourcePackageItem.php b/Server/application/common/model/TrafficSourcePackageItem.php
new file mode 100644
index 00000000..923d842e
--- /dev/null
+++ b/Server/application/common/model/TrafficSourcePackageItem.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace app\common\model;
+
+use think\Model;
+
+/**
+ * 流量池模型类
+ */
+class TrafficSourcePackageItem extends Model
+{
+
+    // 设置数据表名
+    protected $name = 'traffic_source_package_item';
+
+
+} 
\ No newline at end of file
diff --git a/Server/application/cunkebao/config/route.php b/Server/application/cunkebao/config/route.php
index 02519844..d865852a 100644
--- a/Server/application/cunkebao/config/route.php
+++ b/Server/application/cunkebao/config/route.php
@@ -63,13 +63,20 @@ Route::group('v1/', function () {
     // 流量池相关
     Route::group('traffic/pool', function () {
         Route::get('getPackage', 'app\cunkebao\controller\TrafficController@getPackage');
+        Route::post('addPackage', 'app\cunkebao\controller\TrafficController@addPackage');
+        Route::post('editPackage', 'app\cunkebao\controller\TrafficController@editPackage');
+        Route::delete('deletePackage', 'app\cunkebao\controller\TrafficController@deletePackage');
+
+        Route::get('', 'app\cunkebao\controller\TrafficController@getTrafficPoolList');
 
 
-        Route::get('', 'app\cunkebao\controller\traffic\GetPotentialListWithInCompanyV1Controller@index');
+
+
+        //Route::get('', 'app\cunkebao\controller\traffic\GetPotentialListWithInCompanyV1Controller@index');
         Route::get('getUserJourney', 'app\cunkebao\controller\traffic\GetPotentialListWithInCompanyV1Controller@getUserJourney');
         Route::get('getUserTags', 'app\cunkebao\controller\traffic\GetPotentialListWithInCompanyV1Controller@getUserTags');
         Route::get('getUserInfo', 'app\cunkebao\controller\traffic\GetPotentialListWithInCompanyV1Controller@getUser');
-        Route::post('addPackage', 'app\cunkebao\controller\traffic\GetPotentialListWithInCompanyV1Controller@addPackage');
+       // Route::post('addPackage', 'app\cunkebao\controller\traffic\GetPotentialListWithInCompanyV1Controller@addPackage');
 
 
 
diff --git a/Server/application/cunkebao/controller/RFMController.php b/Server/application/cunkebao/controller/RFMController.php
index d6f0b42e..693e808e 100644
--- a/Server/application/cunkebao/controller/RFMController.php
+++ b/Server/application/cunkebao/controller/RFMController.php
@@ -11,7 +11,7 @@ class RFMController extends BaseController
      * @param float $monetary 购买金额
      * @return array{R:int,F:int,M:int}
      */
-    public static function calcRfmScores($recencyDays, $frequency, $monetary)
+    public static function calcRfmScores($recencyDays = 30, $frequency, $monetary)
     {
         $recencyDays = is_numeric($recencyDays) ? (int)$recencyDays : 9999;
         $frequency = max(0, (int)$frequency);
diff --git a/Server/application/cunkebao/controller/TrafficController.php b/Server/application/cunkebao/controller/TrafficController.php
index 4dfa1441..4ceefc9e 100644
--- a/Server/application/cunkebao/controller/TrafficController.php
+++ b/Server/application/cunkebao/controller/TrafficController.php
@@ -2,6 +2,8 @@
 
 namespace app\cunkebao\controller;
 
+use app\common\model\TrafficSourcePackage;
+use app\common\model\TrafficSourcePackageItem;
 use library\ResponseHelper;
 use think\Db;
 use app\cunkebao\controller\RFMController;
@@ -9,9 +11,15 @@ use app\cunkebao\controller\RFMController;
 class TrafficController extends BaseController
 {
 
+    /**
+     * 流量池包
+     * @return \think\response\Json
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
     public function getPackage()
     {
-
         $page = $this->request->param('page', 1);
         $limit = $this->request->param('limit', 10);
         $keyword = $this->request->param('keyword', '');
@@ -34,7 +42,7 @@ class TrafficController extends BaseController
         foreach ($list as $k => &$v) {
             if ($v['type'] != 1) {
                 $v['createTime'] = !empty($v['createTime']) ? formatRelativeTime($v['createTime']) : '';
-            }else{
+            } else {
                 $v['createTime'] = '';
             }
 
@@ -53,7 +61,6 @@ class TrafficController extends BaseController
             $v['F'] = $scores['F'];
             $v['M'] = $scores['M'];
             $v['RFM'] = $scores['R'] + $scores['F'] + $scores['M'];
-
         }
         unset($v);
 
@@ -65,4 +72,250 @@ class TrafficController extends BaseController
         return ResponseHelper::success($data);
     }
 
+    /**
+     * 添加流量池
+     * @return \think\response\Json
+     * @throws \Exception
+     */
+    public function addPackage()
+    {
+        $packageName = $this->request->param('packageName', '');
+        $description = $this->request->param('description', '');
+        $pic = $this->request->param('pic', '');
+        $companyId = $this->getUserInfo('companyId');
+        $userId = $this->getUserInfo('id');
+
+        if (empty($packageName)) {
+            return ResponseHelper::error('流量池名称不能为空');
+        }
+
+        $package = TrafficSourcePackage::where(['isDel' => 0, 'name' => $packageName])
+            ->whereIn('companyId', [$companyId, 0])
+            ->field('id,name')
+            ->find();
+        if (!empty($package)) {
+            return ResponseHelper::error('该流量池名称已存在');
+        }
+        $packageId = TrafficSourcePackage::insertGetId([
+            'userId' => $userId,
+            'companyId' => $companyId,
+            'name' => $packageName,
+            'description' => $description,
+            'pic' => $pic,
+            'matchingRules' => json_encode([]),
+            'createTime' => time(),
+            'isDel' => 0,
+        ]);
+
+        if (!empty($packageId)) {
+            return ResponseHelper::success($packageId, '该流量添加成功');
+        } else {
+            return ResponseHelper::error('该流量添加失败');
+        }
+    }
+
+    /**
+     * 编辑流量池
+     * @return \think\response\Json
+     * @throws \Exception
+     */
+    public function editPackage()
+    {
+        $packageId = $this->request->param('packageId', '');
+        $packageName = $this->request->param('packageName', '');
+        $description = $this->request->param('description', '');
+        $pic = $this->request->param('pic', '');
+        $companyId = $this->getUserInfo('companyId');
+        $userId = $this->getUserInfo('id');
+
+        if (empty($packageId)) {
+            return ResponseHelper::error('流量池ID不能为空');
+        }
+
+        if (empty($packageName)) {
+            return ResponseHelper::error('流量池名称不能为空');
+        }
+
+        // 检查流量池是否存在且属于当前公司
+        $package = TrafficSourcePackage::where(['id' => $packageId, 'isDel' => 0])
+            ->whereIn('companyId', [$companyId, 0])
+            ->find();
+        if (empty($package)) {
+            return ResponseHelper::error('流量池不存在或已删除');
+        }
+
+        // 检查系统流量池是否可编辑
+        if ($package['isSys'] == 1) {
+            return ResponseHelper::error('系统流量池不允许编辑');
+        }
+
+        // 检查名称是否重复（排除当前记录）
+        $existPackage = TrafficSourcePackage::where(['isDel' => 0, 'name' => $packageName])
+            ->whereIn('companyId', [$companyId, 0])
+            ->where('id', '<>', $packageId)
+            ->field('id,name')
+            ->find();
+        if (!empty($existPackage)) {
+            return ResponseHelper::error('该流量池名称已存在');
+        }
+
+        // 更新流量池信息
+        $updateData = [
+            'name' => $packageName,
+            'updateTime' => time(),
+        ];
+
+        // 更新描述字段（允许为空）
+        $updateData['description'] = $description;
+
+        // 更新图片字段（允许为空）
+        $updateData['pic'] = $pic;
+
+        $result = TrafficSourcePackage::where('id', $packageId)->update($updateData);
+
+        if ($result !== false) {
+            return ResponseHelper::success($packageId, '流量池编辑成功');
+        } else {
+            return ResponseHelper::error('流量池编辑失败');
+        }
+    }
+
+    /**
+     * 删除流量池（假删除）
+     * @return \think\response\Json
+     * @throws \Exception
+     */
+    public function deletePackage()
+    {
+        $packageId = $this->request->param('packageId', '');
+        $companyId = $this->getUserInfo('companyId');
+
+        if (empty($packageId)) {
+            return ResponseHelper::error('流量池ID不能为空');
+        }
+
+        // 检查流量池是否存在且属于当前公司
+        $package = TrafficSourcePackage::where(['id' => $packageId, 'isDel' => 0])
+            ->whereIn('companyId', [$companyId, 0])
+            ->find();
+        if (empty($package)) {
+            return ResponseHelper::error('流量池不存在或已删除');
+        }
+
+        // 检查系统流量池是否可删除
+        if ($package['isSys'] == 1) {
+            return ResponseHelper::error('系统流量池不允许删除');
+        }
+
+        // 开启事务
+        Db::startTrans();
+        try {
+            // 执行流量池假删除
+            $result = TrafficSourcePackage::where('id', $packageId)->update([
+                'isDel' => 1,
+                'deleteTime' => time()
+            ]);
+
+            if ($result === false) {
+                throw new \Exception('流量池删除失败');
+            }
+
+            // 删除流量池内容（TrafficSourcePackageItem）假删除
+            $itemResult = TrafficSourcePackageItem::where([
+                'packageId' => $packageId,
+                'companyId' => $companyId,
+                'isDel' => 0
+            ])->update([
+                'isDel' => 1,
+                'deleteTime' => time()
+            ]);
+
+            // 提交事务
+            Db::commit();
+            
+            return ResponseHelper::success($packageId, '流量池及内容删除成功');
+            
+        } catch (\Exception $e) {
+            // 回滚事务
+            Db::rollback();
+            return ResponseHelper::error('删除失败：' . $e->getMessage());
+        }
+    }
+
+
+    /**
+     * 流量池列表
+     * @return \think\response\Json
+     * @throws \Exception
+     */
+    public function getTrafficPoolList()
+    {
+        $page = $this->request->param('page', 1);
+        $limit = $this->request->param('limit', 10);
+        $keyword = $this->request->param('keyword', '');
+        $packageId = $this->request->param('packageId', '');
+        $companyId = $this->getUserInfo('companyId');
+        $userId = $this->getUserInfo('id');
+
+        if (empty($packageId)) {
+            return ResponseHelper::error('流量包id不能为空');
+        }
+
+        $trafficSourcePackage = TrafficSourcePackage::where(['id' => $packageId, 'isDel' => 0])->whereIn('companyId', [$companyId, 0])->find();
+        if (empty($trafficSourcePackage)) {
+            return ResponseHelper::error('流量包不存在或已删除');
+        }
+        $where = [
+            ['tspi.companyId', '=', $companyId],
+            ['tspi.packageId', '=', $packageId],
+        ];
+
+        if (empty($keyword)) {
+            $where[] = ['wa.nickname|wa.phone|wa.alias|wa.wechatId|p.mobile|p.identifier', 'like', '%' . $keyword . '%'];
+        }
+
+        $query = TrafficSourcePackageItem::alias('tspi')
+            ->field(
+                [
+                    'p.id', 'p.identifier', 'p.mobile', 'p.wechatId', 'tspi.companyId',
+                    'wa.nickname', 'wa.avatar', 'wa.gender', 'wa.phone', 'wa.alias'
+                ]
+            )
+            ->join('traffic_pool p', 'p.identifier=tspi.identifier', 'left')
+            ->join('wechat_account wa', 'tspi.identifier=wa.wechatId', 'left')
+            ->where($where);
+
+        $query->order('tspi.id DESC,p.id DESC')->group('p.identifier');
+
+        $list = $query->page($page, $limit)->select()->toArray();
+        $total = $query->count();
+
+        foreach ($list as $k => &$v) {
+            //流量池筛选
+            $package = TrafficSourcePackageItem::alias('tspi')
+                ->join('traffic_source_package p', 'tspi.packageId=p.id AND tspi.companyId=p.companyId')
+                ->where(['tspi.identifier' => $v['identifier']])
+                ->whereIn('tspi.companyId', [0, $v['companyId']])
+                ->column('p.name');
+            $v['packages'] = $package;
+            $v['phone'] = !empty($v['phone']) ? $v['phone'] : $v['mobile'];
+            unset($v['mobile']);
+
+
+            $scores = RFMController::calcRfmScores(30, 30, 30);
+            $v['R'] = $scores['R'];
+            $v['F'] = $scores['F'];
+            $v['M'] = $scores['M'];
+            $v['RFM'] = $scores['R'] + $scores['F'] + $scores['M'];
+            $v['money'] = 2222;
+            $v['msgCount'] = 2222;
+            $v['tag'] = ['test', 'test2'];
+        }
+        unset($v);
+
+
+        $data = ['list' => $list, 'total' => $total];
+        return ResponseHelper::success($data);
+    }
+
 }
\ No newline at end of file
diff --git a/Server/application/cunkebao/controller/plan/PostCreateAddFriendPlanV1Controller.php b/Server/application/cunkebao/controller/plan/PostCreateAddFriendPlanV1Controller.php
index 228841b6..9c670d1f 100644
--- a/Server/application/cunkebao/controller/plan/PostCreateAddFriendPlanV1Controller.php
+++ b/Server/application/cunkebao/controller/plan/PostCreateAddFriendPlanV1Controller.php
@@ -223,7 +223,6 @@ class PostCreateAddFriendPlanV1Controller extends BaseController
                     if (!empty($params['wechatGroups']) && is_array($params['wechatGroups'])) {
                         $rows = Db::name('wechat_group_member')->alias('gm')
                             ->join('wechat_account wa', 'gm.identifier = wa.wechatId')
-                            ->where('gm.companyId', $this->getUserInfo('companyId'))
                             ->whereIn('gm.groupId', $params['wechatGroups'])
                             ->group('gm.identifier')
                             ->column('wa.id,wa.wechatId,wa.alias,wa.phone');
diff --git a/Server/application/cunkebao/controller/plan/PostUpdateAddFriendPlanV1Controller.php b/Server/application/cunkebao/controller/plan/PostUpdateAddFriendPlanV1Controller.php
index e9810fd5..f5c0d3d1 100644
--- a/Server/application/cunkebao/controller/plan/PostUpdateAddFriendPlanV1Controller.php
+++ b/Server/application/cunkebao/controller/plan/PostUpdateAddFriendPlanV1Controller.php
@@ -198,7 +198,6 @@ class PostUpdateAddFriendPlanV1Controller extends BaseController
                     if (!empty($params['wechatGroups']) && is_array($params['wechatGroups'])) {
                         $rows = Db::name('wechat_group_member')->alias('gm')
                             ->join('wechat_account wa', 'gm.identifier = wa.wechatId')
-                            ->where('gm.companyId', $this->getUserInfo('companyId'))
                             ->whereIn('gm.groupId', $params['wechatGroups'])
                             ->group('gm.identifier')
                             ->column('wa.id,wa.wechatId,wa.alias,wa.phone');

From 52f4a2b1e139889e8f057a1a95eb632a798fb1e0 Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Mon, 20 Oct 2025 14:52:10 +0800
Subject: [PATCH 20/72] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Adapters/ChuKeBao/Adapter.php             | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/Server/extend/WeChatDeviceApi/Adapters/ChuKeBao/Adapter.php b/Server/extend/WeChatDeviceApi/Adapters/ChuKeBao/Adapter.php
index 08f720ea..a1ef4e3e 100644
--- a/Server/extend/WeChatDeviceApi/Adapters/ChuKeBao/Adapter.php
+++ b/Server/extend/WeChatDeviceApi/Adapters/ChuKeBao/Adapter.php
@@ -236,15 +236,17 @@ class Adapter implements WeChatServiceInterface
                     $task['processed_wechat_ids'] = $task['processed_wechat_ids'] . ',' . $wechatId; // 处理失败任务用，用于过滤已处理的微信号
                     break;
                 }
-                $res = Db::name('task_customer')
-                    ->where('id', $task['id'])
-                    ->update([
-                        'status' => $friendAddTaskCreated ? 1 : 3,
-                        'fail_reason' => '',
-                        'processed_wechat_ids' => $task['processed_wechat_ids'],
-                        'addTime' => time(),
-                        'updateTime' => time()
-                    ]);
+                if (!empty($friendAddTaskCreated)){
+                    Db::name('task_customer')
+                        ->where('id', $task['id'])
+                        ->update([
+                            'status' => $friendAddTaskCreated ? 1 : 3,
+                            'fail_reason' => '',
+                            'processed_wechat_ids' => $task['processed_wechat_ids'],
+                            'addTime' => time(),
+                            'updateTime' => time()
+                        ]);
+                }
                 // ~~不用管，回头再添加再判断即可~~
                 // 失败一定是另一个进程/定时器在检查的
 

From 64ad480bbb896dc0a49554717077b15f3b96520d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Mon, 20 Oct 2025 15:36:32 +0800
Subject: [PATCH 21/72] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=EF=BC=8C=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E4=BD=BF=E7=94=A8=E7=9A=84=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=92=8C=E6=A8=A1=E6=80=81=E6=A1=86=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F=E5=B8=83=E5=B1=80=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=91=E5=B8=83=E5=92=8C=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=8F=90=E5=8D=87?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=E5=92=8C=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EditMomentModal.tsx            | 222 +++++++++++
 .../components/MomentPublish.module.scss      | 200 ++++++++++
 .../components/MomentPublish.tsx              | 319 +++++++++++++++
 .../components/PreviewMomentModal.tsx         | 285 ++++++++++++++
 .../components/PublishSchedule.module.scss    | 352 +++++++++++++++++
 .../components/PublishSchedule.tsx            | 371 ++++++++++++++++++
 .../content-management/components/api.ts      |  86 ++++
 .../content-management/components/index.ts    |  13 +-
 .../management/KeywordManagement.tsx          | 318 ---------------
 .../management/MaterialManagement.tsx         | 320 ---------------
 .../management/SensitiveWordManagement.tsx    | 293 --------------
 .../components/management/index.module.scss   | 252 ------------
 .../components/management/index.ts            |   4 -
 .../components/modals/ContentManager.tsx      | 276 -------------
 .../components/modals/KeywordModal.tsx        | 288 --------------
 .../components/modals/MaterialModal.tsx       | 197 ----------
 .../components/modals/SensitiveWordModal.tsx  | 203 ----------
 .../components/modals/index.ts                |   5 -
 .../content-management/index.module.scss      |  36 +-
 .../powerCenter/content-management/index.tsx  | 129 ++----
 .../components/MessageRecord/index.tsx        |   2 +-
 .../components/SidebarMenu/MessageList/api.ts |  25 ++
 .../SidebarMenu/MessageList/index.tsx         |  55 ++-
 Touchkebao/src/pages/pc/ckbox/weChat/main.ts  |   4 +-
 Touchkebao/src/store/module/weChat/weChat.ts  |   2 +-
 .../src/store/module/websocket/msgManage.ts   |  34 +-
 26 files changed, 1999 insertions(+), 2292 deletions(-)
 create mode 100644 Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/EditMomentModal.tsx
 create mode 100644 Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/MomentPublish.module.scss
 create mode 100644 Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/MomentPublish.tsx
 create mode 100644 Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/PreviewMomentModal.tsx
 create mode 100644 Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/PublishSchedule.module.scss
 create mode 100644 Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/PublishSchedule.tsx
 create mode 100644 Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/api.ts
 delete mode 100644 Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/KeywordManagement.tsx
 delete mode 100644 Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/MaterialManagement.tsx
 delete mode 100644 Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/SensitiveWordManagement.tsx
 delete mode 100644 Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/index.module.scss
 delete mode 100644 Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/index.ts
 delete mode 100644 Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/ContentManager.tsx
 delete mode 100644 Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/KeywordModal.tsx
 delete mode 100644 Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/MaterialModal.tsx
 delete mode 100644 Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/SensitiveWordModal.tsx
 delete mode 100644 Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/index.ts

diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/EditMomentModal.tsx b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/EditMomentModal.tsx
new file mode 100644
index 00000000..c332a14e
--- /dev/null
+++ b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/EditMomentModal.tsx
@@ -0,0 +1,222 @@
+import React, { useState, useEffect } from "react";
+import { Modal, Form, Input, Select, Button, message } from "antd";
+import { listData, updateMoment } from "./api";
+import UploadComponent from "@/components/Upload/ImageUpload/ImageUpload";
+import VideoUpload from "@/components/Upload/VideoUpload";
+
+interface EditMomentModalProps {
+  visible: boolean;
+  onCancel: () => void;
+  onSuccess: () => void;
+  momentData?: listData;
+}
+
+const EditMomentModal: React.FC<EditMomentModalProps> = ({
+  visible,
+  onCancel,
+  onSuccess,
+  momentData,
+}) => {
+  const [form] = Form.useForm();
+  const [loading, setLoading] = useState(false);
+  const [contentType, setContentType] = useState<number>(1);
+  const [resUrls, setResUrls] = useState<string[]>([]);
+  const [linkData, setLinkData] = useState({
+    desc: "",
+    image: "",
+    url: "",
+  });
+
+  useEffect(() => {
+    if (visible && momentData) {
+      // 填充表单数据
+      form.setFieldsValue({
+        content: momentData.text,
+        type: momentData.momentContentType.toString(),
+        sendTime: momentData.sendTime
+          ? new Date(momentData.sendTime * 1000).toISOString().slice(0, 16)
+          : "",
+      });
+
+      setContentType(momentData.momentContentType);
+      setResUrls(momentData.picUrlList || []);
+
+      // 处理链接数据
+      if (momentData.link && momentData.link.length > 0) {
+        setLinkData({
+          desc: momentData.link[0] || "",
+          image: "",
+          url: momentData.link[0] || "",
+        });
+      }
+    }
+  }, [visible, momentData, form]);
+
+  const handleSubmit = async () => {
+    try {
+      const values = await form.validateFields();
+      setLoading(true);
+
+      const updateData: any = {
+        id: momentData?.id,
+        content: values.content,
+        type: values.type,
+        "wechatIds[]": [momentData?.accountCount || 1], // 这里需要根据实际情况调整
+      };
+
+      // 根据内容类型添加相应字段
+      switch (parseInt(values.type)) {
+        case 1: // 文本
+          break;
+        case 2: // 图文
+          if (resUrls.length > 0) {
+            updateData["picUrlList[]"] = resUrls;
+          }
+          break;
+        case 3: // 视频
+          if (resUrls[0]) {
+            updateData.videoUrl = resUrls[0];
+          }
+          break;
+        case 4: // 链接
+          if (linkData.url) {
+            updateData["link[url]"] = [linkData.url];
+            if (linkData.desc) {
+              updateData["link[desc]"] = [linkData.desc];
+            }
+            if (linkData.image) {
+              updateData["link[image]"] = [linkData.image];
+            }
+          }
+          break;
+      }
+
+      // 添加定时发布时间
+      if (values.sendTime) {
+        updateData.timingTime = values.sendTime;
+      }
+
+      const success = await updateMoment(updateData);
+
+      if (success) {
+        message.success("更新成功！");
+        onSuccess();
+        onCancel();
+      } else {
+        message.error("更新失败，请重试");
+      }
+    } catch (error) {
+      console.error("更新失败:", error);
+      message.error("更新失败，请重试");
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleCancel = () => {
+    form.resetFields();
+    setResUrls([]);
+    setLinkData({ desc: "", image: "", url: "" });
+    onCancel();
+  };
+
+  return (
+    <Modal
+      title="编辑朋友圈"
+      open={visible}
+      onCancel={handleCancel}
+      width={600}
+      footer={[
+        <Button key="cancel" onClick={handleCancel}>
+          取消
+        </Button>,
+        <Button
+          key="submit"
+          type="primary"
+          loading={loading}
+          onClick={handleSubmit}
+        >
+          保存
+        </Button>,
+      ]}
+    >
+      <Form form={form} layout="vertical">
+        <Form.Item
+          name="content"
+          label="内容"
+          rules={[{ required: true, message: "请输入内容" }]}
+        >
+          <Input.TextArea rows={4} placeholder="请输入内容" />
+        </Form.Item>
+
+        <Form.Item name="type" label="类型" rules={[{ required: true }]}>
+          <Select
+            placeholder="请选择类型"
+            onChange={value => setContentType(parseInt(value))}
+          >
+            <Select.Option value="1">文本</Select.Option>
+            <Select.Option value="2">图文</Select.Option>
+            <Select.Option value="3">视频</Select.Option>
+            <Select.Option value="4">链接</Select.Option>
+          </Select>
+        </Form.Item>
+
+        <Form.Item name="sendTime" label="发布时间">
+          <Input type="datetime-local" />
+        </Form.Item>
+
+        {/* 图文类型 */}
+        {contentType === 2 && (
+          <Form.Item label="图片">
+            <UploadComponent value={resUrls} onChange={setResUrls} count={9} />
+          </Form.Item>
+        )}
+
+        {/* 视频类型 */}
+        {contentType === 3 && (
+          <Form.Item label="视频">
+            <VideoUpload
+              value={resUrls[0] || ""}
+              onChange={url => setResUrls([url as string])}
+            />
+          </Form.Item>
+        )}
+
+        {/* 链接类型 */}
+        {contentType === 4 && (
+          <>
+            <Form.Item label="链接地址">
+              <Input
+                value={linkData.url}
+                onChange={e =>
+                  setLinkData(prev => ({ ...prev, url: e.target.value }))
+                }
+                placeholder="请输入链接地址"
+              />
+            </Form.Item>
+            <Form.Item label="链接描述">
+              <Input
+                value={linkData.desc}
+                onChange={e =>
+                  setLinkData(prev => ({ ...prev, desc: e.target.value }))
+                }
+                placeholder="请输入链接描述"
+              />
+            </Form.Item>
+            <Form.Item label="链接封面">
+              <UploadComponent
+                value={linkData.image ? [linkData.image] : []}
+                onChange={urls =>
+                  setLinkData(prev => ({ ...prev, image: urls[0] || "" }))
+                }
+                count={1}
+              />
+            </Form.Item>
+          </>
+        )}
+      </Form>
+    </Modal>
+  );
+};
+
+export default EditMomentModal;
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/MomentPublish.module.scss b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/MomentPublish.module.scss
new file mode 100644
index 00000000..53c6ff14
--- /dev/null
+++ b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/MomentPublish.module.scss
@@ -0,0 +1,200 @@
+.momentPublish {
+  padding: 24px;
+  background: #fff;
+  border-radius: 8px;
+  height: 100%;
+
+  .title {
+    font-size: 18px;
+    font-weight: 600;
+    color: #262626;
+    margin: 0 0 24px 0;
+    padding-bottom: 12px;
+    border-bottom: 1px solid #f0f0f0;
+  }
+
+  .sectionTitle {
+    font-size: 14px;
+    font-weight: 500;
+    color: #595959;
+    margin: 0 0 12px 0;
+  }
+
+  .accountSection {
+    margin-bottom: 24px;
+
+    .accountList {
+      display: flex;
+      gap: 12px;
+      flex-wrap: wrap;
+    }
+
+    .accountCard {
+      flex: 1;
+      min-width: 120px;
+      cursor: pointer;
+      border: 2px solid #f0f0f0;
+      border-radius: 8px;
+      transition: all 0.3s;
+      position: relative;
+
+      &:hover:not(.disabled) {
+        border-color: #d9d9d9;
+        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+      }
+
+      &.selected {
+        border-color: #1890ff;
+        box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+      }
+
+      &.disabled {
+        opacity: 0.6;
+        cursor: not-allowed;
+        background-color: #fafafa;
+      }
+
+      :global(.ant-card-body) {
+        padding: 16px;
+      }
+
+      .accountInfo {
+        text-align: center;
+
+        .accountName {
+          font-size: 14px;
+          font-weight: 500;
+          color: #262626;
+          margin-bottom: 8px;
+        }
+
+        .usageBadge {
+          :global(.ant-badge-count) {
+            font-size: 12px;
+            min-width: 32px;
+            height: 20px;
+            line-height: 18px;
+            border-radius: 10px;
+          }
+        }
+
+        .limitText {
+          font-size: 12px;
+          color: #ff4d4f;
+          margin-top: 4px;
+        }
+      }
+    }
+  }
+
+  .contentSection {
+    margin-bottom: 24px;
+    .formItem {
+      margin-bottom: 24px;
+      .formSelect {
+        width: 100%;
+      }
+    }
+    .contentInput {
+      :global(.ant-input) {
+        border-radius: 8px;
+        border: 1px solid #d9d9d9;
+        font-size: 14px;
+        line-height: 1.5;
+        resize: none;
+
+        &:focus {
+          border-color: #1890ff;
+          box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+        }
+      }
+
+      :global(.ant-input::placeholder) {
+        color: #bfbfbf;
+      }
+    }
+  }
+
+  .imageSection {
+    margin-bottom: 24px;
+
+    :global(.ant-upload-list-picture-card) {
+      .ant-upload-list-item {
+        border-radius: 8px;
+        border: 1px solid #d9d9d9;
+      }
+    }
+
+    .uploadButton {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      width: 100%;
+      height: 100%;
+      color: #8c8c8c;
+      font-size: 14px;
+      border: 2px dashed #d9d9d9;
+      border-radius: 8px;
+      background: #fafafa;
+      transition: all 0.3s;
+
+      &:hover {
+        border-color: #1890ff;
+        color: #1890ff;
+        background: #f0f8ff;
+      }
+    }
+  }
+
+  .publishSection {
+    display: flex;
+    justify-content: center;
+    padding-top: 16px;
+    border-top: 1px solid #f0f0f0;
+
+    .publishButton {
+      width: 200px;
+      height: 40px;
+      border-radius: 8px;
+      font-size: 16px;
+      font-weight: 500;
+      background: linear-gradient(135deg, #1890ff 0%, #40a9ff 100%);
+      border: none;
+      box-shadow: 0 2px 8px rgba(24, 144, 255, 0.3);
+
+      &:hover {
+        background: linear-gradient(135deg, #40a9ff 0%, #69c0ff 100%);
+        box-shadow: 0 4px 12px rgba(24, 144, 255, 0.4);
+        transform: translateY(-1px);
+      }
+
+      &:active {
+        transform: translateY(0);
+      }
+    }
+  }
+}
+
+// 响应式设计
+@media (max-width: 768px) {
+  .momentPublish {
+    padding: 16px;
+
+    .accountSection {
+      .accountList {
+        flex-direction: column;
+      }
+
+      .accountCard {
+        min-width: auto;
+      }
+    }
+
+    .publishSection {
+      .publishButton {
+        width: 100%;
+      }
+    }
+  }
+}
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/MomentPublish.tsx b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/MomentPublish.tsx
new file mode 100644
index 00000000..1a740746
--- /dev/null
+++ b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/MomentPublish.tsx
@@ -0,0 +1,319 @@
+import React, { useState, useEffect, useCallback } from "react";
+import { Button, Input, Select, message, Card, Badge } from "antd";
+import { useCkChatStore } from "@/store/module/ckchat/ckchat";
+import { addMoment } from "./api";
+import styles from "./MomentPublish.module.scss";
+import { KfUserListData } from "@/pages/pc/ckbox/data";
+import UploadComponent from "@/components/Upload/ImageUpload/ImageUpload";
+import VideoUpload from "@/components/Upload/VideoUpload";
+
+interface MomentPublishProps {
+  onPublishSuccess?: () => void;
+}
+
+const MomentPublish: React.FC<MomentPublishProps> = ({ onPublishSuccess }) => {
+  const [selectedAccounts, setSelectedAccounts] = useState<string[]>([]);
+  const [content, setContent] = useState<string>("");
+  // 发布类型：1文本 2图文 3视频 4链接
+  const [contentType, setContentType] = useState<number>(1);
+  const [sendTime, setSendTime] = useState<string>("");
+  const [resUrls, setResUrls] = useState<string[]>([]); // 图片/视频等资源
+  const [comment, setComment] = useState<string>("");
+  // 链接
+  const [linkDesc, setLinkDesc] = useState<string>("");
+  const [linkImage, setLinkImage] = useState<string>("");
+  const [linkUrl, setLinkUrl] = useState<string>("");
+  const [accounts, setAccounts] = useState<KfUserListData[]>([]);
+  const [loading, setLoading] = useState<boolean>(false);
+
+  // 从store获取客服列表
+  const kfUserList = useCkChatStore(state => state.kfUserList);
+
+  // 获取账号使用情况
+  const fetchAccountUsage = useCallback(async () => {
+    if (kfUserList.length === 0) return;
+
+    // 直接使用客服列表数据，不需要额外的API调用
+    const accountData = kfUserList.map((kf, index) => ({
+      ...kf,
+      name: kf.nickname || `客服${index + 1}`,
+      isSelected: selectedAccounts.includes(kf.id.toString()),
+      isDisabled: kf.momentsNum >= kf.momentsMax,
+    }));
+
+    setAccounts(accountData);
+  }, [kfUserList, selectedAccounts]);
+
+  // 如果没有选中的账号且有可用账号，自动选择第一个可用账号
+  useEffect(() => {
+    if (selectedAccounts.length === 0 && accounts.length > 0) {
+      const firstAvailable = accounts.find(acc => !acc.isDisabled);
+      if (firstAvailable) {
+        setSelectedAccounts([firstAvailable.id.toString()]);
+      }
+    }
+  }, [accounts, selectedAccounts.length]);
+
+  // 当客服列表变化时，重新获取使用情况
+  useEffect(() => {
+    fetchAccountUsage();
+  }, [kfUserList, selectedAccounts, fetchAccountUsage]);
+
+  const handleAccountSelect = (accountId: string) => {
+    const account = accounts.find(acc => acc.id.toString() === accountId);
+    if (!account || account.isDisabled) return;
+
+    setSelectedAccounts(prev =>
+      prev.includes(accountId)
+        ? prev.filter(id => id !== accountId)
+        : [...prev, accountId],
+    );
+  };
+
+  const handleContentChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+    setContent(e.target.value);
+  };
+
+  const handlePublish = async () => {
+    if (!content.trim()) {
+      message.warning("请输入朋友圈内容");
+      return;
+    }
+
+    if (selectedAccounts.length === 0) {
+      message.warning("请选择发布账号");
+      return;
+    }
+
+    setLoading(true);
+    try {
+      // 根据API要求构造数据
+      const publishData: any = {
+        content: content.trim(),
+        type: contentType.toString(),
+        wechatIds: selectedAccounts,
+      };
+
+      // 根据内容类型添加相应字段
+      switch (contentType) {
+        case 1: // 文本
+          // 文本类型只需要content
+          break;
+        case 2: // 图文
+          if (resUrls.length > 0) {
+            publishData["picUrlList[]"] = resUrls;
+          }
+          break;
+        case 3: // 视频
+          if (resUrls[0]) {
+            publishData.videoUrl = resUrls[0];
+          }
+          break;
+        case 4: // 链接
+          if (linkUrl) {
+            publishData["link[url]"] = [linkUrl];
+            if (linkDesc) {
+              publishData["link[desc]"] = [linkDesc];
+            }
+            if (linkImage) {
+              publishData["link[image]"] = [linkImage];
+            }
+          }
+          break;
+      }
+
+      // 添加定时发布时间
+      if (sendTime) {
+        publishData.timingTime = sendTime;
+      }
+      console.log(publishData);
+
+      await addMoment(publishData);
+
+      message.success("发布成功！");
+      // 重置表单
+      setContent("");
+      setResUrls([]);
+      setLinkDesc("");
+      setLinkImage("");
+      setLinkUrl("");
+      setSendTime("");
+      // 重新获取账号使用情况
+      await fetchAccountUsage();
+      // 触发父组件的刷新回调
+      onPublishSuccess?.();
+    } catch (error) {
+      console.error("发布失败:", error);
+      message.error("发布失败，请重试");
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <div className={styles.momentPublish}>
+      <h3 className={styles.title}>发布朋友圈</h3>
+
+      {/* 选择发布账号 */}
+      <div className={styles.accountSection}>
+        <h4 className={styles.sectionTitle}>选择发布账号</h4>
+        <div className={styles.accountList}>
+          {accounts.map(account => (
+            <Card
+              key={account.id}
+              className={`${styles.accountCard} ${
+                selectedAccounts.includes(account.id.toString())
+                  ? styles.selected
+                  : ""
+              } ${account.isDisabled ? styles.disabled : ""}`}
+              onClick={() => handleAccountSelect(account.id.toString())}
+            >
+              <div className={styles.accountInfo}>
+                <div className={styles.accountName}>{account.name}</div>
+                <Badge
+                  count={`${account.momentsNum}/${account.momentsMax}`}
+                  className={styles.usageBadge}
+                  color={
+                    account.momentsNum >= account.momentsMax ? "red" : "blue"
+                  }
+                />
+                {account.isDisabled && (
+                  <div className={styles.limitText}>今日已达上限</div>
+                )}
+              </div>
+            </Card>
+          ))}
+        </div>
+      </div>
+
+      {/* 朋友圈内容 */}
+      <div className={styles.contentSection}>
+        {/* 发布时间 */}
+        <div className={styles.formItem}>
+          <label className={styles.formLabel}>发布时间</label>
+          <Input
+            type="datetime-local"
+            value={sendTime}
+            onChange={e => setSendTime((e.target as HTMLInputElement).value)}
+            placeholder="请选择发布时间"
+            className={styles.contentInput}
+          />
+        </div>
+
+        {/* 类型选择 */}
+        <div className={styles.formItem}>
+          <label className={styles.formLabel}>类型</label>
+          <div>
+            <Select
+              value={contentType}
+              onChange={value => setContentType(value)}
+              className={styles.formSelect}
+            >
+              <Select.Option value={1}>文本</Select.Option>
+              <Select.Option value={2}>图文</Select.Option>
+              <Select.Option value={3}>视频</Select.Option>
+              <Select.Option value={4}>链接</Select.Option>
+            </Select>
+          </div>
+        </div>
+
+        {/* 文本内容 */}
+        <div className={styles.formItem}>
+          <label className={styles.formLabel}>内容</label>
+          <Input.TextArea
+            value={content}
+            onChange={handleContentChange}
+            placeholder="请输入内容"
+            className={styles.contentInput}
+            rows={6}
+            showCount
+            maxLength={500}
+          />
+        </div>
+
+        {/* 链接类型 */}
+        {contentType === 2 && (
+          <>
+            <div className={styles.formItem}>
+              <label className={styles.formLabel}>描述</label>
+              <Input
+                value={linkDesc}
+                onChange={e =>
+                  setLinkDesc((e.target as HTMLInputElement).value)
+                }
+                placeholder="请输入描述"
+                className={styles.contentInput}
+              />
+            </div>
+            <div className={styles.formItem}>
+              <label className={styles.formLabel}>封面图</label>
+              <UploadComponent
+                value={linkImage ? [linkImage] : []}
+                onChange={urls => setLinkImage(urls[0] || "")}
+                count={1}
+              />
+            </div>
+            <div className={styles.formItem}>
+              <label className={styles.formLabel}>链接地址</label>
+              <Input
+                value={linkUrl}
+                onChange={e => setLinkUrl((e.target as HTMLInputElement).value)}
+                placeholder="请输入链接地址"
+                className={styles.contentInput}
+              />
+            </div>
+          </>
+        )}
+
+        {/* 视频类型 */}
+        {contentType === 3 && (
+          <div className={styles.formItem}>
+            <label className={styles.formLabel}>视频上传</label>
+            <div style={{ width: "40%" }}>
+              <VideoUpload
+                value={resUrls[0] || ""}
+                onChange={url => setResUrls([url as string])}
+              />
+            </div>
+          </div>
+        )}
+
+        {/* 图片/小程序 素材上传 */}
+        {contentType === 2 && (
+          <div className={styles.formItem}>
+            <label className={styles.formLabel}>图片上传 (最多9张)</label>
+            <UploadComponent value={resUrls} onChange={setResUrls} count={9} />
+          </div>
+        )}
+
+        {/* 备注 */}
+        <div className={styles.formItem}>
+          <label className={styles.formLabel}>备注</label>
+          <Input.TextArea
+            value={comment}
+            onChange={e => setComment((e.target as HTMLTextAreaElement).value)}
+            placeholder="请输入备注"
+            className={styles.contentInput}
+            rows={4}
+          />
+        </div>
+      </div>
+
+      {/* 发布按钮 */}
+      <div className={styles.publishSection}>
+        <Button
+          type="primary"
+          size="large"
+          onClick={handlePublish}
+          loading={loading}
+          disabled={selectedAccounts.length === 0 || !content.trim()}
+          className={styles.publishButton}
+        >
+          {loading ? "发布中..." : "发布朋友圈"}
+        </Button>
+      </div>
+    </div>
+  );
+};
+
+export default MomentPublish;
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/PreviewMomentModal.tsx b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/PreviewMomentModal.tsx
new file mode 100644
index 00000000..8f72a505
--- /dev/null
+++ b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/PreviewMomentModal.tsx
@@ -0,0 +1,285 @@
+import React from "react";
+import { Modal, Card, Tag, Badge } from "antd";
+import {
+  PictureOutlined,
+  VideoCameraOutlined,
+  LinkOutlined,
+  FileTextOutlined,
+} from "@ant-design/icons";
+import { listData } from "./api";
+
+interface PreviewMomentModalProps {
+  visible: boolean;
+  onCancel: () => void;
+  momentData?: listData;
+}
+
+const PreviewMomentModal: React.FC<PreviewMomentModalProps> = ({
+  visible,
+  onCancel,
+  momentData,
+}) => {
+  if (!momentData) return null;
+
+  // 获取内容类型信息
+  const getContentTypeInfo = (type: number) => {
+    switch (type) {
+      case 1:
+        return { icon: <FileTextOutlined />, label: "文本", color: "blue" };
+      case 2:
+        return { icon: <PictureOutlined />, label: "图文", color: "green" };
+      case 3:
+        return {
+          icon: <VideoCameraOutlined />,
+          label: "视频",
+          color: "purple",
+        };
+      case 4:
+        return { icon: <LinkOutlined />, label: "链接", color: "orange" };
+      default:
+        return { icon: <FileTextOutlined />, label: "未知", color: "default" };
+    }
+  };
+
+  // 格式化时间显示
+  const formatTime = (timestamp: number) => {
+    if (!timestamp) return "未设置";
+    const date = new Date(timestamp * 1000);
+    return date.toLocaleString("zh-CN", {
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit",
+      hour: "2-digit",
+      minute: "2-digit",
+    });
+  };
+
+  // 获取状态信息
+  const getStatusInfo = (isSend: number) => {
+    switch (isSend) {
+      case 0:
+        return { status: "processing" as const, text: "待发布" };
+      case 1:
+        return { status: "success" as const, text: "已发布" };
+      case 2:
+        return { status: "error" as const, text: "发布失败" };
+      default:
+        return { status: "default" as const, text: "未知" };
+    }
+  };
+
+  const contentTypeInfo = getContentTypeInfo(momentData.momentContentType);
+  const statusInfo = getStatusInfo(momentData.isSend);
+
+  return (
+    <Modal
+      title="朋友圈预览"
+      open={visible}
+      onCancel={onCancel}
+      width={500}
+      footer={null}
+    >
+      <Card className="preview-card">
+        <div className="preview-header">
+          <div className="preview-status">
+            <Badge status={statusInfo.status} text={statusInfo.text} />
+            <Tag
+              color={contentTypeInfo.color}
+              icon={contentTypeInfo.icon}
+              style={{ marginLeft: 8 }}
+            >
+              {contentTypeInfo.label}
+            </Tag>
+          </div>
+        </div>
+
+        <div className="preview-content">
+          <div className="preview-text">{momentData.text || "无文本内容"}</div>
+
+          {/* 图片预览 */}
+          {momentData.picUrlList && momentData.picUrlList.length > 0 && (
+            <div className="preview-images">
+              {momentData.picUrlList.map((image, index) => (
+                <div key={index} className="preview-image-item">
+                  <img
+                    src={image}
+                    alt={`图片${index + 1}`}
+                    className="preview-image"
+                    onError={e => {
+                      (e.target as HTMLImageElement).style.display = "none";
+                    }}
+                  />
+                </div>
+              ))}
+            </div>
+          )}
+
+          {/* 视频预览 */}
+          {momentData.videoUrl && (
+            <div className="preview-video">
+              <div className="preview-video-icon">
+                <VideoCameraOutlined />
+              </div>
+              <span className="preview-video-text">视频内容</span>
+            </div>
+          )}
+
+          {/* 链接预览 */}
+          {momentData.link && momentData.link.length > 0 && (
+            <div className="preview-link">
+              <LinkOutlined className="preview-link-icon" />
+              <span className="preview-link-text">
+                {momentData.link.length} 个链接
+              </span>
+            </div>
+          )}
+        </div>
+
+        <div className="preview-details">
+          <div className="preview-detail-item">
+            <span className="preview-detail-label">发布时间:</span>
+            <span className="preview-detail-value">
+              {formatTime(momentData.sendTime)}
+            </span>
+          </div>
+          <div className="preview-detail-item">
+            <span className="preview-detail-label">账号数量:</span>
+            <span className="preview-detail-value">
+              {momentData.accountCount} 个账号
+            </span>
+          </div>
+          <div className="preview-detail-item">
+            <span className="preview-detail-label">创建时间:</span>
+            <span className="preview-detail-value">
+              {formatTime(momentData.createTime)}
+            </span>
+          </div>
+        </div>
+      </Card>
+
+      <style jsx>{`
+        .preview-card {
+          border: 1px solid #f0f0f0;
+          border-radius: 8px;
+        }
+
+        .preview-header {
+          margin-bottom: 16px;
+          padding-bottom: 12px;
+          border-bottom: 1px solid #f0f0f0;
+        }
+
+        .preview-status {
+          display: flex;
+          align-items: center;
+        }
+
+        .preview-content {
+          margin-bottom: 16px;
+        }
+
+        .preview-text {
+          font-size: 14px;
+          line-height: 1.6;
+          color: #262626;
+          margin-bottom: 12px;
+          word-break: break-word;
+        }
+
+        .preview-images {
+          display: flex;
+          gap: 8px;
+          flex-wrap: wrap;
+          margin-bottom: 12px;
+        }
+
+        .preview-image-item {
+          width: 80px;
+          height: 80px;
+          border-radius: 6px;
+          overflow: hidden;
+          border: 1px solid #e8e8e8;
+        }
+
+        .preview-image {
+          width: 100%;
+          height: 100%;
+          object-fit: cover;
+        }
+
+        .preview-video {
+          display: flex;
+          align-items: center;
+          gap: 8px;
+          padding: 8px 12px;
+          background: #f0f8ff;
+          border: 1px solid #d6e4ff;
+          border-radius: 6px;
+          margin-bottom: 12px;
+        }
+
+        .preview-video-icon {
+          color: #1890ff;
+          font-size: 16px;
+        }
+
+        .preview-video-text {
+          color: #1890ff;
+          font-size: 14px;
+        }
+
+        .preview-link {
+          display: flex;
+          align-items: center;
+          gap: 8px;
+          padding: 8px 12px;
+          background: #fff7e6;
+          border: 1px solid #ffd591;
+          border-radius: 6px;
+          margin-bottom: 12px;
+        }
+
+        .preview-link-icon {
+          color: #fa8c16;
+          font-size: 16px;
+        }
+
+        .preview-link-text {
+          color: #fa8c16;
+          font-size: 14px;
+        }
+
+        .preview-details {
+          padding: 12px;
+          background: #fafafa;
+          border-radius: 6px;
+          border-left: 3px solid #1890ff;
+        }
+
+        .preview-detail-item {
+          display: flex;
+          align-items: center;
+          font-size: 12px;
+          margin-bottom: 4px;
+        }
+
+        .preview-detail-item:last-child {
+          margin-bottom: 0;
+        }
+
+        .preview-detail-label {
+          color: #8c8c8c;
+          min-width: 80px;
+          margin-right: 8px;
+        }
+
+        .preview-detail-value {
+          color: #595959;
+          font-weight: 500;
+        }
+      `}</style>
+    </Modal>
+  );
+};
+
+export default PreviewMomentModal;
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/PublishSchedule.module.scss b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/PublishSchedule.module.scss
new file mode 100644
index 00000000..20a384e9
--- /dev/null
+++ b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/PublishSchedule.module.scss
@@ -0,0 +1,352 @@
+.publishSchedule {
+  padding: 24px;
+  background: #fff;
+  border-radius: 8px;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 24px;
+    padding-bottom: 12px;
+    border-bottom: 1px solid #f0f0f0;
+
+    .title {
+      font-size: 18px;
+      font-weight: 600;
+      color: #262626;
+      margin: 0;
+    }
+
+    .headerActions {
+      display: flex;
+      gap: 8px;
+    }
+  }
+
+  .loadingContainer {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 200px;
+    color: #8c8c8c;
+
+    .loadingText {
+      margin-top: 12px;
+      font-size: 14px;
+    }
+  }
+
+  .scheduleList {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    flex: 1;
+    overflow-y: auto;
+
+    &::-webkit-scrollbar {
+      width: 6px;
+    }
+
+    &::-webkit-scrollbar-track {
+      background: #f1f1f1;
+      border-radius: 3px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background: #c1c1c1;
+      border-radius: 3px;
+
+      &:hover {
+        background: #a8a8a8;
+      }
+    }
+  }
+
+  .scheduleCard {
+    border: 1px solid #f0f0f0;
+    border-radius: 12px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
+    transition: all 0.3s;
+
+    &:hover {
+      box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
+      transform: translateY(-2px);
+    }
+
+    :global(.ant-card-body) {
+      padding: 20px;
+    }
+
+    .cardHeader {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 16px;
+
+      .headerLeft {
+        display: flex;
+        align-items: center;
+        gap: 12px;
+
+        .statusBadge {
+          :global(.ant-badge) {
+            font-size: 12px;
+          }
+
+          :global(.ant-badge-status-text) {
+            color: #1890ff;
+            font-weight: 500;
+          }
+        }
+
+        .typeTag {
+          font-size: 12px;
+          border-radius: 4px;
+        }
+      }
+
+      .headerActions {
+        display: flex;
+        align-items: center;
+        gap: 4px;
+
+        .actionButton {
+          color: #1890ff;
+          opacity: 0.7;
+          transition: all 0.3s;
+
+          &:hover {
+            opacity: 1;
+            background-color: #f0f8ff;
+          }
+        }
+
+        .deleteButton {
+          color: #ff4d4f;
+          opacity: 0.7;
+          transition: all 0.3s;
+
+          &:hover {
+            opacity: 1;
+            background-color: #fff2f0;
+          }
+        }
+      }
+    }
+
+    .cardContent {
+      .postContent {
+        font-size: 14px;
+        line-height: 1.6;
+        color: #262626;
+        margin-bottom: 12px;
+        word-break: break-word;
+      }
+
+      .postImages {
+        display: flex;
+        gap: 8px;
+        margin-bottom: 16px;
+        flex-wrap: wrap;
+
+        .imagePlaceholder {
+          width: 60px;
+          height: 60px;
+          background: #f5f5f5;
+          border: 1px solid #e8e8e8;
+          border-radius: 6px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          position: relative;
+          overflow: hidden;
+
+          .imagePreview {
+            width: 100%;
+            height: 100%;
+            object-fit: cover;
+            border-radius: 6px;
+          }
+
+          .imageIcon {
+            font-size: 20px;
+            opacity: 0.6;
+            display: none;
+
+            &.show {
+              display: flex;
+            }
+          }
+        }
+
+        .moreImages {
+          width: 60px;
+          height: 60px;
+          background: rgba(0, 0, 0, 0.6);
+          border-radius: 6px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          color: white;
+          font-size: 12px;
+          font-weight: 500;
+        }
+      }
+
+      .videoPreview {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        margin-bottom: 16px;
+        padding: 8px 12px;
+        background: #f0f8ff;
+        border: 1px solid #d6e4ff;
+        border-radius: 6px;
+
+        .videoIcon {
+          color: #1890ff;
+          font-size: 16px;
+        }
+
+        .videoText {
+          color: #1890ff;
+          font-size: 14px;
+        }
+      }
+
+      .linkPreview {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        margin-bottom: 16px;
+        padding: 8px 12px;
+        background: #fff7e6;
+        border: 1px solid #ffd591;
+        border-radius: 6px;
+
+        .linkIcon {
+          color: #fa8c16;
+          font-size: 16px;
+        }
+
+        .linkText {
+          color: #fa8c16;
+          font-size: 14px;
+        }
+      }
+
+      .postDetails {
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
+        padding: 12px;
+        background: #fafafa;
+        border-radius: 6px;
+        border-left: 3px solid #1890ff;
+
+        .detailItem {
+          display: flex;
+          align-items: center;
+          font-size: 12px;
+
+          .detailIcon {
+            color: #8c8c8c;
+            margin-right: 6px;
+            font-size: 12px;
+          }
+
+          .detailLabel {
+            color: #8c8c8c;
+            min-width: 60px;
+            margin-right: 8px;
+          }
+
+          .detailValue {
+            color: #595959;
+            font-weight: 500;
+          }
+        }
+      }
+    }
+  }
+
+  .emptyState {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 60px 20px;
+    text-align: center;
+    background: #fafafa;
+    border: 1px dashed #d9d9d9;
+    border-radius: 8px;
+    margin: 20px 0;
+
+    .emptyIcon {
+      font-size: 48px;
+      margin-bottom: 16px;
+      opacity: 0.6;
+    }
+
+    .emptyText {
+      font-size: 16px;
+      color: #8c8c8c;
+      margin-bottom: 8px;
+      font-weight: 500;
+    }
+
+    .emptySubText {
+      font-size: 14px;
+      color: #bfbfbf;
+    }
+  }
+
+  .paginationInfo {
+    margin-top: 16px;
+    padding-top: 16px;
+    border-top: 1px solid #f0f0f0;
+    text-align: center;
+
+    .paginationText {
+      font-size: 12px;
+      color: #8c8c8c;
+    }
+  }
+}
+
+// 响应式设计
+@media (max-width: 768px) {
+  .publishSchedule {
+    padding: 16px;
+
+    .scheduleList {
+      max-height: calc(100vh - 150px);
+    }
+
+    .scheduleCard {
+      :global(.ant-card-body) {
+        padding: 16px;
+      }
+
+      .cardContent {
+        .postDetails {
+          .detailItem {
+            flex-direction: column;
+            align-items: flex-start;
+            gap: 4px;
+
+            .detailLabel {
+              min-width: auto;
+              margin-right: 0;
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/PublishSchedule.tsx b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/PublishSchedule.tsx
new file mode 100644
index 00000000..4bec521f
--- /dev/null
+++ b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/PublishSchedule.tsx
@@ -0,0 +1,371 @@
+import React, {
+  useState,
+  useEffect,
+  useCallback,
+  forwardRef,
+  useImperativeHandle,
+} from "react";
+import {
+  Card,
+  Badge,
+  Button,
+  message,
+  Popconfirm,
+  Empty,
+  Spin,
+  Tag,
+  Tooltip,
+} from "antd";
+import {
+  DeleteOutlined,
+  EditOutlined,
+  EyeOutlined,
+  ClockCircleOutlined,
+  UserOutlined,
+  PictureOutlined,
+  VideoCameraOutlined,
+  LinkOutlined,
+  FileTextOutlined,
+  AppstoreOutlined,
+} from "@ant-design/icons";
+import { getMomentList, deleteMoment, listData } from "./api";
+import EditMomentModal from "./EditMomentModal";
+import PreviewMomentModal from "./PreviewMomentModal";
+import styles from "./PublishSchedule.module.scss";
+
+// 定义组件暴露的方法接口
+export interface PublishScheduleRef {
+  refresh: () => void;
+}
+
+const PublishSchedule = forwardRef<PublishScheduleRef>((props, ref) => {
+  const [scheduledPosts, setScheduledPosts] = useState<listData[]>([]);
+  const [loading, setLoading] = useState<boolean>(false);
+  const [pagination, setPagination] = useState({
+    page: 1,
+    limit: 10,
+    total: 0,
+  });
+  const [editModalVisible, setEditModalVisible] = useState(false);
+  const [previewModalVisible, setPreviewModalVisible] = useState(false);
+  const [selectedMoment, setSelectedMoment] = useState<listData | undefined>();
+
+  // 获取内容类型图标和标签
+  const getContentTypeInfo = (type: number) => {
+    switch (type) {
+      case 1:
+        return { icon: <FileTextOutlined />, label: "文本", color: "blue" };
+      case 2:
+        return { icon: <PictureOutlined />, label: "图文", color: "green" };
+      case 3:
+        return {
+          icon: <VideoCameraOutlined />,
+          label: "视频",
+          color: "purple",
+        };
+      case 4:
+        return { icon: <LinkOutlined />, label: "链接", color: "orange" };
+      case 5:
+        return { icon: <AppstoreOutlined />, label: "小程序", color: "cyan" };
+      default:
+        return { icon: <FileTextOutlined />, label: "未知", color: "default" };
+    }
+  };
+
+  // 格式化时间显示
+  const formatTime = (timestamp: number) => {
+    if (!timestamp) return "未设置";
+    const date = new Date(timestamp * 1000);
+    return date.toLocaleString("zh-CN", {
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit",
+      hour: "2-digit",
+      minute: "2-digit",
+    });
+  };
+
+  // 获取发布计划列表
+  const fetchScheduledMoments = useCallback(
+    async (page = 1) => {
+      setLoading(true);
+      try {
+        const response = await getMomentList({ page, limit: pagination.limit });
+        setScheduledPosts(response.list);
+        setPagination(prev => ({ ...prev, page, total: response.total }));
+      } catch (error) {
+        console.error("获取发布计划失败:", error);
+        message.error("获取发布计划失败");
+      } finally {
+        setLoading(false);
+      }
+    },
+    [pagination.limit],
+  );
+
+  // 暴露给父组件的方法
+  useImperativeHandle(ref, () => ({
+    refresh: () => {
+      fetchScheduledMoments(pagination.page);
+    },
+  }));
+
+  // 组件挂载时获取数据
+  useEffect(() => {
+    fetchScheduledMoments();
+  }, [fetchScheduledMoments]);
+
+  const handleDeletePost = async (postId: number) => {
+    try {
+      const success = await deleteMoment({ id: postId });
+      if (success) {
+        setScheduledPosts(prev => prev.filter(post => post.id !== postId));
+        message.success("删除成功");
+        // 如果当前页没有数据了，回到上一页
+        if (scheduledPosts.length === 1 && pagination.page > 1) {
+          fetchScheduledMoments(pagination.page - 1);
+        }
+      } else {
+        message.error("删除失败，请重试");
+      }
+    } catch (error) {
+      console.error("删除发布计划失败:", error);
+      message.error("删除失败，请重试");
+    }
+  };
+
+  const handleEditPost = (post: listData) => {
+    setSelectedMoment(post);
+    setEditModalVisible(true);
+  };
+
+  const handleViewPost = (post: listData) => {
+    setSelectedMoment(post);
+    setPreviewModalVisible(true);
+  };
+
+  const handleEditSuccess = () => {
+    // 编辑成功后刷新列表
+    fetchScheduledMoments(pagination.page);
+  };
+
+  const getStatusBadge = (isSend: number) => {
+    switch (isSend) {
+      case 0:
+        return <Badge status="processing" text="待发布" />;
+      case 1:
+        return <Badge status="success" text="已发布" />;
+      case 2:
+        return <Badge status="error" text="发布失败" />;
+      default:
+        return <Badge status="default" text="未知" />;
+    }
+  };
+
+  const handleRefresh = () => {
+    fetchScheduledMoments(pagination.page);
+  };
+
+  return (
+    <div className={styles.publishSchedule}>
+      <div className={styles.header}>
+        <h3 className={styles.title}>发布计划</h3>
+        <div className={styles.headerActions}>
+          <Button
+            type="text"
+            icon={<ClockCircleOutlined />}
+            onClick={handleRefresh}
+            loading={loading}
+          >
+            刷新
+          </Button>
+        </div>
+      </div>
+
+      <div className={styles.scheduleList}>
+        {loading ? (
+          <div className={styles.loadingContainer}>
+            <Spin size="large" />
+            <div className={styles.loadingText}>加载中...</div>
+          </div>
+        ) : scheduledPosts.length === 0 ? (
+          <Empty
+            image={Empty.PRESENTED_IMAGE_SIMPLE}
+            description={
+              <div>
+                <div className={styles.emptyText}>暂无发布计划</div>
+                <div className={styles.emptySubText}>
+                  创建朋友圈内容后可以设置定时发布
+                </div>
+              </div>
+            }
+          />
+        ) : (
+          scheduledPosts.map(post => {
+            const contentTypeInfo = getContentTypeInfo(post.momentContentType);
+            return (
+              <Card key={post.id} className={styles.scheduleCard}>
+                <div className={styles.cardHeader}>
+                  <div className={styles.headerLeft}>
+                    <div className={styles.statusBadge}>
+                      {getStatusBadge(post.isSend)}
+                    </div>
+                    <Tag
+                      color={contentTypeInfo.color}
+                      icon={contentTypeInfo.icon}
+                      className={styles.typeTag}
+                    >
+                      {contentTypeInfo.label}
+                    </Tag>
+                  </div>
+                  <div className={styles.headerActions}>
+                    <Tooltip title="预览">
+                      <Button
+                        type="text"
+                        icon={<EyeOutlined />}
+                        onClick={() => handleViewPost(post)}
+                        size="small"
+                        className={styles.actionButton}
+                      />
+                    </Tooltip>
+                    <Tooltip title="编辑">
+                      <Button
+                        type="text"
+                        icon={<EditOutlined />}
+                        onClick={() => handleEditPost(post)}
+                        size="small"
+                        className={styles.actionButton}
+                      />
+                    </Tooltip>
+                    <Popconfirm
+                      title="确定要删除这条发布计划吗？"
+                      onConfirm={() => handleDeletePost(post.id)}
+                      okText="确定"
+                      cancelText="取消"
+                    >
+                      <Tooltip title="删除">
+                        <Button
+                          type="text"
+                          icon={<DeleteOutlined />}
+                          size="small"
+                          className={styles.deleteButton}
+                        />
+                      </Tooltip>
+                    </Popconfirm>
+                  </div>
+                </div>
+
+                <div className={styles.cardContent}>
+                  <div className={styles.postContent}>
+                    {post.text || "无文本内容"}
+                  </div>
+
+                  {/* 图片展示 */}
+                  {post.picUrlList && post.picUrlList.length > 0 && (
+                    <div className={styles.postImages}>
+                      {post.picUrlList.slice(0, 3).map((image, index) => (
+                        <div key={index} className={styles.imagePlaceholder}>
+                          <img
+                            src={image}
+                            alt={`图片${index + 1}`}
+                            className={styles.imagePreview}
+                            onError={e => {
+                              (e.target as HTMLImageElement).style.display =
+                                "none";
+                              (
+                                e.target as HTMLImageElement
+                              ).nextElementSibling?.classList.add(styles.show);
+                            }}
+                          />
+                          <div className={styles.imageIcon}>
+                            <PictureOutlined />
+                          </div>
+                        </div>
+                      ))}
+                      {post.picUrlList.length > 3 && (
+                        <div className={styles.moreImages}>
+                          +{post.picUrlList.length - 3}
+                        </div>
+                      )}
+                    </div>
+                  )}
+
+                  {/* 视频展示 */}
+                  {post.videoUrl && (
+                    <div className={styles.videoPreview}>
+                      <div className={styles.videoIcon}>
+                        <VideoCameraOutlined />
+                      </div>
+                      <span className={styles.videoText}>视频内容</span>
+                    </div>
+                  )}
+
+                  {/* 链接展示 */}
+                  {post.link && post.link.length > 0 && (
+                    <div className={styles.linkPreview}>
+                      <LinkOutlined className={styles.linkIcon} />
+                      <span className={styles.linkText}>
+                        {post.link.length} 个链接
+                      </span>
+                    </div>
+                  )}
+
+                  <div className={styles.postDetails}>
+                    <div className={styles.detailItem}>
+                      <ClockCircleOutlined className={styles.detailIcon} />
+                      <span className={styles.detailLabel}>发布时间:</span>
+                      <span className={styles.detailValue}>
+                        {formatTime(post.sendTime)}
+                      </span>
+                    </div>
+                    <div className={styles.detailItem}>
+                      <UserOutlined className={styles.detailIcon} />
+                      <span className={styles.detailLabel}>账号数量:</span>
+                      <span className={styles.detailValue}>
+                        {post.accountCount} 个账号
+                      </span>
+                    </div>
+                    <div className={styles.detailItem}>
+                      <span className={styles.detailLabel}>创建时间:</span>
+                      <span className={styles.detailValue}>
+                        {formatTime(post.createTime)}
+                      </span>
+                    </div>
+                  </div>
+                </div>
+              </Card>
+            );
+          })
+        )}
+      </div>
+
+      {/* 分页信息 */}
+      {scheduledPosts.length > 0 && (
+        <div className={styles.paginationInfo}>
+          <span className={styles.paginationText}>
+            共 {pagination.total} 条记录，当前第 {pagination.page} 页
+          </span>
+        </div>
+      )}
+
+      {/* 编辑弹窗 */}
+      <EditMomentModal
+        visible={editModalVisible}
+        onCancel={() => setEditModalVisible(false)}
+        onSuccess={handleEditSuccess}
+        momentData={selectedMoment}
+      />
+
+      {/* 预览弹窗 */}
+      <PreviewMomentModal
+        visible={previewModalVisible}
+        onCancel={() => setPreviewModalVisible(false)}
+        momentData={selectedMoment}
+      />
+    </div>
+  );
+});
+
+PublishSchedule.displayName = "PublishSchedule";
+
+export default PublishSchedule;
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/api.ts b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/api.ts
new file mode 100644
index 00000000..23041afd
--- /dev/null
+++ b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/api.ts
@@ -0,0 +1,86 @@
+import request from "@/api/request";
+export interface listData {
+  id: number;
+  text: "";
+  momentContentType: number;
+  picUrlList: string[];
+  videoUrl: string;
+  link: string[];
+  publicMode: number;
+  isSend: number;
+  createTime: number;
+  sendTime: number;
+  accountCount: number;
+}
+
+interface listResponse {
+  list: listData[];
+  total: number;
+}
+// 朋友圈定时发布 - 列表
+export const getMomentList = (data: {
+  page: number;
+  limit: number;
+}): Promise<listResponse> => {
+  return request("/v1/kefu/moments/list", data, "GET");
+};
+
+export interface MomentRequest {
+  id?: number;
+  /**
+   * 朋友圈内容
+   */
+  content: string;
+  /**
+   * 标签列表
+   */
+  "labels[]"?: string[];
+  /**
+   * 链接信息-描述  type4有效
+   */
+  "link[desc]"?: string[];
+  /**
+   * 链接信息-图标  type4有效
+   */
+  "link[image]"?: string[];
+  /**
+   * 链接信息-链接  type4有效
+   */
+  "link[url]"?: string[];
+  /**
+   * 图片列表  type2有效
+   */
+  "picUrlList[]"?: string[];
+  /**
+   * 定时发布时间
+   */
+  timingTime?: string;
+  /**
+   * 内容类型 1文本 2图文 3视频 4链接
+   */
+  type: string;
+  /**
+   * 视频链接  type3有效
+   */
+  videoUrl?: string;
+  /**
+   * 微信账号ID列表
+   */
+  "wechatIds[]"?: string[];
+  [property: string]: any;
+}
+
+// 朋友圈定时发布 - 添加
+export const addMoment = (data: MomentRequest) => {
+  return request("/v1/kefu/moments/add", data, "POST");
+};
+
+// 朋友圈定时发布 - 编辑
+export const updateMoment = (data: MomentRequest) => {
+  return request("/v1/kefu/moments/update", data, "POST");
+};
+
+// 朋友圈定时发布 - 删除
+export const deleteMoment = (data: { id: number }) => {
+  return request("/v1/kefu/moments/delete", data, "DELETE");
+};
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/index.ts b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/index.ts
index 8acd8cb1..2e65eec3 100644
--- a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/index.ts
+++ b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/index.ts
@@ -1,9 +1,4 @@
-// 管理组件导出
-export { default as MaterialManagement } from "./management/MaterialManagement";
-export { default as SensitiveWordManagement } from "./management/SensitiveWordManagement";
-export { default as KeywordManagement } from "./management/KeywordManagement";
-
-// 模态框组件导出
-export { default as MaterialModal } from "./modals/MaterialModal";
-export { default as SensitiveWordModal } from "./modals/SensitiveWordModal";
-export { default as KeywordModal } from "./modals/KeywordModal";
+export { default as MomentPublish } from "./MomentPublish";
+export { default as PublishSchedule } from "./PublishSchedule";
+export { default as EditMomentModal } from "./EditMomentModal";
+export { default as PreviewMomentModal } from "./PreviewMomentModal";
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/KeywordManagement.tsx b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/KeywordManagement.tsx
deleted file mode 100644
index e3b94ad8..00000000
--- a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/KeywordManagement.tsx
+++ /dev/null
@@ -1,318 +0,0 @@
-import React, {
-  useState,
-  useEffect,
-  forwardRef,
-  useImperativeHandle,
-} from "react";
-import {
-  Button,
-  Input,
-  Tag,
-  Switch,
-  message,
-  Popconfirm,
-  Pagination,
-} from "antd";
-import {
-  SearchOutlined,
-  FormOutlined,
-  DeleteOutlined,
-} from "@ant-design/icons";
-import styles from "./index.module.scss";
-import {
-  getKeywordList,
-  deleteKeyword,
-  setKeywordStatus,
-  type KeywordListParams,
-} from "../../api";
-import KeywordModal from "../modals/KeywordModal";
-
-const { Search } = Input;
-
-interface KeywordItem {
-  id?: number;
-  type: number;
-  replyType: number;
-  title: string;
-  keywords: string;
-  status: number;
-  content: string;
-  metailGroupsOptions: { title: string; id: number }[];
-  level: number;
-}
-
-const KeywordManagement = forwardRef<any, Record<string, never>>(
-  (props, ref) => {
-    const [searchValue, setSearchValue] = useState<string>("");
-    const [keywordsList, setKeywordsList] = useState<KeywordItem[]>([]);
-    const [loading, setLoading] = useState<boolean>(false);
-    const [editModalVisible, setEditModalVisible] = useState<boolean>(false);
-    const [editingKeywordId, setEditingKeywordId] = useState<number | null>(
-      null,
-    );
-    const [pagination, setPagination] = useState({
-      current: 1,
-      pageSize: 10,
-      total: 0,
-    });
-    // 已提交的搜索关键词（仅在点击搜索时更新，用于服务端查询）
-    const [keywordQuery, setKeywordQuery] = useState<string>("");
-
-    //匹配类型
-    const getMatchTypeText = (type: number) => {
-      switch (type) {
-        case 0:
-          return "模糊匹配";
-        case 1:
-          return "精确匹配";
-      }
-    };
-
-    //匹配优先级
-    const getPriorityText = (level: number) => {
-      switch (level) {
-        case 0:
-          return "低优先级";
-        case 1:
-          return "中优先级";
-        case 2:
-          return "高优先级";
-      }
-    };
-    // 回复类型映射
-    const getReplyTypeText = (replyType: number) => {
-      switch (replyType) {
-        case 0:
-          return "素材回复";
-        case 1:
-          return "自定义";
-        default:
-          return "未知类型";
-      }
-    };
-
-    // 回复类型颜色
-    const getReplyTypeColor = (replyType: number) => {
-      switch (replyType) {
-        case 0:
-          return "blue";
-        case 1:
-          return "purple";
-        default:
-          return "gray";
-      }
-    };
-
-    // 获取关键词列表（服务端搜索）
-    const fetchKeywords = async (params?: KeywordListParams) => {
-      try {
-        setLoading(true);
-        const requestParams = {
-          page: pagination.current.toString(),
-          limit: pagination.pageSize.toString(),
-          keyword: keywordQuery || undefined,
-          ...params,
-        } as KeywordListParams;
-        const response = await getKeywordList(requestParams);
-        if (response) {
-          setKeywordsList(response.list || []);
-          setPagination(prev => ({
-            ...prev,
-            total: response.total || 0,
-          }));
-        } else {
-          setKeywordsList([]);
-          message.error(response?.message || "获取关键词列表失败");
-        }
-      } catch (error) {
-        console.error("获取关键词列表失败:", error);
-        setKeywordsList([]);
-        message.error("获取关键词列表失败");
-      } finally {
-        setLoading(false);
-      }
-    };
-
-    // 暴露方法给父组件
-    useImperativeHandle(ref, () => ({
-      fetchKeywords,
-    }));
-
-    // 关键词管理相关函数
-    const handleToggleKeyword = async (id: number) => {
-      try {
-        await setKeywordStatus({ id });
-        setKeywordsList(prev =>
-          prev.map(item =>
-            item.id === id
-              ? { ...item, status: item.status === 1 ? 0 : 1 }
-              : item,
-          ),
-        );
-        message.success("状态更新成功");
-      } catch (error) {
-        console.error("状态更新失败:", error);
-        message.error("状态更新失败");
-      }
-    };
-
-    const handleEditKeyword = (id: number) => {
-      setEditingKeywordId(id);
-      setEditModalVisible(true);
-    };
-
-    // 编辑弹窗成功回调
-    const handleEditSuccess = () => {
-      fetchKeywords(); // 重新获取数据
-    };
-
-    const handleDeleteKeyword = async (id: number) => {
-      try {
-        await deleteKeyword(id);
-        setKeywordsList(prev => prev.filter(item => item.id !== id));
-        message.success("删除成功");
-      } catch (error) {
-        console.error("删除失败:", error);
-        message.error("删除失败");
-      }
-    };
-
-    // 移除本地筛选，改为服务端搜索，列表直接使用 keywordsList
-
-    // 搜索处理函数
-    const handleSearch = (value: string) => {
-      setKeywordQuery(value || "");
-      setPagination(prev => ({ ...prev, current: 1 }));
-    };
-
-    // 分页处理函数
-    const handlePageChange = (page: number, pageSize?: number) => {
-      setPagination(prev => ({
-        ...prev,
-        current: page,
-        pageSize: pageSize || prev.pageSize,
-      }));
-    };
-
-    // 初始化与依赖变化时获取数据（依赖分页与搜索关键字）
-    useEffect(() => {
-      fetchKeywords();
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [pagination.current, pagination.pageSize, keywordQuery]);
-
-    return (
-      <div className={styles.keywordContent}>
-        <div className={styles.searchSection}>
-          <Search
-            placeholder="搜索关键词..."
-            value={searchValue}
-            onChange={e => setSearchValue(e.target.value)}
-            onSearch={handleSearch}
-            style={{ width: 300 }}
-            prefix={<SearchOutlined />}
-          />
-        </div>
-
-        <div className={styles.keywordList}>
-          {loading ? (
-            <div className={styles.loading}>加载中...</div>
-          ) : keywordsList.length === 0 ? (
-            <div className={styles.empty}>暂无关键词数据</div>
-          ) : (
-            keywordsList.map(item => (
-              <div key={item.id} className={styles.keywordItem}>
-                <div className={styles.itemContent}>
-                  <div className={styles.leftSection}>
-                    <div className={styles.titleRow}>
-                      <div className={styles.title}>{item.title}</div>
-                      <Tag color="default">{getMatchTypeText(item.type)}</Tag>
-                      <Tag color="default">{getPriorityText(item.level)}</Tag>
-                    </div>
-                    {item.content.length ? (
-                      <div className={styles.description}>{item.content}</div>
-                    ) : (
-                      <div className={styles.description}>
-                        已选素材：
-                        {item.metailGroupsOptions.map(v => (
-                          <Tag color="success" key={v.id}>
-                            {v.title}
-                          </Tag>
-                        ))}
-                      </div>
-                    )}
-                    <div className={styles.footer}>
-                      <Tag color={getReplyTypeColor(item.replyType)}>
-                        {getReplyTypeText(item.replyType)}
-                      </Tag>
-                    </div>
-                  </div>
-                  <div className={styles.rightSection}>
-                    <Switch
-                      checked={item.status === 1}
-                      onChange={() => handleToggleKeyword(item.id)}
-                      className={styles.toggleSwitch}
-                    />
-                    <Button
-                      type="text"
-                      size="small"
-                      icon={<FormOutlined className={styles.editIcon} />}
-                      onClick={() => handleEditKeyword(item.id)}
-                      className={styles.actionBtn}
-                    />
-                    <Popconfirm
-                      title="确认删除"
-                      description="确定要删除这个关键词吗？删除后无法恢复。"
-                      onConfirm={() => handleDeleteKeyword(item.id)}
-                      okText="确定"
-                      cancelText="取消"
-                      okType="danger"
-                    >
-                      <Button
-                        type="text"
-                        size="small"
-                        icon={<DeleteOutlined className={styles.deleteIcon} />}
-                        className={styles.actionBtn}
-                      />
-                    </Popconfirm>
-                  </div>
-                </div>
-              </div>
-            ))
-          )}
-        </div>
-
-        {/* 分页组件 */}
-        <div style={{ marginTop: 16, textAlign: "right" }}>
-          <Pagination
-            current={pagination.current}
-            pageSize={pagination.pageSize}
-            total={pagination.total}
-            showSizeChanger
-            showQuickJumper
-            showTotal={(total, range) =>
-              `第 ${range[0]}-${range[1]} 条/共 ${total} 条`
-            }
-            onChange={handlePageChange}
-            onShowSizeChange={handlePageChange}
-          />
-        </div>
-
-        {/* 编辑弹窗 */}
-        <KeywordModal
-          visible={editModalVisible}
-          mode="edit"
-          keywordId={editingKeywordId}
-          onCancel={() => {
-            setEditModalVisible(false);
-            setEditingKeywordId(null);
-          }}
-          onSuccess={handleEditSuccess}
-        />
-      </div>
-    );
-  },
-);
-
-KeywordManagement.displayName = "KeywordManagement";
-
-export default KeywordManagement;
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/MaterialManagement.tsx b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/MaterialManagement.tsx
deleted file mode 100644
index 65411fd6..00000000
--- a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/MaterialManagement.tsx
+++ /dev/null
@@ -1,320 +0,0 @@
-import React, {
-  useState,
-  useEffect,
-  forwardRef,
-  useImperativeHandle,
-  useRef,
-} from "react";
-import { Button, Input, Card, message, Popconfirm, Pagination } from "antd";
-import {
-  SearchOutlined,
-  FilterOutlined,
-  FormOutlined,
-  FileTextOutlined,
-  FileImageOutlined,
-  PlayCircleOutlined,
-  DeleteOutlined,
-} from "@ant-design/icons";
-import styles from "../../index.module.scss";
-import {
-  getMaterialList,
-  deleteMaterial,
-  type MaterialListParams,
-} from "../../api";
-import MaterialModal from "../modals/MaterialModal";
-
-const { Search } = Input;
-
-interface MaterialItem {
-  id: number;
-  companyId: number;
-  userId: number;
-  title: string;
-  content: string;
-  cover: string;
-  status: number;
-  type: string; // 素材类型：文本、图片、视频
-  createTime: string;
-  updateTime: string;
-  isDel: number;
-  delTime: string | null;
-  userName: string;
-}
-
-const MaterialManagement = forwardRef<any, Record<string, never>>(
-  (props, ref) => {
-    const [searchValue, setSearchValue] = useState<string>("");
-    const [materialsList, setMaterialsList] = useState<MaterialItem[]>([]);
-    const [loading, setLoading] = useState<boolean>(false);
-    const [editModalVisible, setEditModalVisible] = useState<boolean>(false);
-    const [editingMaterialId, setEditingMaterialId] = useState<number | null>(
-      null,
-    );
-    const [pagination, setPagination] = useState({
-      current: 1,
-      pageSize: 10,
-      total: 0,
-    });
-
-    // 使用 ref 来存储最新的分页状态
-    const paginationRef = useRef(pagination);
-    paginationRef.current = pagination;
-
-    // 获取类型图标
-    const getTypeIcon = (type: string) => {
-      switch (type) {
-        case "文本":
-          return <FileTextOutlined className={styles.typeIcon} />;
-        case "图片":
-          return <FileImageOutlined className={styles.typeIcon} />;
-        case "视频":
-          return <PlayCircleOutlined className={styles.typeIcon} />;
-        default:
-          return <FileTextOutlined className={styles.typeIcon} />;
-      }
-    };
-
-    // 获取素材列表
-    const fetchMaterials = async (params?: MaterialListParams) => {
-      try {
-        setLoading(true);
-        const currentPagination = paginationRef.current;
-        const requestParams = {
-          page: currentPagination.current.toString(),
-          limit: currentPagination.pageSize.toString(),
-          ...params,
-        };
-        const response = await getMaterialList(requestParams);
-        if (response) {
-          setMaterialsList(response.list || []);
-          setPagination(prev => ({
-            ...prev,
-            total: response.total || 0,
-          }));
-        } else {
-          setMaterialsList([]);
-          message.error(response?.message || "获取素材列表失败");
-        }
-      } catch (error) {
-        console.error("获取素材列表失败:", error);
-        setMaterialsList([]);
-        message.error("获取素材列表失败");
-      } finally {
-        setLoading(false);
-      }
-    };
-
-    // 暴露方法给父组件
-    useImperativeHandle(ref, () => ({
-      fetchMaterials,
-    }));
-
-    // 素材管理相关函数
-    const handleDeleteMaterial = async (id: number) => {
-      try {
-        await deleteMaterial(id.toString());
-        setMaterialsList(prev => prev.filter(item => item.id !== id));
-        message.success("删除成功");
-      } catch (error) {
-        message.error("删除失败");
-      }
-    };
-
-    // 编辑素材
-    const handleEditMaterial = (id: number) => {
-      setEditingMaterialId(id);
-      setEditModalVisible(true);
-    };
-
-    // 编辑弹窗成功回调
-    const handleEditSuccess = () => {
-      fetchMaterials(); // 重新获取数据
-    };
-
-    // 搜索处理函数
-    const handleSearch = (value: string) => {
-      setPagination(prev => ({ ...prev, current: 1 }));
-      fetchMaterials({ keyword: value });
-    };
-
-    // 分页处理函数
-    const handlePageChange = (page: number, pageSize?: number) => {
-      setPagination(prev => ({
-        ...prev,
-        current: page,
-        pageSize: pageSize || prev.pageSize,
-      }));
-      // 分页变化后立即获取数据
-      setTimeout(() => {
-        fetchMaterials();
-      }, 0);
-    };
-
-    // 组件挂载时获取数据
-    useEffect(() => {
-      fetchMaterials();
-    }, []);
-
-    return (
-      <div className={styles.materialContent}>
-        <div className={styles.searchSection}>
-          <Search
-            placeholder="搜索素材..."
-            value={searchValue}
-            onChange={e => setSearchValue(e.target.value)}
-            onSearch={handleSearch}
-            style={{ width: 300 }}
-            prefix={<SearchOutlined />}
-          />
-          <Button icon={<FilterOutlined />}>筛选</Button>
-        </div>
-
-        <div className={styles.materialGrid}>
-          {loading ? (
-            <div className={styles.loading}>加载中...</div>
-          ) : materialsList.length === 0 ? (
-            <div className={styles.empty}>暂无素材数据</div>
-          ) : (
-            materialsList.map(item => (
-              <Card
-                key={item.id}
-                className={styles.materialCard}
-                hoverable
-                actions={[
-                  <Button
-                    key="edit"
-                    type="text"
-                    icon={<FormOutlined />}
-                    onClick={e => {
-                      e.stopPropagation();
-                      handleEditMaterial(item.id);
-                    }}
-                  >
-                    编辑
-                  </Button>,
-                  <Popconfirm
-                    key="delete"
-                    title="确认删除"
-                    description="确定要删除这个素材吗？删除后无法恢复。"
-                    onConfirm={() => handleDeleteMaterial(item.id)}
-                    okText="确定"
-                    cancelText="取消"
-                    okType="danger"
-                  >
-                    <Button
-                      type="text"
-                      danger
-                      icon={<DeleteOutlined />}
-                      onClick={e => e.stopPropagation()}
-                    >
-                      删除
-                    </Button>
-                  </Popconfirm>,
-                ]}
-              >
-                <div
-                  className={styles.thumbnail}
-                  onClick={() => handleEditMaterial(item.id)}
-                  style={{ cursor: "pointer" }}
-                >
-                  {item.cover ? (
-                    <div
-                      style={{
-                        position: "relative",
-                        width: "100%",
-                        height: "100%",
-                      }}
-                    >
-                      <img
-                        src={item.cover}
-                        alt={item.title}
-                        style={{
-                          width: "100%",
-                          height: "100%",
-                          objectFit: "cover",
-                        }}
-                      />
-                      <div
-                        style={{
-                          position: "absolute",
-                          top: "4px",
-                          right: "4px",
-                          background: "rgba(0, 0, 0, 0.6)",
-                          color: "white",
-                          padding: "2px 6px",
-                          borderRadius: "4px",
-                          fontSize: "10px",
-                          fontWeight: "500",
-                        }}
-                      >
-                        {item.type}
-                      </div>
-                    </div>
-                  ) : (
-                    <div
-                      style={{
-                        width: "100%",
-                        height: "100%",
-                        display: "flex",
-                        alignItems: "center",
-                        justifyContent: "center",
-                        background: "#f5f5f5",
-                        color: "#999",
-                        flexDirection: "column",
-                      }}
-                    >
-                      {getTypeIcon(item.type)}
-                      <span style={{ marginTop: "8px", fontSize: "12px" }}>
-                        {item.type}
-                      </span>
-                    </div>
-                  )}
-                </div>
-
-                <div className={styles.cardContent}>
-                  <div className={styles.title}>{item.title}</div>
-                  <div className={styles.meta}>
-                    <div>创建人: {item.userName}</div>
-                    <div>{item.createTime}</div>
-                  </div>
-                </div>
-              </Card>
-            ))
-          )}
-        </div>
-
-        {/* 分页组件 */}
-        <div style={{ marginTop: 16, textAlign: "right" }}>
-          <Pagination
-            current={pagination.current}
-            pageSize={pagination.pageSize}
-            total={pagination.total}
-            showSizeChanger
-            showQuickJumper
-            showTotal={(total, range) =>
-              `第 ${range[0]}-${range[1]} 条/共 ${total} 条`
-            }
-            onChange={handlePageChange}
-            onShowSizeChange={handlePageChange}
-          />
-        </div>
-
-        {/* 编辑弹窗 */}
-        <MaterialModal
-          visible={editModalVisible}
-          mode="edit"
-          materialId={editingMaterialId}
-          onCancel={() => {
-            setEditModalVisible(false);
-            setEditingMaterialId(null);
-          }}
-          onSuccess={handleEditSuccess}
-        />
-      </div>
-    );
-  },
-);
-
-MaterialManagement.displayName = "MaterialManagement";
-
-export default MaterialManagement;
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/SensitiveWordManagement.tsx b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/SensitiveWordManagement.tsx
deleted file mode 100644
index 7979be4c..00000000
--- a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/SensitiveWordManagement.tsx
+++ /dev/null
@@ -1,293 +0,0 @@
-import React, {
-  useState,
-  useEffect,
-  forwardRef,
-  useImperativeHandle,
-} from "react";
-import {
-  Button,
-  Input,
-  Tag,
-  Switch,
-  message,
-  Popconfirm,
-  Pagination,
-} from "antd";
-import {
-  SearchOutlined,
-  FilterOutlined,
-  FormOutlined,
-  DeleteOutlined,
-} from "@ant-design/icons";
-import styles from "../../index.module.scss";
-import {
-  getSensitiveWordList,
-  deleteSensitiveWord,
-  setSensitiveWordStatus,
-  type SensitiveWordListParams,
-} from "../../api";
-import SensitiveWordModal from "../modals/SensitiveWordModal";
-
-const { Search } = Input;
-
-interface SensitiveWordItem {
-  id: string;
-  title: string;
-  keywords: string;
-  content: string;
-  operation: number;
-  status: number;
-}
-
-const SensitiveWordManagement = forwardRef<any, Record<string, never>>(
-  (props, ref) => {
-    const [searchValue, setSearchValue] = useState<string>("");
-    const [sensitiveWordsList, setSensitiveWordsList] = useState<
-      SensitiveWordItem[]
-    >([]);
-    const [loading, setLoading] = useState<boolean>(false);
-    const [editModalVisible, setEditModalVisible] = useState<boolean>(false);
-    const [editingSensitiveWordId, setEditingSensitiveWordId] = useState<
-      string | null
-    >(null);
-    const [pagination, setPagination] = useState({
-      current: 1,
-      pageSize: 10,
-      total: 0,
-    });
-
-    const getTagColor = (tag: string) => {
-      switch (tag) {
-        case "政治":
-          return "#ff4d4f";
-        case "色情":
-          return "#ff4d4f";
-        case "暴力":
-          return "#ff4d4f";
-        default:
-          return "#ff4d4f";
-      }
-    };
-
-    // 操作类型映射
-    const getOperationText = (operation: number) => {
-      switch (operation) {
-        case 0:
-          return "不操作";
-        case 1:
-          return "替换";
-        case 2:
-          return "删除";
-        case 3:
-          return "警告";
-        case 4:
-          return "禁止发送";
-        default:
-          return "未知操作";
-      }
-    };
-
-    // 获取敏感词列表
-    const fetchSensitiveWords = async (params?: SensitiveWordListParams) => {
-      try {
-        setLoading(true);
-        const requestParams = {
-          page: pagination.current.toString(),
-          limit: pagination.pageSize.toString(),
-          ...params,
-        };
-        const response = await getSensitiveWordList(requestParams);
-        if (response) {
-          setSensitiveWordsList(response.list || []);
-          setPagination(prev => ({
-            ...prev,
-            total: response.total || 0,
-          }));
-        } else {
-          setSensitiveWordsList([]);
-          message.error(response?.message || "获取敏感词列表失败");
-        }
-      } catch (error) {
-        console.error("获取敏感词列表失败:", error);
-        setSensitiveWordsList([]);
-        message.error("获取敏感词列表失败");
-      } finally {
-        setLoading(false);
-      }
-    };
-
-    // 暴露方法给父组件
-    useImperativeHandle(ref, () => ({
-      fetchSensitiveWords,
-    }));
-
-    // 敏感词管理相关函数
-    const handleToggleSensitiveWord = async (id: string) => {
-      try {
-        const response = await setSensitiveWordStatus({ id });
-        if (response) {
-          setSensitiveWordsList(prev =>
-            prev.map(item =>
-              item.id === id
-                ? { ...item, status: item.status === 1 ? 0 : 1 }
-                : item,
-            ),
-          );
-          message.success("状态更新成功");
-        } else {
-          message.error(response?.message || "状态更新失败");
-        }
-      } catch (error) {
-        console.error("状态更新失败:", error);
-        message.error("状态更新失败");
-      }
-    };
-
-    const handleEditSensitiveWord = (id: string) => {
-      setEditingSensitiveWordId(id);
-      setEditModalVisible(true);
-    };
-
-    // 编辑弹窗成功回调
-    const handleEditSuccess = () => {
-      fetchSensitiveWords(); // 重新获取数据
-    };
-
-    const handleDeleteSensitiveWord = async (id: string) => {
-      try {
-        await deleteSensitiveWord(id);
-        setSensitiveWordsList(prev => prev.filter(item => item.id !== id));
-        message.success("删除成功");
-      } catch (error) {
-        console.error("删除失败:", error);
-        message.error("删除失败");
-      }
-    };
-
-    // 搜索和筛选功能
-    const filteredSensitiveWords = sensitiveWordsList.filter(item => {
-      if (!searchValue) return true;
-      return (
-        item.title.toLowerCase().includes(searchValue.toLowerCase()) ||
-        item.keywords.toLowerCase().includes(searchValue.toLowerCase()) ||
-        item.content.toLowerCase().includes(searchValue.toLowerCase())
-      );
-    });
-
-    // 搜索处理函数
-    const handleSearch = (value: string) => {
-      setPagination(prev => ({ ...prev, current: 1 }));
-      fetchSensitiveWords({ keyword: value });
-    };
-
-    // 分页处理函数
-    const handlePageChange = (page: number, pageSize?: number) => {
-      setPagination(prev => ({
-        ...prev,
-        current: page,
-        pageSize: pageSize || prev.pageSize,
-      }));
-    };
-
-    // 组件挂载和分页变化时获取数据
-    useEffect(() => {
-      fetchSensitiveWords();
-    }, [pagination.current, pagination.pageSize]);
-
-    return (
-      <div className={styles.sensitiveContent}>
-        <div className={styles.searchSection}>
-          <Search
-            placeholder="搜索敏感词..."
-            value={searchValue}
-            onChange={e => setSearchValue(e.target.value)}
-            onSearch={handleSearch}
-            style={{ width: 300 }}
-            prefix={<SearchOutlined />}
-          />
-          <Button icon={<FilterOutlined />}>筛选</Button>
-        </div>
-
-        <div className={styles.sensitiveList}>
-          {loading ? (
-            <div className={styles.loading}>加载中...</div>
-          ) : filteredSensitiveWords.length === 0 ? (
-            <div className={styles.empty}>暂无敏感词数据</div>
-          ) : (
-            filteredSensitiveWords.map(item => (
-              <div key={item.id} className={styles.sensitiveItem}>
-                <div className={styles.itemContent}>
-                  <div className={styles.categoryName}>{item.title}</div>
-                  <div className={styles.actionText}>
-                    {getOperationText(item.operation)}
-                  </div>
-                </div>
-                <div className={styles.itemActions}>
-                  <Switch
-                    checked={item.status == 1}
-                    onChange={() => handleToggleSensitiveWord(item.id)}
-                    className={styles.toggleSwitch}
-                  />
-                  <Button
-                    type="text"
-                    size="small"
-                    icon={<FormOutlined className={styles.editIcon} />}
-                    onClick={() => handleEditSensitiveWord(item.id)}
-                    className={styles.actionBtn}
-                  />
-                  <Popconfirm
-                    title="确认删除"
-                    description="确定要删除这个敏感词吗？删除后无法恢复。"
-                    onConfirm={() => handleDeleteSensitiveWord(item.id)}
-                    okText="确定"
-                    cancelText="取消"
-                    okType="danger"
-                  >
-                    <Button
-                      type="text"
-                      size="small"
-                      icon={<DeleteOutlined className={styles.deleteIcon} />}
-                      className={styles.actionBtn}
-                    />
-                  </Popconfirm>
-                </div>
-              </div>
-            ))
-          )}
-        </div>
-
-        {/* 分页组件 */}
-        <div style={{ marginTop: 16, textAlign: "right" }}>
-          <Pagination
-            current={pagination.current}
-            pageSize={pagination.pageSize}
-            total={pagination.total}
-            showSizeChanger
-            showQuickJumper
-            showTotal={(total, range) =>
-              `第 ${range[0]}-${range[1]} 条/共 ${total} 条`
-            }
-            onChange={handlePageChange}
-            onShowSizeChange={handlePageChange}
-          />
-        </div>
-
-        {/* 编辑弹窗 */}
-        <SensitiveWordModal
-          visible={editModalVisible}
-          mode="edit"
-          sensitiveWordId={editingSensitiveWordId}
-          onCancel={() => {
-            setEditModalVisible(false);
-            setEditingSensitiveWordId(null);
-          }}
-          onSuccess={handleEditSuccess}
-        />
-      </div>
-    );
-  },
-);
-
-SensitiveWordManagement.displayName = "SensitiveWordManagement";
-
-export default SensitiveWordManagement;
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/index.module.scss b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/index.module.scss
deleted file mode 100644
index 52943078..00000000
--- a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/index.module.scss
+++ /dev/null
@@ -1,252 +0,0 @@
-// 关键词管理样式
-.keywordContent {
-  .searchSection {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 24px;
-
-    :global(.ant-input-search) {
-      width: 300px;
-    }
-
-    :global(.ant-btn) {
-      height: 32px;
-      border-radius: 6px;
-    }
-  }
-
-  .keywordList {
-    display: flex;
-    flex-direction: column;
-    gap: 12px;
-  }
-
-  .keywordItem {
-    padding: 16px 20px;
-    background: #fff;
-    border: 1px solid #f0f0f0;
-    border-radius: 8px;
-    transition: all 0.3s;
-
-    &:hover {
-      border-color: #d9d9d9;
-      box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
-    }
-
-    .itemContent {
-      display: flex;
-      justify-content: space-between;
-      align-items: flex-start;
-      gap: 16px;
-
-      .leftSection {
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        gap: 8px;
-
-        .titleRow {
-          display: flex;
-          align-items: center;
-          gap: 12px;
-          margin-bottom: 4px;
-
-          .title {
-            font-size: 16px;
-            font-weight: 500;
-            color: #262626;
-            margin: 0;
-          }
-
-          .tags {
-            display: flex;
-            gap: 8px;
-
-            .matchTag,
-            .priorityTag {
-              font-size: 12px;
-              padding: 2px 8px;
-              border-radius: 12px;
-              background: #f0f0f0;
-              color: #666;
-              border: none;
-            }
-          }
-        }
-
-        .description {
-          font-size: 14px;
-          color: #666;
-          line-height: 1.5;
-          margin-bottom: 8px;
-        }
-
-        .replyTypeTag {
-          font-size: 12px;
-          padding: 2px 8px;
-          border-radius: 20px;
-          background: #fff;
-          color: #fff;
-        }
-      }
-
-      .rightSection {
-        display: flex;
-
-        align-items: center;
-        gap: 8px;
-
-        .toggleSwitch {
-          :global(.ant-switch) {
-            background-color: #d9d9d9;
-          }
-
-          :global(.ant-switch-checked) {
-            background-color: #1890ff;
-          }
-        }
-
-        .actionBtn {
-          width: 28px;
-          height: 28px;
-          padding: 0;
-          border-radius: 4px;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-
-          &:hover {
-            background-color: #f5f5f5;
-          }
-
-          .editIcon {
-            font-size: 14px;
-            color: #1890ff;
-          }
-
-          .deleteIcon {
-            font-size: 14px;
-            color: #ff4d4f;
-          }
-        }
-      }
-    }
-  }
-}
-
-// 响应式设计
-@media (max-width: 768px) {
-  .container {
-    padding: 16px;
-  }
-
-  .headerActions {
-    flex-direction: column;
-    align-items: stretch;
-
-    :global(.ant-btn) {
-      width: 100%;
-    }
-  }
-
-  .tabs {
-    flex-direction: column;
-    padding: 0;
-
-    .tab {
-      border-bottom: 1px solid #e8e8e8;
-      border-radius: 0;
-
-      &:last-child {
-        border-bottom: none;
-      }
-    }
-  }
-
-  .materialContent {
-    .searchSection {
-      flex-direction: column;
-      gap: 12px;
-      align-items: stretch;
-
-      :global(.ant-input-search) {
-        width: 100%;
-      }
-    }
-
-    .materialGrid {
-      grid-template-columns: 1fr;
-      gap: 16px;
-    }
-  }
-
-  .sensitiveContent {
-    .searchSection {
-      flex-direction: column;
-      gap: 12px;
-      align-items: stretch;
-
-      :global(.ant-input-search) {
-        width: 100%;
-      }
-    }
-
-    .sensitiveItem {
-      flex-direction: column;
-      align-items: stretch;
-      gap: 12px;
-
-      .itemContent {
-        flex-direction: column;
-        align-items: flex-start;
-        gap: 8px;
-
-        .categoryName {
-          min-width: auto;
-        }
-      }
-
-      .itemActions {
-        justify-content: flex-end;
-      }
-    }
-  }
-
-  .keywordContent {
-    .searchSection {
-      flex-direction: column;
-      gap: 12px;
-      align-items: stretch;
-
-      :global(.ant-input-search) {
-        width: 100%;
-      }
-    }
-
-    .keywordItem {
-      .itemContent {
-        flex-direction: column;
-        gap: 12px;
-
-        .leftSection {
-          .titleRow {
-            flex-direction: column;
-            align-items: flex-start;
-            gap: 8px;
-
-            .tags {
-              flex-wrap: wrap;
-            }
-          }
-        }
-
-        .rightSection {
-          flex-direction: row;
-          justify-content: flex-end;
-          align-items: center;
-        }
-      }
-    }
-  }
-}
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/index.ts b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/index.ts
deleted file mode 100644
index deff774a..00000000
--- a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/management/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// 管理组件统一导出
-export { default as MaterialManagement } from "./MaterialManagement";
-export { default as SensitiveWordManagement } from "./SensitiveWordManagement";
-export { default as KeywordManagement } from "./KeywordManagement";
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/ContentManager.tsx b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/ContentManager.tsx
deleted file mode 100644
index 915f2de6..00000000
--- a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/ContentManager.tsx
+++ /dev/null
@@ -1,276 +0,0 @@
-import React, { useState, useEffect } from "react";
-import { Button, Input, Select } from "antd";
-import {
-  PlusOutlined,
-  DeleteOutlined,
-  FileTextOutlined,
-  FileImageOutlined,
-  PlayCircleOutlined,
-  FileOutlined,
-  SoundOutlined,
-  LinkOutlined,
-} from "@ant-design/icons";
-import ImageUpload from "@/components/Upload/ImageUpload/ImageUpload";
-import VideoUpload from "@/components/Upload/VideoUpload";
-import FileUpload from "@/components/Upload/FileUpload";
-import AudioUpload from "@/components/Upload/AudioUpload";
-import type { ContentItem, LinkData } from "../../api";
-
-const { TextArea } = Input;
-const { Option } = Select;
-
-interface ContentManagerProps {
-  value?: ContentItem[];
-  onChange?: (content: ContentItem[]) => void;
-}
-
-const ContentManager: React.FC<ContentManagerProps> = ({
-  value = [],
-  onChange,
-}) => {
-  const [contentItems, setContentItems] = useState<ContentItem[]>(value);
-
-  // 内容类型配置
-  const contentTypes = [
-    { value: "text", label: "文本", icon: <FileTextOutlined /> },
-    { value: "image", label: "图片", icon: <FileImageOutlined /> },
-    { value: "video", label: "视频", icon: <PlayCircleOutlined /> },
-    { value: "file", label: "文件", icon: <FileOutlined /> },
-    { value: "audio", label: "音频", icon: <SoundOutlined /> },
-    { value: "link", label: "链接", icon: <LinkOutlined /> },
-  ];
-
-  // 同步外部value到内部state
-  useEffect(() => {
-    setContentItems(value);
-  }, [value]);
-
-  // 初始化时添加默认文本内容项
-  useEffect(() => {
-    if (contentItems.length === 0) {
-      const defaultTextItem: ContentItem = {
-        type: "text",
-        data: "",
-      };
-      setContentItems([defaultTextItem]);
-      onChange?.([defaultTextItem]);
-    }
-  }, [contentItems.length, onChange]);
-
-  // 更新内容项
-  const updateContentItems = (newItems: ContentItem[]) => {
-    setContentItems(newItems);
-    onChange?.(newItems);
-  };
-
-  // 添加新内容项
-  const handleAddItem = () => {
-    const newItem: ContentItem = {
-      type: "text",
-      data: "",
-    };
-
-    const newItems = [...contentItems, newItem];
-    updateContentItems(newItems);
-  };
-
-  // 删除内容项
-  const handleDeleteItem = (index: number) => {
-    const newItems = contentItems.filter((_, i) => i !== index);
-    updateContentItems(newItems);
-  };
-
-  // 更新内容项数据
-  const updateItemData = (index: number, data: any) => {
-    const newItems = [...contentItems];
-    newItems[index] = { ...newItems[index], data };
-    updateContentItems(newItems);
-  };
-
-  // 更新内容项类型
-  const updateItemType = (index: number, newType: string) => {
-    const newItems = [...contentItems];
-
-    // 根据新类型重置数据
-    let newData: any;
-    if (newType === "link") {
-      newData = { title: "", url: "", cover: "" };
-    } else {
-      newData = "";
-    }
-
-    newItems[index] = {
-      type: newType as any,
-      data: newData,
-    };
-    updateContentItems(newItems);
-  };
-
-  // 渲染内容项
-  const renderContentItem = (item: ContentItem, index: number) => {
-    return (
-      <div
-        key={index}
-        style={{
-          border: "1px solid #d9d9d9",
-          borderRadius: "6px",
-          padding: "12px",
-          marginBottom: "8px",
-          backgroundColor: "#fafafa",
-        }}
-      >
-        <div
-          style={{
-            display: "flex",
-            justifyContent: "space-between",
-            alignItems: "center",
-            marginBottom: "8px",
-          }}
-        >
-          <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
-            <Select
-              value={item.type}
-              onChange={newType => updateItemType(index, newType)}
-              style={{ width: 120 }}
-              size="small"
-            >
-              {contentTypes.map(type => (
-                <Option key={type.value} value={type.value}>
-                  {type.icon} {type.label}
-                </Option>
-              ))}
-            </Select>
-          </div>
-          {index !== 0 && (
-            <Button
-              type="link"
-              danger
-              size="small"
-              icon={<DeleteOutlined />}
-              onClick={() => handleDeleteItem(index)}
-            />
-          )}
-        </div>
-
-        {renderContentInput(item, index)}
-      </div>
-    );
-  };
-
-  // 渲染内容输入
-  const renderContentInput = (item: ContentItem, index: number) => {
-    switch (item.type) {
-      case "text":
-        return (
-          <TextArea
-            value={item.data as string}
-            onChange={e => updateItemData(index, e.target.value)}
-            placeholder="请输入文本内容"
-            rows={3}
-          />
-        );
-      case "image":
-        return (
-          <ImageUpload
-            count={1}
-            accept="image/*"
-            value={item.data ? [item.data as string] : []}
-            onChange={urls => updateItemData(index, urls[0] || "")}
-          />
-        );
-      case "video":
-        return (
-          <VideoUpload
-            value={item.data as string}
-            onChange={url => {
-              const videoUrl = Array.isArray(url) ? url[0] || "" : url || "";
-              updateItemData(index, videoUrl);
-            }}
-            maxSize={50}
-            showPreview={true}
-          />
-        );
-      case "file":
-        return (
-          <FileUpload
-            value={item.data as string}
-            onChange={url => {
-              const fileUrl = Array.isArray(url) ? url[0] || "" : url || "";
-              updateItemData(index, fileUrl);
-            }}
-            maxSize={10}
-            showPreview={true}
-            acceptTypes={["excel", "word", "ppt", "pdf", "txt"]}
-          />
-        );
-      case "audio":
-        return (
-          <AudioUpload
-            value={item.data as string}
-            onChange={url => {
-              const audioUrl = Array.isArray(url) ? url[0] || "" : url || "";
-              updateItemData(index, audioUrl);
-            }}
-            maxSize={50}
-            showPreview={true}
-          />
-        );
-      case "link": {
-        const linkData = (item.data as LinkData) || {
-          title: "",
-          url: "",
-          cover: "",
-        };
-        return (
-          <div>
-            <Input
-              value={linkData.title}
-              onChange={e =>
-                updateItemData(index, { ...linkData, title: e.target.value })
-              }
-              placeholder="链接标题"
-              style={{ marginBottom: 8 }}
-            />
-            <Input
-              value={linkData.url}
-              onChange={e =>
-                updateItemData(index, { ...linkData, url: e.target.value })
-              }
-              placeholder="链接URL"
-              style={{ marginBottom: 8 }}
-            />
-            <ImageUpload
-              count={1}
-              accept="image/*"
-              value={linkData.cover ? [linkData.cover] : []}
-              onChange={urls =>
-                updateItemData(index, { ...linkData, cover: urls[0] || "" })
-              }
-            />
-          </div>
-        );
-      }
-      default:
-        return null;
-    }
-  };
-
-  return (
-    <div>
-      {/* 内容列表 */}
-      {contentItems.map((item, index) => renderContentItem(item, index))}
-
-      {/* 添加内容区域 */}
-      <Button
-        type="dashed"
-        block
-        icon={<PlusOutlined />}
-        onClick={handleAddItem}
-      >
-        添加内容
-      </Button>
-    </div>
-  );
-};
-
-export default ContentManager;
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/KeywordModal.tsx b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/KeywordModal.tsx
deleted file mode 100644
index 6dccd250..00000000
--- a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/KeywordModal.tsx
+++ /dev/null
@@ -1,288 +0,0 @@
-import React, { useState, useEffect, useCallback } from "react";
-import { Modal, Form, Input, Button, message, Select } from "antd";
-import {
-  addKeyword,
-  updateKeyword,
-  getKeywordDetails,
-  type KeywordAddRequest,
-  type KeywordUpdateRequest,
-} from "../../api";
-import MetailSelection from "@/components/MetailSelection";
-const { TextArea } = Input;
-const { Option } = Select;
-
-interface KeywordModalProps {
-  visible: boolean;
-  mode: "add" | "edit";
-  keywordId?: number | null;
-  onCancel: () => void;
-  onSuccess: () => void;
-}
-
-const KeywordModal: React.FC<KeywordModalProps> = ({
-  visible,
-  mode,
-  keywordId,
-  onCancel,
-  onSuccess,
-}) => {
-  const [form] = Form.useForm();
-  const [loading, setLoading] = useState(false);
-  const title = mode === "add" ? "添加关键词回复" : "编辑关键词回复";
-  const [selectedOptions, setSelectedOptions] = useState<any[]>([]);
-
-  // 获取关键词详情
-  const fetchKeywordDetails = useCallback(
-    async (id: number) => {
-      try {
-        const response = await getKeywordDetails(id);
-        if (response) {
-          const keyword = response;
-          form.setFieldsValue({
-            title: keyword.title,
-            keywords: keyword.keywords,
-            content: keyword.content,
-            type: keyword.type,
-            level: keyword.level,
-            replyType: keyword.replyType,
-            status: keyword.status,
-            metailGroups: keyword.metailGroups,
-          });
-          setSelectedOptions(keyword.metailGroupsOptions);
-        }
-      } catch (error) {
-        console.error("获取关键词详情失败:", error);
-        message.error("获取关键词详情失败");
-      }
-    },
-    [form],
-  );
-
-  // 当弹窗打开时处理数据
-  useEffect(() => {
-    if (visible) {
-      if (mode === "edit" && keywordId) {
-        // 编辑模式：获取详情
-        fetchKeywordDetails(keywordId);
-      } else if (mode === "add") {
-        // 添加模式：重置表单
-        form.resetFields();
-        setSelectedOptions([]);
-      }
-    }
-  }, [visible, mode, keywordId, fetchKeywordDetails, form]);
-
-  const handleSubmit = async (values: any) => {
-    try {
-      setLoading(true);
-
-      if (mode === "add") {
-        const data: KeywordAddRequest = {
-          title: values.title,
-          keywords: values.keywords,
-          content: values.content,
-          type: values.type,
-          level: values.level,
-          replyType: values.replyType,
-          status: values.status || "1",
-          metailGroups: values.metailGroups,
-        };
-
-        const response = await addKeyword(data);
-        if (response) {
-          message.success("添加关键词成功");
-          form.resetFields();
-          onSuccess();
-          onCancel();
-        } else {
-          message.error(response?.message || "添加关键词失败");
-        }
-      } else {
-        const data: KeywordUpdateRequest = {
-          id: keywordId,
-          title: values.title,
-          keywords: values.keywords,
-          content: values.content,
-          type: values.type,
-          level: values.level,
-          replyType: values.replyType,
-          status: values.status,
-          metailGroups: values.metailGroups,
-        };
-
-        const response = await updateKeyword(data);
-        if (response) {
-          message.success("更新关键词回复成功");
-          form.resetFields();
-          onSuccess();
-          onCancel();
-        } else {
-          message.error(response?.message || "更新关键词回复失败");
-        }
-      }
-    } catch (error) {
-      console.error(`${mode === "add" ? "添加" : "更新"}关键词失败:`, error);
-      message.error(`${mode === "add" ? "添加" : "更新"}关键词失败`);
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  const handleCancel = () => {
-    form.resetFields();
-    setSelectedOptions([]);
-    onCancel();
-  };
-
-  const handSelectMaterial = (options: any[]) => {
-    if (options.length === 0) {
-      form.setFieldsValue({
-        metailGroups: [],
-      });
-    } else {
-      // 在单选模式下，只取第一个选项的ID
-      form.setFieldsValue({
-        metailGroups: options.map(v => v.id),
-      });
-    }
-    setSelectedOptions(options);
-  };
-
-  // 监听表单值变化
-  const handleFormValuesChange = (changedValues: any) => {
-    // 当回复类型切换时，清空素材选择
-    if (changedValues.replyType !== undefined) {
-      setSelectedOptions([]);
-      if (changedValues.replyType === 1) {
-        // 切换到自定义回复时，清空materialId
-        form.setFieldsValue({
-          materialId: null,
-        });
-      } else {
-        // 切换到素材回复时，清空content
-        form.setFieldsValue({
-          content: null,
-        });
-      }
-    }
-  };
-  return (
-    <Modal
-      title={title}
-      open={visible}
-      onCancel={handleCancel}
-      footer={null}
-      width={600}
-    >
-      <Form
-        form={form}
-        layout="vertical"
-        onFinish={handleSubmit}
-        onValuesChange={handleFormValuesChange}
-        initialValues={{
-          status: 1,
-          type: "模糊匹配",
-          level: 1,
-          replyType: 0,
-        }}
-      >
-        <Form.Item
-          name="title"
-          label="关键词标题"
-          rules={[{ required: true, message: "请输入关键词标题" }]}
-        >
-          <Input placeholder="请输入关键词标题" />
-        </Form.Item>
-
-        <Form.Item
-          name="keywords"
-          label="关键词"
-          rules={[{ required: true, message: "请输入关键词" }]}
-        >
-          <Input placeholder="请输入关键词" />
-        </Form.Item>
-
-        <Form.Item
-          name="replyType"
-          label="回复类型"
-          rules={[{ required: true, message: "请选择回复类型" }]}
-        >
-          <Select placeholder="请选择回复类型">
-            <Option value={0}>素材回复</Option>
-            <Option value={1}>自定义</Option>
-          </Select>
-        </Form.Item>
-
-        {form.getFieldValue("replyType") === 1 ? (
-          <Form.Item
-            name="content"
-            label="回复内容"
-            rules={[{ required: true, message: "请输入回复内容" }]}
-          >
-            <TextArea rows={4} placeholder="请输入回复内容" />
-          </Form.Item>
-        ) : (
-          <Form.Item
-            name="metailGroups"
-            label="回复内容"
-            rules={[{ required: true, message: "请输入回复内容" }]}
-          >
-            <MetailSelection
-              selectedOptions={selectedOptions}
-              onSelect={handSelectMaterial}
-              selectionMode="single"
-              placeholder="选择素材"
-            />
-          </Form.Item>
-        )}
-
-        <Form.Item
-          name="type"
-          label="匹配类型"
-          rules={[{ required: true, message: "请选择匹配类型" }]}
-        >
-          <Select placeholder="请选择匹配类型">
-            <Option value={0}>模糊匹配</Option>
-            <Option value={1}>精确匹配</Option>
-          </Select>
-        </Form.Item>
-
-        <Form.Item
-          name="level"
-          label="优先级"
-          rules={[{ required: true, message: "请选择优先级" }]}
-        >
-          <Select placeholder="请选择优先级">
-            <Option value={0}>低优先级</Option>
-            <Option value={1}>中优先级</Option>
-            <Option value={2}>高优先级</Option>
-          </Select>
-        </Form.Item>
-
-        <Form.Item
-          name="status"
-          label="状态"
-          rules={[{ required: true, message: "请选择状态" }]}
-        >
-          <Select placeholder="请选择状态">
-            <Option value={1}>启用</Option>
-            <Option value={0}>禁用</Option>
-          </Select>
-        </Form.Item>
-
-        <Form.Item>
-          <div
-            style={{ display: "flex", justifyContent: "flex-end", gap: "8px" }}
-          >
-            <Button onClick={handleCancel}>取消</Button>
-            <Button type="primary" htmlType="submit" loading={loading}>
-              确定
-            </Button>
-          </div>
-        </Form.Item>
-      </Form>
-    </Modal>
-  );
-};
-
-export default KeywordModal;
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/MaterialModal.tsx b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/MaterialModal.tsx
deleted file mode 100644
index 7009b0c8..00000000
--- a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/MaterialModal.tsx
+++ /dev/null
@@ -1,197 +0,0 @@
-import React, { useState, useEffect, useCallback } from "react";
-import { Modal, Form, Input, Button, message, Select } from "antd";
-import {
-  addMaterial,
-  updateMaterial,
-  getMaterialDetails,
-  type MaterialAddRequest,
-  type MaterialUpdateRequest,
-  type ContentItem,
-} from "../../api";
-import ImageUpload from "@/components/Upload/ImageUpload/ImageUpload";
-import ContentManager from "./ContentManager";
-
-const { Option } = Select;
-
-interface MaterialModalProps {
-  visible: boolean;
-  mode: "add" | "edit";
-  materialId?: number | null;
-  onCancel: () => void;
-  onSuccess: () => void;
-}
-
-const MaterialModal: React.FC<MaterialModalProps> = ({
-  visible,
-  mode,
-  materialId,
-  onCancel,
-  onSuccess,
-}) => {
-  const [form] = Form.useForm();
-  const [loading, setLoading] = useState(false);
-  const [contentItems, setContentItems] = useState<ContentItem[]>([]);
-
-  // 获取素材详情
-  const fetchMaterialDetails = useCallback(
-    async (id: number) => {
-      try {
-        const response = await getMaterialDetails(id.toString());
-        if (response) {
-          const material = response;
-          form.setFieldsValue({
-            title: material.title,
-            cover: material.cover ? [material.cover] : [],
-            status: material.status,
-          });
-          // 设置内容项
-          setContentItems(material.content || []);
-        }
-      } catch (error) {
-        console.error("获取素材详情失败:", error);
-        message.error("获取素材详情失败");
-      }
-    },
-    [form],
-  );
-
-  // 当弹窗打开时处理数据
-  useEffect(() => {
-    if (visible) {
-      if (mode === "edit" && materialId) {
-        // 编辑模式：获取详情
-        fetchMaterialDetails(materialId);
-      } else if (mode === "add") {
-        // 添加模式：重置表单
-        form.resetFields();
-        setContentItems([]);
-      }
-    }
-  }, [visible, mode, materialId, fetchMaterialDetails, form]);
-
-  const handleSubmit = async (values: any) => {
-    try {
-      setLoading(true);
-
-      // 验证内容项
-      if (contentItems.length === 0) {
-        message.warning("请至少添加一个内容项");
-        return;
-      }
-
-      const coverValue = Array.isArray(values.cover)
-        ? values.cover[0] || ""
-        : values.cover || "";
-
-      const data: MaterialAddRequest = {
-        title: values.title,
-        status: values.status || 1,
-        content: contentItems,
-        ...(coverValue && { cover: coverValue }),
-      };
-
-      if (mode === "add") {
-        const response = await addMaterial(data);
-        if (response) {
-          message.success("添加素材成功");
-          form.resetFields();
-          setContentItems([]);
-          onSuccess();
-          onCancel();
-        } else {
-          message.error(response?.message || "添加素材失败");
-        }
-      } else {
-        const updateData: MaterialUpdateRequest = {
-          ...data,
-          id: materialId?.toString(),
-        };
-
-        const response = await updateMaterial(updateData);
-        if (response) {
-          message.success("更新素材成功");
-          form.resetFields();
-          setContentItems([]);
-          onSuccess();
-          onCancel();
-        } else {
-          message.error(response?.message || "更新素材失败");
-        }
-      }
-    } catch (error) {
-      console.error(`${mode === "add" ? "添加" : "更新"}素材失败:`, error);
-      message.error(`${mode === "add" ? "添加" : "更新"}素材失败`);
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  const handleCancel = () => {
-    form.resetFields();
-    setContentItems([]);
-    onCancel();
-  };
-
-  const title = mode === "add" ? "添加素材" : "编辑素材";
-
-  return (
-    <Modal
-      title={title}
-      open={visible}
-      onCancel={handleCancel}
-      footer={null}
-      width={800}
-    >
-      <Form
-        form={form}
-        layout="vertical"
-        onFinish={handleSubmit}
-        initialValues={{ status: 1 }}
-      >
-        <Form.Item
-          name="title"
-          label="素材标题"
-          rules={[{ required: true, message: "请输入素材标题" }]}
-        >
-          <Input placeholder="请输入素材标题" />
-        </Form.Item>
-
-        <Form.Item label="素材内容">
-          <ContentManager value={contentItems} onChange={setContentItems} />
-        </Form.Item>
-
-        <Form.Item name="cover" label="封面图片">
-          <ImageUpload
-            count={1}
-            accept="image/*"
-            className="material-cover-upload"
-          />
-        </Form.Item>
-
-        <Form.Item
-          name="status"
-          label="状态"
-          rules={[{ required: true, message: "请选择状态" }]}
-        >
-          <Select placeholder="请选择状态">
-            <Option value={1}>启用</Option>
-            <Option value={0}>禁用</Option>
-          </Select>
-        </Form.Item>
-
-        <Form.Item>
-          <div
-            style={{ display: "flex", justifyContent: "flex-end", gap: "8px" }}
-          >
-            <Button onClick={handleCancel}>取消</Button>
-            <Button type="primary" htmlType="submit" loading={loading}>
-              确定
-            </Button>
-          </div>
-        </Form.Item>
-      </Form>
-    </Modal>
-  );
-};
-
-export default MaterialModal;
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/SensitiveWordModal.tsx b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/SensitiveWordModal.tsx
deleted file mode 100644
index 5e125b4a..00000000
--- a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/SensitiveWordModal.tsx
+++ /dev/null
@@ -1,203 +0,0 @@
-import React, { useState, useEffect, useCallback } from "react";
-import { Modal, Form, Input, Button, message, Select } from "antd";
-import {
-  addSensitiveWord,
-  updateSensitiveWord,
-  getSensitiveWordDetails,
-  type SensitiveWordAddRequest,
-  type SensitiveWordUpdateRequest,
-} from "../../api";
-
-const { TextArea } = Input;
-const { Option } = Select;
-
-interface SensitiveWordModalProps {
-  visible: boolean;
-  mode: "add" | "edit";
-  sensitiveWordId?: string | null;
-  onCancel: () => void;
-  onSuccess: () => void;
-}
-
-const SensitiveWordModal: React.FC<SensitiveWordModalProps> = ({
-  visible,
-  mode,
-  sensitiveWordId,
-  onCancel,
-  onSuccess,
-}) => {
-  const [form] = Form.useForm();
-  const [loading, setLoading] = useState(false);
-
-  // 获取敏感词详情
-  const fetchSensitiveWordDetails = useCallback(
-    async (id: string) => {
-      try {
-        const response = await getSensitiveWordDetails(id);
-        if (response) {
-          const sensitiveWord = response;
-          form.setFieldsValue({
-            title: sensitiveWord.title,
-            keywords: sensitiveWord.keywords,
-            content: sensitiveWord.content,
-            operation: sensitiveWord.operation,
-            status: sensitiveWord.status,
-          });
-        }
-      } catch (error) {
-        console.error("获取敏感词详情失败:", error);
-        message.error("获取敏感词详情失败");
-      }
-    },
-    [form],
-  );
-
-  // 当弹窗打开时处理数据
-  useEffect(() => {
-    if (visible) {
-      if (mode === "edit" && sensitiveWordId) {
-        // 编辑模式：获取详情
-        fetchSensitiveWordDetails(sensitiveWordId);
-      } else if (mode === "add") {
-        // 添加模式：重置表单
-        form.resetFields();
-      }
-    }
-  }, [visible, mode, sensitiveWordId, fetchSensitiveWordDetails, form]);
-
-  const handleSubmit = async (values: any) => {
-    try {
-      setLoading(true);
-
-      if (mode === "add") {
-        const data: SensitiveWordAddRequest = {
-          title: values.title,
-          keywords: values.keywords,
-          content: values.content,
-          operation: values.operation,
-          status: values.status || "1",
-        };
-
-        const response = await addSensitiveWord(data);
-        if (response) {
-          message.success("添加敏感词成功");
-          form.resetFields();
-          onSuccess();
-          onCancel();
-        } else {
-          message.error(response?.message || "添加敏感词失败");
-        }
-      } else {
-        const data: SensitiveWordUpdateRequest = {
-          id: sensitiveWordId,
-          title: values.title,
-          keywords: values.keywords,
-          content: values.content,
-          operation: values.operation,
-          status: values.status,
-        };
-
-        const response = await updateSensitiveWord(data);
-        if (response) {
-          message.success("更新敏感词成功");
-          form.resetFields();
-          onSuccess();
-          onCancel();
-        } else {
-          message.error(response?.message || "更新敏感词失败");
-        }
-      }
-    } catch (error) {
-      console.error(`${mode === "add" ? "添加" : "更新"}敏感词失败:`, error);
-      message.error(`${mode === "add" ? "添加" : "更新"}敏感词失败`);
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  const handleCancel = () => {
-    form.resetFields();
-    onCancel();
-  };
-
-  const title = mode === "add" ? "添加敏感词" : "编辑敏感词";
-
-  return (
-    <Modal
-      title={title}
-      open={visible}
-      onCancel={handleCancel}
-      footer={null}
-      width={600}
-    >
-      <Form
-        form={form}
-        layout="vertical"
-        onFinish={handleSubmit}
-        initialValues={{ status: "1", operation: "1" }}
-      >
-        <Form.Item
-          name="title"
-          label="敏感词标题"
-          rules={[{ required: true, message: "请输入敏感词标题" }]}
-        >
-          <Input placeholder="请输入敏感词标题" />
-        </Form.Item>
-
-        <Form.Item
-          name="keywords"
-          label="关键词"
-          rules={[{ required: true, message: "请输入关键词" }]}
-        >
-          <Input placeholder="请输入关键词" />
-        </Form.Item>
-
-        <Form.Item
-          name="content"
-          label="敏感词内容"
-          rules={[{ required: true, message: "请输入敏感词内容" }]}
-        >
-          <TextArea rows={4} placeholder="请输入敏感词内容" />
-        </Form.Item>
-
-        <Form.Item
-          name="operation"
-          label="操作类型"
-          rules={[{ required: true, message: "请选择操作类型" }]}
-        >
-          <Select placeholder="请选择操作类型">
-            <Option value={0}>不操作</Option>
-            <Option value={1}>替换</Option>
-            <Option value={2}>删除</Option>
-            <Option value={3}>警告</Option>
-            <Option value={4}>禁止发送</Option>
-          </Select>
-        </Form.Item>
-
-        <Form.Item
-          name="status"
-          label="状态"
-          rules={[{ required: true, message: "请选择状态" }]}
-        >
-          <Select placeholder="请选择状态">
-            <Option value={1}>启用</Option>
-            <Option value={0}>禁用</Option>
-          </Select>
-        </Form.Item>
-
-        <Form.Item>
-          <div
-            style={{ display: "flex", justifyContent: "flex-end", gap: "8px" }}
-          >
-            <Button onClick={handleCancel}>取消</Button>
-            <Button type="primary" htmlType="submit" loading={loading}>
-              确定
-            </Button>
-          </div>
-        </Form.Item>
-      </Form>
-    </Modal>
-  );
-};
-
-export default SensitiveWordModal;
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/index.ts b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/index.ts
deleted file mode 100644
index 93227c33..00000000
--- a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/modals/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// 模态框组件统一导出
-export { default as MaterialModal } from "./MaterialModal";
-export { default as SensitiveWordModal } from "./SensitiveWordModal";
-export { default as KeywordModal } from "./KeywordModal";
-export { default as ContentManager } from "./ContentManager";
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/index.module.scss b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/index.module.scss
index 7fa37698..dcdc830f 100644
--- a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/index.module.scss
+++ b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/index.module.scss
@@ -53,10 +53,27 @@
 }
 
 .content {
-  background: #fff;
-  border-radius: 0 0 8px 8px;
-  padding: 24px;
-  min-height: 400px;
+  background: #f5f5f5;
+  border-radius: 8px;
+  padding: 0;
+  min-height: calc(100vh - 120px);
+}
+
+.mainLayout {
+  display: flex;
+  gap: 24px;
+  height: 100%;
+  margin: 24px 0px;
+}
+
+.leftSection {
+  flex: 1;
+  min-width: 0;
+}
+
+.rightSection {
+  flex: 1;
+  min-width: 0;
 }
 
 .materialContent {
@@ -385,6 +402,17 @@
     }
   }
 
+  .mainLayout {
+    flex-direction: column;
+    gap: 16px;
+    padding: 16px;
+  }
+
+  .leftSection,
+  .rightSection {
+    flex: none;
+  }
+
   .tabs {
     flex-direction: column;
     padding: 0;
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/index.tsx b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/index.tsx
index 144c04ae..fed9b453 100644
--- a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/index.tsx
@@ -1,76 +1,19 @@
-import React, { useState, useRef } from "react";
-import { Button } from "antd";
-import { PlusOutlined } from "@ant-design/icons";
+import React, { useRef } from "react";
+
 import PowerNavigation from "@/components/PowerNavtion";
+import MomentPublish from "./components/MomentPublish";
+import PublishSchedule from "./components/PublishSchedule";
 import styles from "./index.module.scss";
-import {
-  MaterialManagement,
-  SensitiveWordManagement,
-  KeywordManagement,
-  MaterialModal,
-  SensitiveWordModal,
-  KeywordModal,
-} from "./components";
 
 const ContentManagement: React.FC = () => {
-  const [activeTab, setActiveTab] = useState<string>("material");
-  const [materialModalVisible, setMaterialModalVisible] = useState(false);
-  const [sensitiveWordModalVisible, setSensitiveWordModalVisible] =
-    useState(false);
-  const [keywordModalVisible, setKeywordModalVisible] = useState(false);
+  // 用于触发 PublishSchedule 刷新的引用
+  const publishScheduleRef = useRef<{ refresh: () => void }>(null);
 
-  // 引用管理组件
-  const materialManagementRef = useRef<any>(null);
-  const keywordManagementRef = useRef<any>(null);
-  const sensitiveWordManagementRef = useRef<any>(null);
-
-  const tabs = [
-    { key: "material", label: "素材资源库" },
-    { key: "sensitive", label: "敏感词管理" },
-    { key: "keyword", label: "关键词回复" },
-  ];
-
-  // 弹窗成功回调
-  const handleModalSuccess = () => {
-    console.log("handleModalSuccess");
-    // 刷新素材列表
-    if (materialManagementRef.current?.fetchMaterials) {
-      console.log("刷新素材列表");
-      materialManagementRef.current.fetchMaterials();
-    }
-    // 刷新敏感词列表
-    if (sensitiveWordManagementRef.current?.fetchSensitiveWords) {
-      console.log("刷新敏感词列表");
-      sensitiveWordManagementRef.current.fetchSensitiveWords();
-    }
-    // 刷新关键词列表
-    if (keywordManagementRef.current?.fetchKeywords) {
-      console.log("刷新关键词列表");
-      keywordManagementRef.current.fetchKeywords();
-    }
-  };
-
-  const renderTabContent = () => {
-    switch (activeTab) {
-      case "material":
-        return (
-          <MaterialManagement ref={materialManagementRef} {...({} as any)} />
-        );
-      case "sensitive":
-        return (
-          <SensitiveWordManagement
-            ref={sensitiveWordManagementRef}
-            {...({} as any)}
-          />
-        );
-      case "keyword":
-        return (
-          <KeywordManagement ref={keywordManagementRef} {...({} as any)} />
-        );
-      default:
-        return (
-          <MaterialManagement ref={materialManagementRef} {...({} as any)} />
-        );
+  // 发布成功后的回调函数
+  const handlePublishSuccess = () => {
+    // 触发 PublishSchedule 组件刷新
+    if (publishScheduleRef.current) {
+      publishScheduleRef.current.refresh();
     }
   };
 
@@ -84,47 +27,19 @@ const ContentManagement: React.FC = () => {
         rightContent={<div className={styles.headerActions}></div>}
       />
 
-      <div className={styles.tabsSection}>
-        <br />
-        <div className={styles.tabs}>
-          {tabs.map(tab => (
-            <div
-              key={tab.key}
-              className={`${styles.tab} ${
-                activeTab === tab.key ? styles.tabActive : ""
-              }`}
-              onClick={() => setActiveTab(tab.key)}
-            >
-              {tab.label}
-            </div>
-          ))}
+      <div className={styles.content}>
+        <div className={styles.mainLayout}>
+          {/* 左侧：发布朋友圈 */}
+          <div className={styles.leftSection}>
+            <MomentPublish onPublishSuccess={handlePublishSuccess} />
+          </div>
+
+          {/* 右侧：发布计划 */}
+          <div className={styles.rightSection}>
+            <PublishSchedule ref={publishScheduleRef} />
+          </div>
         </div>
       </div>
-
-      <div className={styles.content}>{renderTabContent()}</div>
-
-      {/* 弹窗组件 */}
-      <MaterialModal
-        visible={materialModalVisible}
-        mode="add"
-        onCancel={() => setMaterialModalVisible(false)}
-        onSuccess={handleModalSuccess}
-      />
-
-      <SensitiveWordModal
-        visible={sensitiveWordModalVisible}
-        mode="add"
-        onCancel={() => setSensitiveWordModalVisible(false)}
-        onSuccess={handleModalSuccess}
-      />
-
-      <KeywordModal
-        visible={keywordModalVisible}
-        mode="add"
-        keywordId={null}
-        onCancel={() => setKeywordModalVisible(false)}
-        onSuccess={handleModalSuccess}
-      />
     </div>
   );
 };
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
index 0d31d6aa..8cbd6c82 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
@@ -671,7 +671,7 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
         console.warn("Invalid createTime format:", firstMessage.createTime);
         return;
       }
-      timestamp = date.getTime() - 20000;
+      timestamp = date.getTime() - 24 * 36000 * 1000;
     } catch (error) {
       console.error("Error parsing createTime:", error);
       return;
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/api.ts b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/api.ts
index cbb8c79d..186cc3db 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/api.ts
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/api.ts
@@ -4,3 +4,28 @@ import request from "@/api/request";
 export const getContactList = (params: { prevId: string; count: number }) => {
   return request("/api/wechatFriend/list", params, "GET");
 };
+
+export interface dataProcessingPost {
+  /**
+   * CmdModifyFriendLabel专属
+   */
+  "labels[]"?: string[];
+  /**
+   * CmdModifyFriendLabel专属
+   */
+  newRemark?: string;
+  /**
+   * 类型 CmdModifyFriendRemark修改备注 CmdModifyFriendLabel好友修改标签
+   */
+  type?: string;
+  /**
+   * 公共
+   */
+  wechatAccountId?: number;
+  wechatFriendId?: number;
+  [property: string]: any;
+}
+
+export const dataProcessing = (params: dataProcessingPost) => {
+  return request("/v1/kefu/dataProcessing", params, "POST");
+};
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index e36d7c0e..eb59df6e 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -14,7 +14,9 @@ import {
   toggleChatSessionPin,
   deleteChatSession,
 } from "@/store/module/ckchat/ckchat";
+import { useWebSocketStore } from "@/store/module/websocket/websocket";
 import { updateConfig } from "@/pages/pc/ckbox/api";
+import { dataProcessing } from "./api";
 import styles from "./MessageList.module.scss";
 import { formatWechatTime } from "@/utils/common";
 interface MessageListProps {}
@@ -23,6 +25,7 @@ const MessageList: React.FC<MessageListProps> = () => {
   const { setCurrentContact, currentContract } = useWeChatStore();
   const getChatSessions = useCkChatStore(state => state.chatSessions);
   const kfSelected = useCkChatStore(state => state.kfSelected);
+  const { sendCommand } = useWebSocketStore();
   const onContactClick = (session: ContractData | weChatGroup) => {
     console.log(session);
 
@@ -139,12 +142,56 @@ const MessageList: React.FC<MessageListProps> = () => {
   };
 
   // 保存备注
-  const handleSaveRemark = () => {
+  const handleSaveRemark = async () => {
     if (!editRemarkModal.session) return;
 
-    // TODO: 调用API更新备注
-    console.log("更新备注", editRemarkModal.session, editRemarkModal.remark);
-    message.success("备注更新成功");
+    const session = editRemarkModal.session;
+    const isGroup = "chatroomId" in session;
+
+    try {
+      if (isGroup) {
+        // 群聊备注修改
+        sendCommand("CmdModifyGroupRemark", {
+          wechatAccountId: session.wechatAccountId,
+          chatroomId: session.chatroomId,
+          newRemark: editRemarkModal.remark,
+        });
+        await dataProcessing({
+          type: "CmdModifyGroupRemark",
+          wechatAccountId: session.wechatAccountId,
+          wechatFriendId: session.id,
+          newRemark: editRemarkModal.remark,
+        });
+      } else {
+        // 好友备注修改
+        sendCommand("CmdModifyFriendRemark", {
+          wechatAccountId: session.wechatAccountId,
+          wechatFriendId: session.id,
+          newRemark: editRemarkModal.remark,
+        });
+        await dataProcessing({
+          type: "CmdModifyFriendRemark",
+          wechatAccountId: session.wechatAccountId,
+          wechatFriendId: session.id,
+          newRemark: editRemarkModal.remark,
+        });
+      }
+
+      // 修改备注后会更新当前的session的conRemark，然后使用updateChatSession方法更新会话列表
+      const updatedSession = {
+        ...session,
+        conRemark: editRemarkModal.remark,
+      };
+
+      // 更新会话列表中的备注
+      const { updateChatSession } = useCkChatStore.getState();
+      updateChatSession(updatedSession);
+
+      message.success("备注更新成功");
+    } catch (error) {
+      console.error("更新备注失败:", error);
+      message.error("备注更新失败，请重试");
+    }
 
     setEditRemarkModal({
       visible: false,
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/main.ts b/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
index 917118fb..9dba27a8 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
@@ -189,7 +189,7 @@ export const getAllContactList = async () => {
   try {
     let allContacts = [];
     let page = 1;
-    const limit = 1000;
+    const limit = 500;
     let hasMore = true;
 
     while (hasMore) {
@@ -257,7 +257,7 @@ export const getAllGroupList = async () => {
   try {
     let allContacts = [];
     let page = 1;
-    const limit = 1000;
+    const limit = 500;
     let hasMore = true;
 
     while (hasMore) {
diff --git a/Touchkebao/src/store/module/weChat/weChat.ts b/Touchkebao/src/store/module/weChat/weChat.ts
index 5ef7f24e..58ee18c1 100644
--- a/Touchkebao/src/store/module/weChat/weChat.ts
+++ b/Touchkebao/src/store/module/weChat/weChat.ts
@@ -201,7 +201,7 @@ export const useWeChatStore = create<WeChatState>()(
             wechatAccountId: contact.wechatAccountId,
             From: 1,
             To: To || +new Date(),
-            Count: 5,
+            Count: 20,
             olderData: true,
           };
 
diff --git a/Touchkebao/src/store/module/websocket/msgManage.ts b/Touchkebao/src/store/module/websocket/msgManage.ts
index beab2fbf..54eddcc5 100644
--- a/Touchkebao/src/store/module/websocket/msgManage.ts
+++ b/Touchkebao/src/store/module/websocket/msgManage.ts
@@ -5,6 +5,7 @@ import { WebSocketMessage } from "./websocket";
 import { deepCopy } from "@/utils/common";
 import { Messages } from "./msg.data";
 import { db } from "@/utils/db";
+import { Modal } from "antd";
 // 消息处理器类型定义
 type MessageHandler = (message: WebSocketMessage) => void;
 const addMessage = useWeChatStore.getState().addMessage;
@@ -82,14 +83,31 @@ const messageHandlers: Record<string, MessageHandler> = {
     console.log("通知消息", message);
     // 在这里添加具体的处理逻辑
     if (message.notify == "Auth failed") {
-      // 被踢出时删除所有缓存数据
-      localStorage.clear();
-      // 删除
-      await db.kfUsers.clear();
-      await db.weChatGroup.clear();
-      await db.contracts.clear();
-      await db.newContractList.clear();
-      window.location.href = "/login";
+      // 避免重复弹窗
+      if ((window as any).__CKB_AUTH_FAILED_SHOWN__) {
+        return;
+      }
+      (window as any).__CKB_AUTH_FAILED_SHOWN__ = true;
+
+      Modal.warning({
+        title: "登录失效",
+        content: "认证已失效或账号在其他设备登录，请重新登录。",
+        okText: "重新登录",
+        onOk: async () => {
+          try {
+            // 被踢出时删除所有缓存数据
+            localStorage.clear();
+            await db.kfUsers.clear();
+            await db.weChatGroup.clear();
+            await db.contracts.clear();
+            await db.newContractList.clear();
+          } finally {
+            (window as any).__CKB_AUTH_FAILED_SHOWN__ = false;
+            window.location.href = "/login";
+          }
+        },
+      });
+      return;
     }
   },
 

From 252d02e7b9558121619e9fc6f34e38bdc02b7e9a Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Tue, 21 Oct 2025 11:05:57 +0800
Subject: [PATCH 22/72] =?UTF-8?q?=E3=80=90=E8=A7=A6=E5=AE=A2=E5=AE=9D?=
 =?UTF-8?q?=E3=80=91=E5=86=85=E5=AE=B9=E7=AE=A1=E7=90=86=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/chukebao/controller/MomentsController.php  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Server/application/chukebao/controller/MomentsController.php b/Server/application/chukebao/controller/MomentsController.php
index 2019a047..fd3ae575 100644
--- a/Server/application/chukebao/controller/MomentsController.php
+++ b/Server/application/chukebao/controller/MomentsController.php
@@ -370,18 +370,17 @@ class MomentsController extends BaseController
             // 处理数据
             $data = [];
             foreach ($list as $item) {
-                $sendData = json_encode($item->sendData,true);
+                $sendData = json_decode($item->sendData,true);
                 $data[] = [
                     'id' => $item->id,
-                    'text' => $sendData['text'] ?? '',
+                    'content' => $sendData['text'] ?? '',
                     'momentContentType' => $sendData['momentContentType'] ?? 1,
                     'picUrlList' => $sendData['picUrlList'] ?? [],
                     'videoUrl' => $sendData['videoUrl'] ?? '',
                     'link' => $sendData['link'] ?? [],
                     'publicMode' => $sendData['publicMode'] ?? 2,
                     'isSend' => $item->isSend,
-                    'createTime' => $item->createTime,
-                    'sendTime' => $item->sendTime,
+                    'sendTime' => date('Y-m-d H:i:s',$item->sendTime),
                     'accountCount' => count($sendData['jobPublishWechatMomentsItems'] ?? [])
                 ];
             }

From 19734415f05eac5bb1af30ab96d711178ce53d4c Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Tue, 21 Oct 2025 11:06:53 +0800
Subject: [PATCH 23/72] =?UTF-8?q?=E3=80=90=E9=97=A8=E5=BA=97=E7=AB=AF=20-?=
 =?UTF-8?q?=20AI=E6=95=B0=E6=99=BA=E5=91=98=E5=B7=A5=E3=80=91=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Server/application/store/config/route.php     | 30 +++++++++----------
 .../store/controller/StatisticsController.php | 23 +++++++-------
 .../store/model/WechatFriendModel.php         |  5 ++--
 Store_vue/components/DataStatistics.vue       |  2 +-
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Server/application/store/config/route.php b/Server/application/store/config/route.php
index d8658fd8..dbae6f08 100644
--- a/Server/application/store/config/route.php
+++ b/Server/application/store/config/route.php
@@ -7,42 +7,42 @@ use think\facade\Route;
 Route::group('v1/store', function () {
     // 流量套餐相关路由
     Route::group('flow-packages', function () {
-        Route::get('', 'app\\store\\controller\\FlowPackageController@getList');  // 获取流量套餐列表
-        Route::get('remaining-flow', 'app\\store\\controller\\FlowPackageController@remainingFlow'); // 获取用户剩余流量
-        Route::get(':id', 'app\\store\\controller\\FlowPackageController@detail'); // 获取流量套餐详情
-        Route::post('order', 'app\\store\\controller\\FlowPackageController@createOrder'); // 创建流量采购订单
+        Route::get('', 'app\store\controller\FlowPackageController@getList');  // 获取流量套餐列表
+        Route::get('remaining-flow', 'app\store\controller\FlowPackageController@remainingFlow'); // 获取用户剩余流量
+        Route::get(':id', 'app\store\controller\FlowPackageController@detail'); // 获取流量套餐详情
+        Route::post('order', 'app\store\controller\FlowPackageController@createOrder'); // 创建流量采购订单
     });
     
     // 流量订单相关路由
     Route::group('flow-orders', function () {
-        Route::get('list', 'app\\store\\controller\\FlowPackageController@getOrderList'); // 获取订单列表
-        Route::get(':orderNo', 'app\\store\\controller\\FlowPackageController@getOrderDetail'); // 获取订单详情
+        Route::get('list', 'app\store\controller\FlowPackageController@getOrderList'); // 获取订单列表
+        Route::get(':orderNo', 'app\store\controller\FlowPackageController@getOrderDetail'); // 获取订单详情
     });
 
     // 客户相关路由
     Route::group('customers', function () {
-        Route::get('list', 'app\\store\\controller\\CustomerController@getList'); // 获取客户列表
+        Route::get('list', 'app\store\controller\CustomerController@getList'); // 获取客户列表
     });
 
 
     // 系统配置相关路由
     Route::group('system-config', function () {
-        Route::get('switch-status', 'app\\store\\controller\\SystemConfigController@getSwitchStatus'); // 获取系统开关状态
-        Route::post('update-switch-status', 'app\\store\\controller\\SystemConfigController@updateSwitchStatus'); // 更新系统开关状态
+        Route::get('switch-status', 'app\store\controller\SystemConfigController@getSwitchStatus'); // 获取系统开关状态
+        Route::post('update-switch-status', 'app\store\controller\SystemConfigController@updateSwitchStatus'); // 更新系统开关状态
     });
 
 
     // 数据统计相关路由
     Route::group('statistics', function () {
-        Route::get('overview', 'app\\store\\controller\\StatisticsController@getOverview'); // 获取数据概览
-        Route::get('customer-analysis', 'app\\store\\controller\\StatisticsController@getCustomerAnalysis'); // 获取客户分析数据
-        Route::get('interaction-analysis', 'app\\store\\controller\\StatisticsController@getInteractionAnalysis'); // 获取互动分析数据
+        Route::get('overview', 'app\store\controller\StatisticsController@getOverview'); // 获取数据概览
+        Route::get('customer-analysis', 'app\store\controller\StatisticsController@getCustomerAnalysis'); // 获取客户分析数据
+        Route::get('interaction-analysis', 'app\store\controller\StatisticsController@getInteractionAnalysis'); // 获取互动分析数据
     });
 
     // 供应商相关路由
     Route::group('vendor', function () {
-        Route::get('list', 'app\\store\\controller\\VendorController@getList'); // 获取供应商列表
-        Route::get('detail', 'app\\store\\controller\\VendorController@detail'); // 获取供应商详情
-        Route::post('order', 'app\\store\\controller\\VendorController@createOrder'); // 创建订单
+        Route::get('list', 'app\store\controller\VendorController@getList'); // 获取供应商列表
+        Route::get('detail', 'app\store\controller\VendorController@detail'); // 获取供应商详情
+        Route::post('order', 'app\store\controller\VendorController@createOrder'); // 创建订单
     });
 })->middleware(['jwt']);
\ No newline at end of file
diff --git a/Server/application/store/controller/StatisticsController.php b/Server/application/store/controller/StatisticsController.php
index 11cda5fb..2096b2bc 100644
--- a/Server/application/store/controller/StatisticsController.php
+++ b/Server/application/store/controller/StatisticsController.php
@@ -50,15 +50,11 @@ class StatisticsController extends BaseController
             
             // 1. 总客户数
             $totalCustomers = WechatFriendModel::whereIn('ownerWechatId',$ownerWechatIds)
-            ->whereTime('createTime', '>=', $startTime)
-            ->whereTime('createTime', '<', $endTime)
+            ->where('isDeleted',0)
             ->count();
 
             // 上期总客户数
-            $lastTotalCustomers = WechatFriendModel::whereIn('ownerWechatId',$ownerWechatIds)
-            ->whereTime('createTime', '>=', $lastStartTime)
-            ->whereTime('createTime', '<', $lastEndTime)
-            ->count();
+            $lastTotalCustomers = WechatFriendModel::whereIn('ownerWechatId',$ownerWechatIds)->count();
 
             // 2. 新增客户数
             $newCustomers = WechatFriendModel::whereIn('ownerWechatId',$ownerWechatIds)
@@ -143,35 +139,38 @@ class StatisticsController extends BaseController
 
             // 1. 客户增长趋势数据
             $totalCustomers = WechatFriendModel::whereIn('ownerWechatId', $ownerWechatIds)
+                ->where('isDeleted',0)
                 ->whereTime('createTime', '<', $endTime)
                 ->count();
 
             $newCustomers = WechatFriendModel::whereIn('ownerWechatId', $ownerWechatIds)
+                ->where('isDeleted',0)
                 ->whereTime('createTime', '>=', $startTime)
                 ->whereTime('createTime', '<', $endTime)
                 ->count();
 
-            // 计算流失客户数（假设超过30天未互动的客户为流失客户）
-            $thirtyDaysAgo = strtotime('-30 days');
+            // 计算流失客户数
             $lostCustomers = WechatFriendModel::whereIn('ownerWechatId', $ownerWechatIds)
+                ->where('isDeleted',1)
                 ->where('createTime', '>', 0)
-                ->where('deleteTime', '<', $thirtyDaysAgo)
+                ->whereTime('deleteTime', '>=', $startTime)
+                ->whereTime('deleteTime', '<', $endTime)
                 ->count();
 
             // 2. 客户来源分布数据
             // 朋友推荐
             $friendRecommend = WechatFriendModel::whereIn('ownerWechatId', $ownerWechatIds)
-                // ->whereIn('addFrom', [17, 1000017])
+                 ->whereIn('addFrom', [17, 1000017])
                 ->count();
 
             // 微信搜索
             $wechatSearch = WechatFriendModel::whereIn('ownerWechatId', $ownerWechatIds)
-                // ->whereIn('addFrom', [3, 15, 1000003, 1000015])
+                 ->whereIn('addFrom', [3, 15, 1000003, 1000015])
                 ->count();
 
             // 微信群
             $wechatGroup = WechatFriendModel::whereIn('ownerWechatId', $ownerWechatIds)
-                // ->whereIn('addFrom', [14, 1000014])
+                ->whereIn('addFrom', [14, 1000014])
                 ->count();
 
             // 其他渠道（总数减去已知渠道）
diff --git a/Server/application/store/model/WechatFriendModel.php b/Server/application/store/model/WechatFriendModel.php
index 02a8610a..0dcb7580 100644
--- a/Server/application/store/model/WechatFriendModel.php
+++ b/Server/application/store/model/WechatFriendModel.php
@@ -6,6 +6,7 @@ use think\Model;
 
 class WechatFriendModel extends Model
 {
-    protected $name = 'wechat_friendship';
-   
+    //protected $name = 'wechat_friendship';
+    protected $table = 's2_wechat_friend';
+
 } 
\ No newline at end of file
diff --git a/Store_vue/components/DataStatistics.vue b/Store_vue/components/DataStatistics.vue
index 3c455ce4..6329b225 100644
--- a/Store_vue/components/DataStatistics.vue
+++ b/Store_vue/components/DataStatistics.vue
@@ -557,7 +557,7 @@
 				tempEndDate: parseInt(today.getTime()),
 				minDate: parseInt(new Date(new Date().getFullYear() - 1, 0, 1).getTime()),
 				maxDate: parseInt(new Date().getTime()),
-				subsectionList: ['客户分析', '互动分析', '转化分析', '收入分析'],
+				subsectionList: ['客户分析', '互动分析'/* , '转化分析', '收入分析' */],
 				currentSubsection: 0,
 				overviewData: {
 					totalCustomers: 0,

From 7475dbd07cf34ca2506d224c837731f68c84e820 Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Tue, 21 Oct 2025 16:46:55 +0800
Subject: [PATCH 24/72] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chukebao/controller/MessageController.php | 194 ++++++++++--------
 .../chatroom/GetChatroomListV1Controller.php  |   8 +-
 .../friend/GetFriendListV1Controller.php      |  13 +-
 3 files changed, 126 insertions(+), 89 deletions(-)

diff --git a/Server/application/chukebao/controller/MessageController.php b/Server/application/chukebao/controller/MessageController.php
index 6d7de2a6..2898bb6d 100644
--- a/Server/application/chukebao/controller/MessageController.php
+++ b/Server/application/chukebao/controller/MessageController.php
@@ -8,67 +8,102 @@ use think\Db;
 class MessageController extends BaseController
 {
 
-    public function getList(){
+    public function getList()
+    {
         $page = $this->request->param('page', 1);
-        $limit =  $this->request->param('limit', 10);
+        $limit = $this->request->param('limit', 10);
         $accountId = $this->getUserInfo('s2_accountId');
-        if (empty($accountId)){
+        if (empty($accountId)) {
             return ResponseHelper::error('请先登录');
         }
 
-        $chatroomList = Db::table('s2_wechat_chatroom')->alias('wc')
-            ->join(['s2_wechat_message' => 'm'], 'wc.id = m.wechatChatroomId', 'LEFT')
-            ->where(['wc.accountId' =>  $accountId,'m.type' => 2,' wc.isDeleted' => 0])
-            ->order('m.id desc')
-            ->group('m.wechatChatroomId')
-            ->page($page, $limit)
-            ->select();
-        $friendIds = Db::table('s2_wechat_friend')
-            ->where(['accountId' =>  $accountId,' isDeleted' => 0])
-            ->group('id')
-            ->column('id');
-        $friendList = Db::table('s2_wechat_message')
-            ->where(['type' => 1])
-            ->whereIn('wechatFriendId',$friendIds)
-            ->order('id desc')
-            ->group('wechatFriendId')
-            ->page($page, $limit)
-            ->select();
-
-        $list = array_merge($chatroomList,$friendList);
-        
-        // 按createTime字段从大到小排序
-        usort($list, function($a, $b) {
-            return $b['createTime'] <=> $a['createTime'];
-        });
+        $friends = Db::table('s2_wechat_friend')
+            ->where(['accountId' => $accountId, 'isDeleted' => 0])
+            ->column('id,nickname,avatar');
 
 
-        foreach ($list as $k=>&$v){
-            $v['createTime'] = !empty($v['createTime']) ? date('Y-m-d H:i:s',$v['createTime']) : '';
-            $v['wechatTime'] = !empty($v['wechatTime']) ? date('Y-m-d H:i:s',$v['wechatTime']) : '';
+        // 构建好友子查询
+        $friendSubQuery = Db::table('s2_wechat_friend')
+            ->where(['accountId' => $accountId, 'isDeleted' => 0])
+            ->field('id')
+            ->buildSql();
 
-            if (!empty($v['wechatFriendId'])){
-                $friend = Db::table('s2_wechat_friend')
-                    ->where(['id'=>$v['wechatFriendId']])
-                    ->field('id,nickname,avatar')
-                    ->find();
-                $v['msgInfo'] = $friend;
-                $v['unreadCount'] = Db::table('s2_wechat_message')
-                    ->where(['wechatFriendId' => $v['wechatFriendId'],'isRead' => 0])
-                    ->count();
+        // 使用 UNION 合并群聊和好友消息，然后统一排序和分页
+        $unionQuery = "
+            (SELECT m.id, m.content, m.wechatFriendId, m.wechatChatroomId, m.createTime, m.wechatTime, 2 as msgType, wc.nickname, wc.chatroomAvatar as avatar
+             FROM s2_wechat_chatroom wc
+             LEFT JOIN s2_wechat_message m ON wc.id = m.wechatChatroomId
+             WHERE wc.accountId = {$accountId} AND m.type = 2 AND wc.isDeleted = 0
+             GROUP BY m.wechatChatroomId)
+            UNION ALL
+            (SELECT m.id, m.content, m.wechatFriendId, m.wechatChatroomId, m.createTime, m.wechatTime, 1 as msgType, 1 as nickname, 1 avatar
+             FROM s2_wechat_message m
+             WHERE m.type = 1 AND m.wechatFriendId IN {$friendSubQuery}
+             GROUP BY m.wechatFriendId)
+            ORDER BY createTime DESC
+            LIMIT " . (($page - 1) * $limit) . ", {$limit}
+        ";
+
+        $list = Db::query($unionQuery);
+
+        // 批量统计未读数量（isRead=0），按好友/群聊分别聚合
+        $friendIds = [];
+        $chatroomIds = [];
+        foreach ($list as $row) {
+            if (!empty($row['wechatFriendId'])) {
+                $friendIds[] = $row['wechatFriendId'];
+            }
+            if (!empty($row['wechatChatroomId'])) {
+                $chatroomIds[] = $row['wechatChatroomId'];
+            }
+        }
+        $friendIds = array_values(array_unique(array_filter($friendIds)));
+        $chatroomIds = array_values(array_unique(array_filter($chatroomIds)));
+
+        $friendUnreadMap = [];
+        if (!empty($friendIds)) {
+            $friendUnreadMap = Db::table('s2_wechat_message')
+                ->where(['isRead' => 0])
+                ->whereIn('wechatFriendId', $friendIds)
+                ->group('wechatFriendId')
+                ->column('COUNT(*) AS cnt', 'wechatFriendId');
+        }
+
+        $chatroomUnreadMap = [];
+        if (!empty($chatroomIds)) {
+            $chatroomUnreadMap = Db::table('s2_wechat_message')
+                ->where(['isRead' => 0])
+                ->whereIn('wechatChatroomId', $chatroomIds)
+                ->group('wechatChatroomId')
+                ->column('COUNT(*) AS cnt', 'wechatChatroomId');
+        }
+
+        foreach ($list as $k => &$v) {
+
+            $createTime = !empty($v['createTime']) ? date('Y-m-d H:i:s', $v['createTime']) : '';
+            $wechatTime = !empty($v['wechatTime']) ? date('Y-m-d H:i:s', $v['wechatTime']) : '';
+
+            $vunreadCount = 0;
+            if (!empty($v['wechatFriendId'])) {
+                $v['nickname'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['nickname'] : '';
+                $v['avatar'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['avatar'] : '';
+                $vunreadCount = isset($friendUnreadMap[$v['wechatFriendId']]) ? (int)$friendUnreadMap[$v['wechatFriendId']] : 0;
             }
 
-            if (!empty($v['wechatChatroomId'])){
-                $chatroom = Db::table('s2_wechat_chatroom')
-                    ->where(['id'=>$v['wechatChatroomId']])
-                    ->field('id,nickname,chatroomAvatar as avatar')
-                    ->find();
-                $v['msgInfo'] = $chatroom;
-                $v['unreadCount'] = Db::table('s2_wechat_message')
-                    ->where(['wechatChatroomId' => $v['wechatChatroomId'],'isRead' => 0])
-                    ->count();
+            if (!empty($v['wechatChatroomId'])) {
+                $vunreadCount = isset($chatroomUnreadMap[$v['wechatChatroomId']]) ? (int)$chatroomUnreadMap[$v['wechatChatroomId']] : 0;
             }
 
+            $v['id'] = !empty($v['wechatFriendId']) ? $v['wechatFriendId'] : $v['wechatChatroomId'];
+            $v['config'] = [
+                'vunreadCount' => $vunreadCount,
+                'chat' => true,
+                'msgTime' => $v['wechatTime'],
+            ];
+            $v['createTime'] = $createTime;
+            $v['wechatTime'] = $wechatTime;
+            unset($v['wechatFriendId'],$v['wechatChatroomId']);
+
         }
         unset($v);
 
@@ -76,24 +111,25 @@ class MessageController extends BaseController
     }
 
 
-    public function readMessage(){
+    public function readMessage()
+    {
         $wechatFriendId = $this->request->param('wechatFriendId', '');
-        $wechatChatroomId =  $this->request->param('wechatChatroomId', '');
+        $wechatChatroomId = $this->request->param('wechatChatroomId', '');
         $accountId = $this->getUserInfo('s2_accountId');
-        if (empty($accountId)){
+        if (empty($accountId)) {
             return ResponseHelper::error('请先登录');
         }
-        if (empty($wechatChatroomId) && empty($wechatFriendId)){
+        if (empty($wechatChatroomId) && empty($wechatFriendId)) {
             return ResponseHelper::error('参数缺失');
         }
 
         $where = [];
-        if (!empty($wechatChatroomId)){
-            $where[] = ['wechatChatroomId','=',$wechatChatroomId];
+        if (!empty($wechatChatroomId)) {
+            $where[] = ['wechatChatroomId', '=', $wechatChatroomId];
         }
 
-        if (!empty($wechatFriendId)){
-            $where[] = ['wechatFriendId','=',$wechatFriendId];
+        if (!empty($wechatFriendId)) {
+            $where[] = ['wechatFriendId', '=', $wechatFriendId];
         }
 
         Db::table('s2_wechat_message')->where($where)->update(['isRead' => 1]);
@@ -101,49 +137,47 @@ class MessageController extends BaseController
     }
 
 
-
-
-    public function details(){
+    public function details()
+    {
         $wechatFriendId = $this->request->param('wechatFriendId', '');
-        $wechatChatroomId =  $this->request->param('wechatChatroomId', '');
-        $wechatAccountId =  $this->request->param('wechatAccountId', '');
-        $page =  $this->request->param('page', 1);
-        $limit =  $this->request->param('limit', 10);
-        $from =  $this->request->param('From', '');
-        $to =  $this->request->param('To', '');
-        $olderData =  $this->request->param('olderData', false);
+        $wechatChatroomId = $this->request->param('wechatChatroomId', '');
+        $wechatAccountId = $this->request->param('wechatAccountId', '');
+        $page = $this->request->param('page', 1);
+        $limit = $this->request->param('limit', 10);
+        $from = $this->request->param('From', '');
+        $to = $this->request->param('To', '');
+        $olderData = $this->request->param('olderData', false);
         $accountId = $this->getUserInfo('s2_accountId');
-        if (empty($accountId)){
+        if (empty($accountId)) {
             return ResponseHelper::error('请先登录');
         }
-        if (empty($wechatChatroomId) && empty($wechatFriendId)){
+        if (empty($wechatChatroomId) && empty($wechatFriendId)) {
             return ResponseHelper::error('参数缺失');
         }
 
         $where = [];
-        if (!empty($wechatChatroomId)){
-            $where[] = ['wechatChatroomId','=',$wechatChatroomId];
+        if (!empty($wechatChatroomId)) {
+            $where[] = ['wechatChatroomId', '=', $wechatChatroomId];
         }
 
-        if (!empty($wechatFriendId)){
-            $where[] = ['wechatFriendId','=',$wechatFriendId];
+        if (!empty($wechatFriendId)) {
+            $where[] = ['wechatFriendId', '=', $wechatFriendId];
         }
 
-        if (!empty($From) && !empty($To)){
-            $where[] = ['wechatTime','between',[$from,$to]];
+        if (!empty($From) && !empty($To)) {
+            $where[] = ['wechatTime', 'between', [$from, $to]];
         }
 
         $total = Db::table('s2_wechat_message')->where($where)->count();
-        $list = Db::table('s2_wechat_message')->where($where)->page($page,$limit)->order('id DESC')->select();
+        $list = Db::table('s2_wechat_message')->where($where)->page($page, $limit)->order('id DESC')->select();
 
 
-
-        foreach ($list as $k=>&$v){
-            $v['wechatTime'] = !empty($v['wechatTime']) ? date('Y-m-d H:i:s',$v['wechatTime']) : '';
+        foreach ($list as $k => &$v) {
+            $v['wechatTime'] = !empty($v['wechatTime']) ? date('Y-m-d H:i:s', $v['wechatTime']) : '';
         }
 
 
-        return ResponseHelper::success(['total'=>$total,'list'=>$list]);
+        return ResponseHelper::success(['total' => $total, 'list' => $list]);
     }
 
 
diff --git a/Server/application/cunkebao/controller/chatroom/GetChatroomListV1Controller.php b/Server/application/cunkebao/controller/chatroom/GetChatroomListV1Controller.php
index 39ca9149..8499c6e6 100644
--- a/Server/application/cunkebao/controller/chatroom/GetChatroomListV1Controller.php
+++ b/Server/application/cunkebao/controller/chatroom/GetChatroomListV1Controller.php
@@ -22,19 +22,19 @@ class GetChatroomListV1Controller extends BaseController
         $keyword = $this->request->param('keyword', '');
         try {
 
-            /*$companyId = (int)$this->getUserInfo('companyId');
+            $companyId = (int)$this->getUserInfo('companyId');
             $wechatIds = Db::name('device')->alias('d')
                 // 仅关联每个设备在 device_wechat_login 中的最新一条记录
                 ->join('(SELECT MAX(id) AS id, deviceId FROM ck_device_wechat_login WHERE companyId='.$companyId.' GROUP BY deviceId) dwl_max','dwl_max.deviceId = d.id')
                 ->join('device_wechat_login dwl','dwl.id = dwl_max.id')
                 ->where(['d.companyId' => $companyId,'d.deleteTime' => 0])
-                ->column('dwl.wechatId');*/
+                ->column('dwl.wechatId');
 
 
-            $wechatIds = Db::name('device')->alias('d')
+           /* $wechatIds = Db::name('device')->alias('d')
                 ->join('device_wechat_login dwl','dwl.deviceId=d.id AND dwl.companyId='.$this->getUserInfo('companyId'))
                 ->where(['d.companyId' => $this->getUserInfo('companyId'),'d.deleteTime' => 0])
-                ->column('dwl.wechatId');
+                ->column('dwl.wechatId');*/
 
 
             $where = [];
diff --git a/Server/application/cunkebao/controller/friend/GetFriendListV1Controller.php b/Server/application/cunkebao/controller/friend/GetFriendListV1Controller.php
index 3222d7db..dc7a525f 100644
--- a/Server/application/cunkebao/controller/friend/GetFriendListV1Controller.php
+++ b/Server/application/cunkebao/controller/friend/GetFriendListV1Controller.php
@@ -42,16 +42,20 @@ class GetFriendListV1Controller extends BaseController
                 $where[] = ['nickname|alias|wechatId','like','%'.$keyword.'%'];
             }
 
-            $wechatIds = Db::name('device')->alias('d')
+          /*  $wechatIds = Db::name('device')->alias('d')
                 ->join('device_wechat_login dwl','dwl.deviceId=d.id AND dwl.companyId='.$this->getUserInfo('companyId'))
-                ->where(['d.companyId' => $this->getUserInfo('companyId'),'d.deleteTime' => 0])->group('dwl.deviceId')->order('dwl.id desc');
+                ->where(['d.companyId' => $this->getUserInfo('companyId'),'d.deleteTime' => 0])
+                ->group('dwl.deviceId')
+                ->order('dwl.id desc');*/
 
 
-            /*$wechatIds = Db::name('device')->alias('d')
+            $companyId = $this->getUserInfo('companyId');
+            
+            $wechatIds = Db::name('device')->alias('d')
                 // 仅关联每个设备在 device_wechat_login 中的最新一条记录
                 ->join('(SELECT MAX(id) AS id, deviceId FROM ck_device_wechat_login WHERE companyId='.$companyId.' GROUP BY deviceId) dwl_max','dwl_max.deviceId = d.id')
                 ->join('device_wechat_login dwl','dwl.id = dwl_max.id')
-                ->where(['d.companyId' => $companyId,'d.deleteTime' => 0]);*/
+                ->where(['d.companyId' => $companyId,'d.deleteTime' => 0]);
 
 
             if (!empty($deviceIds)){
@@ -59,7 +63,6 @@ class GetFriendListV1Controller extends BaseController
             }
             $wechatIds = $wechatIds->column('dwl.wechatId');
 
-
             $where[] = ['ownerWechatId','in',$wechatIds];
 
             $data = Db::table('s2_wechat_friend')

From 0958c5f9c7ffcd737f1990d8f3b842d16ae4adb7 Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Tue, 21 Oct 2025 16:48:00 +0800
Subject: [PATCH 25/72] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A5=E6=94=B6?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/MessageController.php      |  4 +--
 .../chukebao/controller/DataProcessing.php    | 28 +++++++++++++++++++
 .../controller/ContentLibraryController.php   |  1 +
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/Server/application/api/controller/MessageController.php b/Server/application/api/controller/MessageController.php
index 12d732c1..c4bd545b 100644
--- a/Server/application/api/controller/MessageController.php
+++ b/Server/application/api/controller/MessageController.php
@@ -349,7 +349,7 @@ class MessageController extends BaseController
      * 保存消息记录到数据库
      * @param array $item 消息记录数据
      */
-    private function saveMessage($item)
+    public function saveMessage($item)
     {
         // 检查消息是否已存在
         $exists = WechatMessageModel::where('id', $item['id']) ->find();
@@ -457,7 +457,7 @@ class MessageController extends BaseController
      * @param array $item 消息记录数据
      * @return bool 是否保存成功
      */
-    private function saveChatroomMessage($item)
+    public function saveChatroomMessage($item)
     {
         // 检查消息是否已存在
         $exists = WechatMessageModel::where('id', $item['id'])->find();
diff --git a/Server/application/chukebao/controller/DataProcessing.php b/Server/application/chukebao/controller/DataProcessing.php
index 04344a74..d6970702 100644
--- a/Server/application/chukebao/controller/DataProcessing.php
+++ b/Server/application/chukebao/controller/DataProcessing.php
@@ -4,6 +4,8 @@ namespace app\chukebao\controller;
 
 use library\ResponseHelper;
 use app\api\model\WechatFriendModel;
+use app\api\controller\MessageController;
+
 
 class DataProcessing extends BaseController
 {
@@ -20,11 +22,17 @@ class DataProcessing extends BaseController
         $labels = $this->request->param('labels', []);
         //微信群
         $wechatChatroomId = $this->request->param('wechatChatroomId', '');
+
+        //新消息
+        $friendMessage = $this->request->param('friendMessage', '');
+        $chatroomMessage = $this->request->param('chatroomMessage', '');
+
         $typeData = [
             'CmdModifyFriendRemark', //好友修改备注  {newRemark、wechatAccountId、wechatFriendId}
             'CmdModifyFriendLabel', //好友修改标签  {labels、wechatAccountId、wechatFriendId}
             'CmdAllotFriend', //转让好友  {labels、wechatAccountId、wechatFriendId}
             'CmdChatroomOperate', //修改群信息  {chatroomName（群名）、announce（公告）、extra（公告）、wechatAccountId、wechatChatroomId}
+            'CmdNewMessage', //接收消息
         ];
 
         if (empty($type) || empty($wechatAccountId)) {
@@ -76,6 +84,26 @@ class DataProcessing extends BaseController
                 $friend->save();
                 $msg = '好友转移成功';
                 break;
+            case 'CmdNewMessage':
+                if(empty($friendMessage) || empty($chatroomMessage)){
+                    return ResponseHelper::error('参数缺失');
+                }
+
+                if(is_array($friendMessage) || is_array($chatroomMessage)){
+                    return ResponseHelper::error('参数缺失');
+                }
+
+                $messageController = new MessageController();
+                if (!empty($friendMessage)){
+                    $res = $messageController->saveMessage($friendMessage);
+                }else{
+                    $res = $messageController->saveChatroomMessage($friendMessage);
+                }
+                if (!empty($res)){
+                    $msg = '消息记录成功';
+                }else{
+                    $msg = '消息记录失败';
+                }
         }
         return ResponseHelper::success('',$msg);
     }
diff --git a/Server/application/cunkebao/controller/ContentLibraryController.php b/Server/application/cunkebao/controller/ContentLibraryController.php
index 726625a6..0ddac5b7 100644
--- a/Server/application/cunkebao/controller/ContentLibraryController.php
+++ b/Server/application/cunkebao/controller/ContentLibraryController.php
@@ -247,6 +247,7 @@ class ContentLibraryController extends Controller
                 $friendsInfo = Db::name('wechat_friendship')->alias('wf')
                     ->field('wf.id,wf.wechatId, wa.nickname, wa.avatar')
                     ->join('wechat_account wa', 'wf.wechatId = wa.wechatId')
+                    ->order('wa.id DESC')
                     ->whereIn('wf.id', $friendIds)
                     ->select();
             }

From 7db48facbdb1ccb3151bd5c386692d27f1cc94fb Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Wed, 22 Oct 2025 09:55:49 +0800
Subject: [PATCH 26/72] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Server/application/chukebao/controller/DataProcessing.php     | 4 +++-
 .../cunkebao/controller/plan/PosterWeChatMiniProgram.php      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Server/application/chukebao/controller/DataProcessing.php b/Server/application/chukebao/controller/DataProcessing.php
index d6970702..edd2edbd 100644
--- a/Server/application/chukebao/controller/DataProcessing.php
+++ b/Server/application/chukebao/controller/DataProcessing.php
@@ -43,6 +43,7 @@ class DataProcessing extends BaseController
             return ResponseHelper::error('类型错误');
         }
         $msg = '';
+        $codee = 200;
         switch ($type) {
             case 'CmdModifyFriendRemark': //修改好友备注
                 if(empty($wechatFriendId) || empty($newRemark)){
@@ -103,8 +104,9 @@ class DataProcessing extends BaseController
                     $msg = '消息记录成功';
                 }else{
                     $msg = '消息记录失败';
+                    $codee = 400;
                 }
         }
-        return ResponseHelper::success('',$msg);
+        return ResponseHelper::success('',$msg,$codee);
     }
 }
\ No newline at end of file
diff --git a/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php b/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php
index cb780daa..49330c10 100644
--- a/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php
+++ b/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php
@@ -153,7 +153,7 @@ class PosterWeChatMiniProgram extends Controller
         }
 
 
-        $phoneData = explode(',', $phoneData);
+        $phoneData = explode(    "\n",  $phoneData);
         foreach ($phoneData as $phone) {
             if (empty($phone)) {
                 continue;

From 17e81cafc201e78c81452321ab41e8f21ab00811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Wed, 22 Oct 2025 10:41:19 +0800
Subject: [PATCH 27/72] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=E4=BB=A5=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E6=9B=B4=E5=85=B7=E6=8F=8F=E8=BF=B0=E6=80=A7=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=90=8D=EF=BC=8C=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E5=A4=87=E6=B3=A8=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E5=AE=9A=E6=97=B6=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9A=84=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E6=8F=90=E5=8D=87=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BD=93=E9=AA=8C=E5=92=8C=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB?=
 =?UTF-8?q?=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/MomentPublish.tsx              | 38 +++++++++----------
 .../components/PublishSchedule.tsx            |  2 +-
 .../content-management/components/api.ts      |  2 +-
 Touchkebao/src/pages/pc/ckbox/weChat/main.ts  | 24 ++----------
 4 files changed, 23 insertions(+), 43 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/MomentPublish.tsx b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/MomentPublish.tsx
index 1a740746..e8702e7e 100644
--- a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/MomentPublish.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/MomentPublish.tsx
@@ -16,9 +16,8 @@ const MomentPublish: React.FC<MomentPublishProps> = ({ onPublishSuccess }) => {
   const [content, setContent] = useState<string>("");
   // 发布类型：1文本 2图文 3视频 4链接
   const [contentType, setContentType] = useState<number>(1);
-  const [sendTime, setSendTime] = useState<string>("");
+  const [timingTime, setTimingTime] = useState<string>("");
   const [resUrls, setResUrls] = useState<string[]>([]); // 图片/视频等资源
-  const [comment, setComment] = useState<string>("");
   // 链接
   const [linkDesc, setLinkDesc] = useState<string>("");
   const [linkImage, setLinkImage] = useState<string>("");
@@ -101,7 +100,7 @@ const MomentPublish: React.FC<MomentPublishProps> = ({ onPublishSuccess }) => {
           break;
         case 2: // 图文
           if (resUrls.length > 0) {
-            publishData["picUrlList[]"] = resUrls;
+            publishData.picUrlList = resUrls;
           }
           break;
         case 3: // 视频
@@ -123,8 +122,17 @@ const MomentPublish: React.FC<MomentPublishProps> = ({ onPublishSuccess }) => {
       }
 
       // 添加定时发布时间
-      if (sendTime) {
-        publishData.timingTime = sendTime;
+      if (timingTime) {
+        // 将 datetime-local 格式转换为 "2025年10月20日17:06:34" 格式
+        const date = new Date(timingTime);
+        const year = date.getFullYear();
+        const month = date.getMonth() + 1;
+        const day = date.getDate();
+        const hours = date.getHours().toString().padStart(2, "0");
+        const minutes = date.getMinutes().toString().padStart(2, "0");
+        const seconds = date.getSeconds().toString().padStart(2, "0");
+
+        publishData.timingTime = `${year}年${month}月${day}日${hours}:${minutes}:${seconds}`;
       }
       console.log(publishData);
 
@@ -137,7 +145,7 @@ const MomentPublish: React.FC<MomentPublishProps> = ({ onPublishSuccess }) => {
       setLinkDesc("");
       setLinkImage("");
       setLinkUrl("");
-      setSendTime("");
+      setTimingTime("");
       // 重新获取账号使用情况
       await fetchAccountUsage();
       // 触发父组件的刷新回调
@@ -193,8 +201,8 @@ const MomentPublish: React.FC<MomentPublishProps> = ({ onPublishSuccess }) => {
           <label className={styles.formLabel}>发布时间</label>
           <Input
             type="datetime-local"
-            value={sendTime}
-            onChange={e => setSendTime((e.target as HTMLInputElement).value)}
+            value={timingTime}
+            onChange={e => setTimingTime((e.target as HTMLInputElement).value)}
             placeholder="请选择发布时间"
             className={styles.contentInput}
           />
@@ -232,7 +240,7 @@ const MomentPublish: React.FC<MomentPublishProps> = ({ onPublishSuccess }) => {
         </div>
 
         {/* 链接类型 */}
-        {contentType === 2 && (
+        {contentType === 4 && (
           <>
             <div className={styles.formItem}>
               <label className={styles.formLabel}>描述</label>
@@ -286,17 +294,7 @@ const MomentPublish: React.FC<MomentPublishProps> = ({ onPublishSuccess }) => {
           </div>
         )}
 
-        {/* 备注 */}
-        <div className={styles.formItem}>
-          <label className={styles.formLabel}>备注</label>
-          <Input.TextArea
-            value={comment}
-            onChange={e => setComment((e.target as HTMLTextAreaElement).value)}
-            placeholder="请输入备注"
-            className={styles.contentInput}
-            rows={4}
-          />
-        </div>
+        {/* 备注已移除 */}
       </div>
 
       {/* 发布按钮 */}
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/PublishSchedule.tsx b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/PublishSchedule.tsx
index 4bec521f..171a5e92 100644
--- a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/PublishSchedule.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/PublishSchedule.tsx
@@ -257,7 +257,7 @@ const PublishSchedule = forwardRef<PublishScheduleRef>((props, ref) => {
 
                 <div className={styles.cardContent}>
                   <div className={styles.postContent}>
-                    {post.text || "无文本内容"}
+                    {post.content || "无文本内容"}
                   </div>
 
                   {/* 图片展示 */}
diff --git a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/api.ts b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/api.ts
index 23041afd..259daf45 100644
--- a/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/api.ts
+++ b/Touchkebao/src/pages/pc/ckbox/powerCenter/content-management/components/api.ts
@@ -1,7 +1,7 @@
 import request from "@/api/request";
 export interface listData {
   id: number;
-  text: "";
+  content: "";
   momentContentType: number;
   picUrlList: string[];
   videoUrl: string;
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/main.ts b/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
index 9dba27a8..1dc638da 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
@@ -19,6 +19,7 @@ import {
   getGroupList,
   getAgentList,
   getLabelsListByGroup,
+  getMessageList,
 } from "./api";
 
 import {
@@ -75,6 +76,8 @@ export const chatInitAPIdata = async () => {
       return session.conRemark || session.nickname || "";
     };
 
+    const messageList = await getMessageList();
+    console.log(messageList);
     //排序功能
     const sortedSessions = [...filterUserSessions, ...filterGroupSessions].sort(
       (a, b) => {
@@ -293,24 +296,3 @@ export const getAllGroupList = async () => {
     return [];
   }
 };
-
-//获取token
-const getToken = () => {
-  return new Promise((resolve, reject) => {
-    const params = {
-      grant_type: "password",
-      password: "kr123456",
-      username: "kr_xf3",
-      // username: "karuo",
-      // password: "zhiqun1984",
-    };
-    loginWithToken(params)
-      .then(res => {
-        login2(res.access_token);
-        resolve(res.access_token);
-      })
-      .catch(err => {
-        reject(err);
-      });
-  });
-};

From 9be85c4c2d3baa67947981435a476269ea997a40 Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Wed, 22 Oct 2025 10:42:37 +0800
Subject: [PATCH 28/72] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cunkebao/controller/plan/PosterWeChatMiniProgram.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php b/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php
index 49330c10..f51e5d76 100644
--- a/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php
+++ b/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php
@@ -153,7 +153,7 @@ class PosterWeChatMiniProgram extends Controller
         }
 
 
-        $phoneData = explode(    "\n",  $phoneData);
+        $phoneData = explode("\n",  $phoneData);
         foreach ($phoneData as $phone) {
             if (empty($phone)) {
                 continue;

From 5b9ae2b80520b88c5f0584c0ee640e918b3e8317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Wed, 22 Oct 2025 15:28:03 +0800
Subject: [PATCH 29/72] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=86=85=E5=AE=B9=E5=B1=95=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B6=88=E6=81=AF=E6=97=B6=E9=97=B4=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91=EF=BC=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=8E=B7=E5=8F=96=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84API=E4=BB=A5=E6=94=AF=E6=8C=81=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E5=8D=87=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C?=
 =?UTF-8?q?=E5=92=8C=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pc/ckbox/components/NavCommon/index.tsx   |   5 +-
 Touchkebao/src/pages/pc/ckbox/weChat/api.ts   |   4 +-
 .../MessageList/MessageList.module.scss       |  50 +-------
 .../SidebarMenu/MessageList/index.tsx         |   1 +
 Touchkebao/src/pages/pc/ckbox/weChat/main.ts  | 113 +++++++++++-------
 Touchkebao/src/store/module/ckchat/api.ts     |   4 +-
 Touchkebao/src/utils/common.ts                |  99 +++++++++------
 7 files changed, 142 insertions(+), 134 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.tsx b/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.tsx
index dedc91e3..4e3fabcd 100644
--- a/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/components/NavCommon/index.tsx
@@ -217,10 +217,7 @@ const NavCommon: React.FC<NavCommonProps> = ({ title = "触客宝" }) => {
             icon={<BarChartOutlined style={{ fontSize: 18 }} />}
             type="primary"
             onClick={handleMenuClick}
-          >
-            切换到{isWeChat() ? "功能中心" : "Ai智能客服"}
-            <RetweetOutlined style={{ fontSize: 18 }} />
-          </Button>
+          ></Button>
 
           <Button
             icon={<CalendarOutlined />}
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/api.ts b/Touchkebao/src/pages/pc/ckbox/weChat/api.ts
index d9c137da..7b153312 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/api.ts
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/api.ts
@@ -58,8 +58,8 @@ export function getLabelsListByGroup(params) {
 // }
 
 //群、好友聊天记录列表
-export function getMessageList() {
-  return request("/v1/kefu/message/list", {}, "GET");
+export function getMessageList(params: { page: number; limit: number }) {
+  return request("/v1/kefu/message/list", params, "GET");
 }
 
 //获取客服列表
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss
index a3bad297..b924c483 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss
@@ -76,51 +76,11 @@
         }
 
         .messageContent {
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-
-          .lastMessage {
-            font-size: 12px;
-            color: #8c8c8c;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            flex: 1;
-            position: relative;
-            padding-right: 5px;
-            height: 18px; // 添加固定高度
-            line-height: 18px; // 设置行高与高度一致
-
-            &::before {
-              content: attr(data-count);
-              position: absolute;
-              right: -5px;
-              top: 0;
-              background-color: #ff4d4f;
-              color: white;
-              border-radius: 10px;
-              padding: 0 6px;
-              font-size: 10px;
-              line-height: 16px;
-              min-width: 16px;
-              height: 16px;
-              text-align: center;
-              display: none;
-            }
-
-            &[data-count]:not([data-count=""]):not([data-count="0"]) {
-              &::before {
-                display: inline-block;
-              }
-            }
-          }
-
-          .onlineIndicator {
-            font-size: 10px;
-            color: #52c41a;
-            flex-shrink: 0;
-            margin-left: 8px;
-          }
+          font-size: 12px;
+          color: #888;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
         }
       }
     }
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index eb59df6e..2e64e377 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -278,6 +278,7 @@ const MessageList: React.FC<MessageListProps> = () => {
                     {formatWechatTime(session?.lastUpdateTime)}
                   </div>
                 </div>
+                <div className={styles.messageContent}>{session.content}</div>
               </div>
             </div>
           </List.Item>
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/main.ts b/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
index 1dc638da..11c4082b 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
@@ -13,7 +13,6 @@ import { useUserStore } from "@/store/module/user";
 import { weChatGroupService, contractService } from "@/utils/db";
 
 import {
-  loginWithToken,
   getControlTerminalList,
   getContactList,
   getGroupList,
@@ -28,7 +27,6 @@ import {
   weChatGroup,
 } from "@/pages/pc/ckbox/data";
 
-const { login2 } = useUserStore.getState();
 //获取触客宝基础信息
 export const chatInitAPIdata = async () => {
   try {
@@ -64,60 +62,51 @@ export const chatInitAPIdata = async () => {
     const countLables = await getCountLables();
     await asyncCountLables(countLables);
 
-    //获取消息会话列表并按lastUpdateTime排序
-    const filterUserSessions = contractList?.filter(
-      v => v?.config && v.config?.chat,
-    );
-    const filterGroupSessions = groupList?.filter(
-      v => v?.config && v.config?.chat,
-    );
     // 获取显示名称的辅助函数（优先 conRemark，其次 nickname）
     const getDisplayName = (session: any) => {
       return session.conRemark || session.nickname || "";
     };
 
-    const messageList = await getMessageList();
-    console.log(messageList);
+    const messageList = await getAllMessageList();
+
     //排序功能
-    const sortedSessions = [...filterUserSessions, ...filterGroupSessions].sort(
-      (a, b) => {
-        // 获取置顶状态
-        const aTop = a.config?.top || false;
-        const bTop = b.config?.top || false;
+    const sortedSessions = messageList.sort((a, b) => {
+      // 获取置顶状态
+      const aTop = a.config?.top || false;
+      const bTop = b.config?.top || false;
 
-        // 首先按置顶状态排序（置顶的排在前面）
-        if (aTop !== bTop) {
-          return aTop ? -1 : 1;
-        }
+      // 首先按置顶状态排序（置顶的排在前面）
+      if (aTop !== bTop) {
+        return aTop ? -1 : 1;
+      }
 
-        // 如果都是置顶或都不是置顶，则按未读消息数量降序排列（未读消息多的排在前面）
-        const aUnread = a.config?.unreadCount || 0;
-        const bUnread = b.config?.unreadCount || 0;
+      // 如果都是置顶或都不是置顶，则按未读消息数量降序排列（未读消息多的排在前面）
+      const aUnread = a.config?.unreadCount || 0;
+      const bUnread = b.config?.unreadCount || 0;
 
-        if (aUnread !== bUnread) {
-          return bUnread - aUnread;
-        }
+      if (aUnread !== bUnread) {
+        return bUnread - aUnread;
+      }
 
-        // 如果未读消息数量相同，则按显示名称排序（字母排序）
-        const aName = getDisplayName(a).toLowerCase();
-        const bName = getDisplayName(b).toLowerCase();
+      // 如果未读消息数量相同，则按显示名称排序（字母排序）
+      const aName = getDisplayName(a).toLowerCase();
+      const bName = getDisplayName(b).toLowerCase();
 
-        if (aName !== bName) {
-          return aName.localeCompare(bName, "zh-CN");
-        }
+      if (aName !== bName) {
+        return aName.localeCompare(bName, "zh-CN");
+      }
 
-        // 如果名称也相同，则按时间降序排列（最新的在前面）
-        // 如果lastUpdateTime不存在，则将其排在最后
-        if (!a.lastUpdateTime) return 1;
-        if (!b.lastUpdateTime) return -1;
+      // 如果名称也相同，则按时间降序排列（最新的在前面）
+      // 如果lastUpdateTime不存在，则将其排在最后
+      if (!a.lastUpdateTime) return 1;
+      if (!b.lastUpdateTime) return -1;
 
-        const timeCompare =
-          new Date(b.lastUpdateTime).getTime() -
-          new Date(a.lastUpdateTime).getTime();
+      const timeCompare =
+        new Date(b.lastUpdateTime).getTime() -
+        new Date(a.lastUpdateTime).getTime();
 
-        return timeCompare;
-      },
-    );
+      return timeCompare;
+    });
     //会话数据同步
     asyncChatSessions(sortedSessions);
 
@@ -131,6 +120,46 @@ export const chatInitAPIdata = async () => {
     return [];
   }
 };
+
+// 递归获取所有联系人列表
+export const getAllMessageList = async () => {
+  try {
+    let allMessages = [];
+    let page = 1;
+    const limit = 500;
+    let hasMore = true;
+
+    while (hasMore) {
+      const Result = await getMessageList({
+        page,
+        limit,
+      });
+      const messageList = Result;
+      if (
+        !messageList ||
+        !Array.isArray(messageList) ||
+        messageList.length === 0
+      ) {
+        hasMore = false;
+        break;
+      }
+
+      allMessages = [...allMessages, ...messageList];
+
+      // 如果返回的数据少于请求的数量，说明已经没有更多数据了
+      if (messageList.length == 0) {
+        hasMore = false;
+      } else {
+        page = page + 1;
+      }
+    }
+    return allMessages;
+  } catch (error) {
+    console.error("获取所有联系人列表失败:", error);
+    return [];
+  }
+};
+
 //发起soket连接
 export const initSocket = () => {
   // 从store获取token和accountId
diff --git a/Touchkebao/src/store/module/ckchat/api.ts b/Touchkebao/src/store/module/ckchat/api.ts
index b921e605..804509a5 100644
--- a/Touchkebao/src/store/module/ckchat/api.ts
+++ b/Touchkebao/src/store/module/ckchat/api.ts
@@ -19,7 +19,7 @@ export const createContractList = async (
   const dataByLabels = [];
   for (const label of countLables) {
     let data;
-    if (label.groupType === 1) {
+    if (Number(label.groupType) === 1) {
       if (label.id == 0) {
         data = await contractService.findWhereMultiple([
           {
@@ -36,7 +36,7 @@ export const createContractList = async (
         data = data.filter(contact => contact.wechatAccountId === kfSelected);
       }
       // console.log(`标签 ${label.groupName} 对应的联系人数据:`, data);
-    } else if (label.groupType === 2) {
+    } else if (Number(label.groupType) === 2) {
       // groupType: 2, 查询 weChatGroupService
       if (label.id == 0) {
         data = await weChatGroupService.findWhereMultiple([
diff --git a/Touchkebao/src/utils/common.ts b/Touchkebao/src/utils/common.ts
index 5c195d3b..c2a879cb 100644
--- a/Touchkebao/src/utils/common.ts
+++ b/Touchkebao/src/utils/common.ts
@@ -1,55 +1,76 @@
 import { Modal } from "antd-mobile";
 import { getSetting } from "@/store/module/settings";
-export function formatWechatTime(timestamp) {
-  if (!timestamp) {
+import dayjs from "dayjs";
+export function formatWechatTime(lastUpdateTime: string) {
+  if (!lastUpdateTime) {
     return "";
   }
-  // 处理时间戳（兼容秒级/毫秒级）
-  const date = new Date(
-    timestamp.toString().length === 10 ? timestamp * 1000 : timestamp,
-  );
-  const now = new Date();
 
-  // 获取消息时间的年月日时分
-  const messageYear = date.getFullYear();
-  const messageMonth = date.getMonth();
-  const messageDate = date.getDate();
-  const messageHour = date.getHours().toString().padStart(2, "0");
-  const messageMinute = date.getMinutes().toString().padStart(2, "0");
+  // 使用dayjs解析时间字符串，处理"2025-10-22 13:21:13"格式
+  let messageTime;
+  try {
+    // 直接解析时间字符串，dayjs可以自动识别这种格式
+    messageTime = dayjs(lastUpdateTime);
 
-  // 获取当前时间的年月日
-  const nowYear = now.getFullYear();
-  const nowMonth = now.getMonth();
-  const nowDate = now.getDate();
-
-  // 创建当天0点的时间对象，用于比较是否同一天
-  const today = new Date(nowYear, nowMonth, nowDate, 0, 0, 0);
-  const yesterday = new Date(today);
-  yesterday.setDate(yesterday.getDate() - 1);
-  const weekAgo = new Date(today);
-  weekAgo.setDate(weekAgo.getDate() - 6); // 7天前（包括今天）
-
-  // 消息日期（不含时间）
-  const messageDay = new Date(messageYear, messageMonth, messageDate, 0, 0, 0);
-
-  // 当天消息：只显示时分
-  if (messageDay.getTime() === today.getTime()) {
-    return `${messageHour}:${messageMinute}`;
+    // 检查日期是否有效
+    if (!messageTime.isValid()) {
+      console.warn("formatWechatTime: Invalid date string", lastUpdateTime);
+      return "";
+    }
+  } catch (error) {
+    console.error(
+      "formatWechatTime: Error processing date string",
+      lastUpdateTime,
+      error,
+    );
+    return "";
   }
 
-  // 昨天消息：显示"昨天 时分"
-  if (messageDay.getTime() === yesterday.getTime()) {
-    return `昨天 ${messageHour}:${messageMinute}`;
+  const now = dayjs();
+
+  // 获取消息时间和当前时间的年份
+  const messageYear = messageTime.year();
+  const nowYear = now.year();
+
+  // 如果是去年或更早的时间，直接返回空字符串
+  if (messageYear < nowYear) {
+    return "";
   }
 
-  // 一周内消息：显示"星期X 时分"
-  if (messageDay.getTime() >= weekAgo.getTime()) {
+  // 创建时间比较对象
+  const today = now.startOf("day");
+  const yesterday = today.subtract(1, "day");
+  const messageDay = messageTime.startOf("day");
+
+  // 1. 时间是否今天，如果是就展示时和分，示例为： "13:00"
+  if (messageDay.isSame(today, "day")) {
+    return messageTime.format("HH:mm");
+  }
+
+  // 2. 时间是否为昨天，如果是就展示"昨天"和时与分，示例为： "昨天 13:00"
+  if (messageDay.isSame(yesterday, "day")) {
+    return `昨天 ${messageTime.format("HH:mm")}`;
+  }
+
+  // 3. 时间是否在本周，如果是就展示具体周几，示例为： "周一"
+  const startOfWeek = now.startOf("week");
+  const endOfWeek = now.endOf("week");
+  if (messageTime.isAfter(startOfWeek) && messageTime.isBefore(endOfWeek)) {
     const weekdays = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
-    return `${weekdays[date.getDay()]} ${messageHour}:${messageMinute}`;
+    return weekdays[messageTime.day()];
   }
 
-  // 超过一周：显示"年月日 时分"
-  return `${messageYear}年${messageMonth + 1}月${messageDate}日 ${messageHour}:${messageMinute}`;
+  // 4. 时间是否在本月，如果是就展示月和日，示例为： "12/07"
+  if (messageTime.isSame(now, "month")) {
+    return messageTime.format("MM/DD");
+  }
+
+  // 5. 时间是否在本年，如果在本年就展示月和日，示例为： "12/07"
+  if (messageTime.isSame(now, "year")) {
+    return messageTime.format("MM/DD");
+  }
+
+  return "";
 }
 /**
  * 通用js调用弹窗，Promise风格

From f137bd2c07c3eef82cc7c1e5663ab07261765b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Wed, 22 Oct 2025 15:32:53 +0800
Subject: [PATCH 30/72] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=86=85=E5=AE=B9=E5=B1=95=E7=A4=BA=E5=92=8C?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=A4=84=E7=90=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E6=9B=B4=E6=96=B0API=E4=BB=A5=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=88=86=E9=A1=B5=EF=BC=8C=E6=8F=90=E5=8D=87=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BD=93=E9=AA=8C=E5=92=8C=E4=BB=A3=E7=A0=81=E5=8F=AF?=
 =?UTF-8?q?=E8=AF=BB=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/store/module/dataCenter/index.data.ts | 113 +++++
 .../src/store/module/dataCenter/index.ts      | 479 ++++++++++++++++++
 2 files changed, 592 insertions(+)
 create mode 100644 Touchkebao/src/store/module/dataCenter/index.data.ts
 create mode 100644 Touchkebao/src/store/module/dataCenter/index.ts

diff --git a/Touchkebao/src/store/module/dataCenter/index.data.ts b/Touchkebao/src/store/module/dataCenter/index.data.ts
new file mode 100644
index 00000000..29a1f2d6
--- /dev/null
+++ b/Touchkebao/src/store/module/dataCenter/index.data.ts
@@ -0,0 +1,113 @@
+import { ChatRecord, ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
+import {
+  CommentItem,
+  likeListItem,
+  FriendsCircleItem,
+} from "@/pages/pc/ckbox/weChat/components/SidebarMenu/FriendsCicle/index.data";
+
+/**
+ * 微信聊天状态管理接口定义
+ * 包含聊天消息、联系人管理、朋友圈等功能的状态和方法
+ */
+export interface WeChatState {
+  showChatRecordModel: boolean;
+  updateShowChatRecordModel: (show: boolean) => void;
+  aiQuoteMessageContent: number;
+  updateAiQuoteMessageContent: (message: number) => void;
+  quoteMessageContent: string;
+  updateQuoteMessageContent: (value: string) => void;
+  // ==================== Transmit Module =========Start===========
+  /** 选中的聊天记录列表 */
+  selectedChatRecords: ChatRecord[];
+  /** 更新选中的聊天记录 */
+  updateSelectedChatRecords: (message: ChatRecord[]) => void;
+
+  /** 选中的联系人或群组列表 */
+  selectedTransmitContact: ContractData[] | weChatGroup[];
+  /** 更新选中的联系人或群组 */
+  updateSelectedTransmitContact: (
+    contact: ContractData[] | weChatGroup[],
+  ) => void;
+
+  /** 转发弹窗开启状态 */
+  openTransmitModal: boolean;
+  /** 更新转发弹窗状态 */
+  updateTransmitModal: (open: boolean) => void;
+  // ==================== Transmit Module =========END===========
+
+  // ==================== 当前联系人管理 ====================
+  /** 当前选中的联系人/群组 */
+  currentContract: ContractData | weChatGroup | null;
+  /** 清空当前联系人 */
+  clearCurrentContact: () => void;
+  /** 设置当前联系人 */
+  setCurrentContact: (
+    contract: ContractData | weChatGroup,
+    isExist?: boolean,
+  ) => void;
+
+  // ==================== 聊天消息管理 ====================
+  /** 当前聊天的消息列表 */
+  currentMessages: ChatRecord[];
+  /** 添加新消息 */
+  addMessage: (message: ChatRecord) => void;
+  /** 更新指定消息 */
+  updateMessage: (messageId: number, updates: Partial<ChatRecord>) => void;
+  /** 撤回指定消息 */
+  recallMessage: (messageId: number) => void;
+  /** 消息加载状态 */
+  messagesLoading: boolean;
+  /** 数据初始化加载状态 */
+  isLoadingData: boolean;
+  /** 当前群组成员列表 */
+  currentGroupMembers: any[];
+
+  // ==================== 界面状态管理 ====================
+  /** 是否显示复选框 */
+  showCheckbox: boolean;
+  /** 更新复选框显示状态 */
+  updateShowCheckbox: (show: boolean) => void;
+  /** 进入模块类型 (common | multipleForwarding) */
+  EnterModule: string;
+  /** 更新进入模块类型 */
+  updateEnterModule: (module: string) => void;
+
+  // ==================== 朋友圈相关 ====================
+  /** 朋友圈数据列表 */
+  MomentCommon: FriendsCircleItem[];
+  /** 朋友圈数据加载状态 */
+  MomentCommonLoading: boolean;
+  /** 清空朋友圈数据 */
+  clearMomentCommon: () => void;
+  /** 添加朋友圈数据 */
+  addMomentCommon: (moment: FriendsCircleItem[]) => void;
+  /** 更新朋友圈数据 */
+  updateMomentCommon: (moments: FriendsCircleItem[]) => void;
+  /** 更新朋友圈加载状态 */
+  updateMomentCommonLoading: (loading: boolean) => void;
+  /** 更新朋友圈点赞 */
+  updateLikeMoment: (snsId: string, likeList: likeListItem[]) => void;
+  /** 更新朋友圈评论 */
+  updateComment: (snsId: string, commentList: CommentItem[]) => void;
+
+  // ==================== 消息加载方法 ====================
+  /** 加载聊天消息 */
+  loadChatMessages: (Init: boolean, To?: number) => Promise<void>;
+  /** 搜索消息 */
+  SearchMessage: (params: {
+    From: number;
+    To: number;
+    keyword: string;
+    Count?: number;
+  }) => Promise<void>;
+
+  // ==================== 视频消息处理 ====================
+  /** 设置视频消息加载状态 */
+  setVideoLoading: (messageId: number, isLoading: boolean) => void;
+  /** 设置视频消息URL */
+  setVideoUrl: (messageId: number, videoUrl: string) => void;
+
+  // ==================== 消息接收处理 ====================
+  /** 接收新消息处理 */
+  receivedMsg: (message: ChatRecord) => void;
+}
diff --git a/Touchkebao/src/store/module/dataCenter/index.ts b/Touchkebao/src/store/module/dataCenter/index.ts
new file mode 100644
index 00000000..dcfd4b61
--- /dev/null
+++ b/Touchkebao/src/store/module/dataCenter/index.ts
@@ -0,0 +1,479 @@
+import { create } from "zustand";
+import { persist } from "zustand/middleware";
+import {
+  getChatMessages,
+  getChatroomMessages,
+  getGroupMembers,
+} from "@/pages/pc/ckbox/api";
+import { WeChatState } from "./index.data";
+
+import {
+  likeListItem,
+  CommentItem,
+} from "@/pages/pc/ckbox/weChat/components/SidebarMenu/FriendsCicle/index.data";
+import {
+  clearUnreadCount1,
+  clearUnreadCount2,
+  updateConfig,
+  getFriendInjectConfig,
+} from "@/pages/pc/ckbox/api";
+import { ChatRecord, ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
+import { weChatGroupService, contractService } from "@/utils/db";
+import {
+  addChatSession,
+  updateChatSession,
+  useCkChatStore,
+  pinChatSessionToTop,
+} from "@/store/module/ckchat/ckchat";
+
+/**
+ * 微信聊天状态管理 Store
+ * 使用 Zustand 管理微信聊天相关的状态和操作
+ */
+export const useWeChatStore = create<WeChatState>()(
+  persist(
+    (set, get) => ({
+      showChatRecordModel: false,
+      updateShowChatRecordModel: (show: boolean) => {
+        set({ showChatRecordModel: show });
+      },
+      //当前用户的ai接管状态
+      aiQuoteMessageContent: 0,
+      updateAiQuoteMessageContent: (message: number) => {
+        set({ aiQuoteMessageContent: message });
+      },
+      quoteMessageContent: "",
+      updateQuoteMessageContent: (message: string) => {
+        set({ quoteMessageContent: message });
+      },
+      // ==================== Transmit Module =========Start===========
+      /** 选中的聊天记录列表 */
+      selectedChatRecords: [],
+      /** 更新选中的聊天记录 */
+      updateSelectedChatRecords: (message: ChatRecord[]) => {
+        set({ selectedChatRecords: message });
+      },
+
+      /** 选中的联系人或群组列表 */
+      selectedTransmitContact: [],
+      /** 更新选中的联系人或群组 */
+      updateSelectedTransmitContact: (
+        contact: ContractData[] | weChatGroup[],
+      ) => {
+        set({ selectedTransmitContact: contact });
+      },
+
+      /** 转发弹窗开启状态 */
+      openTransmitModal: false,
+      /** 更新转发弹窗状态 */
+      updateTransmitModal: (open: boolean) => {
+        set({ openTransmitModal: open });
+      },
+      // ==================== Transmit Module =========END===========
+
+      // ==================== 当前联系人管理状态 ====================
+      /** 当前选中的联系人/群组 */
+      currentContract: null,
+      /** 当前聊天的消息列表 */
+      currentMessages: [],
+
+      // ==================== 聊天消息管理方法 ====================
+      /** 添加新消息到当前聊天 */
+      addMessage: message => {
+        const { wechatChatroomId, wechatFriendId } = message;
+        const currentContract = get().currentContract;
+        if (currentContract) {
+          if (
+            currentContract.id === wechatFriendId ||
+            currentContract.id === wechatChatroomId
+          ) {
+            set(state => ({
+              currentMessages: [...state.currentMessages, message],
+            }));
+          }
+        }
+      },
+      /** 更新指定消息内容 */
+      updateMessage: (messageId, updates) => {
+        set(state => ({
+          currentMessages: state.currentMessages.map(msg =>
+            msg.id === messageId ? { ...msg, ...updates } : msg,
+          ),
+        }));
+      },
+      /** 撤回指定消息 */
+      recallMessage: (messageId: number) => {
+        set(state => ({
+          currentMessages: state.currentMessages.filter(
+            msg => msg.id !== messageId,
+          ),
+        }));
+      },
+
+      // ==================== 加载状态管理 ====================
+      /** 消息加载状态 */
+      messagesLoading: false,
+      /** 数据初始化加载状态 */
+      isLoadingData: false,
+      /** 当前群组成员列表 */
+      currentGroupMembers: [],
+
+      // ==================== 界面状态管理 ====================
+      /** 是否显示复选框 */
+      showCheckbox: false,
+      /** 更新复选框显示状态 */
+      updateShowCheckbox: (show: boolean) => {
+        set({ showCheckbox: show });
+      },
+      /** 进入模块类型 (common | multipleForwarding) */
+      EnterModule: "common",
+      /** 更新进入模块类型 */
+      updateEnterModule: (module: string) => {
+        set({ EnterModule: module });
+      },
+
+      // ==================== 朋友圈相关状态 ====================
+      /** 朋友圈数据列表 */
+      MomentCommon: [],
+      /** 朋友圈数据加载状态 */
+      MomentCommonLoading: false,
+      /** 更新朋友圈加载状态 */
+      updateMomentCommonLoading: (loading: boolean) => {
+        set({ MomentCommonLoading: loading });
+      },
+
+      // ==================== 当前联系人管理方法 ====================
+      /** 清空当前联系人和消息 */
+      clearCurrentContact: () => {
+        set({ currentContract: null, currentMessages: [] });
+      },
+      /** 设置当前联系人并加载相关数据 */
+      setCurrentContact: (
+        contract: ContractData | weChatGroup,
+        isExist?: boolean,
+      ) => {
+        const state = useWeChatStore.getState();
+        // 切换联系人时清空当前消息，等待重新加载
+        set({ currentMessages: [], openTransmitModal: false });
+
+        const params: any = {};
+
+        if (!contract.chatroomId) {
+          params.wechatFriendId = contract.id;
+        } else {
+          params.wechatChatroomId = contract.id;
+        }
+        //重置动作
+        set({ showChatRecordModel: false });
+        clearUnreadCount1(params);
+        clearUnreadCount2([contract.id]);
+        getFriendInjectConfig({
+          friendId: contract.id,
+          wechatAccountId: contract.wechatAccountId,
+        }).then(result => {
+          set({ aiQuoteMessageContent: result });
+        });
+        if (isExist) {
+          updateChatSession({
+            ...contract,
+            config: { unreadCount: 0 },
+          });
+        } else {
+          addChatSession(contract);
+        }
+        set({ currentContract: contract });
+        updateConfig({
+          id: contract.id,
+          config: { chat: true },
+        });
+        state.loadChatMessages(true, 4704624000000);
+      },
+
+      // ==================== 消息加载方法 ====================
+      /** 加载聊天消息 */
+      loadChatMessages: async (Init: boolean, To?: number) => {
+        const state = useWeChatStore.getState();
+        const contact = state.currentContract;
+        set({ messagesLoading: true });
+        set({ isLoadingData: Init });
+        try {
+          const params: any = {
+            wechatAccountId: contact.wechatAccountId,
+            From: 1,
+            To: To || +new Date(),
+            Count: 20,
+            olderData: true,
+          };
+
+          if ("chatroomId" in contact && contact.chatroomId) {
+            // 群聊消息加载
+            params.wechatChatroomId = contact.id;
+            const messages = await getChatroomMessages(params);
+            const currentGroupMembers = await getGroupMembers({
+              id: contact.id,
+            });
+            if (Init) {
+              set({ currentMessages: messages || [], currentGroupMembers });
+            } else {
+              set({
+                currentMessages: [
+                  ...(messages || []),
+                  ...state.currentMessages,
+                ],
+              });
+            }
+          } else {
+            // 私聊消息加载
+            params.wechatFriendId = contact.id;
+            const messages = await getChatMessages(params);
+            if (Init) {
+              set({ currentMessages: messages || [] });
+            } else {
+              set({
+                currentMessages: [
+                  ...(messages || []),
+                  ...state.currentMessages,
+                ],
+              });
+            }
+          }
+          set({ messagesLoading: false });
+        } catch (error) {
+          console.error("获取聊天消息失败:", error);
+        } finally {
+          set({ messagesLoading: false });
+        }
+      },
+
+      /** 搜索消息 */
+      SearchMessage: async ({
+        From = 1,
+        To = 4704624000000,
+        keyword = "",
+        Count = 20,
+      }: {
+        From: number;
+        To: number;
+        keyword: string;
+        Count?: number;
+      }) => {
+        const state = useWeChatStore.getState();
+        const contact = state.currentContract;
+        set({ messagesLoading: true });
+
+        try {
+          const params: any = {
+            wechatAccountId: contact.wechatAccountId,
+            From,
+            To,
+            keyword,
+            Count,
+            olderData: true,
+          };
+
+          if ("chatroomId" in contact && contact.chatroomId) {
+            // 群聊消息搜索
+            params.wechatChatroomId = contact.id;
+            const messages = await getChatroomMessages(params);
+            const currentGroupMembers = await getGroupMembers({
+              id: contact.id,
+            });
+            set({ currentMessages: messages || [], currentGroupMembers });
+          } else {
+            // 私聊消息搜索
+            params.wechatFriendId = contact.id;
+            const messages = await getChatMessages(params);
+            set({ currentMessages: messages || [] });
+          }
+          set({ messagesLoading: false });
+        } catch (error) {
+          console.error("获取聊天消息失败:", error);
+        } finally {
+          set({ messagesLoading: false });
+        }
+      },
+
+      /** 设置消息加载状态 */
+      setMessageLoading: loading => {
+        set({ messagesLoading: Boolean(loading) });
+      },
+
+      // ==================== 消息接收处理 ====================
+      /** 接收新消息处理 */
+      receivedMsg: async message => {
+        const currentContract = useWeChatStore.getState().currentContract;
+        // 判断是群聊还是私聊
+        const getMessageId =
+          message?.wechatChatroomId || message.wechatFriendId;
+        const isWechatGroup = message?.wechatChatroomId;
+
+        // 如果是当前选中的聊天，直接添加到消息列表
+        if (currentContract && currentContract.id == getMessageId) {
+          set(state => ({
+            currentMessages: [...state.currentMessages, message],
+          }));
+        } else {
+          // 更新其他聊天的未读消息数
+          const chatSessions = useCkChatStore.getState().chatSessions;
+          const session = chatSessions.find(item => item.id == getMessageId);
+          if (session) {
+            session.config.unreadCount = Number(session.config.unreadCount) + 1;
+            updateChatSession(session);
+            // 将接收到新消息的会话置顶到列表顶部
+            pinChatSessionToTop(getMessageId);
+          } else {
+            // 如果会话不存在，创建新会话
+            if (isWechatGroup) {
+              const [group] = await weChatGroupService.findByIds(getMessageId);
+              if (group) {
+                addChatSession({
+                  ...group,
+                  config: { unreadCount: 1 },
+                });
+                // 新创建的会话会自动添加到列表顶部，无需额外置顶
+              }
+            } else {
+              const [user] = await contractService.findByIds(getMessageId);
+              addChatSession({
+                ...user,
+                config: { unreadCount: 1 },
+              });
+              // 新创建的会话会自动添加到列表顶部，无需额外置顶
+            }
+          }
+        }
+      },
+
+      // ==================== 便捷选择器方法 ====================
+      /** 获取当前联系人 */
+      getCurrentContact: () => get().currentContract,
+      /** 获取当前消息列表 */
+      getCurrentMessages: () => get().currentMessages,
+      /** 获取消息加载状态 */
+      getMessagesLoading: () => get().messagesLoading,
+
+      // ==================== 视频消息处理方法 ====================
+      /** 设置视频消息加载状态 */
+      setVideoLoading: (messageId: number, isLoading: boolean) => {
+        set(state => ({
+          currentMessages: state.currentMessages.map(msg => {
+            if (msg.id === messageId) {
+              try {
+                const content = JSON.parse(msg.content);
+                // 更新加载状态
+                const updatedContent = { ...content, isLoading };
+                return {
+                  ...msg,
+                  content: JSON.stringify(updatedContent),
+                };
+              } catch (e) {
+                console.error("更新视频加载状态失败:", e);
+                return msg;
+              }
+            }
+            return msg;
+          }),
+        }));
+      },
+
+      /** 设置视频消息URL */
+      setVideoUrl: (messageId: number, videoUrl: string) => {
+        set(state => ({
+          currentMessages: state.currentMessages.map(msg => {
+            if (msg.id === messageId) {
+              try {
+                const content = JSON.parse(msg.content);
+                // 检查视频是否已经下载完毕，避免重复更新
+                if (content.videoUrl && content.videoUrl === videoUrl) {
+                  console.log("视频已下载，跳过重复更新:", messageId);
+                  return msg;
+                }
+
+                // 设置视频URL并清除加载状态
+                const updatedContent = {
+                  ...content,
+                  videoUrl,
+                  isLoading: false,
+                };
+                return {
+                  ...msg,
+                  content: JSON.stringify(updatedContent),
+                };
+              } catch (e) {
+                console.error("更新视频URL失败:", e);
+                return msg;
+              }
+            }
+            return msg;
+          }),
+        }));
+      },
+
+      // ==================== 数据清理方法 ====================
+      /** 清空所有数据 */
+      clearAllData: () => {
+        set({
+          currentContract: null,
+          currentMessages: [],
+          messagesLoading: false,
+        });
+      },
+
+      // ==================== 朋友圈管理方法 ====================
+      /** 清空朋友圈数据 */
+      clearMomentCommon: () => {
+        set({ MomentCommon: [] });
+      },
+
+      /** 添加朋友圈数据 */
+      addMomentCommon: moment => {
+        set(state => ({
+          MomentCommon: [...state.MomentCommon, ...moment],
+        }));
+      },
+
+      /** 更新朋友圈数据 */
+      updateMomentCommon: moments => {
+        set({ MomentCommon: moments });
+      },
+
+      /** 更新朋友圈点赞 */
+      updateLikeMoment: (snsId: string, likeList: likeListItem[]) => {
+        set(state => ({
+          MomentCommon: state.MomentCommon.map(moment =>
+            moment.snsId === snsId ? { ...moment, likeList } : moment,
+          ),
+        }));
+      },
+
+      /** 更新朋友圈评论 */
+      updateComment: (snsId: string, commentList: CommentItem[]) => {
+        set(state => ({
+          MomentCommon: state.MomentCommon.map(moment =>
+            moment.snsId === snsId ? { ...moment, commentList } : moment,
+          ),
+        }));
+      },
+    }),
+    {
+      name: "wechat-storage",
+      partialize: state => ({
+        // currentContract 不做持久化，登录和页面刷新时直接清空
+      }),
+    },
+  ),
+);
+
+// ==================== 便捷选择器导出 ====================
+/** 获取当前联系人的 Hook */
+export const useCurrentContact = () =>
+  useWeChatStore(state => state.currentContract);
+/** 获取当前消息列表的 Hook */
+export const useCurrentMessages = () =>
+  useWeChatStore(state => state.currentMessages);
+/** 获取消息加载状态的 Hook */
+export const useMessagesLoading = () =>
+  useWeChatStore(state => state.messagesLoading);
+/** 获取复选框显示状态的 Hook */
+export const useShowCheckbox = () =>
+  useWeChatStore(state => state.showCheckbox);

From c3f1433868788a7480755f16f475486394024670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Wed, 22 Oct 2025 16:36:02 +0800
Subject: [PATCH 31/72] =?UTF-8?q?=E6=96=B0=E5=A2=9EAI=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E5=92=8C=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BB=A5=E6=94=AF=E6=8C=81=E7=BE=A4=E7=BB=84?=
 =?UTF-8?q?=E5=92=8C=E4=B8=AA=E4=BA=BA=E6=B6=88=E6=81=AF=E7=9A=84=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E6=8F=90=E5=8D=87=E8=81=8A=E5=A4=A9=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=9A=84=E7=81=B5=E6=B4=BB=E6=80=A7=E5=92=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BD=93=E9=AA=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Touchkebao/src/api/ai.ts                     | 39 +++++++++++++++++++-
 Touchkebao/src/store/module/weChat/weChat.ts | 22 ++++++++++-
 2 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/Touchkebao/src/api/ai.ts b/Touchkebao/src/api/ai.ts
index 35625ecb..6dca8751 100644
--- a/Touchkebao/src/api/ai.ts
+++ b/Touchkebao/src/api/ai.ts
@@ -1,5 +1,42 @@
 import axios from "axios";
 import { useUserStore } from "@/store/module/user";
+import { request } from "@/api/request";
+
+//ai对话接口
+export interface AiChatParams {
+  friendId: number;
+  wechatAccountId: number;
+  [property: string]: any;
+}
+
+export function aiChat(params: AiChatParams) {
+  return request("/v1/kefu/ai/chat", params, "POST");
+}
+
+//soket消息传入数据中心
+export interface DataProcessingParams {
+  /**
+   * 群消息
+   */
+  chatroomMessage?: string[];
+  /**
+   * 个人信息
+   */
+  friendMessage?: string[];
+  /**
+   * 类型固定值
+   */
+  type?: string;
+  /**
+   * 公共
+   */
+  wechatAccountId?: string;
+  [property: string]: any;
+}
+
+export function dataProcessing(params: DataProcessingParams) {
+  return request("/v1/kefu/dataProcessing", params, "POST");
+}
 
 /**
  * AI文本生成接口
@@ -32,7 +69,7 @@ export async function generateAiText(
           Authorization: token ? `Bearer ${token}` : undefined,
         },
         timeout: 30000, // AI生成可能需要更长时间
-      }
+      },
     );
 
     // 新接口返回：{ code: 200, msg: 'success', data: '...公告内容...' }
diff --git a/Touchkebao/src/store/module/weChat/weChat.ts b/Touchkebao/src/store/module/weChat/weChat.ts
index 58ee18c1..5068f3c0 100644
--- a/Touchkebao/src/store/module/weChat/weChat.ts
+++ b/Touchkebao/src/store/module/weChat/weChat.ts
@@ -6,7 +6,7 @@ import {
   getGroupMembers,
 } from "@/pages/pc/ckbox/api";
 import { WeChatState } from "./weChat.data";
-
+import { dataProcessing, aiChat } from "@/api/ai";
 import {
   likeListItem,
   CommentItem,
@@ -312,6 +312,26 @@ export const useWeChatStore = create<WeChatState>()(
           set(state => ({
             currentMessages: [...state.currentMessages, message],
           }));
+          //把数据传到存客宝
+          const params: any = {
+            type: "CmdNewMessage",
+            wechatAccountId: currentContract.wechatAccountId,
+          };
+          if (isWechatGroup) {
+            params.chatroomMessage = [message];
+          } else {
+            params.friendMessage = [message];
+          }
+          const dataProcessingResult = await dataProcessing(params);
+          //如果成功，就请求ai对话接口
+          if (dataProcessingResult) {
+            const messageContent = await aiChat({
+              friendId: getMessageId,
+              wechatAccountId: currentContract.wechatAccountId,
+              message: message,
+            });
+            console.log("ai对话接口返回", messageContent);
+          }
         } else {
           // 更新其他聊天的未读消息数
           const chatSessions = useCkChatStore.getState().chatSessions;

From ef45bedf83e04aec59ad4373c060dfcc403bea31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Wed, 22 Oct 2025 17:05:35 +0800
Subject: [PATCH 32/72] =?UTF-8?q?=E6=96=B0=E5=A2=9EAI=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E8=BE=93=E5=85=A5=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BB=A5=E6=94=AF=E6=8C=81=E5=8A=A0=E8=BD=BD=E6=8C=87?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E6=8F=90=E5=8D=87=E7=94=A8=E6=88=B7=E4=BD=93?=
 =?UTF-8?q?=E9=AA=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/MessageEnter/index.tsx         |  60 ++++++----
 .../src/store/module/weChat/weChat.data.ts    |   2 +
 Touchkebao/src/store/module/weChat/weChat.ts  | 108 ++++++++++--------
 3 files changed, 102 insertions(+), 68 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
index 16f6c179..f49ceccb 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { Layout, Input, Button, Modal } from "antd";
+import { Layout, Input, Button, Modal, Spin } from "antd";
 import {
   SendOutlined,
   FolderOutlined,
@@ -7,6 +7,7 @@ import {
   ExportOutlined,
   CloseOutlined,
   MessageOutlined,
+  LoadingOutlined,
 } from "@ant-design/icons";
 import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 import { useWebSocketStore } from "@/store/module/websocket/websocket";
@@ -45,7 +46,7 @@ const MessageEnter: React.FC<MessageEnterProps> = ({ contract }) => {
   const quoteMessageContent = useWeChatStore(
     state => state.quoteMessageContent,
   );
-
+  const isLoadingAiChat = useWeChatStore(state => state.isLoadingAiChat);
   useEffect(() => {
     if (quoteMessageContent) {
       setInputValue(quoteMessageContent);
@@ -224,29 +225,42 @@ const MessageEnter: React.FC<MessageEnterProps> = ({ contract }) => {
                 </div>
               </div>
             </div>
-            <div className={styles.inputArea}>
-              <div className={styles.inputWrapper}>
-                <TextArea
-                  value={inputValue}
-                  onChange={e => setInputValue(e.target.value)}
-                  onKeyDown={handleKeyPress}
-                  placeholder="输入消息..."
-                  className={styles.messageInput}
-                  autoSize={{ minRows: 2, maxRows: 6 }}
-                />
-                <div className={styles.sendButtonArea}>
-                  <Button
-                    type="primary"
-                    icon={<SendOutlined />}
-                    onClick={handleSend}
-                    disabled={!inputValue.trim()}
-                    className={styles.sendButton}
-                  >
-                    发送
-                  </Button>
+            {isLoadingAiChat ? (
+              <Spin
+                indicator={<LoadingOutlined spin />}
+                spinning={isLoadingAiChat}
+              >
+                <div style={{ height: "100px" }}>
+                  <div>Ai思考中...请稍后</div>
+                </div>
+              </Spin>
+            ) : (
+              <div className={styles.inputArea}>
+                <div className={styles.inputWrapper}>
+                  <TextArea
+                    value={inputValue}
+                    onChange={e => setInputValue(e.target.value)}
+                    onKeyDown={handleKeyPress}
+                    placeholder="输入消息..."
+                    className={styles.messageInput}
+                    autoSize={{ minRows: 2, maxRows: 6 }}
+                  />
+
+                  <div className={styles.sendButtonArea}>
+                    <Button
+                      type="primary"
+                      icon={<SendOutlined />}
+                      onClick={handleSend}
+                      disabled={!inputValue.trim()}
+                      className={styles.sendButton}
+                    >
+                      发送
+                    </Button>
+                  </div>
                 </div>
               </div>
-            </div>
+            )}
+
             <div className={styles.inputHint}>
               按下Ctrl+Enter换行，Enter发送
             </div>
diff --git a/Touchkebao/src/store/module/weChat/weChat.data.ts b/Touchkebao/src/store/module/weChat/weChat.data.ts
index 29a1f2d6..b3f1bf2c 100644
--- a/Touchkebao/src/store/module/weChat/weChat.data.ts
+++ b/Touchkebao/src/store/module/weChat/weChat.data.ts
@@ -14,6 +14,8 @@ export interface WeChatState {
   updateShowChatRecordModel: (show: boolean) => void;
   aiQuoteMessageContent: number;
   updateAiQuoteMessageContent: (message: number) => void;
+  isLoadingAiChat: boolean;
+  updateIsLoadingAiChat: (loading: boolean) => void;
   quoteMessageContent: string;
   updateQuoteMessageContent: (value: string) => void;
   // ==================== Transmit Module =========Start===========
diff --git a/Touchkebao/src/store/module/weChat/weChat.ts b/Touchkebao/src/store/module/weChat/weChat.ts
index 5068f3c0..c1746dfc 100644
--- a/Touchkebao/src/store/module/weChat/weChat.ts
+++ b/Touchkebao/src/store/module/weChat/weChat.ts
@@ -46,6 +46,11 @@ export const useWeChatStore = create<WeChatState>()(
       updateQuoteMessageContent: (message: string) => {
         set({ quoteMessageContent: message });
       },
+      //正在加载ai对话
+      isLoadingAiChat: false,
+      updateIsLoadingAiChat: (loading: boolean) => {
+        set({ isLoadingAiChat: loading });
+      },
       // ==================== Transmit Module =========Start===========
       /** 选中的聊天记录列表 */
       selectedChatRecords: [],
@@ -307,60 +312,73 @@ export const useWeChatStore = create<WeChatState>()(
           message?.wechatChatroomId || message.wechatFriendId;
         const isWechatGroup = message?.wechatChatroomId;
 
-        // 如果是当前选中的聊天，直接添加到消息列表
-        if (currentContract && currentContract.id == getMessageId) {
-          set(state => ({
-            currentMessages: [...state.currentMessages, message],
-          }));
-          //把数据传到存客宝
-          const params: any = {
-            type: "CmdNewMessage",
-            wechatAccountId: currentContract.wechatAccountId,
-          };
-          if (isWechatGroup) {
-            params.chatroomMessage = [message];
-          } else {
-            params.friendMessage = [message];
-          }
-          const dataProcessingResult = await dataProcessing(params);
-          //如果成功，就请求ai对话接口
-          if (dataProcessingResult) {
-            const messageContent = await aiChat({
-              friendId: getMessageId,
+        try {
+          // 如果是当前选中的聊天，直接添加到消息列表
+          if (currentContract && currentContract.id == getMessageId) {
+            set(state => ({
+              currentMessages: [...state.currentMessages, message],
+            }));
+            //把数据传到存客宝
+            const params: any = {
+              type: "CmdNewMessage",
               wechatAccountId: currentContract.wechatAccountId,
-              message: message,
-            });
-            console.log("ai对话接口返回", messageContent);
-          }
-        } else {
-          // 更新其他聊天的未读消息数
-          const chatSessions = useCkChatStore.getState().chatSessions;
-          const session = chatSessions.find(item => item.id == getMessageId);
-          if (session) {
-            session.config.unreadCount = Number(session.config.unreadCount) + 1;
-            updateChatSession(session);
-            // 将接收到新消息的会话置顶到列表顶部
-            pinChatSessionToTop(getMessageId);
-          } else {
-            // 如果会话不存在，创建新会话
+            };
             if (isWechatGroup) {
-              const [group] = await weChatGroupService.findByIds(getMessageId);
-              if (group) {
+              params.chatroomMessage = [message];
+            } else {
+              params.friendMessage = [message];
+            }
+            const dataProcessingResult = await dataProcessing(params);
+            //如果成功，就请求ai对话接口
+            set(() => ({
+              isLoadingAiChat: true,
+            }));
+            if (!dataProcessingResult) {
+              const messageContent = await aiChat({
+                friendId: getMessageId,
+                wechatAccountId: currentContract.wechatAccountId,
+                message: message,
+              });
+
+              set(() => ({
+                quoteMessageContent: messageContent,
+                isLoadingAiChat: false,
+              }));
+            }
+          } else {
+            // 更新其他聊天的未读消息数
+            const chatSessions = useCkChatStore.getState().chatSessions;
+            const session = chatSessions.find(item => item.id == getMessageId);
+            if (session) {
+              session.config.unreadCount =
+                Number(session.config.unreadCount) + 1;
+              updateChatSession(session);
+              // 将接收到新消息的会话置顶到列表顶部
+              pinChatSessionToTop(getMessageId);
+            } else {
+              // 如果会话不存在，创建新会话
+              if (isWechatGroup) {
+                const [group] =
+                  await weChatGroupService.findByIds(getMessageId);
+                if (group) {
+                  addChatSession({
+                    ...group,
+                    config: { unreadCount: 1 },
+                  });
+                  // 新创建的会话会自动添加到列表顶部，无需额外置顶
+                }
+              } else {
+                const [user] = await contractService.findByIds(getMessageId);
                 addChatSession({
-                  ...group,
+                  ...user,
                   config: { unreadCount: 1 },
                 });
                 // 新创建的会话会自动添加到列表顶部，无需额外置顶
               }
-            } else {
-              const [user] = await contractService.findByIds(getMessageId);
-              addChatSession({
-                ...user,
-                config: { unreadCount: 1 },
-              });
-              // 新创建的会话会自动添加到列表顶部，无需额外置顶
             }
           }
+        } catch (error) {
+          console.error("接收新消息失败:", error);
         }
       },
 

From c2dce8344b81d484545c5d16d6a6fafeb4e71e25 Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Thu, 23 Oct 2025 09:34:43 +0800
Subject: [PATCH 33/72] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/MessageController.php      |  2 +-
 .../chukebao/controller/DataProcessing.php    | 11 +++++-----
 .../chukebao/controller/MessageController.php | 22 +++++++++++++------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/Server/application/api/controller/MessageController.php b/Server/application/api/controller/MessageController.php
index c4bd545b..6b47ebe4 100644
--- a/Server/application/api/controller/MessageController.php
+++ b/Server/application/api/controller/MessageController.php
@@ -449,7 +449,7 @@ class MessageController extends BaseController
                 }
             }
         }
-
+        return true;
     }
 
     /**
diff --git a/Server/application/chukebao/controller/DataProcessing.php b/Server/application/chukebao/controller/DataProcessing.php
index edd2edbd..72e617ea 100644
--- a/Server/application/chukebao/controller/DataProcessing.php
+++ b/Server/application/chukebao/controller/DataProcessing.php
@@ -86,19 +86,20 @@ class DataProcessing extends BaseController
                 $msg = '好友转移成功';
                 break;
             case 'CmdNewMessage':
-                if(empty($friendMessage) || empty($chatroomMessage)){
+                if(empty($friendMessage) && empty($chatroomMessage)){
                     return ResponseHelper::error('参数缺失');
                 }
 
-                if(is_array($friendMessage) || is_array($chatroomMessage)){
-                    return ResponseHelper::error('参数缺失');
+                if(is_array($friendMessage) && is_array($chatroomMessage)){
+                    return ResponseHelper::error('数据类型错误');
                 }
 
+
                 $messageController = new MessageController();
                 if (!empty($friendMessage)){
-                    $res = $messageController->saveMessage($friendMessage);
+                    $res = $messageController->saveMessage($friendMessage[0]);
                 }else{
-                    $res = $messageController->saveChatroomMessage($friendMessage);
+                    $res = $messageController->saveChatroomMessage($chatroomMessage[0]);
                 }
                 if (!empty($res)){
                     $msg = '消息记录成功';
diff --git a/Server/application/chukebao/controller/MessageController.php b/Server/application/chukebao/controller/MessageController.php
index 2898bb6d..11cadc10 100644
--- a/Server/application/chukebao/controller/MessageController.php
+++ b/Server/application/chukebao/controller/MessageController.php
@@ -19,7 +19,7 @@ class MessageController extends BaseController
 
         $friends = Db::table('s2_wechat_friend')
             ->where(['accountId' => $accountId, 'isDeleted' => 0])
-            ->column('id,nickname,avatar');
+            ->column('id,nickname,avatar,conRemark,labels,groupId,wechatAccountId,wechatId');
 
 
         // 构建好友子查询
@@ -30,13 +30,13 @@ class MessageController extends BaseController
 
         // 使用 UNION 合并群聊和好友消息，然后统一排序和分页
         $unionQuery = "
-            (SELECT m.id, m.content, m.wechatFriendId, m.wechatChatroomId, m.createTime, m.wechatTime, 2 as msgType, wc.nickname, wc.chatroomAvatar as avatar
+            (SELECT m.id, m.content, m.wechatFriendId, m.wechatChatroomId, m.createTime, m.wechatTime, 2 as msgType, wc.nickname, wc.chatroomAvatar as avatar,wc.chatroomId
              FROM s2_wechat_chatroom wc
              LEFT JOIN s2_wechat_message m ON wc.id = m.wechatChatroomId
              WHERE wc.accountId = {$accountId} AND m.type = 2 AND wc.isDeleted = 0
              GROUP BY m.wechatChatroomId)
             UNION ALL
-            (SELECT m.id, m.content, m.wechatFriendId, m.wechatChatroomId, m.createTime, m.wechatTime, 1 as msgType, 1 as nickname, 1 avatar
+            (SELECT m.id, m.content, m.wechatFriendId, m.wechatChatroomId, m.createTime, m.wechatTime, 1 as msgType, 1 as nickname, 1 avatar, 1 as chatroomId
              FROM s2_wechat_message m
              WHERE m.type = 1 AND m.wechatFriendId IN {$friendSubQuery}
              GROUP BY m.wechatFriendId)
@@ -87,21 +87,29 @@ class MessageController extends BaseController
             if (!empty($v['wechatFriendId'])) {
                 $v['nickname'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['nickname'] : '';
                 $v['avatar'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['avatar'] : '';
-                $vunreadCount = isset($friendUnreadMap[$v['wechatFriendId']]) ? (int)$friendUnreadMap[$v['wechatFriendId']] : 0;
+                $v['conRemark'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['conRemark'] : '';
+                $v['groupId'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['groupId'] : '';
+                $v['wechatAccountId'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['wechatAccountId'] : '';
+                $v['wechatId'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['wechatId'] : '';
+                $v['labels'] = !empty($friends[$v['wechatFriendId']]) ? json_decode($friends[$v['wechatFriendId']]['labels'],true) : [];
+                $unreadCount = isset($friendUnreadMap[$v['wechatFriendId']]) ? (int)$friendUnreadMap[$v['wechatFriendId']] : 0;
+                unset($v['chatroomId']);
             }
 
             if (!empty($v['wechatChatroomId'])) {
-                $vunreadCount = isset($chatroomUnreadMap[$v['wechatChatroomId']]) ? (int)$chatroomUnreadMap[$v['wechatChatroomId']] : 0;
+                $v['conRemark'] = '';
+                $unreadCount = isset($chatroomUnreadMap[$v['wechatChatroomId']]) ? (int)$chatroomUnreadMap[$v['wechatChatroomId']] : 0;
             }
 
             $v['id'] = !empty($v['wechatFriendId']) ? $v['wechatFriendId'] : $v['wechatChatroomId'];
             $v['config'] = [
-                'vunreadCount' => $vunreadCount,
+                'top' => false,
+                'unreadCount' => $unreadCount,
                 'chat' => true,
                 'msgTime' => $v['wechatTime'],
             ];
             $v['createTime'] = $createTime;
-            $v['wechatTime'] = $wechatTime;
+            $v['lastUpdateTime'] = $wechatTime;
             unset($v['wechatFriendId'],$v['wechatChatroomId']);
 
         }

From 268aedbb6e7e35bb417cbc3997cffaae827c6ed1 Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Thu, 23 Oct 2025 09:51:43 +0800
Subject: [PATCH 34/72] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Server/extend/AccountWeight/UnitWeight/ActivityWeigth.php     | 2 +-
 Server/extend/AccountWeight/UnitWeight/AgeWeight.php          | 2 +-
 Server/extend/AccountWeight/UnitWeight/RealNameWeight.php     | 2 +-
 Server/extend/AccountWeight/UnitWeight/RestrictWeight.php     | 2 +-
 Server/extend/AccountWeight/WechatAccountWeightAssessment.php | 4 ++--
 .../extend/AccountWeight/WechatFriendAddLimitAssessment.php   | 4 ++--
 Server/extend/library/ClassTable.php                          | 2 +-
 Server/extend/library/Interfaces/CallMap.php                  | 2 +-
 .../library/Interfaces/WechatAccountWeightAssessment.php      | 2 +-
 .../library/Interfaces/WechatAccountWeightResultSet.php       | 2 +-
 .../library/Interfaces/WechatFriendAddLimitAssessment.php     | 4 ++--
 11 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Server/extend/AccountWeight/UnitWeight/ActivityWeigth.php b/Server/extend/AccountWeight/UnitWeight/ActivityWeigth.php
index 5763ea4f..48963982 100644
--- a/Server/extend/AccountWeight/UnitWeight/ActivityWeigth.php
+++ b/Server/extend/AccountWeight/UnitWeight/ActivityWeigth.php
@@ -3,7 +3,7 @@
 namespace AccountWeight\UnitWeight;
 
 use app\common\model\WechatCustomer as WechatCustomerModel;
-use library\interfaces\WechatAccountWeightResultSet as WechatAccountWeightResultSetInterface;
+use library\Interfaces\WechatAccountWeightResultSet as WechatAccountWeightResultSetInterface;
 
 class ActivityWeigth implements WechatAccountWeightResultSetInterface
 {
diff --git a/Server/extend/AccountWeight/UnitWeight/AgeWeight.php b/Server/extend/AccountWeight/UnitWeight/AgeWeight.php
index 02a2833e..eb40c836 100644
--- a/Server/extend/AccountWeight/UnitWeight/AgeWeight.php
+++ b/Server/extend/AccountWeight/UnitWeight/AgeWeight.php
@@ -3,7 +3,7 @@
 namespace AccountWeight\UnitWeight;
 
 use app\common\model\WechatCustomer as WechatCustomerModel;
-use library\interfaces\WechatAccountWeightResultSet as WechatAccountWeightResultSetInterface;
+use library\Interfaces\WechatAccountWeightResultSet as WechatAccountWeightResultSetInterface;
 
 class AgeWeight implements WechatAccountWeightResultSetInterface
 {
diff --git a/Server/extend/AccountWeight/UnitWeight/RealNameWeight.php b/Server/extend/AccountWeight/UnitWeight/RealNameWeight.php
index 417ebf9f..e2dec3da 100644
--- a/Server/extend/AccountWeight/UnitWeight/RealNameWeight.php
+++ b/Server/extend/AccountWeight/UnitWeight/RealNameWeight.php
@@ -3,7 +3,7 @@
 
 namespace AccountWeight\UnitWeight;
 
-use library\interfaces\WechatAccountWeightResultSet as WechatAccountWeightResultSetInterface;
+use library\Interfaces\WechatAccountWeightResultSet as WechatAccountWeightResultSetInterface;
 
 class RealNameWeight implements WechatAccountWeightResultSetInterface
 {
diff --git a/Server/extend/AccountWeight/UnitWeight/RestrictWeight.php b/Server/extend/AccountWeight/UnitWeight/RestrictWeight.php
index 59e8df53..df2eb7f2 100644
--- a/Server/extend/AccountWeight/UnitWeight/RestrictWeight.php
+++ b/Server/extend/AccountWeight/UnitWeight/RestrictWeight.php
@@ -3,7 +3,7 @@
 namespace AccountWeight\UnitWeight;
 
 use app\common\model\WechatRestricts as WechatRestrictsModel;
-use library\interfaces\WechatAccountWeightResultSet as WechatAccountWeightResultSetInterface;
+use library\Interfaces\WechatAccountWeightResultSet as WechatAccountWeightResultSetInterface;
 
 class RestrictWeight implements WechatAccountWeightResultSetInterface
 {
diff --git a/Server/extend/AccountWeight/WechatAccountWeightAssessment.php b/Server/extend/AccountWeight/WechatAccountWeightAssessment.php
index b4528f2a..0d53b1ff 100644
--- a/Server/extend/AccountWeight/WechatAccountWeightAssessment.php
+++ b/Server/extend/AccountWeight/WechatAccountWeightAssessment.php
@@ -4,8 +4,8 @@ namespace AccountWeight;
 
 use AccountWeight\Exceptions\WechatAccountWeightAssessmentException as WeightAssessmentException;
 use library\ClassTable;
-use library\interfaces\WechatAccountWeightResultSet as WechatAccountWeightResultSetInterface;
-use library\interfaces\WechatAccountWeightAssessment as WechatAccountWeightAssessmentInterface;
+use library\Interfaces\WechatAccountWeightResultSet as WechatAccountWeightResultSetInterface;
+use library\Interfaces\WechatAccountWeightAssessment as WechatAccountWeightAssessmentInterface;
 use AccountWeight\UnitWeight;
 use app\common\service\ClassTableService;
 
diff --git a/Server/extend/AccountWeight/WechatFriendAddLimitAssessment.php b/Server/extend/AccountWeight/WechatFriendAddLimitAssessment.php
index 02fe014b..49bd8876 100644
--- a/Server/extend/AccountWeight/WechatFriendAddLimitAssessment.php
+++ b/Server/extend/AccountWeight/WechatFriendAddLimitAssessment.php
@@ -2,8 +2,8 @@
 
 namespace AccountWeight;
 
-use library\interfaces\WechatAccountWeightAssessment as WechatAccountWeightAssessmentInterface;
-use library\interfaces\WechatFriendAddLimitAssessment as WechatFriendAddLimitAssessmentInterface;
+use library\Interfaces\WechatAccountWeightAssessment as WechatAccountWeightAssessmentInterface;
+use library\Interfaces\WechatFriendAddLimitAssessment as WechatFriendAddLimitAssessmentInterface;
 
 class WechatFriendAddLimitAssessment implements WechatFriendAddLimitAssessmentInterface
 {
diff --git a/Server/extend/library/ClassTable.php b/Server/extend/library/ClassTable.php
index 785556a4..939eeb4a 100644
--- a/Server/extend/library/ClassTable.php
+++ b/Server/extend/library/ClassTable.php
@@ -2,7 +2,7 @@
 
 namespace library;
 
-use library\interfaces\CallMap as CallMapInterface;
+use library\Interfaces\CallMap as CallMapInterface;
 
 class ClassTable implements CallMapInterface
 {
diff --git a/Server/extend/library/Interfaces/CallMap.php b/Server/extend/library/Interfaces/CallMap.php
index 71d34bad..f58d5bc1 100644
--- a/Server/extend/library/Interfaces/CallMap.php
+++ b/Server/extend/library/Interfaces/CallMap.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace library\interfaces;
+namespace library\Interfaces;
 
 interface CallMap
 {
diff --git a/Server/extend/library/Interfaces/WechatAccountWeightAssessment.php b/Server/extend/library/Interfaces/WechatAccountWeightAssessment.php
index fe8c480b..bdeba4a2 100644
--- a/Server/extend/library/Interfaces/WechatAccountWeightAssessment.php
+++ b/Server/extend/library/Interfaces/WechatAccountWeightAssessment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace library\interfaces;
+namespace library\Interfaces;
 
 use AccountWeight\Exceptions\WechatAccountWeightAssessmentException as WeightAssessmentException;
 
diff --git a/Server/extend/library/Interfaces/WechatAccountWeightResultSet.php b/Server/extend/library/Interfaces/WechatAccountWeightResultSet.php
index 86c1d689..4ce401d1 100644
--- a/Server/extend/library/Interfaces/WechatAccountWeightResultSet.php
+++ b/Server/extend/library/Interfaces/WechatAccountWeightResultSet.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace library\interfaces;
+namespace library\Interfaces;
 
 /**
  * 微信账号加友权重评估结果数据
diff --git a/Server/extend/library/Interfaces/WechatFriendAddLimitAssessment.php b/Server/extend/library/Interfaces/WechatFriendAddLimitAssessment.php
index 7c0dc28e..9640d4f1 100644
--- a/Server/extend/library/Interfaces/WechatFriendAddLimitAssessment.php
+++ b/Server/extend/library/Interfaces/WechatFriendAddLimitAssessment.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace library\interfaces;
+namespace library\Interfaces;
 
-use library\interfaces\WechatAccountWeightAssessment as WechatAccountWeightAssessmentInterface;
+use library\Interfaces\WechatAccountWeightAssessment as WechatAccountWeightAssessmentInterface;
 
 /**
  * 微信账号加友权重评估

From 81f225d9cb368342f17d00de1cfd4f65ef2e87a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Thu, 23 Oct 2025 12:35:30 +0800
Subject: [PATCH 35/72] =?UTF-8?q?=E6=9B=B4=E6=96=B0TypeScript=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BB=A5=E6=94=AF=E6=8C=81=E6=96=B0=E7=9A=84=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E8=B7=AF=E5=BE=84=E5=88=AB=E5=90=8D=EF=BC=8C=E9=87=8D?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=8E=B7=E5=8F=96=E5=AE=A2=E6=9C=8D=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84API=E5=87=BD=E6=95=B0=EF=BC=8C=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E7=9B=B8=E5=85=B3=E7=BB=84=E4=BB=B6=EF=BC=8C=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E4=B8=8D=E5=86=8D=E4=BD=BF=E7=94=A8=E7=9A=84=E5=9E=82?=
 =?UTF-8?q?=E7=9B=B4=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=8F=8A=E5=85=B6=E6=A0=B7=E5=BC=8F=EF=BC=8C=E6=8F=90=E5=8D=87?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E5=92=8C=E5=8F=AF=E8=AF=BB?=
 =?UTF-8?q?=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Touchkebao/src/api/module/wechat.ts           |   5 +
 Touchkebao/src/pages/pc/ckbox/weChat/api.ts   |   2 +-
 .../com.module.scss}                          |  50 ++++++-
 .../weChat/components/CustomerList/index.tsx  | 122 ++++++++++++++++++
 .../components/VerticalUserList/index.tsx     |  72 -----------
 .../src/pages/pc/ckbox/weChat/index.tsx       |  10 +-
 Touchkebao/src/pages/pc/ckbox/weChat/main.ts  |  13 +-
 .../src/store/module/weChat/chatRecord.ts     |   0
 .../src/store/module/weChat/contacts.ts       |   0
 .../src/store/module/weChat/currentChat.ts    |   0
 .../src/store/module/weChat/customer.data.ts  |  41 ++++++
 .../src/store/module/weChat/customer.ts       |  56 ++++++++
 Touchkebao/src/store/module/weChat/message.ts |   0
 Touchkebao/tsconfig.json                      |   5 +-
 Touchkebao/vite.config.ts                     |   3 +
 15 files changed, 292 insertions(+), 87 deletions(-)
 create mode 100644 Touchkebao/src/api/module/wechat.ts
 rename Touchkebao/src/pages/pc/ckbox/weChat/components/{VerticalUserList/VerticalUserList.module.scss => CustomerList/com.module.scss} (61%)
 create mode 100644 Touchkebao/src/pages/pc/ckbox/weChat/components/CustomerList/index.tsx
 delete mode 100644 Touchkebao/src/pages/pc/ckbox/weChat/components/VerticalUserList/index.tsx
 create mode 100644 Touchkebao/src/store/module/weChat/chatRecord.ts
 create mode 100644 Touchkebao/src/store/module/weChat/contacts.ts
 create mode 100644 Touchkebao/src/store/module/weChat/currentChat.ts
 create mode 100644 Touchkebao/src/store/module/weChat/customer.data.ts
 create mode 100644 Touchkebao/src/store/module/weChat/customer.ts
 create mode 100644 Touchkebao/src/store/module/weChat/message.ts

diff --git a/Touchkebao/src/api/module/wechat.ts b/Touchkebao/src/api/module/wechat.ts
new file mode 100644
index 00000000..5e10f84c
--- /dev/null
+++ b/Touchkebao/src/api/module/wechat.ts
@@ -0,0 +1,5 @@
+import request from "@/api/request";
+//获取客服列表
+export function getCustomerList() {
+  return request("/v1/kefu/customerService/list", {}, "GET");
+}
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/api.ts b/Touchkebao/src/pages/pc/ckbox/weChat/api.ts
index 7b153312..8ce1bcac 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/api.ts
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/api.ts
@@ -63,7 +63,7 @@ export function getMessageList(params: { page: number; limit: number }) {
 }
 
 //获取客服列表
-export function getAgentList() {
+export function getCustomerList() {
   return request("/v1/kefu/customerService/list", {}, "GET");
 }
 
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/VerticalUserList/VerticalUserList.module.scss b/Touchkebao/src/pages/pc/ckbox/weChat/components/CustomerList/com.module.scss
similarity index 61%
rename from Touchkebao/src/pages/pc/ckbox/weChat/components/VerticalUserList/VerticalUserList.module.scss
rename to Touchkebao/src/pages/pc/ckbox/weChat/components/CustomerList/com.module.scss
index cf6db02e..9cc2941e 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/VerticalUserList/VerticalUserList.module.scss
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/CustomerList/com.module.scss
@@ -1,4 +1,4 @@
-.verticalUserList {
+.customerList {
   display: flex;
   flex-direction: column;
   height: 100%;
@@ -91,4 +91,52 @@
       background-color: #8c8c8c; // 灰色表示离线
     }
   }
+
+  // 骨架屏样式
+  .skeletonContainer {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 10px 0;
+  }
+
+  .skeletonItem {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 10px 0;
+    position: relative;
+    margin-bottom: 10px;
+  }
+
+  .skeletonAvatar {
+    width: 50px;
+    height: 50px;
+    border-radius: 50%;
+    background: linear-gradient(90deg, #f0f0f0 25%, #e0e0e0 50%, #f0f0f0 75%);
+    background-size: 200% 100%;
+    animation: skeleton-loading 1.5s infinite;
+  }
+
+  .skeletonIndicator {
+    position: absolute;
+    bottom: 10px;
+    right: 10px;
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
+    background: linear-gradient(90deg, #f0f0f0 25%, #e0e0e0 50%, #f0f0f0 75%);
+    background-size: 200% 100%;
+    animation: skeleton-loading 1.5s infinite;
+  }
+
+  @keyframes skeleton-loading {
+    0% {
+      background-position: 200% 0;
+    }
+    100% {
+      background-position: -200% 0;
+    }
+  }
 }
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/CustomerList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/CustomerList/index.tsx
new file mode 100644
index 00000000..37c38d6e
--- /dev/null
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/CustomerList/index.tsx
@@ -0,0 +1,122 @@
+import React, { useEffect, useState } from "react";
+import { Avatar, Badge } from "antd";
+import styles from "./com.module.scss";
+import {
+  useCustomerStore,
+  updateCurrentCustomer,
+  updateCustomerList,
+} from "@weChatStore/customer";
+import { getChatSessions } from "@storeModule/ckchat/ckchat";
+import { getCustomerList } from "@apiModule/wechat";
+const CustomerList: React.FC = () => {
+  const [loading, setLoading] = useState(true);
+
+  //初始化获取客服列表
+  useEffect(() => {
+    setLoading(true);
+    getCustomerList()
+      .then(res => {
+        updateCustomerList(res);
+        setLoading(false);
+      })
+      .catch(() => {
+        setLoading(false);
+      });
+  }, []);
+  const handleUserSelect = (userId: number) => {
+    updateCurrentCustomer(
+      customerList.find(customer => customer.id === userId) || null,
+    );
+  };
+  const customerList = useCustomerStore(state => state.customerList);
+  const currentCustomer = useCustomerStore(state => state.currentCustomer);
+
+  const chatSessions = getChatSessions();
+  const getUnreadCount = (customerId: number) => {
+    if (currentCustomer?.id != 0) {
+      const session = chatSessions.filter(
+        v => v.wechatAccountId === customerId,
+      );
+      return session.reduce((pre, cur) => pre + cur.config.unreadCount, 0);
+    } else {
+      return chatSessions.reduce((pre, cur) => pre + cur.config.unreadCount, 0);
+    }
+  };
+
+  // 骨架屏组件
+  const SkeletonItem = () => (
+    <div className={styles.skeletonItem}>
+      <div className={styles.skeletonAvatar} />
+      <div className={styles.skeletonIndicator} />
+    </div>
+  );
+
+  // 骨架屏列表
+  const SkeletonList = () => (
+    <div className={styles.skeletonContainer}>
+      <SkeletonItem />
+      <SkeletonItem />
+      <SkeletonItem />
+      <SkeletonItem />
+      <SkeletonItem />
+    </div>
+  );
+
+  return (
+    <div className={styles.customerList}>
+      <div className={styles.userListHeader}>
+        <div className={styles.allFriends}>微信号</div>
+      </div>
+      <div className={styles.userList}>
+        {loading ? (
+          <SkeletonList />
+        ) : (
+          <>
+            <div
+              className={styles.userItem}
+              onClick={() => handleUserSelect(0)}
+            >
+              <Badge
+                count={getUnreadCount(0)}
+                overflowCount={99}
+                className={styles.messageBadge}
+              >
+                <div className={styles.allUser}>全部</div>
+              </Badge>
+              <div className={`${styles.onlineIndicator} ${styles.online}`} />
+            </div>
+            {customerList.map(customer => (
+              <div
+                key={customer.id}
+                className={`${styles.userItem} ${currentCustomer?.id === customer.id ? styles.active : ""}`}
+                onClick={() => handleUserSelect(customer.id)}
+              >
+                <Badge
+                  count={getUnreadCount(customer.id)}
+                  overflowCount={99}
+                  className={styles.messageBadge}
+                >
+                  <Avatar
+                    src={customer.avatar}
+                    size={50}
+                    className={styles.userAvatar}
+                    style={{
+                      backgroundColor: !customer.avatar ? "#1890ff" : undefined,
+                    }}
+                  >
+                    {!customer.avatar && customer.name.charAt(0)}
+                  </Avatar>
+                </Badge>
+                <div
+                  className={`${styles.onlineIndicator} ${customer.isOnline ? styles.online : styles.offline}`}
+                />
+              </div>
+            ))}
+          </>
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default CustomerList;
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/VerticalUserList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/VerticalUserList/index.tsx
deleted file mode 100644
index e75e7d08..00000000
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/VerticalUserList/index.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import React from "react";
-import { Avatar, Badge } from "antd";
-import styles from "./VerticalUserList.module.scss";
-import { useCkChatStore, asyncKfSelected } from "@/store/module/ckchat/ckchat";
-
-const VerticalUserList: React.FC = () => {
-  const handleUserSelect = (userId: number) => {
-    asyncKfSelected(userId);
-  };
-  const kfUserList = useCkChatStore(state => state.kfUserList);
-  const kfSelected = useCkChatStore(state => state.kfSelected);
-  const chatSessions = useCkChatStore(state => state.chatSessions);
-  const getUnreadCount = (wechatAccountId: number) => {
-    if (wechatAccountId != 0) {
-      const session = chatSessions.filter(
-        v => v.wechatAccountId === wechatAccountId,
-      );
-      return session.reduce((pre, cur) => pre + cur.config.unreadCount, 0);
-    } else {
-      return chatSessions.reduce((pre, cur) => pre + cur.config.unreadCount, 0);
-    }
-  };
-
-  return (
-    <div className={styles.verticalUserList}>
-      <div className={styles.userListHeader}>
-        <div className={styles.allFriends}>微信号</div>
-      </div>
-      <div className={styles.userList}>
-        <div className={styles.userItem} onClick={() => handleUserSelect(0)}>
-          <Badge
-            count={getUnreadCount(0)}
-            overflowCount={99}
-            className={styles.messageBadge}
-          >
-            <div className={styles.allUser}>全部</div>
-          </Badge>
-          <div className={`${styles.onlineIndicator} ${styles.online}`} />
-        </div>
-        {kfUserList.map(user => (
-          <div
-            key={user.id}
-            className={`${styles.userItem} ${kfSelected === user.id ? styles.active : ""}`}
-            onClick={() => handleUserSelect(user.id)}
-          >
-            <Badge
-              count={getUnreadCount(user.id)}
-              overflowCount={99}
-              className={styles.messageBadge}
-            >
-              <Avatar
-                src={user.avatar}
-                size={50}
-                className={styles.userAvatar}
-                style={{
-                  backgroundColor: !user.avatar ? "#1890ff" : undefined,
-                }}
-              >
-                {!user.avatar && user.name.charAt(0)}
-              </Avatar>
-            </Badge>
-            <div
-              className={`${styles.onlineIndicator} ${user.isOnline ? styles.online : styles.offline}`}
-            />
-          </div>
-        ))}
-      </div>
-    </div>
-  );
-};
-
-export default VerticalUserList;
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/index.tsx
index 25fc7774..c28d1a5d 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/index.tsx
@@ -3,7 +3,7 @@ import { Layout } from "antd";
 import { MessageOutlined } from "@ant-design/icons";
 import ChatWindow from "./components/ChatWindow/index";
 import SidebarMenu from "./components/SidebarMenu/index";
-import VerticalUserList from "./components/VerticalUserList";
+import CustomerList from "./components/CustomerList";
 import PageSkeleton from "./components/Skeleton";
 import styles from "./index.module.scss";
 const { Content, Sider } = Layout;
@@ -16,9 +16,9 @@ const CkboxPage: React.FC = () => {
   const currentContract = useWeChatStore(state => state.currentContract);
   useEffect(() => {
     // 方法一：使用 Promise 链式调用处理异步函数
-    if (!getIsLoadWeChat()) {
-      setLoading(true);
-    }
+    // if (!getIsLoadWeChat()) {
+    //   setLoading(true);
+    // }
     chatInitAPIdata()
       .then(() => {
         // 数据加载完成后初始化WebSocket连接
@@ -39,7 +39,7 @@ const CkboxPage: React.FC = () => {
           {/* 垂直侧边栏 */}
 
           <Sider width={80} className={styles.verticalSider}>
-            <VerticalUserList />
+            <CustomerList />
           </Sider>
 
           {/* 左侧联系人边栏 */}
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/main.ts b/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
index 11c4082b..de25c845 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
@@ -1,5 +1,4 @@
 import {
-  asyncKfUserList,
   asyncContractList,
   asyncChatSessions,
   asyncWeChatGroup,
@@ -16,7 +15,7 @@ import {
   getControlTerminalList,
   getContactList,
   getGroupList,
-  getAgentList,
+  getCustomerList,
   getLabelsListByGroup,
   getMessageList,
 } from "./api";
@@ -27,6 +26,7 @@ import {
   weChatGroup,
 } from "@/pages/pc/ckbox/data";
 
+import { updateCustomerList } from "@weChatStore/customer";
 //获取触客宝基础信息
 export const chatInitAPIdata = async () => {
   try {
@@ -52,12 +52,11 @@ export const chatInitAPIdata = async () => {
 
     await asyncWeChatGroup(groupList);
 
-    //获取控制终端列表
-    const kfUserList: KfUserListData[] = await getAgentList();
-
-    //获取用户列表
-    await asyncKfUserList(kfUserList);
+    // //获取控制终端列表
+    // const kfUserList: KfUserListData[] = await getCustomerList();
 
+    // //获取用户列表
+    // updateCustomerList(kfUserList);
     //获取标签列表
     const countLables = await getCountLables();
     await asyncCountLables(countLables);
diff --git a/Touchkebao/src/store/module/weChat/chatRecord.ts b/Touchkebao/src/store/module/weChat/chatRecord.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/Touchkebao/src/store/module/weChat/contacts.ts b/Touchkebao/src/store/module/weChat/contacts.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/Touchkebao/src/store/module/weChat/currentChat.ts b/Touchkebao/src/store/module/weChat/currentChat.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/Touchkebao/src/store/module/weChat/customer.data.ts b/Touchkebao/src/store/module/weChat/customer.data.ts
new file mode 100644
index 00000000..50983be6
--- /dev/null
+++ b/Touchkebao/src/store/module/weChat/customer.data.ts
@@ -0,0 +1,41 @@
+export interface Customer {
+  id: number;
+  tenantId: number;
+  wechatId: string;
+  nickname: string;
+  alias: string;
+  avatar: string;
+  gender: number;
+  region: string;
+  signature: string;
+  bindQQ: string;
+  bindEmail: string;
+  bindMobile: string;
+  createTime: string;
+  currentDeviceId: number;
+  isDeleted: boolean;
+  deleteTime: string;
+  groupId: number;
+  memo: string;
+  wechatVersion: string;
+  labels: string[];
+  lastUpdateTime: string;
+  isOnline?: boolean;
+  momentsMax: number;
+  momentsNum: number;
+  [key: string]: any;
+}
+
+//Store State
+export interface CustomerState {
+  //客服列表
+  customerList: Customer[];
+  //当前选中的客服
+  currentCustomer: Customer | null;
+  //更新客服列表
+  updateCustomerList: (customerList: Customer[]) => void;
+  //更新客服状态
+  updateCustomerStatus: (customerId: number, status: string) => void;
+  //更新当前选中的客服
+  updateCurrentCustomer: (customer: Customer) => void;
+}
diff --git a/Touchkebao/src/store/module/weChat/customer.ts b/Touchkebao/src/store/module/weChat/customer.ts
new file mode 100644
index 00000000..9b85daf7
--- /dev/null
+++ b/Touchkebao/src/store/module/weChat/customer.ts
@@ -0,0 +1,56 @@
+import { create } from "zustand";
+import { persist } from "zustand/middleware";
+import { Customer, CustomerState } from "./customer.data";
+export const useCustomerStore = create<CustomerState>()(
+  persist(
+    (set, get) => ({
+      customerList: [], //客服列表
+      currentCustomer: null, //当前选中的客服
+      updateCustomerList: (customerList: Customer[]) => set({ customerList }), //更新客服列表
+      updateCurrentCustomer: (customer: Customer) =>
+        set({ currentCustomer: customer }), //更新当前选中的客服
+      updateCustomerStatus: (customerId: number, status: string) =>
+        set({
+          customerList: get().customerList.map(customer =>
+            customer.id === customerId ? { ...customer, status } : customer,
+          ),
+        }), //更新客服状态
+    }),
+    {
+      name: "customer-storage",
+      partialize: state => ({
+        customerList: [],
+        currentCustomer: null,
+      }),
+    },
+  ),
+);
+/**
+ * 更新当前选中的客服
+ * @param customer 客服
+ * @returns void
+ */
+export const updateCurrentCustomer = (customer: Customer) =>
+  useCustomerStore.getState().updateCurrentCustomer(customer);
+/**
+ * 更新客服列表
+ * @param customerList 客服列表
+ * @returns void
+ */
+export const updateCustomerList = (customerList: Customer[]) =>
+  useCustomerStore.getState().updateCustomerList(customerList);
+/**
+ * 获取当前选中的客服
+ * @returns Customer | null
+ */
+export const getCurrentCustomer = () =>
+  useCustomerStore.getState().currentCustomer;
+
+/**
+ * 更新客服状态
+ * @param customerId 客服ID
+ * @param status 状态
+ * @returns void
+ */
+export const updateCustomerStatus = (customerId: number, status: string) =>
+  useCustomerStore.getState().updateCustomerStatus(customerId, status);
diff --git a/Touchkebao/src/store/module/weChat/message.ts b/Touchkebao/src/store/module/weChat/message.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/Touchkebao/tsconfig.json b/Touchkebao/tsconfig.json
index 9d100420..f6e4f581 100644
--- a/Touchkebao/tsconfig.json
+++ b/Touchkebao/tsconfig.json
@@ -17,7 +17,10 @@
     "jsx": "react-jsx",
     "baseUrl": "./",
     "paths": {
-      "@/*": ["src/*"]
+      "@/*": ["src/*"],
+      "@weChatStore/*": ["src/store/module/weChat/*"],
+      "@storeModule/*": ["src/store/module/*"],
+      "@apiModule/*": ["src/api/module/*"]
     }
   },
   "include": ["src"]
diff --git a/Touchkebao/vite.config.ts b/Touchkebao/vite.config.ts
index 7ab397b4..1730de58 100644
--- a/Touchkebao/vite.config.ts
+++ b/Touchkebao/vite.config.ts
@@ -7,6 +7,9 @@ export default defineConfig({
   resolve: {
     alias: {
       "@": path.resolve("src"),
+      "@storeModule": path.resolve("src/store/module/"),
+      "@weChatStore": path.resolve("src/store/module/weChat"),
+      "@apiModule": path.resolve("src/api/module/"),
     },
   },
   server: {

From 68a5350c19358a32873e1ba42e73a46ef83b2414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Thu, 23 Oct 2025 12:55:57 +0800
Subject: [PATCH 36/72] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=9C=AA=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=AE=A2=E6=9C=8D=E5=88=97=E8=A1=A8=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81=EF=BC=8C=E4=BC=98=E5=8C=96=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E7=AE=A1=E7=90=86=E9=80=BB=E8=BE=91=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=B6=88=E6=81=AF=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=8F=90=E5=8D=87=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E5=92=8C=E5=8F=AF=E8=AF=BB=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SidebarMenu/MessageList/index.tsx         |  2 -
 Touchkebao/src/pages/pc/ckbox/weChat/main.ts  |  6 --
 .../src/store/module/weChat/message.data.ts   | 39 +++++++++++++
 Touchkebao/src/store/module/weChat/message.ts | 56 +++++++++++++++++++
 .../src/store/module/websocket/msgManage.ts   | 21 ++++---
 5 files changed, 107 insertions(+), 17 deletions(-)
 create mode 100644 Touchkebao/src/store/module/weChat/message.data.ts

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index 2e64e377..aac77a5f 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -27,8 +27,6 @@ const MessageList: React.FC<MessageListProps> = () => {
   const kfSelected = useCkChatStore(state => state.kfSelected);
   const { sendCommand } = useWebSocketStore();
   const onContactClick = (session: ContractData | weChatGroup) => {
-    console.log(session);
-
     setCurrentContact(session, true);
   };
   const [chatSessions, setChatSessions] = useState<
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/main.ts b/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
index de25c845..a74e2d28 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
@@ -52,11 +52,6 @@ export const chatInitAPIdata = async () => {
 
     await asyncWeChatGroup(groupList);
 
-    // //获取控制终端列表
-    // const kfUserList: KfUserListData[] = await getCustomerList();
-
-    // //获取用户列表
-    // updateCustomerList(kfUserList);
     //获取标签列表
     const countLables = await getCountLables();
     await asyncCountLables(countLables);
@@ -112,7 +107,6 @@ export const chatInitAPIdata = async () => {
     return {
       contractList,
       groupList,
-      kfUserList,
     };
   } catch (error) {
     console.error("获取联系人列表失败:", error);
diff --git a/Touchkebao/src/store/module/weChat/message.data.ts b/Touchkebao/src/store/module/weChat/message.data.ts
new file mode 100644
index 00000000..102a5a02
--- /dev/null
+++ b/Touchkebao/src/store/module/weChat/message.data.ts
@@ -0,0 +1,39 @@
+export interface Message {
+  id: number;
+  wechatId: string;
+  nickname: string;
+  alias: string;
+  avatar: string;
+  region: string;
+  signature: string;
+  bindQQ: string;
+  bindEmail: string;
+  bindMobile: string;
+  createTime: string;
+  currentDeviceId: number;
+  isDeleted: boolean;
+  deleteTime: string;
+  groupId: number;
+  memo: string;
+  wechatVersion: string;
+  labels: string[];
+  lastUpdateTime: string;
+  isOnline?: boolean;
+  momentsMax: number;
+  momentsNum: number;
+  [key: string]: any;
+}
+
+//Store State
+export interface MessageState {
+  //消息列表
+  messageList: Message[];
+  //当前选中的消息
+  currentMessage: Message | null;
+  //更新消息列表
+  updateMessageList: (messageList: Message[]) => void;
+  //更新消息状态
+  updateMessageStatus: (messageId: number, status: string) => void;
+  //更新当前选中的消息
+  updateCurrentMessage: (message: Message) => void;
+}
diff --git a/Touchkebao/src/store/module/weChat/message.ts b/Touchkebao/src/store/module/weChat/message.ts
index e69de29b..60e6e74e 100644
--- a/Touchkebao/src/store/module/weChat/message.ts
+++ b/Touchkebao/src/store/module/weChat/message.ts
@@ -0,0 +1,56 @@
+import { create } from "zustand";
+import { persist } from "zustand/middleware";
+import { Message, MessageState } from "./message.data";
+export const useMessageStore = create<MessageState>()(
+  persist(
+    (set, get) => ({
+      messageList: [], //消息列表
+      currentMessage: null, //当前选中的消息
+      updateMessageList: (messageList: Message[]) => set({ messageList }), //更新消息列表
+      updateCurrentMessage: (message: Message) =>
+        set({ currentMessage: message }), //更新当前选中的消息
+      updateMessageStatus: (messageId: number, status: string) =>
+        set({
+          messageList: get().messageList.map(message =>
+            message.id === messageId ? { ...message, status } : message,
+          ),
+        }), //更新消息状态
+    }),
+    {
+      name: "message-storage",
+      partialize: state => ({
+        messageList: [],
+        currentMessage: null,
+      }),
+    },
+  ),
+);
+/**
+ * 更新当前选中的消息
+ * @param message 消息
+ * @returns void
+ */
+export const updateCurrentMessage = (message: Message) =>
+  useMessageStore.getState().updateCurrentMessage(message);
+/**
+ * 更新消息列表
+ * @param messageList 消息列表
+ * @returns void
+ */
+export const updateMessageList = (messageList: Message[]) =>
+  useMessageStore.getState().updateMessageList(messageList);
+/**
+ * 获取当前选中的消息
+ * @returns Message | null
+ */
+export const getCurrentMessage = () =>
+  useMessageStore.getState().currentMessage;
+
+/**
+ * 更新消息状态
+ * @param messageId 消息ID
+ * @param status 状态
+ * @returns void
+ */
+export const updateMessageStatus = (messageId: number, status: string) =>
+  useMessageStore.getState().updateMessageStatus(messageId, status);
diff --git a/Touchkebao/src/store/module/websocket/msgManage.ts b/Touchkebao/src/store/module/websocket/msgManage.ts
index 54eddcc5..2a9166b6 100644
--- a/Touchkebao/src/store/module/websocket/msgManage.ts
+++ b/Touchkebao/src/store/module/websocket/msgManage.ts
@@ -1,11 +1,11 @@
 //消息管理器
-import { getkfUserList, asyncKfUserList } from "@/store/module/ckchat/ckchat";
 import { useWeChatStore } from "../weChat/weChat";
 import { WebSocketMessage } from "./websocket";
 import { deepCopy } from "@/utils/common";
 import { Messages } from "./msg.data";
 import { db } from "@/utils/db";
 import { Modal } from "antd";
+import { useCustomerStore, updateCustomerList } from "../weChat/customer";
 // 消息处理器类型定义
 type MessageHandler = (message: WebSocketMessage) => void;
 const addMessage = useWeChatStore.getState().addMessage;
@@ -20,21 +20,24 @@ const messageHandlers: Record<string, MessageHandler> = {
   CmdRequestWechatAccountsAliveStatusResp: message => {
     // console.log("微信账号存活状态响应", message);
     // 获取客服列表
-    const kfUserList = deepCopy(getkfUserList());
+    const customerList = deepCopy(useCustomerStore.getState().customerList);
     const wechatAccountsAliveStatus = message.wechatAccountsAliveStatus || {};
-    // 遍历客服列表，更新存活状态
-    kfUserList.forEach(kfUser => {
-      kfUser.isOnline = wechatAccountsAliveStatus[kfUser.id];
-    });
+
+    // 遍历客服列表，更新在线状态
+    const updatedCustomerList = customerList.map(customer => ({
+      ...customer,
+      isOnline: wechatAccountsAliveStatus[customer.id] || false,
+    }));
 
     // 按在线状态排序，在线的排在前面
-    kfUserList.sort((a, b) => {
+    updatedCustomerList.sort((a, b) => {
       if (a.isOnline && !b.isOnline) return -1;
       if (!a.isOnline && b.isOnline) return 1;
       return 0;
     });
 
-    asyncKfUserList(kfUserList);
+    // 更新客服列表
+    updateCustomerList(updatedCustomerList);
   },
   // 发送消息响应
   CmdSendMessageResp: message => {
@@ -57,7 +60,7 @@ const messageHandlers: Record<string, MessageHandler> = {
     // 在这里添加具体的处理逻辑
     receivedMsg(message.friendMessage || message.chatroomMessage);
   },
-  CmdFriendInfoChanged: message => {
+  CmdFriendInfoChanged: () => {
     // console.log("好友信息变更", message);
     // 在这里添加具体的处理逻辑
   },

From a5b1861e7d53e53212855795f60ad93aae361fbd Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Thu, 23 Oct 2025 14:12:40 +0800
Subject: [PATCH 37/72] =?UTF-8?q?=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chukebao/controller/MessageController.php | 51 +++++++++++++++----
 .../controller/WechatFriendController.php     | 16 +++---
 2 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/Server/application/chukebao/controller/MessageController.php b/Server/application/chukebao/controller/MessageController.php
index 11cadc10..5593eafb 100644
--- a/Server/application/chukebao/controller/MessageController.php
+++ b/Server/application/chukebao/controller/MessageController.php
@@ -28,24 +28,42 @@ class MessageController extends BaseController
             ->field('id')
             ->buildSql();
 
-        // 使用 UNION 合并群聊和好友消息，然后统一排序和分页
+        // 优化后的查询：使用MySQL兼容的查询方式
         $unionQuery = "
-            (SELECT m.id, m.content, m.wechatFriendId, m.wechatChatroomId, m.createTime, m.wechatTime, 2 as msgType, wc.nickname, wc.chatroomAvatar as avatar,wc.chatroomId
+            (SELECT m.id, m.content, m.wechatFriendId, m.wechatChatroomId, m.createTime, m.wechatTime, 2 as msgType, wc.nickname, wc.chatroomAvatar as avatar, wc.chatroomId
              FROM s2_wechat_chatroom wc
-             LEFT JOIN s2_wechat_message m ON wc.id = m.wechatChatroomId
-             WHERE wc.accountId = {$accountId} AND m.type = 2 AND wc.isDeleted = 0
-             GROUP BY m.wechatChatroomId)
+             INNER JOIN s2_wechat_message m ON wc.id = m.wechatChatroomId AND m.type = 2
+             INNER JOIN (
+                 SELECT wechatChatroomId, MAX(wechatTime) as maxTime, MAX(id) as maxId
+                 FROM s2_wechat_message 
+                 WHERE type = 2
+                 GROUP BY wechatChatroomId
+             ) latest ON m.wechatChatroomId = latest.wechatChatroomId AND m.wechatTime = latest.maxTime AND m.id = latest.maxId
+             WHERE wc.accountId = {$accountId} AND wc.isDeleted = 0
+            )
             UNION ALL
-            (SELECT m.id, m.content, m.wechatFriendId, m.wechatChatroomId, m.createTime, m.wechatTime, 1 as msgType, 1 as nickname, 1 avatar, 1 as chatroomId
+            (SELECT m.id, m.content, m.wechatFriendId, m.wechatChatroomId, m.createTime, m.wechatTime, 1 as msgType, 1 as nickname, 1 as avatar, 1 as chatroomId
              FROM s2_wechat_message m
+             INNER JOIN (
+                 SELECT wechatFriendId, MAX(wechatTime) as maxTime, MAX(id) as maxId
+                 FROM s2_wechat_message 
+                 WHERE type = 1 AND wechatFriendId IN {$friendSubQuery}
+                 GROUP BY wechatFriendId
+             ) latest ON m.wechatFriendId = latest.wechatFriendId AND m.wechatTime = latest.maxTime AND m.id = latest.maxId
              WHERE m.type = 1 AND m.wechatFriendId IN {$friendSubQuery}
-             GROUP BY m.wechatFriendId)
-            ORDER BY createTime DESC
+            )
+            ORDER BY wechatTime DESC
             LIMIT " . (($page - 1) * $limit) . ", {$limit}
         ";
 
         $list = Db::query($unionQuery);
 
+        // 对分页后的结果进行排序（按wechatTime降序）
+        usort($list, function ($a, $b) {
+            return $b['wechatTime'] <=> $a['wechatTime'];
+        });
+
+
         // 批量统计未读数量（isRead=0），按好友/群聊分别聚合
         $friendIds = [];
         $chatroomIds = [];
@@ -62,6 +80,7 @@ class MessageController extends BaseController
 
         $friendUnreadMap = [];
         if (!empty($friendIds)) {
+            // 获取未读消息数量
             $friendUnreadMap = Db::table('s2_wechat_message')
                 ->where(['isRead' => 0])
                 ->whereIn('wechatFriendId', $friendIds)
@@ -71,6 +90,7 @@ class MessageController extends BaseController
 
         $chatroomUnreadMap = [];
         if (!empty($chatroomIds)) {
+            // 获取未读消息数量
             $chatroomUnreadMap = Db::table('s2_wechat_message')
                 ->where(['isRead' => 0])
                 ->whereIn('wechatChatroomId', $chatroomIds)
@@ -78,12 +98,14 @@ class MessageController extends BaseController
                 ->column('COUNT(*) AS cnt', 'wechatChatroomId');
         }
 
+
         foreach ($list as $k => &$v) {
 
             $createTime = !empty($v['createTime']) ? date('Y-m-d H:i:s', $v['createTime']) : '';
             $wechatTime = !empty($v['wechatTime']) ? date('Y-m-d H:i:s', $v['wechatTime']) : '';
 
-            $vunreadCount = 0;
+
+            $unreadCount = 0;
             if (!empty($v['wechatFriendId'])) {
                 $v['nickname'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['nickname'] : '';
                 $v['avatar'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['avatar'] : '';
@@ -91,7 +113,7 @@ class MessageController extends BaseController
                 $v['groupId'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['groupId'] : '';
                 $v['wechatAccountId'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['wechatAccountId'] : '';
                 $v['wechatId'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['wechatId'] : '';
-                $v['labels'] = !empty($friends[$v['wechatFriendId']]) ? json_decode($friends[$v['wechatFriendId']]['labels'],true) : [];
+                $v['labels'] = !empty($friends[$v['wechatFriendId']]) ? json_decode($friends[$v['wechatFriendId']]['labels'], true) : [];
                 $unreadCount = isset($friendUnreadMap[$v['wechatFriendId']]) ? (int)$friendUnreadMap[$v['wechatFriendId']] : 0;
                 unset($v['chatroomId']);
             }
@@ -110,7 +132,14 @@ class MessageController extends BaseController
             ];
             $v['createTime'] = $createTime;
             $v['lastUpdateTime'] = $wechatTime;
-            unset($v['wechatFriendId'],$v['wechatChatroomId']);
+
+            // 最新消息内容已经在UNION查询中获取，直接使用
+            $v['latestMessage'] = [
+                'content' => $v['content'],
+                'wechatTime' => $wechatTime
+            ];
+
+            unset($v['wechatFriendId'], $v['wechatChatroomId']);
 
         }
         unset($v);
diff --git a/Server/application/chukebao/controller/WechatFriendController.php b/Server/application/chukebao/controller/WechatFriendController.php
index 0dce6dc2..d94a0ebb 100644
--- a/Server/application/chukebao/controller/WechatFriendController.php
+++ b/Server/application/chukebao/controller/WechatFriendController.php
@@ -24,10 +24,10 @@ class WechatFriendController extends BaseController
         $list = $query->page($page, $limit)->select();
 
 
-        // 提取所有好友ID
+        /*  // 提取所有好友ID
         $friendIds = array_column($list, 'id');
 
-        // 一次性查询所有好友的未读消息数量
+       // 一次性查询所有好友的未读消息数量
         $unreadCounts = [];
         if (!empty($friendIds)) {
             $unreadResults = Db::table('s2_wechat_message')
@@ -44,7 +44,7 @@ class WechatFriendController extends BaseController
         }
 
         // 一次性查询所有好友的最新消息
-        $latestMessages = [];
+       $latestMessages = [];
         if (!empty($friendIds)) {
             // 使用子查询获取每个好友的最新消息ID
             $subQuery = Db::table('s2_wechat_message')
@@ -67,9 +67,7 @@ class WechatFriendController extends BaseController
                     }
                 }
             }
-
-
-        }
+        }*/
 
 
         $aiTypeData = [];
@@ -87,14 +85,16 @@ class WechatFriendController extends BaseController
             $v['passTime'] = !empty($v['passTime']) ? date('Y-m-d H:i:s', $v['passTime']) : '';
 
 
-            $config = [
+           /* $config = [
                 'unreadCount' => isset($unreadCounts[$v['id']]) ? $unreadCounts[$v['id']] : 0,
                 'chat' => isset($latestMessages[$v['id']]),
                 'msgTime' => isset($latestMessages[$v['id']]) ? $latestMessages[$v['id']]['wechatTime'] : 0
             ];
 
             // 将消息配置添加到好友数据中
-            $v['config'] = $config;
+            $v['config'] = $config;*/
+
+
             $v['aiType'] = isset($aiTypeData[$v['id']]) ? $aiTypeData[$v['id']] : 0;
         }
         unset($v);

From 75e62cce72a6e142d8af380a9509c549fbfb61bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Thu, 23 Oct 2025 15:51:05 +0800
Subject: [PATCH 38/72] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=80=BB=E8=BE=91=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E6=8F=90=E5=8D=87=E4=BB=A3=E7=A0=81=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E5=92=8C=E5=8F=AF=E8=AF=BB=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Touchkebao/src/utils/dbAction/contact.ts      | 0
 Touchkebao/src/utils/dbAction/loginManager.ts | 0
 Touchkebao/src/utils/dbAction/message.ts      | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 Touchkebao/src/utils/dbAction/contact.ts
 create mode 100644 Touchkebao/src/utils/dbAction/loginManager.ts
 create mode 100644 Touchkebao/src/utils/dbAction/message.ts

diff --git a/Touchkebao/src/utils/dbAction/contact.ts b/Touchkebao/src/utils/dbAction/contact.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/Touchkebao/src/utils/dbAction/loginManager.ts b/Touchkebao/src/utils/dbAction/loginManager.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/Touchkebao/src/utils/dbAction/message.ts b/Touchkebao/src/utils/dbAction/message.ts
new file mode 100644
index 00000000..e69de29b

From 7f4bc0487e88ccd571eda1dc117845a325fb1f98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Thu, 23 Oct 2025 17:02:33 +0800
Subject: [PATCH 39/72] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8API=EF=BC=8C=E4=BC=98=E5=8C=96=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6=E4=BB=A5=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=8A=A0=E8=BD=BD=E7=8A=B6=E6=80=81=E5=92=8C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5=EF=BC=8C=E6=8F=90=E5=8D=87=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BD=93=E9=AA=8C=E5=92=8C=E4=BB=A3=E7=A0=81=E5=8F=AF?=
 =?UTF-8?q?=E8=AF=BB=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MessageList/MessageList.module.scss       |  21 +
 .../components/SidebarMenu/MessageList/api.ts |   4 +
 .../SidebarMenu/MessageList/index.tsx         | 415 +++++++++--
 .../src/store/module/weChat/message.data.ts   |  29 +-
 Touchkebao/src/store/module/weChat/message.ts |  55 +-
 .../src/store/module/websocket/msgManage.ts   |  22 +-
 Touchkebao/src/utils/db.ts                    | 201 ++++-
 Touchkebao/src/utils/dbAction/index.ts        |   7 +
 Touchkebao/src/utils/dbAction/message.ts      | 693 ++++++++++++++++++
 9 files changed, 1343 insertions(+), 104 deletions(-)
 create mode 100644 Touchkebao/src/utils/dbAction/index.ts

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss
index b924c483..0bed38fc 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss
@@ -170,4 +170,25 @@
       }
     }
   }
+
+  // 同步状态提示
+  .refreshIndicator {
+    padding: 8px;
+    text-align: center;
+    font-size: 12px;
+    color: #999;
+    background: #f5f5f5;
+    border-bottom: 1px solid #e8e8e8;
+
+    :global(.ant-spin) {
+      margin-right: 6px;
+    }
+  }
+
+  // 加载状态
+  .loading {
+    padding: 16px;
+    text-align: center;
+    color: #999;
+  }
 }
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/api.ts b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/api.ts
index 186cc3db..81af8aa7 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/api.ts
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/api.ts
@@ -1,4 +1,8 @@
 import request from "@/api/request";
+//群、好友聊天记录列表
+export function getMessageList(params: { page: number; limit: number }) {
+  return request("/v1/kefu/message/list", params, "GET");
+}
 
 // 获取联系人列表
 export const getContactList = (params: { prevId: string; count: number }) => {
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index aac77a5f..cb2083bf 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState, useRef } from "react";
-import { List, Avatar, Badge, Modal, Input, message } from "antd";
+import { List, Avatar, Badge, Modal, Input, message, Spin } from "antd";
 import {
   UserOutlined,
   TeamOutlined,
@@ -7,39 +7,42 @@ import {
   DeleteOutlined,
   EditOutlined,
 } from "@ant-design/icons";
-import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 import { useWeChatStore } from "@/store/module/weChat/weChat";
-import {
-  useCkChatStore,
-  toggleChatSessionPin,
-  deleteChatSession,
-} from "@/store/module/ckchat/ckchat";
+import { useCkChatStore } from "@/store/module/ckchat/ckchat";
 import { useWebSocketStore } from "@/store/module/websocket/websocket";
 import { updateConfig } from "@/pages/pc/ckbox/api";
+import { getMessageList } from "./api";
 import { dataProcessing } from "./api";
 import styles from "./MessageList.module.scss";
 import { formatWechatTime } from "@/utils/common";
+import { MessageManager } from "@/utils/dbAction/message";
+import { ChatSession } from "@/utils/db";
+import { useMessageStore } from "@/store/module/weChat/message";
+import { useUserStore } from "@/store/module/user";
 interface MessageListProps {}
 
 const MessageList: React.FC<MessageListProps> = () => {
   const { setCurrentContact, currentContract } = useWeChatStore();
-  const getChatSessions = useCkChatStore(state => state.chatSessions);
   const kfSelected = useCkChatStore(state => state.kfSelected);
-  const { sendCommand } = useWebSocketStore();
-  const onContactClick = (session: ContractData | weChatGroup) => {
-    setCurrentContact(session, true);
-  };
-  const [chatSessions, setChatSessions] = useState<
-    (ContractData | weChatGroup)[]
-  >([]);
   const searchKeyword = useCkChatStore(state => state.searchKeyword);
+  const { sendCommand } = useWebSocketStore();
+  const { user } = useUserStore();
+  const currentUserId = user?.id || 0;
+
+  // Store状态
+  const { loading, refreshing, refreshTrigger, setLoading, setRefreshing } =
+    useMessageStore();
+
+  // 组件内部状态：会话列表数据
+  const [sessions, setSessions] = useState<ChatSession[]>([]);
+  const [filteredSessions, setFilteredSessions] = useState<ChatSession[]>([]);
 
   // 右键菜单相关状态
   const [contextMenu, setContextMenu] = useState<{
     visible: boolean;
     x: number;
     y: number;
-    session: ContractData | weChatGroup | null;
+    session: ChatSession | null;
   }>({
     visible: false,
     x: 0,
@@ -50,7 +53,7 @@ const MessageList: React.FC<MessageListProps> = () => {
   // 修改备注相关状态
   const [editRemarkModal, setEditRemarkModal] = useState<{
     visible: boolean;
-    session: ContractData | weChatGroup | null;
+    session: ChatSession | null;
     remark: string;
   }>({
     visible: false,
@@ -61,10 +64,7 @@ const MessageList: React.FC<MessageListProps> = () => {
   const contextMenuRef = useRef<HTMLDivElement>(null);
 
   // 右键菜单事件处理
-  const handleContextMenu = (
-    e: React.MouseEvent,
-    session: ContractData | weChatGroup,
-  ) => {
+  const handleContextMenu = (e: React.MouseEvent, session: ChatSession) => {
     e.preventDefault();
     e.stopPropagation();
 
@@ -87,53 +87,94 @@ const MessageList: React.FC<MessageListProps> = () => {
   };
 
   // 置顶/取消置顶
-  const handleTogglePin = (session: ContractData | weChatGroup) => {
-    const currentPinned = (session.config as any)?.top || false;
-    const newPinned = !currentPinned; // 切换置顶状态
+  const handleTogglePin = async (session: ChatSession) => {
+    const currentPinned = session.config?.top || false;
+    const newPinned = !currentPinned;
 
-    updateConfig({
-      id: session.id,
-      config: { top: newPinned, chat: true },
-    })
-      .then(() => {
-        // API调用成功，更新本地状态
-        toggleChatSessionPin(session.id!, newPinned);
-        message.success(`${newPinned ? "置顶" : "取消置顶"}成功`);
-      })
-      .catch(() => {
-        message.error(`${newPinned ? "置顶" : "取消置顶"}失败`);
+    try {
+      // 1. 立即更新UI（乐观更新）
+      setSessions(prev =>
+        prev.map(s =>
+          s.id === session.id
+            ? {
+                ...s,
+                config: { ...s.config, top: newPinned },
+                sortKey: "", // 会重新计算
+              }
+            : s,
+        ),
+      );
+
+      // 2. 后台调用API
+      await updateConfig({
+        id: session.id,
+        config: { top: newPinned, chat: true },
       });
+
+      // 3. 后台更新数据库
+      await MessageManager.togglePin(
+        currentUserId,
+        session.id,
+        session.type,
+        newPinned,
+      );
+
+      message.success(`${newPinned ? "置顶" : "取消置顶"}成功`);
+    } catch (error) {
+      // 4. 失败时回滚UI
+      setSessions(prev =>
+        prev.map(s =>
+          s.id === session.id
+            ? { ...s, config: { ...s.config, top: currentPinned } }
+            : s,
+        ),
+      );
+      message.error(`${newPinned ? "置顶" : "取消置顶"}失败`);
+    }
+
     hideContextMenu();
   };
 
   // 删除会话
-  const handleDelete = (session: ContractData | weChatGroup) => {
+  const handleDelete = (session: ChatSession) => {
     Modal.confirm({
       title: "确认删除",
       content: `确定要删除与 ${session.conRemark || session.nickname} 的会话吗？`,
-      onOk: () => {
-        updateConfig({
-          id: session.id,
-          config: { chat: false },
-        })
-          .then(() => {
-            message.success(`删除成功`);
-            //根据id删除会话里Item
-            deleteChatSession(session.id);
-          })
-          .catch(() => {
-            message.error(`删除失败`);
+      onOk: async () => {
+        try {
+          // 1. 立即从UI移除
+          setSessions(prev => prev.filter(s => s.id !== session.id));
+
+          // 2. 后台调用API
+          await updateConfig({
+            id: session.id,
+            config: { chat: false },
           });
+
+          // 3. 后台从数据库删除
+          await MessageManager.deleteSession(
+            currentUserId,
+            session.id,
+            session.type,
+          );
+
+          message.success("删除成功");
+        } catch (error) {
+          // 4. 失败时恢复UI
+          setSessions(prev => [...prev, session]);
+          message.error("删除失败");
+        }
+
         hideContextMenu();
       },
     });
   };
 
   // 修改备注
-  const handleEditRemark = (session: ContractData | weChatGroup) => {
+  const handleEditRemark = (session: ChatSession) => {
     setEditRemarkModal({
       visible: true,
-      session,
+      session: session as any,
       remark: session.conRemark || "",
     });
     hideContextMenu();
@@ -145,13 +186,25 @@ const MessageList: React.FC<MessageListProps> = () => {
 
     const session = editRemarkModal.session;
     const isGroup = "chatroomId" in session;
+    const sessionData = sessions.find(s => s.id === session.id);
+    if (!sessionData) return;
+
+    const oldRemark = session.conRemark;
 
     try {
+      // 1. 立即更新UI
+      setSessions(prev =>
+        prev.map(s =>
+          s.id === session.id ? { ...s, conRemark: editRemarkModal.remark } : s,
+        ),
+      );
+
+      // 2. 后台调用API
       if (isGroup) {
         // 群聊备注修改
         sendCommand("CmdModifyGroupRemark", {
           wechatAccountId: session.wechatAccountId,
-          chatroomId: session.chatroomId,
+          chatroomId: (session as any).chatroomId,
           newRemark: editRemarkModal.remark,
         });
         await dataProcessing({
@@ -175,18 +228,22 @@ const MessageList: React.FC<MessageListProps> = () => {
         });
       }
 
-      // 修改备注后会更新当前的session的conRemark，然后使用updateChatSession方法更新会话列表
-      const updatedSession = {
-        ...session,
-        conRemark: editRemarkModal.remark,
-      };
-
-      // 更新会话列表中的备注
-      const { updateChatSession } = useCkChatStore.getState();
-      updateChatSession(updatedSession);
+      // 3. 后台更新数据库
+      await MessageManager.updateRemark(
+        currentUserId,
+        session.id,
+        sessionData.type,
+        editRemarkModal.remark,
+      );
 
       message.success("备注更新成功");
     } catch (error) {
+      // 4. 失败时回滚UI
+      setSessions(prev =>
+        prev.map(s =>
+          s.id === session.id ? { ...s, conRemark: oldRemark } : s,
+        ),
+      );
       console.error("更新备注失败:", error);
       message.error("备注更新失败，请重试");
     }
@@ -218,32 +275,254 @@ const MessageList: React.FC<MessageListProps> = () => {
     };
   }, [contextMenu.visible]);
 
+  // ==================== 数据加载 ====================
+
+  // 与服务器同步数据
+  const syncWithServer = async () => {
+    if (!currentUserId) return;
+
+    try {
+      // 获取会话列表数据（分页获取所有数据）
+      let allMessages: any[] = [];
+      let page = 1;
+      const limit = 500;
+      let hasMore = true;
+
+      // 分页获取会话列表
+      while (hasMore) {
+        const result: any = await getMessageList({
+          page,
+          limit,
+        });
+
+        if (!result || !Array.isArray(result) || result.length === 0) {
+          hasMore = false;
+          break;
+        }
+
+        allMessages = [...allMessages, ...result];
+
+        if (result.length < limit) {
+          hasMore = false;
+        } else {
+          page++;
+        }
+      }
+
+      // 分离好友和群聊数据
+      const friends = allMessages.filter(
+        (msg: any) => msg.dataType === "friend" || !msg.chatroomId,
+      );
+      const groups = allMessages.filter(
+        (msg: any) => msg.dataType === "group" || msg.chatroomId,
+      );
+
+      // 执行增量同步
+      const syncResult = await MessageManager.syncSessions(currentUserId, {
+        friends,
+        groups,
+      });
+
+      console.log(
+        `会话同步完成: 新增${syncResult.added}, 更新${syncResult.updated}, 删除${syncResult.deleted}`,
+      );
+    } catch (error) {
+      console.error("同步服务器数据失败:", error);
+    }
+  };
+
+  // 初始化加载会话列表
   useEffect(() => {
-    let filteredSessions = getChatSessions;
+    const initializeSessions = async () => {
+      if (!currentUserId) return;
+
+      setLoading(true);
+
+      try {
+        // 1. 优先从本地数据库加载
+        const cachedSessions =
+          await MessageManager.getUserSessions(currentUserId);
+
+        if (cachedSessions.length > 0) {
+          // 有缓存数据，立即显示
+          setSessions(cachedSessions);
+          setLoading(false);
+
+          // 2. 后台静默同步
+          setRefreshing(true);
+          await syncWithServer();
+        } else {
+          // 无缓存，直接API加载
+          await syncWithServer();
+          const newSessions =
+            await MessageManager.getUserSessions(currentUserId);
+          setSessions(newSessions);
+          setLoading(false);
+        }
+      } catch (error) {
+        console.error("初始化会话列表失败:", error);
+        setLoading(false);
+      } finally {
+        setRefreshing(false);
+      }
+    };
+
+    initializeSessions();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [currentUserId]);
+
+  // 监听refreshTrigger，重新查询数据库
+  useEffect(() => {
+    const refreshSessions = async () => {
+      if (!currentUserId || refreshTrigger === 0) return;
+
+      try {
+        const updatedSessions =
+          await MessageManager.getUserSessions(currentUserId);
+        setSessions(updatedSessions);
+      } catch (error) {
+        console.error("刷新会话列表失败:", error);
+      }
+    };
+
+    refreshSessions();
+  }, [refreshTrigger, currentUserId]);
+
+  // 根据客服和搜索关键词筛选会话
+  useEffect(() => {
+    let filtered = [...sessions];
 
     // 根据客服筛选
     if (kfSelected !== 0) {
-      filteredSessions = filteredSessions.filter(
-        v => v.wechatAccountId === kfSelected,
-      );
+      filtered = filtered.filter(v => v.wechatAccountId === kfSelected);
     }
 
     // 根据搜索关键词进行模糊匹配
     if (searchKeyword.trim()) {
       const keyword = searchKeyword.toLowerCase();
-      filteredSessions = filteredSessions.filter(v => {
+      filtered = filtered.filter(v => {
         const nickname = (v.nickname || "").toLowerCase();
         const conRemark = (v.conRemark || "").toLowerCase();
         return nickname.includes(keyword) || conRemark.includes(keyword);
       });
     }
 
-    setChatSessions(filteredSessions);
-  }, [getChatSessions, kfSelected, searchKeyword]);
+    setFilteredSessions(filtered);
+  }, [sessions, kfSelected, searchKeyword]);
+
+  // ==================== WebSocket消息处理 ====================
+
+  // 监听WebSocket消息更新
+  useEffect(() => {
+    const handleNewMessage = (event: CustomEvent) => {
+      const { message: msgData, sessionId, type } = event.detail;
+
+      // 立即更新组件state
+      setSessions(prev => {
+        const existingIndex = prev.findIndex(s => s.id === sessionId);
+
+        if (existingIndex >= 0) {
+          // 更新现有会话
+          const updatedSession = {
+            ...prev[existingIndex],
+            config: {
+              ...prev[existingIndex].config,
+              unreadCount: prev[existingIndex].config.unreadCount + 1,
+            },
+            content: msgData.content,
+            lastUpdateTime: new Date().toISOString(),
+          };
+
+          // 重新计算sortKey（会触发重新排序）
+          const newSessions = [...prev];
+          newSessions[existingIndex] = updatedSession;
+
+          // 按sortKey降序重新排序（最新的在前面）
+          return newSessions.sort((a, b) => {
+            const aKey = MessageManager["generateSortKey"](a);
+            const bKey = MessageManager["generateSortKey"](b);
+            return bKey.localeCompare(aKey); // 降序：b在前，a在后
+          });
+        } else {
+          // 新会话，插入到列表中
+          const newSession: ChatSession = {
+            serverId: `${type}_${sessionId}`,
+            userId: currentUserId,
+            id: sessionId,
+            type,
+            wechatAccountId: msgData.wechatAccountId,
+            nickname: msgData.nickname || "",
+            conRemark: "",
+            avatar: msgData.avatar || "",
+            content: msgData.content,
+            lastUpdateTime: new Date().toISOString(),
+            config: {
+              unreadCount: 1,
+              top: false,
+            },
+            sortKey: "",
+          };
+
+          return [newSession, ...prev];
+        }
+      });
+
+      // 后台更新数据库
+      MessageManager.updateSessionOnNewMessage(
+        currentUserId,
+        sessionId,
+        type,
+        msgData,
+      );
+    };
+
+    window.addEventListener(
+      "chatMessageReceived",
+      handleNewMessage as EventListener,
+    );
+
+    return () => {
+      window.removeEventListener(
+        "chatMessageReceived",
+        handleNewMessage as EventListener,
+      );
+    };
+  }, [currentUserId]);
+
+  // ==================== 会话操作 ====================
+
+  // 点击会话
+  const onContactClick = async (session: ChatSession) => {
+    // 设置当前会话
+    setCurrentContact(session as any, true);
+
+    // 标记为已读
+    if (session.config.unreadCount > 0) {
+      // 立即更新UI
+      setSessions(prev =>
+        prev.map(s =>
+          s.id === session.id
+            ? { ...s, config: { ...s.config, unreadCount: 0 } }
+            : s,
+        ),
+      );
+
+      // 后台更新数据库
+      MessageManager.markAsRead(currentUserId, session.id, session.type);
+    }
+  };
+
   return (
     <div className={styles.messageList}>
+      {loading && <div className={styles.loading}>加载中...</div>}
+      {refreshing && !loading && (
+        <div className={styles.refreshIndicator}>
+          <Spin size="small" /> 正在同步...
+        </div>
+      )}
+
       <List
-        dataSource={chatSessions as (ContractData | weChatGroup)[]}
+        dataSource={filteredSessions as any[]}
         renderItem={session => (
           <List.Item
             key={session.id}
diff --git a/Touchkebao/src/store/module/weChat/message.data.ts b/Touchkebao/src/store/module/weChat/message.data.ts
index 102a5a02..37dc1b6d 100644
--- a/Touchkebao/src/store/module/weChat/message.data.ts
+++ b/Touchkebao/src/store/module/weChat/message.data.ts
@@ -24,16 +24,33 @@ export interface Message {
   [key: string]: any;
 }
 
-//Store State
+//Store State - 会话列表状态管理（不存储数据，只管理状态）
 export interface MessageState {
-  //消息列表
+  //加载状态
+  loading: boolean;
+  //后台同步状态
+  refreshing: boolean;
+  //刷新触发器（用于通知组件重新查询数据库）
+  refreshTrigger: number;
+  //最后刷新时间
+  lastRefreshTime: string | null;
+
+  //设置加载状态
+  setLoading: (loading: boolean) => void;
+  //设置同步状态
+  setRefreshing: (refreshing: boolean) => void;
+  //触发刷新（通知组件重新查询）
+  triggerRefresh: () => void;
+
+  // ==================== 保留原有接口（向后兼容） ====================
+  //消息列表（废弃，保留兼容）
   messageList: Message[];
-  //当前选中的消息
+  //当前选中的消息（废弃，保留兼容）
   currentMessage: Message | null;
-  //更新消息列表
+  //更新消息列表（废弃，保留兼容）
   updateMessageList: (messageList: Message[]) => void;
-  //更新消息状态
+  //更新消息状态（废弃，保留兼容）
   updateMessageStatus: (messageId: number, status: string) => void;
-  //更新当前选中的消息
+  //更新当前选中的消息（废弃，保留兼容）
   updateCurrentMessage: (message: Message) => void;
 }
diff --git a/Touchkebao/src/store/module/weChat/message.ts b/Touchkebao/src/store/module/weChat/message.ts
index 60e6e74e..52533cee 100644
--- a/Touchkebao/src/store/module/weChat/message.ts
+++ b/Touchkebao/src/store/module/weChat/message.ts
@@ -1,24 +1,48 @@
 import { create } from "zustand";
 import { persist } from "zustand/middleware";
 import { Message, MessageState } from "./message.data";
+
+/**
+ * 会话列表状态管理Store
+ * 职责：只管理状态，不存储会话列表数据
+ * 数据存储在：组件state + IndexedDB
+ */
 export const useMessageStore = create<MessageState>()(
   persist(
     (set, get) => ({
-      messageList: [], //消息列表
-      currentMessage: null, //当前选中的消息
-      updateMessageList: (messageList: Message[]) => set({ messageList }), //更新消息列表
+      // ==================== 新增状态管理 ====================
+      loading: false,
+      refreshing: false,
+      refreshTrigger: 0,
+      lastRefreshTime: null,
+
+      setLoading: (loading: boolean) => set({ loading }),
+      setRefreshing: (refreshing: boolean) => set({ refreshing }),
+      triggerRefresh: () =>
+        set({
+          refreshTrigger: get().refreshTrigger + 1,
+          lastRefreshTime: new Date().toISOString(),
+        }),
+
+      // ==================== 保留原有接口（向后兼容） ====================
+      messageList: [],
+      currentMessage: null,
+      updateMessageList: (messageList: Message[]) => set({ messageList }),
       updateCurrentMessage: (message: Message) =>
-        set({ currentMessage: message }), //更新当前选中的消息
+        set({ currentMessage: message }),
       updateMessageStatus: (messageId: number, status: string) =>
         set({
           messageList: get().messageList.map(message =>
             message.id === messageId ? { ...message, status } : message,
           ),
-        }), //更新消息状态
+        }),
     }),
     {
       name: "message-storage",
       partialize: state => ({
+        // 只持久化必要的状态，不持久化数据
+        lastRefreshTime: state.lastRefreshTime,
+        // 保留原有持久化字段（向后兼容）
         messageList: [],
         currentMessage: null,
       }),
@@ -54,3 +78,24 @@ export const getCurrentMessage = () =>
  */
 export const updateMessageStatus = (messageId: number, status: string) =>
   useMessageStore.getState().updateMessageStatus(messageId, status);
+
+// ==================== 新增导出函数 ====================
+
+/**
+ * 设置加载状态
+ * @param loading 加载状态
+ */
+export const setLoading = (loading: boolean) =>
+  useMessageStore.getState().setLoading(loading);
+
+/**
+ * 设置同步状态
+ * @param refreshing 同步状态
+ */
+export const setRefreshing = (refreshing: boolean) =>
+  useMessageStore.getState().setRefreshing(refreshing);
+
+/**
+ * 触发刷新（通知组件重新查询数据库）
+ */
+export const triggerRefresh = () => useMessageStore.getState().triggerRefresh();
diff --git a/Touchkebao/src/store/module/websocket/msgManage.ts b/Touchkebao/src/store/module/websocket/msgManage.ts
index 2a9166b6..64559e53 100644
--- a/Touchkebao/src/store/module/websocket/msgManage.ts
+++ b/Touchkebao/src/store/module/websocket/msgManage.ts
@@ -57,8 +57,28 @@ const messageHandlers: Record<string, MessageHandler> = {
   },
   //收到消息
   CmdNewMessage: (message: Messages) => {
-    // 在这里添加具体的处理逻辑
+    // 处理消息本身
     receivedMsg(message.friendMessage || message.chatroomMessage);
+
+    // 触发会话列表更新事件
+    const msgData = message.friendMessage || message.chatroomMessage;
+    if (msgData) {
+      const sessionId = message.friendMessage
+        ? message.friendMessage.wechatFriendId
+        : message.chatroomMessage?.wechatChatroomId;
+      const type = message.friendMessage ? "friend" : "group";
+
+      // 发送自定义事件通知MessageList组件
+      window.dispatchEvent(
+        new CustomEvent("chatMessageReceived", {
+          detail: {
+            message: msgData,
+            sessionId,
+            type,
+          },
+        }),
+      );
+    }
   },
   CmdFriendInfoChanged: () => {
     // console.log("好友信息变更", message);
diff --git a/Touchkebao/src/utils/db.ts b/Touchkebao/src/utils/db.ts
index df673a94..9a8559e4 100644
--- a/Touchkebao/src/utils/db.ts
+++ b/Touchkebao/src/utils/db.ts
@@ -4,25 +4,15 @@
  * 架构设计：
  * 1. 使用serverId作为数据库主键，直接对应接口返回的id字段
  * 2. 保留原始的id字段，用于存储接口数据的完整性
- * 3. 简化数据处理逻辑，避免ID映射的复杂性
+ * 3. 添加userId字段实现多用户数据隔离
+ * 4. 统一会话表和联系人表，兼容好友和群聊
  *
  * 优势：
  * - 直接使用服务器ID作为主键，避免ID冲突
- * - 保持数据的一致性和可追溯性
- * - 简化查询逻辑，提高性能
- * - 支持重复数据检测和去重
- *
- * 使用方法：
- * - 存储接口数据：使用 createWithServerId() 或 createManyWithServerId()
- * - 查询数据：使用 findById(id) 根据原始ID查询，或 findByPrimaryKey(serverId) 根据主键查询
- * - 批量查询：使用 findByIds([id1, id2, ...]) 根据原始ID批量查询
- * - 内部操作：serverId作为主键用于数据库内部管理
- *
- * 示例：
- * const serverData = { id: 1001, name: '测试', ... }; // 接口返回的数据
- * const serverId = await service.createWithServerId(serverData); // 存储，返回serverId
- * const data = await service.findById(1001); // 根据原始ID查询（用户友好）
- * const dataByPK = await service.findByPrimaryKey(serverId); // 根据主键查询（内部使用）
+ * - 通过userId实现多用户数据隔离
+ * - 统一的会话和联系人表结构，兼容好友和群聊
+ * - 支持复合索引，提高查询性能
+ * - 支持用户登录记录和自动清理
  */
 
 import Dexie, { Table } from "dexie";
@@ -33,33 +23,136 @@ import {
   MessageListData,
 } from "@/pages/pc/ckbox/data";
 
-// 数据类型定义，使用serverId作为主键
+// ==================== 用户登录记录 ====================
+export interface UserLoginRecord {
+  serverId: string; // 主键: user_${userId}
+  userId: number; // 用户ID
+  lastLoginTime: string; // 最后登录时间
+  loginCount: number; // 登录次数
+  createTime: string; // 首次登录时间
+  lastActiveTime: string; // 最后活跃时间
+}
+
+// ==================== 统一会话表（兼容好友和群聊） ====================
+export interface ChatSession {
+  serverId: string; // 主键
+  userId: number; // 用户ID（数据隔离）
+  id: number; // 原始ID
+  type: "friend" | "group"; // 类型：好友或群聊
+
+  // 通用字段
+  wechatAccountId: number; // 所属客服账号
+  nickname: string; // 显示名称
+  conRemark?: string; // 备注名
+  avatar: string; // 头像
+  content: string; // 最新消息内容
+  lastUpdateTime: string; // 最后更新时间
+  config: {
+    unreadCount: number; // 未读数量
+    top: boolean; // 是否置顶
+  };
+  sortKey: string; // 预计算排序键
+
+  // 好友特有字段（type='friend'时有效）
+  wechatFriendId?: number; // 好友ID
+  wechatId?: string; // 微信号
+  alias?: string; // 别名
+
+  // 群聊特有字段（type='group'时有效）
+  chatroomId?: string; // 群聊ID
+  chatroomOwner?: string; // 群主
+  selfDisplayName?: string; // 群内昵称
+  notice?: string; // 群公告
+}
+
+// ==================== 统一联系人表（兼容好友和群聊） ====================
+export interface Contact {
+  serverId: string; // 主键
+  userId: number; // 用户ID（数据隔离）
+  id: number; // 原始ID
+  type: "friend" | "group"; // 类型：好友或群聊
+
+  // 通用字段
+  wechatAccountId: number; // 所属客服账号
+  nickname: string; // 显示名称
+  conRemark?: string; // 备注名
+  avatar: string; // 头像
+  lastUpdateTime: string; // 最后更新时间
+  config?: any; // 配置信息
+  sortKey: string; // 预计算排序键
+  searchKey: string; // 预计算搜索键
+
+  // 好友特有字段（type='friend'时有效）
+  wechatFriendId?: number; // 好友ID
+  wechatId?: string; // 微信号
+  alias?: string; // 别名
+  gender?: number; // 性别
+  region?: string; // 地区
+  signature?: string; // 个性签名
+  phone?: string; // 手机号
+  quanPin?: string; // 全拼
+
+  // 群聊特有字段（type='group'时有效）
+  chatroomId?: string; // 群聊ID
+  chatroomOwner?: string; // 群主
+  selfDisplayName?: string; // 群内昵称
+  notice?: string; // 群公告
+  memberCount?: number; // 群成员数量
+}
+
+// ==================== 联系人标签映射表 ====================
+export interface ContactLabelMap {
+  serverId: string; // 主键: ${contactId}_${labelId}
+  userId: number; // 用户ID（数据隔离）
+  labelId: number; // 标签ID
+  contactId: number; // 联系人ID
+  contactType: "friend" | "group"; // 联系人类型
+  sortKey: string; // 预计算排序键
+  searchKey: string; // 预计算搜索键
+
+  // 列表展示必需字段（轻量）
+  avatar: string;
+  nickname: string;
+  conRemark?: string;
+  unreadCount: number;
+  lastUpdateTime: string;
+}
+
+// ==================== 保留原有数据类型（向后兼容） ====================
 export interface KfUserWithServerId extends Omit<KfUserListData, "id"> {
   serverId: number | string; // 服务器ID作为主键
+  userId: number; // 用户ID（数据隔离）
   id?: number; // 接口数据的原始ID字段
 }
 
-// 新联系人列表数据接口
 export interface NewContactListData {
   serverId: number | string; // 服务器ID作为主键
+  userId: number; // 用户ID（数据隔离）
   id?: number; // 接口数据的原始ID字段
   groupName: string;
-  contacts: ContractData[];
-  weChatGroup: weChatGroup[];
+  contacts: Contact[];
+  weChatGroup: Contact[];
 }
 
 // 数据库类
 class CunkebaoDatabase extends Dexie {
+  // ==================== 保留原有表（向后兼容） ====================
   kfUsers!: Table<KfUserWithServerId>;
   weChatGroup!: Table<weChatGroup>;
   contracts!: Table<ContractData>;
-  newContractList!: Table<NewContactListData>;
+  newContactList!: Table<NewContactListData>;
   messageList!: Table<MessageListData>;
 
+  // ==================== 新增统一表 ====================
+  chatSessions!: Table<ChatSession>; // 统一会话表
+  contactsUnified!: Table<Contact>; // 统一联系人表
+  contactLabelMap!: Table<ContactLabelMap>; // 联系人标签映射表
+  userLoginRecords!: Table<UserLoginRecord>; // 用户登录记录表
+
   constructor() {
     super("CunkebaoDatabase");
 
-    // 版本1：使用serverId作为主键的架构
+    // 版本1：使用serverId作为主键的架构（保留原有表）
     this.version(1).stores({
       kfUsers:
         "serverId, id, tenantId, wechatId, nickname, alias, avatar, gender, region, signature, bindQQ, bindEmail, bindMobile, createTime, currentDeviceId, isDeleted, deleteTime, groupId, memo, wechatVersion, lastUpdateTime, isOnline",
@@ -67,10 +160,64 @@ class CunkebaoDatabase extends Dexie {
         "serverId, id, wechatAccountId, tenantId, accountId, chatroomId, chatroomOwner, conRemark, nickname, chatroomAvatar,wechatChatroomId, groupId, config, notice, selfDisplyName",
       contracts:
         "serverId, id, wechatAccountId, wechatId, alias, conRemark, nickname, quanPin, avatar, gender, region, addFrom, phone, signature, accountId, extendFields, city, lastUpdateTime, isPassed, tenantId, groupId, thirdParty, additionalPicture, desc, config, lastMessageTime, duplicate",
-      newContractList: "serverId, id, groupName, contacts",
+      newContactList: "serverId, id, groupName, contacts",
       messageList:
         "serverId, id, dataType, wechatAccountId, tenantId, accountId, nickname, avatar, groupId, config, labels,  wechatId, alias, conRemark, quanPin, gender, region, addFrom, phone, signature, extendFields, city, lastUpdateTime, isPassed, thirdParty, additionalPicture, desc, lastMessageTime, duplicate, chatroomId, chatroomOwner, chatroomAvatar, notice, selfDisplyName",
     });
+
+    // 版本2：添加用户隔离字段到原有表
+    this.version(2)
+      .stores({
+        kfUsers:
+          "serverId, userId, id, tenantId, wechatId, nickname, alias, avatar, gender, region, signature, bindQQ, bindEmail, bindMobile, createTime, currentDeviceId, isDeleted, deleteTime, groupId, memo, wechatVersion, lastUpdateTime, isOnline",
+        weChatGroup:
+          "serverId, userId, id, wechatAccountId, tenantId, accountId, chatroomId, chatroomOwner, conRemark, nickname, chatroomAvatar,wechatChatroomId, groupId, config, notice, selfDisplyName",
+        contracts:
+          "serverId, userId, id, wechatAccountId, wechatId, alias, conRemark, nickname, quanPin, avatar, gender, region, addFrom, phone, signature, accountId, extendFields, city, lastUpdateTime, isPassed, tenantId, groupId, thirdParty, additionalPicture, desc, config, lastMessageTime, duplicate",
+        newContactList: "serverId, userId, id, groupName, contacts",
+        messageList:
+          "serverId, userId, id, dataType, wechatAccountId, tenantId, accountId, nickname, avatar, groupId, config, labels,  wechatId, alias, conRemark, quanPin, gender, region, addFrom, phone, signature, extendFields, city, lastUpdateTime, isPassed, thirdParty, additionalPicture, desc, lastMessageTime, duplicate, chatroomId, chatroomOwner, chatroomAvatar, notice, selfDisplyName",
+      })
+      .upgrade(trans => {
+        // 为现有数据添加默认userId=0（需要手动清理）
+        return trans
+          .table("kfUsers")
+          .toCollection()
+          .modify(item => {
+            item.userId = 0;
+          });
+      });
+
+    // 版本3：添加新的统一表和用户登录记录表
+    this.version(3).stores({
+      // 保留原有表
+      kfUsers:
+        "serverId, userId, id, tenantId, wechatId, nickname, alias, avatar, gender, region, signature, bindQQ, bindEmail, bindMobile, createTime, currentDeviceId, isDeleted, deleteTime, groupId, memo, wechatVersion, lastUpdateTime, isOnline",
+      weChatGroup:
+        "serverId, userId, id, wechatAccountId, tenantId, accountId, chatroomId, chatroomOwner, conRemark, nickname, chatroomAvatar,wechatChatroomId, groupId, config, notice, selfDisplyName",
+      contracts:
+        "serverId, userId, id, wechatAccountId, wechatId, alias, conRemark, nickname, quanPin, avatar, gender, region, addFrom, phone, signature, accountId, extendFields, city, lastUpdateTime, isPassed, tenantId, groupId, thirdParty, additionalPicture, desc, config, lastMessageTime, duplicate",
+      newContactList: "serverId, userId, id, groupName, contacts",
+      messageList:
+        "serverId, userId, id, dataType, wechatAccountId, tenantId, accountId, nickname, avatar, groupId, config, labels,  wechatId, alias, conRemark, quanPin, gender, region, addFrom, phone, signature, extendFields, city, lastUpdateTime, isPassed, thirdParty, additionalPicture, desc, lastMessageTime, duplicate, chatroomId, chatroomOwner, chatroomAvatar, notice, selfDisplyName",
+
+      // 新增统一表
+      // 会话表索引：支持按用户、类型、时间、置顶等查询
+      chatSessions:
+        "serverId, userId, id, type, wechatAccountId, [userId+type], [userId+wechatAccountId], [userId+lastUpdateTime], sortKey, nickname, conRemark, avatar, content, lastUpdateTime",
+
+      // 联系人表索引：支持按用户、类型、标签、搜索等查询
+      contactsUnified:
+        "serverId, userId, id, type, wechatAccountId, [userId+type], [userId+wechatAccountId], sortKey, searchKey, nickname, conRemark, avatar, lastUpdateTime",
+
+      // 联系人标签映射表索引：支持按用户、标签、联系人、类型查询
+      contactLabelMap:
+        "serverId, userId, labelId, contactId, contactType, [userId+labelId], [userId+contactId], [userId+labelId+sortKey], sortKey, searchKey, avatar, nickname, conRemark, unreadCount, lastUpdateTime",
+
+      // 用户登录记录表索引：支持按用户ID、登录时间查询
+      userLoginRecords:
+        "serverId, userId, lastLoginTime, loginCount, createTime, lastActiveTime",
+    });
   }
 }
 
@@ -335,8 +482,14 @@ export class DatabaseService<T> {
 export const kfUserService = new DatabaseService(db.kfUsers);
 export const weChatGroupService = new DatabaseService(db.weChatGroup);
 export const contractService = new DatabaseService(db.contracts);
-export const newContactListService = new DatabaseService(db.newContractList);
+export const newContactListService = new DatabaseService(db.newContactList);
 export const messageListService = new DatabaseService(db.messageList);
 
+// 新增统一表服务
+export const chatSessionService = new DatabaseService(db.chatSessions);
+export const contactUnifiedService = new DatabaseService(db.contactsUnified);
+export const contactLabelMapService = new DatabaseService(db.contactLabelMap);
+export const userLoginRecordService = new DatabaseService(db.userLoginRecords);
+
 // 默认导出数据库实例
 export default db;
diff --git a/Touchkebao/src/utils/dbAction/index.ts b/Touchkebao/src/utils/dbAction/index.ts
new file mode 100644
index 00000000..3152e5db
--- /dev/null
+++ b/Touchkebao/src/utils/dbAction/index.ts
@@ -0,0 +1,7 @@
+/**
+ * 数据库操作层统一导出
+ */
+
+export { MessageManager } from "./message";
+export { ContactManager } from "./contact";
+export { LoginManager } from "./loginManager";
diff --git a/Touchkebao/src/utils/dbAction/message.ts b/Touchkebao/src/utils/dbAction/message.ts
index e69de29b..d741c75a 100644
--- a/Touchkebao/src/utils/dbAction/message.ts
+++ b/Touchkebao/src/utils/dbAction/message.ts
@@ -0,0 +1,693 @@
+/**
+ * 会话列表数据库操作管理器
+ * 职责：
+ * 1. 会话数据的增删改查
+ * 2. 增量同步逻辑（对比本地和服务器数据）
+ * 3. 好友/群聊数据转换为统一格式
+ * 4. 提供回调机制通知组件更新
+ */
+
+import { db, chatSessionService, ChatSession } from "../db";
+import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
+
+export class MessageManager {
+  private static updateCallbacks = new Set<(sessions: ChatSession[]) => void>();
+
+  // ==================== 回调管理 ====================
+
+  /**
+   * 注册会话更新回调
+   * @param callback 回调函数
+   * @returns 取消注册的函数
+   */
+  static onSessionsUpdate(callback: (sessions: ChatSession[]) => void) {
+    this.updateCallbacks.add(callback);
+    return () => this.updateCallbacks.delete(callback);
+  }
+
+  /**
+   * 触发所有注册的回调
+   * @param userId 用户ID
+   */
+  private static async triggerCallbacks(userId: number) {
+    try {
+      const sessions = await this.getUserSessions(userId);
+      this.updateCallbacks.forEach(callback => {
+        try {
+          callback(sessions);
+        } catch (error) {
+          console.error("会话更新回调执行失败:", error);
+        }
+      });
+    } catch (error) {
+      console.error("触发回调失败:", error);
+    }
+  }
+
+  // ==================== 数据转换 ====================
+
+  /**
+   * 生成会话排序键（微信排序方式）
+   * @param session 会话数据
+   * @returns 排序键
+   */
+  private static generateSortKey(session: any): string {
+    const isTop = session.config?.top ? 0 : 1;
+    // 时间戳转换：使用9e15减去时间戳，这样最新的时间sortKey最小
+    // 9e15 是一个足够大的数字，确保结果为正数
+    const timestamp = new Date(session.lastUpdateTime || new Date()).getTime();
+    const time = 9e15 - timestamp;
+    const displayName = (
+      session.conRemark ||
+      session.nickname ||
+      ""
+    ).toLowerCase();
+
+    // 格式：置顶标识|时间反转值（补齐15位）|显示名称
+    // sortKey越小，排序越靠前
+    // 最新的消息time值最小，所以排在最前面
+    const timeStr = String(Math.floor(time)).padStart(16, "0");
+    return `${isTop}|${timeStr}|${displayName}`;
+  }
+
+  /**
+   * 转换好友会话为统一格式
+   * @param friend 好友数据
+   * @param userId 用户ID
+   * @returns 统一会话格式
+   */
+  private static convertFriendToChatSession(
+    friend: ContractData,
+    userId: number,
+  ): ChatSession {
+    return {
+      serverId: `friend_${friend.id}`,
+      userId,
+      id: friend.id!,
+      type: "friend",
+      wechatAccountId: friend.wechatAccountId,
+      nickname: friend.nickname,
+      conRemark: friend.conRemark,
+      avatar: friend.avatar || "",
+      content: (friend as any).content || "",
+      lastUpdateTime: friend.lastUpdateTime || new Date().toISOString(),
+      config: {
+        unreadCount: friend.config?.unreadCount || 0,
+        top: (friend.config as any)?.top || false,
+      },
+      sortKey: this.generateSortKey(friend),
+      wechatFriendId: friend.id,
+      wechatId: friend.wechatId,
+      alias: friend.alias,
+    };
+  }
+
+  /**
+   * 转换群聊会话为统一格式
+   * @param group 群聊数据
+   * @param userId 用户ID
+   * @returns 统一会话格式
+   */
+  private static convertGroupToChatSession(
+    group: weChatGroup,
+    userId: number,
+  ): ChatSession {
+    return {
+      serverId: `group_${group.id}`,
+      userId,
+      id: group.id!,
+      type: "group",
+      wechatAccountId: group.wechatAccountId,
+      nickname: group.nickname,
+      conRemark: group.conRemark,
+      avatar: group.chatroomAvatar || "",
+      content: (group as any).content || "",
+      lastUpdateTime: (group as any).lastUpdateTime || new Date().toISOString(),
+      config: {
+        unreadCount: (group.config as any)?.unreadCount || 0,
+        top: (group.config as any)?.top || false,
+      },
+      sortKey: this.generateSortKey(group),
+      chatroomId: group.chatroomId,
+      chatroomOwner: group.chatroomOwner,
+      selfDisplayName: group.selfDisplyName,
+      notice: group.notice,
+    };
+  }
+
+  // ==================== 查询操作 ====================
+
+  /**
+   * 获取用户的所有会话（已排序）
+   * @param userId 用户ID
+   * @returns 会话列表
+   */
+  static async getUserSessions(userId: number): Promise<ChatSession[]> {
+    try {
+      // 按sortKey降序排序查询（最新的在前面）
+      const sessions = await db.chatSessions
+        .where("userId")
+        .equals(userId)
+        .reverse()
+        .sortBy("sortKey");
+
+      return sessions;
+    } catch (error) {
+      console.error("获取用户会话失败:", error);
+      return [];
+    }
+  }
+
+  /**
+   * 根据ID查找会话
+   * @param userId 用户ID
+   * @param sessionId 会话ID
+   * @returns 会话数据
+   */
+  static async getSessionById(
+    userId: number,
+    sessionId: number,
+  ): Promise<ChatSession | undefined> {
+    try {
+      return await db.chatSessions
+        .where(["userId", "id"])
+        .equals([userId, sessionId])
+        .first();
+    } catch (error) {
+      console.error("查找会话失败:", error);
+      return undefined;
+    }
+  }
+
+  // ==================== 同步操作 ====================
+
+  /**
+   * 判断会话是否需要更新
+   * @param local 本地会话
+   * @param server 服务器会话
+   * @returns 是否需要更新
+   */
+  private static needsUpdate(local: ChatSession, server: ChatSession): boolean {
+    const fieldsToCompare = [
+      "content",
+      "lastUpdateTime",
+      "nickname",
+      "conRemark",
+      "avatar",
+    ];
+
+    for (const field of fieldsToCompare) {
+      if (
+        JSON.stringify((local as any)[field]) !==
+        JSON.stringify((server as any)[field])
+      ) {
+        return true;
+      }
+    }
+
+    // 检查config对象
+    if (
+      local.config.unreadCount !== server.config.unreadCount ||
+      local.config.top !== server.config.top
+    ) {
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * 增量同步会话数据
+   * @param userId 用户ID
+   * @param serverData 服务器数据
+   * @returns 同步结果统计
+   */
+  static async syncSessions(
+    userId: number,
+    serverData: {
+      friends?: ContractData[];
+      groups?: weChatGroup[];
+    },
+  ): Promise<{
+    added: number;
+    updated: number;
+    deleted: number;
+  }> {
+    return await db.transaction("rw", [db.chatSessions], async () => {
+      // 1. 获取本地现有会话
+      const localSessions = (await chatSessionService.findWhere(
+        "userId",
+        userId,
+      )) as ChatSession[];
+      const localSessionMap = new Map(localSessions.map(s => [s.id, s]));
+
+      // 2. 转换服务器数据为统一格式
+      const serverSessions: ChatSession[] = [];
+
+      // 处理好友会话
+      if (serverData.friends) {
+        const friends = serverData.friends
+          .filter(f => (f.config as any)?.chat === true) // 只要开启会话的
+          .map(friend => this.convertFriendToChatSession(friend, userId));
+        serverSessions.push(...friends);
+      }
+
+      // 处理群聊会话
+      if (serverData.groups) {
+        const groups = serverData.groups
+          .filter(g => (g.config as any)?.chat === true) // 只要开启会话的
+          .map(group => this.convertGroupToChatSession(group, userId));
+        serverSessions.push(...groups);
+      }
+
+      const serverSessionMap = new Map(serverSessions.map(s => [s.id, s]));
+
+      // 3. 计算差异
+      const toAdd: ChatSession[] = [];
+      const toUpdate: ChatSession[] = [];
+      const toDelete: number[] = [];
+
+      // 检查新增和更新
+      for (const serverSession of serverSessions) {
+        const localSession = localSessionMap.get(serverSession.id);
+
+        if (!localSession) {
+          toAdd.push(serverSession);
+        } else {
+          if (this.needsUpdate(localSession, serverSession)) {
+            toUpdate.push(serverSession);
+          }
+        }
+      }
+
+      // 检查删除
+      for (const localSession of localSessions) {
+        if (!serverSessionMap.has(localSession.id)) {
+          toDelete.push(localSession.id);
+        }
+      }
+
+      // 4. 执行同步操作
+      let added = 0,
+        updated = 0,
+        deleted = 0;
+
+      if (toAdd.length > 0) {
+        await this.batchAddSessions(toAdd);
+        added = toAdd.length;
+      }
+
+      if (toUpdate.length > 0) {
+        await this.batchUpdateSessions(toUpdate);
+        updated = toUpdate.length;
+      }
+
+      if (toDelete.length > 0) {
+        await this.batchDeleteSessions(userId, toDelete);
+        deleted = toDelete.length;
+      }
+
+      console.log(`会话同步完成: 新增${added}, 更新${updated}, 删除${deleted}`);
+
+      // 5. 触发回调通知组件
+      await this.triggerCallbacks(userId);
+
+      return { added, updated, deleted };
+    });
+  }
+
+  // ==================== 增删改操作 ====================
+
+  /**
+   * 批量新增会话
+   * @param sessions 会话列表
+   */
+  private static async batchAddSessions(sessions: ChatSession[]) {
+    if (sessions.length === 0) return;
+
+    const dataToInsert = sessions.map(session => ({
+      ...session,
+      serverId: `${session.type}_${session.id}`,
+    }));
+
+    await db.chatSessions.bulkAdd(dataToInsert);
+  }
+
+  /**
+   * 批量更新会话
+   * @param sessions 会话列表
+   */
+  private static async batchUpdateSessions(sessions: ChatSession[]) {
+    if (sessions.length === 0) return;
+
+    for (const session of sessions) {
+      const serverId = `${session.type}_${session.id}`;
+      await chatSessionService.update(serverId, session);
+    }
+  }
+
+  /**
+   * 批量删除会话
+   * @param userId 用户ID
+   * @param sessionIds 会话ID列表
+   */
+  private static async batchDeleteSessions(
+    userId: number,
+    sessionIds: number[],
+  ) {
+    if (sessionIds.length === 0) return;
+
+    await db.chatSessions
+      .where("userId")
+      .equals(userId)
+      .and(session => sessionIds.includes(session.id))
+      .delete();
+  }
+
+  /**
+   * 新增单个会话
+   * @param session 会话数据
+   */
+  static async addSession(session: ChatSession): Promise<void> {
+    try {
+      const dataToInsert = {
+        ...session,
+        serverId: `${session.type}_${session.id}`,
+        sortKey: this.generateSortKey(session),
+      };
+
+      await db.chatSessions.add(dataToInsert);
+      await this.triggerCallbacks(session.userId);
+    } catch (error) {
+      console.error("新增会话失败:", error);
+      throw error;
+    }
+  }
+
+  /**
+   * 更新单个会话
+   * @param session 会话数据
+   */
+  static async updateSession(
+    session: Partial<ChatSession> & {
+      userId: number;
+      id: number;
+      type: "friend" | "group";
+    },
+  ): Promise<void> {
+    try {
+      const serverId = `${session.type}_${session.id}`;
+      const updateData = {
+        ...session,
+        sortKey: this.generateSortKey(session),
+      };
+
+      await chatSessionService.update(serverId, updateData);
+      await this.triggerCallbacks(session.userId);
+    } catch (error) {
+      console.error("更新会话失败:", error);
+      throw error;
+    }
+  }
+
+  /**
+   * 删除单个会话
+   * @param userId 用户ID
+   * @param sessionId 会话ID
+   * @param type 会话类型
+   */
+  static async deleteSession(
+    userId: number,
+    sessionId: number,
+    type: "friend" | "group",
+  ): Promise<void> {
+    try {
+      const serverId = `${type}_${sessionId}`;
+      await chatSessionService.delete(serverId);
+      await this.triggerCallbacks(userId);
+    } catch (error) {
+      console.error("删除会话失败:", error);
+      throw error;
+    }
+  }
+
+  // ==================== 特殊操作 ====================
+
+  /**
+   * 从联系人数据构建会话（发起新会话时使用）
+   * @param contact 联系人数据（好友或群聊）
+   * @param userId 用户ID
+   * @returns 会话数据
+   */
+  static buildSessionFromContact(
+    contact: ContractData | weChatGroup,
+    userId: number,
+  ): ChatSession {
+    const isGroup = "chatroomId" in contact;
+
+    if (isGroup) {
+      // 群聊
+      return this.convertGroupToChatSession(contact as weChatGroup, userId);
+    } else {
+      // 好友
+      return this.convertFriendToChatSession(contact as ContractData, userId);
+    }
+  }
+
+  /**
+   * 更新会话的最新消息（WebSocket消息到达时使用）
+   * @param userId 用户ID
+   * @param sessionId 会话ID
+   * @param type 会话类型
+   * @param message 消息内容
+   */
+  static async updateSessionOnNewMessage(
+    userId: number,
+    sessionId: number,
+    type: "friend" | "group",
+    message: {
+      content: string;
+    },
+  ): Promise<void> {
+    try {
+      const serverId = `${type}_${sessionId}`;
+      const session = (await chatSessionService.findByPrimaryKey(
+        serverId,
+      )) as ChatSession;
+
+      if (session) {
+        const updatedSession = {
+          ...session,
+          config: {
+            ...session.config,
+            unreadCount: (session.config?.unreadCount || 0) + 1,
+          },
+          content: message.content,
+          lastUpdateTime: new Date().toISOString(),
+        };
+
+        updatedSession.sortKey = this.generateSortKey(updatedSession);
+
+        await chatSessionService.update(serverId, updatedSession);
+        await this.triggerCallbacks(userId);
+      }
+    } catch (error) {
+      console.error("更新会话消息失败:", error);
+    }
+  }
+
+  /**
+   * 标记会话为已读
+   * @param userId 用户ID
+   * @param sessionId 会话ID
+   * @param type 会话类型
+   */
+  static async markAsRead(
+    userId: number,
+    sessionId: number,
+    type: "friend" | "group",
+  ): Promise<void> {
+    try {
+      const serverId = `${type}_${sessionId}`;
+      const session = (await chatSessionService.findByPrimaryKey(
+        serverId,
+      )) as ChatSession;
+
+      if (session && session.config.unreadCount > 0) {
+        await chatSessionService.update(serverId, {
+          config: {
+            ...session.config,
+            unreadCount: 0,
+          },
+        });
+        // 不触发回调，因为只是已读状态变化，不需要重新排序
+      }
+    } catch (error) {
+      console.error("标记已读失败:", error);
+    }
+  }
+
+  /**
+   * 置顶/取消置顶会话
+   * @param userId 用户ID
+   * @param sessionId 会话ID
+   * @param type 会话类型
+   * @param isPinned 是否置顶
+   */
+  static async togglePin(
+    userId: number,
+    sessionId: number,
+    type: "friend" | "group",
+    isPinned: boolean,
+  ): Promise<void> {
+    try {
+      const serverId = `${type}_${sessionId}`;
+      const session = (await chatSessionService.findByPrimaryKey(
+        serverId,
+      )) as ChatSession;
+
+      if (session) {
+        const updatedSession = {
+          ...session,
+          config: {
+            ...session.config,
+            top: isPinned,
+          },
+        };
+
+        updatedSession.sortKey = this.generateSortKey(updatedSession);
+
+        await chatSessionService.update(serverId, updatedSession);
+        await this.triggerCallbacks(userId);
+      }
+    } catch (error) {
+      console.error("置顶操作失败:", error);
+      throw error;
+    }
+  }
+
+  /**
+   * 更新会话备注
+   * @param userId 用户ID
+   * @param sessionId 会话ID
+   * @param type 会话类型
+   * @param remark 新备注
+   */
+  static async updateRemark(
+    userId: number,
+    sessionId: number,
+    type: "friend" | "group",
+    remark: string,
+  ): Promise<void> {
+    try {
+      const serverId = `${type}_${sessionId}`;
+      const session = (await chatSessionService.findByPrimaryKey(
+        serverId,
+      )) as ChatSession;
+
+      if (session) {
+        const updatedSession = {
+          ...session,
+          conRemark: remark,
+        };
+
+        updatedSession.sortKey = this.generateSortKey(updatedSession);
+
+        await chatSessionService.update(serverId, updatedSession);
+        await this.triggerCallbacks(userId);
+      }
+    } catch (error) {
+      console.error("更新备注失败:", error);
+      throw error;
+    }
+  }
+
+  // ==================== 批量操作优化 ====================
+
+  private static updateBuffer: Array<{
+    userId: number;
+    sessionId: number;
+    type: "friend" | "group";
+    updates: Partial<ChatSession>;
+  }> = [];
+  private static bufferTimer: NodeJS.Timeout | null = null;
+
+  /**
+   * 批量更新会话（用于WebSocket消息批处理）
+   * @param userId 用户ID
+   * @param sessionId 会话ID
+   * @param type 会话类型
+   * @param updates 更新内容
+   */
+  static batchUpdateSession(
+    userId: number,
+    sessionId: number,
+    type: "friend" | "group",
+    updates: Partial<ChatSession>,
+  ): void {
+    this.updateBuffer.push({ userId, sessionId, type, updates });
+
+    if (this.bufferTimer) {
+      clearTimeout(this.bufferTimer);
+    }
+
+    this.bufferTimer = setTimeout(async () => {
+      await this.flushUpdateBuffer();
+    }, 100); // 100ms批量处理
+  }
+
+  /**
+   * 刷新更新缓冲区
+   */
+  private static async flushUpdateBuffer() {
+    if (this.updateBuffer.length === 0) return;
+
+    const buffer = [...this.updateBuffer];
+    this.updateBuffer = [];
+
+    try {
+      await db.transaction("rw", [db.chatSessions], async () => {
+        for (const item of buffer) {
+          const serverId = `${item.type}_${item.sessionId}`;
+          const session = (await chatSessionService.findByPrimaryKey(
+            serverId,
+          )) as ChatSession;
+
+          if (session) {
+            const updatedSession = {
+              ...session,
+              ...item.updates,
+            };
+
+            updatedSession.sortKey = this.generateSortKey(updatedSession);
+
+            await chatSessionService.update(serverId, updatedSession);
+          }
+        }
+      });
+
+      // 触发回调
+      const userIds = new Set(buffer.map(item => item.userId));
+      for (const userId of userIds) {
+        await this.triggerCallbacks(userId);
+      }
+    } catch (error) {
+      console.error("批量更新会话失败:", error);
+    }
+  }
+
+  // ==================== 清理操作 ====================
+
+  /**
+   * 清空指定用户的所有会话
+   * @param userId 用户ID
+   */
+  static async clearUserSessions(userId: number): Promise<void> {
+    try {
+      await db.chatSessions.where("userId").equals(userId).delete();
+      console.log(`用户 ${userId} 的会话数据已清空`);
+    } catch (error) {
+      console.error("清空用户会话失败:", error);
+    }
+  }
+}

From 5c86c2fbf28e80af3d2ce22fc2797b1a8aa551be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Thu, 23 Oct 2025 17:14:48 +0800
Subject: [PATCH 40/72] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=80=BB=E8=BE=91=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B6=E5=92=8C=E6=97=B6=E9=97=B4=E6=88=B3=E7=9A=84?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E6=96=B9=E5=BC=8F=EF=BC=8C=E4=BB=A5=E7=A1=AE?=
 =?UTF-8?q?=E4=BF=9D=E7=BD=AE=E9=A1=B6=E6=B6=88=E6=81=AF=E4=BC=98=E5=85=88?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=8F=90=E5=8D=87=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E5=8F=AF=E8=AF=BB=E6=80=A7=E5=92=8C?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/SidebarMenu/MessageList/index.tsx  |  2 +-
 Touchkebao/src/utils/dbAction/message.ts          | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index cb2083bf..dec222c6 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -437,7 +437,7 @@ const MessageList: React.FC<MessageListProps> = () => {
           const newSessions = [...prev];
           newSessions[existingIndex] = updatedSession;
 
-          // 按sortKey降序重新排序（最新的在前面）
+          // 按sortKey降序重新排序（置顶在前，最新的在前）
           return newSessions.sort((a, b) => {
             const aKey = MessageManager["generateSortKey"](a);
             const bKey = MessageManager["generateSortKey"](b);
diff --git a/Touchkebao/src/utils/dbAction/message.ts b/Touchkebao/src/utils/dbAction/message.ts
index d741c75a..bd5f7f97 100644
--- a/Touchkebao/src/utils/dbAction/message.ts
+++ b/Touchkebao/src/utils/dbAction/message.ts
@@ -52,21 +52,18 @@ export class MessageManager {
    * @returns 排序键
    */
   private static generateSortKey(session: any): string {
-    const isTop = session.config?.top ? 0 : 1;
-    // 时间戳转换：使用9e15减去时间戳，这样最新的时间sortKey最小
-    // 9e15 是一个足够大的数字，确保结果为正数
+    const isTop = session.config?.top ? 1 : 0;
+    // 时间戳：使用正序时间戳，最新的时间值最大
     const timestamp = new Date(session.lastUpdateTime || new Date()).getTime();
-    const time = 9e15 - timestamp;
     const displayName = (
       session.conRemark ||
       session.nickname ||
       ""
     ).toLowerCase();
 
-    // 格式：置顶标识|时间反转值（补齐15位）|显示名称
-    // sortKey越小，排序越靠前
-    // 最新的消息time值最小，所以排在最前面
-    const timeStr = String(Math.floor(time)).padStart(16, "0");
+    // 格式：置顶标识|时间戳（补齐15位）|显示名称
+    // 降序排序：置顶(1)在前，时间大的在前（即最新的在前），名称小的在前
+    const timeStr = String(timestamp).padStart(16, "0");
     return `${isTop}|${timeStr}|${displayName}`;
   }
 
@@ -144,7 +141,7 @@ export class MessageManager {
    */
   static async getUserSessions(userId: number): Promise<ChatSession[]> {
     try {
-      // 按sortKey降序排序查询（最新的在前面）
+      // 按sortKey降序排序查询（置顶在前，最新的在前）
       const sessions = await db.chatSessions
         .where("userId")
         .equals(userId)

From 7056e00fcc71879e8ad43fc1c4923875b42ed674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Thu, 23 Oct 2025 17:21:25 +0800
Subject: [PATCH 41/72] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E5=AE=A2=E6=88=B7=E7=8A=B6=E6=80=81=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E9=80=BB=E8=BE=91=E4=BB=A5=E6=8F=90=E5=8D=87=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BD=93=E9=AA=8C=E5=92=8C=E4=BB=A3=E7=A0=81=E5=8F=AF?=
 =?UTF-8?q?=E8=AF=BB=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/SidebarMenu/MessageList/index.tsx      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index dec222c6..9ff4cb21 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -10,6 +10,7 @@ import {
 import { useWeChatStore } from "@/store/module/weChat/weChat";
 import { useCkChatStore } from "@/store/module/ckchat/ckchat";
 import { useWebSocketStore } from "@/store/module/websocket/websocket";
+import { useCustomerStore } from "@/store/module/weChat/customer";
 import { updateConfig } from "@/pages/pc/ckbox/api";
 import { getMessageList } from "./api";
 import { dataProcessing } from "./api";
@@ -23,8 +24,8 @@ interface MessageListProps {}
 
 const MessageList: React.FC<MessageListProps> = () => {
   const { setCurrentContact, currentContract } = useWeChatStore();
-  const kfSelected = useCkChatStore(state => state.kfSelected);
   const searchKeyword = useCkChatStore(state => state.searchKeyword);
+  const { currentCustomer } = useCustomerStore();
   const { sendCommand } = useWebSocketStore();
   const { user } = useUserStore();
   const currentUserId = user?.id || 0;
@@ -392,9 +393,9 @@ const MessageList: React.FC<MessageListProps> = () => {
   useEffect(() => {
     let filtered = [...sessions];
 
-    // 根据客服筛选
-    if (kfSelected !== 0) {
-      filtered = filtered.filter(v => v.wechatAccountId === kfSelected);
+    // 根据当前选中的客服筛选
+    if (currentCustomer && currentCustomer.id !== 0) {
+      filtered = filtered.filter(v => v.wechatAccountId === currentCustomer.id);
     }
 
     // 根据搜索关键词进行模糊匹配
@@ -408,7 +409,7 @@ const MessageList: React.FC<MessageListProps> = () => {
     }
 
     setFilteredSessions(filtered);
-  }, [sessions, kfSelected, searchKeyword]);
+  }, [sessions, currentCustomer, searchKeyword]);
 
   // ==================== WebSocket消息处理 ====================
 

From 1c9f986a9766741450d2ea4f00c76c2507c9e02d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Thu, 23 Oct 2025 17:30:30 +0800
Subject: [PATCH 42/72] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=B7=B2=E8=AF=BB=E6=A0=87=E8=AE=B0=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E7=A1=AE=E4=BF=9D=E4=BB=85=E6=9B=B4=E6=96=B0=E6=9C=AA=E8=AF=BB?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E8=80=8C=E4=B8=8D=E5=BD=B1=E5=93=8D=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=92=8C=E6=8E=92=E5=BA=8F=EF=BC=8C=E6=8F=90=E5=8D=87?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ckbox/weChat/components/SidebarMenu/MessageList/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index 9ff4cb21..8ed31256 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -497,9 +497,9 @@ const MessageList: React.FC<MessageListProps> = () => {
     // 设置当前会话
     setCurrentContact(session as any, true);
 
-    // 标记为已读
+    // 标记为已读（不更新时间和排序）
     if (session.config.unreadCount > 0) {
-      // 立即更新UI
+      // 立即更新UI（只更新未读数量）
       setSessions(prev =>
         prev.map(s =>
           s.id === session.id

From 26af225fffff6a7dc2ced8d1f31ab532a929f583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Thu, 23 Oct 2025 18:00:07 +0800
Subject: [PATCH 43/72] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=80=BB=E8=BE=91=EF=BC=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=8E=92=E5=BA=8F=E9=94=AE=E7=9A=84=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A=EF=BC=8C=E6=98=8E=E7=A1=AE=E7=BD=AE=E9=A1=B6=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86=E3=80=81=E6=97=B6=E9=97=B4=E6=88=B3=E5=92=8C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=90=8D=E7=A7=B0=E7=9A=84=E5=A4=84=E7=90=86=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E6=8F=90=E5=8D=87=E4=BB=A3=E7=A0=81=E5=8F=AF?=
 =?UTF-8?q?=E8=AF=BB=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SidebarMenu/MessageList/index.tsx           | 17 ++++++++++++-----
 Touchkebao/src/utils/dbAction/message.ts        | 13 ++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index 8ed31256..41743f87 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -93,9 +93,9 @@ const MessageList: React.FC<MessageListProps> = () => {
     const newPinned = !currentPinned;
 
     try {
-      // 1. 立即更新UI（乐观更新）
-      setSessions(prev =>
-        prev.map(s =>
+      // 1. 立即更新UI并重新排序（乐观更新）
+      setSessions(prev => {
+        const updatedSessions = prev.map(s =>
           s.id === session.id
             ? {
                 ...s,
@@ -103,8 +103,15 @@ const MessageList: React.FC<MessageListProps> = () => {
                 sortKey: "", // 会重新计算
               }
             : s,
-        ),
-      );
+        );
+
+        // 重新排序
+        return updatedSessions.sort((a, b) => {
+          const aKey = MessageManager["generateSortKey"](a);
+          const bKey = MessageManager["generateSortKey"](b);
+          return bKey.localeCompare(aKey);
+        });
+      });
 
       // 2. 后台调用API
       await updateConfig({
diff --git a/Touchkebao/src/utils/dbAction/message.ts b/Touchkebao/src/utils/dbAction/message.ts
index bd5f7f97..34b883fb 100644
--- a/Touchkebao/src/utils/dbAction/message.ts
+++ b/Touchkebao/src/utils/dbAction/message.ts
@@ -52,19 +52,22 @@ export class MessageManager {
    * @returns 排序键
    */
   private static generateSortKey(session: any): string {
+    // 1. 置顶标识：置顶为1，普通为0（降序时置顶在前）
     const isTop = session.config?.top ? 1 : 0;
-    // 时间戳：使用正序时间戳，最新的时间值最大
+
+    // 2. 时间戳：直接使用时间戳，数值越大表示越新
     const timestamp = new Date(session.lastUpdateTime || new Date()).getTime();
+
+    // 3. 显示名称：用于稳定排序
     const displayName = (
       session.conRemark ||
       session.nickname ||
       ""
     ).toLowerCase();
 
-    // 格式：置顶标识|时间戳（补齐15位）|显示名称
-    // 降序排序：置顶(1)在前，时间大的在前（即最新的在前），名称小的在前
-    const timeStr = String(timestamp).padStart(16, "0");
-    return `${isTop}|${timeStr}|${displayName}`;
+    // 格式：置顶标识|时间戳|显示名称
+    // 降序排序：置顶(1)在前，时间大的在前，名称小的在前
+    return `${isTop}|${timestamp}|${displayName}`;
   }
 
   /**

From 3b36b19d016b5d6199cdfcbf0385be1ca5a3bca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Thu, 23 Oct 2025 18:56:16 +0800
Subject: [PATCH 44/72] =?UTF-8?q?=E6=9B=B4=E6=96=B0TypeScript=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=92=8CVite=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=A8=A1=E5=9D=97=E8=B7=AF=E5=BE=84=E5=88=AB=E5=90=8D?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=EF=BC=8C=E5=90=8C=E6=97=B6=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=88=9D=E5=A7=8B=E5=8C=96=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E6=8F=90=E5=8D=87=E4=BB=A3=E7=A0=81=E5=8F=AF?=
 =?UTF-8?q?=E8=AF=BB=E6=80=A7=E5=92=8C=E7=BB=93=E6=9E=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Touchkebao/src/main.tsx   | 17 ++++-------------
 Touchkebao/tsconfig.json  |  3 ++-
 Touchkebao/vite.config.ts |  1 +
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/Touchkebao/src/main.tsx b/Touchkebao/src/main.tsx
index c1fe6c20..24238f27 100644
--- a/Touchkebao/src/main.tsx
+++ b/Touchkebao/src/main.tsx
@@ -7,25 +7,16 @@ import dayjs from "dayjs";
 import "dayjs/locale/zh-cn";
 import App from "./App";
 import "./styles/global.scss";
-import { db } from "@/utils/db"; // 引入数据库实例
+import { db } from "./utils/db"; // 引入数据库实例
 
 // 设置dayjs为中文
 dayjs.locale("zh-cn");
 
 // 数据库初始化
 async function initializeApp() {
-  try {
-    // 确保数据库已打开
-    await db.open();
-
-    await db.kfUsers.clear();
-    await db.weChatGroup.clear();
-    await db.contracts.clear();
-    await db.newContractList.clear();
-  } catch (error) {
-    console.error("数据库初始化失败:", error);
-    // 可以选择显示错误提示或使用降级方案
-  }
+  // 确保数据库已打开
+  await db.open();
+  console.log("数据库初始化成功");
 
   // 渲染应用
   const root = createRoot(document.getElementById("root")!);
diff --git a/Touchkebao/tsconfig.json b/Touchkebao/tsconfig.json
index f6e4f581..5d6d8515 100644
--- a/Touchkebao/tsconfig.json
+++ b/Touchkebao/tsconfig.json
@@ -20,7 +20,8 @@
       "@/*": ["src/*"],
       "@weChatStore/*": ["src/store/module/weChat/*"],
       "@storeModule/*": ["src/store/module/*"],
-      "@apiModule/*": ["src/api/module/*"]
+      "@apiModule/*": ["src/api/module/*"],
+      "@utils/*": ["src/utils/*"]
     }
   },
   "include": ["src"]
diff --git a/Touchkebao/vite.config.ts b/Touchkebao/vite.config.ts
index 1730de58..1431a796 100644
--- a/Touchkebao/vite.config.ts
+++ b/Touchkebao/vite.config.ts
@@ -10,6 +10,7 @@ export default defineConfig({
       "@storeModule": path.resolve("src/store/module/"),
       "@weChatStore": path.resolve("src/store/module/weChat"),
       "@apiModule": path.resolve("src/api/module/"),
+      "@utils": path.resolve("src/utils/"),
     },
   },
   server: {

From dc58109829cf7d937fc89be08b21f5fa9d6ac129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Thu, 23 Oct 2025 19:56:57 +0800
Subject: [PATCH 45/72] =?UTF-8?q?=E9=87=8D=E6=9E=84=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E7=AE=A1=E7=90=86=E9=80=BB=E8=BE=91=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=81=94=E7=B3=BB=E4=BA=BA=E7=8A=B6=E6=80=81=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=92=8C=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E4=BC=98=E5=8C=96=E8=81=94=E7=B3=BB=E4=BA=BA?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6=E4=BB=A5=E6=8F=90=E5=8D=87?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=E5=92=8C=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=8F=AF=E8=AF=BB=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ProfileModules/index.tsx       |   9 +-
 .../SidebarMenu/MessageList/index.tsx         |  12 +-
 .../WechatFriends/WechatFriends.module.scss   |  70 ++-
 .../SidebarMenu/WechatFriends/extend.ts       | 255 +++++++++
 .../SidebarMenu/WechatFriends/index.tsx       | 306 +++++-----
 .../weChat/components/SidebarMenu/index.tsx   |  16 +-
 Touchkebao/src/pages/pc/ckbox/weChat/main.ts  |  69 +--
 .../src/store/module/ckchat/ckchat.data.ts    |   9 -
 Touchkebao/src/store/module/ckchat/ckchat.ts  | 259 +--------
 .../src/store/module/weChat/contacts.data.ts  |  70 +++
 .../src/store/module/weChat/contacts.ts       | 539 ++++++++++++++++++
 .../src/store/module/weChat/weChat.data.ts    |  11 -
 Touchkebao/src/store/module/weChat/weChat.ts  |  19 +-
 Touchkebao/src/utils/db.ts                    |   1 +
 Touchkebao/src/utils/dbAction/contact.ts      | 317 ++++++++++
 Touchkebao/src/utils/dbAction/loginManager.ts | 169 ++++++
 16 files changed, 1614 insertions(+), 517 deletions(-)
 create mode 100644 Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/extend.ts
 create mode 100644 Touchkebao/src/store/module/weChat/contacts.data.ts

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/ProfileCard/components/ProfileModules/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/ProfileCard/components/ProfileModules/index.tsx
index 58bb50fe..fa96bcb2 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/ProfileCard/components/ProfileModules/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/ProfileCard/components/ProfileModules/index.tsx
@@ -25,6 +25,7 @@ import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 import { useCkChatStore } from "@/store/module/ckchat/ckchat";
 import { useWebSocketStore } from "@/store/module/websocket/websocket";
 import { useWeChatStore } from "@/store/module/weChat/weChat";
+import { useContactStore } from "@/store/module/weChat/contacts";
 import { generateAiText } from "@/api/ai";
 import TwoColumnSelection from "@/components/TwoColumnSelection/TwoColumnSelection";
 import TwoColumnMemberSelection from "@/components/MemberSelection/TwoColumnMemberSelection";
@@ -212,9 +213,7 @@ const Person: React.FC<PersonProps> = ({ contract }) => {
     state.getKfUserInfo(contract.wechatAccountId || 0),
   );
 
-  const getSomeContractList = useCkChatStore(
-    state => state.getSomeContractList,
-  );
+  const { getContactsByCustomer } = useContactStore();
 
   const { sendCommand } = useWebSocketStore();
 
@@ -931,10 +930,10 @@ const Person: React.FC<PersonProps> = ({ contract }) => {
                   icon={<PlusOutlined />}
                   onClick={async () => {
                     try {
-                      const contractData = await getSomeContractList(
+                      const contractData = getContactsByCustomer(
                         contract.wechatAccountId,
                       );
-                      // 转换 ContractData[] 为 FriendSelectionItem[]
+                      // 转换 Contact[] 为 FriendSelectionItem[]
                       const friendSelectionData = (contractData || []).map(
                         item => ({
                           id: item.id || item.serverId,
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index 41743f87..ab344821 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -7,10 +7,12 @@ import {
   DeleteOutlined,
   EditOutlined,
 } from "@ant-design/icons";
-import { useWeChatStore } from "@/store/module/weChat/weChat";
-import { useCkChatStore } from "@/store/module/ckchat/ckchat";
+import { useWeChatStore } from "@weChatStore/weChat";
+import { useMessageStore } from "@weChatStore/message";
+import { useCustomerStore } from "@weChatStore/customer";
+import { useContactStore } from "@weChatStore/contacts";
 import { useWebSocketStore } from "@/store/module/websocket/websocket";
-import { useCustomerStore } from "@/store/module/weChat/customer";
+
 import { updateConfig } from "@/pages/pc/ckbox/api";
 import { getMessageList } from "./api";
 import { dataProcessing } from "./api";
@@ -18,13 +20,13 @@ import styles from "./MessageList.module.scss";
 import { formatWechatTime } from "@/utils/common";
 import { MessageManager } from "@/utils/dbAction/message";
 import { ChatSession } from "@/utils/db";
-import { useMessageStore } from "@/store/module/weChat/message";
+
 import { useUserStore } from "@/store/module/user";
 interface MessageListProps {}
 
 const MessageList: React.FC<MessageListProps> = () => {
+  const searchKeyword = useContactStore(state => state.searchKeyword);
   const { setCurrentContact, currentContract } = useWeChatStore();
-  const searchKeyword = useCkChatStore(state => state.searchKeyword);
   const { currentCustomer } = useCustomerStore();
   const { sendCommand } = useWebSocketStore();
   const { user } = useUserStore();
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/WechatFriends.module.scss b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/WechatFriends.module.scss
index 00633207..7ea6903a 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/WechatFriends.module.scss
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/WechatFriends.module.scss
@@ -44,28 +44,28 @@
   }
 
   .groupPanel {
-  background-color: transparent;
-}
+    background-color: transparent;
+  }
 
-.loadMoreContainer {
-  display: flex;
-  justify-content: center;
-  padding: 10px 0;
-}
+  .loadMoreContainer {
+    display: flex;
+    justify-content: center;
+    padding: 10px 0;
+  }
 
-.noMoreText {
-  text-align: center;
-  color: #999;
-  font-size: 12px;
-  padding: 10px 0;
-}
+  .noMoreText {
+    text-align: center;
+    color: #999;
+    font-size: 12px;
+    padding: 10px 0;
+  }
 
-.noResults {
-  text-align: center;
-  color: #999;
-  padding: 20px;
-  font-size: 14px;
-}
+  .noResults {
+    text-align: center;
+    color: #999;
+    padding: 20px;
+    font-size: 14px;
+  }
 
   .list {
     flex: 1;
@@ -119,4 +119,36 @@
     overflow: hidden;
     text-overflow: ellipsis;
   }
+
+  .groupInfo {
+    font-size: 12px;
+    color: #999;
+    margin-top: 4px;
+  }
+
+  // 骨架屏样式
+  .skeletonContainer {
+    padding: 10px;
+  }
+
+  .skeletonItem {
+    display: flex;
+    align-items: center;
+    padding: 10px 15px;
+    gap: 12px;
+  }
+
+  .skeletonInfo {
+    flex: 1;
+  }
+
+  // 刷新提示
+  .refreshingTip {
+    padding: 8px 15px;
+    background-color: #e6f7ff;
+    border-bottom: 1px solid #91d5ff;
+    color: #1890ff;
+    font-size: 12px;
+    text-align: center;
+  }
 }
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/extend.ts b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/extend.ts
new file mode 100644
index 00000000..88cf1a25
--- /dev/null
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/extend.ts
@@ -0,0 +1,255 @@
+import { Contact } from "@/utils/db";
+import { ContactManager } from "@/utils/dbAction";
+import {
+  getContactList,
+  getGroupList,
+  getLabelsListByGroup,
+} from "@/pages/pc/ckbox/weChat/api";
+import { ContactGroupByLabel } from "@/pages/pc/ckbox/data";
+
+/**
+ * 递归获取所有好友列表
+ */
+export const getAllFriends = async () => {
+  try {
+    let allFriends = [];
+    let page = 1;
+    const limit = 500;
+    let hasMore = true;
+
+    while (hasMore) {
+      const result = await getContactList({ page, limit });
+      const friendList = result?.list || [];
+
+      if (
+        !friendList ||
+        !Array.isArray(friendList) ||
+        friendList.length === 0
+      ) {
+        hasMore = false;
+        break;
+      }
+
+      allFriends = [...allFriends, ...friendList];
+
+      if (friendList.length === 0) {
+        hasMore = false;
+      } else {
+        page = page + 1;
+      }
+    }
+    return allFriends;
+  } catch (error) {
+    console.error("获取所有好友列表失败:", error);
+    return [];
+  }
+};
+
+/**
+ * 递归获取所有群组列表
+ */
+export const getAllGroups = async () => {
+  try {
+    let allGroups = [];
+    let page = 1;
+    const limit = 500;
+    let hasMore = true;
+
+    while (hasMore) {
+      const result = await getGroupList({ page, limit });
+      const groupList = result?.list || [];
+
+      if (!groupList || !Array.isArray(groupList) || groupList.length === 0) {
+        hasMore = false;
+        break;
+      }
+
+      allGroups = [...allGroups, ...groupList];
+
+      if (groupList.length < limit) {
+        hasMore = false;
+      } else {
+        // 获取最后一条数据的id作为下一次请求的page
+        const lastGroup = groupList[groupList.length - 1];
+        page = lastGroup.id;
+      }
+    }
+
+    return allGroups;
+  } catch (error) {
+    console.error("获取所有群列表失败:", error);
+    return [];
+  }
+};
+
+/**
+ * 将好友数据转换为统一的 Contact 格式
+ */
+export const convertFriendsToContacts = (
+  friends: any[],
+  userId: number,
+): Contact[] => {
+  return friends.map((friend: any) => ({
+    serverId: `friend_${friend.id}`,
+    userId,
+    id: friend.id,
+    type: "friend" as const,
+    wechatAccountId: friend.wechatAccountId,
+    wechatId: friend.wechatId,
+    nickname: friend.nickname || "",
+    conRemark: friend.conRemark || "",
+    avatar: friend.avatar || "",
+    groupId: friend.groupId, // 保留标签ID
+    lastUpdateTime: new Date().toISOString(),
+    sortKey: "",
+    searchKey: "",
+  }));
+};
+
+/**
+ * 将群组数据转换为统一的 Contact 格式
+ */
+export const convertGroupsToContacts = (
+  groups: any[],
+  userId: number,
+): Contact[] => {
+  return groups.map((group: any) => ({
+    serverId: `group_${group.id}`,
+    userId,
+    id: group.id,
+    type: "group" as const,
+    wechatAccountId: group.wechatAccountId,
+    wechatId: group.chatroomId || "",
+    nickname: group.nickname || "",
+    conRemark: group.conRemark || "",
+    avatar: group.chatroomAvatar || group.avatar || "",
+    groupId: group.groupId, // 保留标签ID
+    lastUpdateTime: new Date().toISOString(),
+    sortKey: "",
+    searchKey: "",
+  }));
+};
+
+/**
+ * 从服务器同步联系人数据
+ */
+export const syncContactsFromServer = async (userId: number) => {
+  try {
+    // 递归获取好友列表
+    const friends = await getAllFriends();
+
+    // 递归获取群组列表
+    const groups = await getAllGroups();
+
+    // 转换为统一的 Contact 格式
+    const friendContacts = convertFriendsToContacts(friends, userId);
+    const groupContacts = convertGroupsToContacts(groups, userId);
+    const allContacts = [...friendContacts, ...groupContacts];
+
+    // 同步到数据库
+    await ContactManager.syncContacts(userId, allContacts);
+
+    // 重新从数据库读取
+    const updatedContacts = await ContactManager.getUserContacts(userId);
+    return updatedContacts;
+  } catch (error) {
+    console.error("同步联系人失败:", error);
+    throw error;
+  }
+};
+
+/**
+ * 根据客服筛选联系人
+ */
+export const filterContactsByCustomer = (
+  contacts: Contact[],
+  customerId: number | undefined,
+): Contact[] => {
+  if (!customerId || customerId === 0) {
+    return contacts;
+  }
+  return contacts.filter(contact => contact.wechatAccountId === customerId);
+};
+
+/**
+ * 获取标签列表（分组列表）
+ */
+export const getCountLables = async (): Promise<ContactGroupByLabel[]> => {
+  try {
+    const result = await getLabelsListByGroup({});
+    const labelsRes = result?.list || [];
+
+    return [
+      {
+        id: 0,
+        groupName: "默认群分组",
+        groupType: 2,
+      },
+      ...labelsRes,
+      {
+        id: 0,
+        groupName: "未分组",
+        groupType: 1,
+      },
+    ];
+  } catch (error) {
+    console.error("获取标签列表失败:", error);
+    return [];
+  }
+};
+
+/**
+ * 根据标签对联系人进行分组
+ */
+export const groupContactsByLabels = (
+  contacts: Contact[],
+  labels: ContactGroupByLabel[],
+): ContactGroupByLabel[] => {
+  // 获取所有非默认标签的ID
+  const realGroupIds = labels
+    .filter(item => item.id !== 0)
+    .map(item => item.id);
+
+  const groupedData: ContactGroupByLabel[] = [];
+
+  for (const label of labels) {
+    let filteredContacts: Contact[] = [];
+
+    if (Number(label.groupType) === 1) {
+      // 好友分组
+      const friends = contacts.filter(c => c.type === "friend");
+
+      if (label.id === 0) {
+        // 未分组：不属于任何标签的好友
+        filteredContacts = friends.filter(
+          friend => !friend.groupId || !realGroupIds.includes(friend.groupId),
+        );
+      } else {
+        // 指定标签的好友
+        filteredContacts = friends.filter(
+          friend => friend.groupId === label.id,
+        );
+      }
+    } else if (Number(label.groupType) === 2) {
+      // 群组分组
+      const groups = contacts.filter(c => c.type === "group");
+
+      if (label.id === 0) {
+        // 默认群分组：不属于任何标签的群
+        filteredContacts = groups.filter(
+          group => !group.groupId || !realGroupIds.includes(group.groupId),
+        );
+      } else {
+        // 指定标签的群
+        filteredContacts = groups.filter(group => group.groupId === label.id);
+      }
+    }
+
+    groupedData.push({
+      ...label,
+      contacts: filteredContacts,
+    });
+  }
+
+  return groupedData;
+};
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx
index 76f5f981..1bfddfe0 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx
@@ -1,77 +1,134 @@
 import React, { useState, useCallback, useEffect } from "react";
-import { List, Avatar, Collapse, Button } from "antd";
+import { List, Avatar, Skeleton, Collapse } from "antd";
 import type { CollapseProps } from "antd";
 import styles from "./WechatFriends.module.scss";
+import { Contact } from "@/utils/db";
+import { ContactManager } from "@/utils/dbAction";
+import { ContactGroupByLabel } from "@/pages/pc/ckbox/data";
+import { useContactStore } from "@weChatStore/contacts";
+import { useWeChatStore } from "@weChatStore/weChat";
+import { useCustomerStore } from "@weChatStore/customer";
+import { useUserStore } from "@storeModule/user";
 import {
-  useCkChatStore,
-  searchContactsAndGroups,
-} from "@/store/module/ckchat/ckchat";
-import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
-import { addChatSession } from "@/store/module/ckchat/ckchat";
-import { useWeChatStore } from "@/store/module/weChat/weChat";
+  syncContactsFromServer,
+  filterContactsByCustomer,
+  getCountLables,
+  groupContactsByLabels,
+} from "./extend";
 
 interface WechatFriendsProps {
-  selectedContactId?: ContractData | weChatGroup;
+  selectedContactId?: Contact;
 }
 const ContactListSimple: React.FC<WechatFriendsProps> = ({
   selectedContactId,
 }) => {
-  const [newContractList, setNewContractList] = useState<any[]>([]);
-  const [searchResults, setSearchResults] = useState<
-    (ContractData | weChatGroup)[]
-  >([]);
-  const getNewContractListFn = useCkChatStore(
-    state => state.getNewContractList,
-  );
-  const kfSelected = useCkChatStore(state => state.kfSelected);
-  const countLables = useCkChatStore(state => state.countLables);
-  const searchKeyword = useCkChatStore(state => state.searchKeyword);
+  // 本地状态
+  const [contacts, setContacts] = useState<Contact[]>([]);
+  const [contactGroups, setContactGroups] = useState<ContactGroupByLabel[]>([]);
+  const [labels, setLabels] = useState<ContactGroupByLabel[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [refreshing, setRefreshing] = useState(false);
+  const [activeKey, setActiveKey] = useState<string[]>([]);
 
-  // 使用useEffect来处理异步的getNewContractList调用
+  // 使用新的 contacts store
+  const { searchResults, isSearchMode, setCurrentContact } = useContactStore();
+
+  // 获取用户和客服信息
+  const currentUser = useUserStore(state => state.user);
+  const currentCustomer = useCustomerStore(state => state.currentCustomer);
+  const { setCurrentContact: setWeChatCurrentContact } = useWeChatStore();
+
+  // 从服务器同步数据
+  const syncWithServer = useCallback(async (userId: number) => {
+    setRefreshing(true);
+
+    try {
+      const updatedContacts = await syncContactsFromServer(userId);
+      setContacts(updatedContacts);
+    } catch (error) {
+      console.error("同步联系人失败:", error);
+    } finally {
+      setRefreshing(false);
+    }
+  }, []);
+
+  // 获取标签列表
   useEffect(() => {
-    const fetchData = async () => {
+    const loadLabels = async () => {
       try {
-        if (searchKeyword.trim()) {
-          // 有搜索关键词时，获取搜索结果
-          const searchResult = await searchContactsAndGroups();
-          setSearchResults(searchResult || []);
-          setNewContractList([]);
-        } else {
-          // 无搜索关键词时，获取分组列表
-          const result = await getNewContractListFn();
-          setNewContractList(result || []);
-          setSearchResults([]);
-        }
+        const labelList = await getCountLables();
+        setLabels(labelList);
       } catch (error) {
-        console.error("获取联系人数据失败:", error);
-        setNewContractList([]);
-        setSearchResults([]);
+        console.error("获取标签列表失败:", error);
       }
     };
 
-    fetchData();
-  }, [getNewContractListFn, kfSelected, countLables, searchKeyword]);
+    loadLabels();
+  }, []);
 
-  const [activeKey, setActiveKey] = useState<string[]>([]); // 默认展开第一个分组
+  // 初始化数据加载：先读取本地数据库，再静默同步
+  useEffect(() => {
+    const loadData = async () => {
+      if (!currentUser?.id) return;
 
-  // 分页加载相关状态
-  const [visibleContacts, setVisibleContacts] = useState<{
-    [key: string]: ContractData[];
-  }>({});
-  const [loading, setLoading] = useState<{ [key: string]: boolean }>({});
-  const [hasMore, setHasMore] = useState<{ [key: string]: boolean }>({});
-  const [page, setPage] = useState<{ [key: string]: number }>({});
-  const { setCurrentContact } = useWeChatStore();
-  const onContactClick = (contact: ContractData | weChatGroup) => {
-    addChatSession(contact);
+      setLoading(true);
+
+      try {
+        // 1. 先从本地数据库加载
+        const localContacts = await ContactManager.getUserContacts(
+          currentUser.id,
+        );
+
+        if (localContacts && localContacts.length > 0) {
+          // 有本地数据，立即显示
+          setContacts(localContacts);
+          setLoading(false);
+
+          // 后台静默同步
+          syncWithServer(currentUser.id);
+        } else {
+          // 没有本地数据，从服务器获取
+          await syncWithServer(currentUser.id);
+          setLoading(false);
+        }
+      } catch (error) {
+        console.error("加载联系人数据失败:", error);
+        setLoading(false);
+      }
+    };
+
+    loadData();
+  }, [currentUser?.id, syncWithServer]);
+
+  // 根据客服筛选联系人
+  const filteredContacts = filterContactsByCustomer(
+    contacts,
+    currentCustomer?.id,
+  );
+
+  // 根据标签对联系人进行分组
+  useEffect(() => {
+    if (labels.length > 0 && filteredContacts.length > 0) {
+      const grouped = groupContactsByLabels(filteredContacts, labels);
+      setContactGroups(grouped);
+    } else {
+      setContactGroups([]);
+    }
+  }, [filteredContacts, labels]);
+
+  // 联系人点击处理
+  const onContactClick = (contact: Contact) => {
     setCurrentContact(contact);
+    // 这里需要将 Contact 转换为 weChat 需要的格式
+    // 暂时使用 any 类型，后续需要完善转换逻辑
+    setWeChatCurrentContact(contact as any);
   };
 
   // 渲染联系人项
-  const renderContactItem = (contact: ContractData | weChatGroup) => {
+  const renderContactItem = (contact: Contact) => {
     // 判断是否为群组
-    const isGroup = "chatroomId" in contact;
-    const avatar = contact.avatar || contact.chatroomAvatar;
+    const isGroup = contact.type === "group";
+    const avatar = contact.avatar;
     const name = contact.conRemark || contact.nickname;
 
     return (
@@ -83,7 +140,7 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
         <div className={styles.avatarContainer}>
           <Avatar
             src={avatar}
-            icon={!avatar && <span>{contact.nickname.charAt(0)}</span>}
+            icon={!avatar && <span>{contact.nickname?.charAt(0) || ""}</span>}
             className={styles.avatar}
           />
         </div>
@@ -95,120 +152,57 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
     );
   };
 
-  // 初始化分页数据
-  useEffect(() => {
-    if (newContractList && newContractList.length > 0) {
-      const initialVisibleContacts: { [key: string]: ContractData[] } = {};
-      const initialLoading: { [key: string]: boolean } = {};
-      const initialHasMore: { [key: string]: boolean } = {};
-      const initialPage: { [key: string]: number } = {};
-
-      newContractList.forEach((group, index) => {
-        const groupKey = index.toString();
-        // 每个分组初始加载20条数据
-        const pageSize = 20;
-        initialVisibleContacts[groupKey] = group.contacts.slice(0, pageSize);
-        initialLoading[groupKey] = false;
-        initialHasMore[groupKey] = group.contacts.length > pageSize;
-        initialPage[groupKey] = 1;
-      });
-
-      setVisibleContacts(initialVisibleContacts);
-      setLoading(initialLoading);
-      setHasMore(initialHasMore);
-      setPage(initialPage);
-    }
-  }, [newContractList]);
-
-  // 加载更多联系人
-  const loadMoreContacts = useCallback(
-    (groupKey: string) => {
-      if (loading[groupKey] || !hasMore[groupKey] || !newContractList) return;
-
-      setLoading(prev => ({ ...prev, [groupKey]: true }));
-
-      // 模拟异步加载
-      setTimeout(() => {
-        const groupIndex = parseInt(groupKey);
-        const group = newContractList[groupIndex];
-        if (!group) return;
-
-        const pageSize = 20;
-        const currentPage = page[groupKey] || 1;
-        const nextPage = currentPage + 1;
-        const startIndex = currentPage * pageSize;
-        const endIndex = nextPage * pageSize;
-        const newContacts = group.contacts.slice(startIndex, endIndex);
-
-        setVisibleContacts(prev => ({
-          ...prev,
-          [groupKey]: [...(prev[groupKey] || []), ...newContacts],
-        }));
-
-        setPage(prev => ({ ...prev, [groupKey]: nextPage }));
-        setHasMore(prev => ({
-          ...prev,
-          [groupKey]: endIndex < group.contacts.length,
-        }));
-
-        setLoading(prev => ({ ...prev, [groupKey]: false }));
-      }, 300);
-    },
-    [loading, hasMore, page, newContractList],
+  // 渲染骨架屏
+  const renderSkeleton = () => (
+    <div className={styles.skeletonContainer}>
+      {Array(10)
+        .fill(null)
+        .map((_, index) => (
+          <div key={`skeleton-${index}`} className={styles.skeletonItem}>
+            <Skeleton.Avatar active size="large" shape="circle" />
+            <div className={styles.skeletonInfo}>
+              <Skeleton.Input active size="small" style={{ width: "60%" }} />
+            </div>
+          </div>
+        ))}
+    </div>
   );
 
-  // 渲染加载更多按钮
-  const renderLoadMoreButton = (groupKey: string) => {
-    if (!hasMore[groupKey])
-      return <div className={styles.noMoreText}>没有更多了</div>;
-
-    return (
-      <div className={styles.loadMoreContainer}>
-        <Button
-          size="small"
-          loading={loading[groupKey]}
-          onClick={() => loadMoreContacts(groupKey)}
-        >
-          {loading[groupKey] ? "加载中..." : "加载更多"}
-        </Button>
-      </div>
-    );
-  };
-
-  // 构建Collapse的items属性
+  // 构建 Collapse 的 items
   const getCollapseItems = (): CollapseProps["items"] => {
-    if (!newContractList || newContractList.length === 0) return [];
+    if (!contactGroups || contactGroups.length === 0) return [];
 
-    return newContractList.map((group, index) => {
+    return contactGroups.map((group, index) => {
       const groupKey = index.toString();
-      const isActive = activeKey.includes(groupKey);
 
       return {
         key: groupKey,
         label: (
           <div className={styles.groupHeader}>
             <span>{group.groupName}</span>
-            <span className={styles.contactCount}>{group.contacts.length}</span>
+            <span className={styles.contactCount}>
+              {group.contacts?.length || 0}
+            </span>
           </div>
         ),
         className: styles.groupPanel,
-        children: isActive ? (
-          <>
-            <List
-              className={styles.list}
-              dataSource={visibleContacts[groupKey] || []}
-              renderItem={renderContactItem}
-            />
-            {renderLoadMoreButton(groupKey)}
-          </>
-        ) : null,
+        children: (
+          <List
+            className={styles.list}
+            dataSource={group.contacts || []}
+            renderItem={renderContactItem}
+          />
+        ),
       };
     });
   };
 
   return (
     <div className={styles.contractListSimple}>
-      {searchKeyword.trim() ? (
+      {loading ? (
+        // 加载状态：显示骨架屏
+        renderSkeleton()
+      ) : isSearchMode ? (
         // 搜索模式：直接显示搜索结果列表
         <>
           <div className={styles.header}>搜索结果</div>
@@ -222,13 +216,21 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
           )}
         </>
       ) : (
-        // 正常模式：显示分组
-        <Collapse
-          className={styles.groupCollapse}
-          activeKey={activeKey}
-          onChange={keys => setActiveKey(keys as string[])}
-          items={getCollapseItems()}
-        />
+        // 正常模式：显示分组列表
+        <>
+          {refreshing && (
+            <div className={styles.refreshingTip}>正在同步联系人...</div>
+          )}
+          <Collapse
+            className={styles.groupCollapse}
+            activeKey={activeKey}
+            onChange={keys => setActiveKey(keys as string[])}
+            items={getCollapseItems()}
+          />
+          {contactGroups.length === 0 && (
+            <div className={styles.noResults}>暂无联系人</div>
+          )}
+        </>
       )}
     </div>
   );
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx
index 37516986..b9b5999f 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx
@@ -5,16 +5,16 @@ import WechatFriends from "./WechatFriends";
 import MessageList from "./MessageList/index";
 import FriendsCircle from "./FriendsCicle";
 import styles from "./SidebarMenu.module.scss";
-import { useCkChatStore } from "@/store/module/ckchat/ckchat";
+import { useContactStore } from "@/store/module/weChat/contacts";
+import { useCustomerStore } from "@/store/module/weChat/customer";
 interface SidebarMenuProps {
   loading?: boolean;
 }
 
 const SidebarMenu: React.FC<SidebarMenuProps> = ({ loading = false }) => {
-  const searchKeyword = useCkChatStore(state => state.searchKeyword);
-  const setSearchKeyword = useCkChatStore(state => state.setSearchKeyword);
-  const clearSearchKeyword = useCkChatStore(state => state.clearSearchKeyword);
-  const kfSelected = useCkChatStore(state => state.kfSelected);
+  const { searchKeyword, setSearchKeyword, clearSearchKeyword } =
+    useContactStore();
+  const currentCustomer = useCustomerStore(state => state.currentCustomer);
 
   const [activeTab, setActiveTab] = useState("chats");
 
@@ -27,8 +27,8 @@ const SidebarMenu: React.FC<SidebarMenuProps> = ({ loading = false }) => {
   };
 
   useEffect(() => {
-    setActiveTab("chats");
-  }, [kfSelected]);
+    setActiveTab("contracts");
+  }, [currentCustomer]);
 
   // 渲染骨架屏
   const renderSkeleton = () => (
@@ -104,7 +104,7 @@ const SidebarMenu: React.FC<SidebarMenuProps> = ({ loading = false }) => {
         >
           <span>联系人</span>
         </div>
-        {kfSelected != 0 && (
+        {currentCustomer && currentCustomer.id !== 0 && (
           <div
             className={`${styles.tabItem} ${activeTab === "friendsCicle" ? styles.active : ""}`}
             onClick={() => setActiveTab("friendsCicle")}
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/main.ts b/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
index a74e2d28..551d85d5 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
@@ -1,5 +1,4 @@
 import {
-  asyncContractList,
   asyncChatSessions,
   asyncWeChatGroup,
   asyncCountLables,
@@ -7,6 +6,7 @@ import {
   updateIsLoadWeChat,
   getIsLoadWeChat,
 } from "@/store/module/ckchat/ckchat";
+import { useContactStore } from "@/store/module/weChat/contacts";
 import { useWebSocketStore } from "@/store/module/websocket/websocket";
 import { useUserStore } from "@/store/module/user";
 import { weChatGroupService, contractService } from "@/utils/db";
@@ -47,9 +47,10 @@ export const chatInitAPIdata = async () => {
 
       updateIsLoadWeChat(true);
     }
-    //获取联系人列表
-    await asyncContractList(contractList);
-
+    //获取联系人列表 - 使用新的 contacts store
+    // 注意：这里需要将 contractList 和 groupList 转换为统一的 Contact 格式
+    // 暂时保留旧的数据库写入逻辑，后续需要统一到 ContactManager
+    await contractService.createManyWithServerId(contractList);
     await asyncWeChatGroup(groupList);
 
     //获取标签列表
@@ -247,36 +248,6 @@ export const getAllContactList = async () => {
     return [];
   }
 };
-
-// 提取不重复的wechatAccountId组
-export const getUniqueWechatAccountIds = (
-  contacts: ContractData[],
-  groupList: weChatGroup[],
-) => {
-  if (!contacts || !Array.isArray(contacts) || contacts.length === 0) {
-    return [];
-  }
-
-  // 使用Set来存储不重复的wechatAccountId
-  const uniqueAccountIdsSet = new Set<number>();
-
-  // 遍历联系人列表，将每个wechatAccountId添加到Set中
-  contacts.forEach(contact => {
-    if (contact && contact.wechatAccountId) {
-      uniqueAccountIdsSet.add(contact.wechatAccountId);
-    }
-  });
-
-  // 遍历联系人列表，将每个wechatAccountId添加到Set中
-  groupList.forEach(group => {
-    if (group && group.wechatAccountId) {
-      uniqueAccountIdsSet.add(group.wechatAccountId);
-    }
-  });
-
-  // 将Set转换为数组并返回
-  return Array.from(uniqueAccountIdsSet);
-};
 // 递归获取所有群列表
 export const getAllGroupList = async () => {
   try {
@@ -318,3 +289,33 @@ export const getAllGroupList = async () => {
     return [];
   }
 };
+
+// 提取不重复的wechatAccountId组
+export const getUniqueWechatAccountIds = (
+  contacts: ContractData[],
+  groupList: weChatGroup[],
+) => {
+  if (!contacts || !Array.isArray(contacts) || contacts.length === 0) {
+    return [];
+  }
+
+  // 使用Set来存储不重复的wechatAccountId
+  const uniqueAccountIdsSet = new Set<number>();
+
+  // 遍历联系人列表，将每个wechatAccountId添加到Set中
+  contacts.forEach(contact => {
+    if (contact && contact.wechatAccountId) {
+      uniqueAccountIdsSet.add(contact.wechatAccountId);
+    }
+  });
+
+  // 遍历联系人列表，将每个wechatAccountId添加到Set中
+  groupList.forEach(group => {
+    if (group && group.wechatAccountId) {
+      uniqueAccountIdsSet.add(group.wechatAccountId);
+    }
+  });
+
+  // 将Set转换为数组并返回
+  return Array.from(uniqueAccountIdsSet);
+};
diff --git a/Touchkebao/src/store/module/ckchat/ckchat.data.ts b/Touchkebao/src/store/module/ckchat/ckchat.data.ts
index d406fbe7..6eb2d225 100644
--- a/Touchkebao/src/store/module/ckchat/ckchat.data.ts
+++ b/Touchkebao/src/store/module/ckchat/ckchat.data.ts
@@ -33,29 +33,20 @@ export interface CkUserInfo {
 export interface CkChatState {
   userInfo: CkUserInfo | null;
   isLoggedIn: boolean;
-  searchKeyword: string;
   isLoadWeChat: boolean;
   getIsLoadWeChat: () => boolean;
   updateIsLoadWeChat: (isLoadWeChat: boolean) => void;
-  contractList: ContractData[];
   chatSessions: any[];
   kfUserList: KfUserListData[];
   kfSelected: number;
   getKfSelectedUser: () => KfUserListData | undefined;
   countLables: ContactGroupByLabel[];
-  newContractList: ContactGroupByLabel[];
-  getContractList: () => ContractData[];
-  getSomeContractList: (kfSelected: number) => ContractData[];
-  getNewContractList: () => Promise<ContactGroupByLabel[]>;
-  setSearchKeyword: (keyword: string) => void;
-  clearSearchKeyword: () => void;
   asyncKfSelected: (data: number) => void;
   asyncWeChatGroup: (data: weChatGroup[]) => void;
   asyncCountLables: (data: ContactGroupByLabel[]) => void;
   getkfUserList: () => KfUserListData[];
   asyncKfUserList: (data: KfUserListData[]) => void;
   getKfUserInfo: (wechatAccountId: number) => KfUserListData | undefined;
-  asyncContractList: (data: ContractData[]) => void;
   getChatSessions: () => any[];
   asyncChatSessions: (data: any[]) => void;
   updateChatSession: (session: ContractData | weChatGroup) => void;
diff --git a/Touchkebao/src/store/module/ckchat/ckchat.ts b/Touchkebao/src/store/module/ckchat/ckchat.ts
index 2bd1c391..558b1c8e 100644
--- a/Touchkebao/src/store/module/ckchat/ckchat.ts
+++ b/Touchkebao/src/store/module/ckchat/ckchat.ts
@@ -17,13 +17,10 @@ export const useCkChatStore = createPersistStore<CkChatState>(
   set => ({
     userInfo: null,
     isLoggedIn: false,
-    contractList: [], //联系人列表
     chatSessions: [], //聊天会话
     kfUserList: [], //客服列表
     countLables: [], //标签列表
-    newContractList: [], //联系人分组
     kfSelected: 0, //选中的客服
-    searchKeyword: "", //搜索关键词
     isLoadWeChat: false, //是否加载微信
     getIsLoadWeChat: () => {
       return useCkChatStore.getState().isLoadWeChat;
@@ -44,27 +41,10 @@ export const useCkChatStore = createPersistStore<CkChatState>(
     // 异步设置标签列表
     asyncCountLables: async (data: ContactGroupByLabel[]) => {
       set({ countLables: data });
-      // 清除getNewContractList缓存
-      const state = useCkChatStore.getState();
-      if (
-        state.getNewContractList &&
-        typeof state.getNewContractList === "function"
-      ) {
-        // 触发缓存重新计算
-        await state.getNewContractList();
-      }
-    },
-    // 设置搜索关键词
-    setSearchKeyword: (keyword: string) => {
-      set({ searchKeyword: keyword });
-    },
-    // 清除搜索关键词
-    clearSearchKeyword: () => {
-      set({ searchKeyword: "" });
     },
     asyncKfSelected: async (data: number) => {
       set({ kfSelected: data });
-      // 清除getChatSessions、getContractList和getNewContractList缓存
+      // 清除getChatSessions缓存
       const state = useCkChatStore.getState();
       if (
         state.getChatSessions &&
@@ -73,151 +53,8 @@ export const useCkChatStore = createPersistStore<CkChatState>(
         // 触发缓存重新计算
         state.getChatSessions();
       }
-      if (
-        state.getContractList &&
-        typeof state.getContractList === "function"
-      ) {
-        // 触发缓存重新计算
-        state.getContractList();
-      }
-      if (
-        state.getNewContractList &&
-        typeof state.getNewContractList === "function"
-      ) {
-        // 触发缓存重新计算
-        await state.getNewContractList();
-      }
     },
 
-    // 获取联系人分组列表 - 使用缓存避免无限循环
-    getNewContractList: (() => {
-      let cachedResult: any = null;
-      let lastKfSelected: number | null = null;
-      let lastCountLablesLength: number = 0;
-      let lastSearchKeyword: string = "";
-
-      return async () => {
-        const state = useCkChatStore.getState();
-
-        // 检查是否需要重新计算缓存
-        const shouldRecalculate =
-          cachedResult === null ||
-          lastKfSelected !== state.kfSelected ||
-          lastCountLablesLength !== (state.countLables?.length || 0) ||
-          lastSearchKeyword !== state.searchKeyword;
-
-        if (shouldRecalculate) {
-          // 使用createContractList构建联系人分组数据
-          let contractList = await createContractList(
-            state.kfSelected,
-            state.countLables,
-          );
-
-          // 根据搜索关键词筛选联系人分组
-          if (state.searchKeyword.trim()) {
-            const keyword = state.searchKeyword.toLowerCase();
-            contractList = contractList
-              .map(group => ({
-                ...group,
-                contracts:
-                  group.contracts?.filter(item => {
-                    const nickname = (item.nickname || "").toLowerCase();
-                    const conRemark = (item.conRemark || "").toLowerCase();
-                    return (
-                      nickname.includes(keyword) || conRemark.includes(keyword)
-                    );
-                  }) || [],
-              }))
-              .filter(group => group.contracts.length > 0);
-          }
-
-          cachedResult = contractList;
-          lastKfSelected = state.kfSelected;
-          lastCountLablesLength = state.countLables?.length || 0;
-          lastSearchKeyword = state.searchKeyword;
-        }
-
-        return cachedResult;
-      };
-    })(),
-    // 搜索好友和群组的新方法 - 从本地数据库查询并返回扁平化的搜索结果
-    searchContactsAndGroups: (() => {
-      let cachedResult: (ContractData | weChatGroup)[] = [];
-      let lastKfSelected: number | null = null;
-      let lastSearchKeyword: string = "";
-
-      return async () => {
-        const state = useCkChatStore.getState();
-
-        // 检查是否需要重新计算缓存
-        const shouldRecalculate =
-          lastKfSelected !== state.kfSelected ||
-          lastSearchKeyword !== state.searchKeyword;
-
-        if (shouldRecalculate) {
-          if (state.searchKeyword.trim()) {
-            const keyword = state.searchKeyword.toLowerCase();
-
-            // 从本地数据库查询联系人数据
-            let allContacts: any[] = await contractService.findAll();
-
-            // 从本地数据库查询群组数据
-            let allGroups: any[] = await weChatGroupService.findAll();
-
-            // 根据选中的客服筛选联系人
-            if (state.kfSelected !== 0) {
-              allContacts = allContacts.filter(
-                item => item.wechatAccountId === state.kfSelected,
-              );
-            }
-
-            // 根据选中的客服筛选群组
-            if (state.kfSelected !== 0) {
-              allGroups = allGroups.filter(
-                item => item.wechatAccountId === state.kfSelected,
-              );
-            }
-
-            // 搜索匹配的联系人
-            const matchedContacts = allContacts.filter(item => {
-              const nickname = (item.nickname || "").toLowerCase();
-              const conRemark = (item.conRemark || "").toLowerCase();
-              return nickname.includes(keyword) || conRemark.includes(keyword);
-            });
-
-            // 搜索匹配的群组
-            const matchedGroups = allGroups.filter(item => {
-              const nickname = (item.nickname || "").toLowerCase();
-              const conRemark = (item.conRemark || "").toLowerCase();
-              return nickname.includes(keyword) || conRemark.includes(keyword);
-            });
-
-            // 合并搜索结果
-            cachedResult = [...matchedContacts, ...matchedGroups];
-          } else {
-            cachedResult = [];
-          }
-
-          lastKfSelected = state.kfSelected;
-          lastSearchKeyword = state.searchKeyword;
-        }
-
-        return cachedResult;
-      };
-    })(),
-    // 异步设置联系人分组列表
-    asyncNewContractList: async (data: any[]) => {
-      set({ newContractList: data });
-      // 清除getNewContractList缓存
-      const state = useCkChatStore.getState();
-      if (
-        state.getNewContractList &&
-        typeof state.getNewContractList === "function"
-      ) {
-        // 触发缓存重新计算
-        await state.getNewContractList();
-      }
-    },
     // 异步设置会话列表
     asyncChatSessions: data => {
       set({ chatSessions: data });
@@ -231,73 +68,6 @@ export const useCkChatStore = createPersistStore<CkChatState>(
         state.getChatSessions();
       }
     },
-    // 异步设置联系人列表
-    asyncContractList: async (data: ContractData[]) => {
-      set({ contractList: data });
-      await contractService.createManyWithServerId(data);
-      // 清除getContractList缓存
-      const state = useCkChatStore.getState();
-      if (
-        state.getContractList &&
-        typeof state.getContractList === "function"
-      ) {
-        // 触发缓存重新计算
-        state.getContractList();
-      }
-    },
-    //获取特定联系人
-    getSomeContractList: (kfSelected: number) => {
-      const state = useCkChatStore.getState();
-      return state.contractList.filter(
-        item => item.wechatAccountId === kfSelected,
-      );
-    },
-    // 获取联系人列表 - 使用缓存避免无限循环
-    getContractList: (() => {
-      let cachedResult: any = null;
-      let lastKfSelected: number | null = null;
-      let lastContractListLength: number = 0;
-      let lastSearchKeyword: string = "";
-
-      return () => {
-        const state = useCkChatStore.getState();
-
-        // 检查是否需要重新计算缓存
-        const shouldRecalculate =
-          cachedResult === null ||
-          lastKfSelected !== state.kfSelected ||
-          lastContractListLength !== state.contractList.length ||
-          lastSearchKeyword !== state.searchKeyword;
-
-        if (shouldRecalculate) {
-          let filteredContracts = state.contractList;
-
-          // 根据客服筛选
-          if (state.kfSelected !== 0) {
-            filteredContracts = filteredContracts.filter(
-              item => item.wechatAccountId === state.kfSelected,
-            );
-          }
-
-          // 根据搜索关键词筛选
-          if (state.searchKeyword.trim()) {
-            const keyword = state.searchKeyword.toLowerCase();
-            filteredContracts = filteredContracts.filter(item => {
-              const nickname = (item.nickname || "").toLowerCase();
-              const conRemark = (item.conRemark || "").toLowerCase();
-              return nickname.includes(keyword) || conRemark.includes(keyword);
-            });
-          }
-
-          cachedResult = filteredContracts;
-          lastKfSelected = state.kfSelected;
-          lastContractListLength = state.contractList.length;
-          lastSearchKeyword = state.searchKeyword;
-        }
-
-        return cachedResult;
-      };
-    })(),
     //异步设置联系人分组
     asyncWeChatGroup: async (data: weChatGroup[]) => {
       await weChatGroupService.createManyWithServerId(data);
@@ -341,7 +111,6 @@ export const useCkChatStore = createPersistStore<CkChatState>(
       let cachedResult: any = null;
       let lastKfSelected: number | null = null;
       let lastChatSessionsLength: number = 0;
-      let lastSearchKeyword: string = "";
 
       return () => {
         const state = useCkChatStore.getState();
@@ -350,8 +119,7 @@ export const useCkChatStore = createPersistStore<CkChatState>(
         const shouldRecalculate =
           cachedResult === null ||
           lastKfSelected !== state.kfSelected ||
-          lastChatSessionsLength !== state.chatSessions.length ||
-          lastSearchKeyword !== state.searchKeyword;
+          lastChatSessionsLength !== state.chatSessions.length;
 
         if (shouldRecalculate) {
           let filteredSessions = state.chatSessions;
@@ -363,20 +131,9 @@ export const useCkChatStore = createPersistStore<CkChatState>(
             );
           }
 
-          // 根据搜索关键词筛选
-          if (state.searchKeyword.trim()) {
-            const keyword = state.searchKeyword.toLowerCase();
-            filteredSessions = filteredSessions.filter(item => {
-              const nickname = (item.nickname || "").toLowerCase();
-              const conRemark = (item.conRemark || "").toLowerCase();
-              return nickname.includes(keyword) || conRemark.includes(keyword);
-            });
-          }
-
           cachedResult = filteredSessions;
           lastKfSelected = state.kfSelected;
           lastChatSessionsLength = state.chatSessions.length;
-          lastSearchKeyword = state.searchKeyword;
         }
 
         return cachedResult;
@@ -621,21 +378,9 @@ export const getKfSelectedUser = () =>
   useCkChatStore.getState().getKfSelectedUser();
 export const getKfUserInfo = (wechatAccountId: number) =>
   useCkChatStore.getState().getKfUserInfo(wechatAccountId);
-export const getContractList = () =>
-  useCkChatStore.getState().getContractList();
-export const getNewContractList = () =>
-  useCkChatStore.getState().getNewContractList();
 export const asyncCountLables = (data: ContactGroupByLabel[]) =>
   useCkChatStore.getState().asyncCountLables(data);
-export const asyncNewContractList = (data: any[]) =>
-  useCkChatStore.getState().asyncNewContractList(data);
 export const getCountLables = () => useCkChatStore.getState().countLables;
-export const setSearchKeyword = (keyword: string) =>
-  useCkChatStore.getState().setSearchKeyword(keyword);
-export const clearSearchKeyword = () =>
-  useCkChatStore.getState().clearSearchKeyword();
-export const searchContactsAndGroups = () =>
-  useCkChatStore.getState().searchContactsAndGroups();
 export const pinChatSessionToTop = (sessionId: number) =>
   useCkChatStore.getState().pinChatSessionToTop(sessionId);
 useCkChatStore.getState().getKfSelectedUser();
diff --git a/Touchkebao/src/store/module/weChat/contacts.data.ts b/Touchkebao/src/store/module/weChat/contacts.data.ts
new file mode 100644
index 00000000..0ef039e1
--- /dev/null
+++ b/Touchkebao/src/store/module/weChat/contacts.data.ts
@@ -0,0 +1,70 @@
+//联系人标签分组
+export interface ContactGroupByLabel {
+  id: number;
+  accountId?: number;
+  groupName: string;
+  tenantId?: number;
+  count: number;
+  [key: string]: any;
+}
+//群聊数据接口
+export interface weChatGroup {
+  id?: number;
+  wechatAccountId: number;
+  tenantId: number;
+  accountId: number;
+  chatroomId: string;
+  chatroomOwner: string;
+  conRemark: string;
+  nickname: string;
+  chatroomAvatar: string;
+  groupId: number;
+  config?: {
+    top?: false;
+    chat?: boolean;
+    unreadCount?: number;
+  };
+  labels?: string[];
+  notice: string;
+  selfDisplyName: string;
+  wechatChatroomId: number;
+  serverId?: number;
+  [key: string]: any;
+}
+
+// 联系人数据接口
+export interface ContractData {
+  id?: number;
+  serverId?: number;
+  wechatAccountId: number;
+  wechatId: string;
+  alias: string;
+  conRemark: string;
+  nickname: string;
+  quanPin: string;
+  avatar?: string;
+  gender: number;
+  region: string;
+  addFrom: number;
+  phone: string;
+  labels: string[];
+  signature: string;
+  accountId: number;
+  extendFields: null;
+  city?: string;
+  lastUpdateTime: string;
+  isPassed: boolean;
+  tenantId: number;
+  groupId: number;
+  thirdParty: null;
+  additionalPicture: string;
+  desc: string;
+  config?: {
+    chat?: boolean;
+    unreadCount: number;
+  };
+  lastMessageTime: number;
+
+  duplicate: boolean;
+  [key: string]: any;
+}
diff --git a/Touchkebao/src/store/module/weChat/contacts.ts b/Touchkebao/src/store/module/weChat/contacts.ts
index e69de29b..ca875b97 100644
--- a/Touchkebao/src/store/module/weChat/contacts.ts
+++ b/Touchkebao/src/store/module/weChat/contacts.ts
@@ -0,0 +1,539 @@
+import { create } from "zustand";
+import { persist } from "zustand/middleware";
+import { ContactGroupByLabel } from "@/pages/pc/ckbox/data";
+import { Contact } from "@/utils/db";
+import { ContactManager } from "@/utils/dbAction";
+
+/**
+ * 联系人状态管理接口
+ */
+export interface ContactState {
+  // ==================== 基础状态 ====================
+  /** 联系人列表 */
+  contactList: Contact[];
+  /** 联系人分组列表 */
+  contactGroups: ContactGroupByLabel[];
+  /** 当前选中的联系人 */
+  currentContact: Contact | null;
+  /** 搜索关键词 */
+  searchKeyword: string;
+  /** 加载状态 */
+  loading: boolean;
+  /** 刷新状态 */
+  refreshing: boolean;
+
+  // ==================== 搜索和筛选 ====================
+  /** 搜索结果 */
+  searchResults: Contact[];
+  /** 是否在搜索模式 */
+  isSearchMode: boolean;
+
+  // ==================== 分页和性能 ====================
+  /** 可见联系人（用于分页） */
+  visibleContacts: { [key: string]: Contact[] };
+  /** 加载状态（按分组） */
+  loadingStates: { [key: string]: boolean };
+  /** 是否有更多数据（按分组） */
+  hasMore: { [key: string]: boolean };
+  /** 当前页码（按分组） */
+  currentPage: { [key: string]: number };
+
+  // ==================== 转发相关 ====================
+  /** 选中的转发联系人 */
+  selectedTransmitContacts: Contact[];
+  /** 转发弹窗状态 */
+  openTransmitModal: boolean;
+
+  // ==================== 基础操作方法 ====================
+  /** 设置联系人列表 */
+  setContactList: (contacts: Contact[]) => void;
+  /** 设置联系人分组 */
+  setContactGroups: (groups: ContactGroupByLabel[]) => void;
+  /** 设置当前联系人 */
+  setCurrentContact: (contact: Contact | null) => void;
+  /** 清空当前联系人 */
+  clearCurrentContact: () => void;
+  /** 设置搜索关键词 */
+  setSearchKeyword: (keyword: string) => void;
+  /** 清空搜索关键词 */
+  clearSearchKeyword: () => void;
+  /** 设置加载状态 */
+  setLoading: (loading: boolean) => void;
+  /** 设置刷新状态 */
+  setRefreshing: (refreshing: boolean) => void;
+
+  // ==================== 搜索和筛选方法 ====================
+  /** 搜索联系人 */
+  searchContacts: (keyword: string) => Promise<void>;
+  /** 根据客服筛选联系人 */
+  filterByCustomer: (customerId: number) => Promise<void>;
+  /** 清空筛选 */
+  clearFilter: () => void;
+
+  // ==================== 数据同步方法 ====================
+  /** 从服务器同步联系人数据 */
+  syncFromServer: (userId: number) => Promise<void>;
+  /** 从本地数据库加载联系人数据 */
+  loadFromLocal: (userId: number) => Promise<void>;
+  /** 刷新联系人数据 */
+  refreshContacts: (userId: number) => Promise<void>;
+
+  // ==================== 联系人操作方法 ====================
+  /** 添加联系人 */
+  addContact: (contact: Contact) => Promise<void>;
+  /** 更新联系人 */
+  updateContact: (contact: Contact) => Promise<void>;
+  /** 删除联系人 */
+  deleteContact: (contactId: number) => Promise<void>;
+  /** 批量添加联系人 */
+  addContacts: (contacts: Contact[]) => Promise<void>;
+
+  // ==================== 分组管理方法 ====================
+  /** 获取联系人分组列表 */
+  getContactGroups: (
+    userId: number,
+    customerId?: number,
+  ) => Promise<ContactGroupByLabel[]>;
+  /** 创建联系人分组 */
+  createContactGroup: (group: Omit<ContactGroupByLabel, "id">) => Promise<void>;
+  /** 更新联系人分组 */
+  updateContactGroup: (group: ContactGroupByLabel) => Promise<void>;
+  /** 删除联系人分组 */
+  deleteContactGroup: (groupId: number) => Promise<void>;
+
+  // ==================== 分页方法 ====================
+  /** 加载更多联系人 */
+  loadMoreContacts: (groupId: string) => Promise<void>;
+  /** 重置分页状态 */
+  resetPagination: () => void;
+
+  // ==================== 转发相关方法 ====================
+  /** 设置选中的转发联系人 */
+  setSelectedTransmitContacts: (contacts: Contact[]) => void;
+  /** 添加转发联系人 */
+  addTransmitContact: (contact: Contact) => void;
+  /** 移除转发联系人 */
+  removeTransmitContact: (contactId: number) => void;
+  /** 清空转发联系人 */
+  clearTransmitContacts: () => void;
+  /** 设置转发弹窗状态 */
+  setTransmitModal: (open: boolean) => void;
+
+  // ==================== 便捷获取方法 ====================
+  /** 根据ID获取联系人 */
+  getContactById: (id: number) => Contact | undefined;
+  /** 根据客服ID获取联系人 */
+  getContactsByCustomer: (customerId: number) => Contact[];
+  /** 获取联系人总数 */
+  getContactCount: () => number;
+  /** 获取搜索结果总数 */
+  getSearchResultCount: () => number;
+}
+
+/**
+ * 联系人状态管理 Store
+ */
+export const useContactStore = create<ContactState>()(
+  persist(
+    (set, get) => ({
+      // ==================== 初始状态 ====================
+      contactList: [],
+      contactGroups: [],
+      currentContact: null,
+      searchKeyword: "",
+      loading: false,
+      refreshing: false,
+      searchResults: [],
+      isSearchMode: false,
+      visibleContacts: {},
+      loadingStates: {},
+      hasMore: {},
+      currentPage: {},
+      selectedTransmitContacts: [],
+      openTransmitModal: false,
+
+      // ==================== 基础操作方法 ====================
+      setContactList: (contacts: Contact[]) => {
+        set({ contactList: contacts });
+      },
+
+      setContactGroups: (groups: ContactGroupByLabel[]) => {
+        set({ contactGroups: groups });
+      },
+
+      setCurrentContact: (contact: Contact | null) => {
+        set({ currentContact: contact });
+      },
+
+      clearCurrentContact: () => {
+        set({ currentContact: null });
+      },
+
+      setSearchKeyword: (keyword: string) => {
+        set({ searchKeyword: keyword });
+        if (keyword.trim()) {
+          get().searchContacts(keyword);
+        } else {
+          set({ isSearchMode: false, searchResults: [] });
+        }
+      },
+
+      clearSearchKeyword: () => {
+        set({
+          searchKeyword: "",
+          isSearchMode: false,
+          searchResults: [],
+        });
+      },
+
+      setLoading: (loading: boolean) => {
+        set({ loading });
+      },
+
+      setRefreshing: (refreshing: boolean) => {
+        set({ refreshing });
+      },
+
+      // ==================== 搜索和筛选方法 ====================
+      searchContacts: async (keyword: string) => {
+        if (!keyword.trim()) {
+          set({ isSearchMode: false, searchResults: [] });
+          return;
+        }
+
+        set({ loading: true, isSearchMode: true });
+
+        try {
+          const results = await ContactManager.searchContacts(
+            get().currentContact?.userId || 0,
+            keyword,
+          );
+          set({ searchResults: results });
+        } catch (error) {
+          console.error("搜索联系人失败:", error);
+          set({ searchResults: [] });
+        } finally {
+          set({ loading: false });
+        }
+      },
+
+      filterByCustomer: async (customerId: number) => {
+        set({ loading: true });
+
+        try {
+          const contacts = await ContactManager.getContactsByCustomer(
+            get().currentContact?.userId || 0,
+            customerId,
+          );
+          set({ contactList: contacts });
+        } catch (error) {
+          console.error("按客服筛选联系人失败:", error);
+        } finally {
+          set({ loading: false });
+        }
+      },
+
+      clearFilter: () => {
+        set({
+          contactList: [],
+          searchResults: [],
+          isSearchMode: false,
+          searchKeyword: "",
+        });
+      },
+
+      // ==================== 数据同步方法 ====================
+      syncFromServer: async (userId: number) => {
+        set({ refreshing: true });
+
+        try {
+          // 这里应该调用实际的API
+          // const serverContacts = await getContactListFromServer(userId);
+          // await ContactManager.syncContacts(userId, serverContacts);
+
+          // 临时使用本地数据
+          const localContacts = await ContactManager.getUserContacts(userId);
+          set({ contactList: localContacts });
+        } catch (error) {
+          console.error("从服务器同步联系人失败:", error);
+        } finally {
+          set({ refreshing: false });
+        }
+      },
+
+      loadFromLocal: async (userId: number) => {
+        set({ loading: true });
+
+        try {
+          const contacts = await ContactManager.getUserContacts(userId);
+          set({ contactList: contacts });
+        } catch (error) {
+          console.error("从本地加载联系人失败:", error);
+        } finally {
+          set({ loading: false });
+        }
+      },
+
+      refreshContacts: async (userId: number) => {
+        await get().loadFromLocal(userId);
+        await get().syncFromServer(userId);
+      },
+
+      // ==================== 联系人操作方法 ====================
+      addContact: async (contact: Contact) => {
+        try {
+          await ContactManager.addContact(contact);
+          set(state => ({
+            contactList: [...state.contactList, contact],
+          }));
+        } catch (error) {
+          console.error("添加联系人失败:", error);
+          throw error;
+        }
+      },
+
+      updateContact: async (contact: Contact) => {
+        try {
+          await ContactManager.updateContact(contact);
+          set(state => ({
+            contactList: state.contactList.map(c =>
+              c.id === contact.id ? contact : c,
+            ),
+          }));
+        } catch (error) {
+          console.error("更新联系人失败:", error);
+          throw error;
+        }
+      },
+
+      deleteContact: async (contactId: number) => {
+        try {
+          await ContactManager.deleteContact(contactId);
+          set(state => ({
+            contactList: state.contactList.filter(c => c.id !== contactId),
+          }));
+        } catch (error) {
+          console.error("删除联系人失败:", error);
+          throw error;
+        }
+      },
+
+      addContacts: async (contacts: Contact[]) => {
+        try {
+          await ContactManager.addContacts(contacts);
+          set(state => ({
+            contactList: [...state.contactList, ...contacts],
+          }));
+        } catch (error) {
+          console.error("批量添加联系人失败:", error);
+          throw error;
+        }
+      },
+
+      // ==================== 分组管理方法 ====================
+      getContactGroups: async (userId: number, customerId?: number) => {
+        try {
+          const groups = await ContactManager.getContactGroups(
+            userId,
+            customerId,
+          );
+          set({ contactGroups: groups });
+          return groups;
+        } catch (error) {
+          console.error("获取联系人分组失败:", error);
+          return [];
+        }
+      },
+
+      createContactGroup: async (group: Omit<ContactGroupByLabel, "id">) => {
+        try {
+          await ContactManager.createContactGroup(group);
+          // 重新获取分组列表
+          await get().getContactGroups(get().currentContact?.userId || 0);
+        } catch (error) {
+          console.error("创建联系人分组失败:", error);
+          throw error;
+        }
+      },
+
+      updateContactGroup: async (group: ContactGroupByLabel) => {
+        try {
+          await ContactManager.updateContactGroup(group);
+          set(state => ({
+            contactGroups: state.contactGroups.map(g =>
+              g.id === group.id ? group : g,
+            ),
+          }));
+        } catch (error) {
+          console.error("更新联系人分组失败:", error);
+          throw error;
+        }
+      },
+
+      deleteContactGroup: async (groupId: number) => {
+        try {
+          await ContactManager.deleteContactGroup(groupId);
+          set(state => ({
+            contactGroups: state.contactGroups.filter(g => g.id !== groupId),
+          }));
+        } catch (error) {
+          console.error("删除联系人分组失败:", error);
+          throw error;
+        }
+      },
+
+      // ==================== 分页方法 ====================
+      loadMoreContacts: async (groupId: string) => {
+        const state = get();
+        if (state.loadingStates[groupId] || !state.hasMore[groupId]) {
+          return;
+        }
+
+        set(state => ({
+          loadingStates: { ...state.loadingStates, [groupId]: true },
+        }));
+
+        try {
+          const currentPage = state.currentPage[groupId] || 1;
+          const nextPage = currentPage + 1;
+          const pageSize = 20;
+
+          // 这里应该调用实际的分页API
+          // const newContacts = await getContactsByGroup(groupId, nextPage, pageSize);
+
+          // 临时使用本地数据模拟分页
+          const allContacts = state.contactList;
+          const startIndex = currentPage * pageSize;
+          const endIndex = nextPage * pageSize;
+          const newContacts = allContacts.slice(startIndex, endIndex);
+
+          set(state => ({
+            visibleContacts: {
+              ...state.visibleContacts,
+              [groupId]: [
+                ...(state.visibleContacts[groupId] || []),
+                ...newContacts,
+              ],
+            },
+            currentPage: { ...state.currentPage, [groupId]: nextPage },
+            hasMore: {
+              ...state.hasMore,
+              [groupId]: endIndex < allContacts.length,
+            },
+            loadingStates: { ...state.loadingStates, [groupId]: false },
+          }));
+        } catch (error) {
+          console.error("加载更多联系人失败:", error);
+          set(state => ({
+            loadingStates: { ...state.loadingStates, [groupId]: false },
+          }));
+        }
+      },
+
+      resetPagination: () => {
+        set({
+          visibleContacts: {},
+          loadingStates: {},
+          hasMore: {},
+          currentPage: {},
+        });
+      },
+
+      // ==================== 转发相关方法 ====================
+      setSelectedTransmitContacts: (contacts: Contact[]) => {
+        set({ selectedTransmitContacts: contacts });
+      },
+
+      addTransmitContact: (contact: Contact) => {
+        set(state => {
+          const exists = state.selectedTransmitContacts.some(
+            c => c.id === contact.id,
+          );
+          if (exists) return state;
+          return {
+            selectedTransmitContacts: [
+              ...state.selectedTransmitContacts,
+              contact,
+            ],
+          };
+        });
+      },
+
+      removeTransmitContact: (contactId: number) => {
+        set(state => ({
+          selectedTransmitContacts: state.selectedTransmitContacts.filter(
+            c => c.id !== contactId,
+          ),
+        }));
+      },
+
+      clearTransmitContacts: () => {
+        set({ selectedTransmitContacts: [] });
+      },
+
+      setTransmitModal: (open: boolean) => {
+        set({ openTransmitModal: open });
+      },
+
+      // ==================== 便捷获取方法 ====================
+      getContactById: (id: number) => {
+        const state = get();
+        return state.contactList.find(contact => contact.id === id);
+      },
+
+      getContactsByCustomer: (customerId: number) => {
+        const state = get();
+        return state.contactList.filter(
+          contact => contact.wechatAccountId === customerId,
+        );
+      },
+
+      getContactCount: () => {
+        return get().contactList.length;
+      },
+
+      getSearchResultCount: () => {
+        return get().searchResults.length;
+      },
+    }),
+    {
+      name: "contacts-storage",
+      partialize: () => ({
+        // 只持久化必要的状态，不持久化临时状态
+        contactList: [],
+        contactGroups: [],
+        currentContact: null,
+        searchKeyword: "",
+        selectedTransmitContacts: [],
+        openTransmitModal: false,
+      }),
+    },
+  ),
+);
+
+// ==================== 便捷选择器导出 ====================
+/** 获取联系人列表的 Hook */
+export const useContactList = () => useContactStore(state => state.contactList);
+/** 获取当前联系人的 Hook */
+export const useCurrentContact = () =>
+  useContactStore(state => state.currentContact);
+/** 获取搜索关键词的 Hook */
+export const useSearchKeyword = () =>
+  useContactStore(state => state.searchKeyword);
+/** 获取加载状态的 Hook */
+export const useContactLoading = () => useContactStore(state => state.loading);
+/** 获取刷新状态的 Hook */
+export const useContactRefreshing = () =>
+  useContactStore(state => state.refreshing);
+/** 获取搜索结果的 Hook */
+export const useSearchResults = () =>
+  useContactStore(state => state.searchResults);
+/** 获取是否在搜索模式的 Hook */
+export const useIsSearchMode = () =>
+  useContactStore(state => state.isSearchMode);
+/** 获取转发联系人的 Hook */
+export const useSelectedTransmitContacts = () =>
+  useContactStore(state => state.selectedTransmitContacts);
+/** 获取转发弹窗状态的 Hook */
+export const useTransmitModal = () =>
+  useContactStore(state => state.openTransmitModal);
diff --git a/Touchkebao/src/store/module/weChat/weChat.data.ts b/Touchkebao/src/store/module/weChat/weChat.data.ts
index b3f1bf2c..3a7bb10e 100644
--- a/Touchkebao/src/store/module/weChat/weChat.data.ts
+++ b/Touchkebao/src/store/module/weChat/weChat.data.ts
@@ -24,17 +24,6 @@ export interface WeChatState {
   /** 更新选中的聊天记录 */
   updateSelectedChatRecords: (message: ChatRecord[]) => void;
 
-  /** 选中的联系人或群组列表 */
-  selectedTransmitContact: ContractData[] | weChatGroup[];
-  /** 更新选中的联系人或群组 */
-  updateSelectedTransmitContact: (
-    contact: ContractData[] | weChatGroup[],
-  ) => void;
-
-  /** 转发弹窗开启状态 */
-  openTransmitModal: boolean;
-  /** 更新转发弹窗状态 */
-  updateTransmitModal: (open: boolean) => void;
   // ==================== Transmit Module =========END===========
 
   // ==================== 当前联系人管理 ====================
diff --git a/Touchkebao/src/store/module/weChat/weChat.ts b/Touchkebao/src/store/module/weChat/weChat.ts
index c1746dfc..27a2348e 100644
--- a/Touchkebao/src/store/module/weChat/weChat.ts
+++ b/Touchkebao/src/store/module/weChat/weChat.ts
@@ -59,21 +59,6 @@ export const useWeChatStore = create<WeChatState>()(
         set({ selectedChatRecords: message });
       },
 
-      /** 选中的联系人或群组列表 */
-      selectedTransmitContact: [],
-      /** 更新选中的联系人或群组 */
-      updateSelectedTransmitContact: (
-        contact: ContractData[] | weChatGroup[],
-      ) => {
-        set({ selectedTransmitContact: contact });
-      },
-
-      /** 转发弹窗开启状态 */
-      openTransmitModal: false,
-      /** 更新转发弹窗状态 */
-      updateTransmitModal: (open: boolean) => {
-        set({ openTransmitModal: open });
-      },
       // ==================== Transmit Module =========END===========
 
       // ==================== 当前联系人管理状态 ====================
@@ -159,7 +144,7 @@ export const useWeChatStore = create<WeChatState>()(
       ) => {
         const state = useWeChatStore.getState();
         // 切换联系人时清空当前消息，等待重新加载
-        set({ currentMessages: [], openTransmitModal: false });
+        set({ currentMessages: [] });
 
         const params: any = {};
 
@@ -495,7 +480,7 @@ export const useWeChatStore = create<WeChatState>()(
     }),
     {
       name: "wechat-storage",
-      partialize: state => ({
+      partialize: () => ({
         // currentContract 不做持久化，登录和页面刷新时直接清空
       }),
     },
diff --git a/Touchkebao/src/utils/db.ts b/Touchkebao/src/utils/db.ts
index 9a8559e4..407acf9b 100644
--- a/Touchkebao/src/utils/db.ts
+++ b/Touchkebao/src/utils/db.ts
@@ -87,6 +87,7 @@ export interface Contact {
   wechatId?: string; // 微信号
   alias?: string; // 别名
   gender?: number; // 性别
+  groupId?: number; // 标签ID（分组）
   region?: string; // 地区
   signature?: string; // 个性签名
   phone?: string; // 手机号
diff --git a/Touchkebao/src/utils/dbAction/contact.ts b/Touchkebao/src/utils/dbAction/contact.ts
index e69de29b..d015da45 100644
--- a/Touchkebao/src/utils/dbAction/contact.ts
+++ b/Touchkebao/src/utils/dbAction/contact.ts
@@ -0,0 +1,317 @@
+import { Contact, contactUnifiedService } from "@/utils/db";
+import { ContactGroupByLabel } from "@/pages/pc/ckbox/data";
+
+/**
+ * 联系人数据管理器
+ * 负责联系人相关的数据库操作和业务逻辑
+ */
+export class ContactManager {
+  /**
+   * 获取用户的所有联系人
+   */
+  static async getUserContacts(userId: number): Promise<Contact[]> {
+    try {
+      const contacts = await contactUnifiedService.findWhere("userId", userId);
+      return contacts;
+    } catch (error) {
+      console.error("获取用户联系人失败:", error);
+      return [];
+    }
+  }
+
+  /**
+   * 根据客服ID获取联系人
+   */
+  static async getContactsByCustomer(
+    userId: number,
+    customerId: number,
+  ): Promise<Contact[]> {
+    try {
+      const contacts = await contactUnifiedService.findWhereMultiple([
+        { field: "userId", operator: "equals", value: userId },
+        { field: "wechatAccountId", operator: "equals", value: customerId },
+      ]);
+      return contacts;
+    } catch (error) {
+      console.error("根据客服获取联系人失败:", error);
+      return [];
+    }
+  }
+
+  /**
+   * 搜索联系人
+   */
+  static async searchContacts(
+    userId: number,
+    keyword: string,
+  ): Promise<Contact[]> {
+    try {
+      const contacts = await contactUnifiedService.findWhere("userId", userId);
+      const lowerKeyword = keyword.toLowerCase();
+
+      return contacts.filter(contact => {
+        const nickname = (contact.nickname || "").toLowerCase();
+        const conRemark = (contact.conRemark || "").toLowerCase();
+        return (
+          nickname.includes(lowerKeyword) || conRemark.includes(lowerKeyword)
+        );
+      });
+    } catch (error) {
+      console.error("搜索联系人失败:", error);
+      return [];
+    }
+  }
+
+  /**
+   * 添加联系人
+   */
+  static async addContact(contact: Contact): Promise<void> {
+    try {
+      await contactUnifiedService.create(contact);
+    } catch (error) {
+      console.error("添加联系人失败:", error);
+      throw error;
+    }
+  }
+
+  /**
+   * 批量添加联系人
+   */
+  static async addContacts(contacts: Contact[]): Promise<void> {
+    try {
+      await contactUnifiedService.createMany(contacts);
+    } catch (error) {
+      console.error("批量添加联系人失败:", error);
+      throw error;
+    }
+  }
+
+  /**
+   * 更新联系人
+   */
+  static async updateContact(contact: Contact): Promise<void> {
+    try {
+      await contactUnifiedService.update(contact.serverId, contact);
+    } catch (error) {
+      console.error("更新联系人失败:", error);
+      throw error;
+    }
+  }
+
+  /**
+   * 删除联系人
+   */
+  static async deleteContact(contactId: number): Promise<void> {
+    try {
+      // 这里需要根据实际的ID字段来删除
+      // 假设contactId对应的是id字段
+      const contacts = await contactUnifiedService.findWhere("id", contactId);
+      if (contacts.length > 0) {
+        await contactUnifiedService.delete(contacts[0].serverId);
+      }
+    } catch (error) {
+      console.error("删除联系人失败:", error);
+      throw error;
+    }
+  }
+
+  /**
+   * 同步联系人数据
+   */
+  static async syncContacts(
+    userId: number,
+    serverContacts: any[],
+  ): Promise<void> {
+    try {
+      // 获取本地联系人
+      const localContacts = await this.getUserContacts(userId);
+      const localContactMap = new Map(localContacts.map(c => [c.serverId, c]));
+
+      // 处理服务器联系人
+      const contactsToAdd: Contact[] = [];
+      const contactsToUpdate: Contact[] = [];
+
+      for (const serverContact of serverContacts) {
+        const localContact = localContactMap.get(serverContact.serverId);
+
+        if (!localContact) {
+          // 新增联系人
+          contactsToAdd.push({
+            ...serverContact,
+            userId,
+            serverId: serverContact.serverId,
+            lastUpdateTime: new Date().toISOString(),
+          });
+        } else {
+          // 检查是否需要更新
+          if (this.isContactChanged(localContact, serverContact)) {
+            contactsToUpdate.push({
+              ...serverContact,
+              userId,
+              serverId: serverContact.serverId,
+              lastUpdateTime: new Date().toISOString(),
+            });
+          }
+        }
+      }
+
+      // 执行数据库操作
+      if (contactsToAdd.length > 0) {
+        await this.addContacts(contactsToAdd);
+      }
+
+      if (contactsToUpdate.length > 0) {
+        for (const contact of contactsToUpdate) {
+          await this.updateContact(contact);
+        }
+      }
+
+      console.log(
+        `同步联系人完成: 新增${contactsToAdd.length}个, 更新${contactsToUpdate.length}个`,
+      );
+    } catch (error) {
+      console.error("同步联系人失败:", error);
+      throw error;
+    }
+  }
+
+  /**
+   * 检查联系人是否发生变化
+   */
+  private static isContactChanged(local: Contact, server: any): boolean {
+    return (
+      local.nickname !== server.nickname ||
+      local.conRemark !== server.conRemark ||
+      local.avatar !== server.avatar ||
+      local.wechatAccountId !== server.wechatAccountId
+    );
+  }
+
+  /**
+   * 获取联系人分组列表
+   */
+  static async getContactGroups(
+    userId: number,
+    customerId?: number,
+  ): Promise<ContactGroupByLabel[]> {
+    try {
+      // 这里应该根据实际的标签系统来实现
+      // 暂时返回空数组，实际实现需要根据标签表来查询
+      return [];
+    } catch (error) {
+      console.error("获取联系人分组失败:", error);
+      return [];
+    }
+  }
+
+  /**
+   * 创建联系人分组
+   */
+  static async createContactGroup(
+    group: Omit<ContactGroupByLabel, "id">,
+  ): Promise<void> {
+    try {
+      // 这里应该调用标签相关的API
+      console.log("创建联系人分组:", group);
+    } catch (error) {
+      console.error("创建联系人分组失败:", error);
+      throw error;
+    }
+  }
+
+  /**
+   * 更新联系人分组
+   */
+  static async updateContactGroup(group: ContactGroupByLabel): Promise<void> {
+    try {
+      // 这里应该调用标签相关的API
+      console.log("更新联系人分组:", group);
+    } catch (error) {
+      console.error("更新联系人分组失败:", error);
+      throw error;
+    }
+  }
+
+  /**
+   * 删除联系人分组
+   */
+  static async deleteContactGroup(groupId: number): Promise<void> {
+    try {
+      // 这里应该调用标签相关的API
+      console.log("删除联系人分组:", groupId);
+    } catch (error) {
+      console.error("删除联系人分组失败:", error);
+      throw error;
+    }
+  }
+
+  /**
+   * 根据ID获取联系人
+   */
+  static async getContactById(
+    userId: number,
+    contactId: number,
+  ): Promise<Contact | null> {
+    try {
+      const contacts = await contactUnifiedService.findWhereMultiple([
+        { field: "userId", operator: "equals", value: userId },
+        { field: "id", operator: "equals", value: contactId },
+      ]);
+      return contacts.length > 0 ? contacts[0] : null;
+    } catch (error) {
+      console.error("根据ID获取联系人失败:", error);
+      return null;
+    }
+  }
+
+  /**
+   * 根据类型获取联系人
+   */
+  static async getContactsByType(
+    userId: number,
+    type: "friend" | "group",
+  ): Promise<Contact[]> {
+    try {
+      const contacts = await contactUnifiedService.findWhereMultiple([
+        { field: "userId", operator: "equals", value: userId },
+        { field: "type", operator: "equals", value: type },
+      ]);
+      return contacts;
+    } catch (error) {
+      console.error("根据类型获取联系人失败:", error);
+      return [];
+    }
+  }
+
+  /**
+   * 获取联系人统计信息
+   */
+  static async getContactStats(userId: number): Promise<{
+    total: number;
+    friends: number;
+    groups: number;
+    byCustomer: { [customerId: number]: number };
+  }> {
+    try {
+      const contacts = await this.getUserContacts(userId);
+
+      const stats = {
+        total: contacts.length,
+        friends: contacts.filter(c => c.type === "friend").length,
+        groups: contacts.filter(c => c.type === "group").length,
+        byCustomer: {} as { [customerId: number]: number },
+      };
+
+      // 按客服统计
+      contacts.forEach(contact => {
+        const customerId = contact.wechatAccountId;
+        stats.byCustomer[customerId] = (stats.byCustomer[customerId] || 0) + 1;
+      });
+
+      return stats;
+    } catch (error) {
+      console.error("获取联系人统计失败:", error);
+      return { total: 0, friends: 0, groups: 0, byCustomer: {} };
+    }
+  }
+}
diff --git a/Touchkebao/src/utils/dbAction/loginManager.ts b/Touchkebao/src/utils/dbAction/loginManager.ts
index e69de29b..fd3ed519 100644
--- a/Touchkebao/src/utils/dbAction/loginManager.ts
+++ b/Touchkebao/src/utils/dbAction/loginManager.ts
@@ -0,0 +1,169 @@
+import { UserLoginRecord, userLoginRecordService } from "@/utils/db";
+
+/**
+ * 登录管理器
+ * 负责用户登录记录相关的数据库操作和业务逻辑
+ */
+export class LoginManager {
+  /**
+   * 记录用户登录
+   */
+  static async recordLogin(userId: number): Promise<void> {
+    try {
+      const serverId = `user_${userId}`;
+      const existingRecord =
+        await userLoginRecordService.findByPrimaryKey(serverId);
+
+      if (existingRecord) {
+        // 更新已存在的记录
+        await userLoginRecordService.update(serverId, {
+          lastLoginTime: new Date().toISOString(),
+          loginCount: (existingRecord.loginCount || 0) + 1,
+          lastActiveTime: new Date().toISOString(),
+        });
+      } else {
+        // 创建新记录
+        const newRecord: UserLoginRecord = {
+          serverId,
+          userId,
+          lastLoginTime: new Date().toISOString(),
+          loginCount: 1,
+          createTime: new Date().toISOString(),
+          lastActiveTime: new Date().toISOString(),
+        };
+        await userLoginRecordService.create(newRecord);
+      }
+    } catch (error) {
+      console.error("记录用户登录失败:", error);
+      throw error;
+    }
+  }
+
+  /**
+   * 更新用户活跃时间
+   */
+  static async updateActiveTime(userId: number): Promise<void> {
+    try {
+      const serverId = `user_${userId}`;
+      await userLoginRecordService.update(serverId, {
+        lastActiveTime: new Date().toISOString(),
+      });
+    } catch (error) {
+      console.error("更新用户活跃时间失败:", error);
+    }
+  }
+
+  /**
+   * 获取用户登录记录
+   */
+  static async getLoginRecord(userId: number): Promise<UserLoginRecord | null> {
+    try {
+      const serverId = `user_${userId}`;
+      const record = await userLoginRecordService.findByPrimaryKey(serverId);
+      return record as UserLoginRecord | null;
+    } catch (error) {
+      console.error("获取用户登录记录失败:", error);
+      return null;
+    }
+  }
+
+  /**
+   * 检查用户是否是首次登录
+   */
+  static async isFirstLogin(userId: number): Promise<boolean> {
+    try {
+      const record = await this.getLoginRecord(userId);
+      return !record || record.loginCount === 0;
+    } catch (error) {
+      console.error("检查首次登录失败:", error);
+      return true;
+    }
+  }
+
+  /**
+   * 清理过期用户数据（未登录超过指定天数）
+   */
+  static async cleanupInactiveUsers(inactiveDays: number = 7): Promise<void> {
+    try {
+      const allRecords = await userLoginRecordService.findAll();
+      const currentTime = new Date().getTime();
+      const inactiveThreshold = inactiveDays * 24 * 60 * 60 * 1000;
+
+      const inactiveUserIds: number[] = [];
+
+      for (const record of allRecords) {
+        const lastActiveTime = new Date(record.lastActiveTime).getTime();
+        if (currentTime - lastActiveTime > inactiveThreshold) {
+          inactiveUserIds.push(record.userId);
+          await userLoginRecordService.delete(record.serverId);
+        }
+      }
+
+      console.log(`清理了 ${inactiveUserIds.length} 个不活跃用户的数据`);
+    } catch (error) {
+      console.error("清理不活跃用户数据失败:", error);
+    }
+  }
+
+  /**
+   * 获取所有登录记录
+   */
+  static async getAllLoginRecords(): Promise<UserLoginRecord[]> {
+    try {
+      return (await userLoginRecordService.findAll()) as UserLoginRecord[];
+    } catch (error) {
+      console.error("获取所有登录记录失败:", error);
+      return [];
+    }
+  }
+
+  /**
+   * 删除用户登录记录
+   */
+  static async deleteLoginRecord(userId: number): Promise<void> {
+    try {
+      const serverId = `user_${userId}`;
+      await userLoginRecordService.delete(serverId);
+    } catch (error) {
+      console.error("删除用户登录记录失败:", error);
+      throw error;
+    }
+  }
+
+  /**
+   * 获取用户统计信息
+   */
+  static async getUserStats(): Promise<{
+    totalUsers: number;
+    activeUsers: number;
+    inactiveUsers: number;
+  }> {
+    try {
+      const allRecords = await userLoginRecordService.findAll();
+      const currentTime = new Date().getTime();
+      const activeDays = 7;
+      const activeThreshold = activeDays * 24 * 60 * 60 * 1000;
+
+      let activeCount = 0;
+      for (const record of allRecords) {
+        const lastActiveTime = new Date(record.lastActiveTime).getTime();
+        if (currentTime - lastActiveTime <= activeThreshold) {
+          activeCount++;
+        }
+      }
+
+      return {
+        totalUsers: allRecords.length,
+        activeUsers: activeCount,
+        inactiveUsers: allRecords.length - activeCount,
+      };
+    } catch (error) {
+      console.error("获取用户统计信息失败:", error);
+      return {
+        totalUsers: 0,
+        activeUsers: 0,
+        inactiveUsers: 0,
+      };
+    }
+  }
+}

From 1f081cdddc50a22957765ad0762e02fa6bd67d5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Thu, 23 Oct 2025 20:15:59 +0800
Subject: [PATCH 46/72] =?UTF-8?q?=E9=87=8D=E6=9E=84=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E5=88=86=E7=BB=84=E9=80=BB=E8=BE=91=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=8E=B7=E5=8F=96=E5=88=86=E7=BB=84=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=92=8C=E5=88=86=E9=A1=B5=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=81=94=E7=B3=BB=E4=BA=BA=E5=88=97=E8=A1=A8=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BB=A5=E6=8F=90=E5=8D=87=E7=94=A8=E6=88=B7=E4=BD=93?=
 =?UTF-8?q?=E9=AA=8C=E5=92=8C=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB=E6=80=A7?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WechatFriends/WechatFriends.module.scss   |  26 ++
 .../SidebarMenu/WechatFriends/extend.ts       | 119 +++++++--
 .../SidebarMenu/WechatFriends/index.tsx       | 235 ++++++++++++++++--
 Touchkebao/src/utils/dbAction/contact.ts      | 111 +++++++++
 4 files changed, 446 insertions(+), 45 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/WechatFriends.module.scss b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/WechatFriends.module.scss
index 7ea6903a..75a67032 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/WechatFriends.module.scss
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/WechatFriends.module.scss
@@ -151,4 +151,30 @@
     font-size: 12px;
     text-align: center;
   }
+
+  // 分组骨架屏
+  .groupSkeleton {
+    padding: 10px;
+  }
+
+  // 加载更多按钮
+  .loadMoreBtn {
+    background: #fff;
+    border: 1px solid #d9d9d9;
+    border-radius: 4px;
+    padding: 6px 15px;
+    font-size: 14px;
+    cursor: pointer;
+    transition: all 0.3s;
+
+    &:hover:not(:disabled) {
+      color: #1890ff;
+      border-color: #1890ff;
+    }
+
+    &:disabled {
+      cursor: not-allowed;
+      opacity: 0.6;
+    }
+  }
 }
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/extend.ts b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/extend.ts
index 88cf1a25..f9a3b3c8 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/extend.ts
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/extend.ts
@@ -199,13 +199,13 @@ export const getCountLables = async (): Promise<ContactGroupByLabel[]> => {
 };
 
 /**
- * 根据标签对联系人进行分组
+ * 获取分组统计信息（只获取数量，不获取详细数据）
  */
-export const groupContactsByLabels = (
-  contacts: Contact[],
+export const getGroupStatistics = async (
+  userId: number,
   labels: ContactGroupByLabel[],
-): ContactGroupByLabel[] => {
-  // 获取所有非默认标签的ID
+  customerId?: number,
+): Promise<ContactGroupByLabel[]> => {
   const realGroupIds = labels
     .filter(item => item.id !== 0)
     .map(item => item.id);
@@ -213,43 +213,126 @@ export const groupContactsByLabels = (
   const groupedData: ContactGroupByLabel[] = [];
 
   for (const label of labels) {
-    let filteredContacts: Contact[] = [];
+    let count = 0;
 
     if (Number(label.groupType) === 1) {
       // 好友分组
-      const friends = contacts.filter(c => c.type === "friend");
-
       if (label.id === 0) {
         // 未分组：不属于任何标签的好友
-        filteredContacts = friends.filter(
-          friend => !friend.groupId || !realGroupIds.includes(friend.groupId),
+        count = await ContactManager.getContactCount(
+          userId,
+          "friend",
+          customerId,
+          realGroupIds,
+          true, // 排除已分组的
         );
       } else {
         // 指定标签的好友
-        filteredContacts = friends.filter(
-          friend => friend.groupId === label.id,
+        count = await ContactManager.getContactCount(
+          userId,
+          "friend",
+          customerId,
+          [label.id],
+          false, // 包含指定分组
         );
       }
     } else if (Number(label.groupType) === 2) {
       // 群组分组
-      const groups = contacts.filter(c => c.type === "group");
-
       if (label.id === 0) {
         // 默认群分组：不属于任何标签的群
-        filteredContacts = groups.filter(
-          group => !group.groupId || !realGroupIds.includes(group.groupId),
+        count = await ContactManager.getContactCount(
+          userId,
+          "group",
+          customerId,
+          realGroupIds,
+          true, // 排除已分组的
         );
       } else {
         // 指定标签的群
-        filteredContacts = groups.filter(group => group.groupId === label.id);
+        count = await ContactManager.getContactCount(
+          userId,
+          "group",
+          customerId,
+          [label.id],
+          false, // 包含指定分组
+        );
       }
     }
 
     groupedData.push({
       ...label,
-      contacts: filteredContacts,
+      contacts: [], // 不加载数据，只返回统计信息
+      count, // 添加统计数量
     });
   }
 
   return groupedData;
 };
+
+/**
+ * 分页获取指定分组的联系人
+ */
+export const getContactsByGroup = async (
+  userId: number,
+  label: ContactGroupByLabel,
+  realGroupIds: number[],
+  customerId?: number,
+  page: number = 1,
+  pageSize: number = 20,
+): Promise<Contact[]> => {
+  const offset = (page - 1) * pageSize;
+
+  if (Number(label.groupType) === 1) {
+    // 好友分组
+    if (label.id === 0) {
+      // 未分组的好友
+      return await ContactManager.getContactsByGroupPaginated(
+        userId,
+        "friend",
+        customerId,
+        realGroupIds,
+        true, // 排除已分组的
+        offset,
+        pageSize,
+      );
+    } else {
+      // 指定标签的好友
+      return await ContactManager.getContactsByGroupPaginated(
+        userId,
+        "friend",
+        customerId,
+        [label.id],
+        false, // 包含指定分组
+        offset,
+        pageSize,
+      );
+    }
+  } else if (Number(label.groupType) === 2) {
+    // 群组分组
+    if (label.id === 0) {
+      // 默认群分组
+      return await ContactManager.getContactsByGroupPaginated(
+        userId,
+        "group",
+        customerId,
+        realGroupIds,
+        true, // 排除已分组的
+        offset,
+        pageSize,
+      );
+    } else {
+      // 指定标签的群
+      return await ContactManager.getContactsByGroupPaginated(
+        userId,
+        "group",
+        customerId,
+        [label.id],
+        false, // 包含指定分组
+        offset,
+        pageSize,
+      );
+    }
+  }
+
+  return [];
+};
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx
index 1bfddfe0..3c0b6b36 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx
@@ -11,9 +11,9 @@ import { useCustomerStore } from "@weChatStore/customer";
 import { useUserStore } from "@storeModule/user";
 import {
   syncContactsFromServer,
-  filterContactsByCustomer,
   getCountLables,
-  groupContactsByLabels,
+  getGroupStatistics,
+  getContactsByGroup,
 } from "./extend";
 
 interface WechatFriendsProps {
@@ -22,7 +22,8 @@ interface WechatFriendsProps {
 const ContactListSimple: React.FC<WechatFriendsProps> = ({
   selectedContactId,
 }) => {
-  // 本地状态
+  // 本地状态（用于数据同步，不直接用于显示）
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const [contacts, setContacts] = useState<Contact[]>([]);
   const [contactGroups, setContactGroups] = useState<ContactGroupByLabel[]>([]);
   const [labels, setLabels] = useState<ContactGroupByLabel[]>([]);
@@ -30,6 +31,20 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
   const [refreshing, setRefreshing] = useState(false);
   const [activeKey, setActiveKey] = useState<string[]>([]);
 
+  // 分页相关状态
+  const [groupContacts, setGroupContacts] = useState<{
+    [groupKey: string]: Contact[];
+  }>({});
+  const [groupPages, setGroupPages] = useState<{ [groupKey: string]: number }>(
+    {},
+  );
+  const [groupLoading, setGroupLoading] = useState<{
+    [groupKey: string]: boolean;
+  }>({});
+  const [groupHasMore, setGroupHasMore] = useState<{
+    [groupKey: string]: boolean;
+  }>({});
+
   // 使用新的 contacts store
   const { searchResults, isSearchMode, setCurrentContact } = useContactStore();
 
@@ -100,21 +115,130 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
     loadData();
   }, [currentUser?.id, syncWithServer]);
 
-  // 根据客服筛选联系人
-  const filteredContacts = filterContactsByCustomer(
-    contacts,
-    currentCustomer?.id,
+  // 获取分组统计信息（只获取数量，不加载联系人数据）
+  useEffect(() => {
+    const loadGroupStats = async () => {
+      if (!currentUser?.id || labels.length === 0) return;
+
+      try {
+        const groupStats = await getGroupStatistics(
+          currentUser.id,
+          labels,
+          currentCustomer?.id,
+        );
+        setContactGroups(groupStats);
+      } catch (error) {
+        console.error("获取分组统计失败:", error);
+      }
+    };
+
+    loadGroupStats();
+  }, [currentUser?.id, labels, currentCustomer?.id]);
+
+  // 当分组展开时，加载该分组的第一页数据
+  const handleGroupExpand = useCallback(
+    async (groupKey: string) => {
+      const groupIndex = parseInt(groupKey);
+      const label = contactGroups[groupIndex];
+
+      if (!label || !currentUser?.id) return;
+
+      // 如果已经加载过数据，不重复加载
+      if (groupContacts[groupKey] && groupContacts[groupKey].length > 0) {
+        return;
+      }
+
+      setGroupLoading(prev => ({ ...prev, [groupKey]: true }));
+
+      try {
+        const realGroupIds = labels
+          .filter(item => item.id !== 0)
+          .map(item => item.id);
+
+        const contacts = await getContactsByGroup(
+          currentUser.id,
+          label,
+          realGroupIds,
+          currentCustomer?.id,
+          1,
+          20,
+        );
+
+        setGroupContacts(prev => ({ ...prev, [groupKey]: contacts }));
+        setGroupPages(prev => ({ ...prev, [groupKey]: 1 }));
+        setGroupHasMore(prev => ({
+          ...prev,
+          [groupKey]: contacts.length === 20,
+        }));
+      } catch (error) {
+        console.error("加载分组数据失败:", error);
+      } finally {
+        setGroupLoading(prev => ({ ...prev, [groupKey]: false }));
+      }
+    },
+    [
+      contactGroups,
+      labels,
+      currentUser?.id,
+      currentCustomer?.id,
+      groupContacts,
+    ],
   );
 
-  // 根据标签对联系人进行分组
-  useEffect(() => {
-    if (labels.length > 0 && filteredContacts.length > 0) {
-      const grouped = groupContactsByLabels(filteredContacts, labels);
-      setContactGroups(grouped);
-    } else {
-      setContactGroups([]);
-    }
-  }, [filteredContacts, labels]);
+  // 加载更多联系人
+  const handleLoadMore = useCallback(
+    async (groupKey: string) => {
+      if (groupLoading[groupKey] || !groupHasMore[groupKey]) return;
+
+      const groupIndex = parseInt(groupKey);
+      const label = contactGroups[groupIndex];
+
+      if (!label || !currentUser?.id) return;
+
+      setGroupLoading(prev => ({ ...prev, [groupKey]: true }));
+
+      try {
+        const currentPage = groupPages[groupKey] || 1;
+        const nextPage = currentPage + 1;
+
+        const realGroupIds = labels
+          .filter(item => item.id !== 0)
+          .map(item => item.id);
+
+        const newContacts = await getContactsByGroup(
+          currentUser.id,
+          label,
+          realGroupIds,
+          currentCustomer?.id,
+          nextPage,
+          20,
+        );
+
+        setGroupContacts(prev => ({
+          ...prev,
+          [groupKey]: [...(prev[groupKey] || []), ...newContacts],
+        }));
+        setGroupPages(prev => ({ ...prev, [groupKey]: nextPage }));
+        setGroupHasMore(prev => ({
+          ...prev,
+          [groupKey]: newContacts.length === 20,
+        }));
+      } catch (error) {
+        console.error("加载更多联系人失败:", error);
+      } finally {
+        setGroupLoading(prev => ({ ...prev, [groupKey]: false }));
+      }
+    },
+    [
+      contactGroups,
+      labels,
+      currentUser?.id,
+      currentCustomer?.id,
+      groupLoading,
+      groupHasMore,
+      groupPages,
+    ],
+  );
 
   // 联系人点击处理
   const onContactClick = (contact: Contact) => {
@@ -168,31 +292,88 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
     </div>
   );
 
+  // 监听分组展开/折叠事件
+  const handleCollapseChange = (keys: string | string[]) => {
+    const newKeys = Array.isArray(keys) ? keys : [keys];
+    const expandedKeys = newKeys.filter(key => !activeKey.includes(key));
+
+    // 加载新展开的分组数据
+    expandedKeys.forEach(key => {
+      handleGroupExpand(key);
+    });
+
+    setActiveKey(newKeys);
+  };
+
+  // 渲染加载更多按钮
+  const renderLoadMoreButton = (groupKey: string) => {
+    if (!groupHasMore[groupKey]) {
+      return <div className={styles.noMoreText}>没有更多了</div>;
+    }
+
+    return (
+      <div className={styles.loadMoreContainer}>
+        <button
+          className={styles.loadMoreBtn}
+          onClick={() => handleLoadMore(groupKey)}
+          disabled={groupLoading[groupKey]}
+        >
+          {groupLoading[groupKey] ? "加载中..." : "加载更多"}
+        </button>
+      </div>
+    );
+  };
+
   // 构建 Collapse 的 items
   const getCollapseItems = (): CollapseProps["items"] => {
     if (!contactGroups || contactGroups.length === 0) return [];
 
     return contactGroups.map((group, index) => {
       const groupKey = index.toString();
+      const isActive = activeKey.includes(groupKey);
 
       return {
         key: groupKey,
         label: (
           <div className={styles.groupHeader}>
             <span>{group.groupName}</span>
-            <span className={styles.contactCount}>
-              {group.contacts?.length || 0}
-            </span>
+            <span className={styles.contactCount}>{group.count || 0}</span>
           </div>
         ),
         className: styles.groupPanel,
-        children: (
-          <List
-            className={styles.list}
-            dataSource={group.contacts || []}
-            renderItem={renderContactItem}
-          />
-        ),
+        children: isActive ? (
+          <>
+            {groupLoading[groupKey] && !groupContacts[groupKey] ? (
+              // 首次加载显示骨架屏
+              <div className={styles.groupSkeleton}>
+                {Array(3)
+                  .fill(null)
+                  .map((_, i) => (
+                    <div key={`skeleton-${i}`} className={styles.skeletonItem}>
+                      <Skeleton.Avatar active size="large" shape="circle" />
+                      <div className={styles.skeletonInfo}>
+                        <Skeleton.Input
+                          active
+                          size="small"
+                          style={{ width: "60%" }}
+                        />
+                      </div>
+                    </div>
+                  ))}
+              </div>
+            ) : (
+              <>
+                <List
+                  className={styles.list}
+                  dataSource={groupContacts[groupKey] || []}
+                  renderItem={renderContactItem}
+                />
+                {(groupContacts[groupKey]?.length || 0) > 0 &&
+                  renderLoadMoreButton(groupKey)}
+              </>
+            )}
+          </>
+        ) : null,
       };
     });
   };
@@ -224,7 +405,7 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
           <Collapse
             className={styles.groupCollapse}
             activeKey={activeKey}
-            onChange={keys => setActiveKey(keys as string[])}
+            onChange={handleCollapseChange}
             items={getCollapseItems()}
           />
           {contactGroups.length === 0 && (
diff --git a/Touchkebao/src/utils/dbAction/contact.ts b/Touchkebao/src/utils/dbAction/contact.ts
index d015da45..501c6289 100644
--- a/Touchkebao/src/utils/dbAction/contact.ts
+++ b/Touchkebao/src/utils/dbAction/contact.ts
@@ -314,4 +314,115 @@ export class ContactManager {
       return { total: 0, friends: 0, groups: 0, byCustomer: {} };
     }
   }
+
+  /**
+   * 获取指定分组的联系人数量（支持数据库级别的统计）
+   */
+  static async getContactCount(
+    userId: number,
+    type: "friend" | "group",
+    customerId?: number,
+    groupIds?: number[],
+    exclude: boolean = false,
+  ): Promise<number> {
+    try {
+      const conditions: any[] = [
+        { field: "userId", operator: "equals", value: userId },
+        { field: "type", operator: "equals", value: type },
+      ];
+
+      // 客服筛选
+      if (customerId && customerId !== 0) {
+        conditions.push({
+          field: "wechatAccountId",
+          operator: "equals",
+          value: customerId,
+        });
+      }
+
+      // 分组筛选
+      if (groupIds && groupIds.length > 0) {
+        if (exclude) {
+          // 排除指定分组（未分组）
+          conditions.push({
+            field: "groupId",
+            operator: "notIn",
+            value: groupIds,
+          });
+        } else {
+          // 包含指定分组
+          conditions.push({
+            field: "groupId",
+            operator: "in",
+            value: groupIds,
+          });
+        }
+      }
+
+      const contacts =
+        await contactUnifiedService.findWhereMultiple(conditions);
+      return contacts.length;
+    } catch (error) {
+      console.error("获取联系人数量失败:", error);
+      return 0;
+    }
+  }
+
+  /**
+   * 分页获取指定分组的联系人
+   */
+  static async getContactsByGroupPaginated(
+    userId: number,
+    type: "friend" | "group",
+    customerId?: number,
+    groupIds?: number[],
+    exclude: boolean = false,
+    offset: number = 0,
+    limit: number = 20,
+  ): Promise<Contact[]> {
+    try {
+      const conditions: any[] = [
+        { field: "userId", operator: "equals", value: userId },
+        { field: "type", operator: "equals", value: type },
+      ];
+
+      // 客服筛选
+      if (customerId && customerId !== 0) {
+        conditions.push({
+          field: "wechatAccountId",
+          operator: "equals",
+          value: customerId,
+        });
+      }
+
+      // 分组筛选
+      if (groupIds && groupIds.length > 0) {
+        if (exclude) {
+          // 排除指定分组（未分组）
+          conditions.push({
+            field: "groupId",
+            operator: "notIn",
+            value: groupIds,
+          });
+        } else {
+          // 包含指定分组
+          conditions.push({
+            field: "groupId",
+            operator: "in",
+            value: groupIds,
+          });
+        }
+      }
+
+      // 查询数据
+      const allContacts =
+        await contactUnifiedService.findWhereMultiple(conditions);
+
+      // 手动分页（IndexedDB 不支持原生的 offset/limit）
+      return allContacts.slice(offset, offset + limit);
+    } catch (error) {
+      console.error("分页获取联系人失败:", error);
+      return [];
+    }
+  }
 }

From 8941b87e0305fef8bc1111f3e8deb57f6d77a38d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Thu, 23 Oct 2025 20:18:45 +0800
Subject: [PATCH 47/72] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E7=8A=B6=E6=80=81=E6=8F=90=E7=A4=BA=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E6=8F=90=E5=8D=87=E7=94=A8=E6=88=B7=E4=BD=93?=
 =?UTF-8?q?=E9=AA=8C=E5=92=8C=E5=8F=AF=E8=AF=BB=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MessageList/MessageList.module.scss       | 23 ++++++++-----------
 .../SidebarMenu/MessageList/index.tsx         |  4 +---
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss
index 0bed38fc..4e93b88c 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss
@@ -171,20 +171,6 @@
     }
   }
 
-  // 同步状态提示
-  .refreshIndicator {
-    padding: 8px;
-    text-align: center;
-    font-size: 12px;
-    color: #999;
-    background: #f5f5f5;
-    border-bottom: 1px solid #e8e8e8;
-
-    :global(.ant-spin) {
-      margin-right: 6px;
-    }
-  }
-
   // 加载状态
   .loading {
     padding: 16px;
@@ -192,3 +178,12 @@
     color: #999;
   }
 }
+// 刷新提示
+.refreshingTip {
+  padding: 8px 15px;
+  background-color: #e6f7ff;
+  border-bottom: 1px solid #91d5ff;
+  color: #1890ff;
+  font-size: 12px;
+  text-align: center;
+}
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index ab344821..73b083dc 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -526,9 +526,7 @@ const MessageList: React.FC<MessageListProps> = () => {
     <div className={styles.messageList}>
       {loading && <div className={styles.loading}>加载中...</div>}
       {refreshing && !loading && (
-        <div className={styles.refreshIndicator}>
-          <Spin size="small" /> 正在同步...
-        </div>
+        <div className={styles.refreshingTip}>正在同步消息...</div>
       )}
 
       <List

From 3b82908e8af7ebedfba71f25a2a5aa8d3a6d175b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Thu, 23 Oct 2025 20:42:29 +0800
Subject: [PATCH 48/72] =?UTF-8?q?=E9=87=8D=E6=9E=84SidebarMenu=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81?=
 =?UTF-8?q?=E7=9A=84useEffect=EF=BC=8C=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=92=8C=E8=81=94=E7=B3=BB=E4=BA=BA=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=8A=A0=E8=BD=BD=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=A0=B7=E5=BC=8F=E6=96=87=E4=BB=B6=E4=BB=A5?=
 =?UTF-8?q?=E6=8F=90=E5=8D=87=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB=E6=80=A7?=
 =?UTF-8?q?=E5=92=8C=E7=BB=B4=E6=8A=A4=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...essageList.module.scss => com.module.scss} |  24 ++
 .../SidebarMenu/MessageList/index.tsx         | 272 ++++++++++--------
 ...hatFriends.module.scss => com.module.scss} |   0
 .../SidebarMenu/WechatFriends/index.tsx       | 166 +++++------
 .../weChat/components/SidebarMenu/index.tsx   |   8 +-
 .../src/store/module/weChat/message.data.ts   |   6 +
 Touchkebao/src/store/module/weChat/message.ts |  22 ++
 Touchkebao/src/utils/filter.ts                |   1 +
 8 files changed, 296 insertions(+), 203 deletions(-)
 rename Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/{MessageList.module.scss => com.module.scss} (90%)
 rename Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/{WechatFriends.module.scss => com.module.scss} (100%)
 create mode 100644 Touchkebao/src/utils/filter.ts

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/com.module.scss
similarity index 90%
rename from Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss
rename to Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/com.module.scss
index 4e93b88c..77c9db24 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/MessageList.module.scss
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/com.module.scss
@@ -187,3 +187,27 @@
   font-size: 12px;
   text-align: center;
 }
+
+// 骨架屏样式
+.skeletonContainer {
+  padding: 10px;
+}
+
+.skeletonItem {
+  display: flex;
+  align-items: flex-start;
+  padding: 12px 16px;
+  gap: 12px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.skeletonContent {
+  flex: 1;
+}
+
+.skeletonHeader {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 8px;
+}
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index 73b083dc..039b7154 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState, useRef } from "react";
-import { List, Avatar, Badge, Modal, Input, message, Spin } from "antd";
+import { List, Avatar, Badge, Modal, Input, message, Skeleton } from "antd";
 import {
   UserOutlined,
   TeamOutlined,
@@ -7,21 +7,19 @@ import {
   DeleteOutlined,
   EditOutlined,
 } from "@ant-design/icons";
+import styles from "./com.module.scss";
 import { useWeChatStore } from "@weChatStore/weChat";
 import { useMessageStore } from "@weChatStore/message";
 import { useCustomerStore } from "@weChatStore/customer";
 import { useContactStore } from "@weChatStore/contacts";
 import { useWebSocketStore } from "@/store/module/websocket/websocket";
-
 import { updateConfig } from "@/pages/pc/ckbox/api";
-import { getMessageList } from "./api";
-import { dataProcessing } from "./api";
-import styles from "./MessageList.module.scss";
+import { getMessageList, dataProcessing } from "./api";
 import { formatWechatTime } from "@/utils/common";
 import { MessageManager } from "@/utils/dbAction/message";
 import { ChatSession } from "@/utils/db";
-
 import { useUserStore } from "@/store/module/user";
+
 interface MessageListProps {}
 
 const MessageList: React.FC<MessageListProps> = () => {
@@ -33,8 +31,13 @@ const MessageList: React.FC<MessageListProps> = () => {
   const currentUserId = user?.id || 0;
 
   // Store状态
-  const { loading, refreshing, refreshTrigger, setLoading, setRefreshing } =
-    useMessageStore();
+  const {
+    loading,
+    refreshTrigger,
+    hasLoadedOnce,
+    setLoading,
+    setHasLoadedOnce,
+  } = useMessageStore();
 
   // 组件内部状态：会话列表数据
   const [sessions, setSessions] = useState<ChatSession[]>([]);
@@ -346,6 +349,18 @@ const MessageList: React.FC<MessageListProps> = () => {
     const initializeSessions = async () => {
       if (!currentUserId) return;
 
+      // 如果已经加载过一次，只从本地数据库读取，不请求接口
+      if (hasLoadedOnce) {
+        try {
+          const cachedSessions =
+            await MessageManager.getUserSessions(currentUserId);
+          setSessions(cachedSessions);
+        } catch (error) {
+          console.error("从本地加载会话列表失败:", error);
+        }
+        return;
+      }
+
       setLoading(true);
 
       try {
@@ -358,9 +373,9 @@ const MessageList: React.FC<MessageListProps> = () => {
           setSessions(cachedSessions);
           setLoading(false);
 
-          // 2. 后台静默同步
-          setRefreshing(true);
+          // 2. 后台静默同步（不显示同步提示）
           await syncWithServer();
+          setHasLoadedOnce(true); // 标记已加载过
         } else {
           // 无缓存，直接API加载
           await syncWithServer();
@@ -368,12 +383,11 @@ const MessageList: React.FC<MessageListProps> = () => {
             await MessageManager.getUserSessions(currentUserId);
           setSessions(newSessions);
           setLoading(false);
+          setHasLoadedOnce(true); // 标记已加载过
         }
       } catch (error) {
         console.error("初始化会话列表失败:", error);
         setLoading(false);
-      } finally {
-        setRefreshing(false);
       }
     };
 
@@ -522,117 +536,147 @@ const MessageList: React.FC<MessageListProps> = () => {
     }
   };
 
+  // 渲染骨架屏
+  const renderSkeleton = () => (
+    <div className={styles.skeletonContainer}>
+      {Array(8)
+        .fill(null)
+        .map((_, index) => (
+          <div key={`skeleton-${index}`} className={styles.skeletonItem}>
+            <Skeleton.Avatar active size={48} shape="circle" />
+            <div className={styles.skeletonContent}>
+              <div className={styles.skeletonHeader}>
+                <Skeleton.Input active size="small" style={{ width: "40%" }} />
+                <Skeleton.Input active size="small" style={{ width: "20%" }} />
+              </div>
+              <Skeleton.Input
+                active
+                size="small"
+                style={{ width: "70%", marginTop: "8px" }}
+              />
+            </div>
+          </div>
+        ))}
+    </div>
+  );
+
   return (
     <div className={styles.messageList}>
-      {loading && <div className={styles.loading}>加载中...</div>}
-      {refreshing && !loading && (
-        <div className={styles.refreshingTip}>正在同步消息...</div>
-      )}
-
-      <List
-        dataSource={filteredSessions as any[]}
-        renderItem={session => (
-          <List.Item
-            key={session.id}
-            className={`${styles.messageItem} ${
-              currentContract?.id === session.id ? styles.active : ""
-            } ${(session.config as any)?.top ? styles.pinned : ""}`}
-            onClick={() => onContactClick(session)}
-            onContextMenu={e => handleContextMenu(e, session)}
-          >
-            <div className={styles.messageInfo}>
-              <Badge count={session.config.unreadCount || 0} size="small">
-                <Avatar
-                  size={48}
-                  src={session.avatar || session.chatroomAvatar}
-                  icon={
-                    session?.type === "group" ? (
-                      <TeamOutlined />
-                    ) : (
-                      <UserOutlined />
-                    )
-                  }
-                />
-              </Badge>
-              <div className={styles.messageDetails}>
-                <div className={styles.messageHeader}>
-                  <div className={styles.messageName}>
-                    {session.conRemark || session.nickname || session.wechatId}
-                  </div>
-                  <div className={styles.messageTime}>
-                    {formatWechatTime(session?.lastUpdateTime)}
+      {loading ? (
+        // 加载状态：显示骨架屏
+        renderSkeleton()
+      ) : (
+        <>
+          <List
+            dataSource={filteredSessions as any[]}
+            renderItem={session => (
+              <List.Item
+                key={session.id}
+                className={`${styles.messageItem} ${
+                  currentContract?.id === session.id ? styles.active : ""
+                } ${(session.config as any)?.top ? styles.pinned : ""}`}
+                onClick={() => onContactClick(session)}
+                onContextMenu={e => handleContextMenu(e, session)}
+              >
+                <div className={styles.messageInfo}>
+                  <Badge count={session.config.unreadCount || 0} size="small">
+                    <Avatar
+                      size={48}
+                      src={session.avatar || session.chatroomAvatar}
+                      icon={
+                        session?.type === "group" ? (
+                          <TeamOutlined />
+                        ) : (
+                          <UserOutlined />
+                        )
+                      }
+                    />
+                  </Badge>
+                  <div className={styles.messageDetails}>
+                    <div className={styles.messageHeader}>
+                      <div className={styles.messageName}>
+                        {session.conRemark ||
+                          session.nickname ||
+                          session.wechatId}
+                      </div>
+                      <div className={styles.messageTime}>
+                        {formatWechatTime(session?.lastUpdateTime)}
+                      </div>
+                    </div>
+                    <div className={styles.messageContent}>
+                      {session.content}
+                    </div>
                   </div>
                 </div>
-                <div className={styles.messageContent}>{session.content}</div>
+              </List.Item>
+            )}
+          />
+
+          {/* 右键菜单 */}
+          {contextMenu.visible && contextMenu.session && (
+            <div
+              ref={contextMenuRef}
+              className={styles.contextMenu}
+              style={{
+                position: "fixed",
+                left: contextMenu.x,
+                top: contextMenu.y,
+                zIndex: 1000,
+              }}
+            >
+              <div
+                className={styles.menuItem}
+                onClick={() => handleTogglePin(contextMenu.session!)}
+              >
+                <PushpinOutlined />
+                {(contextMenu.session.config as any)?.top ? "取消置顶" : "置顶"}
+              </div>
+              <div
+                className={styles.menuItem}
+                onClick={() => handleEditRemark(contextMenu.session!)}
+              >
+                <EditOutlined />
+                修改备注
+              </div>
+              <div
+                className={styles.menuItem}
+                onClick={() => handleDelete(contextMenu.session!)}
+              >
+                <DeleteOutlined />
+                删除
               </div>
             </div>
-          </List.Item>
-        )}
-      />
+          )}
 
-      {/* 右键菜单 */}
-      {contextMenu.visible && contextMenu.session && (
-        <div
-          ref={contextMenuRef}
-          className={styles.contextMenu}
-          style={{
-            position: "fixed",
-            left: contextMenu.x,
-            top: contextMenu.y,
-            zIndex: 1000,
-          }}
-        >
-          <div
-            className={styles.menuItem}
-            onClick={() => handleTogglePin(contextMenu.session!)}
+          {/* 修改备注Modal */}
+          <Modal
+            title="修改备注"
+            open={editRemarkModal.visible}
+            onOk={handleSaveRemark}
+            onCancel={() =>
+              setEditRemarkModal({
+                visible: false,
+                session: null,
+                remark: "",
+              })
+            }
+            okText="保存"
+            cancelText="取消"
           >
-            <PushpinOutlined />
-            {(contextMenu.session.config as any)?.top ? "取消置顶" : "置顶"}
-          </div>
-          <div
-            className={styles.menuItem}
-            onClick={() => handleEditRemark(contextMenu.session!)}
-          >
-            <EditOutlined />
-            修改备注
-          </div>
-          <div
-            className={styles.menuItem}
-            onClick={() => handleDelete(contextMenu.session!)}
-          >
-            <DeleteOutlined />
-            删除
-          </div>
-        </div>
+            <Input
+              value={editRemarkModal.remark}
+              onChange={e =>
+                setEditRemarkModal(prev => ({
+                  ...prev,
+                  remark: e.target.value,
+                }))
+              }
+              placeholder="请输入备注"
+              maxLength={20}
+            />
+          </Modal>
+        </>
       )}
-
-      {/* 修改备注Modal */}
-      <Modal
-        title="修改备注"
-        open={editRemarkModal.visible}
-        onOk={handleSaveRemark}
-        onCancel={() =>
-          setEditRemarkModal({
-            visible: false,
-            session: null,
-            remark: "",
-          })
-        }
-        okText="保存"
-        cancelText="取消"
-      >
-        <Input
-          value={editRemarkModal.remark}
-          onChange={e =>
-            setEditRemarkModal(prev => ({
-              ...prev,
-              remark: e.target.value,
-            }))
-          }
-          placeholder="请输入备注"
-          maxLength={20}
-        />
-      </Modal>
     </div>
   );
 };
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/WechatFriends.module.scss b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/com.module.scss
similarity index 100%
rename from Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/WechatFriends.module.scss
rename to Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/com.module.scss
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx
index 3c0b6b36..961f5e80 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useCallback, useEffect } from "react";
 import { List, Avatar, Skeleton, Collapse } from "antd";
 import type { CollapseProps } from "antd";
-import styles from "./WechatFriends.module.scss";
+import styles from "./com.module.scss";
 import { Contact } from "@/utils/db";
 import { ContactManager } from "@/utils/dbAction";
 import { ContactGroupByLabel } from "@/pages/pc/ckbox/data";
@@ -22,28 +22,24 @@ interface WechatFriendsProps {
 const ContactListSimple: React.FC<WechatFriendsProps> = ({
   selectedContactId,
 }) => {
-  // 本地状态（用于数据同步，不直接用于显示）
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const [contacts, setContacts] = useState<Contact[]>([]);
+  // 基础状态
   const [contactGroups, setContactGroups] = useState<ContactGroupByLabel[]>([]);
   const [labels, setLabels] = useState<ContactGroupByLabel[]>([]);
   const [loading, setLoading] = useState(false);
-  const [refreshing, setRefreshing] = useState(false);
   const [activeKey, setActiveKey] = useState<string[]>([]);
 
-  // 分页相关状态
-  const [groupContacts, setGroupContacts] = useState<{
-    [groupKey: string]: Contact[];
-  }>({});
-  const [groupPages, setGroupPages] = useState<{ [groupKey: string]: number }>(
-    {},
-  );
-  const [groupLoading, setGroupLoading] = useState<{
-    [groupKey: string]: boolean;
-  }>({});
-  const [groupHasMore, setGroupHasMore] = useState<{
-    [groupKey: string]: boolean;
-  }>({});
+  // 分页相关状态（合并为对象，减少状态数量）
+  const [groupData, setGroupData] = useState<{
+    contacts: { [groupKey: string]: Contact[] };
+    pages: { [groupKey: string]: number };
+    loading: { [groupKey: string]: boolean };
+    hasMore: { [groupKey: string]: boolean };
+  }>({
+    contacts: {},
+    pages: {},
+    loading: {},
+    hasMore: {},
+  });
 
   // 使用新的 contacts store
   const { searchResults, isSearchMode, setCurrentContact } = useContactStore();
@@ -53,19 +49,26 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
   const currentCustomer = useCustomerStore(state => state.currentCustomer);
   const { setCurrentContact: setWeChatCurrentContact } = useWeChatStore();
 
-  // 从服务器同步数据
-  const syncWithServer = useCallback(async (userId: number) => {
-    setRefreshing(true);
-
-    try {
-      const updatedContacts = await syncContactsFromServer(userId);
-      setContacts(updatedContacts);
-    } catch (error) {
-      console.error("同步联系人失败:", error);
-    } finally {
-      setRefreshing(false);
-    }
-  }, []);
+  // 从服务器同步数据（静默同步，不显示提示）
+  const syncWithServer = useCallback(
+    async (userId: number) => {
+      try {
+        await syncContactsFromServer(userId);
+        // 同步完成后，重新加载分组统计
+        if (labels.length > 0) {
+          const groupStats = await getGroupStatistics(
+            userId,
+            labels,
+            currentCustomer?.id,
+          );
+          setContactGroups(groupStats);
+        }
+      } catch (error) {
+        console.error("同步联系人失败:", error);
+      }
+    },
+    [labels, currentCustomer?.id],
+  );
 
   // 获取标签列表
   useEffect(() => {
@@ -86,23 +89,19 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
     const loadData = async () => {
       if (!currentUser?.id) return;
 
-      setLoading(true);
-
       try {
-        // 1. 先从本地数据库加载
+        // 检查本地数据库是否有数据
         const localContacts = await ContactManager.getUserContacts(
           currentUser.id,
         );
 
         if (localContacts && localContacts.length > 0) {
-          // 有本地数据，立即显示
-          setContacts(localContacts);
-          setLoading(false);
-
+          // 有本地数据，直接显示（不显示 loading）
           // 后台静默同步
           syncWithServer(currentUser.id);
         } else {
-          // 没有本地数据，从服务器获取
+          // 没有本地数据，显示骨架屏并从服务器获取
+          setLoading(true);
           await syncWithServer(currentUser.id);
           setLoading(false);
         }
@@ -144,11 +143,13 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
       if (!label || !currentUser?.id) return;
 
       // 如果已经加载过数据，不重复加载
-      if (groupContacts[groupKey] && groupContacts[groupKey].length > 0) {
-        return;
-      }
+      if (groupData.contacts[groupKey]?.length > 0) return;
 
-      setGroupLoading(prev => ({ ...prev, [groupKey]: true }));
+      // 设置加载状态
+      setGroupData(prev => ({
+        ...prev,
+        loading: { ...prev.loading, [groupKey]: true },
+      }));
 
       try {
         const realGroupIds = labels
@@ -164,16 +165,19 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
           20,
         );
 
-        setGroupContacts(prev => ({ ...prev, [groupKey]: contacts }));
-        setGroupPages(prev => ({ ...prev, [groupKey]: 1 }));
-        setGroupHasMore(prev => ({
-          ...prev,
-          [groupKey]: contacts.length === 20,
+        // 更新分组数据
+        setGroupData(prev => ({
+          contacts: { ...prev.contacts, [groupKey]: contacts },
+          pages: { ...prev.pages, [groupKey]: 1 },
+          loading: { ...prev.loading, [groupKey]: false },
+          hasMore: { ...prev.hasMore, [groupKey]: contacts.length === 20 },
         }));
       } catch (error) {
         console.error("加载分组数据失败:", error);
-      } finally {
-        setGroupLoading(prev => ({ ...prev, [groupKey]: false }));
+        setGroupData(prev => ({
+          ...prev,
+          loading: { ...prev.loading, [groupKey]: false },
+        }));
       }
     },
     [
@@ -181,24 +185,28 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
       labels,
       currentUser?.id,
       currentCustomer?.id,
-      groupContacts,
+      groupData.contacts,
     ],
   );
 
   // 加载更多联系人
   const handleLoadMore = useCallback(
     async (groupKey: string) => {
-      if (groupLoading[groupKey] || !groupHasMore[groupKey]) return;
+      if (groupData.loading[groupKey] || !groupData.hasMore[groupKey]) return;
 
       const groupIndex = parseInt(groupKey);
       const label = contactGroups[groupIndex];
 
       if (!label || !currentUser?.id) return;
 
-      setGroupLoading(prev => ({ ...prev, [groupKey]: true }));
+      // 设置加载状态
+      setGroupData(prev => ({
+        ...prev,
+        loading: { ...prev.loading, [groupKey]: true },
+      }));
 
       try {
-        const currentPage = groupPages[groupKey] || 1;
+        const currentPage = groupData.pages[groupKey] || 1;
         const nextPage = currentPage + 1;
 
         const realGroupIds = labels
@@ -214,30 +222,25 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
           20,
         );
 
-        setGroupContacts(prev => ({
-          ...prev,
-          [groupKey]: [...(prev[groupKey] || []), ...newContacts],
-        }));
-        setGroupPages(prev => ({ ...prev, [groupKey]: nextPage }));
-        setGroupHasMore(prev => ({
-          ...prev,
-          [groupKey]: newContacts.length === 20,
+        // 更新分组数据
+        setGroupData(prev => ({
+          contacts: {
+            ...prev.contacts,
+            [groupKey]: [...(prev.contacts[groupKey] || []), ...newContacts],
+          },
+          pages: { ...prev.pages, [groupKey]: nextPage },
+          loading: { ...prev.loading, [groupKey]: false },
+          hasMore: { ...prev.hasMore, [groupKey]: newContacts.length === 20 },
         }));
       } catch (error) {
         console.error("加载更多联系人失败:", error);
-      } finally {
-        setGroupLoading(prev => ({ ...prev, [groupKey]: false }));
+        setGroupData(prev => ({
+          ...prev,
+          loading: { ...prev.loading, [groupKey]: false },
+        }));
       }
     },
-    [
-      contactGroups,
-      labels,
-      currentUser?.id,
-      currentCustomer?.id,
-      groupLoading,
-      groupHasMore,
-      groupPages,
-    ],
+    [contactGroups, labels, currentUser?.id, currentCustomer?.id, groupData],
   );
 
   // 联系人点击处理
@@ -307,7 +310,7 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
 
   // 渲染加载更多按钮
   const renderLoadMoreButton = (groupKey: string) => {
-    if (!groupHasMore[groupKey]) {
+    if (!groupData.hasMore[groupKey]) {
       return <div className={styles.noMoreText}>没有更多了</div>;
     }
 
@@ -316,9 +319,9 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
         <button
           className={styles.loadMoreBtn}
           onClick={() => handleLoadMore(groupKey)}
-          disabled={groupLoading[groupKey]}
+          disabled={groupData.loading[groupKey]}
         >
-          {groupLoading[groupKey] ? "加载中..." : "加载更多"}
+          {groupData.loading[groupKey] ? "加载中..." : "加载更多"}
         </button>
       </div>
     );
@@ -343,7 +346,7 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
         className: styles.groupPanel,
         children: isActive ? (
           <>
-            {groupLoading[groupKey] && !groupContacts[groupKey] ? (
+            {groupData.loading[groupKey] && !groupData.contacts[groupKey] ? (
               // 首次加载显示骨架屏
               <div className={styles.groupSkeleton}>
                 {Array(3)
@@ -365,10 +368,10 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
               <>
                 <List
                   className={styles.list}
-                  dataSource={groupContacts[groupKey] || []}
+                  dataSource={groupData.contacts[groupKey] || []}
                   renderItem={renderContactItem}
                 />
-                {(groupContacts[groupKey]?.length || 0) > 0 &&
+                {(groupData.contacts[groupKey]?.length || 0) > 0 &&
                   renderLoadMoreButton(groupKey)}
               </>
             )}
@@ -381,7 +384,7 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
   return (
     <div className={styles.contractListSimple}>
       {loading ? (
-        // 加载状态：显示骨架屏
+        // 加载状态：显示骨架屏（只在首次无本地数据时显示）
         renderSkeleton()
       ) : isSearchMode ? (
         // 搜索模式：直接显示搜索结果列表
@@ -399,9 +402,6 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
       ) : (
         // 正常模式：显示分组列表
         <>
-          {refreshing && (
-            <div className={styles.refreshingTip}>正在同步联系人...</div>
-          )}
           <Collapse
             className={styles.groupCollapse}
             activeKey={activeKey}
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx
index b9b5999f..871e49cb 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx
@@ -1,6 +1,6 @@
-import React, { useEffect, useState } from "react";
+import React, { useState } from "react";
 import { Input, Skeleton } from "antd";
-import { SearchOutlined, ChromeOutlined } from "@ant-design/icons";
+import { SearchOutlined } from "@ant-design/icons";
 import WechatFriends from "./WechatFriends";
 import MessageList from "./MessageList/index";
 import FriendsCircle from "./FriendsCicle";
@@ -26,10 +26,6 @@ const SidebarMenu: React.FC<SidebarMenuProps> = ({ loading = false }) => {
     clearSearchKeyword();
   };
 
-  useEffect(() => {
-    setActiveTab("contracts");
-  }, [currentCustomer]);
-
   // 渲染骨架屏
   const renderSkeleton = () => (
     <div className={styles.skeletonContainer}>
diff --git a/Touchkebao/src/store/module/weChat/message.data.ts b/Touchkebao/src/store/module/weChat/message.data.ts
index 37dc1b6d..a333e9e8 100644
--- a/Touchkebao/src/store/module/weChat/message.data.ts
+++ b/Touchkebao/src/store/module/weChat/message.data.ts
@@ -34,6 +34,8 @@ export interface MessageState {
   refreshTrigger: number;
   //最后刷新时间
   lastRefreshTime: string | null;
+  //是否已经加载过一次（避免重复请求）
+  hasLoadedOnce: boolean;
 
   //设置加载状态
   setLoading: (loading: boolean) => void;
@@ -41,6 +43,10 @@ export interface MessageState {
   setRefreshing: (refreshing: boolean) => void;
   //触发刷新（通知组件重新查询）
   triggerRefresh: () => void;
+  //设置已加载标识
+  setHasLoadedOnce: (loaded: boolean) => void;
+  //重置加载状态（用于登出或切换用户）
+  resetLoadState: () => void;
 
   // ==================== 保留原有接口（向后兼容） ====================
   //消息列表（废弃，保留兼容）
diff --git a/Touchkebao/src/store/module/weChat/message.ts b/Touchkebao/src/store/module/weChat/message.ts
index 52533cee..51503f19 100644
--- a/Touchkebao/src/store/module/weChat/message.ts
+++ b/Touchkebao/src/store/module/weChat/message.ts
@@ -15,6 +15,7 @@ export const useMessageStore = create<MessageState>()(
       refreshing: false,
       refreshTrigger: 0,
       lastRefreshTime: null,
+      hasLoadedOnce: false,
 
       setLoading: (loading: boolean) => set({ loading }),
       setRefreshing: (refreshing: boolean) => set({ refreshing }),
@@ -23,6 +24,14 @@ export const useMessageStore = create<MessageState>()(
           refreshTrigger: get().refreshTrigger + 1,
           lastRefreshTime: new Date().toISOString(),
         }),
+      setHasLoadedOnce: (loaded: boolean) => set({ hasLoadedOnce: loaded }),
+      resetLoadState: () =>
+        set({
+          hasLoadedOnce: false,
+          loading: false,
+          refreshing: false,
+          refreshTrigger: 0,
+        }),
 
       // ==================== 保留原有接口（向后兼容） ====================
       messageList: [],
@@ -42,6 +51,7 @@ export const useMessageStore = create<MessageState>()(
       partialize: state => ({
         // 只持久化必要的状态，不持久化数据
         lastRefreshTime: state.lastRefreshTime,
+        hasLoadedOnce: state.hasLoadedOnce,
         // 保留原有持久化字段（向后兼容）
         messageList: [],
         currentMessage: null,
@@ -99,3 +109,15 @@ export const setRefreshing = (refreshing: boolean) =>
  * 触发刷新（通知组件重新查询数据库）
  */
 export const triggerRefresh = () => useMessageStore.getState().triggerRefresh();
+
+/**
+ * 设置已加载标识
+ * @param loaded 是否已加载
+ */
+export const setHasLoadedOnce = (loaded: boolean) =>
+  useMessageStore.getState().setHasLoadedOnce(loaded);
+
+/**
+ * 重置加载状态（用于登出或切换用户）
+ */
+export const resetLoadState = () => useMessageStore.getState().resetLoadState();
diff --git a/Touchkebao/src/utils/filter.ts b/Touchkebao/src/utils/filter.ts
new file mode 100644
index 00000000..eb812862
--- /dev/null
+++ b/Touchkebao/src/utils/filter.ts
@@ -0,0 +1 @@
+//消息过滤器

From 1b026665315d72bc7041c8a9e852ff373b4d1e90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Fri, 24 Oct 2025 11:28:01 +0800
Subject: [PATCH 49/72] =?UTF-8?q?=E5=A2=9E=E5=BC=BASidebarMenu=E5=92=8CMes?=
 =?UTF-8?q?sageList=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AF=B9c?=
 =?UTF-8?q?urrentContact=E5=8F=98=E5=8C=96=E7=9A=84=E7=9B=91=E5=90=AC?=
 =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=88=87=E6=8D=A2=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?tab=EF=BC=8C=E4=BC=98=E5=8C=96=E8=81=94=E7=B3=BB=E4=BA=BA?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BD=AE=E9=A1=B6=E6=A0=87=E8=AF=86=E4=B8=BA?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E7=B1=BB=E5=9E=8B=EF=BC=8C=E6=8F=90=E5=8D=87?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB=E6=80=A7=E5=92=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BD=93=E9=AA=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weChat/components/CustomerList/index.tsx  | 10 ++-
 .../SidebarMenu/MessageList/index.tsx         | 36 +++++++-
 .../SidebarMenu/WechatFriends/index.tsx       | 70 +++++++++++++---
 .../weChat/components/SidebarMenu/index.tsx   | 17 +++-
 Touchkebao/src/utils/db.ts                    |  2 +-
 Touchkebao/src/utils/dbAction/message.ts      | 84 ++++++++++++++++++-
 6 files changed, 198 insertions(+), 21 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/CustomerList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/CustomerList/index.tsx
index 37c38d6e..9ce88a1f 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/CustomerList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/CustomerList/index.tsx
@@ -37,9 +37,15 @@ const CustomerList: React.FC = () => {
       const session = chatSessions.filter(
         v => v.wechatAccountId === customerId,
       );
-      return session.reduce((pre, cur) => pre + cur.config.unreadCount, 0);
+      return session.reduce(
+        (pre, cur) => pre + (cur.config.unreadCount || 0),
+        0,
+      );
     } else {
-      return chatSessions.reduce((pre, cur) => pre + cur.config.unreadCount, 0);
+      return chatSessions.reduce(
+        (pre, cur) => pre + (cur.config?.unreadCount || 0),
+        0,
+      );
     }
   };
 
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index 039b7154..11190671 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -24,6 +24,7 @@ interface MessageListProps {}
 
 const MessageList: React.FC<MessageListProps> = () => {
   const searchKeyword = useContactStore(state => state.searchKeyword);
+  const selectedContact = useContactStore(state => state.currentContact);
   const { setCurrentContact, currentContract } = useWeChatStore();
   const { currentCustomer } = useCustomerStore();
   const { sendCommand } = useWebSocketStore();
@@ -94,8 +95,8 @@ const MessageList: React.FC<MessageListProps> = () => {
 
   // 置顶/取消置顶
   const handleTogglePin = async (session: ChatSession) => {
-    const currentPinned = session.config?.top || false;
-    const newPinned = !currentPinned;
+    const currentPinned = session.config?.top || 0;
+    const newPinned = currentPinned === 1 ? 0 : 1;
 
     try {
       // 1. 立即更新UI并重新排序（乐观更新）
@@ -132,7 +133,7 @@ const MessageList: React.FC<MessageListProps> = () => {
         newPinned,
       );
 
-      message.success(`${newPinned ? "置顶" : "取消置顶"}成功`);
+      message.success(`${newPinned === 1 ? "置顶" : "取消置顶"}成功`);
     } catch (error) {
       // 4. 失败时回滚UI
       setSessions(prev =>
@@ -434,6 +435,33 @@ const MessageList: React.FC<MessageListProps> = () => {
     setFilteredSessions(filtered);
   }, [sessions, currentCustomer, searchKeyword]);
 
+  // ==================== 监听联系人选中 ====================
+
+  // 监听 contacts store 中的 currentContact 变化
+  useEffect(() => {
+    if (!selectedContact || !currentUserId) return;
+
+    const handleContactSelection = async () => {
+      try {
+        // 从数据库中查找该联系人对应的会话
+        const session = await MessageManager.getSessionByContactId(
+          currentUserId,
+          selectedContact.id,
+          selectedContact.type,
+        );
+
+        if (session) {
+          // 直接选中该会话
+          setCurrentContact(session as any, true);
+        }
+      } catch (error) {
+        console.error("处理联系人选中失败:", error);
+      }
+    };
+
+    handleContactSelection();
+  }, [selectedContact, currentUserId, setCurrentContact]);
+
   // ==================== WebSocket消息处理 ====================
 
   // 监听WebSocket消息更新
@@ -482,7 +510,7 @@ const MessageList: React.FC<MessageListProps> = () => {
             lastUpdateTime: new Date().toISOString(),
             config: {
               unreadCount: 1,
-              top: false,
+              top: 0,
             },
             sortKey: "",
           };
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx
index 961f5e80..3987775e 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx
@@ -1,12 +1,12 @@
 import React, { useState, useCallback, useEffect } from "react";
 import { List, Avatar, Skeleton, Collapse } from "antd";
 import type { CollapseProps } from "antd";
+import dayjs from "dayjs";
 import styles from "./com.module.scss";
-import { Contact } from "@/utils/db";
-import { ContactManager } from "@/utils/dbAction";
+import { Contact, ChatSession } from "@/utils/db";
+import { ContactManager, MessageManager } from "@/utils/dbAction";
 import { ContactGroupByLabel } from "@/pages/pc/ckbox/data";
 import { useContactStore } from "@weChatStore/contacts";
-import { useWeChatStore } from "@weChatStore/weChat";
 import { useCustomerStore } from "@weChatStore/customer";
 import { useUserStore } from "@storeModule/user";
 import {
@@ -47,7 +47,6 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
   // 获取用户和客服信息
   const currentUser = useUserStore(state => state.user);
   const currentCustomer = useCustomerStore(state => state.currentCustomer);
-  const { setCurrentContact: setWeChatCurrentContact } = useWeChatStore();
 
   // 从服务器同步数据（静默同步，不显示提示）
   const syncWithServer = useCallback(
@@ -244,13 +243,64 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
   );
 
   // 联系人点击处理
-  const onContactClick = (contact: Contact) => {
-    setCurrentContact(contact);
-    // 这里需要将 Contact 转换为 weChat 需要的格式
-    // 暂时使用 any 类型，后续需要完善转换逻辑
-    setWeChatCurrentContact(contact as any);
-  };
+  const onContactClick = async (contact: Contact) => {
+    if (!currentUser?.id) return;
 
+    try {
+      // 1. 查询数据库是否存在该联系人的会话
+      const existingSession = await MessageManager.getSessionByContactId(
+        currentUser.id,
+        contact.id,
+        contact.type,
+      );
+
+      const currentTime = dayjs().format(); // 当前时间
+
+      if (!existingSession) {
+        // === 场景1：会话不存在，创建新会话并插入数据库 ===
+
+        const newSession: ChatSession = {
+          serverId: `${contact.type}_${contact.id}`,
+          userId: currentUser.id,
+          id: contact.id,
+          type: contact.type,
+          wechatAccountId: contact.wechatAccountId,
+          nickname: contact.nickname,
+          conRemark: contact.conRemark || "",
+          avatar: contact.avatar,
+          content: "",
+          lastUpdateTime: currentTime, // 使用当前时间
+          config: {
+            unreadCount: 0,
+            top: contact.config?.top === true ? 1 : 0, // boolean → number
+          },
+          sortKey: "",
+          wechatId: contact.wechatId,
+        };
+
+        // 插入数据库（等待完成）
+        await MessageManager.createSession(currentUser.id, newSession);
+        console.log(`创建新会话: ${contact.nickname || contact.wechatId}`);
+      } else {
+        // === 场景2：会话已存在，更新 lastUpdateTime ===
+
+        await MessageManager.updateSessionTime(
+          currentUser.id,
+          contact.id,
+          contact.type,
+          currentTime, // 更新为当前时间
+        );
+        console.log(
+          `更新会话时间: ${contact.nickname || contact.wechatId} -> ${currentTime}`,
+        );
+      }
+
+      // 3. 数据库操作完成后，触发 UI 更新
+      setCurrentContact(contact);
+    } catch (error) {
+      console.error("处理联系人点击失败:", error);
+    }
+  };
   // 渲染联系人项
   const renderContactItem = (contact: Contact) => {
     // 判断是否为群组
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx
index 871e49cb..4d032784 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import { Input, Skeleton } from "antd";
 import { SearchOutlined } from "@ant-design/icons";
 import WechatFriends from "./WechatFriends";
@@ -12,12 +12,23 @@ interface SidebarMenuProps {
 }
 
 const SidebarMenu: React.FC<SidebarMenuProps> = ({ loading = false }) => {
-  const { searchKeyword, setSearchKeyword, clearSearchKeyword } =
-    useContactStore();
+  const {
+    searchKeyword,
+    setSearchKeyword,
+    clearSearchKeyword,
+    currentContact,
+  } = useContactStore();
   const currentCustomer = useCustomerStore(state => state.currentCustomer);
 
   const [activeTab, setActiveTab] = useState("chats");
 
+  // 监听 currentContact 变化，自动切换到聊天tab
+  useEffect(() => {
+    if (currentContact !== null) {
+      setActiveTab("chats");
+    }
+  }, [currentContact]);
+
   const handleSearch = (value: string) => {
     setSearchKeyword(value);
   };
diff --git a/Touchkebao/src/utils/db.ts b/Touchkebao/src/utils/db.ts
index 407acf9b..ce0450e7 100644
--- a/Touchkebao/src/utils/db.ts
+++ b/Touchkebao/src/utils/db.ts
@@ -49,7 +49,7 @@ export interface ChatSession {
   lastUpdateTime: string; // 最后更新时间
   config: {
     unreadCount: number; // 未读数量
-    top: boolean; // 是否置顶
+    top: number; // 是否置顶（1=置顶，0=非置顶）
   };
   sortKey: string; // 预计算排序键
 
diff --git a/Touchkebao/src/utils/dbAction/message.ts b/Touchkebao/src/utils/dbAction/message.ts
index 34b883fb..5f452f2a 100644
--- a/Touchkebao/src/utils/dbAction/message.ts
+++ b/Touchkebao/src/utils/dbAction/message.ts
@@ -538,7 +538,7 @@ export class MessageManager {
     userId: number,
     sessionId: number,
     type: "friend" | "group",
-    isPinned: boolean,
+    isPinned: number,
   ): Promise<void> {
     try {
       const serverId = `${type}_${sessionId}`;
@@ -566,6 +566,43 @@ export class MessageManager {
     }
   }
 
+  /**
+   * 更新会话时间（用于联系人点击时更新）
+   * @param userId 用户ID
+   * @param sessionId 会话ID
+   * @param type 会话类型
+   * @param newTime 新的时间
+   */
+  static async updateSessionTime(
+    userId: number,
+    sessionId: number,
+    type: "friend" | "group",
+    newTime: string,
+  ): Promise<void> {
+    try {
+      const serverId = `${type}_${sessionId}`;
+      const session = (await chatSessionService.findByPrimaryKey(
+        serverId,
+      )) as ChatSession;
+
+      if (session) {
+        const updatedSession = {
+          ...session,
+          lastUpdateTime: newTime,
+        };
+
+        // 重新生成 sortKey（因为时间变了，排序会改变）
+        updatedSession.sortKey = this.generateSortKey(updatedSession);
+
+        await chatSessionService.update(serverId, updatedSession);
+        console.log(`会话时间已更新: ${serverId} -> ${newTime}`);
+      }
+    } catch (error) {
+      console.error("更新会话时间失败:", error);
+      throw error;
+    }
+  }
+
   /**
    * 更新会话备注
    * @param userId 用户ID
@@ -690,4 +727,49 @@ export class MessageManager {
       console.error("清空用户会话失败:", error);
     }
   }
+
+  /**
+   * 根据联系人ID获取会话
+   * @param userId 用户ID
+   * @param contactId 联系人ID
+   * @param type 类型（friend/group）
+   */
+  static async getSessionByContactId(
+    userId: number,
+    contactId: number,
+    type: "friend" | "group",
+  ): Promise<ChatSession | null> {
+    try {
+      const serverId = `${type}_${contactId}`;
+      const session = await chatSessionService.findByPrimaryKey(serverId);
+      return session as ChatSession | null;
+    } catch (error) {
+      console.error("根据联系人ID获取会话失败:", error);
+      return null;
+    }
+  }
+
+  /**
+   * 创建新会话
+   * @param userId 用户ID
+   * @param session 会话数据
+   */
+  static async createSession(
+    userId: number,
+    session: ChatSession,
+  ): Promise<void> {
+    try {
+      // 生成 sortKey
+      const sessionWithSortKey = {
+        ...session,
+        sortKey: this.generateSortKey(session),
+      };
+
+      await chatSessionService.create(sessionWithSortKey);
+      console.log(`创建新会话: ${session.nickname || session.wechatId}`);
+    } catch (error) {
+      console.error("创建会话失败:", error);
+      throw error;
+    }
+  }
 }

From bb6453d3a2f2fc051bd133ac31e707781b28d613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Fri, 24 Oct 2025 12:01:01 +0800
Subject: [PATCH 50/72] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=92=8C=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=81=94=E7=B3=BB=E4=BA=BA=E5=88=97=E8=A1=A8=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=8A=A0=E8=BD=BD=E7=8A=B6=E6=80=81=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E6=8F=90=E5=8D=87=E7=94=A8=E6=88=B7=E4=BD=93?=
 =?UTF-8?q?=E9=AA=8C=E5=92=8C=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB=E6=80=A7?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SidebarMenu/WechatFriends/com.module.scss | 22 +++-----
 .../SidebarMenu/WechatFriends/index.tsx       | 50 +++++++++++++------
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/com.module.scss b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/com.module.scss
index 75a67032..70630da1 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/com.module.scss
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/com.module.scss
@@ -157,24 +157,18 @@
     padding: 10px;
   }
 
-  // 加载更多按钮
-  .loadMoreBtn {
-    background: #fff;
-    border: 1px solid #d9d9d9;
-    border-radius: 4px;
-    padding: 6px 15px;
+  // 加载更多文字
+  .loadMoreText {
+    text-align: center;
+    padding: 10px 15px;
     font-size: 14px;
+    color: #1890ff;
     cursor: pointer;
     transition: all 0.3s;
 
-    &:hover:not(:disabled) {
-      color: #1890ff;
-      border-color: #1890ff;
-    }
-
-    &:disabled {
-      cursor: not-allowed;
-      opacity: 0.6;
+    &:hover {
+      color: #40a9ff;
+      background-color: #f5f5f5;
     }
   }
 }
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx
index 3987775e..22b4c34b 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx
@@ -26,6 +26,7 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
   const [contactGroups, setContactGroups] = useState<ContactGroupByLabel[]>([]);
   const [labels, setLabels] = useState<ContactGroupByLabel[]>([]);
   const [loading, setLoading] = useState(false);
+  const [initializing, setInitializing] = useState(true); // 初始化状态
   const [activeKey, setActiveKey] = useState<string[]>([]);
 
   // 分页相关状态（合并为对象，减少状态数量）
@@ -119,14 +120,36 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
       if (!currentUser?.id || labels.length === 0) return;
 
       try {
-        const groupStats = await getGroupStatistics(
+        // 先检查本地数据库是否有数据
+        const localContacts = await ContactManager.getUserContacts(
           currentUser.id,
-          labels,
-          currentCustomer?.id,
         );
-        setContactGroups(groupStats);
+
+        if (localContacts && localContacts.length > 0) {
+          // 有本地数据，直接加载分组统计（不显示骨架屏）
+          const groupStats = await getGroupStatistics(
+            currentUser.id,
+            labels,
+            currentCustomer?.id,
+          );
+          setContactGroups(groupStats);
+          setInitializing(false); // 初始化完成
+        } else {
+          // 没有本地数据，显示骨架屏
+          setLoading(true);
+          const groupStats = await getGroupStatistics(
+            currentUser.id,
+            labels,
+            currentCustomer?.id,
+          );
+          setContactGroups(groupStats);
+          setLoading(false);
+          setInitializing(false); // 初始化完成
+        }
       } catch (error) {
         console.error("获取分组统计失败:", error);
+        setLoading(false);
+        setInitializing(false); // 即使失败也标记为完成
       }
     };
 
@@ -358,21 +381,18 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
     setActiveKey(newKeys);
   };
 
-  // 渲染加载更多按钮
+  // 渲染加载更多文字
   const renderLoadMoreButton = (groupKey: string) => {
     if (!groupData.hasMore[groupKey]) {
       return <div className={styles.noMoreText}>没有更多了</div>;
     }
 
     return (
-      <div className={styles.loadMoreContainer}>
-        <button
-          className={styles.loadMoreBtn}
-          onClick={() => handleLoadMore(groupKey)}
-          disabled={groupData.loading[groupKey]}
-        >
-          {groupData.loading[groupKey] ? "加载中..." : "加载更多"}
-        </button>
+      <div
+        className={styles.loadMoreText}
+        onClick={() => !groupData.loading[groupKey] && handleLoadMore(groupKey)}
+      >
+        {groupData.loading[groupKey] ? "加载中..." : "加载更多"}
       </div>
     );
   };
@@ -433,8 +453,8 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
 
   return (
     <div className={styles.contractListSimple}>
-      {loading ? (
-        // 加载状态：显示骨架屏（只在首次无本地数据时显示）
+      {loading || initializing ? (
+        // 加载状态：显示骨架屏（初始化或首次无本地数据时显示）
         renderSkeleton()
       ) : isSearchMode ? (
         // 搜索模式：直接显示搜索结果列表

From e1d4f678ab6a94e28d71d220856ed0392aa388c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Fri, 24 Oct 2025 14:44:25 +0800
Subject: [PATCH 51/72] =?UTF-8?q?=E9=87=8D=E6=9E=84MessageRecord=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=9B=B4=E6=96=B0=E6=A0=B7=E5=BC=8F=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=BC=95=E7=94=A8=EF=BC=8C=E4=BC=98=E5=8C=96=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E8=BD=AC=E5=8F=91=E9=80=BB=E8=BE=91=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=B6=88=E6=81=AF=E8=BF=87=E6=BB=A4=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BB=A5=E6=8F=90=E5=8D=87=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C?=
 =?UTF-8?q?=E5=92=8C=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...sageRecord.module.scss => com.module.scss} |  0
 .../components/MessageRecord/index.tsx        |  9 ++--
 .../SidebarMenu/MessageList/index.tsx         |  3 +-
 Touchkebao/src/store/module/ckchat/ckchat.ts  |  1 -
 Touchkebao/src/store/module/weChat/weChat.ts  | 32 ++++++------
 .../src/store/module/websocket/msgManage.ts   |  2 +-
 Touchkebao/src/utils/filter.ts                | 50 +++++++++++++++++++
 7 files changed, 73 insertions(+), 24 deletions(-)
 rename Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/{MessageRecord.module.scss => com.module.scss} (100%)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/MessageRecord.module.scss b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/com.module.scss
similarity index 100%
rename from Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/MessageRecord.module.scss
rename to Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/com.module.scss
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
index 8cbd6c82..ae4a706e 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
@@ -10,8 +10,9 @@ import SystemRecommendRemarkMessage from "./components/SystemRecommendRemarkMess
 import { ChatRecord, ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 import { formatWechatTime } from "@/utils/common";
 import { getEmojiPath } from "@/components/EmojiSeclection/wechatEmoji";
-import styles from "./MessageRecord.module.scss";
+import styles from "./com.module.scss";
 import { useWeChatStore } from "@/store/module/weChat/weChat";
+import { useContactStore } from "@/store/module/weChat/contacts";
 import { useCkChatStore } from "@/store/module/ckchat/ckchat";
 import { fetchReCallApi } from "./api";
 import TransmitModal from "./components/TransmitModal";
@@ -52,9 +53,7 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
     state => state.updateSelectedChatRecords,
   );
 
-  const updateTransmitModal = useWeChatStore(
-    state => state.updateTransmitModal,
-  );
+  const setTransmitModal = useContactStore(state => state.setTransmitModal);
 
   const currentContract = useWeChatStore(state => state.currentContract);
   const updateQuoteMessageContent = useWeChatStore(
@@ -682,7 +681,7 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
 
   const handleForwardMessage = (messageData: ChatRecord) => {
     updateSelectedChatRecords([messageData]);
-    updateTransmitModal(true);
+    setTransmitModal(true);
   };
 
   const handRecall = messageData => {
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index 11190671..7df16161 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -19,6 +19,7 @@ import { formatWechatTime } from "@/utils/common";
 import { MessageManager } from "@/utils/dbAction/message";
 import { ChatSession } from "@/utils/db";
 import { useUserStore } from "@/store/module/user";
+import { messageFilter } from "@/utils/filter";
 
 interface MessageListProps {}
 
@@ -632,7 +633,7 @@ const MessageList: React.FC<MessageListProps> = () => {
                       </div>
                     </div>
                     <div className={styles.messageContent}>
-                      {session.content}
+                      {messageFilter(session.content)}
                     </div>
                   </div>
                 </div>
diff --git a/Touchkebao/src/store/module/ckchat/ckchat.ts b/Touchkebao/src/store/module/ckchat/ckchat.ts
index 558b1c8e..44507597 100644
--- a/Touchkebao/src/store/module/ckchat/ckchat.ts
+++ b/Touchkebao/src/store/module/ckchat/ckchat.ts
@@ -26,7 +26,6 @@ export const useCkChatStore = createPersistStore<CkChatState>(
       return useCkChatStore.getState().isLoadWeChat;
     },
     updateIsLoadWeChat: (isLoadWeChat: boolean) => {
-      console.log("updateIsLoadWeChat", isLoadWeChat);
       set({ isLoadWeChat });
     },
     //客服列表
diff --git a/Touchkebao/src/store/module/weChat/weChat.ts b/Touchkebao/src/store/module/weChat/weChat.ts
index 27a2348e..46da6e54 100644
--- a/Touchkebao/src/store/module/weChat/weChat.ts
+++ b/Touchkebao/src/store/module/weChat/weChat.ts
@@ -313,23 +313,23 @@ export const useWeChatStore = create<WeChatState>()(
             } else {
               params.friendMessage = [message];
             }
-            const dataProcessingResult = await dataProcessing(params);
-            //如果成功，就请求ai对话接口
-            set(() => ({
-              isLoadingAiChat: true,
-            }));
-            if (!dataProcessingResult) {
-              const messageContent = await aiChat({
-                friendId: getMessageId,
-                wechatAccountId: currentContract.wechatAccountId,
-                message: message,
-              });
+            // const dataProcessingResult = await dataProcessing(params);
+            // //如果成功，就请求ai对话接口
+            // set(() => ({
+            //   isLoadingAiChat: true,
+            // }));
+            // if (!dataProcessingResult) {
+            //   const messageContent = await aiChat({
+            //     friendId: getMessageId,
+            //     wechatAccountId: currentContract.wechatAccountId,
+            //     message: message,
+            //   });
 
-              set(() => ({
-                quoteMessageContent: messageContent,
-                isLoadingAiChat: false,
-              }));
-            }
+            //   set(() => ({
+            //     quoteMessageContent: messageContent,
+            //     isLoadingAiChat: false,
+            //   }));
+            // }
           } else {
             // 更新其他聊天的未读消息数
             const chatSessions = useCkChatStore.getState().chatSessions;
diff --git a/Touchkebao/src/store/module/websocket/msgManage.ts b/Touchkebao/src/store/module/websocket/msgManage.ts
index 64559e53..0b071cb4 100644
--- a/Touchkebao/src/store/module/websocket/msgManage.ts
+++ b/Touchkebao/src/store/module/websocket/msgManage.ts
@@ -123,7 +123,7 @@ const messageHandlers: Record<string, MessageHandler> = {
             await db.kfUsers.clear();
             await db.weChatGroup.clear();
             await db.contracts.clear();
-            await db.newContractList.clear();
+            await db.newContactList.clear();
           } finally {
             (window as any).__CKB_AUTH_FAILED_SHOWN__ = false;
             window.location.href = "/login";
diff --git a/Touchkebao/src/utils/filter.ts b/Touchkebao/src/utils/filter.ts
index eb812862..3c0bbd26 100644
--- a/Touchkebao/src/utils/filter.ts
+++ b/Touchkebao/src/utils/filter.ts
@@ -1 +1,51 @@
 //消息过滤器
+export const messageFilter = (message: string) => {
+  if (!message) return "";
+
+  try {
+    // 尝试解析为 JSON
+    const parsed = JSON.parse(message);
+
+    // 根据消息类型返回对应的显示文本
+    switch (true) {
+      // 图片消息：包含 previewImage 或 tencentUrl
+      case !!(parsed.previewImage || parsed.tencentUrl):
+        return "[图片]";
+
+      // 语音消息：包含 voiceUrl 或 voice
+      case !!(parsed.voiceUrl || parsed.voice):
+        return "[语音]";
+
+      // 视频消息：包含 videoUrl 或 video
+      case !!(parsed.videoUrl || parsed.video):
+        return "[视频]";
+
+      // 文件消息：包含 fileUrl 或 file
+      case !!(parsed.fileUrl || parsed.file):
+        return "[文件]";
+
+      // 表情消息：包含 emoji 或 emojiUrl
+      case !!(parsed.emoji || parsed.emojiUrl):
+        return "[表情]";
+
+      // 位置消息：包含 latitude 和 longitude
+      case !!(parsed.latitude && parsed.longitude):
+        return "[位置]";
+
+      // 链接消息：包含 linkUrl
+      case !!parsed.linkUrl:
+        return "[链接]";
+
+      // 文本消息：包含 text 或 content
+      case !!(parsed.text || parsed.content):
+        return parsed.text || parsed.content;
+
+      // 其他未知 JSON 格式
+      default:
+        return message;
+    }
+  } catch (error) {
+    // 如果不是 JSON 格式，直接返回原始消息
+    return message;
+  }
+};

From 28cbcea4f92e9c9f299913f0d4802d657c8f49f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Fri, 24 Oct 2025 16:14:13 +0800
Subject: [PATCH 52/72] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E7=AE=A1=E7=90=86=E9=80=BB=E8=BE=91=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=97=A7=E6=95=B0=E6=8D=AE=E5=BA=93=E6=B8=85=E7=90=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E5=88=9D=E5=A7=8B=E5=8C=96=E6=B5=81=E7=A8=8B=EF=BC=8C?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=81=94=E7=B3=BB=E4=BA=BA=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=92=8C=E6=B6=88=E6=81=AF=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E5=8D=87=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB?=
 =?UTF-8?q?=E6=80=A7=E5=92=8C=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Touchkebao/src/main.tsx                       |  85 ++++-
 .../components/toContract/index.tsx           |  19 +-
 .../components/ClickMeau/index.tsx            |  49 ++-
 .../components/TransmitModal/index.tsx        |  26 +-
 .../SidebarMenu/MessageList/index.tsx         |  45 ++-
 .../weChat/components/SidebarMenu/index.tsx   |  15 +-
 .../src/pages/pc/ckbox/weChat/index.tsx       |  45 ++-
 Touchkebao/src/pages/pc/ckbox/weChat/main.ts  | 321 ------------------
 Touchkebao/src/store/module/ckchat/api.ts     |  58 ++--
 Touchkebao/src/store/module/ckchat/ckchat.ts  |  25 +-
 .../src/store/module/dataCenter/index.ts      |  29 +-
 Touchkebao/src/store/module/weChat/weChat.ts  |  30 +-
 Touchkebao/src/utils/db.ts                    |  92 +----
 13 files changed, 278 insertions(+), 561 deletions(-)
 delete mode 100644 Touchkebao/src/pages/pc/ckbox/weChat/main.ts

diff --git a/Touchkebao/src/main.tsx b/Touchkebao/src/main.tsx
index 24238f27..a3392df2 100644
--- a/Touchkebao/src/main.tsx
+++ b/Touchkebao/src/main.tsx
@@ -12,11 +12,90 @@ import { db } from "./utils/db"; // 引入数据库实例
 // 设置dayjs为中文
 dayjs.locale("zh-cn");
 
+// 清理旧数据库
+async function cleanupOldDatabase() {
+  try {
+    // 获取所有数据库
+    const databases = await indexedDB.databases();
+
+    for (const dbInfo of databases) {
+      if (dbInfo.name === "CunkebaoDatabase") {
+        console.log("检测到旧版数据库，开始清理...");
+
+        // 打开数据库检查版本
+        const openRequest = indexedDB.open(dbInfo.name);
+
+        await new Promise<void>((resolve, reject) => {
+          openRequest.onsuccess = async event => {
+            const database = (event.target as IDBOpenDBRequest).result;
+            const objectStoreNames = Array.from(database.objectStoreNames);
+
+            // 检查是否存在旧表
+            const hasOldTables = objectStoreNames.some(name =>
+              [
+                "kfUsers",
+                "weChatGroup",
+                "contracts",
+                "newContactList",
+                "messageList",
+              ].includes(name),
+            );
+
+            if (hasOldTables) {
+              console.log("发现旧表，删除整个数据库:", objectStoreNames);
+              database.close();
+
+              // 删除整个数据库
+              const deleteRequest = indexedDB.deleteDatabase(dbInfo.name);
+              deleteRequest.onsuccess = () => {
+                console.log("旧数据库已删除");
+                resolve();
+              };
+              deleteRequest.onerror = () => {
+                console.error("删除旧数据库失败");
+                reject();
+              };
+            } else {
+              console.log("数据库结构正确，无需清理");
+              database.close();
+              resolve();
+            }
+          };
+
+          openRequest.onerror = () => {
+            console.error("无法打开数据库进行检查");
+            reject();
+          };
+        });
+      }
+    }
+  } catch (error) {
+    console.warn("清理旧数据库时出错（可忽略）:", error);
+  }
+}
+
 // 数据库初始化
 async function initializeApp() {
-  // 确保数据库已打开
-  await db.open();
-  console.log("数据库初始化成功");
+  try {
+    // 1. 清理旧数据库
+    await cleanupOldDatabase();
+
+    // 2. 打开新数据库
+    await db.open();
+    console.log("数据库初始化成功");
+
+    // 3. 开发环境清空数据（可选）
+    if (process.env.NODE_ENV === "development") {
+      console.log("开发环境：跳过数据清理");
+      // 如需清空数据，取消下面的注释
+      // await db.chatSessions.clear();
+      // await db.contactsUnified.clear();
+      // await db.contactLabelMap.clear();
+      // await db.userLoginRecords.clear();
+    }
+  } catch (error) {
+    console.error("数据库初始化失败:", error);
+  }
 
   // 渲染应用
   const root = createRoot(document.getElementById("root")!);
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/components/toContract/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/components/toContract/index.tsx
index be2f9cb2..7c569755 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/components/toContract/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/components/toContract/index.tsx
@@ -8,7 +8,8 @@ import {
 } from "@/pages/pc/ckbox/weChat/api";
 import { useCurrentContact } from "@/store/module/weChat/weChat";
 import { useCkChatStore } from "@/store/module/ckchat/ckchat";
-import { contractService, weChatGroupService } from "@/utils/db";
+import { ContactManager } from "@/utils/dbAction";
+import { useUserStore } from "@/store/module/user";
 const { TextArea } = Input;
 const { Option } = Select;
 
@@ -92,11 +93,9 @@ const ToContract: React.FC<ToContractProps> = ({
         // 删除聊天会话
         deleteChatSession(currentContact.id);
         // 删除本地数据库记录
-        if ("chatroomId" in currentContact) {
-          await weChatGroupService.delete(currentContact.id);
-        } else {
-          await contractService.delete(currentContact.id);
-        }
+        const currentUserId = useUserStore.getState().user?.id || 0;
+        const contactType = "chatroomId" in currentContact ? "group" : "friend";
+        await ContactManager.deleteContact(currentContact.id);
       } catch (deleteError) {
         console.error("删除本地数据失败:", deleteError);
       }
@@ -132,11 +131,9 @@ const ToContract: React.FC<ToContractProps> = ({
         // 删除聊天会话
         deleteChatSession(currentContact.id);
         // 删除本地数据库记录
-        if ("chatroomId" in currentContact) {
-          await weChatGroupService.delete(currentContact.id);
-        } else {
-          await contractService.delete(currentContact.id);
-        }
+        const currentUserId = useUserStore.getState().user?.id || 0;
+        const contactType = "chatroomId" in currentContact ? "group" : "friend";
+        await ContactManager.deleteContact(currentContact.id);
       } catch (deleteError) {
         console.error("删除本地数据失败:", deleteError);
       }
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/ClickMeau/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/ClickMeau/index.tsx
index b9b69d97..b930e1b7 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/ClickMeau/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/ClickMeau/index.tsx
@@ -111,27 +111,58 @@ const ClickMenu: React.FC<ClickMenuProps> = ({
 
     return timeDiffInSeconds <= 108;
   };
-  const isText = (): boolean => {
-    return messageData.msgType === 1;
+  // 检查是否为文本消息
+  const isTextMessage = (): boolean => {
+    // msgType === 1 是纯文本消息
+    if (messageData.msgType === 1) return true;
+
+    // 尝试解析 content，如果是 JSON 且只包含 text/content 字段，也认为是文本
+    try {
+      const parsed = JSON.parse(messageData.content || "");
+      // 如果包含图片、视频、语音等字段，则不是纯文本
+      if (
+        parsed.previewImage ||
+        parsed.tencentUrl ||
+        parsed.voiceUrl ||
+        parsed.voice ||
+        parsed.videoUrl ||
+        parsed.video ||
+        parsed.fileUrl ||
+        parsed.file
+      ) {
+        return false;
+      }
+      // 包含 text 或 content 字段，认为是文本
+      return !!(parsed.text || parsed.content);
+    } catch (error) {
+      // 不是 JSON，如果 msgType 不确定，按文本处理
+      return true;
+    }
   };
+
   const menuItems = [
     {
       key: "transmit",
       icon: <ExportOutlined />,
       label: "转发",
     },
-    {
-      key: "copy",
-      icon: <CopyOutlined />,
-      label: "复制",
-    },
+    // 只在文本消息时显示复制选项
+    ...(isTextMessage()
+      ? [
+          {
+            key: "copy",
+            icon: <CopyOutlined />,
+            label: "复制",
+          },
+        ]
+      : []),
     {
       key: "multipleForwarding",
       icon: <CheckSquareOutlined />,
       label: "多条转发",
     },
-
-    ...(isText()
+    // 只在文本消息时显示引用选项
+    ...(isTextMessage()
       ? [
           {
             key: "quote",
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/TransmitModal/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/TransmitModal/index.tsx
index 671888ff..62e41990 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/TransmitModal/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/TransmitModal/index.tsx
@@ -17,8 +17,10 @@ import {
   TeamOutlined,
 } from "@ant-design/icons";
 import styles from "./TransmitModal.module.scss";
-import { weChatGroupService, contractService } from "@/utils/db";
+import { ContactManager } from "@/utils/dbAction";
 import { useWeChatStore } from "@/store/module/weChat/weChat";
+import { useContactStore } from "@/store/module/weChat/contacts";
+import { useUserStore } from "@/store/module/user";
 import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 import { useWebSocketStore } from "@/store/module/websocket/websocket";
 const TransmitModal: React.FC = () => {
@@ -33,11 +35,11 @@ const TransmitModal: React.FC = () => {
   const [page, setPage] = useState(1);
   const pageSize = 20;
   const { sendCommand } = useWebSocketStore.getState();
+  const currentUserId = useUserStore(state => state.user?.id) || 0;
+
   // 从 Zustand store 获取更新方法
-  const openTransmitModal = useWeChatStore(state => state.openTransmitModal);
-  const updateTransmitModal = useWeChatStore(
-    state => state.updateTransmitModal,
-  );
+  const openTransmitModal = useContactStore(state => state.openTransmitModal);
+  const setTransmitModal = useContactStore(state => state.setTransmitModal);
   const updateSelectedChatRecords = useWeChatStore(
     state => state.updateSelectedChatRecords,
   );
@@ -50,14 +52,10 @@ const TransmitModal: React.FC = () => {
   const loadContacts = async () => {
     setLoading(true);
     try {
-      // 并行加载联系人和群组数据
-      const [contractsData, groupsData] = await Promise.all([
-        contractService.findAll(),
-        weChatGroupService.findAll(),
-      ]);
-      // 合并并排序（联系人在前，群组在后）
-      const allContactsData = [...contractsData, ...groupsData];
-      setAllContacts(allContactsData);
+      // 从统一联系人表加载所有联系人
+      const allContactsData =
+        await ContactManager.getUserContacts(currentUserId);
+      setAllContacts(allContactsData as any);
     } catch (err) {
       console.error("加载联系人数据失败:", err);
       message.error("加载联系人数据失败");
@@ -132,7 +130,7 @@ const TransmitModal: React.FC = () => {
       }
     }
     updateSelectedChatRecords([]);
-    updateTransmitModal(false);
+    setTransmitModal(false);
   };
 
   // 检查联系人是否已选择
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index 7df16161..60f93569 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -349,20 +349,38 @@ const MessageList: React.FC<MessageListProps> = () => {
   // 初始化加载会话列表
   useEffect(() => {
     const initializeSessions = async () => {
-      if (!currentUserId) return;
+      console.log("MessageList 初始化加载，currentUserId:", currentUserId);
+      console.log("user 对象:", user);
 
-      // 如果已经加载过一次，只从本地数据库读取，不请求接口
-      if (hasLoadedOnce) {
-        try {
-          const cachedSessions =
-            await MessageManager.getUserSessions(currentUserId);
-          setSessions(cachedSessions);
-        } catch (error) {
-          console.error("从本地加载会话列表失败:", error);
-        }
+      if (!currentUserId || currentUserId === 0) {
+        console.warn("currentUserId 无效，跳过加载:", currentUserId);
         return;
       }
 
+      // 如果已经加载过一次，只从本地数据库读取，不请求接口
+      if (hasLoadedOnce) {
+        console.log("已加载过，只从本地数据库读取");
+        try {
+          const cachedSessions =
+            await MessageManager.getUserSessions(currentUserId);
+          console.log("从本地加载会话数:", cachedSessions.length);
+
+          // 如果本地数据为空，重置 hasLoadedOnce 并重新加载
+          if (cachedSessions.length === 0) {
+            console.warn("本地数据为空，重置加载状态并重新加载");
+            setHasLoadedOnce(false);
+            // 不 return，继续执行下面的首次加载逻辑
+          } else {
+            setSessions(cachedSessions);
+            return;
+          }
+        } catch (error) {
+          console.error("从本地加载会话列表失败:", error);
+          return;
+        }
+      }
+
+      console.log("首次加载，开始初始化...");
       setLoading(true);
 
       try {
@@ -370,19 +388,26 @@ const MessageList: React.FC<MessageListProps> = () => {
         const cachedSessions =
           await MessageManager.getUserSessions(currentUserId);
 
+        console.log("本地缓存会话数:", cachedSessions.length);
+
         if (cachedSessions.length > 0) {
           // 有缓存数据，立即显示
+          console.log("有缓存数据，立即显示");
           setSessions(cachedSessions);
           setLoading(false);
 
           // 2. 后台静默同步（不显示同步提示）
+          console.log("后台静默同步中...");
           await syncWithServer();
           setHasLoadedOnce(true); // 标记已加载过
+          console.log("同步完成");
         } else {
           // 无缓存，直接API加载
+          console.log("无缓存，从服务器加载...");
           await syncWithServer();
           const newSessions =
             await MessageManager.getUserSessions(currentUserId);
+          console.log("从服务器加载会话数:", newSessions.length);
           setSessions(newSessions);
           setLoading(false);
           setHasLoadedOnce(true); // 标记已加载过
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx
index 4d032784..05a37cce 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx
@@ -12,23 +12,12 @@ interface SidebarMenuProps {
 }
 
 const SidebarMenu: React.FC<SidebarMenuProps> = ({ loading = false }) => {
-  const {
-    searchKeyword,
-    setSearchKeyword,
-    clearSearchKeyword,
-    currentContact,
-  } = useContactStore();
+  const { searchKeyword, setSearchKeyword, clearSearchKeyword } =
+    useContactStore();
   const currentCustomer = useCustomerStore(state => state.currentCustomer);
 
   const [activeTab, setActiveTab] = useState("chats");
 
-  // 监听 currentContact 变化，自动切换到聊天tab
-  useEffect(() => {
-    if (currentContact !== null) {
-      setActiveTab("chats");
-    }
-  }, [currentContact]);
-
   const handleSearch = (value: string) => {
     setSearchKeyword(value);
   };
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/index.tsx
index c28d1a5d..0bb8510c 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/index.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from "react";
+import React, { useEffect } from "react";
 import { Layout } from "antd";
 import { MessageOutlined } from "@ant-design/icons";
 import ChatWindow from "./components/ChatWindow/index";
@@ -6,34 +6,33 @@ import SidebarMenu from "./components/SidebarMenu/index";
 import CustomerList from "./components/CustomerList";
 import PageSkeleton from "./components/Skeleton";
 import styles from "./index.module.scss";
-const { Content, Sider } = Layout;
-import { chatInitAPIdata, initSocket } from "./main";
+import { useWebSocketStore } from "@/store/module/websocket/websocket";
+import { useUserStore } from "@/store/module/user";
+import { useCkChatStore } from "@/store/module/ckchat/ckchat";
 import { useWeChatStore } from "@/store/module/weChat/weChat";
-import { getIsLoadWeChat } from "@/store/module/ckchat/ckchat";
+
+const { Content, Sider } = Layout;
+
 const CkboxPage: React.FC = () => {
-  // 不要在组件初始化时获取sendCommand，而是在需要时动态获取
-  const [loading, setLoading] = useState(false);
   const currentContract = useWeChatStore(state => state.currentContract);
+
+  // 初始化 WebSocket 连接
   useEffect(() => {
-    // 方法一：使用 Promise 链式调用处理异步函数
-    // if (!getIsLoadWeChat()) {
-    //   setLoading(true);
-    // }
-    chatInitAPIdata()
-      .then(() => {
-        // 数据加载完成后初始化WebSocket连接
-        initSocket();
-      })
-      .catch(error => {
-        console.error("获取联系人列表失败:", error);
-      })
-      .finally(() => {
-        setLoading(false);
-      });
+    const { token2 } = useUserStore.getState();
+    const { getAccountId } = useCkChatStore.getState();
+    const { connect } = useWebSocketStore.getState();
+
+    connect({
+      accessToken: token2,
+      accountId: Number(getAccountId()),
+      client: "kefu-client",
+      cmdType: "CmdSignIn",
+      seq: +new Date(),
+    });
   }, []);
 
   return (
-    <PageSkeleton loading={loading}>
+    <PageSkeleton loading={false}>
       <Layout className={styles.ckboxLayout}>
         <Layout>
           {/* 垂直侧边栏 */}
@@ -44,7 +43,7 @@ const CkboxPage: React.FC = () => {
 
           {/* 左侧联系人边栏 */}
           <Sider width={280} className={styles.sider}>
-            <SidebarMenu loading={loading} />
+            <SidebarMenu />
           </Sider>
 
           {/* 主内容区 */}
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/main.ts b/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
deleted file mode 100644
index 551d85d5..00000000
--- a/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
+++ /dev/null
@@ -1,321 +0,0 @@
-import {
-  asyncChatSessions,
-  asyncWeChatGroup,
-  asyncCountLables,
-  useCkChatStore,
-  updateIsLoadWeChat,
-  getIsLoadWeChat,
-} from "@/store/module/ckchat/ckchat";
-import { useContactStore } from "@/store/module/weChat/contacts";
-import { useWebSocketStore } from "@/store/module/websocket/websocket";
-import { useUserStore } from "@/store/module/user";
-import { weChatGroupService, contractService } from "@/utils/db";
-
-import {
-  getControlTerminalList,
-  getContactList,
-  getGroupList,
-  getCustomerList,
-  getLabelsListByGroup,
-  getMessageList,
-} from "./api";
-
-import {
-  KfUserListData,
-  ContractData,
-  weChatGroup,
-} from "@/pages/pc/ckbox/data";
-
-import { updateCustomerList } from "@weChatStore/customer";
-//获取触客宝基础信息
-export const chatInitAPIdata = async () => {
-  try {
-    let contractList = [];
-    let groupList = [];
-
-    if (getIsLoadWeChat()) {
-      //获取联系人列表
-      contractList = await contractService.findAll();
-      //获取群列表
-      groupList = await weChatGroupService.findAll();
-    } else {
-      //获取联系人列表
-      contractList = await getAllContactList();
-
-      //获取群列表
-      groupList = await getAllGroupList();
-
-      updateIsLoadWeChat(true);
-    }
-    //获取联系人列表 - 使用新的 contacts store
-    // 注意：这里需要将 contractList 和 groupList 转换为统一的 Contact 格式
-    // 暂时保留旧的数据库写入逻辑，后续需要统一到 ContactManager
-    await contractService.createManyWithServerId(contractList);
-    await asyncWeChatGroup(groupList);
-
-    //获取标签列表
-    const countLables = await getCountLables();
-    await asyncCountLables(countLables);
-
-    // 获取显示名称的辅助函数（优先 conRemark，其次 nickname）
-    const getDisplayName = (session: any) => {
-      return session.conRemark || session.nickname || "";
-    };
-
-    const messageList = await getAllMessageList();
-
-    //排序功能
-    const sortedSessions = messageList.sort((a, b) => {
-      // 获取置顶状态
-      const aTop = a.config?.top || false;
-      const bTop = b.config?.top || false;
-
-      // 首先按置顶状态排序（置顶的排在前面）
-      if (aTop !== bTop) {
-        return aTop ? -1 : 1;
-      }
-
-      // 如果都是置顶或都不是置顶，则按未读消息数量降序排列（未读消息多的排在前面）
-      const aUnread = a.config?.unreadCount || 0;
-      const bUnread = b.config?.unreadCount || 0;
-
-      if (aUnread !== bUnread) {
-        return bUnread - aUnread;
-      }
-
-      // 如果未读消息数量相同，则按显示名称排序（字母排序）
-      const aName = getDisplayName(a).toLowerCase();
-      const bName = getDisplayName(b).toLowerCase();
-
-      if (aName !== bName) {
-        return aName.localeCompare(bName, "zh-CN");
-      }
-
-      // 如果名称也相同，则按时间降序排列（最新的在前面）
-      // 如果lastUpdateTime不存在，则将其排在最后
-      if (!a.lastUpdateTime) return 1;
-      if (!b.lastUpdateTime) return -1;
-
-      const timeCompare =
-        new Date(b.lastUpdateTime).getTime() -
-        new Date(a.lastUpdateTime).getTime();
-
-      return timeCompare;
-    });
-    //会话数据同步
-    asyncChatSessions(sortedSessions);
-
-    return {
-      contractList,
-      groupList,
-    };
-  } catch (error) {
-    console.error("获取联系人列表失败:", error);
-    return [];
-  }
-};
-
-// 递归获取所有联系人列表
-export const getAllMessageList = async () => {
-  try {
-    let allMessages = [];
-    let page = 1;
-    const limit = 500;
-    let hasMore = true;
-
-    while (hasMore) {
-      const Result = await getMessageList({
-        page,
-        limit,
-      });
-      const messageList = Result;
-      if (
-        !messageList ||
-        !Array.isArray(messageList) ||
-        messageList.length === 0
-      ) {
-        hasMore = false;
-        break;
-      }
-
-      allMessages = [...allMessages, ...messageList];
-
-      // 如果返回的数据少于请求的数量，说明已经没有更多数据了
-      if (messageList.length == 0) {
-        hasMore = false;
-      } else {
-        page = page + 1;
-      }
-    }
-    return allMessages;
-  } catch (error) {
-    console.error("获取所有联系人列表失败:", error);
-    return [];
-  }
-};
-
-//发起soket连接
-export const initSocket = () => {
-  // 从store获取token和accountId
-  const { token2 } = useUserStore.getState();
-  const { getAccountId } = useCkChatStore.getState();
-  const Token = token2;
-  const accountId = getAccountId();
-  // 使用WebSocket store初始化连接
-  const { connect } = useWebSocketStore.getState();
-
-  // 连接WebSocket
-  connect({
-    accessToken: Token,
-    accountId: Number(accountId),
-    client: "kefu-client",
-    cmdType: "CmdSignIn",
-    seq: +new Date(),
-  });
-};
-
-export const getCountLables = async () => {
-  const Result = await getLabelsListByGroup({});
-  const LablesRes = Result.list;
-  return [
-    ...[
-      {
-        id: 0,
-        groupName: "默认群分组",
-        groupType: 2,
-      },
-    ],
-    ...LablesRes,
-    ...[
-      {
-        id: 0,
-        groupName: "未分组",
-        groupType: 1,
-      },
-    ],
-  ];
-};
-/**
- * 根据标签组织联系人
- * @param contractList 联系人列表
- * @param countLables 标签列表
- * @returns 按标签分组的联系人
- */
-
-//获取控制终端列表
-export const getControlTerminalListByWechatAccountIds = (
-  WechatAccountIds: number[],
-) => {
-  return Promise.all(
-    WechatAccountIds.map(id => getControlTerminalList({ id: id })),
-  );
-};
-// 递归获取所有联系人列表
-export const getAllContactList = async () => {
-  try {
-    let allContacts = [];
-    let page = 1;
-    const limit = 500;
-    let hasMore = true;
-
-    while (hasMore) {
-      const Result = await getContactList({
-        page,
-        limit,
-      });
-      const contractList = Result.list;
-      if (
-        !contractList ||
-        !Array.isArray(contractList) ||
-        contractList.length === 0
-      ) {
-        hasMore = false;
-        break;
-      }
-
-      allContacts = [...allContacts, ...contractList];
-
-      // 如果返回的数据少于请求的数量，说明已经没有更多数据了
-      if (contractList.length == 0) {
-        hasMore = false;
-      } else {
-        page = page + 1;
-      }
-    }
-    return allContacts;
-  } catch (error) {
-    console.error("获取所有联系人列表失败:", error);
-    return [];
-  }
-};
-// 递归获取所有群列表
-export const getAllGroupList = async () => {
-  try {
-    let allContacts = [];
-    let page = 1;
-    const limit = 500;
-    let hasMore = true;
-
-    while (hasMore) {
-      const Result = await getGroupList({
-        page,
-        limit,
-      });
-      const contractList = Result.list;
-      if (
-        !contractList ||
-        !Array.isArray(contractList) ||
-        contractList.length === 0
-      ) {
-        hasMore = false;
-        break;
-      }
-
-      allContacts = [...allContacts, ...contractList];
-
-      // 如果返回的数据少于请求的数量，说明已经没有更多数据了
-      if (contractList.length < limit) {
-        hasMore = false;
-      } else {
-        // 获取最后一条数据的id作为下一次请求的page
-        const lastContact = contractList[contractList.length - 1];
-        page = lastContact.id;
-      }
-    }
-
-    return allContacts;
-  } catch (error) {
-    console.error("获取所有群列表失败:", error);
-    return [];
-  }
-};
-
-// 提取不重复的wechatAccountId组
-export const getUniqueWechatAccountIds = (
-  contacts: ContractData[],
-  groupList: weChatGroup[],
-) => {
-  if (!contacts || !Array.isArray(contacts) || contacts.length === 0) {
-    return [];
-  }
-
-  // 使用Set来存储不重复的wechatAccountId
-  const uniqueAccountIdsSet = new Set<number>();
-
-  // 遍历联系人列表，将每个wechatAccountId添加到Set中
-  contacts.forEach(contact => {
-    if (contact && contact.wechatAccountId) {
-      uniqueAccountIdsSet.add(contact.wechatAccountId);
-    }
-  });
-
-  // 遍历联系人列表，将每个wechatAccountId添加到Set中
-  groupList.forEach(group => {
-    if (group && group.wechatAccountId) {
-      uniqueAccountIdsSet.add(group.wechatAccountId);
-    }
-  });
-
-  // 将Set转换为数组并返回
-  return Array.from(uniqueAccountIdsSet);
-};
diff --git a/Touchkebao/src/store/module/ckchat/api.ts b/Touchkebao/src/store/module/ckchat/api.ts
index 804509a5..c98a02fa 100644
--- a/Touchkebao/src/store/module/ckchat/api.ts
+++ b/Touchkebao/src/store/module/ckchat/api.ts
@@ -1,5 +1,5 @@
 //构建联系人列表标签
-import { weChatGroupService, contractService } from "@/utils/db";
+import { contactUnifiedService } from "@/utils/db";
 import { request } from "@/api/request2";
 import { ContactGroupByLabel } from "@/pages/pc/ckbox/data";
 
@@ -11,7 +11,6 @@ export const createContractList = async (
   kfSelected: number,
   countLables: ContactGroupByLabel[],
 ) => {
-  // 根据 groupType 决定查询不同的服务
   const realGroup = countLables
     .filter(item => item.id !== 0)
     .map(item => item.id);
@@ -19,44 +18,27 @@ export const createContractList = async (
   const dataByLabels = [];
   for (const label of countLables) {
     let data;
-    if (Number(label.groupType) === 1) {
-      if (label.id == 0) {
-        data = await contractService.findWhereMultiple([
-          {
-            field: "groupId",
-            operator: "notIn",
-            value: realGroup,
-          },
-        ]);
-      } else {
-        data = await contractService.findWhere("groupId", label.id);
-      }
-      // 过滤出 kfSelected 对应的联系人
-      if (kfSelected && kfSelected != 0) {
-        data = data.filter(contact => contact.wechatAccountId === kfSelected);
-      }
-      // console.log(`标签 ${label.groupName} 对应的联系人数据:`, data);
-    } else if (Number(label.groupType) === 2) {
-      // groupType: 2, 查询 weChatGroupService
-      if (label.id == 0) {
-        data = await weChatGroupService.findWhereMultiple([
-          {
-            field: "groupId",
-            operator: "notIn",
-            value: realGroup,
-          },
-        ]);
-      } else {
-        data = await weChatGroupService.findWhere("groupId", label.id);
-        // 过滤出 kfSelected 对应的联系人
-      }
-      if (kfSelected && kfSelected != 0) {
-        data = data.filter(contact => contact.wechatAccountId === kfSelected);
-      }
+
+    // 使用统一的联系人服务查询
+    if (label.id == 0) {
+      // 未分组：排除所有已分组的联系人
+      data = await contactUnifiedService.findWhereMultiple([
+        {
+          field: "groupId",
+          operator: "notIn",
+          value: realGroup,
+        },
+      ]);
     } else {
-      console.warn(`未知的 groupType: ${label.groupType}`);
-      data = [];
+      // 指定分组：查询该分组的联系人
+      data = await contactUnifiedService.findWhere("groupId", label.id);
     }
+
+    // 过滤出 kfSelected 对应的联系人
+    if (kfSelected && kfSelected != 0) {
+      data = data.filter(contact => contact.wechatAccountId === kfSelected);
+    }
+
     dataByLabels.push({
       ...label,
       contacts: data,
diff --git a/Touchkebao/src/store/module/ckchat/ckchat.ts b/Touchkebao/src/store/module/ckchat/ckchat.ts
index 44507597..63924f3b 100644
--- a/Touchkebao/src/store/module/ckchat/ckchat.ts
+++ b/Touchkebao/src/store/module/ckchat/ckchat.ts
@@ -7,9 +7,10 @@ import {
   KfUserListData,
   ContactGroupByLabel,
 } from "@/pages/pc/ckbox/data";
-import { weChatGroupService, contractService } from "@/utils/db";
+import { ContactManager } from "@/utils/dbAction";
 import { createContractList } from "@/store/module/ckchat/api";
 import { useWeChatStore } from "@/store/module/weChat/weChat";
+import { useUserStore } from "@/store/module/user";
 // 从weChat store获取clearCurrentContact方法
 const getClearCurrentContact = () =>
   useWeChatStore.getState().clearCurrentContact;
@@ -69,7 +70,27 @@ export const useCkChatStore = createPersistStore<CkChatState>(
     },
     //异步设置联系人分组
     asyncWeChatGroup: async (data: weChatGroup[]) => {
-      await weChatGroupService.createManyWithServerId(data);
+      const currentUserId = useUserStore.getState().user?.id || 0;
+      // 转换为统一的 Contact 格式并保存
+      await ContactManager.addContacts(
+        data.map(g => ({
+          serverId: `group_${g.id}`,
+          userId: currentUserId,
+          id: g.id,
+          type: "group" as const,
+          wechatAccountId: g.wechatAccountId,
+          nickname: g.nickname,
+          conRemark: g.conRemark,
+          avatar: g.chatroomAvatar || "",
+          lastUpdateTime: new Date().toISOString(),
+          sortKey: "",
+          searchKey: (g.conRemark || g.nickname || "").toLowerCase(),
+          chatroomId: g.chatroomId,
+          chatroomOwner: g.chatroomOwner,
+          selfDisplayName: g.selfDisplyName,
+          notice: g.notice,
+        })),
+      );
     },
     //获取选中的客服信息
     getKfSelectedUser: () => {
diff --git a/Touchkebao/src/store/module/dataCenter/index.ts b/Touchkebao/src/store/module/dataCenter/index.ts
index dcfd4b61..fe83e150 100644
--- a/Touchkebao/src/store/module/dataCenter/index.ts
+++ b/Touchkebao/src/store/module/dataCenter/index.ts
@@ -18,7 +18,8 @@ import {
   getFriendInjectConfig,
 } from "@/pages/pc/ckbox/api";
 import { ChatRecord, ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
-import { weChatGroupService, contractService } from "@/utils/db";
+import { ContactManager } from "@/utils/dbAction";
+import { useUserStore } from "@/store/module/user";
 import {
   addChatSession,
   updateChatSession,
@@ -323,21 +324,21 @@ export const useWeChatStore = create<WeChatState>()(
             pinChatSessionToTop(getMessageId);
           } else {
             // 如果会话不存在，创建新会话
-            if (isWechatGroup) {
-              const [group] = await weChatGroupService.findByIds(getMessageId);
-              if (group) {
-                addChatSession({
-                  ...group,
-                  config: { unreadCount: 1 },
-                });
-                // 新创建的会话会自动添加到列表顶部，无需额外置顶
-              }
-            } else {
-              const [user] = await contractService.findByIds(getMessageId);
+            const currentUserId = useUserStore.getState().user?.id || 0;
+            const contactType = isWechatGroup ? "group" : "friend";
+
+            // 从统一联系人表查询
+            const contacts =
+              await ContactManager.getUserContacts(currentUserId);
+            const contact = contacts.find(
+              c => c.id === getMessageId[0] && c.type === contactType,
+            );
+
+            if (contact) {
               addChatSession({
-                ...user,
+                ...contact,
                 config: { unreadCount: 1 },
-              });
+              } as any);
               // 新创建的会话会自动添加到列表顶部，无需额外置顶
             }
           }
diff --git a/Touchkebao/src/store/module/weChat/weChat.ts b/Touchkebao/src/store/module/weChat/weChat.ts
index 46da6e54..d3d51007 100644
--- a/Touchkebao/src/store/module/weChat/weChat.ts
+++ b/Touchkebao/src/store/module/weChat/weChat.ts
@@ -18,7 +18,8 @@ import {
   getFriendInjectConfig,
 } from "@/pages/pc/ckbox/api";
 import { ChatRecord, ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
-import { weChatGroupService, contractService } from "@/utils/db";
+import { ContactManager } from "@/utils/dbAction";
+import { useUserStore } from "@/store/module/user";
 import {
   addChatSession,
   updateChatSession,
@@ -342,22 +343,21 @@ export const useWeChatStore = create<WeChatState>()(
               pinChatSessionToTop(getMessageId);
             } else {
               // 如果会话不存在，创建新会话
-              if (isWechatGroup) {
-                const [group] =
-                  await weChatGroupService.findByIds(getMessageId);
-                if (group) {
-                  addChatSession({
-                    ...group,
-                    config: { unreadCount: 1 },
-                  });
-                  // 新创建的会话会自动添加到列表顶部，无需额外置顶
-                }
-              } else {
-                const [user] = await contractService.findByIds(getMessageId);
+              const currentUserId = useUserStore.getState().user?.id || 0;
+              const contactType = isWechatGroup ? "group" : "friend";
+
+              // 从统一联系人表查询
+              const contacts =
+                await ContactManager.getUserContacts(currentUserId);
+              const contact = contacts.find(
+                c => c.id === getMessageId[0] && c.type === contactType,
+              );
+
+              if (contact) {
                 addChatSession({
-                  ...user,
+                  ...contact,
                   config: { unreadCount: 1 },
-                });
+                } as any);
                 // 新创建的会话会自动添加到列表顶部，无需额外置顶
               }
             }
diff --git a/Touchkebao/src/utils/db.ts b/Touchkebao/src/utils/db.ts
index ce0450e7..d314eca9 100644
--- a/Touchkebao/src/utils/db.ts
+++ b/Touchkebao/src/utils/db.ts
@@ -16,12 +16,6 @@
  */
 
 import Dexie, { Table } from "dexie";
-import {
-  KfUserListData,
-  weChatGroup,
-  ContractData,
-  MessageListData,
-} from "@/pages/pc/ckbox/data";
 
 // ==================== 用户登录记录 ====================
 export interface UserLoginRecord {
@@ -119,32 +113,9 @@ export interface ContactLabelMap {
   lastUpdateTime: string;
 }
 
-// ==================== 保留原有数据类型（向后兼容） ====================
-export interface KfUserWithServerId extends Omit<KfUserListData, "id"> {
-  serverId: number | string; // 服务器ID作为主键
-  userId: number; // 用户ID（数据隔离）
-  id?: number; // 接口数据的原始ID字段
-}
-
-export interface NewContactListData {
-  serverId: number | string; // 服务器ID作为主键
-  userId: number; // 用户ID（数据隔离）
-  id?: number; // 接口数据的原始ID字段
-  groupName: string;
-  contacts: Contact[];
-  weChatGroup: Contact[];
-}
-
 // 数据库类
 class CunkebaoDatabase extends Dexie {
-  // ==================== 保留原有表（向后兼容） ====================
-  kfUsers!: Table<KfUserWithServerId>;
-  weChatGroup!: Table<weChatGroup>;
-  contracts!: Table<ContractData>;
-  newContactList!: Table<NewContactListData>;
-  messageList!: Table<MessageListData>;
-
-  // ==================== 新增统一表 ====================
+  // ==================== 统一表结构 ====================
   chatSessions!: Table<ChatSession>; // 统一会话表
   contactsUnified!: Table<Contact>; // 统一联系人表
   contactLabelMap!: Table<ContactLabelMap>; // 联系人标签映射表
@@ -153,63 +124,15 @@ class CunkebaoDatabase extends Dexie {
   constructor() {
     super("CunkebaoDatabase");
 
-    // 版本1：使用serverId作为主键的架构（保留原有表）
+    // 版本1：统一表结构
     this.version(1).stores({
-      kfUsers:
-        "serverId, id, tenantId, wechatId, nickname, alias, avatar, gender, region, signature, bindQQ, bindEmail, bindMobile, createTime, currentDeviceId, isDeleted, deleteTime, groupId, memo, wechatVersion, lastUpdateTime, isOnline",
-      weChatGroup:
-        "serverId, id, wechatAccountId, tenantId, accountId, chatroomId, chatroomOwner, conRemark, nickname, chatroomAvatar,wechatChatroomId, groupId, config, notice, selfDisplyName",
-      contracts:
-        "serverId, id, wechatAccountId, wechatId, alias, conRemark, nickname, quanPin, avatar, gender, region, addFrom, phone, signature, accountId, extendFields, city, lastUpdateTime, isPassed, tenantId, groupId, thirdParty, additionalPicture, desc, config, lastMessageTime, duplicate",
-      newContactList: "serverId, id, groupName, contacts",
-      messageList:
-        "serverId, id, dataType, wechatAccountId, tenantId, accountId, nickname, avatar, groupId, config, labels,  wechatId, alias, conRemark, quanPin, gender, region, addFrom, phone, signature, extendFields, city, lastUpdateTime, isPassed, thirdParty, additionalPicture, desc, lastMessageTime, duplicate, chatroomId, chatroomOwner, chatroomAvatar, notice, selfDisplyName",
-    });
-
-    // 版本2：添加用户隔离字段到原有表
-    this.version(2)
-      .stores({
-        kfUsers:
-          "serverId, userId, id, tenantId, wechatId, nickname, alias, avatar, gender, region, signature, bindQQ, bindEmail, bindMobile, createTime, currentDeviceId, isDeleted, deleteTime, groupId, memo, wechatVersion, lastUpdateTime, isOnline",
-        weChatGroup:
-          "serverId, userId, id, wechatAccountId, tenantId, accountId, chatroomId, chatroomOwner, conRemark, nickname, chatroomAvatar,wechatChatroomId, groupId, config, notice, selfDisplyName",
-        contracts:
-          "serverId, userId, id, wechatAccountId, wechatId, alias, conRemark, nickname, quanPin, avatar, gender, region, addFrom, phone, signature, accountId, extendFields, city, lastUpdateTime, isPassed, tenantId, groupId, thirdParty, additionalPicture, desc, config, lastMessageTime, duplicate",
-        newContactList: "serverId, userId, id, groupName, contacts",
-        messageList:
-          "serverId, userId, id, dataType, wechatAccountId, tenantId, accountId, nickname, avatar, groupId, config, labels,  wechatId, alias, conRemark, quanPin, gender, region, addFrom, phone, signature, extendFields, city, lastUpdateTime, isPassed, thirdParty, additionalPicture, desc, lastMessageTime, duplicate, chatroomId, chatroomOwner, chatroomAvatar, notice, selfDisplyName",
-      })
-      .upgrade(trans => {
-        // 为现有数据添加默认userId=0（需要手动清理）
-        return trans
-          .table("kfUsers")
-          .toCollection()
-          .modify(item => {
-            item.userId = 0;
-          });
-      });
-
-    // 版本3：添加新的统一表和用户登录记录表
-    this.version(3).stores({
-      // 保留原有表
-      kfUsers:
-        "serverId, userId, id, tenantId, wechatId, nickname, alias, avatar, gender, region, signature, bindQQ, bindEmail, bindMobile, createTime, currentDeviceId, isDeleted, deleteTime, groupId, memo, wechatVersion, lastUpdateTime, isOnline",
-      weChatGroup:
-        "serverId, userId, id, wechatAccountId, tenantId, accountId, chatroomId, chatroomOwner, conRemark, nickname, chatroomAvatar,wechatChatroomId, groupId, config, notice, selfDisplyName",
-      contracts:
-        "serverId, userId, id, wechatAccountId, wechatId, alias, conRemark, nickname, quanPin, avatar, gender, region, addFrom, phone, signature, accountId, extendFields, city, lastUpdateTime, isPassed, tenantId, groupId, thirdParty, additionalPicture, desc, config, lastMessageTime, duplicate",
-      newContactList: "serverId, userId, id, groupName, contacts",
-      messageList:
-        "serverId, userId, id, dataType, wechatAccountId, tenantId, accountId, nickname, avatar, groupId, config, labels,  wechatId, alias, conRemark, quanPin, gender, region, addFrom, phone, signature, extendFields, city, lastUpdateTime, isPassed, thirdParty, additionalPicture, desc, lastMessageTime, duplicate, chatroomId, chatroomOwner, chatroomAvatar, notice, selfDisplyName",
-
-      // 新增统一表
       // 会话表索引：支持按用户、类型、时间、置顶等查询
       chatSessions:
         "serverId, userId, id, type, wechatAccountId, [userId+type], [userId+wechatAccountId], [userId+lastUpdateTime], sortKey, nickname, conRemark, avatar, content, lastUpdateTime",
 
       // 联系人表索引：支持按用户、类型、标签、搜索等查询
       contactsUnified:
-        "serverId, userId, id, type, wechatAccountId, [userId+type], [userId+wechatAccountId], sortKey, searchKey, nickname, conRemark, avatar, lastUpdateTime",
+        "serverId, userId, id, type, wechatAccountId, [userId+type], [userId+wechatAccountId], sortKey, searchKey, nickname, conRemark, avatar, lastUpdateTime, groupId",
 
       // 联系人标签映射表索引：支持按用户、标签、联系人、类型查询
       contactLabelMap:
@@ -479,14 +402,7 @@ export class DatabaseService<T> {
   }
 }
 
-// 创建各表的服务实例
-export const kfUserService = new DatabaseService(db.kfUsers);
-export const weChatGroupService = new DatabaseService(db.weChatGroup);
-export const contractService = new DatabaseService(db.contracts);
-export const newContactListService = new DatabaseService(db.newContactList);
-export const messageListService = new DatabaseService(db.messageList);
-
-// 新增统一表服务
+// 创建统一表的服务实例
 export const chatSessionService = new DatabaseService(db.chatSessions);
 export const contactUnifiedService = new DatabaseService(db.contactsUnified);
 export const contactLabelMapService = new DatabaseService(db.contactLabelMap);

From 7d8573b52a9628629f78dcddda98bb438e9d7128 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Fri, 24 Oct 2025 17:20:09 +0800
Subject: [PATCH 53/72] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E5=88=86=E7=BB=84=E7=BB=9F=E8=AE=A1=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E5=88=86=E5=88=AB=E6=8F=90=E5=8F=96=E5=A5=BD=E5=8F=8B?=
 =?UTF-8?q?=E5=92=8C=E7=BE=A4=E7=BB=84=E6=A0=87=E7=AD=BEID=E4=BB=A5?=
 =?UTF-8?q?=E6=8F=90=E9=AB=98=E5=87=86=E7=A1=AE=E6=80=A7=EF=BC=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E7=9B=B8=E5=85=B3=E6=B3=A8=E9=87=8A=E4=BB=A5=E5=A2=9E?=
 =?UTF-8?q?=E5=BC=BA=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB=E6=80=A7=EF=BC=8C?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E8=B0=83=E6=95=B4=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BB=A5=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=9B=B4=E7=81=B5=E6=B4=BB=E7=9A=84=E5=88=86=E7=BB=84=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SidebarMenu/WechatFriends/extend.ts       | 17 +++++++++++------
 .../SidebarMenu/WechatFriends/index.tsx       | 14 ++++++++++++--
 Touchkebao/src/utils/dbAction/contact.ts      | 19 +++++++++++++++++--
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/extend.ts b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/extend.ts
index f9a3b3c8..220c4d56 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/extend.ts
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/extend.ts
@@ -206,8 +206,13 @@ export const getGroupStatistics = async (
   labels: ContactGroupByLabel[],
   customerId?: number,
 ): Promise<ContactGroupByLabel[]> => {
-  const realGroupIds = labels
-    .filter(item => item.id !== 0)
+  // 分别提取好友标签和群标签的ID
+  const friendGroupIds = labels
+    .filter(item => item.id !== 0 && Number(item.groupType) === 1)
+    .map(item => item.id);
+
+  const chatGroupIds = labels
+    .filter(item => item.id !== 0 && Number(item.groupType) === 2)
     .map(item => item.id);
 
   const groupedData: ContactGroupByLabel[] = [];
@@ -218,12 +223,12 @@ export const getGroupStatistics = async (
     if (Number(label.groupType) === 1) {
       // 好友分组
       if (label.id === 0) {
-        // 未分组：不属于任何标签的好友
+        // 未分组：不属于任何好友标签的好友
         count = await ContactManager.getContactCount(
           userId,
           "friend",
           customerId,
-          realGroupIds,
+          friendGroupIds, // 只排除好友标签
           true, // 排除已分组的
         );
       } else {
@@ -239,12 +244,12 @@ export const getGroupStatistics = async (
     } else if (Number(label.groupType) === 2) {
       // 群组分组
       if (label.id === 0) {
-        // 默认群分组：不属于任何标签的群
+        // 默认群分组：不属于任何群标签的群
         count = await ContactManager.getContactCount(
           userId,
           "group",
           customerId,
-          realGroupIds,
+          chatGroupIds, // 只排除群标签
           true, // 排除已分组的
         );
       } else {
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx
index 22b4c34b..deed4a02 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/WechatFriends/index.tsx
@@ -174,8 +174,13 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
       }));
 
       try {
+        // 根据当前标签的 groupType 计算正确的 realGroupIds
         const realGroupIds = labels
-          .filter(item => item.id !== 0)
+          .filter(
+            item =>
+              item.id !== 0 &&
+              Number(item.groupType) === Number(label.groupType),
+          )
           .map(item => item.id);
 
         const contacts = await getContactsByGroup(
@@ -231,8 +236,13 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
         const currentPage = groupData.pages[groupKey] || 1;
         const nextPage = currentPage + 1;
 
+        // 根据当前标签的 groupType 计算正确的 realGroupIds
         const realGroupIds = labels
-          .filter(item => item.id !== 0)
+          .filter(
+            item =>
+              item.id !== 0 &&
+              Number(item.groupType) === Number(label.groupType),
+          )
           .map(item => item.id);
 
         const newContacts = await getContactsByGroup(
diff --git a/Touchkebao/src/utils/dbAction/contact.ts b/Touchkebao/src/utils/dbAction/contact.ts
index 501c6289..1f0ced1a 100644
--- a/Touchkebao/src/utils/dbAction/contact.ts
+++ b/Touchkebao/src/utils/dbAction/contact.ts
@@ -326,6 +326,14 @@ export class ContactManager {
     exclude: boolean = false,
   ): Promise<number> {
     try {
+      console.log("getContactCount 调用参数:", {
+        userId,
+        type,
+        customerId,
+        groupIds,
+        exclude,
+      });
+
       const conditions: any[] = [
         { field: "userId", operator: "equals", value: userId },
         { field: "type", operator: "equals", value: type },
@@ -353,14 +361,21 @@ export class ContactManager {
           // 包含指定分组
           conditions.push({
             field: "groupId",
-            operator: "in",
+            operator: "anyOf",
             value: groupIds,
           });
         }
       }
 
+      console.log("查询条件:", conditions);
+
       const contacts =
         await contactUnifiedService.findWhereMultiple(conditions);
+
+      console.log(
+        `查询结果数量: ${contacts.length}, type: ${type}, groupIds: ${groupIds}`,
+      );
+
       return contacts.length;
     } catch (error) {
       console.error("获取联系人数量失败:", error);
@@ -408,7 +423,7 @@ export class ContactManager {
           // 包含指定分组
           conditions.push({
             field: "groupId",
-            operator: "in",
+            operator: "anyOf",
             value: groupIds,
           });
         }

From e409618b7a038e0ae085f49022d7982170db7f51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Fri, 24 Oct 2025 17:46:44 +0800
Subject: [PATCH 54/72] =?UTF-8?q?=E5=A2=9E=E5=BC=BASidebarMenu=E5=92=8CMes?=
 =?UTF-8?q?sageList=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AF=B9c?=
 =?UTF-8?q?urrentContact=E5=8F=98=E5=8C=96=E7=9A=84=E7=9B=91=E5=90=AC?=
 =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=88=87=E6=8D=A2=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?tab=E5=B9=B6=E6=98=BE=E7=A4=BA=E5=8A=A0=E8=BD=BD=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=EF=BC=8C=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=8A=A0=E8=BD=BD=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E5=8D=87=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=E5=92=8C?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SidebarMenu/MessageList/index.tsx         | 32 ++----------
 .../weChat/components/SidebarMenu/index.tsx   | 51 ++++++++++++++++++-
 2 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index 60f93569..40502e63 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -25,7 +25,6 @@ interface MessageListProps {}
 
 const MessageList: React.FC<MessageListProps> = () => {
   const searchKeyword = useContactStore(state => state.searchKeyword);
-  const selectedContact = useContactStore(state => state.currentContact);
   const { setCurrentContact, currentContract } = useWeChatStore();
   const { currentCustomer } = useCustomerStore();
   const { sendCommand } = useWebSocketStore();
@@ -360,6 +359,8 @@ const MessageList: React.FC<MessageListProps> = () => {
       // 如果已经加载过一次，只从本地数据库读取，不请求接口
       if (hasLoadedOnce) {
         console.log("已加载过，只从本地数据库读取");
+        setLoading(true); // 显示骨架屏
+
         try {
           const cachedSessions =
             await MessageManager.getUserSessions(currentUserId);
@@ -372,10 +373,12 @@ const MessageList: React.FC<MessageListProps> = () => {
             // 不 return，继续执行下面的首次加载逻辑
           } else {
             setSessions(cachedSessions);
+            setLoading(false); // 数据加载完成，关闭骨架屏
             return;
           }
         } catch (error) {
           console.error("从本地加载会话列表失败:", error);
+          setLoading(false);
           return;
         }
       }
@@ -461,33 +464,6 @@ const MessageList: React.FC<MessageListProps> = () => {
     setFilteredSessions(filtered);
   }, [sessions, currentCustomer, searchKeyword]);
 
-  // ==================== 监听联系人选中 ====================
-
-  // 监听 contacts store 中的 currentContact 变化
-  useEffect(() => {
-    if (!selectedContact || !currentUserId) return;
-
-    const handleContactSelection = async () => {
-      try {
-        // 从数据库中查找该联系人对应的会话
-        const session = await MessageManager.getSessionByContactId(
-          currentUserId,
-          selectedContact.id,
-          selectedContact.type,
-        );
-
-        if (session) {
-          // 直接选中该会话
-          setCurrentContact(session as any, true);
-        }
-      } catch (error) {
-        console.error("处理联系人选中失败:", error);
-      }
-    };
-
-    handleContactSelection();
-  }, [selectedContact, currentUserId, setCurrentContact]);
-
   // ==================== WebSocket消息处理 ====================
 
   // 监听WebSocket消息更新
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx
index 05a37cce..f596b9c9 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/index.tsx
@@ -7,16 +7,58 @@ import FriendsCircle from "./FriendsCicle";
 import styles from "./SidebarMenu.module.scss";
 import { useContactStore } from "@/store/module/weChat/contacts";
 import { useCustomerStore } from "@/store/module/weChat/customer";
+import { useWeChatStore } from "@/store/module/weChat/weChat";
+import { useUserStore } from "@/store/module/user";
+import { MessageManager } from "@/utils/dbAction/message";
 interface SidebarMenuProps {
   loading?: boolean;
 }
 
 const SidebarMenu: React.FC<SidebarMenuProps> = ({ loading = false }) => {
-  const { searchKeyword, setSearchKeyword, clearSearchKeyword } =
-    useContactStore();
+  const {
+    searchKeyword,
+    setSearchKeyword,
+    clearSearchKeyword,
+    currentContact,
+  } = useContactStore();
   const currentCustomer = useCustomerStore(state => state.currentCustomer);
+  const { setCurrentContact } = useWeChatStore();
+  const { user } = useUserStore();
+  const currentUserId = user?.id || 0;
 
   const [activeTab, setActiveTab] = useState("chats");
+  const [switchingTab, setSwitchingTab] = useState(false); // tab切换加载状态
+
+  // 监听 currentContact 变化，自动切换到聊天tab并选中会话
+  useEffect(() => {
+    if (!currentContact || !currentUserId) return;
+
+    const handleContactSelection = async () => {
+      try {
+        setSwitchingTab(true);
+
+        // 2. 从数据库中查找该联系人对应的会话
+        const session = await MessageManager.getSessionByContactId(
+          currentUserId,
+          currentContact.id,
+          currentContact.type,
+        );
+
+        if (session) {
+          // 3. 直接选中该会话
+          setCurrentContact(session as any, true);
+        }
+
+        // 4. 关闭加载状态
+        setSwitchingTab(false);
+      } catch (error) {
+        console.error("处理联系人选中失败:", error);
+        setSwitchingTab(false);
+      }
+    };
+
+    handleContactSelection();
+  }, [currentContact, currentUserId, setCurrentContact]);
 
   const handleSearch = (value: string) => {
     setSearchKeyword(value);
@@ -114,6 +156,11 @@ const SidebarMenu: React.FC<SidebarMenuProps> = ({ loading = false }) => {
 
   // 渲染内容部分
   const renderContent = () => {
+    // 如果正在切换tab到聊天，显示骨架屏
+    if (switchingTab && activeTab === "chats") {
+      return renderSkeleton();
+    }
+
     switch (activeTab) {
       case "chats":
         return <MessageList />;

From aa3c07a0b236599ac07138d58f92d4356119a38c Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Sat, 25 Oct 2025 17:41:20 +0800
Subject: [PATCH 55/72] =?UTF-8?q?ai=E5=AF=B9=E8=AF=9D=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Server/application/ai/config/route.php        |   4 -
 Server/application/ai/controller/CozeAI.php   | 370 ++++++++++++
 Server/application/ai/controller/OpenAi.php   |   2 +-
 .../chukebao/controller/AiChatController.php  | 449 +++++++++++++-
 .../chukebao/model/AiKnowledgeBase.php        |  52 ++
 .../chukebao/model/AiKnowledgeBaseType.php    |  57 ++
 .../application/chukebao/model/AiSettings.php |  17 +
 Server/application/cunkebao/config/route.php  |  20 +
 .../controller/AiKnowledgeBaseController.php  | 570 ++++++++++++++++++
 .../controller/AiSettingsController.php       | 344 +++++++++++
 .../cunkebao/model/AiKnowledgeBase.php        |  11 +
 .../cunkebao/model/AiKnowledgeBaseType.php    |  11 +
 12 files changed, 1883 insertions(+), 24 deletions(-)
 create mode 100644 Server/application/ai/controller/CozeAI.php
 create mode 100644 Server/application/chukebao/model/AiKnowledgeBase.php
 create mode 100644 Server/application/chukebao/model/AiKnowledgeBaseType.php
 create mode 100644 Server/application/chukebao/model/AiSettings.php
 create mode 100644 Server/application/cunkebao/controller/AiKnowledgeBaseController.php
 create mode 100644 Server/application/cunkebao/controller/AiSettingsController.php
 create mode 100644 Server/application/cunkebao/model/AiKnowledgeBase.php
 create mode 100644 Server/application/cunkebao/model/AiKnowledgeBaseType.php

diff --git a/Server/application/ai/config/route.php b/Server/application/ai/config/route.php
index 286b7c24..4fd9f4f6 100644
--- a/Server/application/ai/config/route.php
+++ b/Server/application/ai/config/route.php
@@ -15,8 +15,4 @@ Route::group('v1/ai', function () {
     Route::group('doubao', function () {
         Route::post('text', 'app\ai\controller\DouBaoAI@text');
     });
-
-
-
-
 })->middleware(['jwt']);
\ No newline at end of file
diff --git a/Server/application/ai/controller/CozeAI.php b/Server/application/ai/controller/CozeAI.php
new file mode 100644
index 00000000..9d9bf150
--- /dev/null
+++ b/Server/application/ai/controller/CozeAI.php
@@ -0,0 +1,370 @@
+<?php
+
+namespace app\ai\controller;
+
+use think\facade\Env;
+use think\Controller;
+
+class CozeAI extends Controller
+{
+    protected $apiUrl;
+    protected $accessToken;
+    protected $headers;
+
+    /**
+     * 初始化
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        // 从环境变量获取配置
+        $this->apiUrl = Env::get('cozeAi.api_url');
+        $this->accessToken = Env::get('cozeAi.token');
+
+        if (empty($this->accessToken) || empty($this->apiUrl)) {
+            return json_encode(['code' => 500, 'msg' => '参数缺失']);
+        }
+
+        // 设置请求头
+        $this->headers = [
+            'Authorization: Bearer ' . $this->accessToken,
+            'Content-Type: application/json'
+        ];
+    }
+
+
+    /**
+     * 创建智能体
+     * @param $data
+     * @return false|string|\think\response\Json
+     */
+    public function createBot($data = [])
+    {
+        $space_id = Env::get('cozeAi.space_id');
+        $name = !empty($data['name']) ? $data['name'] : '';
+        $model_id = !empty($data['model_id']) ? $data['model_id'] : '';
+        $prompt_info = !empty($data['prompt_info']) ? $data['prompt_info'] : '';
+        $plugin_id_list = [
+            'id_list' => [
+                ['api_id' => '7362852017859035163', 'plugin_id' => '7362852017859018779'],
+                ['api_id' => '7472045461050851367', 'plugin_id' => '7472045461050834983'],
+            ]
+        ];
+        if (empty($name)) {
+            return json_encode(['code' => 500, 'msg' => '参数缺失']);
+        }
+
+        $model_info_config = [
+            'model_id' => (string)$model_id,
+        ];
+
+        $params = [
+            'space_id' => $space_id,
+            'name' => $name,
+            'model_info_config' => (object)$model_info_config,
+            'plugin_id_list' => (object)$plugin_id_list
+        ];
+
+        if (!empty($prompt_info)){
+            $new_prompt_info = [
+                'prompt' => $prompt_info
+            ];
+            $params['prompt_info'] = (object) $new_prompt_info;
+        }
+
+        $result = requestCurl($this->apiUrl . '/v1/bot/create', $params, 'POST', $this->headers, 'json');
+        $result = json_decode($result, true);
+        if ($result['code'] != 0) {
+            return errorJson($result['msg'], $result['code']);
+        }
+
+        return json_encode(['code' => 200, 'msg' => '创建成功', 'data' => $result['data']]);
+    }
+
+
+    /**
+     * 创建智能体
+     * @param $data
+     * @return false|string|\think\response\Json
+     */
+    public function updateBot($data = [])
+    {
+        $space_id = Env::get('cozeAi.space_id');
+        $bot_id = !empty($data['bot_id']) ? $data['bot_id'] : '';
+        $name = !empty($data['name']) ? $data['name'] : '';
+        $model_id = !empty($data['model_id']) ? $data['model_id'] : '';
+        $prompt_info = !empty($data['prompt_info']) ? $data['prompt_info'] : '';
+        $dataset_ids = !empty($data['dataset_ids']) ? $data['dataset_ids'] : '';
+        $plugin_id_list = [
+            'id_list' => [
+                ['api_id' => '7362852017859035163', 'plugin_id' => '7362852017859018779'],
+                ['api_id' => '7472045461050851367', 'plugin_id' => '7472045461050834983'],
+            ]
+        ];
+        if (empty($name) || empty($bot_id)) {
+            return json_encode(['code' => 500, 'msg' => '参数缺失']);
+        }
+
+        $model_info_config = [
+            'model_id' => (string)$model_id,
+        ];
+
+        $params = [
+            'bot_id' => $bot_id,
+            'space_id' => $space_id,
+            'name' => $name,
+            'model_info_config' => (object)$model_info_config,
+            'plugin_id_list' => (object)$plugin_id_list
+        ];
+
+
+        if (!empty($prompt_info)){
+            $new_prompt_info = [
+                'prompt' => $prompt_info
+            ];
+            $params['prompt_info'] = (object) $new_prompt_info;
+        }
+
+        if (!empty($dataset_ids)){
+            $knowledge = [
+                'dataset_ids' => $dataset_ids
+            ];
+            $params['knowledge'] = (object) $knowledge;
+        }
+
+        $result = requestCurl($this->apiUrl . '/v1/bot/update', $params, 'POST', $this->headers, 'json');
+        $result = json_decode($result, true);
+        if ($result['code'] != 0) {
+            return errorJson($result['msg'], $result['code']);
+        }
+        return json_encode(['code' => 200, 'msg' => '获取成功']);
+    }
+
+
+    /**
+     * 发布智能体
+     * @param $data
+     * @return false|string|\think\response\Json
+     */
+    public function botPublish($data = [])
+    {
+        $bot_id = !empty($data['bot_id']) ? $data['bot_id'] : '';
+        $connector_ids = ['1024', '999'];
+        if (empty($bot_id) || empty($connector_ids)) {
+            return json_encode(['code' => 500, 'msg' => '参数缺失']);
+        }
+
+        $params = [
+            'bot_id' => $bot_id,
+            'connector_ids' => $connector_ids,
+        ];
+        $result = requestCurl($this->apiUrl . '/v1/bot/publish', $params, 'POST', $this->headers, 'json');
+        $result = json_decode($result, true);
+        if ($result['code'] != 0) {
+            return errorJson($result['msg'], $result['code']);
+        }
+        return json_encode(['code' => 200, 'msg' => '发布成功']);
+    }
+
+
+    /**
+     * 创建知识库
+     * @param $data
+     * @return false|string|\think\response\Json
+     */
+    public function createKnowledge($data = [])
+    {
+
+        $space_id = Env::get('cozeAi.space_id');
+        $name = !empty($data['name']) ? $data['name'] : '';
+        if (empty($space_id) || empty($name)) {
+            return json_encode(['code' => 500, 'msg' => '参数缺失']);
+        }
+
+        $params = [
+            'space_id' => $space_id,
+            'format_type' => 0,
+            'name' => $name,
+        ];
+        $result = requestCurl($this->apiUrl . '/v1/datasets', $params, 'POST', $this->headers, 'json');
+        $result = json_decode($result, true);
+
+        if ($result['code'] != 0) {
+            return errorJson($result['msg'], $result['code']);
+        }
+        return json_encode(['code' => 200, 'msg' => '创建成功','data' => $result['data']]);
+    }
+
+
+    public function createDocument($data = [])
+    {
+        // 文件路径
+        $filePath = !empty($data['filePath']) ? $data['filePath'] : '';
+        $fileName = !empty($data['fileName']) ? $data['fileName'] : '';
+        if (empty($filePath)) {
+            return json_encode(['code' => 500, 'msg' => '参数缺失']);
+        }
+        // 读取文件内容
+        $fileContent = file_get_contents($filePath);
+        // 将文件内容编码为Base64
+        $base64EncodedContent = base64_encode($fileContent);
+
+
+        $dataset_id = !empty($data['dataset_id']) ? $data['dataset_id'] : '';
+
+        $document_bases = [
+             ['name' => $fileName,'source_info' => ['file_base64' => $base64EncodedContent]]
+        ];
+
+        $chunk_strategy = [
+            'chunk_type' => 0,
+            'remove_extra_spaces' => true
+        ];
+        $params = [
+            'dataset_id' => (string) $dataset_id,
+            'document_bases' => $document_bases,
+            'chunk_strategy' => (object) $chunk_strategy,
+            'format_type' => 0
+        ];
+        $headers = array_merge($this->headers, ['Agw-Js-Conv: str']);
+        $result = requestCurl($this->apiUrl . '/open_api/knowledge/document/create', $params, 'POST', $headers, 'json');
+        $result = json_decode($result, true);
+        if ($result['code'] != 0) {
+            return errorJson($result['msg'], $result['code']);
+        }
+        return json_encode(['code' => 200, 'msg' => '创建成功','data' => $result['document_infos']]);
+    }
+
+
+    /**
+     * 删除知识库文件
+     * @param $data
+     * @return false|string|\think\response\Json
+     */
+    public function deleteDocument($data = [])
+    {
+        if (empty($data)) {
+            return json_encode(['code' => 500, 'msg' => '参数缺失']);
+        }
+        $params = [
+            'document_ids' => $data,
+        ];
+        $headers = array_merge($this->headers, ['Agw-Js-Conv: str']);
+        $result = requestCurl($this->apiUrl . '/open_api/knowledge/document/delete', $params, 'POST', $headers, 'json');
+        $result = json_decode($result, true);
+        if ($result['code'] != 0) {
+            return errorJson($result['msg'], $result['code']);
+        }
+        return json_encode(['code' => 200, 'msg' => '删除成功']);
+
+    }
+
+
+    /**
+     * 创建会话
+     * @param $data
+     * @return false|string|\think\response\Json
+     */
+    public function createConversation($data = [])
+    {
+        $bot_id = !empty($data['bot_id']) ? $data['bot_id'] : '';
+        $name = !empty($data['name']) ? $data['name'] : '';
+        $meta_data = !empty($data['meta_data']) ? $data['meta_data'] : [];
+
+        if (empty($bot_id) || empty($name)) {
+            return json_encode(['code' => 500, 'msg' => '参数缺失']);
+        }
+        $params = [
+            'bot_id' => $bot_id,
+            'name' => $name,
+        ];
+        if (!empty($meta_data)){
+            $params['meta_data'] = $meta_data;
+        }
+        $result = requestCurl($this->apiUrl . '/v1/conversation/create', $params, 'POST', $this->headers, 'json');
+        $result = json_decode($result, true);
+        if ($result['code'] != 0) {
+            return errorJson($result['msg'], $result['code']);
+        }
+        return json_encode(['code' => 200, 'msg' => '创建成功','data' => $result['data']]);
+    }
+
+
+    /**
+     * 开始对话
+     * @param $data
+     * @return false|string|\think\response\Json
+     */
+    public function createChat($data = [])
+    {
+        try {
+            $bot_id = !empty($data['bot_id']) ? $data['bot_id'] : '';
+            $uid = !empty($data['uid']) ? $data['uid'] : '';
+            $conversation_id = !empty($data['conversation_id']) ? $data['conversation_id'] : '';
+            $question = !empty($data['question']) ? $data['question'] : [];
+
+
+            if(empty($bot_id)){
+                return errorJson('智能体ID不能为空');
+            }
+
+            if(empty($conversation_id)){
+                return errorJson('会话ID不能为空');
+            }
+
+            if(empty($question)){
+                return errorJson('问题不能为空');
+            }
+
+            // 构建请求数据
+            $params = [
+                'bot_id' => strval($bot_id),
+                'user_id' => strval($uid),
+                'additional_messages' => $question,
+                'stream' => false,
+                'auto_save_history' => true
+            ];
+
+            $url = $this->apiUrl . '/v3/chat?conversation_id='.$conversation_id;
+            $result = requestCurl($url, $params, 'POST', $this->headers, 'json');
+            $result = json_decode($result, true);
+            if ($result['code'] != 0) {
+                return errorJson($result['msg'], $result['code']);
+            }
+            return json_encode(['code' => 200, 'msg' => '发送成功','data' => $result['data']]);
+
+        } catch (\Exception $e) {
+            return errorJson('创建对话失败：' . $e->getMessage());
+        }
+    }
+
+
+    public function getConversationChat($data = [])
+    {
+        $conversation_id = !empty($data['conversation_id']) ? $data['conversation_id'] : '';
+        $chat_id = !empty($data['chat_id']) ? $data['chat_id'] : '';
+        $url = $this->apiUrl . '/v3/chat/retrieve?conversation_id='.$conversation_id.'&chat_id='.$chat_id;
+        $result = requestCurl($url, [], 'GET', $this->headers, 'json');
+        $result = json_decode($result, true);
+        if ($result['code'] != 0) {
+            return errorJson($result['msg'], $result['code']);
+        }
+        return json_encode(['code' => 200, 'msg' => '发送成功','data' => $result['data']]);
+    }
+
+
+    public function listConversationMessage($data = [])
+    {
+        $conversation_id = !empty($data['conversation_id']) ? $data['conversation_id'] : '';
+        $chat_id = !empty($data['chat_id']) ? $data['chat_id'] : '';
+        $url = $this->apiUrl . '/v3/chat/message/list?conversation_id='.$conversation_id.'&chat_id='.$chat_id;
+        $result = requestCurl($url, [], 'GET', $this->headers, 'json');
+        $result = json_decode($result, true);
+        if ($result['code'] != 0) {
+            return errorJson($result['msg'], $result['code']);
+        }
+        return json_encode(['code' => 200, 'msg' => '发送成功','data' => $result['data']]);
+    }
+
+}
\ No newline at end of file
diff --git a/Server/application/ai/controller/OpenAi.php b/Server/application/ai/controller/OpenAi.php
index 3c4f3db4..b71491f6 100644
--- a/Server/application/ai/controller/OpenAi.php
+++ b/Server/application/ai/controller/OpenAi.php
@@ -3,7 +3,7 @@
 namespace app\ai\controller;
 
 use think\facade\Env;
-class OpenAi
+class OpenAI
 {
     protected $apiUrl;
     protected $apiKey;
diff --git a/Server/application/chukebao/controller/AiChatController.php b/Server/application/chukebao/controller/AiChatController.php
index 75d0416e..919204f0 100644
--- a/Server/application/chukebao/controller/AiChatController.php
+++ b/Server/application/chukebao/controller/AiChatController.php
@@ -2,37 +2,448 @@
 
 namespace app\chukebao\controller;
 
+use app\ai\controller\CozeAI;
 use app\ai\controller\DouBaoAI;
+use app\api\model\WechatFriendModel;
 use app\chukebao\controller\TokensRecordController as tokensRecord;
+use app\chukebao\model\AiSettings;
+use app\chukebao\model\FriendSettings;
 use app\chukebao\model\TokensCompany;
 use library\ResponseHelper;
 use think\Db;
 
+/**
+ * AI聊天控制器
+ * 负责处理与好友的AI对话功能
+ */
 class AiChatController extends BaseController
 {
-    public function index(){
+    // 对话状态常量
+    const STATUS_CREATED = 'created';           // 对话已创建
+    const STATUS_IN_PROGRESS = 'in_progress';   // 智能体正在处理中
+    const STATUS_COMPLETED = 'completed';       // 智能体已完成处理
+    const STATUS_FAILED = 'failed';             // 对话失败
+    const STATUS_REQUIRES_ACTION = 'requires_action'; // 对话中断，需要进一步处理
+    const STATUS_CANCELED = 'canceled';         // 对话已取消
+
+    // 轮询配置
+    const MAX_RETRY_TIMES = 30;    // 最大重试次数
+    const RETRY_INTERVAL = 2;      // 重试间隔（秒）
+
+    /**
+     * AI聊天主入口
+     * 
+     * @return \think\response\Json
+     */
+    public function index()
+    {
+        try {
+            // 1. 参数验证和初始化
+            $params = $this->validateAndInitParams();
+            if ($params === false) {
+                return ResponseHelper::error('参数验证失败');
+            }
+
+            // 2. 验证Tokens余额
+            if (!$this->checkTokensBalance($params['companyId'])) {
+                return ResponseHelper::error('Tokens余额不足，请充值后再试');
+            }
+
+            // 3. 获取AI配置
+            $setting = $this->getAiSettings($params['companyId']);
+            if (!$setting) {
+                return ResponseHelper::error('未找到AI配置信息，请先配置AI策略');
+            }
+
+            // 4. 获取好友AI设置
+            $friendSettings = $this->getFriendSettings($params['companyId'], $params['friendId']);
+            if (!$friendSettings) {
+                return ResponseHelper::error('该好友未配置或未开启AI功能');
+            }
+
+            // 5. 确保会话存在
+            $conversationId = $this->ensureConversation($friendSettings, $setting, $params);
+            if (!$conversationId) {
+                return ResponseHelper::error('创建会话失败');
+            }
+
+            // 6. 获取历史消息
+            $msgData = $this->getHistoryMessages($params['friendId'], $friendSettings);
+
+            // 7. 创建AI对话
+            $chatId = $this->createAiChat($setting, $friendSettings, $msgData);
+            if (!$chatId) {
+                return ResponseHelper::error('创建对话失败');
+            }
+
+            // 8. 等待AI处理完成（轮询）
+            $chatResult = $this->waitForChatCompletion($conversationId, $chatId);
+            if (!$chatResult) {
+                return ResponseHelper::error('AI处理超时或失败');
+            }
+
+            // 9. 扣除Tokens
+            $this->consumeTokens($chatResult, $params, $friendSettings);
+
+            // 10. 获取对话消息
+            $messages = $this->getChatMessages($conversationId, $chatId);
+            if (!$messages) {
+                return ResponseHelper::error('获取对话消息失败');
+            }
+            return ResponseHelper::success($messages[1]['content'], '对话成功');
+        } catch (\Exception $e) {
+            \think\facade\Log::error('AI聊天异常：' . $e->getMessage());
+            return ResponseHelper::error('系统异常：' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 验证和初始化参数
+     * 
+     * @return array|false
+     */
+    private function validateAndInitParams()
+    {
         $userId = $this->getUserInfo('id');
         $companyId = $this->getUserInfo('companyId');
-        $friendId =  $this->request->param('friendId', '');
-        $wechatAccountId =  $this->request->param('wechatAccountId', '');
-        $content =  $this->request->param('content', '');
+        $friendId = $this->request->param('friendId', '');
+        $wechatAccountId = $this->request->param('wechatAccountId', '');
 
-        if (empty($wechatAccountId) || empty($friendId)){
+        if (empty($wechatAccountId) || empty($friendId)) {
+            return false;
+        }
+
+        return [
+            'userId' => $userId,
+            'companyId' => $companyId,
+            'friendId' => $friendId,
+            'wechatAccountId' => $wechatAccountId
+        ];
+    }
+
+    /**
+     * 检查Tokens余额
+     * 
+     * @param int $companyId 公司ID
+     * @return bool
+     */
+    private function checkTokensBalance($companyId)
+    {
+        $tokens = TokensCompany::where(['companyId' => $companyId])->value('tokens');
+        return !empty($tokens) && $tokens > 1000;
+    }
+
+    /**
+     * 获取AI配置
+     * 
+     * @param int $companyId 公司ID
+     * @return AiSettings|null
+     */
+    private function getAiSettings($companyId)
+    {
+        return AiSettings::where(['companyId' => $companyId])->find();
+    }
+
+    /**
+     * 获取好友AI设置
+     * 
+     * @param int $companyId 公司ID
+     * @param string $friendId 好友ID
+     * @return FriendSettings|null
+     */
+    private function getFriendSettings($companyId, $friendId)
+    {
+        $friendSettings = FriendSettings::where([
+            'companyId' => $companyId,
+            'friendId' => $friendId
+        ])->find();
+
+        if (empty($friendSettings) || $friendSettings->type == 0) {
+            return null;
+        }
+
+        return $friendSettings;
+    }
+
+    /**
+     * 确保会话存在
+     * 
+     * @param FriendSettings $friendSettings 好友设置
+     * @param AiSettings $setting AI设置
+     * @param array $params 参数
+     * @return string|null 会话ID
+     */
+    private function ensureConversation($friendSettings, $setting, $params)
+    {
+        if (!empty($friendSettings->conversationId)) {
+            return $friendSettings->conversationId;
+        }
+
+        // 创建新会话
+        $cozeAI = new CozeAI();
+        $data = [
+            'bot_id' => $setting->botId,
+            'name' => '与好友' . $params['friendId'] . '的对话',
+            'meta_data' => [
+                'friendId' => (string)$friendSettings->friendId,
+                'wechatAccountId' => (string)$params['wechatAccountId'],
+            ],
+        ];
+
+        $res = $cozeAI->createConversation($data);
+        $res = json_decode($res, true);
+
+        if ($res['code'] != 200) {
+            \think\facade\Log::error('创建会话失败：' . ($res['msg'] ?? '未知错误'));
+            return null;
+        }
+
+        // 保存会话ID
+        $conversationId = $res['data']['id'];
+        $friendSettings->conversationId = $conversationId;
+        $friendSettings->conversationTime = time();
+        $friendSettings->save();
+
+        return $conversationId;
+    }
+
+    /**
+     * 获取历史消息
+     * 
+     * @param string $friendId 好友ID
+     * @param FriendSettings $friendSettings 好友设置
+     * @return array
+     */
+    private function getHistoryMessages($friendId, $friendSettings)
+    {
+        $msgData = [];
+
+        // 会话创建时间小于1分钟，加载最近10条消息
+        if ($friendSettings->conversationTime >= time() - 60) {
+            $messages = Db::table('s2_wechat_message')
+                ->where('wechatFriendId', $friendId)
+                ->where('msgType', '<', 50)
+                ->order('wechatTime desc')
+                ->field('id,content,msgType,isSend,wechatTime')
+                ->limit(10)
+                ->select();
+
+            // 按时间正序排列
+            usort($messages, function ($a, $b) {
+                return $a['wechatTime'] <=> $b['wechatTime'];
+            });
+
+            // 处理聊天数据
+            foreach ($messages as $val) {
+                if (empty($val['content'])) {
+                    continue;
+                }
+
+                $msg = [
+                    'role' => empty($val['isSend']) ? 'user' : 'assistant',
+                    'content' => $val['content'],
+                    'type' => empty($val['isSend']) ? 'question' : 'answer',
+                    'content_type' => 'text'
+                ];
+                $msgData[] = $msg;
+            }
+        } else {
+            // 只加载最新一条用户消息
+            $message = Db::table('s2_wechat_message')
+                ->where('wechatFriendId', $friendId)
+                ->where('msgType', '<', 50)
+                ->where('isSend', 0)
+                ->order('wechatTime desc')
+                ->field('id,content,msgType,isSend,wechatTime')
+                ->find();
+
+            if (!empty($message) && !empty($message['content'])) {
+                $msgData[] = [
+                    'role' => 'user',
+                    'content' => $message['content'],
+                    'type' => 'question',
+                    'content_type' => 'text'
+                ];
+            }
+        }
+
+        return $msgData;
+    }
+
+    /**
+     * 创建AI对话
+     * 
+     * @param AiSettings $setting AI设置
+     * @param FriendSettings $friendSettings 好友设置
+     * @param array $msgData 消息数据
+     * @return string|null 对话ID
+     */
+    private function createAiChat($setting, $friendSettings, $msgData)
+    {
+        $cozeAI = new CozeAI();
+        $data = [
+            'bot_id' => $setting->botId,
+            'uid' => $friendSettings->friendId,
+            'conversation_id' => $friendSettings->conversationId,
+            'question' => $msgData,
+        ];
+
+        $res = $cozeAI->createChat($data);
+        $res = json_decode($res, true);
+
+        if ($res['code'] != 200) {
+            \think\facade\Log::error('创建对话失败：' . ($res['msg'] ?? '未知错误'));
+            return null;
+        }
+
+        return $res['data']['id'];
+    }
+
+    /**
+     * 等待AI处理完成（轮询机制）
+     * 
+     * @param string $conversationId 会话ID
+     * @param string $chatId 对话ID
+     * @return array|null
+     */
+    private function waitForChatCompletion($conversationId, $chatId)
+    {
+        $cozeAI = new CozeAI();
+        $retryCount = 0;
+
+        while ($retryCount < self::MAX_RETRY_TIMES) {
+            // 获取对话状态
+            $res = $cozeAI->getConversationChat([
+                'conversation_id' => $conversationId,
+                'chat_id' => $chatId,
+            ]);
+            $res = json_decode($res, true);
+
+            if ($res['code'] != 200) {
+                \think\facade\Log::error('获取对话状态失败：' . ($res['msg'] ?? '未知错误'));
+                return null;
+            }
+
+            $status = $res['data']['status'] ?? '';
+
+            // 处理不同的状态
+            switch ($status) {
+                case self::STATUS_COMPLETED:
+                    // 对话完成，返回结果
+                    return $res['data'];
+
+                case self::STATUS_IN_PROGRESS:
+                case self::STATUS_CREATED:
+                    // 继续等待
+                    $retryCount++;
+                    sleep(self::RETRY_INTERVAL);
+                    break;
+
+                case self::STATUS_FAILED:
+                    \think\facade\Log::error('对话失败，chat_id: ' . $chatId);
+                    return null;
+
+                case self::STATUS_CANCELED:
+                    \think\facade\Log::error('对话已取消，chat_id: ' . $chatId);
+                    return null;
+
+                case self::STATUS_REQUIRES_ACTION:
+                    \think\facade\Log::warning('对话需要进一步处理，chat_id: ' . $chatId);
+                    return null;
+
+                default:
+                    \think\facade\Log::error('未知状态：' . $status);
+                    return null;
+            }
+        }
+
+        // 超时
+        \think\facade\Log::error('对话处理超时，chat_id: ' . $chatId);
+        return null;
+    }
+
+    /**
+     * 扣除Tokens
+     * 
+     * @param array $chatResult 对话结果
+     * @param array $params 参数
+     * @param FriendSettings $friendSettings 好友设置
+     */
+    private function consumeTokens($chatResult, $params, $friendSettings)
+    {
+        $tokenCount = $chatResult['usage']['token_count'] ?? 0;
+        
+        if (empty($tokenCount)) {
+            return;
+        }
+
+        // 获取好友昵称
+        $nickname = WechatFriendModel::where('id', $friendSettings->friendId)->value('nickname');
+        $remarks = !empty($nickname) ? '与好友【' . $nickname . '】聊天' : '与好友聊天';
+
+        // 扣除Tokens
+        $tokensRecord = new tokensRecord();
+        $data = [
+            'tokens' => $tokenCount * 20,
+            'type' => 0,
+            'form' => 1,
+            'wechatAccountId' => $params['wechatAccountId'],
+            'friendIdOrGroupId' => $params['friendId'],
+            'remarks' => $remarks,
+        ];
+        
+        $tokensRecord->consumeTokens($data);
+    }
+
+    /**
+     * 获取对话消息
+     * 
+     * @param string $conversationId 会话ID
+     * @param string $chatId 对话ID
+     * @return array|null
+     */
+    private function getChatMessages($conversationId, $chatId)
+    {
+        $cozeAI = new CozeAI();
+        $res = $cozeAI->listConversationMessage([
+            'conversation_id' => $conversationId,
+            'chat_id' => $chatId,
+        ]);
+        $res = json_decode($res, true);
+
+        if ($res['code'] != 200) {
+            \think\facade\Log::error('获取对话消息失败：' . ($res['msg'] ?? '未知错误'));
+            return null;
+        }
+
+        return $res['data'] ?? [];
+    }
+
+
+    public function index2222()
+    {
+        $userId = $this->getUserInfo('id');
+        $companyId = $this->getUserInfo('companyId');
+        $friendId = $this->request->param('friendId', '');
+        $wechatAccountId = $this->request->param('wechatAccountId', '');
+        $content = $this->request->param('content', '');
+
+        if (empty($wechatAccountId) || empty($friendId)) {
             return ResponseHelper::error('参数缺失');
         }
 
         $tokens = TokensCompany::where(['companyId' => $companyId])->value('tokens');
-        if (empty($tokens) || $tokens <= 0){
+        if (empty($tokens) || $tokens <= 0) {
             return ResponseHelper::error('用户Tokens余额不足');
         }
 
 
         //读取AI配置
-        $setting = Db::name('ai_settings')->where(['companyId' => $companyId,'userId' => $userId])->find();
-        if(empty($setting)){
+        $setting = Db::name('ai_settings')->where(['companyId' => $companyId, 'userId' => $userId])->find();
+        if (empty($setting)) {
             return ResponseHelper::error('未找到配置信息，请先配置AI策略');
         }
-        $config = json_decode($setting['config'],true);
+        $config = json_decode($setting['config'], true);
         $modelSetting = $config['modelSetting'];
         $round = isset($config['round']) ? $config['round'] : 10;
 
@@ -45,20 +456,20 @@ class AiChatController extends BaseController
             ->limit($round)
             ->select();
 
-        usort($messages, function($a, $b) {
+        usort($messages, function ($a, $b) {
             return $a['wechatTime'] <=> $b['wechatTime'];
         });
 
         //处理聊天数据
         $msg = [];
-        foreach ($messages as $val){
-            if (empty($val['content'])){
+        foreach ($messages as $val) {
+            if (empty($val['content'])) {
                 continue;
             }
-            if (!empty($val['isSend'])){
-                $msg[] =  '客服：' . $val['content'];
-            }else{
-                $msg[] =  '用户：' . $val['content'];
+            if (!empty($val['isSend'])) {
+                $msg[] = '客服：' . $val['content'];
+            } else {
+                $msg[] = '用户：' . $val['content'];
             }
         }
         $content = implode("\n", $msg);
@@ -78,13 +489,13 @@ class AiChatController extends BaseController
         //AI处理
         $ai = new DouBaoAI();
         $res = $ai->text($params);
-        $res = json_decode($res,true);
+        $res = json_decode($res, true);
 
         if ($res['code'] == 200) {
             //扣除Tokens
             $tokensRecord = new  tokensRecord();
             $nickname = Db::table('s2_wechat_friend')->where(['id' => $friendId])->value('nickname');
-            $remarks = !empty($nickname) ? '与好友【'.$nickname.'】聊天' : '与好友聊天';
+            $remarks = !empty($nickname) ? '与好友【' . $nickname . '】聊天' : '与好友聊天';
             $data = [
                 'tokens' => $res['data']['token'],
                 'type' => 0,
@@ -95,7 +506,7 @@ class AiChatController extends BaseController
             ];
             $tokensRecord->consumeTokens($data);
             return ResponseHelper::success($res['data']['content']);
-        }else{
+        } else {
             return ResponseHelper::error($res['msg']);
         }
 
diff --git a/Server/application/chukebao/model/AiKnowledgeBase.php b/Server/application/chukebao/model/AiKnowledgeBase.php
new file mode 100644
index 00000000..2e08c8f7
--- /dev/null
+++ b/Server/application/chukebao/model/AiKnowledgeBase.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace app\chukebao\model;
+
+use think\Model;
+
+/**
+ * AI知识库模型
+ */
+class AiKnowledgeBase extends Model
+{
+    // 设置表名
+    protected $name = 'ai_knowledge_base';
+    
+    // 设置主键
+    protected $pk = 'id';
+    
+    // 设置JSON字段
+    protected $json = ['label'];
+    
+    // 设置JSON字段自动转换为数组
+    protected $jsonAssoc = true;
+    
+    /**
+     * 关联知识库类型
+     */
+    public function type()
+    {
+        return $this->belongsTo(AiKnowledgeBaseType::class, 'typeId', 'id');
+    }
+    
+    /**
+     * 获取有效的知识库列表（未删除）
+     */
+    public static function getValidList($companyId, $typeId = null)
+    {
+        $where = [
+            ['isDel', '=', 0],
+            ['companyId', '=', $companyId]
+        ];
+        
+        if ($typeId !== null) {
+            $where[] = ['typeId', '=', $typeId];
+        }
+        
+        return self::where($where)
+            ->with(['type'])
+            ->order('createTime', 'desc')
+            ->select();
+    }
+}
+
diff --git a/Server/application/chukebao/model/AiKnowledgeBaseType.php b/Server/application/chukebao/model/AiKnowledgeBaseType.php
new file mode 100644
index 00000000..80fa9f2d
--- /dev/null
+++ b/Server/application/chukebao/model/AiKnowledgeBaseType.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace app\chukebao\model;
+
+use think\Model;
+
+/**
+ * AI知识库类型模型
+ */
+class AiKnowledgeBaseType extends Model
+{
+    // 设置表名
+    protected $name = 'ai_knowledge_base_type';
+    
+    // 设置主键
+    protected $pk = 'id';
+    
+    // 设置JSON字段
+    protected $json = ['label'];
+    
+    // 设置JSON字段自动转换为数组
+    protected $jsonAssoc = true;
+    
+    // 类型常量
+    const TYPE_SYSTEM = 0; // 系统类型
+    const TYPE_USER = 1;   // 用户创建类型
+    
+    /**
+     * 获取有效的类型列表（未删除）
+     */
+    public static function getValidList($companyId, $includeSystem = true)
+    {
+        $where = [
+            ['isDel', '=', 0]
+        ];
+        
+        if ($includeSystem) {
+            $where[] = ['type|companyId', 'in', [0, $companyId]];
+        } else {
+            $where[] = ['companyId', '=', $companyId];
+            $where[] = ['type', '=', self::TYPE_USER];
+        }
+        
+        return self::where($where)
+            ->order('createTime', 'desc')
+            ->select();
+    }
+    
+    /**
+     * 检查是否为系统类型
+     */
+    public function isSystemType()
+    {
+        return $this->type == self::TYPE_SYSTEM;
+    }
+}
+
diff --git a/Server/application/chukebao/model/AiSettings.php b/Server/application/chukebao/model/AiSettings.php
new file mode 100644
index 00000000..7808bd14
--- /dev/null
+++ b/Server/application/chukebao/model/AiSettings.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace app\chukebao\model;
+
+use think\Model;
+class AiSettings extends Model
+{
+    protected $pk = 'id';
+    protected $name  = 'ai_settings';
+
+    // 自动写入时间戳
+    protected $autoWriteTimestamp = true;
+    protected $createTime = 'createTime';
+    protected $updateTime = 'updateTime';
+
+
+}
\ No newline at end of file
diff --git a/Server/application/cunkebao/config/route.php b/Server/application/cunkebao/config/route.php
index d865852a..d7f4012e 100644
--- a/Server/application/cunkebao/config/route.php
+++ b/Server/application/cunkebao/config/route.php
@@ -160,6 +160,26 @@ Route::group('v1/', function () {
 
 
 
+    //AI知识库
+    Route::group('knowledge', function () {
+        Route::get('init', 'app\cunkebao\controller\AiSettingsController@init');
+        Route::get('release', 'app\cunkebao\controller\AiSettingsController@release');
+        Route::get('typeList', 'app\cunkebao\controller\AiKnowledgeBaseController@typeList');
+        Route::get('getList', 'app\cunkebao\controller\AiKnowledgeBaseController@getList');
+        Route::post('add', 'app\cunkebao\controller\AiKnowledgeBaseController@add');
+        //Route::post('edit', 'app\cunkebao\controller\AiKnowledgeBaseController@edit');
+        Route::delete('delete', 'app\cunkebao\controller\AiKnowledgeBaseController@delete');
+        //Route::get('detail', 'app\cunkebao\controller\AiKnowledgeBaseController@detail');
+        Route::post('update', 'app\cunkebao\controller\AiKnowledgeBaseController@update');
+        Route::post('delete', 'app\cunkebao\controller\AiKnowledgeBaseController@delete');
+        Route::post('addType', 'app\cunkebao\controller\AiKnowledgeBaseController@addType');
+        Route::post('editType', 'app\cunkebao\controller\AiKnowledgeBaseController@editType');
+        Route::delete('deleteType', 'app\cunkebao\controller\AiKnowledgeBaseController@deleteType');
+        Route::get('detailType', 'app\cunkebao\controller\AiKnowledgeBaseController@detailType');
+    });
+
+
+
 })->middleware(['jwt']);
 
 
diff --git a/Server/application/cunkebao/controller/AiKnowledgeBaseController.php b/Server/application/cunkebao/controller/AiKnowledgeBaseController.php
new file mode 100644
index 00000000..7ab048a9
--- /dev/null
+++ b/Server/application/cunkebao/controller/AiKnowledgeBaseController.php
@@ -0,0 +1,570 @@
+<?php
+
+namespace app\cunkebao\controller;
+
+use app\ai\controller\CozeAI;
+use app\chukebao\model\AiKnowledgeBaseType;
+use app\chukebao\model\AiKnowledgeBase;
+use app\chukebao\model\AiSettings as AiSettingsModel;
+use library\ResponseHelper;
+
+/**
+ * AI知识库管理控制器
+ * 负责管理AI知识库类型和知识库内容
+ */
+class AiKnowledgeBaseController extends BaseController
+{
+    // ==================== 知识库类型管理 ====================
+
+    /**
+     * 获取知识库类型列表
+     *
+     * @return \think\response\Json
+     */
+    public function typeList()
+    {
+        try {
+            $companyId = $this->getUserInfo('companyId');
+            if (empty($companyId)) {
+                return ResponseHelper::error('公司信息获取失败');
+            }
+
+            // 获取分页参数
+            $page = $this->request->param('page', 1);
+            $pageSize = $this->request->param('pageSize', 20);
+            $includeSystem = $this->request->param('includeSystem', 1); // 是否包含系统类型
+
+            // 构建查询条件
+            $where = [['isDel', '=', 0]];
+
+            if ($includeSystem == 1) {
+                // 包含系统类型和本公司创建的类型
+                $where[] = ['type', '=', AiKnowledgeBaseType::TYPE_SYSTEM];
+                $where[] = ['companyId|type', 'in', [$companyId, 0]];
+            } else {
+                // 只显示本公司创建的类型
+                $where[] = ['companyId', '=', $companyId];
+                $where[] = ['type', '=', AiKnowledgeBaseType::TYPE_USER];
+            }
+
+            // 查询数据
+            $list = AiKnowledgeBaseType::where($where)
+                ->order('type', 'asc') // 系统类型排在前面
+                ->order('createTime', 'desc')
+                ->paginate($pageSize, false, ['page' => $page]);
+
+            return ResponseHelper::success($list, '获取成功');
+
+        } catch (\Exception $e) {
+            return ResponseHelper::error('系统异常：' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 添加知识库类型
+     *
+     * @return \think\response\Json
+     */
+    public function addType()
+    {
+        try {
+            $userId = $this->getUserInfo('id');
+            $companyId = $this->getUserInfo('companyId');
+
+            if (empty($companyId)) {
+                return ResponseHelper::error('公司信息获取失败');
+            }
+
+            // 获取参数
+            $name = $this->request->param('name', '');
+            $description = $this->request->param('description', '');
+            $label = $this->request->param('label', []);
+            $prompt = $this->request->param('prompt', '');
+
+            // 参数验证
+            if (empty($name)) {
+                return ResponseHelper::error('类型名称不能为空');
+            }
+
+            // 检查名称是否重复
+            $exists = AiKnowledgeBaseType::where([
+                ['companyId', '=', $companyId],
+                ['name', '=', $name],
+                ['isDel', '=', 0]
+            ])->find();
+
+            if ($exists) {
+                return ResponseHelper::error('该类型名称已存在');
+            }
+
+            // 创建类型
+            $typeModel = new AiKnowledgeBaseType();
+            $data = [
+                'type' => AiKnowledgeBaseType::TYPE_USER,
+                'name' => $name,
+                'description' => $description,
+                'label' => json_decode($label,256),
+                'prompt' => $prompt,
+                'companyId' => $companyId,
+                'userId' => $userId,
+                'createTime' => time(),
+                'updateTime' => time(),
+                'isDel' => 0
+            ];
+
+            if ($typeModel->save($data)) {
+                return ResponseHelper::success(['id' => $typeModel->id], '添加成功');
+            } else {
+                return ResponseHelper::error('添加失败');
+            }
+
+        } catch (\Exception $e) {
+            return ResponseHelper::error('系统异常：' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 编辑知识库类型
+     *
+     * @return \think\response\Json
+     */
+    public function editType()
+    {
+        try {
+            $companyId = $this->getUserInfo('companyId');
+            if (empty($companyId)) {
+                return ResponseHelper::error('公司信息获取失败');
+            }
+
+            // 获取参数
+            $id = $this->request->param('id', 0);
+            $name = $this->request->param('name', '');
+            $description = $this->request->param('description', '');
+            $label = $this->request->param('label', []);
+            $prompt = $this->request->param('prompt', '');
+
+            // 参数验证
+            if (empty($id)) {
+                return ResponseHelper::error('类型ID不能为空');
+            }
+
+            if (empty($name)) {
+                return ResponseHelper::error('类型名称不能为空');
+            }
+
+            // 查找类型
+            $typeModel = AiKnowledgeBaseType::where([
+                ['id', '=', $id],
+                ['isDel', '=', 0]
+            ])->find();
+
+            if (!$typeModel) {
+                return ResponseHelper::error('类型不存在');
+            }
+
+            // 检查是否为系统类型
+            if ($typeModel->isSystemType()) {
+                return ResponseHelper::error('系统类型不允许编辑');
+            }
+
+            // 检查权限（只能编辑本公司的类型）
+            if ($typeModel->companyId != $companyId) {
+                return ResponseHelper::error('无权限编辑该类型');
+            }
+
+            // 检查名称是否重复（排除自己）
+            $exists = AiKnowledgeBaseType::where([
+                ['companyId', '=', $companyId],
+                ['name', '=', $name],
+                ['id', '<>', $id],
+                ['isDel', '=', 0]
+            ])->find();
+
+            if ($exists) {
+                return ResponseHelper::error('该类型名称已存在');
+            }
+
+            // 更新数据
+            $typeModel->name = $name;
+            $typeModel->description = $description;
+            $typeModel->label = $label;
+            $typeModel->prompt = $prompt;
+            $typeModel->updateTime = time();
+
+            if ($typeModel->save()) {
+                return ResponseHelper::success([], '更新成功');
+            } else {
+                return ResponseHelper::error('更新失败');
+            }
+
+        } catch (\Exception $e) {
+            return ResponseHelper::error('系统异常：' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 删除知识库类型
+     *
+     * @return \think\response\Json
+     */
+    public function deleteType()
+    {
+        try {
+            $companyId = $this->getUserInfo('companyId');
+            if (empty($companyId)) {
+                return ResponseHelper::error('公司信息获取失败');
+            }
+
+            // 获取参数
+            $id = $this->request->param('id', 0);
+
+            // 参数验证
+            if (empty($id)) {
+                return ResponseHelper::error('类型ID不能为空');
+            }
+
+            // 查找类型
+            $typeModel = AiKnowledgeBaseType::where([
+                ['id', '=', $id],
+                ['isDel', '=', 0]
+            ])->find();
+
+            if (!$typeModel) {
+                return ResponseHelper::error('类型不存在');
+            }
+
+            // 检查是否为系统类型
+            if ($typeModel->isSystemType()) {
+                return ResponseHelper::error('系统类型不允许删除');
+            }
+
+            // 检查权限（只能删除本公司的类型）
+            if ($typeModel->companyId != $companyId) {
+                return ResponseHelper::error('无权限删除该类型');
+            }
+
+            // 检查是否有关联的知识库
+            $hasKnowledge = AiKnowledgeBase::where([
+                ['typeId', '=', $id],
+                ['isDel', '=', 0]
+            ])->count();
+
+            if ($hasKnowledge > 0) {
+                return ResponseHelper::error('该类型下存在知识库，无法删除');
+            }
+
+            // 软删除
+            $typeModel->isDel = 1;
+            $typeModel->delTime = time();
+
+            if ($typeModel->save()) {
+                return ResponseHelper::success([], '删除成功');
+            } else {
+                return ResponseHelper::error('删除失败');
+            }
+
+        } catch (\Exception $e) {
+            return ResponseHelper::error('系统异常：' . $e->getMessage());
+        }
+    }
+
+    // ==================== 知识库管理 ====================
+
+    /**
+     * 获取知识库列表
+     *
+     * @return \think\response\Json
+     */
+    public function getList()
+    {
+        try {
+            $companyId = $this->getUserInfo('companyId');
+            if (empty($companyId)) {
+                return ResponseHelper::error('公司信息获取失败');
+            }
+
+            // 获取分页参数
+            $page = $this->request->param('page', 1);
+            $pageSize = $this->request->param('pageSize', 20);
+            $typeId = $this->request->param('typeId', 0); // 类型筛选
+            $keyword = $this->request->param('keyword', ''); // 关键词搜索
+
+            // 构建查询条件
+            $where = [
+                ['isDel', '=', 0],
+                ['companyId', '=', $companyId]
+            ];
+
+            if ($typeId > 0) {
+                $where[] = ['typeId', '=', $typeId];
+            }
+
+            if (!empty($keyword)) {
+                $where[] = ['name', 'like', '%' . $keyword . '%'];
+            }
+
+            // 查询数据
+            $list = AiKnowledgeBase::where($where)
+                ->with(['type'])
+                ->order('createTime', 'desc')
+                ->paginate($pageSize, false, ['page' => $page]);
+
+            return ResponseHelper::success($list, '获取成功');
+
+        } catch (\Exception $e) {
+            return ResponseHelper::error('系统异常：' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 添加知识库
+     *
+     * @return \think\response\Json
+     */
+    public function add()
+    {
+        try {
+            $userId = $this->getUserInfo('id');
+            $companyId = $this->getUserInfo('companyId');
+
+            if (empty($companyId)) {
+                return ResponseHelper::error('公司信息获取失败');
+            }
+
+            $datasetId = AiSettingsModel::where(['companyId' => $companyId])->value('datasetId');
+
+
+            // 获取参数
+            $typeId = $this->request->param('typeId', 0);
+            $name = $this->request->param('name', '');
+            $label = $this->request->param('label', []);
+            $fileUrl = $this->request->param('fileUrl', '');
+
+            // 参数验证
+            if (empty($typeId)) {
+                return ResponseHelper::error('请选择知识库类型');
+            }
+
+            if (empty($name)) {
+                return ResponseHelper::error('知识库名称不能为空');
+            }
+
+            if (empty($fileUrl)) {
+                return ResponseHelper::error('文件地址不能为空');
+            }
+
+            // 检查类型是否存在
+            $typeExists = AiKnowledgeBaseType::where([
+                ['id', '=', $typeId],
+                ['isDel', '=', 0]
+            ])->find();
+
+            if (!$typeExists) {
+                return ResponseHelper::error('知识库类型不存在');
+            }
+
+            // 创建知识库
+            $knowledgeModel = new AiKnowledgeBase();
+            $data = [
+                'typeId' => $typeId,
+                'name' => $name,
+                'label' => json_encode($label, 256),
+                'fileUrl' => $fileUrl,
+                'companyId' => $companyId,
+                'userId' => $userId,
+                'createTime' => time(),
+                'updateTime' => time(),
+                'isDel' => 0
+            ];
+
+            if ($knowledgeModel->save($data)) {
+                if (!empty($datasetId)) {
+                    $createDocumentData = [
+                        'filePath' => $fileUrl,
+                        'fileName' => $name,
+                        'dataset_id' => $datasetId
+                    ];
+                    $cozeAI = new CozeAI();
+                    $result = $cozeAI->createDocument($createDocumentData);
+                    $result = json_decode($result, true);
+                    if ($result['code'] == 200) {
+                        $documentId = $result['data'][0]['document_id'];
+                        AiKnowledgeBase::where('id', $knowledgeModel->id)->update(['documentId' => $documentId, 'updateTime' => time()]);
+                        AiSettingsModel::where(['companyId' => $companyId])->update(['isRelease' => 0,'updateTime' => time()]);
+                    }
+                }
+                return ResponseHelper::success(['id' => $knowledgeModel->id], '添加成功');
+            } else {
+                return ResponseHelper::error('添加失败');
+            }
+
+        } catch (\Exception $e) {
+            return ResponseHelper::error('系统异常：' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 编辑知识库
+     *
+     * @return \think\response\Json
+     */
+    public function edit()
+    {
+        try {
+            $companyId = $this->getUserInfo('companyId');
+            if (empty($companyId)) {
+                return ResponseHelper::error('公司信息获取失败');
+            }
+
+            // 获取参数
+            $id = $this->request->param('id', 0);
+            $typeId = $this->request->param('typeId', 0);
+            $name = $this->request->param('name', '');
+            $label = $this->request->param('label', []);
+            $fileUrl = $this->request->param('fileUrl', '');
+
+            // 参数验证
+            if (empty($id)) {
+                return ResponseHelper::error('知识库ID不能为空');
+            }
+
+            if (empty($typeId)) {
+                return ResponseHelper::error('请选择知识库类型');
+            }
+
+            if (empty($name)) {
+                return ResponseHelper::error('知识库名称不能为空');
+            }
+
+            // 查找知识库
+            $knowledgeModel = AiKnowledgeBase::where([
+                ['id', '=', $id],
+                ['companyId', '=', $companyId],
+                ['isDel', '=', 0]
+            ])->find();
+
+            if (!$knowledgeModel) {
+                return ResponseHelper::error('知识库不存在或无权限编辑');
+            }
+
+            // 检查类型是否存在
+            $typeExists = AiKnowledgeBaseType::where([
+                ['id', '=', $typeId],
+                ['isDel', '=', 0]
+            ])->find();
+
+            if (!$typeExists) {
+                return ResponseHelper::error('知识库类型不存在');
+            }
+
+            // 更新数据
+            $knowledgeModel->typeId = $typeId;
+            $knowledgeModel->name = $name;
+            $knowledgeModel->label = json_encode($label, 256);
+            if (!empty($fileUrl)) {
+                $knowledgeModel->fileUrl = $fileUrl;
+            }
+            $knowledgeModel->updateTime = time();
+
+            if ($knowledgeModel->save()) {
+                return ResponseHelper::success([], '更新成功');
+            } else {
+                return ResponseHelper::error('更新失败');
+            }
+
+        } catch (\Exception $e) {
+            return ResponseHelper::error('系统异常：' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 删除知识库
+     *
+     * @return \think\response\Json
+     */
+    public function delete()
+    {
+        try {
+            $companyId = $this->getUserInfo('companyId');
+            if (empty($companyId)) {
+                return ResponseHelper::error('公司信息获取失败');
+            }
+
+            // 获取参数
+            $id = $this->request->param('id', 0);
+
+            // 参数验证
+            if (empty($id)) {
+                return ResponseHelper::error('知识库ID不能为空');
+            }
+
+            // 查找知识库
+            $knowledgeModel = AiKnowledgeBase::where([
+                ['id', '=', $id],
+                ['companyId', '=', $companyId],
+                ['isDel', '=', 0]
+            ])->find();
+
+            if (!$knowledgeModel) {
+                return ResponseHelper::error('知识库不存在或无权限删除');
+            }
+
+            // 软删除
+            $knowledgeModel->isDel = 1;
+            $knowledgeModel->delTime = time();
+
+            if ($knowledgeModel->save()) {
+                if (!empty($knowledgeModel->documentId)){
+                    $cozeAI = new CozeAI();
+                    $cozeAI->deleteDocument([$knowledgeModel->documentId]);
+                    AiSettingsModel::where(['companyId' => $companyId])->update(['isRelease' => 0,'updateTime' => time()]);
+                }
+                return ResponseHelper::success([], '删除成功');
+            } else {
+                return ResponseHelper::error('删除失败');
+            }
+
+        } catch (\Exception $e) {
+            return ResponseHelper::error('系统异常：' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 获取知识库详情
+     *
+     * @return \think\response\Json
+     */
+    public function detail()
+    {
+        try {
+            $companyId = $this->getUserInfo('companyId');
+            if (empty($companyId)) {
+                return ResponseHelper::error('公司信息获取失败');
+            }
+
+            // 获取参数
+            $id = $this->request->param('id', 0);
+
+            // 参数验证
+            if (empty($id)) {
+                return ResponseHelper::error('知识库ID不能为空');
+            }
+
+            // 查找知识库
+            $knowledge = AiKnowledgeBase::where([
+                ['id', '=', $id],
+                ['companyId', '=', $companyId],
+                ['isDel', '=', 0]
+            ])->with(['type'])->find();
+
+            if (!$knowledge) {
+                return ResponseHelper::error('知识库不存在或无权限查看');
+            }
+
+            return ResponseHelper::success($knowledge, '获取成功');
+
+        } catch (\Exception $e) {
+            return ResponseHelper::error('系统异常：' . $e->getMessage());
+        }
+    }
+}
\ No newline at end of file
diff --git a/Server/application/cunkebao/controller/AiSettingsController.php b/Server/application/cunkebao/controller/AiSettingsController.php
new file mode 100644
index 00000000..8eb41423
--- /dev/null
+++ b/Server/application/cunkebao/controller/AiSettingsController.php
@@ -0,0 +1,344 @@
+<?php
+
+namespace app\cunkebao\controller;
+
+use app\ai\controller\CozeAI;
+use app\api\model\CompanyModel;
+use app\chukebao\model\AiSettings as AiSettingsModel;
+use library\ResponseHelper;
+
+/**
+ * AI设置控制器
+ * 负责管理公司的AI智能体配置，包括创建智能体、知识库等
+ */
+class AiSettingsController extends BaseController
+{
+    /**
+     * 初始化AI设置
+     * 检查公司是否已有AI配置，如果没有则创建默认配置
+     * 自动创建智能体和知识库
+     *
+     * @return \think\response\Json
+     */
+    public function init()
+    {
+        try {
+            // 获取当前用户信息
+            $userId = $this->getUserInfo('id');
+            $companyId = $this->getUserInfo('companyId');
+
+            if (empty($companyId)) {
+                return ResponseHelper::error('公司信息获取失败');
+            }
+
+            // 查找公司AI设置
+            $settings = $this->getOrCreateAiSettings($companyId, $userId);
+
+            if (!$settings) {
+                return ResponseHelper::error('AI设置初始化失败');
+            }
+
+            // 确保智能体已创建
+            if (empty($settings->botId)) {
+                $botCreated = $this->createBot($settings);
+                if (!$botCreated) {
+                    return ResponseHelper::error('智能体创建失败');
+                }
+            }
+
+            // 确保知识库已创建
+            if (empty($settings->datasetId)) {
+                $knowledgeCreated = $this->createKnowledge($settings);
+                if (!$knowledgeCreated) {
+                    return ResponseHelper::error('知识库创建失败');
+                }
+            }
+            if (!empty($settings->botId) && !empty($settings->datasetId)) {
+                $cozeAI = new CozeAI();
+                $config = json_decode($settings->config,true);
+                $config['bot_id'] = $settings->botId;
+                $config['dataset_ids'] = [$settings->datasetId];
+                $cozeAI->updateBot($config);
+            }
+
+            // 解析配置信息
+            $settings->config = json_decode($settings->config, true);
+
+            return ResponseHelper::success($settings, 'AI设置初始化成功');
+
+        } catch (\Exception $e) {
+            return ResponseHelper::error('系统异常：' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 获取或创建AI设置
+     *
+     * @param int $companyId 公司ID
+     * @param int $userId 用户ID
+     * @return AiSettingsModel|false
+     */
+    private function getOrCreateAiSettings($companyId, $userId)
+    {
+        // 查找现有设置
+        $settings = AiSettingsModel::where(['companyId' => $companyId])->find();
+
+        if (empty($settings)) {
+            // 获取公司信息
+            $company = CompanyModel::where('id', $companyId)->find();
+            if (empty($company)) {
+                return false;
+            }
+
+            // 创建默认配置
+            $config = $this->getDefaultConfig($company['name']);
+
+            // 保存AI设置
+            $settings = $this->saveAiSettings($companyId, $userId, $config);
+        }
+
+        return $settings;
+    }
+
+    /**
+     * 获取默认AI配置
+     *
+     * @param string $companyName 公司名称
+     * @return array
+     */
+    private function getDefaultConfig($companyName)
+    {
+        return [
+            'name' => $companyName,
+            'model_id' => '1737521813', // 默认模型ID
+            'prompt_info' => $this->getDefaultPrompt()
+        ];
+    }
+
+    /**
+     * 获取默认提示词
+     *
+     * @return string
+     */
+    private function getDefaultPrompt()
+    {
+        return '# 角色
+你是一位全能知识客服，作为专业的客服智能体，具备全面的知识储备，能够回答用户提出的各类问题。在回答问题前，会仔细查阅知识库内容，并且始终严格遵守中国法律法规。
+
+## 技能
+### 技能 1: 回答用户问题
+1. 当用户提出问题时，首先在知识库中进行搜索查找相关信息。
+2. 依据知识库中的内容，为用户提供准确、清晰、完整的回答。
+                
+## 限制
+- 仅依据知识库内容回答问题，对于知识库中没有的信息，如实告知用户无法回答。
+- 回答必须严格遵循中国法律法规，不得出现任何违法违规内容。
+- 回答需简洁明了，避免冗长复杂的表述。';
+    }
+
+    /**
+     * 保存AI设置到数据库
+     *
+     * @param int $companyId 公司ID
+     * @param int $userId 用户ID
+     * @param array $config 配置信息
+     * @return AiSettingsModel|false
+     */
+    private function saveAiSettings($companyId, $userId, $config)
+    {
+        $data = [
+            'companyId' => $companyId,
+            'userId' => $userId,
+            'config' => json_encode($config, JSON_UNESCAPED_UNICODE),
+            'createTime' => time(),
+            'updateTime' => time(),
+            'botId' => 0,
+            'datasetId' => 0,
+        ];
+
+        $aiSettingsModel = new AiSettingsModel();
+        $result = $aiSettingsModel->save($data);
+
+        if ($result) {
+            return AiSettingsModel::where(['companyId' => $companyId])->find();
+        }
+
+        return false;
+    }
+
+    /**
+     * 创建AI智能体
+     *
+     * @param AiSettingsModel $settings AI设置对象
+     * @return bool
+     */
+    private function createBot($settings)
+    {
+        if (empty($settings)) {
+            return false;
+        }
+
+        try {
+            $config = json_decode($settings->config, true);
+            if (empty($config)) {
+                return false;
+            }
+
+            // 调用CozeAI创建智能体
+            $cozeAI = new CozeAI();
+            $result = $cozeAI->createBot($config);
+            $result = json_decode($result, true);
+
+            if ($result['code'] != 200) {
+                \think\facade\Log::error('智能体创建失败：' . ($result['msg'] ?? '未知错误'));
+                return false;
+            }
+
+            // 更新智能体ID
+            $settings->botId = $result['data']['bot_id'];
+            $settings->updateTime = time();
+
+            return $settings->save();
+
+        } catch (\Exception $e) {
+            \think\facade\Log::error('创建智能体异常：' . $e->getMessage());
+            return false;
+        }
+    }
+
+    /**
+     * 创建知识库
+     *
+     * @param AiSettingsModel $settings AI设置对象
+     * @return bool
+     */
+    private function createKnowledge($settings)
+    {
+        if (empty($settings)) {
+            return false;
+        }
+
+        try {
+            $config = json_decode($settings->config, true);
+            if (empty($config)) {
+                return false;
+            }
+
+            // 调用CozeAI创建知识库
+            $cozeAI = new CozeAI();
+            $result = $cozeAI->createKnowledge(['name' => $config['name']]);
+            $result = json_decode($result, true);
+
+            if ($result['code'] != 200) {
+                \think\facade\Log::error('知识库创建失败：' . ($result['msg'] ?? '未知错误'));
+                return false;
+            }
+
+            // 更新知识库ID
+            $settings->datasetId = $result['data']['dataset_id'];
+            $settings->updateTime = time();
+
+            return $settings->save();
+
+        } catch (\Exception $e) {
+            \think\facade\Log::error('创建知识库异常：' . $e->getMessage());
+            return false;
+        }
+    }
+
+    /**
+     * 更新AI配置
+     *
+     * @return \think\response\Json
+     */
+    public function updateConfig()
+    {
+        try {
+            $companyId = $this->getUserInfo('companyId');
+            if (empty($companyId)) {
+                return ResponseHelper::error('公司信息获取失败');
+            }
+
+            // 获取请求参数
+            $config = $this->request->param('config', []);
+            if (empty($config)) {
+                return ResponseHelper::error('配置参数不能为空');
+            }
+
+            // 查找现有设置
+            $settings = AiSettingsModel::where(['companyId' => $companyId])->find();
+            if (empty($settings)) {
+                return ResponseHelper::error('AI设置不存在，请先初始化');
+            }
+
+            // 更新配置
+            $settings->config = json_encode($config, JSON_UNESCAPED_UNICODE);
+            $settings->updateTime = time();
+
+            if ($settings->save()) {
+                return ResponseHelper::success([], '配置更新成功');
+            } else {
+                return ResponseHelper::error('配置更新失败');
+            }
+
+        } catch (\Exception $e) {
+            return ResponseHelper::error('系统异常：' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 获取AI设置详情
+     *
+     * @return \think\response\Json
+     */
+    public function getSettings()
+    {
+        try {
+            $companyId = $this->getUserInfo('companyId');
+            if (empty($companyId)) {
+                return ResponseHelper::error('公司信息获取失败');
+            }
+
+            $settings = AiSettingsModel::where(['companyId' => $companyId])->find();
+            if (empty($settings)) {
+                return ResponseHelper::error('AI设置不存在');
+            }
+
+            // 解析配置信息
+            $settings->config = json_decode($settings->config, true);
+
+            return ResponseHelper::success($settings, '获取成功');
+
+        } catch (\Exception $e) {
+            return ResponseHelper::error('系统异常：' . $e->getMessage());
+        }
+    }
+
+
+    /**
+     * 发布智能体
+     * @return \think\response\Json
+     * @throws \Exception
+     */
+    public function release()
+    {
+        $companyId = $this->getUserInfo('companyId');
+        $settings = AiSettingsModel::where(['companyId' => $companyId])->find();
+        if (!empty($settings->isRelease)) {
+            return ResponseHelper::success('', '已发布，无需重复发布');
+        }
+
+        $cozeAI = new CozeAI();
+        $res = $cozeAI->botPublish(['bot_id' => $settings->botId]);
+        $res = json_decode($res, true);
+
+        if ($res['code'] != 200) {
+            $msg = '发布失败失败：' . ($res['msg'] ?? '未知错误');
+            return ResponseHelper::error($msg);
+        }
+        $settings->isRelease = 1;
+        $settings->releaseTime = time();
+        $settings->save();
+        return ResponseHelper::success('', '发布成功');
+    }
+}
\ No newline at end of file
diff --git a/Server/application/cunkebao/model/AiKnowledgeBase.php b/Server/application/cunkebao/model/AiKnowledgeBase.php
new file mode 100644
index 00000000..fbf0664c
--- /dev/null
+++ b/Server/application/cunkebao/model/AiKnowledgeBase.php
@@ -0,0 +1,11 @@
+<?php
+namespace app\cunkebao\model;
+
+use think\Model;
+
+
+class AiKnowledgeBase extends Model
+{
+    // 设置表名
+    protected $name = 'ai_knowledge_base';
+} 
\ No newline at end of file
diff --git a/Server/application/cunkebao/model/AiKnowledgeBaseType.php b/Server/application/cunkebao/model/AiKnowledgeBaseType.php
new file mode 100644
index 00000000..5f8f844a
--- /dev/null
+++ b/Server/application/cunkebao/model/AiKnowledgeBaseType.php
@@ -0,0 +1,11 @@
+<?php
+namespace app\cunkebao\model;
+
+use think\Model;
+
+
+class AiKnowledgeBaseType extends Model
+{
+    // 设置表名
+    protected $name = 'ai_knowledge_base_type';
+} 
\ No newline at end of file

From 5f1a1e9f0eb30b17c6749c5170d362e928cef535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Sat, 25 Oct 2025 18:42:17 +0800
Subject: [PATCH 56/72] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8F=B7=E6=94=AF=E6=8C=81=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=B6=88=E6=81=AF=E5=8F=91=E9=80=81=E5=92=8C=E6=8E=A5?=
 =?UTF-8?q?=E6=94=B6=E9=80=BB=E8=BE=91=EF=BC=8C=E6=9B=B4=E6=96=B0=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E7=8A=B6=E6=80=81=E5=A4=84=E7=90=86=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E5=8D=87=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB=E6=80=A7=E5=92=8C?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Touchkebao/src/pages/pc/ckbox/data.ts         |  1 +
 .../components/MessageEnter/index.tsx         | 40 ++++++++++++++++---
 .../AudioMessage/AudioMessage.module.scss     |  4 --
 .../components/AudioMessage/AudioMessage.tsx  |  8 +---
 .../components/MessageRecord/index.tsx        | 18 ++++++++-
 .../src/store/module/weChat/weChat.data.ts    |  2 +
 Touchkebao/src/store/module/weChat/weChat.ts  |  3 ++
 .../src/store/module/websocket/msgManage.ts   | 17 +++++---
 8 files changed, 71 insertions(+), 22 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/data.ts b/Touchkebao/src/pages/pc/ckbox/data.ts
index 367a8ee6..6e006858 100644
--- a/Touchkebao/src/pages/pc/ckbox/data.ts
+++ b/Touchkebao/src/pages/pc/ckbox/data.ts
@@ -194,6 +194,7 @@ export interface ChatRecord {
     wechatId: string;
     [key: string]: any;
   };
+  seq?: number;
   [key: string]: any;
 }
 
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
index f49ceccb..73391f5e 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
@@ -9,7 +9,7 @@ import {
   MessageOutlined,
   LoadingOutlined,
 } from "@ant-design/icons";
-import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
+import { ContractData, weChatGroup, ChatRecord } from "@/pages/pc/ckbox/data";
 import { useWebSocketStore } from "@/store/module/websocket/websocket";
 import { EmojiPicker } from "@/components/EmojiSeclection";
 import { EmojiInfo } from "@/components/EmojiSeclection/wechatEmoji";
@@ -18,6 +18,7 @@ import AudioRecorder from "@/components/Upload/AudioRecorder";
 import ToContract from "./components/toContract";
 import styles from "./MessageEnter.module.scss";
 import { useWeChatStore } from "@/store/module/weChat/weChat";
+import { useContactStore } from "@/store/module/weChat/contacts";
 const { Footer } = Layout;
 const { TextArea } = Input;
 
@@ -33,9 +34,8 @@ const MessageEnter: React.FC<MessageEnterProps> = ({ contract }) => {
   const EnterModule = useWeChatStore(state => state.EnterModule);
   const updateShowCheckbox = useWeChatStore(state => state.updateShowCheckbox);
   const updateEnterModule = useWeChatStore(state => state.updateEnterModule);
-  const updateTransmitModal = useWeChatStore(
-    state => state.updateTransmitModal,
-  );
+  const setTransmitModal = useContactStore(state => state.setTransmitModal);
+  const addMessage = useWeChatStore(state => state.addMessage);
   const showChatRecordModel = useWeChatStore(
     state => state.showChatRecordModel,
   );
@@ -55,6 +55,35 @@ const MessageEnter: React.FC<MessageEnterProps> = ({ contract }) => {
 
   const handleSend = async () => {
     if (!inputValue.trim()) return;
+    const messageId = +Date.now();
+    // 构造本地消息对象
+    const localMessage: ChatRecord = {
+      id: messageId, // 使用时间戳作为临时ID
+      wechatAccountId: contract.wechatAccountId,
+      wechatFriendId: contract?.chatroomId ? 0 : contract.id,
+      wechatChatroomId: contract?.chatroomId ? contract.id : 0,
+      tenantId: 0,
+      accountId: 0,
+      synergyAccountId: 0,
+      content: inputValue,
+      msgType: 1,
+      msgSubType: 0,
+      msgSvrId: "",
+      isSend: true, // 标记为发送中
+      createTime: new Date().toISOString(),
+      isDeleted: false,
+      deleteTime: "",
+      sendStatus: 1,
+      wechatTime: Date.now(),
+      origin: 0,
+      msgId: 0,
+      recalled: false,
+      seq: messageId,
+    };
+    // 先插入本地数据
+    addMessage(localMessage);
+
+    // 再发送消息到服务器
     const params = {
       wechatAccountId: contract.wechatAccountId,
       wechatChatroomId: contract?.chatroomId ? contract.id : 0,
@@ -62,6 +91,7 @@ const MessageEnter: React.FC<MessageEnterProps> = ({ contract }) => {
       msgSubType: 0,
       msgType: 1,
       content: inputValue,
+      seq: messageId,
     };
     sendCommand("CmdSendMessage", params);
     setInputValue("");
@@ -159,7 +189,7 @@ const MessageEnter: React.FC<MessageEnterProps> = ({ contract }) => {
     updateEnterModule("common");
   };
   const handTurnRignt = () => {
-    updateTransmitModal(true);
+    setTransmitModal(true);
   };
   const openChatRecordModel = () => {
     updateShowChatRecordModel(!showChatRecordModel);
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/AudioMessage/AudioMessage.module.scss b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/AudioMessage/AudioMessage.module.scss
index 394058b6..b732a7fe 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/AudioMessage/AudioMessage.module.scss
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/AudioMessage/AudioMessage.module.scss
@@ -104,10 +104,6 @@
   font-size: 11px;
   color: #666;
   margin-top: 2px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  cursor: help;
 }
 
 // 进度条容器
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/AudioMessage/AudioMessage.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/AudioMessage/AudioMessage.tsx
index f087165c..d9840279 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/AudioMessage/AudioMessage.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/AudioMessage/AudioMessage.tsx
@@ -215,13 +215,7 @@ const AudioMessage: React.FC<AudioMessageProps> = ({ audioUrl, msgId }) => {
         </div>
       </div>
       <div>
-        {audioText && (
-          <div className={styles.audioText} title={audioText}>
-            {audioText.length > 10
-              ? `${audioText.substring(0, 10)}...`
-              : audioText}
-          </div>
-        )}
+        {audioText && <div className={styles.audioText}>{audioText}</div>}
       </div>
     </>
   );
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
index ae4a706e..de065ea2 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
@@ -542,7 +542,7 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
     return messages
       .filter(msg => msg !== null && msg !== undefined) // 过滤掉null和undefined的消息
       .map(msg => ({
-        time: formatWechatTime(msg?.wechatTime),
+        time: formatWechatTime(String(msg?.wechatTime)),
         messages: [msg],
       }));
   };
@@ -636,6 +636,7 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
                   />
                 </div>
               )}
+
               <Avatar
                 size={32}
                 src={currentKf.avatar}
@@ -643,6 +644,21 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
                 className={styles.messageAvatar}
               />
               <div>{parseMessageContent(msg?.content, msg, msg?.msgType)}</div>
+              {/* 发送状态 loading 图标 */}
+              {msg.sendStatus === 1 && (
+                <div
+                  style={{
+                    marginRight: "8px",
+                    display: "flex",
+                    alignItems: "center",
+                  }}
+                >
+                  <LoadingOutlined
+                    spin
+                    style={{ fontSize: "16px", color: "#1890ff" }}
+                  />
+                </div>
+              )}
             </>
           )}
         </div>
diff --git a/Touchkebao/src/store/module/weChat/weChat.data.ts b/Touchkebao/src/store/module/weChat/weChat.data.ts
index 3a7bb10e..c4c9ae22 100644
--- a/Touchkebao/src/store/module/weChat/weChat.data.ts
+++ b/Touchkebao/src/store/module/weChat/weChat.data.ts
@@ -101,4 +101,6 @@ export interface WeChatState {
   // ==================== 消息接收处理 ====================
   /** 接收新消息处理 */
   receivedMsg: (message: ChatRecord) => void;
+  /** 查找消息 */
+  findMessageBySeq: (seq: number) => ChatRecord | undefined;
 }
diff --git a/Touchkebao/src/store/module/weChat/weChat.ts b/Touchkebao/src/store/module/weChat/weChat.ts
index d3d51007..c0532c18 100644
--- a/Touchkebao/src/store/module/weChat/weChat.ts
+++ b/Touchkebao/src/store/module/weChat/weChat.ts
@@ -84,6 +84,9 @@ export const useWeChatStore = create<WeChatState>()(
           }
         }
       },
+      findMessageBySeq: (seq: number) => {
+        return get().currentMessages.find(msg => msg.seq === seq);
+      },
       /** 更新指定消息内容 */
       updateMessage: (messageId, updates) => {
         set(state => ({
diff --git a/Touchkebao/src/store/module/websocket/msgManage.ts b/Touchkebao/src/store/module/websocket/msgManage.ts
index 0b071cb4..1052a139 100644
--- a/Touchkebao/src/store/module/websocket/msgManage.ts
+++ b/Touchkebao/src/store/module/websocket/msgManage.ts
@@ -11,6 +11,8 @@ type MessageHandler = (message: WebSocketMessage) => void;
 const addMessage = useWeChatStore.getState().addMessage;
 const recallMessage = useWeChatStore.getState().recallMessage;
 const receivedMsg = useWeChatStore.getState().receivedMsg;
+const findMessageBySeq = useWeChatStore.getState().findMessageBySeq;
+const updateMessage = useWeChatStore.getState().updateMessage;
 const updateMomentCommonLoading =
   useWeChatStore.getState().updateMomentCommonLoading;
 const addMomentCommon = useWeChatStore.getState().addMomentCommon;
@@ -41,13 +43,18 @@ const messageHandlers: Record<string, MessageHandler> = {
   },
   // 发送消息响应
   CmdSendMessageResp: message => {
-    console.log("发送消息响应", message);
-    addMessage(message.friendMessage || message.chatroomMessage);
-    // 在这里添加具体的处理逻辑
+    const msg = findMessageBySeq(message.seq);
+    if (msg) {
+      updateMessage(message.seq, {
+        sendStatus: 1,
+        id: message.friendMessage?.id || message.chatroomMessage?.id,
+      });
+    }
   },
   CmdSendMessageResult: message => {
-    console.log("发送消息结果", message);
-    // 在这里添加具体的处理逻辑
+    updateMessage(message.friendMessageId, {
+      sendStatus: 0,
+    });
   },
   // 接收消息响应
   CmdReceiveMessageResp: message => {

From 27a108027bdd843f09b4543cd5aeb033911c2bd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Sat, 25 Oct 2025 19:00:20 +0800
Subject: [PATCH 57/72] =?UTF-8?q?=E7=A7=BB=E9=99=A4MessageList=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E7=9A=84=E8=B0=83=E8=AF=95=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E9=80=9A=E8=BF=87ID=E6=9F=A5?=
 =?UTF-8?q?=E6=89=BE=E6=B6=88=E6=81=AF=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E5=A4=84=E7=90=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E6=8F=90=E5=8D=87=E4=BB=A3=E7=A0=81=E5=8F=AF?=
 =?UTF-8?q?=E8=AF=BB=E6=80=A7=E5=92=8C=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SidebarMenu/MessageList/index.tsx         |  3 --
 .../src/store/module/weChat/weChat.data.ts    |  1 +
 Touchkebao/src/store/module/weChat/weChat.ts  |  3 ++
 .../src/store/module/websocket/msgManage.ts   | 38 ++++++++++++++-----
 4 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index 40502e63..ea582929 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -348,9 +348,6 @@ const MessageList: React.FC<MessageListProps> = () => {
   // 初始化加载会话列表
   useEffect(() => {
     const initializeSessions = async () => {
-      console.log("MessageList 初始化加载，currentUserId:", currentUserId);
-      console.log("user 对象:", user);
-
       if (!currentUserId || currentUserId === 0) {
         console.warn("currentUserId 无效，跳过加载:", currentUserId);
         return;
diff --git a/Touchkebao/src/store/module/weChat/weChat.data.ts b/Touchkebao/src/store/module/weChat/weChat.data.ts
index c4c9ae22..00bc2c51 100644
--- a/Touchkebao/src/store/module/weChat/weChat.data.ts
+++ b/Touchkebao/src/store/module/weChat/weChat.data.ts
@@ -103,4 +103,5 @@ export interface WeChatState {
   receivedMsg: (message: ChatRecord) => void;
   /** 查找消息 */
   findMessageBySeq: (seq: number) => ChatRecord | undefined;
+  findMessageById: (id: number) => ChatRecord | undefined;
 }
diff --git a/Touchkebao/src/store/module/weChat/weChat.ts b/Touchkebao/src/store/module/weChat/weChat.ts
index c0532c18..6f298309 100644
--- a/Touchkebao/src/store/module/weChat/weChat.ts
+++ b/Touchkebao/src/store/module/weChat/weChat.ts
@@ -87,6 +87,9 @@ export const useWeChatStore = create<WeChatState>()(
       findMessageBySeq: (seq: number) => {
         return get().currentMessages.find(msg => msg.seq === seq);
       },
+      findMessageById: (id: number) => {
+        return get().currentMessages.find(msg => msg.id === id);
+      },
       /** 更新指定消息内容 */
       updateMessage: (messageId, updates) => {
         set(state => ({
diff --git a/Touchkebao/src/store/module/websocket/msgManage.ts b/Touchkebao/src/store/module/websocket/msgManage.ts
index 1052a139..81a79ffb 100644
--- a/Touchkebao/src/store/module/websocket/msgManage.ts
+++ b/Touchkebao/src/store/module/websocket/msgManage.ts
@@ -12,6 +12,7 @@ const addMessage = useWeChatStore.getState().addMessage;
 const recallMessage = useWeChatStore.getState().recallMessage;
 const receivedMsg = useWeChatStore.getState().receivedMsg;
 const findMessageBySeq = useWeChatStore.getState().findMessageBySeq;
+const findMessageById = useWeChatStore.getState().findMessageById;
 const updateMessage = useWeChatStore.getState().updateMessage;
 const updateMomentCommonLoading =
   useWeChatStore.getState().updateMomentCommonLoading;
@@ -43,6 +44,7 @@ const messageHandlers: Record<string, MessageHandler> = {
   },
   // 发送消息响应
   CmdSendMessageResp: message => {
+    console.log("CmdSendMessageResp", message);
     const msg = findMessageBySeq(message.seq);
     if (msg) {
       updateMessage(message.seq, {
@@ -127,10 +129,10 @@ const messageHandlers: Record<string, MessageHandler> = {
           try {
             // 被踢出时删除所有缓存数据
             localStorage.clear();
-            await db.kfUsers.clear();
-            await db.weChatGroup.clear();
-            await db.contracts.clear();
-            await db.newContactList.clear();
+            await db.chatSessions.clear();
+            await db.contactsUnified.clear();
+            await db.contactLabelMap.clear();
+            await db.userLoginRecords.clear();
           } finally {
             (window as any).__CKB_AUTH_FAILED_SHOWN__ = false;
             window.location.href = "/login";
@@ -145,12 +147,30 @@ const messageHandlers: Record<string, MessageHandler> = {
   CmdMessageRecalled: message => {
     const MessageId = message.friendMessageId || message.chatroomMessageId;
     recallMessage(MessageId);
-    //     {
-    //     "friendMessageId": 745007874,
-    //     "chatroomMessageId": 0,
-    //     "seq": 2076470,
-    //     "cmdType": "CmdMessageRecalled"
+  },
+
+  CmdVoiceToTextResult: message => {
+    const msg = findMessageById(
+      message.friendMessageId || message.chatroomMessageId,
+    );
+    console.log("CmdVoiceToTextResult", msg);
+    const content = JSON.parse(msg.content);
+    if (msg) {
+      updateMessage(msg.id, {
+        content: JSON.stringify({
+          ...content,
+          text: message.text,
+        }),
+      });
+    }
+    // {
+    //   "friendMessageId":753361041,
+    //   "chatroomMessageId":0,
+    //   "text":"以后我会好好对待你。",
+    //   "seq":76698,
+    //   "cmdType":"CmdVoiceToTextResult"
     // }
+    console.log("CmdVoiceToTextResult", message);
   },
 
   // 可以继续添加更多处理器...

From 422fed2719f4bf3e5f093085f2b1112333f0c13e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Sat, 25 Oct 2025 19:11:08 +0800
Subject: [PATCH 58/72] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9F=B3=E9=A2=91?=
 =?UTF-8?q?=E8=BD=AC=E6=96=87=E5=AD=97=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E7=9B=B8=E5=85=B3API=E5=92=8C=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=8F=90=E5=8D=87?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=E5=92=8C=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=8F=AF=E8=AF=BB=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/MessageRecord/api.ts           | 17 ++++++++
 .../components/ClickMeau/index.tsx            | 40 ++++++++-----------
 .../components/MessageRecord/index.tsx        | 15 ++++++-
 .../src/store/module/websocket/msgManage.ts   |  9 -----
 4 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/api.ts b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/api.ts
index 3e92af4a..cb50d14b 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/api.ts
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/api.ts
@@ -13,3 +13,20 @@ export const fetchReCallApi = async (params: FetchMomentParams) => {
   const { sendCommand } = useWebSocketStore.getState();
   sendCommand("CmdRecallMessage", params);
 };
+
+// 音频转文字请求参数接口
+export interface VoiceToTextParams {
+  friendMessageId: number;
+  chatroomMessageId: number;
+  seq: number;
+}
+
+// 音频转文字
+export const fetchVoiceToTextApi = async (params: VoiceToTextParams) => {
+  const { sendCommand } = useWebSocketStore.getState();
+  sendCommand("CmdVoiceToText", {
+    friendMessageId: params.friendMessageId,
+    chatroomMessageId: params.chatroomMessageId,
+    seq: params.seq,
+  });
+};
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/ClickMeau/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/ClickMeau/index.tsx
index b930e1b7..5f7ace49 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/ClickMeau/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/ClickMeau/index.tsx
@@ -6,6 +6,7 @@ import {
   RollbackOutlined,
   ExportOutlined,
   LinkOutlined,
+  SoundOutlined,
 } from "@ant-design/icons";
 import dayjs from "dayjs";
 import { ChatRecord } from "@/pages/pc/ckbox/data";
@@ -113,31 +114,12 @@ const ClickMenu: React.FC<ClickMenuProps> = ({
   };
   // 检查是否为文本消息
   const isTextMessage = (): boolean => {
-    // msgType === 1 是纯文本消息
-    if (messageData.msgType === 1) return true;
+    return messageData.msgType === 1;
+  };
 
-    // 尝试解析 content，如果是 JSON 且只包含 text/content 字段，也认为是文本
-    try {
-      const parsed = JSON.parse(messageData.content || "");
-      // 如果包含图片、视频、语音等字段，则不是纯文本
-      if (
-        parsed.previewImage ||
-        parsed.tencentUrl ||
-        parsed.voiceUrl ||
-        parsed.voice ||
-        parsed.videoUrl ||
-        parsed.video ||
-        parsed.fileUrl ||
-        parsed.file
-      ) {
-        return false;
-      }
-      // 包含 text 或 content 字段，认为是文本
-      return !!(parsed.text || parsed.content);
-    } catch (error) {
-      // 不是 JSON，如果 msgType 不确定，按文本处理
-      return true;
-    }
+  // 检查是否为音频消息
+  const isAudioMessage = (): boolean => {
+    return messageData.msgType === 34;
   };
 
   const menuItems = [
@@ -156,6 +138,16 @@ const ClickMenu: React.FC<ClickMenuProps> = ({
           },
         ]
       : []),
+    // 只在音频消息时显示转文字选项
+    ...(isAudioMessage()
+      ? [
+          {
+            key: "voiceToText",
+            icon: <SoundOutlined />,
+            label: "转换文字",
+          },
+        ]
+      : []),
     {
       key: "multipleForwarding",
       icon: <CheckSquareOutlined />,
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
index de065ea2..5ac5eaf8 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
@@ -14,7 +14,7 @@ import styles from "./com.module.scss";
 import { useWeChatStore } from "@/store/module/weChat/weChat";
 import { useContactStore } from "@/store/module/weChat/contacts";
 import { useCkChatStore } from "@/store/module/ckchat/ckchat";
-import { fetchReCallApi } from "./api";
+import { fetchReCallApi, fetchVoiceToTextApi } from "./api";
 import TransmitModal from "./components/TransmitModal";
 
 interface MessageRecordProps {
@@ -709,6 +709,15 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
     });
   };
 
+  const handVoiceToText = messageData => {
+    // 音频转文字的处理逻辑
+    fetchVoiceToTextApi({
+      friendMessageId: messageData?.wechatFriendId ? messageData.id : 0,
+      chatroomMessageId: messageData?.wechatFriendId ? 0 : messageData.id,
+      seq: +new Date(),
+    });
+  };
+
   const handQuote = (messageData: ChatRecord) => {
     const isGroupUser = !!currentContract?.chatroomId;
     const isSend = !!messageData.isSend;
@@ -751,6 +760,10 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
         // 撤回逻辑
         handRecall(contextMenu.messageData);
         break;
+      case "voiceToText":
+        // 音频转文字逻辑
+        handVoiceToText(contextMenu.messageData);
+        break;
       default:
         break;
     }
diff --git a/Touchkebao/src/store/module/websocket/msgManage.ts b/Touchkebao/src/store/module/websocket/msgManage.ts
index 81a79ffb..ce206546 100644
--- a/Touchkebao/src/store/module/websocket/msgManage.ts
+++ b/Touchkebao/src/store/module/websocket/msgManage.ts
@@ -153,7 +153,6 @@ const messageHandlers: Record<string, MessageHandler> = {
     const msg = findMessageById(
       message.friendMessageId || message.chatroomMessageId,
     );
-    console.log("CmdVoiceToTextResult", msg);
     const content = JSON.parse(msg.content);
     if (msg) {
       updateMessage(msg.id, {
@@ -163,14 +162,6 @@ const messageHandlers: Record<string, MessageHandler> = {
         }),
       });
     }
-    // {
-    //   "friendMessageId":753361041,
-    //   "chatroomMessageId":0,
-    //   "text":"以后我会好好对待你。",
-    //   "seq":76698,
-    //   "cmdType":"CmdVoiceToTextResult"
-    // }
-    console.log("CmdVoiceToTextResult", message);
   },
 
   // 可以继续添加更多处理器...

From 781662026adeb40b95688018331c9026ced9ce88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Sat, 25 Oct 2025 19:15:00 +0800
Subject: [PATCH 59/72] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E9=80=BB=E8=BE=91=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AF=B9=E8=AF=AD=E9=9F=B3=E6=B6=88=E6=81=AF=E7=9A=84=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E6=9D=A1=E4=BB=B6=EF=BC=8C=E6=94=AF=E6=8C=81=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87URL=E5=92=8C=E6=8C=81=E7=BB=AD=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=8C=E5=90=8C=E6=97=B6=E5=A2=9E=E5=BC=BA?=
 =?UTF-8?q?=E5=AF=B9=E7=89=B9=E6=AE=8A=E6=A0=BC=E5=BC=8F=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E8=AF=86=E5=88=AB=EF=BC=8C=E6=8F=90=E5=8D=87=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=8F=AF=E8=AF=BB=E6=80=A7=E5=92=8C=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BD=93=E9=AA=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Touchkebao/src/utils/filter.ts | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/Touchkebao/src/utils/filter.ts b/Touchkebao/src/utils/filter.ts
index 3c0bbd26..5e2d3754 100644
--- a/Touchkebao/src/utils/filter.ts
+++ b/Touchkebao/src/utils/filter.ts
@@ -12,14 +12,18 @@ export const messageFilter = (message: string) => {
       case !!(parsed.previewImage || parsed.tencentUrl):
         return "[图片]";
 
-      // 语音消息：包含 voiceUrl 或 voice
-      case !!(parsed.voiceUrl || parsed.voice):
-        return "[语音]";
-
-      // 视频消息：包含 videoUrl 或 video
+      // 视频消息：包含 videoUrl 或 video（需要在语音消息之前判断）
       case !!(parsed.videoUrl || parsed.video):
         return "[视频]";
 
+      // 语音消息：包含 voiceUrl、voice 或 (url + durationMs)
+      case !!(
+        parsed.voiceUrl ||
+        parsed.voice ||
+        (parsed.url && parsed.durationMs)
+      ):
+        return parsed.text ? `[语音] ${parsed.text}` : "[语音]";
+
       // 文件消息：包含 fileUrl 或 file
       case !!(parsed.fileUrl || parsed.file):
         return "[文件]";
@@ -45,7 +49,16 @@ export const messageFilter = (message: string) => {
         return message;
     }
   } catch (error) {
-    // 如果不是 JSON 格式，直接返回原始消息
+    // 如果不是 JSON 格式，检查是否为特殊格式
+    // 以 @ 开头的图片URL，例如：@https://...jpg
+    if (
+      message.startsWith("@") &&
+      /\.(jpg|jpeg|png|gif|webp|bmp)(\?.*)?$/i.test(message)
+    ) {
+      return "[图片]";
+    }
+
+    // 其他情况直接返回原始消息
     return message;
   }
 };

From f58070495f74ac4f02065fd4a40d12c44a71c454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Mon, 27 Oct 2025 10:00:32 +0800
Subject: [PATCH 60/72] Refactor WeChat store logic to enable AI chat
 processing. Reintroduce data processing and AI chat request handling,
 improving message handling flow and user experience.

---
 Touchkebao/src/store/module/weChat/weChat.ts | 32 ++++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Touchkebao/src/store/module/weChat/weChat.ts b/Touchkebao/src/store/module/weChat/weChat.ts
index 6f298309..d4d7055e 100644
--- a/Touchkebao/src/store/module/weChat/weChat.ts
+++ b/Touchkebao/src/store/module/weChat/weChat.ts
@@ -320,23 +320,23 @@ export const useWeChatStore = create<WeChatState>()(
             } else {
               params.friendMessage = [message];
             }
-            // const dataProcessingResult = await dataProcessing(params);
-            // //如果成功，就请求ai对话接口
-            // set(() => ({
-            //   isLoadingAiChat: true,
-            // }));
-            // if (!dataProcessingResult) {
-            //   const messageContent = await aiChat({
-            //     friendId: getMessageId,
-            //     wechatAccountId: currentContract.wechatAccountId,
-            //     message: message,
-            //   });
+            const dataProcessingResult = await dataProcessing(params);
+            //如果成功，就请求ai对话接口
+            set(() => ({
+              isLoadingAiChat: true,
+            }));
+            if (!dataProcessingResult) {
+              const messageContent = await aiChat({
+                friendId: getMessageId,
+                wechatAccountId: currentContract.wechatAccountId,
+                message: message,
+              });
 
-            //   set(() => ({
-            //     quoteMessageContent: messageContent,
-            //     isLoadingAiChat: false,
-            //   }));
-            // }
+              set(() => ({
+                quoteMessageContent: messageContent,
+                isLoadingAiChat: false,
+              }));
+            }
           } else {
             // 更新其他聊天的未读消息数
             const chatSessions = useCkChatStore.getState().chatSessions;

From 3c2fec2122f4c132ea1a29947489fd3a0ab8d5a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Mon, 27 Oct 2025 10:38:39 +0800
Subject: [PATCH 61/72] Refactor MessageRecord component to replace ckchat
 store with customer store for improved data handling. This change enhances
 the retrieval of customer information based on the wechatAccountId,
 streamlining the message processing logic.

---
 .../ChatWindow/components/MessageRecord/index.tsx           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
index 5ac5eaf8..5a4fab16 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
@@ -13,7 +13,7 @@ import { getEmojiPath } from "@/components/EmojiSeclection/wechatEmoji";
 import styles from "./com.module.scss";
 import { useWeChatStore } from "@/store/module/weChat/weChat";
 import { useContactStore } from "@/store/module/weChat/contacts";
-import { useCkChatStore } from "@/store/module/ckchat/ckchat";
+import { useCustomerStore } from "@weChatStore/customer";
 import { fetchReCallApi, fetchVoiceToTextApi } from "./api";
 import TransmitModal from "./components/TransmitModal";
 
@@ -45,8 +45,8 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
   const prevMessagesRef = useRef(currentMessages);
   const updateShowCheckbox = useWeChatStore(state => state.updateShowCheckbox);
   const updateEnterModule = useWeChatStore(state => state.updateEnterModule);
-  const currentKf = useCkChatStore(state =>
-    state.kfUserList.find(kf => kf.id === contract.wechatAccountId),
+  const currentKf = useCustomerStore(state =>
+    state.customerList.find(kf => kf.id === contract.wechatAccountId),
   );
 
   const updateSelectedChatRecords = useWeChatStore(

From 77072594d2585c75c94628f219e0603b264a4bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Mon, 27 Oct 2025 11:11:24 +0800
Subject: [PATCH 62/72] Add debug logging for quote message content and session
 selection in MessageEnter and MessageList components. Update WeChat store to
 handle empty message content gracefully, improving error handling during
 message reception.

---
 .../components/ChatWindow/components/MessageEnter/index.tsx  | 2 ++
 .../weChat/components/SidebarMenu/MessageList/index.tsx      | 2 ++
 Touchkebao/src/store/module/weChat/weChat.ts                 | 5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
index 73391f5e..f302a759 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
@@ -49,6 +49,8 @@ const MessageEnter: React.FC<MessageEnterProps> = ({ contract }) => {
   const isLoadingAiChat = useWeChatStore(state => state.isLoadingAiChat);
   useEffect(() => {
     if (quoteMessageContent) {
+      console.log("quoteMessageContent", quoteMessageContent);
+
       setInputValue(quoteMessageContent);
     }
   }, [quoteMessageContent]);
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index ea582929..159e1bc7 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -544,6 +544,8 @@ const MessageList: React.FC<MessageListProps> = () => {
 
   // 点击会话
   const onContactClick = async (session: ChatSession) => {
+    console.log(session);
+
     // 设置当前会话
     setCurrentContact(session as any, true);
 
diff --git a/Touchkebao/src/store/module/weChat/weChat.ts b/Touchkebao/src/store/module/weChat/weChat.ts
index d4d7055e..a74b5e76 100644
--- a/Touchkebao/src/store/module/weChat/weChat.ts
+++ b/Touchkebao/src/store/module/weChat/weChat.ts
@@ -333,7 +333,7 @@ export const useWeChatStore = create<WeChatState>()(
               });
 
               set(() => ({
-                quoteMessageContent: messageContent,
+                quoteMessageContent: messageContent?.content || "",
                 isLoadingAiChat: false,
               }));
             }
@@ -370,6 +370,9 @@ export const useWeChatStore = create<WeChatState>()(
           }
         } catch (error) {
           console.error("接收新消息失败:", error);
+          set(() => ({
+            isLoadingAiChat: false,
+          }));
         }
       },
 

From 3ff3e40d8e12e736d8adc67a5be1d07db080797f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Mon, 27 Oct 2025 11:43:35 +0800
Subject: [PATCH 63/72] Enhance MessageList component to include complete
 contact information during message updates. Implement a new method in
 ContactManager for retrieving contacts by ID and type, ensuring accurate
 avatar and nickname display. Trigger UI refresh on data changes to improve
 user experience.

---
 .../SidebarMenu/MessageList/index.tsx         | 137 ++++++++++++------
 .../src/store/module/weChat/message.data.ts   |   1 +
 Touchkebao/src/store/module/weChat/weChat.ts  |   2 +-
 Touchkebao/src/utils/dbAction/contact.ts      |  21 +++
 4 files changed, 117 insertions(+), 44 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index 159e1bc7..08923e35 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -9,7 +9,7 @@ import {
 } from "@ant-design/icons";
 import styles from "./com.module.scss";
 import { useWeChatStore } from "@weChatStore/weChat";
-import { useMessageStore } from "@weChatStore/message";
+import { useMessageStore, triggerRefresh } from "@weChatStore/message";
 import { useCustomerStore } from "@weChatStore/customer";
 import { useContactStore } from "@weChatStore/contacts";
 import { useWebSocketStore } from "@/store/module/websocket/websocket";
@@ -17,6 +17,7 @@ import { updateConfig } from "@/pages/pc/ckbox/api";
 import { getMessageList, dataProcessing } from "./api";
 import { formatWechatTime } from "@/utils/common";
 import { MessageManager } from "@/utils/dbAction/message";
+import { ContactManager } from "@/utils/dbAction/contact";
 import { ChatSession } from "@/utils/db";
 import { useUserStore } from "@/store/module/user";
 import { messageFilter } from "@/utils/filter";
@@ -327,9 +328,18 @@ const MessageList: React.FC<MessageListProps> = () => {
       const friends = allMessages.filter(
         (msg: any) => msg.dataType === "friend" || !msg.chatroomId,
       );
-      const groups = allMessages.filter(
-        (msg: any) => msg.dataType === "group" || msg.chatroomId,
-      );
+      const groups = allMessages
+        .filter((msg: any) => msg.dataType === "group" || msg.chatroomId)
+        .map((msg: any) => {
+          // 确保群聊数据包含正确的头像字段
+          // 如果接口返回的是 avatar 字段，需要映射到 chatroomAvatar
+          return {
+            ...msg,
+            chatroomAvatar: msg.chatroomAvatar || msg.avatar || "",
+          };
+        });
+
+      console.log("群聊数据示例:", groups[0]); // 调试：查看第一个群聊数据
 
       // 执行增量同步
       const syncResult = await MessageManager.syncSessions(currentUserId, {
@@ -340,6 +350,15 @@ const MessageList: React.FC<MessageListProps> = () => {
       console.log(
         `会话同步完成: 新增${syncResult.added}, 更新${syncResult.updated}, 删除${syncResult.deleted}`,
       );
+
+      // 如果有数据变更，触发UI刷新
+      if (
+        syncResult.added > 0 ||
+        syncResult.updated > 0 ||
+        syncResult.deleted > 0
+      ) {
+        triggerRefresh();
+      }
     } catch (error) {
       console.error("同步服务器数据失败:", error);
     }
@@ -463,48 +482,84 @@ const MessageList: React.FC<MessageListProps> = () => {
 
   // ==================== WebSocket消息处理 ====================
 
-  // 监听WebSocket消息更新
+  // 监听WebSocket消息更新（静默更新模式）
   useEffect(() => {
-    const handleNewMessage = (event: CustomEvent) => {
+    const handleNewMessage = async (event: CustomEvent) => {
       const { message: msgData, sessionId, type } = event.detail;
 
-      // 立即更新组件state
-      setSessions(prev => {
-        const existingIndex = prev.findIndex(s => s.id === sessionId);
+      // 从联系人表查询完整信息（确保头像、wechatAccountId等字段完整）
+      const contact = await ContactManager.getContactByIdAndType(
+        currentUserId,
+        sessionId,
+        type,
+      );
 
-        if (existingIndex >= 0) {
-          // 更新现有会话
-          const updatedSession = {
-            ...prev[existingIndex],
-            config: {
-              ...prev[existingIndex].config,
-              unreadCount: prev[existingIndex].config.unreadCount + 1,
-            },
-            content: msgData.content,
-            lastUpdateTime: new Date().toISOString(),
-          };
+      // 检查会话是否存在
+      const existingSession = await MessageManager.getSessionByContactId(
+        currentUserId,
+        sessionId,
+        type,
+      );
 
-          // 重新计算sortKey（会触发重新排序）
-          const newSessions = [...prev];
-          newSessions[existingIndex] = updatedSession;
+      if (existingSession) {
+        // 已存在的会话：更新消息内容、未读数，同时更新联系人信息（头像、昵称等）
+        const updateData: any = {
+          content: msgData.content,
+          lastUpdateTime: new Date().toISOString(),
+          config: {
+            ...existingSession.config,
+            unreadCount: (existingSession.config?.unreadCount || 0) + 1,
+          },
+        };
 
-          // 按sortKey降序重新排序（置顶在前，最新的在前）
-          return newSessions.sort((a, b) => {
-            const aKey = MessageManager["generateSortKey"](a);
-            const bKey = MessageManager["generateSortKey"](b);
-            return bKey.localeCompare(aKey); // 降序：b在前，a在后
-          });
+        // 如果查到了联系人信息，同步更新头像、昵称等字段
+        if (contact) {
+          updateData.avatar = contact.avatar;
+          updateData.wechatAccountId = contact.wechatAccountId;
+          updateData.nickname = contact.nickname;
+          updateData.conRemark = contact.conRemark;
+        }
+
+        // 更新到数据库
+        await MessageManager.updateSession({
+          userId: currentUserId,
+          id: sessionId,
+          type,
+          ...updateData,
+        });
+      } else {
+        // 新会话：从联系人表构建完整会话
+        if (contact) {
+          // 使用完整联系人信息构建会话
+          const newSession = MessageManager.buildSessionFromContact(
+            contact as any,
+            currentUserId,
+          );
+
+          // 更新会话内容和未读数
+          newSession.content = msgData.content;
+          newSession.lastUpdateTime = new Date().toISOString();
+          newSession.config.unreadCount = 1;
+
+          // 添加到数据库
+          await MessageManager.addSession(newSession);
         } else {
-          // 新会话，插入到列表中
+          // 联系人表中不存在，创建简化会话（兜底方案）
+          console.warn(
+            `联系人表中未找到 ID: ${sessionId}, 类型: ${type}，使用消息数据创建简化会话`,
+          );
           const newSession: ChatSession = {
             serverId: `${type}_${sessionId}`,
             userId: currentUserId,
             id: sessionId,
             type,
-            wechatAccountId: msgData.wechatAccountId,
+            wechatAccountId: msgData.wechatAccountId || 0,
             nickname: msgData.nickname || "",
-            conRemark: "",
-            avatar: msgData.avatar || "",
+            conRemark: msgData.conRemark || "",
+            avatar:
+              type === "group"
+                ? msgData.chatroomAvatar || ""
+                : msgData.avatar || "",
             content: msgData.content,
             lastUpdateTime: new Date().toISOString(),
             config: {
@@ -514,17 +569,13 @@ const MessageList: React.FC<MessageListProps> = () => {
             sortKey: "",
           };
 
-          return [newSession, ...prev];
+          // 添加到数据库
+          await MessageManager.addSession(newSession);
         }
-      });
+      }
 
-      // 后台更新数据库
-      MessageManager.updateSessionOnNewMessage(
-        currentUserId,
-        sessionId,
-        type,
-        msgData,
-      );
+      // 触发静默刷新：通知组件从数据库重新查询
+      triggerRefresh();
     };
 
     window.addEventListener(
@@ -611,7 +662,7 @@ const MessageList: React.FC<MessageListProps> = () => {
                   <Badge count={session.config.unreadCount || 0} size="small">
                     <Avatar
                       size={48}
-                      src={session.avatar || session.chatroomAvatar}
+                      src={session.avatar}
                       icon={
                         session?.type === "group" ? (
                           <TeamOutlined />
diff --git a/Touchkebao/src/store/module/weChat/message.data.ts b/Touchkebao/src/store/module/weChat/message.data.ts
index a333e9e8..0925bbfd 100644
--- a/Touchkebao/src/store/module/weChat/message.data.ts
+++ b/Touchkebao/src/store/module/weChat/message.data.ts
@@ -21,6 +21,7 @@ export interface Message {
   isOnline?: boolean;
   momentsMax: number;
   momentsNum: number;
+  wechatAccountId: number;
   [key: string]: any;
 }
 
diff --git a/Touchkebao/src/store/module/weChat/weChat.ts b/Touchkebao/src/store/module/weChat/weChat.ts
index a74b5e76..64f4cc7f 100644
--- a/Touchkebao/src/store/module/weChat/weChat.ts
+++ b/Touchkebao/src/store/module/weChat/weChat.ts
@@ -356,7 +356,7 @@ export const useWeChatStore = create<WeChatState>()(
               const contacts =
                 await ContactManager.getUserContacts(currentUserId);
               const contact = contacts.find(
-                c => c.id === getMessageId[0] && c.type === contactType,
+                c => c.id === getMessageId && c.type === contactType,
               );
 
               if (contact) {
diff --git a/Touchkebao/src/utils/dbAction/contact.ts b/Touchkebao/src/utils/dbAction/contact.ts
index 1f0ced1a..675e0650 100644
--- a/Touchkebao/src/utils/dbAction/contact.ts
+++ b/Touchkebao/src/utils/dbAction/contact.ts
@@ -264,6 +264,27 @@ export class ContactManager {
     }
   }
 
+  /**
+   * 根据ID和类型获取联系人（用于消息列表查询完整联系人信息）
+   */
+  static async getContactByIdAndType(
+    userId: number,
+    contactId: number,
+    type: "friend" | "group",
+  ): Promise<Contact | null> {
+    try {
+      const contacts = await contactUnifiedService.findWhereMultiple([
+        { field: "userId", operator: "equals", value: userId },
+        { field: "id", operator: "equals", value: contactId },
+        { field: "type", operator: "equals", value: type },
+      ]);
+      return contacts.length > 0 ? contacts[0] : null;
+    } catch (error) {
+      console.error("根据ID和类型获取联系人失败:", error);
+      return null;
+    }
+  }
+
   /**
    * 根据类型获取联系人
    */

From 8b28194d00bb6d92f1d852ae88451d8d730d15f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Mon, 27 Oct 2025 11:48:22 +0800
Subject: [PATCH 64/72] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ChatWindow/components/MessageRecord/index.tsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
index 5a4fab16..3b21ff8a 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
@@ -45,7 +45,7 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
   const prevMessagesRef = useRef(currentMessages);
   const updateShowCheckbox = useWeChatStore(state => state.updateShowCheckbox);
   const updateEnterModule = useWeChatStore(state => state.updateEnterModule);
-  const currentKf = useCustomerStore(state =>
+  const currentCustomer = useCustomerStore(state =>
     state.customerList.find(kf => kf.id === contract.wechatAccountId),
   );
 
@@ -639,7 +639,7 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
 
               <Avatar
                 size={32}
-                src={currentKf.avatar}
+                src={currentCustomer?.avatar || ""}
                 icon={<UserOutlined />}
                 className={styles.messageAvatar}
               />

From 494ccbbe5ef0c924614746e2a724f65c81d6cce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Mon, 27 Oct 2025 14:49:05 +0800
Subject: [PATCH 65/72] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weChat/components/SidebarMenu/MessageList/index.tsx  | 9 ++++++++-
 Touchkebao/src/store/module/websocket/msgManage.ts       | 4 ++--
 Touchkebao/src/utils/dbAction/message.ts                 | 1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index 08923e35..73d4a729 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -340,6 +340,7 @@ const MessageList: React.FC<MessageListProps> = () => {
         });
 
       console.log("群聊数据示例:", groups[0]); // 调试：查看第一个群聊数据
+      console.log("好友数据示例:", friends[0]); // 调试：查看第一个好友数据
 
       // 执行增量同步
       const syncResult = await MessageManager.syncSessions(currentUserId, {
@@ -347,6 +348,10 @@ const MessageList: React.FC<MessageListProps> = () => {
         groups,
       });
 
+      // 同步后验证数据
+      const verifySession = await MessageManager.getUserSessions(currentUserId);
+      console.log("同步后的会话数据示例:", verifySession[0]);
+
       console.log(
         `会话同步完成: 新增${syncResult.added}, 更新${syncResult.updated}, 删除${syncResult.deleted}`,
       );
@@ -595,7 +600,9 @@ const MessageList: React.FC<MessageListProps> = () => {
 
   // 点击会话
   const onContactClick = async (session: ChatSession) => {
-    console.log(session);
+    console.log("点击的会话数据:", session);
+    console.log("wechatAccountId:", session.wechatAccountId);
+    console.log("类型:", session.type);
 
     // 设置当前会话
     setCurrentContact(session as any, true);
diff --git a/Touchkebao/src/store/module/websocket/msgManage.ts b/Touchkebao/src/store/module/websocket/msgManage.ts
index ce206546..4148f5dc 100644
--- a/Touchkebao/src/store/module/websocket/msgManage.ts
+++ b/Touchkebao/src/store/module/websocket/msgManage.ts
@@ -60,8 +60,8 @@ const messageHandlers: Record<string, MessageHandler> = {
   },
   // 接收消息响应
   CmdReceiveMessageResp: message => {
-    console.log("接收消息响应", message);
-    addMessage(message.friendMessage || message.chatroomMessage);
+    console.log("CmdReceiveMessageResp 接收消息响应", message);
+    // addMessage(message.friendMessage || message.chatroomMessage);
     // 在这里添加具体的处理逻辑
   },
   //收到消息
diff --git a/Touchkebao/src/utils/dbAction/message.ts b/Touchkebao/src/utils/dbAction/message.ts
index 5f452f2a..ae0a0e20 100644
--- a/Touchkebao/src/utils/dbAction/message.ts
+++ b/Touchkebao/src/utils/dbAction/message.ts
@@ -194,6 +194,7 @@ export class MessageManager {
       "nickname",
       "conRemark",
       "avatar",
+      "wechatAccountId", // 添加wechatAccountId比较
     ];
 
     for (const field of fieldsToCompare) {

From c65001399f8b84dc07305f75532a793f4e31d925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Mon, 27 Oct 2025 15:30:27 +0800
Subject: [PATCH 66/72] =?UTF-8?q?=E5=AE=8C=E6=95=B4=E7=9A=84wechatAccountI?=
 =?UTF-8?q?d=E5=A4=84=E7=90=86=20=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=20=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84?=
 =?UTF-8?q?=E5=85=9C=E5=BA=95=EF=BC=88accountId=EF=BC=89=20=E4=BF=9D?=
 =?UTF-8?q?=E8=AF=81=E6=AF=8F=E4=B8=AA=E4=BC=9A=E8=AF=9D=E9=83=BD=E6=9C=89?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84=E8=B4=A6=E5=8F=B7ID=20=E2=9C=85=20?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F=E6=AD=A3=E7=A1=AE=E6=98=BE=E7=A4=BA=20?=
 =?UTF-8?q?=E5=A5=BD=E5=8F=8B=EF=BC=9Aavatar=20=E5=AD=97=E6=AE=B5=20?=
 =?UTF-8?q?=E7=BE=A4=E8=81=8A=EF=BC=9AchatroomAvatar=20=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=20=E7=BB=9F=E4=B8=80=E5=AD=98=E5=82=A8=E5=88=B0=20ChatSession.?=
 =?UTF-8?q?avatar=20=E2=9C=85=20=E4=B8=89=E5=B1=82=E5=85=9C=E5=BA=95?=
 =?UTF-8?q?=E6=9C=BA=E5=88=B6=20=E4=BB=8E=E8=81=94=E7=B3=BB=E4=BA=BA?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=EF=BC=88=E6=9C=80=E5=BF=AB=EF=BC=89?=
 =?UTF-8?q?=20=E4=BB=8E=E6=8E=A5=E5=8F=A3=E8=8E=B7=E5=8F=96=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=EF=BC=88=E5=AE=8C=E6=95=B4=EF=BC=89=20=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=B6=88=E6=81=AF=E6=95=B0=E6=8D=AE=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=EF=BC=88=E5=85=9C=E5=BA=95=EF=BC=89=20=E2=9C=85=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8C=81=E4=B9=85=E5=8C=96=20=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E6=95=B0=E6=8D=AE=E5=AD=98=E5=85=A5=20contactsUnified?=
 =?UTF-8?q?=20=E8=A1=A8=20=E4=BC=9A=E8=AF=9D=E6=95=B0=E6=8D=AE=E5=AD=98?=
 =?UTF-8?q?=E5=85=A5=20chatSessions=20=E8=A1=A8=20=E4=B8=8B=E6=AC=A1?=
 =?UTF-8?q?=E6=94=B6=E5=88=B0=E6=B6=88=E6=81=AF=E7=9B=B4=E6=8E=A5=E4=BB=8E?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E8=AF=BB=E5=8F=96=20=E2=9C=85=20=E9=9D=99?=
 =?UTF-8?q?=E9=BB=98=E6=9B=B4=E6=96=B0=E6=9C=BA=E5=88=B6=20=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE=E5=BA=93=E6=93=8D=E4=BD=9C=E5=9C=A8?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=AE=8C=E6=88=90=20=E9=80=9A=E8=BF=87=20tri?=
 =?UTF-8?q?ggerRefresh()=20=E8=A7=A6=E5=8F=91UI=E6=9B=B4=E6=96=B0=20?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=E6=B5=81=E7=95=85=E6=97=A0?=
 =?UTF-8?q?=E6=84=9F=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/SidebarMenu/MessageList/api.ts |  13 ++
 .../SidebarMenu/MessageList/index.tsx         | 179 ++++++++++++++----
 Touchkebao/src/store/module/weChat/weChat.ts  |  54 +-----
 3 files changed, 162 insertions(+), 84 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/api.ts b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/api.ts
index 81af8aa7..9114b348 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/api.ts
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/api.ts
@@ -1,4 +1,5 @@
 import request from "@/api/request";
+import request2 from "@/api/request2";
 //群、好友聊天记录列表
 export function getMessageList(params: { page: number; limit: number }) {
   return request("/v1/kefu/message/list", params, "GET");
@@ -33,3 +34,15 @@ export interface dataProcessingPost {
 export const dataProcessing = (params: dataProcessingPost) => {
   return request("/v1/kefu/dataProcessing", params, "POST");
 };
+
+export const getWechatFriendDetail = (params: { id: number }) => {
+  return request("/v1/kefu/wechatFriend/detail", params, "GET");
+};
+
+export const getWechatChatroomDetail = (params: { id: number }) => {
+  return request("/v1/kefu/wechatChatroom/detail", params, "GET");
+};
+//更新配置
+export function updateConfig(params) {
+  return request2("/api/WechatFriend/updateConfig", params, "PUT");
+}
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index 73d4a729..5b806f47 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -8,20 +8,24 @@ import {
   EditOutlined,
 } from "@ant-design/icons";
 import styles from "./com.module.scss";
-import { useWeChatStore } from "@weChatStore/weChat";
+import {
+  getMessageList,
+  dataProcessing,
+  updateConfig,
+  getWechatFriendDetail,
+  getWechatChatroomDetail,
+} from "./api";
 import { useMessageStore, triggerRefresh } from "@weChatStore/message";
+import { useWebSocketStore } from "@storeModule/websocket/websocket";
 import { useCustomerStore } from "@weChatStore/customer";
 import { useContactStore } from "@weChatStore/contacts";
-import { useWebSocketStore } from "@/store/module/websocket/websocket";
-import { updateConfig } from "@/pages/pc/ckbox/api";
-import { getMessageList, dataProcessing } from "./api";
-import { formatWechatTime } from "@/utils/common";
+import { useWeChatStore } from "@weChatStore/weChat";
+import { useUserStore } from "@storeModule/user";
 import { MessageManager } from "@/utils/dbAction/message";
 import { ContactManager } from "@/utils/dbAction/contact";
-import { ChatSession } from "@/utils/db";
-import { useUserStore } from "@/store/module/user";
+import { formatWechatTime } from "@/utils/common";
 import { messageFilter } from "@/utils/filter";
-
+import { ChatSession } from "@/utils/db";
 interface MessageListProps {}
 
 const MessageList: React.FC<MessageListProps> = () => {
@@ -490,6 +494,8 @@ const MessageList: React.FC<MessageListProps> = () => {
   // 监听WebSocket消息更新（静默更新模式）
   useEffect(() => {
     const handleNewMessage = async (event: CustomEvent) => {
+      console.log("handleNewMessage", event);
+
       const { message: msgData, sessionId, type } = event.detail;
 
       // 从联系人表查询完整信息（确保头像、wechatAccountId等字段完整）
@@ -523,6 +529,7 @@ const MessageList: React.FC<MessageListProps> = () => {
           updateData.wechatAccountId = contact.wechatAccountId;
           updateData.nickname = contact.nickname;
           updateData.conRemark = contact.conRemark;
+          updateData.content = msgData.content;
         }
 
         // 更新到数据库
@@ -545,37 +552,141 @@ const MessageList: React.FC<MessageListProps> = () => {
           newSession.content = msgData.content;
           newSession.lastUpdateTime = new Date().toISOString();
           newSession.config.unreadCount = 1;
-
           // 添加到数据库
           await MessageManager.addSession(newSession);
         } else {
-          // 联系人表中不存在，创建简化会话（兜底方案）
+          // 联系人表中不存在，从接口获取详细信息
           console.warn(
-            `联系人表中未找到 ID: ${sessionId}, 类型: ${type}，使用消息数据创建简化会话`,
+            `联系人表中未找到 ID: ${sessionId}, 类型: ${type}，从接口获取详细信息`,
           );
-          const newSession: ChatSession = {
-            serverId: `${type}_${sessionId}`,
-            userId: currentUserId,
-            id: sessionId,
-            type,
-            wechatAccountId: msgData.wechatAccountId || 0,
-            nickname: msgData.nickname || "",
-            conRemark: msgData.conRemark || "",
-            avatar:
-              type === "group"
-                ? msgData.chatroomAvatar || ""
-                : msgData.avatar || "",
-            content: msgData.content,
-            lastUpdateTime: new Date().toISOString(),
-            config: {
-              unreadCount: 1,
-              top: 0,
-            },
-            sortKey: "",
-          };
 
-          // 添加到数据库
-          await MessageManager.addSession(newSession);
+          try {
+            // 请求接口获取联系人/群组详情
+            let detailResult: any = null;
+            if (type === "friend") {
+              detailResult = await getWechatFriendDetail({ id: sessionId });
+            } else {
+              detailResult = await getWechatChatroomDetail({ id: sessionId });
+            }
+
+            if (detailResult?.detail) {
+              const contactDetail = detailResult.detail;
+
+              // 构建联系人数据并存入联系人数据库
+              const newContact = {
+                serverId: `${type}_${sessionId}`,
+                userId: currentUserId,
+                id: sessionId,
+                type,
+                wechatAccountId: contactDetail.wechatAccountId,
+                nickname: contactDetail.nickname || "",
+                conRemark: contactDetail.conRemark || "",
+                avatar:
+                  type === "group"
+                    ? contactDetail.chatroomAvatar || ""
+                    : contactDetail.avatar || "",
+                lastUpdateTime: new Date().toISOString(),
+                sortKey: "",
+                searchKey: (
+                  contactDetail.conRemark ||
+                  contactDetail.nickname ||
+                  ""
+                ).toLowerCase(),
+              };
+
+              // 添加群组特有字段
+              if (type === "group") {
+                Object.assign(newContact, {
+                  chatroomId: contactDetail.chatroomId,
+                  chatroomOwner: contactDetail.chatroomOwner,
+                  selfDisplayName: contactDetail.selfDisplyName,
+                  notice: contactDetail.notice,
+                });
+              } else {
+                // 添加好友特有字段
+                Object.assign(newContact, {
+                  wechatFriendId: contactDetail.id,
+                  wechatId: contactDetail.wechatId,
+                  alias: contactDetail.alias,
+                  gender: contactDetail.gender,
+                  region: contactDetail.region,
+                  signature: contactDetail.signature,
+                  phone: contactDetail.phone,
+                  quanPin: contactDetail.quanPin,
+                  groupId: contactDetail.groupId,
+                });
+              }
+
+              // 存入联系人数据库
+              await ContactManager.addContact(newContact as any);
+              console.log("✅ 新联系人已存入数据库:", newContact);
+
+              // 使用完整联系人信息构建会话
+              const newSession = MessageManager.buildSessionFromContact(
+                contactDetail as any,
+                currentUserId,
+              );
+
+              // 更新会话内容和未读数
+              newSession.content = msgData.content;
+              newSession.lastUpdateTime = new Date().toISOString();
+              newSession.config.unreadCount = 1;
+
+              // 添加到会话数据库
+              await MessageManager.addSession(newSession);
+              console.log("✅ 新会话已创建:", newSession);
+            } else {
+              // 接口也没有返回数据，使用最基础的兜底方案
+              console.error("接口未返回联系人详情，使用基础数据创建会话");
+              const newSession: ChatSession = {
+                serverId: `${type}_${sessionId}`,
+                userId: currentUserId,
+                id: sessionId,
+                type,
+                wechatAccountId: msgData.wechatAccountId || 0,
+                nickname: msgData.nickname || "未知联系人",
+                conRemark: msgData.conRemark || "",
+                avatar:
+                  type === "group"
+                    ? msgData.chatroomAvatar || ""
+                    : msgData.avatar || "",
+                content: msgData.content,
+                lastUpdateTime: new Date().toISOString(),
+                config: {
+                  unreadCount: 1,
+                  top: 0,
+                },
+                sortKey: "",
+              };
+
+              await MessageManager.addSession(newSession);
+            }
+          } catch (error) {
+            console.error("获取联系人详情失败:", error);
+            // 失败时使用消息数据创建简化会话
+            const newSession: ChatSession = {
+              serverId: `${type}_${sessionId}`,
+              userId: currentUserId,
+              id: sessionId,
+              type,
+              wechatAccountId: msgData.wechatAccountId || 0,
+              nickname: msgData.nickname || "未知联系人",
+              conRemark: msgData.conRemark || "",
+              avatar:
+                type === "group"
+                  ? msgData.chatroomAvatar || ""
+                  : msgData.avatar || "",
+              content: msgData.content,
+              lastUpdateTime: new Date().toISOString(),
+              config: {
+                unreadCount: 1,
+                top: 0,
+              },
+              sortKey: "",
+            };
+
+            await MessageManager.addSession(newSession);
+          }
         }
       }
 
@@ -605,7 +716,7 @@ const MessageList: React.FC<MessageListProps> = () => {
     console.log("类型:", session.type);
 
     // 设置当前会话
-    setCurrentContact(session as any, true);
+    setCurrentContact(session as any);
 
     // 标记为已读（不更新时间和排序）
     if (session.config.unreadCount > 0) {
diff --git a/Touchkebao/src/store/module/weChat/weChat.ts b/Touchkebao/src/store/module/weChat/weChat.ts
index 64f4cc7f..85977de2 100644
--- a/Touchkebao/src/store/module/weChat/weChat.ts
+++ b/Touchkebao/src/store/module/weChat/weChat.ts
@@ -18,14 +18,6 @@ import {
   getFriendInjectConfig,
 } from "@/pages/pc/ckbox/api";
 import { ChatRecord, ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
-import { ContactManager } from "@/utils/dbAction";
-import { useUserStore } from "@/store/module/user";
-import {
-  addChatSession,
-  updateChatSession,
-  useCkChatStore,
-  pinChatSessionToTop,
-} from "@/store/module/ckchat/ckchat";
 
 /**
  * 微信聊天状态管理 Store
@@ -145,10 +137,7 @@ export const useWeChatStore = create<WeChatState>()(
         set({ currentContract: null, currentMessages: [] });
       },
       /** 设置当前联系人并加载相关数据 */
-      setCurrentContact: (
-        contract: ContractData | weChatGroup,
-        isExist?: boolean,
-      ) => {
+      setCurrentContact: (contract: ContractData | weChatGroup) => {
         const state = useWeChatStore.getState();
         // 切换联系人时清空当前消息，等待重新加载
         set({ currentMessages: [] });
@@ -170,14 +159,7 @@ export const useWeChatStore = create<WeChatState>()(
         }).then(result => {
           set({ aiQuoteMessageContent: result });
         });
-        if (isExist) {
-          updateChatSession({
-            ...contract,
-            config: { unreadCount: 0 },
-          });
-        } else {
-          addChatSession(contract);
-        }
+        // 注意：会话列表的未读数清零在MessageList组件的onContactClick中处理
         set({ currentContract: contract });
         updateConfig({
           id: contract.id,
@@ -337,37 +319,9 @@ export const useWeChatStore = create<WeChatState>()(
                 isLoadingAiChat: false,
               }));
             }
-          } else {
-            // 更新其他聊天的未读消息数
-            const chatSessions = useCkChatStore.getState().chatSessions;
-            const session = chatSessions.find(item => item.id == getMessageId);
-            if (session) {
-              session.config.unreadCount =
-                Number(session.config.unreadCount) + 1;
-              updateChatSession(session);
-              // 将接收到新消息的会话置顶到列表顶部
-              pinChatSessionToTop(getMessageId);
-            } else {
-              // 如果会话不存在，创建新会话
-              const currentUserId = useUserStore.getState().user?.id || 0;
-              const contactType = isWechatGroup ? "group" : "friend";
-
-              // 从统一联系人表查询
-              const contacts =
-                await ContactManager.getUserContacts(currentUserId);
-              const contact = contacts.find(
-                c => c.id === getMessageId && c.type === contactType,
-              );
-
-              if (contact) {
-                addChatSession({
-                  ...contact,
-                  config: { unreadCount: 1 },
-                } as any);
-                // 新创建的会话会自动添加到列表顶部，无需额外置顶
-              }
-            }
           }
+          // 注意：非当前聊天的会话列表更新已通过 chatMessageReceived 事件
+          // 在 MessageList 组件中处理，无需在此重复操作
         } catch (error) {
           console.error("接收新消息失败:", error);
           set(() => ({

From ae4b592bb694aa85576c51a867d7decfd233a2f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Mon, 27 Oct 2025 15:38:01 +0800
Subject: [PATCH 67/72] =?UTF-8?q?=E8=BD=AC=E7=BB=99=E4=BB=96=E4=BA=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86=EF=BC=8C=E5=8C=85=E6=8B=AC?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=92=8C=E5=88=A0=E9=99=A4=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E3=80=81=E8=81=94=E7=B3=BB=E4=BC=9A=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/toContract/index.tsx           | 70 +++++++++++++++----
 .../components/MessageEnter/index.tsx         |  2 -
 2 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/components/toContract/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/components/toContract/index.tsx
index 7c569755..1c7975f5 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/components/toContract/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/components/toContract/index.tsx
@@ -7,9 +7,11 @@ import {
   WechatFriendRebackAllot,
 } from "@/pages/pc/ckbox/weChat/api";
 import { useCurrentContact } from "@/store/module/weChat/weChat";
-import { useCkChatStore } from "@/store/module/ckchat/ckchat";
-import { ContactManager } from "@/utils/dbAction";
+import { ContactManager } from "@/utils/dbAction/contact";
+import { MessageManager } from "@/utils/dbAction/message";
+import { triggerRefresh } from "@/store/module/weChat/message";
 import { useUserStore } from "@/store/module/user";
+import { useWeChatStore } from "@/store/module/weChat/weChat";
 const { TextArea } = Input;
 const { Option } = Select;
 
@@ -33,6 +35,9 @@ const ToContract: React.FC<ToContractProps> = ({
   disabled = false,
 }) => {
   const currentContact = useCurrentContact();
+  const clearCurrentContact = useWeChatStore(
+    state => state.clearCurrentContact,
+  );
   const [visible, setVisible] = useState(false);
   const [selectedTarget, setSelectedTarget] = useState<number | null>(null);
   const [comment, setComment] = useState<string>("");
@@ -40,7 +45,6 @@ const ToContract: React.FC<ToContractProps> = ({
   const [customerServiceList, setCustomerServiceList] = useState<DepartItem[]>(
     [],
   );
-  const deleteChatSession = useCkChatStore(state => state.deleteChatSession);
   // 打开弹窗
   const openModal = () => {
     setVisible(true);
@@ -67,8 +71,6 @@ const ToContract: React.FC<ToContractProps> = ({
     try {
       setLoading(true);
 
-      console.log(currentContact);
-
       // 调用转接接口
       if (currentContact) {
         if ("chatroomId" in currentContact && currentContact.chatroomId) {
@@ -88,18 +90,37 @@ const ToContract: React.FC<ToContractProps> = ({
         }
       }
 
-      message.success("转接成功");
+      // 先关闭弹窗
+      closeModal();
+
+      // 删除本地数据库记录并关闭聊天窗口
       try {
-        // 删除聊天会话
-        deleteChatSession(currentContact.id);
-        // 删除本地数据库记录
         const currentUserId = useUserStore.getState().user?.id || 0;
         const contactType = "chatroomId" in currentContact ? "group" : "friend";
+
+        // 1. 从会话列表数据库删除
+        await MessageManager.deleteSession(
+          currentUserId,
+          currentContact.id,
+          contactType,
+        );
+        console.log("✅ 已从会话列表删除");
+
+        // 2. 从联系人数据库删除
         await ContactManager.deleteContact(currentContact.id);
+        console.log("✅ 已从联系人数据库删除");
+
+        // 3. 触发会话列表刷新
+        triggerRefresh();
+
+        // 4. 清空当前选中的联系人（关闭聊天窗口）
+        clearCurrentContact();
+
+        message.success("转接成功，已清理本地数据");
       } catch (deleteError) {
         console.error("删除本地数据失败:", deleteError);
+        message.error("删除本地数据失败");
       }
-      closeModal();
     } catch (error) {
       console.error("转接失败:", error);
       message.error("转接失败，请重试");
@@ -126,18 +147,37 @@ const ToContract: React.FC<ToContractProps> = ({
         }
       }
 
-      message.success("转回成功");
+      // 先关闭弹窗
+      closeModal();
+
+      // 删除本地数据库记录并关闭聊天窗口
       try {
-        // 删除聊天会话
-        deleteChatSession(currentContact.id);
-        // 删除本地数据库记录
         const currentUserId = useUserStore.getState().user?.id || 0;
         const contactType = "chatroomId" in currentContact ? "group" : "friend";
+
+        // 1. 从会话列表数据库删除
+        await MessageManager.deleteSession(
+          currentUserId,
+          currentContact.id,
+          contactType,
+        );
+        console.log("✅ 已从会话列表删除");
+
+        // 2. 从联系人数据库删除
         await ContactManager.deleteContact(currentContact.id);
+        console.log("✅ 已从联系人数据库删除");
+
+        // 3. 触发会话列表刷新
+        triggerRefresh();
+
+        // 4. 清空当前选中的联系人（关闭聊天窗口）
+        clearCurrentContact();
+
+        message.success("转回成功，已清理本地数据");
       } catch (deleteError) {
         console.error("删除本地数据失败:", deleteError);
+        message.error("删除本地数据失败");
       }
-      closeModal();
     } catch (error) {
       console.error("转回失败:", error);
       message.error("转回失败，请重试");
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
index f302a759..73391f5e 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
@@ -49,8 +49,6 @@ const MessageEnter: React.FC<MessageEnterProps> = ({ contract }) => {
   const isLoadingAiChat = useWeChatStore(state => state.isLoadingAiChat);
   useEffect(() => {
     if (quoteMessageContent) {
-      console.log("quoteMessageContent", quoteMessageContent);
-
       setInputValue(quoteMessageContent);
     }
   }, [quoteMessageContent]);

From e1893e15069f4cc198cdbcad37e0008f510b37d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Mon, 27 Oct 2025 15:45:07 +0800
Subject: [PATCH 68/72] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChatWindow/components/MessageRecord/index.tsx           | 4 ++--
 .../weChat/components/SidebarMenu/MessageList/index.tsx     | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
index 3b21ff8a..715c755b 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
@@ -787,7 +787,7 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
             ))}
 
           {group.messages
-            .filter(v => [570425393].includes(v.msgType))
+            .filter(v => [570425393, 90000].includes(v.msgType))
             .map(msg => {
               // 解析JSON字符串
               let displayContent = msg.content;
@@ -812,7 +812,7 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
             })}
           <div className={styles.messageTime}>{group.time}</div>
           {group.messages
-            .filter(v => ![10000, 570425393].includes(v.msgType))
+            .filter(v => ![10000, 570425393, 90000].includes(v.msgType))
             .map(msg => {
               return renderMessage(msg);
             })}
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
index 5b806f47..2cf63cdc 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -494,8 +494,6 @@ const MessageList: React.FC<MessageListProps> = () => {
   // 监听WebSocket消息更新（静默更新模式）
   useEffect(() => {
     const handleNewMessage = async (event: CustomEvent) => {
-      console.log("handleNewMessage", event);
-
       const { message: msgData, sessionId, type } = event.detail;
 
       // 从联系人表查询完整信息（确保头像、wechatAccountId等字段完整）
@@ -711,10 +709,6 @@ const MessageList: React.FC<MessageListProps> = () => {
 
   // 点击会话
   const onContactClick = async (session: ChatSession) => {
-    console.log("点击的会话数据:", session);
-    console.log("wechatAccountId:", session.wechatAccountId);
-    console.log("类型:", session.type);
-
     // 设置当前会话
     setCurrentContact(session as any);
 

From d01c91e6ee1e86f9b22646d74bd870193e90b6ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Mon, 27 Oct 2025 15:49:52 +0800
Subject: [PATCH 69/72] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=89=8D=E4=BC=9A=E8=A7=A6=E5=8F=91ai?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Touchkebao/src/store/module/weChat/weChat.ts | 50 +++++++++++---------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/Touchkebao/src/store/module/weChat/weChat.ts b/Touchkebao/src/store/module/weChat/weChat.ts
index 85977de2..abeb9c19 100644
--- a/Touchkebao/src/store/module/weChat/weChat.ts
+++ b/Touchkebao/src/store/module/weChat/weChat.ts
@@ -292,32 +292,36 @@ export const useWeChatStore = create<WeChatState>()(
             set(state => ({
               currentMessages: [...state.currentMessages, message],
             }));
-            //把数据传到存客宝
-            const params: any = {
-              type: "CmdNewMessage",
-              wechatAccountId: currentContract.wechatAccountId,
-            };
-            if (isWechatGroup) {
-              params.chatroomMessage = [message];
-            } else {
-              params.friendMessage = [message];
-            }
-            const dataProcessingResult = await dataProcessing(params);
-            //如果成功，就请求ai对话接口
-            set(() => ({
-              isLoadingAiChat: true,
-            }));
-            if (!dataProcessingResult) {
-              const messageContent = await aiChat({
-                friendId: getMessageId,
-                wechatAccountId: currentContract.wechatAccountId,
-                message: message,
-              });
 
+            // 只有文字消息才触发AI（msgType === 1）
+            if (message.msgType === 1) {
+              //把数据传到存客宝
+              const params: any = {
+                type: "CmdNewMessage",
+                wechatAccountId: currentContract.wechatAccountId,
+              };
+              if (isWechatGroup) {
+                params.chatroomMessage = [message];
+              } else {
+                params.friendMessage = [message];
+              }
+              const dataProcessingResult = await dataProcessing(params);
+              //如果成功，就请求ai对话接口
               set(() => ({
-                quoteMessageContent: messageContent?.content || "",
-                isLoadingAiChat: false,
+                isLoadingAiChat: true,
               }));
+              if (!dataProcessingResult) {
+                const messageContent = await aiChat({
+                  friendId: getMessageId,
+                  wechatAccountId: currentContract.wechatAccountId,
+                  message: message,
+                });
+
+                set(() => ({
+                  quoteMessageContent: messageContent?.content || "",
+                  isLoadingAiChat: false,
+                }));
+              }
             }
           }
           // 注意：非当前聊天的会话列表更新已通过 chatMessageReceived 事件

From 8cff6750f95345d6d8220b92786274532dddcf79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Mon, 27 Oct 2025 16:57:26 +0800
Subject: [PATCH 70/72] Implement AI loading animation in MessageEnter
 component and enhance user interface. Remove unused loading icon and
 streamline input area for better user experience during AI response
 generation.

---
 .../MessageEnter/MessageEnter.module.scss     | 209 ++++++++++++++++
 .../components/MessageEnter/index.tsx         | 234 ++++++++++--------
 2 files changed, 341 insertions(+), 102 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/MessageEnter.module.scss b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/MessageEnter.module.scss
index 95c26fd0..744a1e76 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/MessageEnter.module.scss
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/MessageEnter.module.scss
@@ -227,3 +227,212 @@
     min-width: 60px;
   }
 }
+
+// AI 加载动效样式
+.aiLoadingContainer {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 190px;
+  background: linear-gradient(135deg, #f8f9ff 0%, #fef5ff 100%);
+  border-radius: 8px;
+  margin: 8px 0;
+  position: relative;
+  overflow: hidden;
+
+  &::before {
+    content: "";
+    position: absolute;
+    top: -50%;
+    left: -50%;
+    width: 200%;
+    height: 200%;
+    background: linear-gradient(
+      45deg,
+      transparent 30%,
+      rgba(138, 99, 210, 0.05) 50%,
+      transparent 70%
+    );
+    animation: shimmer 3s infinite;
+  }
+}
+
+@keyframes shimmer {
+  0% {
+    transform: translateX(-100%) translateY(-100%) rotate(45deg);
+  }
+  100% {
+    transform: translateX(100%) translateY(100%) rotate(45deg);
+  }
+}
+
+.aiLoadingContent {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 12px;
+  position: relative;
+  z-index: 1;
+}
+
+.aiLoadingIcon {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 0;
+  height: 60px;
+}
+
+.brainIcon {
+  font-size: 36px;
+  animation: float 2s ease-in-out infinite;
+  filter: drop-shadow(0 4px 8px rgba(138, 99, 210, 0.3));
+  position: relative;
+  z-index: 2;
+  margin: 0 12px;
+}
+
+@keyframes float {
+  0%,
+  100% {
+    transform: translateY(0) scale(1);
+  }
+  50% {
+    transform: translateY(-8px) scale(1.05);
+  }
+}
+
+// WiFi波纹容器 - 左侧
+.waveLeft {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  justify-content: center;
+  gap: 5px;
+}
+
+// WiFi波纹容器 - 右侧
+.waveRight {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: center;
+  gap: 5px;
+}
+
+// 波纹条样式
+.wave1,
+.wave2,
+.wave3 {
+  height: 3px;
+  background: #8a63d2;
+  border-radius: 2px;
+  animation: waveExpand 1.5s ease-out infinite;
+}
+
+.wave1 {
+  width: 12px;
+  animation-delay: 0s;
+}
+
+.wave2 {
+  width: 20px;
+  animation-delay: 0.25s;
+}
+
+.wave3 {
+  width: 28px;
+  animation-delay: 0.5s;
+}
+
+@keyframes waveExpand {
+  0% {
+    opacity: 0;
+    transform: scaleX(0.3);
+  }
+  40% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0;
+    transform: scaleX(1.2);
+  }
+}
+
+.aiLoadingText {
+  display: flex;
+  align-items: center;
+  gap: 2px;
+  font-size: 16px;
+  font-weight: 500;
+  color: #333;
+}
+
+.loadingTextMain {
+  background: linear-gradient(90deg, #8a63d2 0%, #b794f6 50%, #8a63d2 100%);
+  background-size: 200% auto;
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+  background-clip: text;
+  animation: textShine 2s linear infinite;
+}
+
+@keyframes textShine {
+  0% {
+    background-position: 0% center;
+  }
+  100% {
+    background-position: 200% center;
+  }
+}
+
+.loadingDots {
+  display: inline-flex;
+  gap: 2px;
+
+  span {
+    animation: dotFlashing 1.4s infinite;
+    color: #8a63d2;
+    font-weight: bold;
+
+    &:nth-child(1) {
+      animation-delay: 0s;
+    }
+    &:nth-child(2) {
+      animation-delay: 0.2s;
+    }
+    &:nth-child(3) {
+      animation-delay: 0.4s;
+    }
+  }
+}
+
+@keyframes dotFlashing {
+  0%,
+  80%,
+  100% {
+    opacity: 0.3;
+    transform: scale(0.8);
+  }
+  40% {
+    opacity: 1;
+    transform: scale(1.2);
+  }
+}
+
+.aiLoadingSubText {
+  font-size: 12px;
+  color: #999;
+  animation: fadeInOut 2s ease-in-out infinite;
+}
+
+@keyframes fadeInOut {
+  0%,
+  100% {
+    opacity: 0.5;
+  }
+  50% {
+    opacity: 1;
+  }
+}
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
index 73391f5e..ca6de5bb 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { Layout, Input, Button, Modal, Spin } from "antd";
+import { Layout, Input, Button, Modal } from "antd";
 import {
   SendOutlined,
   FolderOutlined,
@@ -7,7 +7,6 @@ import {
   ExportOutlined,
   CloseOutlined,
   MessageOutlined,
-  LoadingOutlined,
 } from "@ant-design/icons";
 import { ContractData, weChatGroup, ChatRecord } from "@/pages/pc/ckbox/data";
 import { useWebSocketStore } from "@/store/module/websocket/websocket";
@@ -199,115 +198,146 @@ const MessageEnter: React.FC<MessageEnterProps> = ({ contract }) => {
     <>
       {/* 聊天输入 */}
       <Footer className={styles.chatFooter}>
-        {["common"].includes(EnterModule) && (
-          <div className={styles.inputContainer}>
-            <div className={styles.inputToolbar}>
-              <div className={styles.leftTool}>
-                <EmojiPicker onEmojiSelect={handleEmojiSelect} />
-                <SimpleFileUpload
-                  onFileUploaded={filePath =>
-                    handleFileUploaded(filePath, FileType.FILE)
-                  }
-                  maxSize={1}
-                  type={4}
-                  slot={
-                    <Button
-                      className={styles.toolbarButton}
-                      type="text"
-                      icon={<FolderOutlined />}
-                    />
-                  }
-                />
-                <SimpleFileUpload
-                  onFileUploaded={filePath =>
-                    handleFileUploaded(filePath, FileType.IMAGE)
-                  }
-                  maxSize={1}
-                  type={1}
-                  slot={
-                    <Button
-                      className={styles.toolbarButton}
-                      type="text"
-                      icon={<PictureOutlined />}
-                    />
-                  }
-                />
-
-                <AudioRecorder
-                  onAudioUploaded={audioData =>
-                    handleFileUploaded(audioData, FileType.AUDIO)
-                  }
-                  className={styles.toolbarButton}
-                />
-              </div>
-              <div className={styles.rightTool}>
-                <ToContract className={styles.rightToolItem} />
-                <div
-                  style={{
-                    fontSize: "12px",
-                    cursor: "pointer",
-                    color: "#666",
-                  }}
-                  onClick={openChatRecordModel}
-                >
-                  <MessageOutlined />
-                  &nbsp;聊天记录
+        {isLoadingAiChat ? (
+          <div className={styles.aiLoadingContainer}>
+            <div className={styles.aiLoadingContent}>
+              <div className={styles.aiLoadingIcon}>
+                {/* WiFi式波纹 - 左侧 */}
+                <div className={styles.waveLeft}>
+                  <div className={styles.wave1}></div>
+                  <div className={styles.wave2}></div>
+                  <div className={styles.wave3}></div>
                 </div>
+
+                {/* 中心大脑图标 */}
+                <div className={styles.brainIcon}>🧠</div>
+
+                {/* WiFi式波纹 - 右侧 */}
+                <div className={styles.waveRight}>
+                  <div className={styles.wave1}></div>
+                  <div className={styles.wave2}></div>
+                  <div className={styles.wave3}></div>
+                </div>
+              </div>
+              <div className={styles.aiLoadingText}>
+                <span className={styles.loadingTextMain}>AI 正在思考</span>
+                <span className={styles.loadingDots}>
+                  <span>.</span>
+                  <span>.</span>
+                  <span>.</span>
+                </span>
+              </div>
+              <div className={styles.aiLoadingSubText}>
+                正在分析消息内容，为您生成智能回复
               </div>
             </div>
-            {isLoadingAiChat ? (
-              <Spin
-                indicator={<LoadingOutlined spin />}
-                spinning={isLoadingAiChat}
-              >
-                <div style={{ height: "100px" }}>
-                  <div>Ai思考中...请稍后</div>
-                </div>
-              </Spin>
-            ) : (
-              <div className={styles.inputArea}>
-                <div className={styles.inputWrapper}>
-                  <TextArea
-                    value={inputValue}
-                    onChange={e => setInputValue(e.target.value)}
-                    onKeyDown={handleKeyPress}
-                    placeholder="输入消息..."
-                    className={styles.messageInput}
-                    autoSize={{ minRows: 2, maxRows: 6 }}
-                  />
+          </div>
+        ) : (
+          <>
+            {["common"].includes(EnterModule) && (
+              <div className={styles.inputContainer}>
+                <div className={styles.inputToolbar}>
+                  <div className={styles.leftTool}>
+                    <EmojiPicker onEmojiSelect={handleEmojiSelect} />
+                    <SimpleFileUpload
+                      onFileUploaded={filePath =>
+                        handleFileUploaded(filePath, FileType.FILE)
+                      }
+                      maxSize={1}
+                      type={4}
+                      slot={
+                        <Button
+                          className={styles.toolbarButton}
+                          type="text"
+                          icon={<FolderOutlined />}
+                        />
+                      }
+                    />
+                    <SimpleFileUpload
+                      onFileUploaded={filePath =>
+                        handleFileUploaded(filePath, FileType.IMAGE)
+                      }
+                      maxSize={1}
+                      type={1}
+                      slot={
+                        <Button
+                          className={styles.toolbarButton}
+                          type="text"
+                          icon={<PictureOutlined />}
+                        />
+                      }
+                    />
 
-                  <div className={styles.sendButtonArea}>
-                    <Button
-                      type="primary"
-                      icon={<SendOutlined />}
-                      onClick={handleSend}
-                      disabled={!inputValue.trim()}
-                      className={styles.sendButton}
-                    >
-                      发送
-                    </Button>
+                    <AudioRecorder
+                      onAudioUploaded={audioData =>
+                        handleFileUploaded(audioData, FileType.AUDIO)
+                      }
+                      className={styles.toolbarButton}
+                    />
                   </div>
+                  <div className={styles.rightTool}>
+                    <ToContract className={styles.rightToolItem} />
+                    <div
+                      style={{
+                        fontSize: "12px",
+                        cursor: "pointer",
+                        color: "#666",
+                      }}
+                      onClick={openChatRecordModel}
+                    >
+                      <MessageOutlined />
+                      &nbsp;聊天记录
+                    </div>
+                  </div>
+                </div>
+
+                <div className={styles.inputArea}>
+                  <div className={styles.inputWrapper}>
+                    <TextArea
+                      value={inputValue}
+                      onChange={e => setInputValue(e.target.value)}
+                      onKeyDown={handleKeyPress}
+                      placeholder="输入消息..."
+                      className={styles.messageInput}
+                      autoSize={{ minRows: 2, maxRows: 6 }}
+                    />
+
+                    <div className={styles.sendButtonArea}>
+                      <Button
+                        type="primary"
+                        icon={<SendOutlined />}
+                        onClick={handleSend}
+                        disabled={!inputValue.trim()}
+                        className={styles.sendButton}
+                      >
+                        发送
+                      </Button>
+                    </div>
+                  </div>
+                </div>
+
+                <div className={styles.inputHint}>
+                  按下Ctrl+Enter换行，Enter发送
                 </div>
               </div>
             )}
+            {["multipleForwarding"].includes(EnterModule) && (
+              <div className={styles.multipleForwardingBar}>
+                <div className={styles.actionButton} onClick={handTurnRignt}>
+                  <ExportOutlined className={styles.actionIcon} />
+                  <span className={styles.actionText}>转发</span>
+                </div>
 
-            <div className={styles.inputHint}>
-              按下Ctrl+Enter换行，Enter发送
-            </div>
-          </div>
-        )}
-        {["multipleForwarding"].includes(EnterModule) && (
-          <div className={styles.multipleForwardingBar}>
-            <div className={styles.actionButton} onClick={handTurnRignt}>
-              <ExportOutlined className={styles.actionIcon} />
-              <span className={styles.actionText}>转发</span>
-            </div>
-
-            <div className={styles.actionButton} onClick={handleCancelAction}>
-              <CloseOutlined className={styles.actionIcon} />
-              <span className={styles.actionText}>取消</span>
-            </div>
-          </div>
+                <div
+                  className={styles.actionButton}
+                  onClick={handleCancelAction}
+                >
+                  <CloseOutlined className={styles.actionIcon} />
+                  <span className={styles.actionText}>取消</span>
+                </div>
+              </div>
+            )}
+          </>
         )}
       </Footer>
 

From 364a52b5536011caa6fa528a805ed29c626985e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Mon, 27 Oct 2025 17:07:10 +0800
Subject: [PATCH 71/72] Remove Dexie database implementation and related
 initialization logic. Update Recharge component to fetch and display
 subscription packages dynamically, enhancing user experience with improved
 payment handling and UI updates.

---
 Cunkebao/package.json                         |   1 -
 Cunkebao/src/main.tsx                         |  38 +--
 .../pages/mobile/mine/recharge/index/api.ts   |  35 ++
 .../mine/recharge/index/index.module.scss     |   8 +
 .../mobile/mine/recharge/index/index.tsx      | 175 +++++++---
 Cunkebao/src/utils/db.ts                      | 319 ------------------
 6 files changed, 177 insertions(+), 399 deletions(-)
 create mode 100644 Cunkebao/src/pages/mobile/mine/recharge/index/api.ts
 delete mode 100644 Cunkebao/src/utils/db.ts

diff --git a/Cunkebao/package.json b/Cunkebao/package.json
index 0277589c..1e1baa4b 100644
--- a/Cunkebao/package.json
+++ b/Cunkebao/package.json
@@ -10,7 +10,6 @@
     "antd-mobile-icons": "^0.3.0",
     "axios": "^1.6.7",
     "dayjs": "^1.11.13",
-    "dexie": "^4.2.0",
     "echarts": "^5.6.0",
     "echarts-for-react": "^3.0.2",
     "react": "^18.2.0",
diff --git a/Cunkebao/src/main.tsx b/Cunkebao/src/main.tsx
index e442b9c1..ef303df7 100644
--- a/Cunkebao/src/main.tsx
+++ b/Cunkebao/src/main.tsx
@@ -7,38 +7,14 @@ import dayjs from "dayjs";
 import "dayjs/locale/zh-cn";
 import App from "./App";
 import "./styles/global.scss";
-import { db } from "@/utils/db"; // 引入数据库实例
 
 // 设置dayjs为中文
 dayjs.locale("zh-cn");
 
-// 数据库初始化
-async function initializeApp() {
-  try {
-    // 确保数据库已打开
-    await db.open();
-    console.log("数据库初始化成功");
-
-    // 调试模式：清理所有数据
-    console.log("调试模式：开始清理数据库数据...");
-    await db.kfUsers.clear();
-    await db.weChatGroup.clear();
-    await db.contracts.clear();
-    await db.newContractList.clear();
-    console.log("数据库数据清理完成");
-  } catch (error) {
-    console.error("数据库初始化失败:", error);
-    // 可以选择显示错误提示或使用降级方案
-  }
-
-  // 渲染应用
-  const root = createRoot(document.getElementById("root")!);
-  root.render(
-    <ConfigProvider locale={zhCN}>
-      <App />
-    </ConfigProvider>,
-  );
-}
-
-// 启动应用
-initializeApp();
+// 渲染应用
+const root = createRoot(document.getElementById("root")!);
+root.render(
+  <ConfigProvider locale={zhCN}>
+    <App />
+  </ConfigProvider>,
+);
diff --git a/Cunkebao/src/pages/mobile/mine/recharge/index/api.ts b/Cunkebao/src/pages/mobile/mine/recharge/index/api.ts
new file mode 100644
index 00000000..c2034d7e
--- /dev/null
+++ b/Cunkebao/src/pages/mobile/mine/recharge/index/api.ts
@@ -0,0 +1,35 @@
+import request from "@/api/request";
+
+interface taocanItem {
+  id: 1;
+  name: "试用套餐";
+  tokens: "2,800";
+  price: 9800;
+  originalPrice: 140;
+  description: ["适合新用户体验", "包含基础AI功能", "永久有效", "客服支持"];
+  sort: 1;
+  isTrial: 1;
+  isRecommend: 0;
+  isHot: 0;
+  isVip: 0;
+  status: 1;
+  isDel: 0;
+  delTime: null;
+  createTime: "2025-09-29 16:53:06";
+  updateTime: "2025-09-29 16:53:06";
+  discount: 30;
+  unitPrice: 3.5;
+}
+
+interface taocanList {
+  list: taocanItem[];
+}
+// 套餐列表
+export function getTaocanList(): Promise<taocanList> {
+  return request("/v1/tokens/list", {}, "GET");
+}
+
+// 支付id和price 从套餐列表取对应的价格
+export function pay(params: { id: string; price: number }) {
+  return request("/v1/tokens/pay", params, "POST");
+}
diff --git a/Cunkebao/src/pages/mobile/mine/recharge/index/index.module.scss b/Cunkebao/src/pages/mobile/mine/recharge/index/index.module.scss
index c7e3615a..46a297c1 100644
--- a/Cunkebao/src/pages/mobile/mine/recharge/index/index.module.scss
+++ b/Cunkebao/src/pages/mobile/mine/recharge/index/index.module.scss
@@ -123,10 +123,18 @@
   margin: 4px 0;
   font-size: 16px;
   border-radius: 8px;
+  padding: 12px 16px;
+
+  div {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
 }
 .quick-btn-active {
   @extend .quick-btn;
   font-weight: 600;
+  border: 2px solid var(--primary-color);
 }
 .recharge-main-btn {
   margin-top: 16px;
diff --git a/Cunkebao/src/pages/mobile/mine/recharge/index/index.tsx b/Cunkebao/src/pages/mobile/mine/recharge/index/index.tsx
index 9507b73c..c0a493b1 100644
--- a/Cunkebao/src/pages/mobile/mine/recharge/index/index.tsx
+++ b/Cunkebao/src/pages/mobile/mine/recharge/index/index.tsx
@@ -1,7 +1,6 @@
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import { useNavigate } from "react-router-dom";
-import { Card, Button, Toast, Tabs } from "antd-mobile";
-import { useUserStore } from "@/store/module/user";
+import { Card, Button, Toast, Tabs, Dialog } from "antd-mobile";
 import style from "./index.module.scss";
 import {
   WalletOutlined,
@@ -12,36 +11,7 @@ import {
 } from "@ant-design/icons";
 import NavCommon from "@/components/NavCommon";
 import Layout from "@/components/Layout/Layout";
-
-const quickAmounts = [50, 100, 200, 500, 1000];
-
-// AI服务套餐数据
-const aiServicePackages = [
-  {
-    id: 1,
-    name: "入门套餐",
-    tag: "推荐",
-    tagColor: "blue",
-    description: "适合个人用户体验AI服务",
-    usage: "可使用AI服务约110次",
-    price: 100,
-    originalPrice: 110,
-    gift: 10,
-    actualAmount: 110,
-  },
-  {
-    id: 2,
-    name: "标准套餐",
-    tag: "热门",
-    tagColor: "green",
-    description: "适合小团队日常使用",
-    usage: "可使用AI服务约580次",
-    price: 500,
-    originalPrice: 580,
-    gift: 80,
-    actualAmount: 580,
-  },
-];
+import { getTaocanList, pay } from "./api";
 
 // AI服务列表数据
 const aiServices = [
@@ -120,25 +90,77 @@ const versionPackages = [
 
 const Recharge: React.FC = () => {
   const navigate = useNavigate();
-  const { user } = useUserStore();
   // 假设余额从后端接口获取，实际可用props或store传递
-  const [balance, setBalance] = useState(0);
-  const [selected, setSelected] = useState<number | null>(null);
+  const [balance] = useState(0);
+  const [selected, setSelected] = useState<any | null>(null);
   const [loading, setLoading] = useState(false);
   const [activeTab, setActiveTab] = useState("account");
+  const [taocanList, setTaocanList] = useState<any[]>([]);
+
+  // 加载套餐列表
+  useEffect(() => {
+    const loadTaocanList = async () => {
+      try {
+        const res = await getTaocanList();
+        if (res.list) {
+          setTaocanList(res.list);
+        }
+      } catch (error) {
+        console.error("加载套餐列表失败:", error);
+        Toast.show({ content: "加载套餐列表失败", position: "top" });
+      }
+    };
+    loadTaocanList();
+  }, []);
 
   // 充值操作
   const handleRecharge = async () => {
     if (!selected) {
-      Toast.show({ content: "请选择充值金额", position: "top" });
+      Toast.show({ content: "请选择充值套餐", position: "top" });
       return;
     }
     setLoading(true);
-    setTimeout(() => {
-      setBalance(b => b + selected);
-      Toast.show({ content: `充值成功，已到账￥${selected}` });
+    try {
+      const res = await pay({
+        id: selected.id,
+        price: selected.price,
+      });
+      // 假设返回的是二维码链接，存储在res中
+      if (res) {
+        // 显示二维码弹窗
+        Dialog.show({
+          content: (
+            <div style={{ textAlign: "center", padding: "20px" }}>
+              <div
+                style={{
+                  marginBottom: "16px",
+                  fontSize: "16px",
+                  fontWeight: "500",
+                }}
+              >
+                请使用微信扫码支付
+              </div>
+              <img
+                src={res.code_url as any}
+                alt="支付二维码"
+                style={{ width: "250px", height: "250px", margin: "0 auto" }}
+              />
+              <div
+                style={{ marginTop: "16px", color: "#666", fontSize: "14px" }}
+              >
+                支付金额: ¥{selected.price / 100}
+              </div>
+            </div>
+          ),
+          closeOnMaskClick: true,
+        });
+      }
+    } catch (error) {
+      console.error("支付失败:", error);
+      Toast.show({ content: "支付失败，请重试", position: "top" });
+    } finally {
       setLoading(false);
-    }, 1200);
+    }
   };
 
   // 渲染账户充值tab内容
@@ -156,23 +178,80 @@ const Recharge: React.FC = () => {
         </div>
       </Card>
       <Card className={style["quick-card"]}>
-        <div className={style["quick-title"]}>快捷充值</div>
+        <div className={style["quick-title"]}>选择套餐</div>
         <div className={style["quick-list"]}>
-          {quickAmounts.map(amt => (
+          {taocanList.map(item => (
             <Button
-              key={amt}
-              color={selected === amt ? "primary" : "default"}
+              key={item.id}
+              color={selected?.id === item.id ? "primary" : "default"}
               className={
-                selected === amt
+                selected?.id === item.id
                   ? style["quick-btn-active"]
                   : style["quick-btn"]
               }
-              onClick={() => setSelected(amt)}
+              onClick={() => setSelected(item)}
             >
-              ￥{amt}
+              <div>
+                <div>￥{item.price / 100}</div>
+                {item.discount && (
+                  <div style={{ fontSize: "12px", color: "#999" }}>
+                    {item.discount}折
+                  </div>
+                )}
+              </div>
             </Button>
           ))}
         </div>
+        {selected && (
+          <div
+            style={{
+              marginBottom: "12px",
+              padding: "12px",
+              background: "#f5f5f5",
+              borderRadius: "8px",
+            }}
+          >
+            <div style={{ marginBottom: "6px" }}>
+              <span style={{ fontWeight: "500" }}>{selected.name}</span>
+              {selected.isRecommend === 1 && (
+                <span
+                  style={{
+                    marginLeft: "8px",
+                    fontSize: "12px",
+                    color: "#1890ff",
+                  }}
+                >
+                  推荐
+                </span>
+              )}
+              {selected.isHot === 1 && (
+                <span
+                  style={{
+                    marginLeft: "8px",
+                    fontSize: "12px",
+                    color: "#ff4d4f",
+                  }}
+                >
+                  热门
+                </span>
+              )}
+            </div>
+            <div style={{ fontSize: "14px", color: "#666" }}>
+              包含 {selected.tokens} Tokens
+            </div>
+            {selected.originalPrice && (
+              <div
+                style={{
+                  fontSize: "12px",
+                  color: "#999",
+                  textDecoration: "line-through",
+                }}
+              >
+                原价: ¥{selected.originalPrice / 100}
+              </div>
+            )}
+          </div>
+        )}
         <Button
           block
           color="primary"
diff --git a/Cunkebao/src/utils/db.ts b/Cunkebao/src/utils/db.ts
deleted file mode 100644
index cebcff29..00000000
--- a/Cunkebao/src/utils/db.ts
+++ /dev/null
@@ -1,319 +0,0 @@
-/**
- * 数据库工具类 - 使用serverId作为主键的优化架构
- *
- * 架构设计：
- * 1. 使用serverId作为数据库主键，直接对应接口返回的id字段
- * 2. 保留原始的id字段，用于存储接口数据的完整性
- * 3. 简化数据处理逻辑，避免ID映射的复杂性
- *
- * 优势：
- * - 直接使用服务器ID作为主键，避免ID冲突
- * - 保持数据的一致性和可追溯性
- * - 简化查询逻辑，提高性能
- * - 支持重复数据检测和去重
- *
- * 使用方法：
- * - 存储接口数据：使用 createWithServerId() 或 createManyWithServerId()
- * - 查询数据：使用 findById(id) 根据原始ID查询，或 findByPrimaryKey(serverId) 根据主键查询
- * - 批量查询：使用 findByIds([id1, id2, ...]) 根据原始ID批量查询
- * - 内部操作：serverId作为主键用于数据库内部管理
- *
- * 示例：
- * const serverData = { id: 1001, name: '测试', ... }; // 接口返回的数据
- * const serverId = await service.createWithServerId(serverData); // 存储，返回serverId
- * const data = await service.findById(1001); // 根据原始ID查询（用户友好）
- * const dataByPK = await service.findByPrimaryKey(serverId); // 根据主键查询（内部使用）
- */
-
-import Dexie, { Table } from "dexie";
-import {
-  KfUserListData,
-  weChatGroup,
-  ContractData,
-  MessageListData,
-} from "@/pages/pc/ckbox/data";
-
-// 数据类型定义，使用serverId作为主键
-export interface KfUserWithServerId extends Omit<KfUserListData, "id"> {
-  serverId: number | string; // 服务器ID作为主键
-  id?: number; // 接口数据的原始ID字段
-}
-
-// 新联系人列表数据接口
-export interface NewContactListData {
-  serverId: number | string; // 服务器ID作为主键
-  id?: number; // 接口数据的原始ID字段
-  groupName: string;
-  contacts: ContractData[];
-  weChatGroup: weChatGroup[];
-}
-
-// 数据库类
-class CunkebaoDatabase extends Dexie {
-  kfUsers!: Table<KfUserWithServerId>;
-  weChatGroup!: Table<weChatGroup>;
-  contracts!: Table<ContractData>;
-  newContractList!: Table<NewContactListData>;
-  messageList!: Table<MessageListData>;
-
-  constructor() {
-    super("CunkebaoDatabase");
-
-    // 版本1：使用serverId作为主键的架构
-    this.version(1).stores({
-      kfUsers:
-        "serverId, id, tenantId, wechatId, nickname, alias, avatar, gender, region, signature, bindQQ, bindEmail, bindMobile, createTime, currentDeviceId, isDeleted, deleteTime, groupId, memo, wechatVersion, lastUpdateTime, isOnline",
-      weChatGroup:
-        "serverId, id, wechatAccountId, tenantId, accountId, chatroomId, chatroomOwner, conRemark, nickname, chatroomAvatar,wechatChatroomId, groupId, config, unreadCount, notice, selfDisplyName",
-      contracts:
-        "serverId, id, wechatAccountId, wechatId, alias, conRemark, nickname, quanPin, avatar, gender, region, addFrom, phone, signature, accountId, extendFields, city, lastUpdateTime, isPassed, tenantId, groupId, thirdParty, additionalPicture, desc, config, lastMessageTime, unreadCount, duplicate",
-      newContractList: "serverId, id, groupName, contacts",
-      messageList:
-        "serverId, id, dataType, wechatAccountId, tenantId, accountId, nickname, avatar, groupId, config, labels, unreadCount, wechatId, alias, conRemark, quanPin, gender, region, addFrom, phone, signature, extendFields, city, lastUpdateTime, isPassed, thirdParty, additionalPicture, desc, lastMessageTime, duplicate, chatroomId, chatroomOwner, chatroomAvatar, notice, selfDisplyName",
-    });
-  }
-}
-
-// 创建数据库实例
-export const db = new CunkebaoDatabase();
-
-// 简单的数据库操作类
-export class DatabaseService<T> {
-  constructor(private table: Table<T>) {}
-
-  // 基础 CRUD 操作 - 使用serverId作为主键
-  async create(data: Omit<T, "serverId">): Promise<string | number> {
-    return await this.table.add(data as T);
-  }
-
-  // 创建数据（直接使用接口数据）
-  // 接口数据的id字段直接作为serverId主键，原id字段保留
-  async createWithServerId(data: any): Promise<string | number> {
-    const dataToInsert = {
-      ...data,
-      serverId: data.id, // 使用接口的id作为serverId主键
-    };
-    return await this.table.add(dataToInsert as T);
-  }
-
-  // 根据原始ID查询（用户友好的查询方法）
-  async findById(id: string | number): Promise<T | undefined> {
-    return await this.table.where("id").equals(id).first();
-  }
-
-  // 根据serverId查询（内部主键查询）
-  async findByPrimaryKey(serverId: string | number): Promise<T | undefined> {
-    return await this.table.get(serverId);
-  }
-
-  async findAll(): Promise<T[]> {
-    return await this.table.toArray();
-  }
-
-  async update(serverId: string | number, data: Partial<T>): Promise<number> {
-    return await this.table.update(serverId, data as any);
-  }
-
-  async updateMany(
-    dataList: { serverId: string | number; data: Partial<T> }[],
-  ): Promise<number> {
-    return await this.table.bulkUpdate(
-      dataList.map(item => ({
-        key: item.serverId,
-        changes: item.data as any,
-      })),
-    );
-  }
-
-  async createMany(
-    dataList: Omit<T, "serverId">[],
-  ): Promise<(string | number)[]> {
-    return await this.table.bulkAdd(dataList as T[], { allKeys: true });
-  }
-
-  // 批量创建数据（直接使用接口数据）
-  // 接口数据的id字段直接作为serverId主键
-  async createManyWithServerId(dataList: any[]): Promise<(string | number)[]> {
-    // 检查是否存在重复的serverId
-    const serverIds = dataList.map(item => item.id);
-    const existingData = await this.table
-      .where("serverId")
-      .anyOf(serverIds)
-      .toArray();
-    const existingServerIds = new Set(
-      existingData.map((item: any) => item.serverId),
-    );
-
-    // 过滤掉已存在的数据
-    const newData = dataList.filter(item => !existingServerIds.has(item.id));
-
-    if (newData.length === 0) {
-      console.log("所有数据都已存在，跳过插入");
-      return [];
-    }
-
-    const processedData = newData.map(item => ({
-      ...item,
-      serverId: item.id, // 使用接口的id作为serverId主键
-    }));
-
-    console.log(
-      `插入 ${processedData.length} 条新数据，跳过 ${dataList.length - newData.length} 条重复数据`,
-    );
-    return await this.table.bulkAdd(processedData as T[], { allKeys: true });
-  }
-
-  async delete(serverId: string | number): Promise<void> {
-    await this.table.delete(serverId);
-  }
-
-  async clear(): Promise<void> {
-    await this.table.clear();
-  }
-
-  // 条件查询
-  async findWhere(field: keyof T, value: any): Promise<T[]> {
-    return await this.table
-      .where(field as string)
-      .equals(value)
-      .toArray();
-  }
-
-  // 根据服务器ID查询（兼容性方法）
-  async findByServerId(serverId: any): Promise<T | undefined> {
-    return await this.table.get(serverId);
-  }
-
-  // 根据原始ID批量查询
-  async findByIds(ids: (string | number)[]): Promise<T[]> {
-    return await this.table.where("id").anyOf(ids).toArray();
-  }
-
-  // 多值查询（IN 查询）
-  async findWhereIn(field: keyof T, values: any[]): Promise<T[]> {
-    return await this.table
-      .where(field as string)
-      .anyOf(values)
-      .toArray();
-  }
-
-  // 范围查询
-  async findWhereBetween(field: keyof T, min: any, max: any): Promise<T[]> {
-    return await this.table
-      .where(field as string)
-      .between(min, max)
-      .toArray();
-  }
-
-  // 模糊查询（以指定字符串开头）
-  async findWhereStartsWith(field: keyof T, prefix: string): Promise<T[]> {
-    return await this.table
-      .where(field as string)
-      .startsWith(prefix)
-      .toArray();
-  }
-
-  // 不等于查询
-  async findWhereNot(field: keyof T, value: any): Promise<T[]> {
-    return await this.table
-      .where(field as string)
-      .notEqual(value)
-      .toArray();
-  }
-
-  // 大于查询
-  async findWhereGreaterThan(field: keyof T, value: any): Promise<T[]> {
-    return await this.table
-      .where(field as string)
-      .above(value)
-      .toArray();
-  }
-
-  // 小于查询
-  async findWhereLessThan(field: keyof T, value: any): Promise<T[]> {
-    return await this.table
-      .where(field as string)
-      .below(value)
-      .toArray();
-  }
-
-  // 复合条件查询
-  async findWhereMultiple(
-    conditions: {
-      field: keyof T;
-      operator: "equals" | "above" | "below" | "startsWith";
-      value: any;
-    }[],
-  ): Promise<T[]> {
-    let collection = this.table.toCollection();
-
-    for (const condition of conditions) {
-      const { field, operator, value } = condition;
-      collection = collection.and(item => {
-        const fieldValue = (item as any)[field];
-        switch (operator) {
-          case "equals":
-            return fieldValue === value;
-          case "above":
-            return fieldValue > value;
-          case "below":
-            return fieldValue < value;
-          case "startsWith":
-            return (
-              typeof fieldValue === "string" && fieldValue.startsWith(value)
-            );
-          default:
-            return true;
-        }
-      });
-    }
-
-    return await collection.toArray();
-  }
-
-  // 分页查询
-  async findWithPagination(
-    page: number = 1,
-    limit: number = 10,
-  ): Promise<{ data: T[]; total: number; page: number; limit: number }> {
-    const offset = (page - 1) * limit;
-    const total = await this.table.count();
-    const data = await this.table.offset(offset).limit(limit).toArray();
-
-    return { data, total, page, limit };
-  }
-
-  // 排序查询
-  async findAllSorted(
-    field: keyof T,
-    direction: "asc" | "desc" = "asc",
-  ): Promise<T[]> {
-    const collection = this.table.orderBy(field as string);
-    return direction === "desc"
-      ? await collection.reverse().toArray()
-      : await collection.toArray();
-  }
-
-  // 统计
-  async count(): Promise<number> {
-    return await this.table.count();
-  }
-
-  // 条件统计
-  async countWhere(field: keyof T, value: any): Promise<number> {
-    return await this.table
-      .where(field as string)
-      .equals(value)
-      .count();
-  }
-}
-
-// 创建各表的服务实例
-export const kfUserService = new DatabaseService(db.kfUsers);
-export const weChatGroupService = new DatabaseService(db.weChatGroup);
-export const contractService = new DatabaseService(db.contracts);
-export const newContactListService = new DatabaseService(db.newContractList);
-export const messageListService = new DatabaseService(db.messageList);
-
-// 默认导出数据库实例
-export default db;

From 3d8c6562248fb39fce72131ab7a7eb87699c8743 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Mon, 27 Oct 2025 17:08:37 +0800
Subject: [PATCH 72/72] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=8A=A8=E7=94=BB?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MessageEnter/MessageEnter.module.scss     | 38 +++++++++++++++++
 .../components/MessageEnter/index.tsx         | 41 +++++++++++++++----
 2 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/MessageEnter.module.scss b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/MessageEnter.module.scss
index 744a1e76..e65d7823 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/MessageEnter.module.scss
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/MessageEnter.module.scss
@@ -436,3 +436,41 @@
     opacity: 1;
   }
 }
+
+// 加载文字和取消按钮同行容器
+.aiLoadingTextRow {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+}
+
+// 取消AI按钮（显眼版）
+.cancelAiButton {
+  height: 28px;
+  padding: 0 12px;
+  font-size: 13px;
+  border-radius: 6px;
+  border: 1px solid #ff7875;
+  background: #fff;
+  color: #ff4d4f;
+  font-weight: 500;
+  transition: all 0.2s ease;
+  box-shadow: 0 2px 4px rgba(255, 77, 79, 0.15);
+
+  &:hover {
+    color: #fff;
+    background: #ff4d4f;
+    border-color: #ff4d4f;
+    box-shadow: 0 4px 8px rgba(255, 77, 79, 0.3);
+    transform: translateY(-1px);
+  }
+
+  &:active {
+    transform: translateY(0);
+    box-shadow: 0 2px 4px rgba(255, 77, 79, 0.2);
+  }
+
+  .anticon {
+    font-size: 12px;
+  }
+}
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
index ca6de5bb..b6733e5c 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { Layout, Input, Button, Modal } from "antd";
+import { Layout, Input, Button, Modal, message } from "antd";
 import {
   SendOutlined,
   FolderOutlined,
@@ -46,12 +46,27 @@ const MessageEnter: React.FC<MessageEnterProps> = ({ contract }) => {
     state => state.quoteMessageContent,
   );
   const isLoadingAiChat = useWeChatStore(state => state.isLoadingAiChat);
+  const updateIsLoadingAiChat = useWeChatStore(
+    state => state.updateIsLoadingAiChat,
+  );
+  const updateQuoteMessageContent = useWeChatStore(
+    state => state.updateQuoteMessageContent,
+  );
   useEffect(() => {
     if (quoteMessageContent) {
       setInputValue(quoteMessageContent);
     }
   }, [quoteMessageContent]);
 
+  // 取消AI生成
+  const handleCancelAi = () => {
+    // 停止AI加载状态
+    updateIsLoadingAiChat(false);
+    // 清空AI回复内容
+    updateQuoteMessageContent("");
+    message.info("已取消AI生成");
+  };
+
   const handleSend = async () => {
     if (!inputValue.trim()) return;
     const messageId = +Date.now();
@@ -219,13 +234,23 @@ const MessageEnter: React.FC<MessageEnterProps> = ({ contract }) => {
                   <div className={styles.wave3}></div>
                 </div>
               </div>
-              <div className={styles.aiLoadingText}>
-                <span className={styles.loadingTextMain}>AI 正在思考</span>
-                <span className={styles.loadingDots}>
-                  <span>.</span>
-                  <span>.</span>
-                  <span>.</span>
-                </span>
+              <div className={styles.aiLoadingTextRow}>
+                <div className={styles.aiLoadingText}>
+                  <span className={styles.loadingTextMain}>AI 正在思考</span>
+                  <span className={styles.loadingDots}>
+                    <span>.</span>
+                    <span>.</span>
+                    <span>.</span>
+                  </span>
+                </div>
+                <Button
+                  className={styles.cancelAiButton}
+                  onClick={handleCancelAi}
+                  size="small"
+                  icon={<CloseOutlined />}
+                >
+                  取消生成
+                </Button>
               </div>
               <div className={styles.aiLoadingSubText}>
                 正在分析消息内容，为您生成智能回复