From d5e609aa3751c182aa66e278b40cad37a25690b1 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, 2 Sep 2025 15:21:54 +0800
Subject: [PATCH 01/29] =?UTF-8?q?feat(=E8=81=8A=E5=A4=A9=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?):=20=E9=87=8D=E6=9E=84=E6=B6=88=E6=81=AF=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E9=A3=8E=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将消息输入功能从ChatWindow组件中拆分为独立的MessageEnter组件
添加微信风格的样式和交互效果
新增消息处理逻辑和素材选择功能
重命名getMessages为getChatMessages以保持命名一致性
---
 Cunkebao/src/pages/pc/ckbox/api.ts            |  15 +-
 .../ChatWindow/ChatWindow.module.scss         | 130 --------
 .../MessageEnter/MessageEnter.module.scss     | 181 ++++++++++
 .../components/MessageEnter/index.tsx         | 310 ++++++++++++++++++
 .../pc/ckbox/components/ChatWindow/index.tsx  | 305 +----------------
 .../src/store/module/websocket/msgManage.ts   |  16 +
 6 files changed, 517 insertions(+), 440 deletions(-)
 create mode 100644 Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/MessageEnter.module.scss

diff --git a/Cunkebao/src/pages/pc/ckbox/api.ts b/Cunkebao/src/pages/pc/ckbox/api.ts
index 1d27fdb0..9bf2e54c 100644
--- a/Cunkebao/src/pages/pc/ckbox/api.ts
+++ b/Cunkebao/src/pages/pc/ckbox/api.ts
@@ -23,7 +23,7 @@ export function clearUnreadCount(params) {
   return request("/api/WechatFriend/clearUnreadCount", params, "PUT");
 }
 //获取聊天记录-2 获取列表
-export function getMessages(params: {
+export function getChatMessages(params: {
   wechatAccountId: number;
   wechatFriendId?: number;
   wechatChatroomId?: number;
@@ -73,19 +73,6 @@ export const getControlTerminalList = params => {
   return request("/api/wechataccount", params, "GET");
 };
 
-// 搜索联系人
-export const getChatMessage = (params: {
-  wechatAccountId: number;
-  wechatFriendId: number;
-  From: number;
-  To: number;
-  Count: number;
-  olderData: boolean;
-  keyword: string;
-}) => {
-  return request("/api/FriendMessage/SearchMessage", params, "GET");
-};
-
 // 获取聊天历史
 export const getChatHistory = (
   chatId: string,
diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/ChatWindow.module.scss b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/ChatWindow.module.scss
index c2515179..355cb2a4 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/ChatWindow.module.scss
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/ChatWindow.module.scss
@@ -128,127 +128,8 @@
   }
 }
 
-.chatFooter {
-  background: #fff;
-  border-top: 1px solid #f0f0f0;
-  padding: 0;
-  height: auto;
-  min-height: auto;
-  flex-shrink: 0;
 
-  .inputContainer {
-    .inputToolbar {
-      display: flex;
-      border-bottom: 1px solid #f0f0f0;
-      background: #fafafa;
-      justify-content: space-between;
 
-      .leftTool {
-        display: flex;
-        gap: 4px;
-      }
-
-      .rightTool {
-        display: flex;
-        gap: 8px;
-        padding: 8px;
-      }
-
-      .toolbarButton {
-        color: #666;
-        border: none;
-        padding: 8px;
-        border-radius: 4px;
-        font-size: 18px;
-        width: 36px;
-        height: 36px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        background: transparent;
-        transition: all 0.2s;
-
-        &:hover {
-          color: #1890ff;
-          background: #e6f7ff;
-        }
-
-        &:active {
-          background: #bae7ff;
-        }
-      }
-    }
-
-    .inputArea {
-      display: flex;
-      padding: 12px 16px;
-      gap: 8px;
-      align-items: flex-end;
-      background: #fff;
-
-      .messageInput {
-        flex: 1;
-        border: 1px solid #d9d9d9;
-        border-radius: 4px;
-        resize: none;
-        padding: 8px 12px;
-        font-size: 14px;
-        line-height: 1.5;
-        min-height: 36px;
-        max-height: 120px;
-        background: #fff;
-        transition: all 0.2s;
-
-        &:focus {
-          border-color: #1890ff;
-          box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
-          outline: none;
-        }
-
-        &::placeholder {
-          color: #bfbfbf;
-        }
-      }
-
-      .sendButton {
-        border-radius: 4px;
-        height: 36px;
-        padding: 0 16px;
-        font-size: 14px;
-        font-weight: 500;
-        background: #1890ff;
-        border: 1px solid #1890ff;
-        color: #fff;
-        transition: all 0.2s;
-
-        &:hover {
-          background: #40a9ff;
-          border-color: #40a9ff;
-        }
-
-        &:active {
-          background: #096dd9;
-          border-color: #096dd9;
-        }
-
-        &:disabled {
-          background: #f5f5f5;
-          border-color: #d9d9d9;
-          color: #bfbfbf;
-          cursor: not-allowed;
-        }
-      }
-    }
-
-    .inputHint {
-      padding: 4px 16px 8px;
-      font-size: 12px;
-      color: #8c8c8c;
-      background: #fff;
-      border-top: 1px solid #f0f0f0;
-    }
-  }
-}
 
 // 右侧个人资料卡片
 .profileSider {
@@ -748,18 +629,7 @@
     }
   }
 
-  .chatFooter {
-    padding: 12px;
 
-    .inputContainer {
-      .inputArea {
-        .sendButton {
-          height: 28px;
-          padding: 0 12px;
-        }
-      }
-    }
-  }
 
   .messageItem {
     .messageContent {
diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/MessageEnter.module.scss b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/MessageEnter.module.scss
new file mode 100644
index 00000000..36977bd1
--- /dev/null
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/MessageEnter.module.scss
@@ -0,0 +1,181 @@
+// MessageEnter 组件样式 - 微信风格
+.chatFooter {
+  background: #f7f7f7;
+  border-top: 1px solid #e1e1e1;
+  padding: 0;
+  height: auto;
+  min-height: 100px;
+}
+
+.inputContainer {
+  padding: 8px 12px;
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+}
+
+.inputToolbar {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 4px 0;
+  border-bottom: none;
+}
+
+.leftTool {
+  display: flex;
+  gap: 2px;
+  align-items: center;
+}
+
+.toolbarButton {
+  width: 28px;
+  height: 28px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 4px;
+  color: #666;
+  font-size: 16px;
+  transition: all 0.15s;
+  border: none;
+  background: transparent;
+
+  &:hover {
+    background: #e6e6e6;
+    color: #333;
+  }
+
+  &:active {
+    background: #d9d9d9;
+  }
+}
+
+.rightTool {
+  display: flex;
+  gap: 12px;
+  align-items: center;
+}
+
+.rightToolItem {
+  display: flex;
+  align-items: center;
+  gap: 3px;
+  color: #666;
+  font-size: 11px;
+  cursor: pointer;
+  padding: 3px 6px;
+  border-radius: 3px;
+  transition: all 0.15s;
+
+  &:hover {
+    background: #e6e6e6;
+    color: #333;
+  }
+}
+
+.inputArea {
+  display: flex;
+  flex-direction: column;
+  padding: 4px 0;
+}
+
+.inputWrapper {
+  border: 1px solid #d1d1d1;
+  border-radius: 4px;
+  background: #fff;
+  overflow: hidden;
+
+  &:focus-within {
+    border-color: #07c160;
+  }
+}
+
+.messageInput {
+  width: 100%;
+  border: none;
+  resize: none;
+  font-size: 13px;
+  line-height: 1.4;
+  padding: 8px 10px;
+  background: transparent;
+
+  &:focus {
+    box-shadow: none;
+    outline: none;
+  }
+
+  &::placeholder {
+    color: #b3b3b3;
+  }
+}
+
+.sendButtonArea {
+  padding: 8px 10px;
+  display: flex;
+  justify-content: flex-end;
+}
+
+.sendButton {
+  height: 32px;
+  border-radius: 4px;
+  font-weight: normal;
+  min-width: 60px;
+  font-size: 13px;
+  background: #07c160;
+  border-color: #07c160;
+
+  &:hover {
+    background: #06ad56;
+    border-color: #06ad56;
+  }
+
+  &:active {
+    background: #059748;
+    border-color: #059748;
+  }
+
+  &:disabled {
+    background: #b3b3b3;
+    border-color: #b3b3b3;
+    opacity: 1;
+  }
+}
+
+.inputHint {
+  font-size: 11px;
+  color: #999;
+  text-align: right;
+  margin-top: 2px;
+}
+
+// 响应式设计
+@media (max-width: 768px) {
+  .inputContainer {
+    padding: 8px 12px;
+  }
+
+  .inputToolbar {
+    flex-wrap: wrap;
+    gap: 8px;
+  }
+
+  .rightTool {
+    gap: 8px;
+  }
+
+  .rightToolItem {
+    font-size: 11px;
+    padding: 2px 6px;
+  }
+
+  .inputArea {
+    flex-direction: column;
+    gap: 8px;
+  }
+
+  .sendButton {
+    align-self: flex-end;
+    min-width: 60px;
+  }
+}
diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx
index e69de29b..e869a45d 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx
@@ -0,0 +1,310 @@
+import React, { useState } from "react";
+import { Layout, Input, Button, Dropdown, Menu, Tooltip, Modal } from "antd";
+import {
+  ShareAltOutlined,
+  SendOutlined,
+  SmileOutlined,
+  FolderOutlined,
+  AudioOutlined,
+  AudioOutlined as AudioHoldOutlined,
+  CodeSandboxOutlined,
+  MessageOutlined,
+  EnvironmentOutlined,
+  StarOutlined,
+} from "@ant-design/icons";
+import { ChatRecord, ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
+import { useWebSocketStore } from "@/store/module/websocket/websocket";
+import styles from "./MessageEnter.module.scss";
+
+const { Footer } = Layout;
+const { TextArea } = Input;
+
+interface MessageEnterProps {
+  contract: ContractData | weChatGroup;
+  onSendMessage: (message: string) => void;
+}
+
+const { sendCommand } = useWebSocketStore.getState();
+
+const MessageEnter: React.FC<MessageEnterProps> = ({
+  contract,
+  onSendMessage,
+}) => {
+  const [inputValue, setInputValue] = useState("");
+  const [showMaterialModal, setShowMaterialModal] = useState(false);
+
+  const handleSend = async () => {
+    if (!inputValue.trim()) return;
+    console.log("发送消息", contract);
+    const params = {
+      wechatAccountId: contract.wechatAccountId,
+      wechatChatroomId: contract?.chatroomId || 0,
+      wechatFriendId: contract?.chatroomId ? 0 : contract.id,
+      msgSubType: 0,
+      msgType: 1,
+      content: inputValue,
+    };
+    sendCommand("CmdSendMessage", params);
+    // try {
+    //   onSendMessage(inputValue);
+    //   setInputValue("");
+    // } catch (error) {
+    //   console.error("发送失败", error);
+    // }
+  };
+
+  const handleKeyPress = (e: React.KeyboardEvent) => {
+    if (e.key === "Enter" && !e.shiftKey && !e.ctrlKey) {
+      e.preventDefault();
+      handleSend();
+    }
+    // Ctrl+Enter 换行由 TextArea 自动处理，不需要阻止默认行为
+  };
+
+  // 素材菜单项
+  const materialMenuItems = [
+    {
+      key: "text",
+      label: "文字素材",
+      icon: <span>📝</span>,
+    },
+    {
+      key: "audio",
+      label: "语音素材",
+      icon: <span>🎵</span>,
+    },
+    {
+      key: "image",
+      label: "图片素材",
+      icon: <span>🖼️</span>,
+    },
+    {
+      key: "video",
+      label: "视频素材",
+      icon: <span>🎬</span>,
+    },
+    {
+      key: "link",
+      label: "链接素材",
+      icon: <span>🔗</span>,
+    },
+    {
+      key: "card",
+      label: "名片素材",
+      icon: <span>📇</span>,
+    },
+  ];
+
+  const handleMaterialSelect = (key: string) => {
+    console.log("选择素材类型:", key);
+    setShowMaterialModal(true);
+    // 这里可以根据不同的素材类型显示不同的模态框
+  };
+
+  return (
+    <>
+      {/* 聊天输入 */}
+      <Footer className={styles.chatFooter}>
+        <div className={styles.inputContainer}>
+          <div className={styles.inputToolbar}>
+            <div className={styles.leftTool}>
+              <Tooltip title="表情">
+                <Button
+                  type="text"
+                  icon={<SmileOutlined />}
+                  className={styles.toolbarButton}
+                />
+              </Tooltip>
+              <Tooltip title="上传附件">
+                <Button
+                  type="text"
+                  icon={<FolderOutlined />}
+                  className={styles.toolbarButton}
+                />
+              </Tooltip>
+              <Tooltip title="收藏">
+                <Button
+                  type="text"
+                  icon={<StarOutlined />}
+                  className={styles.toolbarButton}
+                />
+              </Tooltip>
+              <Tooltip title="位置">
+                <Button
+                  type="text"
+                  icon={<EnvironmentOutlined />}
+                  className={styles.toolbarButton}
+                />
+              </Tooltip>
+              <Tooltip title="语音">
+                <Button
+                  type="text"
+                  icon={<AudioOutlined />}
+                  className={styles.toolbarButton}
+                />
+              </Tooltip>
+              <Tooltip title="按住说话">
+                <Button
+                  type="text"
+                  icon={<AudioHoldOutlined />}
+                  className={styles.toolbarButton}
+                  style={{ position: "relative" }}
+                >
+                  <span
+                    style={{
+                      position: "absolute",
+                      top: "2px",
+                      right: "2px",
+                      fontSize: "8px",
+                      color: "#52c41a",
+                      fontWeight: "bold",
+                    }}
+                  >
+                    H
+                  </span>
+                </Button>
+              </Tooltip>
+              <Dropdown
+                overlay={
+                  <Menu
+                    items={materialMenuItems}
+                    onClick={({ key }) => handleMaterialSelect(key)}
+                    style={{
+                      borderRadius: "8px",
+                      boxShadow: "0 4px 12px rgba(0, 0, 0, 0.15)",
+                    }}
+                  />
+                }
+                trigger={["click"]}
+                placement="topLeft"
+              >
+                <Button
+                  type="text"
+                  icon={<CodeSandboxOutlined />}
+                  className={styles.toolbarButton}
+                />
+              </Dropdown>
+            </div>
+            <div className={styles.rightTool}>
+              <div className={styles.rightToolItem}>
+                <ShareAltOutlined />
+                转给他人
+              </div>
+              <div className={styles.rightToolItem}>
+                <MessageOutlined />
+                聊天记录
+              </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>
+      </Footer>
+
+      {/* 素材选择模态框 */}
+      <Modal
+        title="选择素材"
+        open={showMaterialModal}
+        onCancel={() => setShowMaterialModal(false)}
+        footer={[
+          <Button key="cancel" onClick={() => setShowMaterialModal(false)}>
+            取消
+          </Button>,
+          <Button
+            key="confirm"
+            type="primary"
+            onClick={() => setShowMaterialModal(false)}
+          >
+            确定
+          </Button>,
+        ]}
+        width={800}
+      >
+        <div style={{ display: "flex", height: "400px" }}>
+          {/* 左侧素材分类 */}
+          <div
+            style={{
+              width: "200px",
+              background: "#f5f5f5",
+              borderRight: "1px solid #e8e8e8",
+            }}
+          >
+            <div style={{ padding: "16px", borderBottom: "1px solid #e8e8e8" }}>
+              <h4 style={{ margin: 0, color: "#262626" }}>公共素材</h4>
+            </div>
+            <div style={{ padding: "8px 0" }}>
+              <div
+                style={{
+                  padding: "8px 16px",
+                  cursor: "pointer",
+                  background: "#e6f7ff",
+                  borderLeft: "3px solid #1890ff",
+                  color: "#1890ff",
+                }}
+              >
+                暗黑4
+              </div>
+              <div style={{ padding: "8px 16px", cursor: "pointer" }}>
+                针对老客户的...
+              </div>
+              <div style={{ padding: "8px 16px", cursor: "pointer" }}>
+                D2辅助
+              </div>
+              <div style={{ padding: "8px 16px", cursor: "pointer" }}>
+                ROS反馈演示...
+              </div>
+              <div style={{ padding: "8px 16px", cursor: "pointer" }}>
+                一键宏产品素...
+              </div>
+            </div>
+            <div style={{ padding: "16px", borderTop: "1px solid #e8e8e8" }}>
+              <h4 style={{ margin: 0, color: "#262626" }}>部门素材</h4>
+            </div>
+          </div>
+
+          {/* 右侧内容区域 */}
+          <div style={{ flex: 1, padding: "16px" }}>
+            <div style={{ marginBottom: "16px" }}>
+              <Input.Search placeholder="昵称" style={{ width: "100%" }} />
+            </div>
+            <div
+              style={{
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+                height: "300px",
+                color: "#8c8c8c",
+              }}
+            >
+              请选择左侧素材分类
+            </div>
+          </div>
+        </div>
+      </Modal>
+    </>
+  );
+};
+
+export default MessageEnter;
diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
index 9bdfdb93..27cf32bc 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
@@ -1,7 +1,6 @@
 import React, { useState, useEffect, useRef } from "react";
 import {
   Layout,
-  Input,
   Button,
   Avatar,
   Space,
@@ -9,34 +8,25 @@ import {
   Menu,
   message,
   Tooltip,
-  Modal,
 } from "antd";
 import {
-  ShareAltOutlined,
-  SendOutlined,
-  SmileOutlined,
-  FolderOutlined,
   PhoneOutlined,
   VideoCameraOutlined,
   MoreOutlined,
   UserOutlined,
-  AudioOutlined,
-  AudioOutlined as AudioHoldOutlined,
   DownloadOutlined,
-  CodeSandboxOutlined,
-  MessageOutlined,
   FileOutlined,
   FilePdfOutlined,
   FileWordOutlined,
   FileExcelOutlined,
   FilePptOutlined,
   PlayCircleFilled,
-  EnvironmentOutlined,
   TeamOutlined,
-  StarOutlined,
+  FolderOutlined,
+  EnvironmentOutlined,
 } from "@ant-design/icons";
 import { ChatRecord, ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
-import { getMessages } from "@/pages/pc/ckbox/api";
+import { getChatMessages } from "@/pages/pc/ckbox/api";
 import styles from "./ChatWindow.module.scss";
 import {
   useWebSocketStore,
@@ -44,8 +34,8 @@ import {
 } from "@/store/module/websocket/websocket";
 import { formatWechatTime } from "@/utils/common";
 import Person from "./components/Person";
-const { Header, Content, Footer } = Layout;
-const { TextArea } = Input;
+import MessageEnter from "./components/MessageEnter";
+const { Header, Content } = Layout;
 
 interface ChatWindowProps {
   contract: ContractData | weChatGroup;
@@ -60,11 +50,9 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
   showProfile = true,
   onToggleProfile,
 }) => {
-  const [messageApi, contextHolder] = message.useMessage();
+  const [, contextHolder] = message.useMessage();
   const [messages, setMessages] = useState<ChatRecord[]>([]);
-  const [inputValue, setInputValue] = useState("");
   const [loading, setLoading] = useState(false);
-  const [showMaterialModal, setShowMaterialModal] = useState(false);
   const [pendingVideoRequests, setPendingVideoRequests] = useState<
     Record<string, string>
   >({});
@@ -84,7 +72,7 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
     } else {
       params.wechatChatroomId = contract.id;
     }
-    getMessages(params)
+    getChatMessages(params)
       .then(msg => {
         setMessages(msg);
       })
@@ -188,87 +176,6 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
     messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
   };
 
-  const handleSend = async () => {
-    if (!inputValue.trim()) return;
-
-    try {
-      const newMessage: ChatRecord = {
-        id: contract.id,
-        wechatAccountId: contract.wechatAccountId,
-        wechatFriendId: contract.id,
-        tenantId: 0,
-        accountId: 0,
-        synergyAccountId: 0,
-        content: inputValue,
-        msgType: 0,
-        msgSubType: 0,
-        msgSvrId: "",
-        isSend: false,
-        createTime: "",
-        isDeleted: false,
-        deleteTime: "",
-        sendStatus: 0,
-        wechatTime: 0,
-        origin: 0,
-        msgId: 0,
-        recalled: false,
-      };
-
-      setMessages(prev => [...prev, newMessage]);
-      onSendMessage(inputValue);
-      setInputValue("");
-    } catch (error) {
-      messageApi.error("发送失败");
-    }
-  };
-
-  const handleKeyPress = (e: React.KeyboardEvent) => {
-    if (e.key === "Enter" && !e.shiftKey) {
-      e.preventDefault();
-      handleSend();
-    }
-  };
-
-  // 素材菜单项
-  const materialMenuItems = [
-    {
-      key: "text",
-      label: "文字素材",
-      icon: <span>📝</span>,
-    },
-    {
-      key: "audio",
-      label: "语音素材",
-      icon: <span>🎵</span>,
-    },
-    {
-      key: "image",
-      label: "图片素材",
-      icon: <span>🖼️</span>,
-    },
-    {
-      key: "video",
-      label: "视频素材",
-      icon: <span>🎬</span>,
-    },
-    {
-      key: "link",
-      label: "链接素材",
-      icon: <span>🔗</span>,
-    },
-    {
-      key: "card",
-      label: "名片素材",
-      icon: <span>📇</span>,
-    },
-  ];
-
-  const handleMaterialSelect = (key: string) => {
-    console.log("选择素材类型:", key);
-    setShowMaterialModal(true);
-    // 这里可以根据不同的素材类型显示不同的模态框
-  };
-
   // 处理视频播放请求，发送socket请求获取真实视频地址
   const handleVideoPlayRequest = (tencentUrl: string, messageId: number) => {
     // 生成请求ID (使用当前时间戳作为唯一标识)
@@ -867,121 +774,8 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
           </div>
         </Content>
 
-        {/* 聊天输入 */}
-        <Footer className={styles.chatFooter}>
-          <div className={styles.inputContainer}>
-            <div className={styles.inputToolbar}>
-              <div className={styles.leftTool}>
-                <Tooltip title="表情">
-                  <Button
-                    type="text"
-                    icon={<SmileOutlined />}
-                    className={styles.toolbarButton}
-                  />
-                </Tooltip>
-                <Tooltip title="上传附件">
-                  <Button
-                    type="text"
-                    icon={<FolderOutlined />}
-                    className={styles.toolbarButton}
-                  />
-                </Tooltip>
-                <Tooltip title="收藏">
-                  <Button
-                    type="text"
-                    icon={<StarOutlined />}
-                    className={styles.toolbarButton}
-                  />
-                </Tooltip>
-                <Tooltip title="位置">
-                  <Button
-                    type="text"
-                    icon={<EnvironmentOutlined />}
-                    className={styles.toolbarButton}
-                  />
-                </Tooltip>
-                <Tooltip title="语音">
-                  <Button
-                    type="text"
-                    icon={<AudioOutlined />}
-                    className={styles.toolbarButton}
-                  />
-                </Tooltip>
-                <Tooltip title="按住说话">
-                  <Button
-                    type="text"
-                    icon={<AudioHoldOutlined />}
-                    className={styles.toolbarButton}
-                    style={{ position: "relative" }}
-                  >
-                    <span
-                      style={{
-                        position: "absolute",
-                        top: "2px",
-                        right: "2px",
-                        fontSize: "8px",
-                        color: "#52c41a",
-                        fontWeight: "bold",
-                      }}
-                    >
-                      H
-                    </span>
-                  </Button>
-                </Tooltip>
-                <Dropdown
-                  overlay={
-                    <Menu
-                      items={materialMenuItems}
-                      onClick={({ key }) => handleMaterialSelect(key)}
-                      style={{
-                        borderRadius: "8px",
-                        boxShadow: "0 4px 12px rgba(0, 0, 0, 0.15)",
-                      }}
-                    />
-                  }
-                  trigger={["click"]}
-                  placement="topLeft"
-                >
-                  <Button
-                    type="text"
-                    icon={<CodeSandboxOutlined />}
-                    className={styles.toolbarButton}
-                  />
-                </Dropdown>
-              </div>
-              <div className={styles.rightTool}>
-                <div className={styles.rightToolItem}>
-                  <ShareAltOutlined />
-                  转给他人
-                </div>
-                <div className={styles.rightToolItem}>
-                  <MessageOutlined />
-                  聊天记录
-                </div>
-              </div>
-            </div>
-            <div className={styles.inputArea}>
-              <TextArea
-                value={inputValue}
-                onChange={e => setInputValue(e.target.value)}
-                onKeyDown={handleKeyPress}
-                placeholder="输入消息..."
-                className={styles.messageInput}
-                autoSize={{ minRows: 2, maxRows: 6 }}
-              />
-              <Button
-                type="primary"
-                icon={<SendOutlined />}
-                onClick={handleSend}
-                disabled={!inputValue.trim()}
-                className={styles.sendButton}
-              >
-                发送
-              </Button>
-            </div>
-            <div className={styles.inputHint}>按下Ctrl+Enter换行</div>
-          </div>
-        </Footer>
+        {/* 消息输入组件 */}
+        <MessageEnter contract={contract} onSendMessage={onSendMessage} />
       </Layout>
 
       {/* 右侧个人资料卡片 */}
@@ -990,87 +784,6 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
         showProfile={showProfile}
         onToggleProfile={onToggleProfile}
       />
-
-      {/* 素材选择模态框 */}
-      <Modal
-        title="选择素材"
-        open={showMaterialModal}
-        onCancel={() => setShowMaterialModal(false)}
-        footer={[
-          <Button key="cancel" onClick={() => setShowMaterialModal(false)}>
-            取消
-          </Button>,
-          <Button
-            key="confirm"
-            type="primary"
-            onClick={() => setShowMaterialModal(false)}
-          >
-            确定
-          </Button>,
-        ]}
-        width={800}
-      >
-        <div style={{ display: "flex", height: "400px" }}>
-          {/* 左侧素材分类 */}
-          <div
-            style={{
-              width: "200px",
-              background: "#f5f5f5",
-              borderRight: "1px solid #e8e8e8",
-            }}
-          >
-            <div style={{ padding: "16px", borderBottom: "1px solid #e8e8e8" }}>
-              <h4 style={{ margin: 0, color: "#262626" }}>公共素材</h4>
-            </div>
-            <div style={{ padding: "8px 0" }}>
-              <div
-                style={{
-                  padding: "8px 16px",
-                  cursor: "pointer",
-                  background: "#e6f7ff",
-                  borderLeft: "3px solid #1890ff",
-                  color: "#1890ff",
-                }}
-              >
-                暗黑4
-              </div>
-              <div style={{ padding: "8px 16px", cursor: "pointer" }}>
-                针对老客户的...
-              </div>
-              <div style={{ padding: "8px 16px", cursor: "pointer" }}>
-                D2辅助
-              </div>
-              <div style={{ padding: "8px 16px", cursor: "pointer" }}>
-                ROS反馈演示...
-              </div>
-              <div style={{ padding: "8px 16px", cursor: "pointer" }}>
-                一键宏产品素...
-              </div>
-            </div>
-            <div style={{ padding: "16px", borderTop: "1px solid #e8e8e8" }}>
-              <h4 style={{ margin: 0, color: "#262626" }}>部门素材</h4>
-            </div>
-          </div>
-
-          {/* 右侧内容区域 */}
-          <div style={{ flex: 1, padding: "16px" }}>
-            <div style={{ marginBottom: "16px" }}>
-              <Input.Search placeholder="昵称" style={{ width: "100%" }} />
-            </div>
-            <div
-              style={{
-                display: "flex",
-                alignItems: "center",
-                justifyContent: "center",
-                height: "300px",
-                color: "#8c8c8c",
-              }}
-            >
-              请选择左侧素材分类
-            </div>
-          </div>
-        </div>
-      </Modal>
     </Layout>
   );
 };
diff --git a/Cunkebao/src/store/module/websocket/msgManage.ts b/Cunkebao/src/store/module/websocket/msgManage.ts
index 45dc9ff1..6845d5fc 100644
--- a/Cunkebao/src/store/module/websocket/msgManage.ts
+++ b/Cunkebao/src/store/module/websocket/msgManage.ts
@@ -20,6 +20,22 @@ const messageHandlers: Record<string, MessageHandler> = {
     asyncKfUserList(kfUserList);
   },
 
+  // 发送消息响应
+  CmdSendMessageResp: message => {
+    console.log("发送消息响应", message);
+    // 在这里添加具体的处理逻辑
+  },
+  // 接收消息响应
+  CmdReceiveMessageResp: message => {
+    console.log("接收消息响应", message);
+    // 在这里添加具体的处理逻辑
+  },
+  //收到消息
+  CmdNewMessage: message => {
+    console.log("收到消息", message.friendMessage);
+    // 在这里添加具体的处理逻辑
+  },
+
   // 登录响应
   CmdSignInResp: message => {
     console.log("登录响应", message);

From fd82dfc5e0a845da0cc0c8824b389fd68f27990e 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, 2 Sep 2025 15:27:55 +0800
Subject: [PATCH 02/29] =?UTF-8?q?fix(ChatWindow):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=81=8A=E5=A4=A9=E7=AA=97=E5=8F=A3=E6=B6=88=E6=81=AF=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

调整了消息请求的参数逻辑，将时间戳改为固定值并修正了群聊和私聊的参数判断条件
---
 .../src/pages/pc/ckbox/components/ChatWindow/index.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
index 27cf32bc..4ef790a3 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
@@ -60,17 +60,19 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
 
   useEffect(() => {
     setLoading(true);
+    console.log(contract);
+
     const params: any = {
       wechatAccountId: contract.wechatAccountId,
       From: 1,
-      To: +new Date() + 1000,
+      To: 4704624000000,
       Count: 100,
       olderData: true,
     };
-    if (contract.groupId == 1) {
-      params.wechatFriendId = contract.id;
+    if (contract.chatroomId) {
+      params.wechatChatroomId = contract.chatroomId;
     } else {
-      params.wechatChatroomId = contract.id;
+      params.wechatFriendId = contract.id;
     }
     getChatMessages(params)
       .then(msg => {

From 8d8068f5d64a24106eee379190ca239f5b0ec799 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, 2 Sep 2025 15:39:27 +0800
Subject: [PATCH 03/29] =?UTF-8?q?fix:=20=E5=B0=86=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=AF=B7=E6=B1=82=E6=95=B0=E9=87=8F=E4=BB=8E?=
 =?UTF-8?q?100=E5=87=8F=E5=B0=91=E5=88=B010=E4=BB=A5=E9=99=8D=E4=BD=8E?=
 =?UTF-8?q?=E8=B4=9F=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
index 4ef790a3..d3cc1488 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
@@ -66,7 +66,7 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
       wechatAccountId: contract.wechatAccountId,
       From: 1,
       To: 4704624000000,
-      Count: 100,
+      Count: 10,
       olderData: true,
     };
     if (contract.chatroomId) {

From e35403eaf44e67b20c78b1dc42172fac78ef1299 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, 2 Sep 2025 15:52:44 +0800
Subject: [PATCH 04/29] =?UTF-8?q?fix(websocket):=20=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E8=A2=AB=E8=B8=A2=E5=87=BA=E9=80=9A=E7=9F=A5=E6=97=B6=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=88=B0=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

当收到"Kicked out"通知时，直接重定向到登录页面以强制用户重新登录
---
 Cunkebao/src/store/module/websocket/msgManage.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Cunkebao/src/store/module/websocket/msgManage.ts b/Cunkebao/src/store/module/websocket/msgManage.ts
index 6845d5fc..fdcc0c1e 100644
--- a/Cunkebao/src/store/module/websocket/msgManage.ts
+++ b/Cunkebao/src/store/module/websocket/msgManage.ts
@@ -46,6 +46,10 @@ const messageHandlers: Record<string, MessageHandler> = {
   CmdNotify: message => {
     console.log("通知消息", message);
     // 在这里添加具体的处理逻辑
+    if (message.notify == "Kicked out") {
+      // 被踢出时直接跳转到登录页面
+      window.location.href = "/login";
+    }
   },
 
   // 可以继续添加更多处理器...

From 70877c8c967a70cb1ab1f1ec074376c26cea30f0 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, 2 Sep 2025 16:32:25 +0800
Subject: [PATCH 05/29] =?UTF-8?q?feat(ckchat):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=85=B3=E9=94=AE=E8=AF=8D=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=8F=8A=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在CkChatState接口中添加searchKeyword字段用于存储搜索关键词，并新增setSearchKeyword和clearSearchKeyword方法用于管理搜索状态
---
 Cunkebao/src/store/module/ckchat/ckchat.data.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Cunkebao/src/store/module/ckchat/ckchat.data.ts b/Cunkebao/src/store/module/ckchat/ckchat.data.ts
index c7d28f66..f9780ab6 100644
--- a/Cunkebao/src/store/module/ckchat/ckchat.data.ts
+++ b/Cunkebao/src/store/module/ckchat/ckchat.data.ts
@@ -33,6 +33,7 @@ export interface CkUserInfo {
 export interface CkChatState {
   userInfo: CkUserInfo | null;
   isLoggedIn: boolean;
+  searchKeyword: string;
   contractList: ContractData[];
   chatSessions: any[];
   kfUserList: KfUserListData[];
@@ -42,6 +43,8 @@ export interface CkChatState {
   newContractList: ContactGroupByLabel[];
   getContractList: () => ContractData[];
   getNewContractList: () => ContactGroupByLabel[];
+  setSearchKeyword: (keyword: string) => void;
+  clearSearchKeyword: () => void;
   asyncKfSelected: (data: number) => void;
   asyncWeChatGroup: (data: weChatGroup[]) => void;
   asyncCountLables: (data: ContactGroupByLabel[]) => void;

From b08086e3f567c5d73c8665994edefa30533da2e4 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, 2 Sep 2025 17:36:53 +0800
Subject: [PATCH 06/29] feat

---
 Cunkebao/dist/.vite/manifest.json             | 26 ++---
 Cunkebao/dist/index.html                      |  8 +-
 .../WechatFriends/WechatFriends.module.scss   |  7 ++
 .../SidebarMenu/WechatFriends/index.tsx       | 97 +++++++++++++------
 Cunkebao/src/store/module/ckchat/ckchat.ts    | 67 +++++++++++++
 5 files changed, 156 insertions(+), 49 deletions(-)

diff --git a/Cunkebao/dist/.vite/manifest.json b/Cunkebao/dist/.vite/manifest.json
index aa2b3d0b..cc80cbd8 100644
--- a/Cunkebao/dist/.vite/manifest.json
+++ b/Cunkebao/dist/.vite/manifest.json
@@ -1,18 +1,14 @@
 {
-  "_charts-DKSCc2_C.js": {
-    "file": "assets/charts-DKSCc2_C.js",
+  "_charts-Cbn6yFil.js": {
+    "file": "assets/charts-Cbn6yFil.js",
     "name": "charts",
     "imports": [
-      "_ui-DhAz00L0.js",
+      "_ui-Cytu8vuP.js",
       "_vendor-2vc8h_ct.js"
     ]
   },
-  "_ui-D0C0OGrH.css": {
-    "file": "assets/ui-D0C0OGrH.css",
-    "src": "_ui-D0C0OGrH.css"
-  },
-  "_ui-DhAz00L0.js": {
-    "file": "assets/ui-DhAz00L0.js",
+  "_ui-Cytu8vuP.js": {
+    "file": "assets/ui-Cytu8vuP.js",
     "name": "ui",
     "imports": [
       "_vendor-2vc8h_ct.js"
@@ -21,6 +17,10 @@
       "assets/ui-D0C0OGrH.css"
     ]
   },
+  "_ui-D0C0OGrH.css": {
+    "file": "assets/ui-D0C0OGrH.css",
+    "src": "_ui-D0C0OGrH.css"
+  },
   "_utils-6WF66_dS.js": {
     "file": "assets/utils-6WF66_dS.js",
     "name": "utils",
@@ -33,18 +33,18 @@
     "name": "vendor"
   },
   "index.html": {
-    "file": "assets/index-BdCPAYQ7.js",
+    "file": "assets/index-QManA_e5.js",
     "name": "index",
     "src": "index.html",
     "isEntry": true,
     "imports": [
       "_vendor-2vc8h_ct.js",
       "_utils-6WF66_dS.js",
-      "_ui-DhAz00L0.js",
-      "_charts-DKSCc2_C.js"
+      "_ui-Cytu8vuP.js",
+      "_charts-Cbn6yFil.js"
     ],
     "css": [
-      "assets/index-ChiFk16x.css"
+      "assets/index-BkBrwKGe.css"
     ]
   }
 }
\ No newline at end of file
diff --git a/Cunkebao/dist/index.html b/Cunkebao/dist/index.html
index 0b6673bb..93421b47 100644
--- a/Cunkebao/dist/index.html
+++ b/Cunkebao/dist/index.html
@@ -11,13 +11,13 @@
     </style>
     <!-- 引入 uni-app web-view SDK（必须） -->
     <script type="text/javascript" src="/websdk.js"></script>
-    <script type="module" crossorigin src="/assets/index-BdCPAYQ7.js"></script>
+    <script type="module" crossorigin src="/assets/index-QManA_e5.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/vendor-2vc8h_ct.js">
     <link rel="modulepreload" crossorigin href="/assets/utils-6WF66_dS.js">
-    <link rel="modulepreload" crossorigin href="/assets/ui-DhAz00L0.js">
-    <link rel="modulepreload" crossorigin href="/assets/charts-DKSCc2_C.js">
+    <link rel="modulepreload" crossorigin href="/assets/ui-Cytu8vuP.js">
+    <link rel="modulepreload" crossorigin href="/assets/charts-Cbn6yFil.js">
     <link rel="stylesheet" crossorigin href="/assets/ui-D0C0OGrH.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-ChiFk16x.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-BkBrwKGe.css">
   </head>
   <body>
     <div id="root"></div>
diff --git a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/WechatFriends/WechatFriends.module.scss b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/WechatFriends/WechatFriends.module.scss
index 8b371fa2..00633207 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/WechatFriends/WechatFriends.module.scss
+++ b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/WechatFriends/WechatFriends.module.scss
@@ -60,6 +60,13 @@
   padding: 10px 0;
 }
 
+.noResults {
+  text-align: center;
+  color: #999;
+  padding: 20px;
+  font-size: 14px;
+}
+
   .list {
     flex: 1;
     overflow-y: auto;
diff --git a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/WechatFriends/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/WechatFriends/index.tsx
index 33573b04..24ae993f 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/WechatFriends/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/WechatFriends/index.tsx
@@ -2,7 +2,10 @@ import React, { useState, useCallback, useEffect } from "react";
 import { List, Avatar, Collapse, Button } from "antd";
 import type { CollapseProps } from "antd";
 import styles from "./WechatFriends.module.scss";
-import { useCkChatStore } from "@/store/module/ckchat/ckchat";
+import {
+  useCkChatStore,
+  searchContactsAndGroups,
+} from "@/store/module/ckchat/ckchat";
 import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 
 interface WechatFriendsProps {
@@ -17,6 +20,9 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
   selectedContactId,
 }) => {
   const [newContractList, setNewContractList] = useState<any[]>([]);
+  const [searchResults, setSearchResults] = useState<
+    (ContractData | weChatGroup)[]
+  >([]);
   const getNewContractListFn = useCkChatStore(
     state => state.getNewContractList,
   );
@@ -26,17 +32,27 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
 
   // 使用useEffect来处理异步的getNewContractList调用
   useEffect(() => {
-    const fetchNewContractList = async () => {
+    const fetchData = async () => {
       try {
-        const result = await getNewContractListFn();
-        setNewContractList(result || []);
+        if (searchKeyword.trim()) {
+          // 有搜索关键词时，获取搜索结果
+          const searchResult = await searchContactsAndGroups();
+          setSearchResults(searchResult || []);
+          setNewContractList([]);
+        } else {
+          // 无搜索关键词时，获取分组列表
+          const result = await getNewContractListFn();
+          setNewContractList(result || []);
+          setSearchResults([]);
+        }
       } catch (error) {
-        console.error("获取联系人分组列表失败:", error);
+        console.error("获取联系人数据失败:", error);
         setNewContractList([]);
+        setSearchResults([]);
       }
     };
 
-    fetchNewContractList();
+    fetchData();
   }, [getNewContractListFn, kfSelected, countLables, searchKeyword]);
 
   const [activeKey, setActiveKey] = useState<string[]>([]); // 默认展开第一个分组
@@ -50,30 +66,32 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
   const [page, setPage] = useState<{ [key: string]: number }>({});
 
   // 渲染联系人项
-  const renderContactItem = (contact: ContractData) => (
-    <List.Item
-      key={contact.id}
-      onClick={() => onContactClick(contact)}
-      className={`${styles.contractItem} ${contact.id === selectedContactId?.id ? styles.selected : ""}`}
-    >
-      <div className={styles.avatarContainer}>
-        <Avatar
-          src={contact.avatar || contact.chatroomAvatar}
-          icon={
-            !(contact.avatar || contact.chatroomAvatar) && (
-              <span>{contact.nickname.charAt(0)}</span>
-            )
-          }
-          className={styles.avatar}
-        />
-      </div>
-      <div className={styles.contractInfo}>
-        <div className={styles.name}>
-          {contact.conRemark || contact.nickname}
+  const renderContactItem = (contact: ContractData | weChatGroup) => {
+    // 判断是否为群组
+    const isGroup = "chatroomId" in contact;
+    const avatar = contact.avatar || contact.chatroomAvatar;
+    const name = contact.conRemark || contact.nickname;
+
+    return (
+      <List.Item
+        key={contact.id}
+        onClick={() => onContactClick(contact)}
+        className={`${styles.contractItem} ${contact.id === selectedContactId?.id ? styles.selected : ""}`}
+      >
+        <div className={styles.avatarContainer}>
+          <Avatar
+            src={avatar}
+            icon={!avatar && <span>{contact.nickname.charAt(0)}</span>}
+            className={styles.avatar}
+          />
         </div>
-      </div>
-    </List.Item>
-  );
+        <div className={styles.contractInfo}>
+          <div className={styles.name}>{name}</div>
+          {isGroup && <div className={styles.groupInfo}>群聊</div>}
+        </div>
+      </List.Item>
+    );
+  };
 
   // 初始化分页数据
   useEffect(() => {
@@ -188,7 +206,21 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
 
   return (
     <div className={styles.contractListSimple}>
-      {newContractList && newContractList.length > 0 ? (
+      {searchKeyword.trim() ? (
+        // 搜索模式：直接显示搜索结果列表
+        <>
+          <div className={styles.header}>搜索结果</div>
+          <List
+            className={styles.list}
+            dataSource={searchResults}
+            renderItem={renderContactItem}
+          />
+          {searchResults.length === 0 && (
+            <div className={styles.noResults}>未找到匹配的联系人</div>
+          )}
+        </>
+      ) : newContractList && newContractList.length > 0 ? (
+        // 正常模式：显示分组
         <Collapse
           className={styles.groupCollapse}
           activeKey={activeKey}
@@ -196,11 +228,12 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
           items={getCollapseItems()}
         />
       ) : (
+        // 备用模式：显示传入的联系人列表
         <>
-          <div className={styles.header}>全部好友</div>
+          <div className={styles.header}>全部联系人</div>
           <List
             className={styles.list}
-            dataSource={contracts as ContractData[]}
+            dataSource={contracts}
             renderItem={renderContactItem}
           />
         </>
diff --git a/Cunkebao/src/store/module/ckchat/ckchat.ts b/Cunkebao/src/store/module/ckchat/ckchat.ts
index db1bf9e6..bc490b04 100644
--- a/Cunkebao/src/store/module/ckchat/ckchat.ts
+++ b/Cunkebao/src/store/module/ckchat/ckchat.ts
@@ -131,6 +131,71 @@ export const useCkChatStore = createPersistStore<CkChatState>(
         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: ContractData[] = await contractService.findAll();
+
+            // 根据选中的客服筛选联系人
+            if (state.kfSelected !== 0) {
+              allContacts = allContacts.filter(
+                item => item.wechatAccountId === state.kfSelected,
+              );
+            }
+
+            // 从本地数据库查询群组数据
+            let allGroups: weChatGroup[] = await weChatGroupService.findAll();
+
+            // 根据选中的客服筛选群组
+            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 });
@@ -472,4 +537,6 @@ export const setSearchKeyword = (keyword: string) =>
   useCkChatStore.getState().setSearchKeyword(keyword);
 export const clearSearchKeyword = () =>
   useCkChatStore.getState().clearSearchKeyword();
+export const searchContactsAndGroups = () =>
+  useCkChatStore.getState().searchContactsAndGroups();
 useCkChatStore.getState().getKfSelectedUser();

From 92e9b69348b6d3b5bf15cae15a8787c17a7c5c3d 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, 2 Sep 2025 17:40:11 +0800
Subject: [PATCH 07/29] =?UTF-8?q?feat(WechatFriends):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增搜索联系人及群组功能，支持本地数据库查询
- 添加无搜索结果时的提示样式
- 优化联系人列表渲染逻辑，区分搜索模式和分组模式
- 统一联系人项展示样式，支持群组标识
---
 Cunkebao/src/store/module/ckchat/ckchat.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cunkebao/src/store/module/ckchat/ckchat.ts b/Cunkebao/src/store/module/ckchat/ckchat.ts
index bc490b04..054c4bd5 100644
--- a/Cunkebao/src/store/module/ckchat/ckchat.ts
+++ b/Cunkebao/src/store/module/ckchat/ckchat.ts
@@ -150,7 +150,10 @@ export const useCkChatStore = createPersistStore<CkChatState>(
             const keyword = state.searchKeyword.toLowerCase();
 
             // 从本地数据库查询联系人数据
-            let allContacts: ContractData[] = await contractService.findAll();
+            let allContacts: any[] = await contractService.findAll();
+
+            // 从本地数据库查询群组数据
+            let allGroups: any[] = await weChatGroupService.findAll();
 
             // 根据选中的客服筛选联系人
             if (state.kfSelected !== 0) {
@@ -159,9 +162,6 @@ export const useCkChatStore = createPersistStore<CkChatState>(
               );
             }
 
-            // 从本地数据库查询群组数据
-            let allGroups: weChatGroup[] = await weChatGroupService.findAll();
-
             // 根据选中的客服筛选群组
             if (state.kfSelected !== 0) {
               allGroups = allGroups.filter(

From 4c5e049c16c4dec207f767d2d0db976de114e794 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, 2 Sep 2025 17:51:37 +0800
Subject: [PATCH 08/29] =?UTF-8?q?feat(ckbox):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BE=AE=E4=BF=A1=E5=A5=BD=E5=8F=8B=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=9A=84API=E5=92=8C=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在聊天会话初始化时调用updateConfig API更新好友配置，标记为可聊天状态
---
 Cunkebao/src/pages/pc/ckbox/api.ts    | 5 +++++
 Cunkebao/src/pages/pc/ckbox/index.tsx | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Cunkebao/src/pages/pc/ckbox/api.ts b/Cunkebao/src/pages/pc/ckbox/api.ts
index 9bf2e54c..daa8a79a 100644
--- a/Cunkebao/src/pages/pc/ckbox/api.ts
+++ b/Cunkebao/src/pages/pc/ckbox/api.ts
@@ -22,6 +22,11 @@ export function WechatGroup(params) {
 export function clearUnreadCount(params) {
   return request("/api/WechatFriend/clearUnreadCount", params, "PUT");
 }
+
+//更新配置
+export function updateConfig(params) {
+  return request("/api/WechatFriend/updateConfig", params, "PUT");
+}
 //获取聊天记录-2 获取列表
 export function getChatMessages(params: {
   wechatAccountId: number;
diff --git a/Cunkebao/src/pages/pc/ckbox/index.tsx b/Cunkebao/src/pages/pc/ckbox/index.tsx
index b0112675..7376104c 100644
--- a/Cunkebao/src/pages/pc/ckbox/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/index.tsx
@@ -10,7 +10,7 @@ import styles from "./index.module.scss";
 import { addChatSession } from "@/store/module/ckchat/ckchat";
 const { Header, Content, Sider } = Layout;
 import { chatInitAPIdata, initSocket } from "./main";
-import { clearUnreadCount } from "@/pages/pc/ckbox/api";
+import { clearUnreadCount, updateConfig } from "@/pages/pc/ckbox/api";
 import {
   KfUserListData,
   weChatGroup,
@@ -82,6 +82,10 @@ const CkboxPage: React.FC = () => {
       contract.unreadCount = 0;
       addChatSession(contract);
       setCurrentChat(contract);
+      updateConfig({
+        id: contract.id,
+        config: { chat: true },
+      });
     });
   };
 

From 22560a5ce2e5e52ba0889ea0ae1107e53b76a4eb 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, 2 Sep 2025 17:58:19 +0800
Subject: [PATCH 09/29] =?UTF-8?q?fix(SidebarMenu):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E5=8D=A0=E4=BD=8D=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E4=B8=BA"=E6=90=9C=E7=B4=A2=E5=AE=A2=E6=88=B7..."?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

原占位文本"搜索联系人、群组"不符合当前业务场景，更新为更准确的"搜索客户..."
---
 Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/index.tsx
index b143d406..4704cf38 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/index.tsx
@@ -93,7 +93,7 @@ const SidebarMenu: React.FC<SidebarMenuProps> = ({
       {/* 搜索栏 */}
       <div className={styles.searchBar}>
         <Input
-          placeholder="搜索联系人、群组"
+          placeholder="搜索客户..."
           prefix={<SearchOutlined />}
           value={searchKeyword}
           onChange={e => handleSearch(e.target.value)}

From eb63dc1d8dad647394d8b4bcf16ac372ccaf3501 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, 3 Sep 2025 09:35:09 +0800
Subject: [PATCH 10/29] =?UTF-8?q?refactor(websocket):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=A4=84=E7=90=86=E5=99=A8=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E7=A9=BA=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cunkebao/src/store/module/websocket/msgManage.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Cunkebao/src/store/module/websocket/msgManage.ts b/Cunkebao/src/store/module/websocket/msgManage.ts
index fdcc0c1e..2883be13 100644
--- a/Cunkebao/src/store/module/websocket/msgManage.ts
+++ b/Cunkebao/src/store/module/websocket/msgManage.ts
@@ -19,7 +19,6 @@ const messageHandlers: Record<string, MessageHandler> = {
     });
     asyncKfUserList(kfUserList);
   },
-
   // 发送消息响应
   CmdSendMessageResp: message => {
     console.log("发送消息响应", message);

From 0d6ac88dea214bcc45eec19be560f7d146b0fc36 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, 3 Sep 2025 09:52:58 +0800
Subject: [PATCH 11/29] =?UTF-8?q?refactor(websocket):=20=E5=B0=86=E5=AE=A2?=
 =?UTF-8?q?=E6=9C=8D=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E5=99=A8=E9=80=BB=E8=BE=91=E7=A7=BB=E8=87=B3websocket=20store?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将原本在组件中的客服状态查询定时器逻辑重构到websocket store中，统一管理定时器的启动和停止。同时在连接成功时自动启动定时器，断开连接时自动停止，避免内存泄漏。
---
 Cunkebao/src/pages/pc/ckbox/index.tsx         | 15 -----
 .../src/store/module/websocket/websocket.ts   | 57 +++++++++++++++++++
 2 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/Cunkebao/src/pages/pc/ckbox/index.tsx b/Cunkebao/src/pages/pc/ckbox/index.tsx
index 7376104c..e02d5739 100644
--- a/Cunkebao/src/pages/pc/ckbox/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/index.tsx
@@ -16,8 +16,6 @@ import {
   weChatGroup,
   ContractData,
 } from "@/pages/pc/ckbox/data";
-import { useWebSocketStore } from "@/store/module/websocket/websocket";
-import { useCkChatStore } from "@/store/module/ckchat/ckchat";
 
 const CkboxPage: React.FC = () => {
   const [messageApi, contextHolder] = message.useMessage();
@@ -25,22 +23,9 @@ const CkboxPage: React.FC = () => {
   const [currentChat, setCurrentChat] = useState<ContractData | weChatGroup>(
     null,
   );
-  const status = useWebSocketStore(state => state.status);
   // 不要在组件初始化时获取sendCommand，而是在需要时动态获取
   const [loading, setLoading] = useState(false);
   const [showProfile, setShowProfile] = useState(true);
-  const kfUserList = useCkChatStore(state => state.kfUserList);
-  const { sendCommand } = useWebSocketStore.getState();
-  useEffect(() => {
-    if (status == "connected" && kfUserList.length > 0) {
-      //查询客服用户激活状态
-      setInterval(() => {
-        sendCommand("CmdRequestWechatAccountsAliveStatus", {
-          wechatAccountIds: kfUserList.map(v => v.id),
-        });
-      }, 10 * 1000);
-    }
-  }, [status]);
 
   useEffect(() => {
     // 方法一：使用 Promise 链式调用处理异步函数
diff --git a/Cunkebao/src/store/module/websocket/websocket.ts b/Cunkebao/src/store/module/websocket/websocket.ts
index ebfe53a2..a1327038 100644
--- a/Cunkebao/src/store/module/websocket/websocket.ts
+++ b/Cunkebao/src/store/module/websocket/websocket.ts
@@ -51,6 +51,7 @@ interface WebSocketState {
   // 重连相关
   reconnectAttempts: number;
   reconnectTimer: NodeJS.Timeout | null;
+  aliveStatusTimer: NodeJS.Timeout | null; // 客服用户状态查询定时器
 
   // 方法
   connect: (config: Partial<WebSocketConfig>) => void;
@@ -68,6 +69,8 @@ interface WebSocketState {
   _handleError: (event: Event) => void;
   _startReconnectTimer: () => void;
   _stopReconnectTimer: () => void;
+  _startAliveStatusTimer: () => void; // 启动客服状态查询定时器
+  _stopAliveStatusTimer: () => void; // 停止客服状态查询定时器
 }
 
 // 默认配置
@@ -92,6 +95,7 @@ export const useWebSocketStore = createPersistStore<WebSocketState>(
     unreadCount: 0,
     reconnectAttempts: 0,
     reconnectTimer: null,
+    aliveStatusTimer: null,
 
     // 连接WebSocket
     connect: (config: Partial<WebSocketConfig>) => {
@@ -183,6 +187,7 @@ export const useWebSocketStore = createPersistStore<WebSocketState>(
       }
 
       currentState._stopReconnectTimer();
+      currentState._stopAliveStatusTimer();
 
       set({
         status: WebSocketStatus.DISCONNECTED,
@@ -291,6 +296,9 @@ export const useWebSocketStore = createPersistStore<WebSocketState>(
       }
 
       Toast.show({ content: "WebSocket连接成功", position: "top" });
+
+      // 启动客服状态查询定时器
+      currentState._startAliveStatusTimer();
     },
 
     // 内部方法：处理消息接收
@@ -319,6 +327,9 @@ export const useWebSocketStore = createPersistStore<WebSocketState>(
               });
             }
 
+            // 停止客服状态查询定时器
+            get()._stopAliveStatusTimer();
+
             // 断开连接
             get().disconnect();
             return;
@@ -414,6 +425,51 @@ export const useWebSocketStore = createPersistStore<WebSocketState>(
         set({ reconnectTimer: null });
       }
     },
+
+    // 内部方法：启动客服状态查询定时器
+    _startAliveStatusTimer: () => {
+      const currentState = get();
+
+      // 先停止现有定时器
+      currentState._stopAliveStatusTimer();
+
+      // 获取客服用户列表
+      const { kfUserList } = useCkChatStore.getState();
+
+      // 如果没有客服用户，不启动定时器
+      if (!kfUserList || kfUserList.length === 0) {
+        return;
+      }
+
+      // 启动定时器，每5秒查询一次
+      const timer = setInterval(() => {
+        const state = get();
+        // 检查连接状态
+        if (state.status === WebSocketStatus.CONNECTED) {
+          const { kfUserList: currentKfUserList } = useCkChatStore.getState();
+          if (currentKfUserList && currentKfUserList.length > 0) {
+            state.sendCommand("CmdRequestWechatAccountsAliveStatus", {
+              wechatAccountIds: currentKfUserList.map(v => v.id),
+            });
+          }
+        } else {
+          // 如果连接断开，停止定时器
+          state._stopAliveStatusTimer();
+        }
+      }, 5000);
+
+      set({ aliveStatusTimer: timer });
+    },
+
+    // 内部方法：停止客服状态查询定时器
+    _stopAliveStatusTimer: () => {
+      const currentState = get();
+
+      if (currentState.aliveStatusTimer) {
+        clearInterval(currentState.aliveStatusTimer);
+        set({ aliveStatusTimer: null });
+      }
+    },
   }),
   {
     name: "websocket-store",
@@ -424,6 +480,7 @@ export const useWebSocketStore = createPersistStore<WebSocketState>(
       messages: state.messages.slice(-100), // 只保留最近100条消息
       unreadCount: state.unreadCount,
       reconnectAttempts: state.reconnectAttempts,
+      // 注意：定时器不需要持久化，重新连接时会重新创建
     }),
     onRehydrateStorage: () => state => {
       // 页面刷新后，如果之前是连接状态，尝试重新连接

From 2995755cdac24d3c45931186f449f0ae3825efa1 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, 3 Sep 2025 09:54:40 +0800
Subject: [PATCH 12/29] =?UTF-8?q?refactor(websocket):=20=E5=B0=86=E7=A1=AC?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=9A=845000=E6=AF=AB=E7=A7=92=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA5=20*=201000=E4=BB=A5=E6=8F=90=E9=AB=98=E5=8F=AF?=
 =?UTF-8?q?=E8=AF=BB=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cunkebao/src/store/module/websocket/websocket.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cunkebao/src/store/module/websocket/websocket.ts b/Cunkebao/src/store/module/websocket/websocket.ts
index a1327038..485931c6 100644
--- a/Cunkebao/src/store/module/websocket/websocket.ts
+++ b/Cunkebao/src/store/module/websocket/websocket.ts
@@ -456,7 +456,7 @@ export const useWebSocketStore = createPersistStore<WebSocketState>(
           // 如果连接断开，停止定时器
           state._stopAliveStatusTimer();
         }
-      }, 5000);
+      }, 5 * 1000);
 
       set({ aliveStatusTimer: timer });
     },

From 414660a0a5656fd3937419d2997ba748eab85fce 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, 3 Sep 2025 10:01:26 +0800
Subject: [PATCH 13/29] =?UTF-8?q?refactor(ChatWindow):=20=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E8=B0=83=E8=AF=95=E7=94=A8=E7=9A=84console.log?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

清理无用代码，避免生产环境输出不必要的信息
---
 Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
index d3cc1488..565881be 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
@@ -60,8 +60,6 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
 
   useEffect(() => {
     setLoading(true);
-    console.log(contract);
-
     const params: any = {
       wechatAccountId: contract.wechatAccountId,
       From: 1,

From c6da2062f2bf7c469d0bbd4dc59a3c36d7c0d7a4 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, 3 Sep 2025 10:45:19 +0800
Subject: [PATCH 14/29] =?UTF-8?q?FEAT=20=3D>=20=E6=9C=AC=E6=AC=A1=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=A1=B9=E7=9B=AE=E4=B8=BA=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MessageList/MessageList.module.scss       |  7 +++--
 .../src/store/module/websocket/msg.data.ts    | 27 +++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 Cunkebao/src/store/module/websocket/msg.data.ts

diff --git a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/MessageList.module.scss b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/MessageList.module.scss
index 7f78afc9..e70717c2 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/MessageList.module.scss
+++ b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/MessageList.module.scss
@@ -63,7 +63,6 @@
           .lastMessage {
             font-size: 12px;
             color: #8c8c8c;
-            overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
             flex: 1;
@@ -71,7 +70,7 @@
             padding-right: 5px;
             height: 18px; // 添加固定高度
             line-height: 18px; // 设置行高与高度一致
-            
+
             &::before {
               content: attr(data-count);
               position: absolute;
@@ -88,7 +87,7 @@
               text-align: center;
               display: none;
             }
-            
+
             &[data-count]:not([data-count=""]):not([data-count="0"]) {
               &::before {
                 display: inline-block;
@@ -106,7 +105,7 @@
       }
     }
   }
-  
+
   .lastDayMessage {
     position: absolute;
     bottom: 0;
diff --git a/Cunkebao/src/store/module/websocket/msg.data.ts b/Cunkebao/src/store/module/websocket/msg.data.ts
new file mode 100644
index 00000000..ed8510b1
--- /dev/null
+++ b/Cunkebao/src/store/module/websocket/msg.data.ts
@@ -0,0 +1,27 @@
+export interface FriendMessage {
+  id: number;
+  wechatFriendId: number;
+  wechatAccountId: number;
+  tenantId: number;
+  accountId: number;
+  synergyAccountId: number;
+  content: string;
+  msgType: number;
+  msgSubType: number;
+  msgSvrId: string;
+  isSend: boolean;
+  createTime: string;
+  isDeleted: boolean;
+  deleteTime: string;
+  sendStatus: number;
+  wechatTime: number;
+  origin: number;
+  msgId: number;
+  recalled: boolean;
+}
+export interface Messages {
+  friendMessage: FriendMessage | null;
+  chatroomMessage: string;
+  seq: number;
+  cmdType: string;
+}

From 48880bed0d8eecf0b9ce1b09ff626a8abe416fe2 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, 3 Sep 2025 11:25:10 +0800
Subject: [PATCH 15/29] =?UTF-8?q?feat(wechat):=20=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=81=8A=E5=A4=A9=E7=8A=B6=E6=80=81=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=8F=8A=E6=B6=88=E6=81=AF=E5=A4=84=E7=90=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加微信聊天状态管理store，包含联系人管理、消息发送/接收、未读消息计数等功能
修复聊天窗口参数传递问题，统一使用contract.id作为标识
调整消息加载数量从10条减少到5条
---
 .../components/MessageEnter/index.tsx         |   2 +-
 .../pc/ckbox/components/ChatWindow/index.tsx  |   4 +-
 Cunkebao/src/store/module/weChat.ts           | 601 ++++++++++++++++++
 .../src/store/module/websocket/msgManage.ts   |   3 +-
 4 files changed, 606 insertions(+), 4 deletions(-)
 create mode 100644 Cunkebao/src/store/module/weChat.ts

diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx
index e869a45d..0f4650d2 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx
@@ -38,7 +38,7 @@ const MessageEnter: React.FC<MessageEnterProps> = ({
     console.log("发送消息", contract);
     const params = {
       wechatAccountId: contract.wechatAccountId,
-      wechatChatroomId: contract?.chatroomId || 0,
+      wechatChatroomId: contract?.chatroomId ? contract.id : 0,
       wechatFriendId: contract?.chatroomId ? 0 : contract.id,
       msgSubType: 0,
       msgType: 1,
diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
index 565881be..22e96c0f 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
@@ -64,11 +64,11 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
       wechatAccountId: contract.wechatAccountId,
       From: 1,
       To: 4704624000000,
-      Count: 10,
+      Count: 5,
       olderData: true,
     };
     if (contract.chatroomId) {
-      params.wechatChatroomId = contract.chatroomId;
+      params.wechatChatroomId = contract.id;
     } else {
       params.wechatFriendId = contract.id;
     }
diff --git a/Cunkebao/src/store/module/weChat.ts b/Cunkebao/src/store/module/weChat.ts
new file mode 100644
index 00000000..e1cf17a4
--- /dev/null
+++ b/Cunkebao/src/store/module/weChat.ts
@@ -0,0 +1,601 @@
+import { create } from "zustand";
+import { createPersistStore } from "../createPersistStore";
+import { getChatMessages } from "@/pages/pc/ckbox/api";
+import { ChatRecord, ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
+import { useWebSocketStore } from "./websocket/websocket";
+
+// 聊天列表项类型定义
+export interface ChatListItem {
+  id: string;
+  name: string;
+  avatar?: string;
+  type: "friend" | "group";
+  lastMessage?: ChatRecord;
+  unreadCount: number;
+  isOnline?: boolean;
+  lastActiveTime: number; // 最后活跃时间，用于排序
+  contractData: ContractData | weChatGroup; // 保存完整的联系人数据
+}
+
+// 微信聊天相关的类型定义
+export interface WeChatState {
+  // 当前选中的联系人/群组
+  currentContract: ContractData | weChatGroup | null;
+
+  // 当前聊天用户的消息列表（只存储当前聊天用户的消息）
+  currentMessages: ChatRecord[];
+
+  // 联系人列表（所有好友和群组）
+  contacts: (ContractData | weChatGroup)[];
+
+  // 聊天列表（有聊天记录的联系人/群组，按最后活跃时间排序）
+  chatList: ChatListItem[];
+
+  // 消息发送状态
+  sendingStatus: Record<string, boolean>; // key为消息临时ID，value为发送状态
+
+  // 消息加载状态
+  loadingMessages: boolean;
+
+  // 待处理的视频请求
+  pendingVideoRequests: Record<string, string>; // messageId -> requestId
+
+  // 输入框内容状态 - 按联系人/群组ID分组存储
+  inputValues: Record<string, string>;
+
+  // 素材模态框状态
+  showMaterialModal: boolean;
+  selectedMaterialType: string;
+}
+
+export interface WeChatActions {
+  // 设置当前选中的联系人/群组
+  setCurrentContract: (contract: ContractData | weChatGroup | null) => void;
+
+  // 获取聊天消息
+  fetchChatMessages: (contract: ContractData | weChatGroup) => Promise<void>;
+
+  // 设置当前消息列表
+  setCurrentMessages: (messages: ChatRecord[]) => void;
+
+  // 添加消息到当前聊天
+  addMessageToCurrentChat: (message: ChatRecord) => void;
+
+  // 更新消息内容（用于视频加载状态更新等）
+  updateMessage: (messageId: number, updates: Partial<ChatRecord>) => void;
+
+  // 发送消息
+  sendMessage: (
+    contract: ContractData | weChatGroup,
+    content: string,
+    msgType?: number,
+  ) => Promise<void>;
+
+  // 处理视频播放请求
+  handleVideoPlayRequest: (
+    tencentUrl: string,
+    messageId: number,
+    contract: ContractData | weChatGroup,
+  ) => void;
+
+  // 设置待处理的视频请求
+  setPendingVideoRequest: (messageId: string, requestId: string) => void;
+
+  // 移除待处理的视频请求
+  removePendingVideoRequest: (messageId: string) => void;
+
+  // 处理视频下载响应
+  handleVideoDownloadResponse: (messageId: string, videoUrl: string) => void;
+
+  // 设置输入框内容
+  setInputValue: (contractId: string, value: string) => void;
+
+  // 获取输入框内容
+  getInputValue: (contractId: string) => string;
+
+  // 清空输入框内容
+  clearInputValue: (contractId: string) => void;
+
+  // 素材模态框相关操作
+  setShowMaterialModal: (show: boolean) => void;
+  setSelectedMaterialType: (type: string) => void;
+
+  // 新消息处理
+  handleNewMessage: (
+    message: ChatRecord,
+    fromContract: ContractData | weChatGroup,
+  ) => void;
+
+  // 聊天列表管理
+  setContacts: (contacts: (ContractData | weChatGroup)[]) => void;
+  setChatList: (chatList: ChatListItem[]) => void;
+  updateChatListItem: (
+    contractId: string,
+    updates: Partial<ChatListItem>,
+  ) => void;
+  moveToTopOfChatList: (contractId: string) => void;
+  addToChatList: (contract: ContractData | weChatGroup) => void;
+
+  // 未读消息管理
+  incrementUnreadCount: (contractId: string) => void;
+  clearUnreadCount: (contractId: string) => void;
+
+  // 便捷选择器
+  getUnreadTotal: () => number;
+  getChatListSorted: () => ChatListItem[];
+
+  // 清理指定联系人的数据
+  clearContractData: (contractId: string) => void;
+
+  // 清理所有数据
+  clearAllData: () => void;
+}
+
+type WeChatStore = WeChatState & WeChatActions;
+
+// 生成联系人/群组的唯一ID
+const getContractId = (contract: ContractData | weChatGroup): string => {
+  if ("chatroomId" in contract && contract.chatroomId) {
+    return `group_${contract.chatroomId}`;
+  }
+  return `friend_${contract.id}`;
+};
+
+export const useWeChatStore = create<WeChatStore>()(
+  createPersistStore(
+    (set, get) => ({
+      // 初始状态
+      currentContract: null,
+      currentMessages: [],
+      contacts: [],
+      chatList: [],
+      sendingStatus: {},
+      loadingMessages: false,
+      pendingVideoRequests: {},
+      inputValues: {},
+      showMaterialModal: false,
+      selectedMaterialType: "",
+
+      // Actions
+      setCurrentContract: contract => {
+        set({ currentContract: contract });
+        // 切换联系人时清空当前消息，等待重新加载
+        set({ currentMessages: [] });
+        // 清除该联系人的未读数
+        if (contract) {
+          const contractId = getContractId(contract);
+          get().clearUnreadCount(contractId);
+        }
+      },
+
+      fetchChatMessages: async contract => {
+        const { currentMessages } = get();
+
+        // 如果已经有消息数据，不重复加载
+        if (currentMessages.length > 0) {
+          return;
+        }
+
+        set({ loadingMessages: true });
+
+        try {
+          const params: any = {
+            wechatAccountId: contract.wechatAccountId,
+            From: 1,
+            To: 4704624000000,
+            Count: 10,
+            olderData: true,
+          };
+
+          if ("chatroomId" in contract && contract.chatroomId) {
+            params.wechatChatroomId = contract.chatroomId;
+          } else {
+            params.wechatFriendId = contract.id;
+          }
+
+          const messages = await getChatMessages(params);
+
+          set({ currentMessages: messages });
+        } catch (error) {
+          console.error("获取聊天消息失败:", error);
+        } finally {
+          set({ loadingMessages: false });
+        }
+      },
+
+      setCurrentMessages: messages => {
+        set({ currentMessages: messages });
+      },
+
+      addMessageToCurrentChat: message => {
+        set(state => ({
+          currentMessages: [...state.currentMessages, message],
+        }));
+      },
+
+      updateMessage: (messageId, updates) => {
+        set(state => ({
+          currentMessages: state.currentMessages.map(msg =>
+            msg.id === messageId ? { ...msg, ...updates } : msg,
+          ),
+        }));
+      },
+
+      sendMessage: async (contract, content, msgType = 1) => {
+        const contractId = getContractId(contract);
+        const tempId = `temp_${Date.now()}`;
+
+        // 设置发送状态
+        set(state => ({
+          sendingStatus: {
+            ...state.sendingStatus,
+            [tempId]: true,
+          },
+        }));
+
+        try {
+          const params = {
+            wechatAccountId: contract.wechatAccountId,
+            wechatChatroomId:
+              "chatroomId" in contract && contract.chatroomId
+                ? contract.chatroomId
+                : 0,
+            wechatFriendId:
+              "chatroomId" in contract && contract.chatroomId ? 0 : contract.id,
+            msgSubType: 0,
+            msgType,
+            content,
+          };
+
+          // 通过WebSocket发送消息
+          const { sendCommand } = useWebSocketStore.getState();
+          await sendCommand("CmdSendMessage", params);
+
+          // 清空对应的输入框内容
+          get().clearInputValue(contractId);
+        } catch (error) {
+          console.error("发送消息失败:", error);
+        } finally {
+          // 移除发送状态
+          set(state => {
+            const newSendingStatus = { ...state.sendingStatus };
+            delete newSendingStatus[tempId];
+            return { sendingStatus: newSendingStatus };
+          });
+        }
+      },
+
+      handleVideoPlayRequest: (tencentUrl, messageId, contract) => {
+        const requestSeq = `${Date.now()}`;
+
+        console.log("发送视频下载请求:", { messageId, requestSeq });
+
+        // 构建socket请求数据
+        const { sendCommand } = useWebSocketStore.getState();
+        sendCommand("CmdDownloadVideo", {
+          chatroomMessageId:
+            "chatroomId" in contract && contract.chatroomId ? messageId : 0,
+          friendMessageId:
+            "chatroomId" in contract && contract.chatroomId ? 0 : messageId,
+          seq: requestSeq,
+          tencentUrl: tencentUrl,
+          wechatAccountId: contract.wechatAccountId,
+        });
+
+        // 添加到待处理队列
+        get().setPendingVideoRequest(
+          messageId.toString(),
+          messageId.toString(),
+        );
+
+        // 更新消息状态为加载中
+        const messages = get().currentMessages;
+        const targetMessage = messages.find(msg => msg.id === messageId);
+        if (targetMessage) {
+          try {
+            const originalContent =
+              typeof targetMessage.content === "string"
+                ? JSON.parse(targetMessage.content)
+                : targetMessage.content;
+
+            get().updateMessage(messageId, {
+              content: JSON.stringify({
+                ...originalContent,
+                isLoading: true,
+              }),
+            });
+          } catch (e) {
+            console.error("解析消息内容失败:", e);
+          }
+        }
+      },
+
+      setPendingVideoRequest: (messageId, requestId) => {
+        set(state => ({
+          pendingVideoRequests: {
+            ...state.pendingVideoRequests,
+            [messageId]: requestId,
+          },
+        }));
+      },
+
+      removePendingVideoRequest: messageId => {
+        set(state => {
+          const newRequests = { ...state.pendingVideoRequests };
+          delete newRequests[messageId];
+          return { pendingVideoRequests: newRequests };
+        });
+      },
+
+      handleVideoDownloadResponse: (messageId, videoUrl) => {
+        const { currentMessages } = get();
+        const targetMessage = currentMessages.find(
+          msg => msg.id === Number(messageId),
+        );
+
+        if (targetMessage) {
+          try {
+            const msgContent =
+              typeof targetMessage.content === "string"
+                ? JSON.parse(targetMessage.content)
+                : targetMessage.content;
+
+            // 更新消息内容，添加视频URL并移除加载状态
+            get().updateMessage(Number(messageId), {
+              content: JSON.stringify({
+                ...msgContent,
+                videoUrl: videoUrl,
+                isLoading: false,
+              }),
+            });
+
+            // 从待处理队列中移除
+            get().removePendingVideoRequest(messageId);
+          } catch (e) {
+            console.error("解析消息内容失败:", e);
+          }
+        }
+      },
+
+      setInputValue: (contractId, value) => {
+        set(state => ({
+          inputValues: {
+            ...state.inputValues,
+            [contractId]: value,
+          },
+        }));
+      },
+
+      getInputValue: contractId => {
+        return get().inputValues[contractId] || "";
+      },
+
+      clearInputValue: contractId => {
+        set(state => {
+          const newInputValues = { ...state.inputValues };
+          delete newInputValues[contractId];
+          return { inputValues: newInputValues };
+        });
+      },
+
+      setShowMaterialModal: show => {
+        set({ showMaterialModal: show });
+      },
+
+      setSelectedMaterialType: type => {
+        set({ selectedMaterialType: type });
+      },
+
+      // 新消息处理
+      handleNewMessage: (message, fromContract) => {
+        const { currentContract } = get();
+        const contractId = getContractId(fromContract);
+
+        // 如果是当前聊天用户的消息，直接添加到当前消息列表
+        if (currentContract && getContractId(currentContract) === contractId) {
+          get().addMessageToCurrentChat(message);
+        } else {
+          // 如果不是当前聊天用户，更新聊天列表
+          get().incrementUnreadCount(contractId);
+          get().moveToTopOfChatList(contractId);
+
+          // 更新聊天列表项的最后消息
+          get().updateChatListItem(contractId, {
+            lastMessage: message,
+            lastActiveTime: message.createTime || Date.now(),
+          });
+        }
+      },
+
+      // 聊天列表管理
+      setContacts: contacts => {
+        set({ contacts });
+      },
+
+      setChatList: chatList => {
+        set({ chatList });
+      },
+
+      updateChatListItem: (contractId, updates) => {
+        set(state => ({
+          chatList: state.chatList.map(item =>
+            getContractId(item.contractData) === contractId
+              ? { ...item, ...updates }
+              : item,
+          ),
+        }));
+      },
+
+      moveToTopOfChatList: contractId => {
+        set(state => {
+          const chatList = [...state.chatList];
+          const itemIndex = chatList.findIndex(
+            item => getContractId(item.contractData) === contractId,
+          );
+
+          if (itemIndex > 0) {
+            // 移动到顶部
+            const item = chatList.splice(itemIndex, 1)[0];
+            chatList.unshift({ ...item, lastActiveTime: Date.now() });
+          } else if (itemIndex === -1) {
+            // 如果不在聊天列表中，从联系人列表找到并添加
+            const contract = state.contacts.find(
+              c => getContractId(c) === contractId,
+            );
+            if (contract) {
+              get().addToChatList(contract);
+            }
+          }
+
+          return { chatList };
+        });
+      },
+
+      addToChatList: contract => {
+        set(state => {
+          const contractId = getContractId(contract);
+          // 检查是否已存在
+          const exists = state.chatList.some(
+            item => getContractId(item.contractData) === contractId,
+          );
+          if (exists) return state;
+
+          const newChatItem: ChatListItem = {
+            id: contractId,
+            name: contract.nickName || contract.name || "",
+            avatar: contract.avatar,
+            type: "chatroomId" in contract ? "group" : "friend",
+            unreadCount: 0,
+            lastActiveTime: Date.now(),
+            contractData: contract,
+          };
+
+          return {
+            chatList: [newChatItem, ...state.chatList],
+          };
+        });
+      },
+
+      // 未读消息管理
+      incrementUnreadCount: contractId => {
+        // 更新聊天列表中的未读数
+        set(state => ({
+          chatList: state.chatList.map(item =>
+            getContractId(item.contractData) === contractId
+              ? { ...item, unreadCount: item.unreadCount + 1 }
+              : item,
+          ),
+        }));
+      },
+
+      clearUnreadCount: contractId => {
+        // 清除聊天列表中的未读数
+        set(state => ({
+          chatList: state.chatList.map(item =>
+            getContractId(item.contractData) === contractId
+              ? { ...item, unreadCount: 0 }
+              : item,
+          ),
+        }));
+      },
+
+      // 便捷选择器
+      getUnreadTotal: () => {
+        const { chatList } = get();
+        return chatList.reduce((total, item) => total + item.unreadCount, 0);
+      },
+
+      getChatListSorted: () => {
+        const { chatList } = get();
+        return [...chatList].sort(
+          (a, b) => b.lastActiveTime - a.lastActiveTime,
+        );
+      },
+
+      clearContractData: contractId => {
+        set(state => {
+          const newInputValues = { ...state.inputValues };
+          delete newInputValues[contractId];
+
+          return {
+            inputValues: newInputValues,
+            chatList: state.chatList.filter(
+              item => getContractId(item.contractData) !== contractId,
+            ),
+          };
+        });
+      },
+
+      clearAllData: () => {
+        set({
+          currentContract: null,
+          currentMessages: [],
+          contacts: [],
+          chatList: [],
+          sendingStatus: {},
+          loadingMessages: false,
+          pendingVideoRequests: {},
+          inputValues: {},
+          showMaterialModal: false,
+          selectedMaterialType: "",
+        });
+      },
+    }),
+    {
+      name: "wechat-store",
+      // 只持久化部分状态，排除临时状态
+      partialize: state => ({
+        contacts: state.contacts,
+        chatList: state.chatList,
+        inputValues: state.inputValues,
+      }),
+    },
+  ),
+);
+
+// 导出便捷的选择器函数
+export const useCurrentContract = () =>
+  useWeChatStore(state => state.currentContract);
+export const useCurrentMessages = () =>
+  useWeChatStore(state => state.currentMessages);
+export const useCurrentInputValue = () => {
+  const { currentContract, getInputValue } = useWeChatStore();
+  if (!currentContract) return "";
+  const contractId = getContractId(currentContract);
+  return getInputValue(contractId);
+};
+export const useChatList = () =>
+  useWeChatStore(state => state.getChatListSorted());
+export const useUnreadTotal = () =>
+  useWeChatStore(state => state.getUnreadTotal());
+
+// 初始化WebSocket消息监听
+if (typeof window !== "undefined") {
+  // 监听WebSocket消息，处理视频下载响应
+  useWebSocketStore.subscribe(state => {
+    const messages = state.messages as any[];
+    const { pendingVideoRequests, handleVideoDownloadResponse } =
+      useWeChatStore.getState();
+
+    // 只有当有待处理的视频请求时才处理消息
+    if (Object.keys(pendingVideoRequests).length === 0) {
+      return;
+    }
+
+    messages.forEach(message => {
+      if (message?.content?.cmdType === "CmdDownloadVideoResult") {
+        console.log("收到视频下载响应:", message.content);
+
+        // 检查是否是我们正在等待的视频响应
+        const messageId = Object.keys(pendingVideoRequests).find(
+          id => pendingVideoRequests[id] === message.content.friendMessageId,
+        );
+
+        if (messageId) {
+          console.log("找到对应的消息ID:", messageId);
+          handleVideoDownloadResponse(messageId, message.content.url);
+        }
+      }
+    });
+  });
+}
diff --git a/Cunkebao/src/store/module/websocket/msgManage.ts b/Cunkebao/src/store/module/websocket/msgManage.ts
index 2883be13..484058af 100644
--- a/Cunkebao/src/store/module/websocket/msgManage.ts
+++ b/Cunkebao/src/store/module/websocket/msgManage.ts
@@ -2,6 +2,7 @@
 import { deepCopy } from "@/utils/common";
 import { WebSocketMessage } from "./websocket";
 import { getkfUserList, asyncKfUserList } from "@/store/module/ckchat/ckchat";
+import { Messages } from "./msg.data";
 // 消息处理器类型定义
 type MessageHandler = (message: WebSocketMessage) => void;
 
@@ -30,7 +31,7 @@ const messageHandlers: Record<string, MessageHandler> = {
     // 在这里添加具体的处理逻辑
   },
   //收到消息
-  CmdNewMessage: message => {
+  CmdNewMessage: (message: Messages) => {
     console.log("收到消息", message.friendMessage);
     // 在这里添加具体的处理逻辑
   },

From 647e2a5f7e8f71377d21ff45d6e22473a1db4acf 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, 3 Sep 2025 14:52:32 +0800
Subject: [PATCH 16/29] =?UTF-8?q?refactor(weChat):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=81=8A=E5=A4=A9=E6=A8=A1=E5=9D=97=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将微信聊天相关状态从组件中提取到独立的zustand store
移除冗余的props传递，使用store管理当前联系人和消息
优化消息加载逻辑，统一处理消息状态
---
 .../components/MessageEnter/index.tsx         |   8 +-
 .../pc/ckbox/components/ChatWindow/index.tsx  |  43 +-
 .../SidebarMenu/MessageList/index.tsx         |  16 +-
 .../SidebarMenu/WechatFriends/index.tsx       |  24 +-
 .../pc/ckbox/components/SidebarMenu/index.tsx |  27 +-
 Cunkebao/src/pages/pc/ckbox/index.tsx         |  71 +--
 Cunkebao/src/store/module/weChat.ts           | 601 ------------------
 .../src/store/module/weChat/weChat.data.ts    |  14 +
 Cunkebao/src/store/module/weChat/weChat.ts    | 106 +++
 9 files changed, 154 insertions(+), 756 deletions(-)
 delete mode 100644 Cunkebao/src/store/module/weChat.ts
 create mode 100644 Cunkebao/src/store/module/weChat/weChat.data.ts
 create mode 100644 Cunkebao/src/store/module/weChat/weChat.ts

diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx
index 0f4650d2..edd49db9 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx
@@ -12,7 +12,7 @@ import {
   EnvironmentOutlined,
   StarOutlined,
 } from "@ant-design/icons";
-import { ChatRecord, ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
+import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 import { useWebSocketStore } from "@/store/module/websocket/websocket";
 import styles from "./MessageEnter.module.scss";
 
@@ -21,15 +21,11 @@ const { TextArea } = Input;
 
 interface MessageEnterProps {
   contract: ContractData | weChatGroup;
-  onSendMessage: (message: string) => void;
 }
 
 const { sendCommand } = useWebSocketStore.getState();
 
-const MessageEnter: React.FC<MessageEnterProps> = ({
-  contract,
-  onSendMessage,
-}) => {
+const MessageEnter: React.FC<MessageEnterProps> = ({ contract }) => {
   const [inputValue, setInputValue] = useState("");
   const [showMaterialModal, setShowMaterialModal] = useState(false);
 
diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
index 22e96c0f..087029ff 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
@@ -1,14 +1,5 @@
 import React, { useState, useEffect, useRef } from "react";
-import {
-  Layout,
-  Button,
-  Avatar,
-  Space,
-  Dropdown,
-  Menu,
-  message,
-  Tooltip,
-} from "antd";
+import { Layout, Button, Avatar, Space, Dropdown, Menu, Tooltip } from "antd";
 import {
   PhoneOutlined,
   VideoCameraOutlined,
@@ -26,7 +17,6 @@ import {
   EnvironmentOutlined,
 } from "@ant-design/icons";
 import { ChatRecord, ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
-import { getChatMessages } from "@/pages/pc/ckbox/api";
 import styles from "./ChatWindow.module.scss";
 import {
   useWebSocketStore,
@@ -35,51 +25,27 @@ import {
 import { formatWechatTime } from "@/utils/common";
 import Person from "./components/Person";
 import MessageEnter from "./components/MessageEnter";
+import { useWeChatStore } from "@/store/module/weChat/weChat";
 const { Header, Content } = Layout;
 
 interface ChatWindowProps {
   contract: ContractData | weChatGroup;
-  onSendMessage: (message: string) => void;
   showProfile?: boolean;
   onToggleProfile?: () => void;
 }
 
 const ChatWindow: React.FC<ChatWindowProps> = ({
   contract,
-  onSendMessage,
   showProfile = true,
   onToggleProfile,
 }) => {
-  const [, contextHolder] = message.useMessage();
   const [messages, setMessages] = useState<ChatRecord[]>([]);
   const [loading, setLoading] = useState(false);
   const [pendingVideoRequests, setPendingVideoRequests] = useState<
     Record<string, string>
   >({});
   const messagesEndRef = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-    setLoading(true);
-    const params: any = {
-      wechatAccountId: contract.wechatAccountId,
-      From: 1,
-      To: 4704624000000,
-      Count: 5,
-      olderData: true,
-    };
-    if (contract.chatroomId) {
-      params.wechatChatroomId = contract.id;
-    } else {
-      params.wechatFriendId = contract.id;
-    }
-    getChatMessages(params)
-      .then(msg => {
-        setMessages(msg);
-      })
-      .finally(() => {
-        setLoading(false);
-      });
-  }, [contract.id]);
+  const currentMessages = useWeChatStore(state => state.currentMessages);
 
   useEffect(() => {
     // 只有在非视频加载操作时才自动滚动到底部
@@ -709,7 +675,6 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
 
   return (
     <Layout className={styles.chatWindow}>
-      {contextHolder}
       {/* 聊天主体区域 */}
       <Layout className={styles.chatMain}>
         {/* 聊天头部 */}
@@ -775,7 +740,7 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
         </Content>
 
         {/* 消息输入组件 */}
-        <MessageEnter contract={contract} onSendMessage={onSendMessage} />
+        <MessageEnter contract={contract} />
       </Layout>
 
       {/* 右侧个人资料卡片 */}
diff --git a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx
index 877b9c9e..3507fc6d 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx
@@ -2,19 +2,19 @@ import React from "react";
 import { List, Avatar, Badge } from "antd";
 import { UserOutlined, TeamOutlined } from "@ant-design/icons";
 import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
+import { useWeChatStore } from "@/store/module/weChat/weChat";
 import styles from "./MessageList.module.scss";
 import { formatWechatTime } from "@/utils/common";
 interface MessageListProps {
   chatSessions: ContractData[] | weChatGroup[];
-  currentChat: ContractData | weChatGroup;
-  onContactClick: (chat: ContractData | weChatGroup) => void;
 }
 
-const MessageList: React.FC<MessageListProps> = ({
-  chatSessions,
-  currentChat,
-  onContactClick,
-}) => {
+const MessageList: React.FC<MessageListProps> = ({ chatSessions }) => {
+  const { setCurrentContact, currentContract } = useWeChatStore();
+
+  const onContactClick = (session: ContractData | weChatGroup) => {
+    setCurrentContact(session);
+  };
   return (
     <div className={styles.messageList}>
       <List
@@ -23,7 +23,7 @@ const MessageList: React.FC<MessageListProps> = ({
           <List.Item
             key={session.id}
             className={`${styles.messageItem} ${
-              currentChat?.id === session.id ? styles.active : ""
+              currentContract?.id === session.id ? styles.active : ""
             }`}
             onClick={() => onContactClick(session)}
           >
diff --git a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/WechatFriends/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/WechatFriends/index.tsx
index 24ae993f..76f5f981 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/WechatFriends/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/WechatFriends/index.tsx
@@ -7,16 +7,13 @@ import {
   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";
 
 interface WechatFriendsProps {
-  contracts: ContractData[] | weChatGroup[];
-  onContactClick: (contract: ContractData | weChatGroup) => void;
   selectedContactId?: ContractData | weChatGroup;
 }
-
 const ContactListSimple: React.FC<WechatFriendsProps> = ({
-  contracts,
-  onContactClick,
   selectedContactId,
 }) => {
   const [newContractList, setNewContractList] = useState<any[]>([]);
@@ -64,6 +61,11 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
   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);
+    setCurrentContact(contact);
+  };
 
   // 渲染联系人项
   const renderContactItem = (contact: ContractData | weChatGroup) => {
@@ -219,7 +221,7 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
             <div className={styles.noResults}>未找到匹配的联系人</div>
           )}
         </>
-      ) : newContractList && newContractList.length > 0 ? (
+      ) : (
         // 正常模式：显示分组
         <Collapse
           className={styles.groupCollapse}
@@ -227,16 +229,6 @@ const ContactListSimple: React.FC<WechatFriendsProps> = ({
           onChange={keys => setActiveKey(keys as string[])}
           items={getCollapseItems()}
         />
-      ) : (
-        // 备用模式：显示传入的联系人列表
-        <>
-          <div className={styles.header}>全部联系人</div>
-          <List
-            className={styles.list}
-            dataSource={contracts}
-            renderItem={renderContactItem}
-          />
-        </>
       )}
     </div>
   );
diff --git a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/index.tsx
index 4704cf38..d9152f95 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/index.tsx
@@ -6,24 +6,19 @@ import {
   ChromeOutlined,
   MessageOutlined,
 } from "@ant-design/icons";
-import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 import WechatFriends from "./WechatFriends";
 import MessageList from "./MessageList/index";
 import styles from "./SidebarMenu.module.scss";
 import { useCkChatStore } from "@/store/module/ckchat/ckchat";
-
+import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 interface SidebarMenuProps {
-  contracts: ContractData[] | weChatGroup[];
-  currentChat: ContractData | weChatGroup;
-  onContactClick: (contract: ContractData | weChatGroup) => void;
   loading?: boolean;
+  currentContract?: ContractData | weChatGroup;
 }
 
 const SidebarMenu: React.FC<SidebarMenuProps> = ({
-  contracts,
-  currentChat,
-  onContactClick,
   loading = false,
+  currentContract,
 }) => {
   const chatSessions = useCkChatStore(state => state.getChatSessions());
   const searchKeyword = useCkChatStore(state => state.searchKeyword);
@@ -133,21 +128,9 @@ const SidebarMenu: React.FC<SidebarMenuProps> = ({
   const renderContent = () => {
     switch (activeTab) {
       case "chats":
-        return (
-          <MessageList
-            chatSessions={chatSessions}
-            onContactClick={onContactClick}
-            currentChat={currentChat}
-          />
-        );
+        return <MessageList chatSessions={chatSessions} />;
       case "contracts":
-        return (
-          <WechatFriends
-            contracts={contracts as ContractData[]}
-            onContactClick={onContactClick}
-            selectedContactId={currentChat}
-          />
-        );
+        return <WechatFriends />;
       case "groups":
         return (
           <div className={styles.emptyState}>
diff --git a/Cunkebao/src/pages/pc/ckbox/index.tsx b/Cunkebao/src/pages/pc/ckbox/index.tsx
index e02d5739..38c9cf84 100644
--- a/Cunkebao/src/pages/pc/ckbox/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/index.tsx
@@ -10,23 +10,15 @@ import styles from "./index.module.scss";
 import { addChatSession } from "@/store/module/ckchat/ckchat";
 const { Header, Content, Sider } = Layout;
 import { chatInitAPIdata, initSocket } from "./main";
-import { clearUnreadCount, updateConfig } from "@/pages/pc/ckbox/api";
-import {
-  KfUserListData,
-  weChatGroup,
-  ContractData,
-} from "@/pages/pc/ckbox/data";
+import { useWeChatStore } from "@/store/module/weChat/weChat";
+
+import { KfUserListData } from "@/pages/pc/ckbox/data";
 
 const CkboxPage: React.FC = () => {
-  const [messageApi, contextHolder] = message.useMessage();
-  const [contracts, setContacts] = useState<any[]>([]);
-  const [currentChat, setCurrentChat] = useState<ContractData | weChatGroup>(
-    null,
-  );
   // 不要在组件初始化时获取sendCommand，而是在需要时动态获取
   const [loading, setLoading] = useState(false);
   const [showProfile, setShowProfile] = useState(true);
-
+  const currentContract = useWeChatStore(state => state.currentContract);
   useEffect(() => {
     // 方法一：使用 Promise 链式调用处理异步函数
     setLoading(true);
@@ -48,8 +40,6 @@ const CkboxPage: React.FC = () => {
           addChatSession(v);
         });
 
-        setContacts(isChatList);
-
         // 数据加载完成后初始化WebSocket连接
         initSocket();
       })
@@ -61,50 +51,9 @@ const CkboxPage: React.FC = () => {
       });
   }, []);
 
-  //开始开启聊天
-  const handleContactClick = (contract: ContractData | weChatGroup) => {
-    clearUnreadCount([contract.id]).then(() => {
-      contract.unreadCount = 0;
-      addChatSession(contract);
-      setCurrentChat(contract);
-      updateConfig({
-        id: contract.id,
-        config: { chat: true },
-      });
-    });
-  };
-
-  const handleSendMessage = async (message: string) => {
-    if (!currentChat || !message.trim()) return;
-
-    try {
-      // 更新当前聊天会话
-      const updatedSession = {
-        ...currentChat,
-        lastMessage: message,
-        lastTime: dayjs().toISOString(),
-        unreadCount: 0,
-      };
-
-      setCurrentChat(updatedSession);
-
-      messageApi.success("消息发送成功");
-    } catch (error) {
-      messageApi.error("消息发送失败");
-    }
-  };
-
-  // 处理垂直侧边栏用户选择
-  const handleVerticalUserSelect = (userId: string) => {
-    // setActiveVerticalUserId(userId);
-    // 这里可以根据选择的用户类别筛选不同的联系人列表
-    // 例如：根据userId加载不同分类的联系人
-  };
-
   return (
     <PageSkeleton loading={loading}>
       <Layout className={styles.ckboxLayout}>
-        {contextHolder}
         <Header className={styles.header}>触客宝</Header>
         <Layout>
           {/* 垂直侧边栏 */}
@@ -115,17 +64,12 @@ const CkboxPage: React.FC = () => {
 
           {/* 左侧联系人边栏 */}
           <Sider width={280} className={styles.sider}>
-            <SidebarMenu
-              contracts={contracts}
-              currentChat={currentChat}
-              onContactClick={handleContactClick}
-              loading={loading}
-            />
+            <SidebarMenu currentContract={currentContract} loading={loading} />
           </Sider>
 
           {/* 主内容区 */}
           <Content className={styles.mainContent}>
-            {currentChat ? (
+            {currentContract ? (
               <div className={styles.chatContainer}>
                 <div className={styles.chatToolbar}>
                   <Space>
@@ -142,8 +86,7 @@ const CkboxPage: React.FC = () => {
                   </Space>
                 </div>
                 <ChatWindow
-                  contract={currentChat}
-                  onSendMessage={handleSendMessage}
+                  contract={currentContract}
                   showProfile={showProfile}
                   onToggleProfile={() => setShowProfile(!showProfile)}
                 />
diff --git a/Cunkebao/src/store/module/weChat.ts b/Cunkebao/src/store/module/weChat.ts
deleted file mode 100644
index e1cf17a4..00000000
--- a/Cunkebao/src/store/module/weChat.ts
+++ /dev/null
@@ -1,601 +0,0 @@
-import { create } from "zustand";
-import { createPersistStore } from "../createPersistStore";
-import { getChatMessages } from "@/pages/pc/ckbox/api";
-import { ChatRecord, ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
-import { useWebSocketStore } from "./websocket/websocket";
-
-// 聊天列表项类型定义
-export interface ChatListItem {
-  id: string;
-  name: string;
-  avatar?: string;
-  type: "friend" | "group";
-  lastMessage?: ChatRecord;
-  unreadCount: number;
-  isOnline?: boolean;
-  lastActiveTime: number; // 最后活跃时间，用于排序
-  contractData: ContractData | weChatGroup; // 保存完整的联系人数据
-}
-
-// 微信聊天相关的类型定义
-export interface WeChatState {
-  // 当前选中的联系人/群组
-  currentContract: ContractData | weChatGroup | null;
-
-  // 当前聊天用户的消息列表（只存储当前聊天用户的消息）
-  currentMessages: ChatRecord[];
-
-  // 联系人列表（所有好友和群组）
-  contacts: (ContractData | weChatGroup)[];
-
-  // 聊天列表（有聊天记录的联系人/群组，按最后活跃时间排序）
-  chatList: ChatListItem[];
-
-  // 消息发送状态
-  sendingStatus: Record<string, boolean>; // key为消息临时ID，value为发送状态
-
-  // 消息加载状态
-  loadingMessages: boolean;
-
-  // 待处理的视频请求
-  pendingVideoRequests: Record<string, string>; // messageId -> requestId
-
-  // 输入框内容状态 - 按联系人/群组ID分组存储
-  inputValues: Record<string, string>;
-
-  // 素材模态框状态
-  showMaterialModal: boolean;
-  selectedMaterialType: string;
-}
-
-export interface WeChatActions {
-  // 设置当前选中的联系人/群组
-  setCurrentContract: (contract: ContractData | weChatGroup | null) => void;
-
-  // 获取聊天消息
-  fetchChatMessages: (contract: ContractData | weChatGroup) => Promise<void>;
-
-  // 设置当前消息列表
-  setCurrentMessages: (messages: ChatRecord[]) => void;
-
-  // 添加消息到当前聊天
-  addMessageToCurrentChat: (message: ChatRecord) => void;
-
-  // 更新消息内容（用于视频加载状态更新等）
-  updateMessage: (messageId: number, updates: Partial<ChatRecord>) => void;
-
-  // 发送消息
-  sendMessage: (
-    contract: ContractData | weChatGroup,
-    content: string,
-    msgType?: number,
-  ) => Promise<void>;
-
-  // 处理视频播放请求
-  handleVideoPlayRequest: (
-    tencentUrl: string,
-    messageId: number,
-    contract: ContractData | weChatGroup,
-  ) => void;
-
-  // 设置待处理的视频请求
-  setPendingVideoRequest: (messageId: string, requestId: string) => void;
-
-  // 移除待处理的视频请求
-  removePendingVideoRequest: (messageId: string) => void;
-
-  // 处理视频下载响应
-  handleVideoDownloadResponse: (messageId: string, videoUrl: string) => void;
-
-  // 设置输入框内容
-  setInputValue: (contractId: string, value: string) => void;
-
-  // 获取输入框内容
-  getInputValue: (contractId: string) => string;
-
-  // 清空输入框内容
-  clearInputValue: (contractId: string) => void;
-
-  // 素材模态框相关操作
-  setShowMaterialModal: (show: boolean) => void;
-  setSelectedMaterialType: (type: string) => void;
-
-  // 新消息处理
-  handleNewMessage: (
-    message: ChatRecord,
-    fromContract: ContractData | weChatGroup,
-  ) => void;
-
-  // 聊天列表管理
-  setContacts: (contacts: (ContractData | weChatGroup)[]) => void;
-  setChatList: (chatList: ChatListItem[]) => void;
-  updateChatListItem: (
-    contractId: string,
-    updates: Partial<ChatListItem>,
-  ) => void;
-  moveToTopOfChatList: (contractId: string) => void;
-  addToChatList: (contract: ContractData | weChatGroup) => void;
-
-  // 未读消息管理
-  incrementUnreadCount: (contractId: string) => void;
-  clearUnreadCount: (contractId: string) => void;
-
-  // 便捷选择器
-  getUnreadTotal: () => number;
-  getChatListSorted: () => ChatListItem[];
-
-  // 清理指定联系人的数据
-  clearContractData: (contractId: string) => void;
-
-  // 清理所有数据
-  clearAllData: () => void;
-}
-
-type WeChatStore = WeChatState & WeChatActions;
-
-// 生成联系人/群组的唯一ID
-const getContractId = (contract: ContractData | weChatGroup): string => {
-  if ("chatroomId" in contract && contract.chatroomId) {
-    return `group_${contract.chatroomId}`;
-  }
-  return `friend_${contract.id}`;
-};
-
-export const useWeChatStore = create<WeChatStore>()(
-  createPersistStore(
-    (set, get) => ({
-      // 初始状态
-      currentContract: null,
-      currentMessages: [],
-      contacts: [],
-      chatList: [],
-      sendingStatus: {},
-      loadingMessages: false,
-      pendingVideoRequests: {},
-      inputValues: {},
-      showMaterialModal: false,
-      selectedMaterialType: "",
-
-      // Actions
-      setCurrentContract: contract => {
-        set({ currentContract: contract });
-        // 切换联系人时清空当前消息，等待重新加载
-        set({ currentMessages: [] });
-        // 清除该联系人的未读数
-        if (contract) {
-          const contractId = getContractId(contract);
-          get().clearUnreadCount(contractId);
-        }
-      },
-
-      fetchChatMessages: async contract => {
-        const { currentMessages } = get();
-
-        // 如果已经有消息数据，不重复加载
-        if (currentMessages.length > 0) {
-          return;
-        }
-
-        set({ loadingMessages: true });
-
-        try {
-          const params: any = {
-            wechatAccountId: contract.wechatAccountId,
-            From: 1,
-            To: 4704624000000,
-            Count: 10,
-            olderData: true,
-          };
-
-          if ("chatroomId" in contract && contract.chatroomId) {
-            params.wechatChatroomId = contract.chatroomId;
-          } else {
-            params.wechatFriendId = contract.id;
-          }
-
-          const messages = await getChatMessages(params);
-
-          set({ currentMessages: messages });
-        } catch (error) {
-          console.error("获取聊天消息失败:", error);
-        } finally {
-          set({ loadingMessages: false });
-        }
-      },
-
-      setCurrentMessages: messages => {
-        set({ currentMessages: messages });
-      },
-
-      addMessageToCurrentChat: message => {
-        set(state => ({
-          currentMessages: [...state.currentMessages, message],
-        }));
-      },
-
-      updateMessage: (messageId, updates) => {
-        set(state => ({
-          currentMessages: state.currentMessages.map(msg =>
-            msg.id === messageId ? { ...msg, ...updates } : msg,
-          ),
-        }));
-      },
-
-      sendMessage: async (contract, content, msgType = 1) => {
-        const contractId = getContractId(contract);
-        const tempId = `temp_${Date.now()}`;
-
-        // 设置发送状态
-        set(state => ({
-          sendingStatus: {
-            ...state.sendingStatus,
-            [tempId]: true,
-          },
-        }));
-
-        try {
-          const params = {
-            wechatAccountId: contract.wechatAccountId,
-            wechatChatroomId:
-              "chatroomId" in contract && contract.chatroomId
-                ? contract.chatroomId
-                : 0,
-            wechatFriendId:
-              "chatroomId" in contract && contract.chatroomId ? 0 : contract.id,
-            msgSubType: 0,
-            msgType,
-            content,
-          };
-
-          // 通过WebSocket发送消息
-          const { sendCommand } = useWebSocketStore.getState();
-          await sendCommand("CmdSendMessage", params);
-
-          // 清空对应的输入框内容
-          get().clearInputValue(contractId);
-        } catch (error) {
-          console.error("发送消息失败:", error);
-        } finally {
-          // 移除发送状态
-          set(state => {
-            const newSendingStatus = { ...state.sendingStatus };
-            delete newSendingStatus[tempId];
-            return { sendingStatus: newSendingStatus };
-          });
-        }
-      },
-
-      handleVideoPlayRequest: (tencentUrl, messageId, contract) => {
-        const requestSeq = `${Date.now()}`;
-
-        console.log("发送视频下载请求:", { messageId, requestSeq });
-
-        // 构建socket请求数据
-        const { sendCommand } = useWebSocketStore.getState();
-        sendCommand("CmdDownloadVideo", {
-          chatroomMessageId:
-            "chatroomId" in contract && contract.chatroomId ? messageId : 0,
-          friendMessageId:
-            "chatroomId" in contract && contract.chatroomId ? 0 : messageId,
-          seq: requestSeq,
-          tencentUrl: tencentUrl,
-          wechatAccountId: contract.wechatAccountId,
-        });
-
-        // 添加到待处理队列
-        get().setPendingVideoRequest(
-          messageId.toString(),
-          messageId.toString(),
-        );
-
-        // 更新消息状态为加载中
-        const messages = get().currentMessages;
-        const targetMessage = messages.find(msg => msg.id === messageId);
-        if (targetMessage) {
-          try {
-            const originalContent =
-              typeof targetMessage.content === "string"
-                ? JSON.parse(targetMessage.content)
-                : targetMessage.content;
-
-            get().updateMessage(messageId, {
-              content: JSON.stringify({
-                ...originalContent,
-                isLoading: true,
-              }),
-            });
-          } catch (e) {
-            console.error("解析消息内容失败:", e);
-          }
-        }
-      },
-
-      setPendingVideoRequest: (messageId, requestId) => {
-        set(state => ({
-          pendingVideoRequests: {
-            ...state.pendingVideoRequests,
-            [messageId]: requestId,
-          },
-        }));
-      },
-
-      removePendingVideoRequest: messageId => {
-        set(state => {
-          const newRequests = { ...state.pendingVideoRequests };
-          delete newRequests[messageId];
-          return { pendingVideoRequests: newRequests };
-        });
-      },
-
-      handleVideoDownloadResponse: (messageId, videoUrl) => {
-        const { currentMessages } = get();
-        const targetMessage = currentMessages.find(
-          msg => msg.id === Number(messageId),
-        );
-
-        if (targetMessage) {
-          try {
-            const msgContent =
-              typeof targetMessage.content === "string"
-                ? JSON.parse(targetMessage.content)
-                : targetMessage.content;
-
-            // 更新消息内容，添加视频URL并移除加载状态
-            get().updateMessage(Number(messageId), {
-              content: JSON.stringify({
-                ...msgContent,
-                videoUrl: videoUrl,
-                isLoading: false,
-              }),
-            });
-
-            // 从待处理队列中移除
-            get().removePendingVideoRequest(messageId);
-          } catch (e) {
-            console.error("解析消息内容失败:", e);
-          }
-        }
-      },
-
-      setInputValue: (contractId, value) => {
-        set(state => ({
-          inputValues: {
-            ...state.inputValues,
-            [contractId]: value,
-          },
-        }));
-      },
-
-      getInputValue: contractId => {
-        return get().inputValues[contractId] || "";
-      },
-
-      clearInputValue: contractId => {
-        set(state => {
-          const newInputValues = { ...state.inputValues };
-          delete newInputValues[contractId];
-          return { inputValues: newInputValues };
-        });
-      },
-
-      setShowMaterialModal: show => {
-        set({ showMaterialModal: show });
-      },
-
-      setSelectedMaterialType: type => {
-        set({ selectedMaterialType: type });
-      },
-
-      // 新消息处理
-      handleNewMessage: (message, fromContract) => {
-        const { currentContract } = get();
-        const contractId = getContractId(fromContract);
-
-        // 如果是当前聊天用户的消息，直接添加到当前消息列表
-        if (currentContract && getContractId(currentContract) === contractId) {
-          get().addMessageToCurrentChat(message);
-        } else {
-          // 如果不是当前聊天用户，更新聊天列表
-          get().incrementUnreadCount(contractId);
-          get().moveToTopOfChatList(contractId);
-
-          // 更新聊天列表项的最后消息
-          get().updateChatListItem(contractId, {
-            lastMessage: message,
-            lastActiveTime: message.createTime || Date.now(),
-          });
-        }
-      },
-
-      // 聊天列表管理
-      setContacts: contacts => {
-        set({ contacts });
-      },
-
-      setChatList: chatList => {
-        set({ chatList });
-      },
-
-      updateChatListItem: (contractId, updates) => {
-        set(state => ({
-          chatList: state.chatList.map(item =>
-            getContractId(item.contractData) === contractId
-              ? { ...item, ...updates }
-              : item,
-          ),
-        }));
-      },
-
-      moveToTopOfChatList: contractId => {
-        set(state => {
-          const chatList = [...state.chatList];
-          const itemIndex = chatList.findIndex(
-            item => getContractId(item.contractData) === contractId,
-          );
-
-          if (itemIndex > 0) {
-            // 移动到顶部
-            const item = chatList.splice(itemIndex, 1)[0];
-            chatList.unshift({ ...item, lastActiveTime: Date.now() });
-          } else if (itemIndex === -1) {
-            // 如果不在聊天列表中，从联系人列表找到并添加
-            const contract = state.contacts.find(
-              c => getContractId(c) === contractId,
-            );
-            if (contract) {
-              get().addToChatList(contract);
-            }
-          }
-
-          return { chatList };
-        });
-      },
-
-      addToChatList: contract => {
-        set(state => {
-          const contractId = getContractId(contract);
-          // 检查是否已存在
-          const exists = state.chatList.some(
-            item => getContractId(item.contractData) === contractId,
-          );
-          if (exists) return state;
-
-          const newChatItem: ChatListItem = {
-            id: contractId,
-            name: contract.nickName || contract.name || "",
-            avatar: contract.avatar,
-            type: "chatroomId" in contract ? "group" : "friend",
-            unreadCount: 0,
-            lastActiveTime: Date.now(),
-            contractData: contract,
-          };
-
-          return {
-            chatList: [newChatItem, ...state.chatList],
-          };
-        });
-      },
-
-      // 未读消息管理
-      incrementUnreadCount: contractId => {
-        // 更新聊天列表中的未读数
-        set(state => ({
-          chatList: state.chatList.map(item =>
-            getContractId(item.contractData) === contractId
-              ? { ...item, unreadCount: item.unreadCount + 1 }
-              : item,
-          ),
-        }));
-      },
-
-      clearUnreadCount: contractId => {
-        // 清除聊天列表中的未读数
-        set(state => ({
-          chatList: state.chatList.map(item =>
-            getContractId(item.contractData) === contractId
-              ? { ...item, unreadCount: 0 }
-              : item,
-          ),
-        }));
-      },
-
-      // 便捷选择器
-      getUnreadTotal: () => {
-        const { chatList } = get();
-        return chatList.reduce((total, item) => total + item.unreadCount, 0);
-      },
-
-      getChatListSorted: () => {
-        const { chatList } = get();
-        return [...chatList].sort(
-          (a, b) => b.lastActiveTime - a.lastActiveTime,
-        );
-      },
-
-      clearContractData: contractId => {
-        set(state => {
-          const newInputValues = { ...state.inputValues };
-          delete newInputValues[contractId];
-
-          return {
-            inputValues: newInputValues,
-            chatList: state.chatList.filter(
-              item => getContractId(item.contractData) !== contractId,
-            ),
-          };
-        });
-      },
-
-      clearAllData: () => {
-        set({
-          currentContract: null,
-          currentMessages: [],
-          contacts: [],
-          chatList: [],
-          sendingStatus: {},
-          loadingMessages: false,
-          pendingVideoRequests: {},
-          inputValues: {},
-          showMaterialModal: false,
-          selectedMaterialType: "",
-        });
-      },
-    }),
-    {
-      name: "wechat-store",
-      // 只持久化部分状态，排除临时状态
-      partialize: state => ({
-        contacts: state.contacts,
-        chatList: state.chatList,
-        inputValues: state.inputValues,
-      }),
-    },
-  ),
-);
-
-// 导出便捷的选择器函数
-export const useCurrentContract = () =>
-  useWeChatStore(state => state.currentContract);
-export const useCurrentMessages = () =>
-  useWeChatStore(state => state.currentMessages);
-export const useCurrentInputValue = () => {
-  const { currentContract, getInputValue } = useWeChatStore();
-  if (!currentContract) return "";
-  const contractId = getContractId(currentContract);
-  return getInputValue(contractId);
-};
-export const useChatList = () =>
-  useWeChatStore(state => state.getChatListSorted());
-export const useUnreadTotal = () =>
-  useWeChatStore(state => state.getUnreadTotal());
-
-// 初始化WebSocket消息监听
-if (typeof window !== "undefined") {
-  // 监听WebSocket消息，处理视频下载响应
-  useWebSocketStore.subscribe(state => {
-    const messages = state.messages as any[];
-    const { pendingVideoRequests, handleVideoDownloadResponse } =
-      useWeChatStore.getState();
-
-    // 只有当有待处理的视频请求时才处理消息
-    if (Object.keys(pendingVideoRequests).length === 0) {
-      return;
-    }
-
-    messages.forEach(message => {
-      if (message?.content?.cmdType === "CmdDownloadVideoResult") {
-        console.log("收到视频下载响应:", message.content);
-
-        // 检查是否是我们正在等待的视频响应
-        const messageId = Object.keys(pendingVideoRequests).find(
-          id => pendingVideoRequests[id] === message.content.friendMessageId,
-        );
-
-        if (messageId) {
-          console.log("找到对应的消息ID:", messageId);
-          handleVideoDownloadResponse(messageId, message.content.url);
-        }
-      }
-    });
-  });
-}
diff --git a/Cunkebao/src/store/module/weChat/weChat.data.ts b/Cunkebao/src/store/module/weChat/weChat.data.ts
new file mode 100644
index 00000000..3bd851eb
--- /dev/null
+++ b/Cunkebao/src/store/module/weChat/weChat.data.ts
@@ -0,0 +1,14 @@
+import { ChatRecord, ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
+// 微信聊天相关的类型定义
+export interface WeChatState {
+  // 当前选中的联系人/群组
+  currentContract: ContractData | weChatGroup | null;
+
+  // 当前聊天用户的消息列表（只存储当前聊天用户的消息）
+  currentMessages: ChatRecord[];
+
+  setCurrentContact: (contract: ContractData | weChatGroup) => void;
+  // 消息加载状态
+  messagesLoading: boolean;
+  loadChatMessages: (contact: ContractData | weChatGroup) => Promise<void>;
+}
diff --git a/Cunkebao/src/store/module/weChat/weChat.ts b/Cunkebao/src/store/module/weChat/weChat.ts
new file mode 100644
index 00000000..66ee7818
--- /dev/null
+++ b/Cunkebao/src/store/module/weChat/weChat.ts
@@ -0,0 +1,106 @@
+import { create } from "zustand";
+import { persist } from "zustand/middleware";
+import { getChatMessages } from "@/pages/pc/ckbox/api";
+import { WeChatState } from "./weChat.data";
+import { clearUnreadCount, updateConfig } from "@/pages/pc/ckbox/api";
+import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
+import { addChatSession } from "@/store/module/ckchat/ckchat";
+export const useWeChatStore = create<WeChatState>()(
+  persist(
+    (set, get) => ({
+      // 初始状态
+      currentContract: null,
+      currentMessages: [],
+      messagesLoading: false,
+
+      // Actions
+      setCurrentContact: (contract: ContractData | weChatGroup) => {
+        const state = useWeChatStore.getState();
+        // 切换联系人时清空当前消息，等待重新加载
+        set({ currentMessages: [] });
+        clearUnreadCount([contract.id]).then(() => {
+          contract.unreadCount = 0;
+          addChatSession(contract);
+          set({ currentContract: contract });
+          updateConfig({
+            id: contract.id,
+            config: { chat: true },
+          });
+          state.loadChatMessages(contract);
+        });
+      },
+
+      loadChatMessages: async contact => {
+        set({ messagesLoading: true });
+
+        try {
+          const params: any = {
+            wechatAccountId: contact.wechatAccountId,
+            From: 1,
+            To: 4704624000000,
+            Count: 10,
+            olderData: true,
+          };
+
+          if ("chatroomId" in contact && contact.chatroomId) {
+            params.wechatChatroomId = contact.chatroomId;
+          } else {
+            params.wechatFriendId = contact.id;
+          }
+
+          const messages = await getChatMessages(params);
+          set({ currentMessages: messages });
+        } catch (error) {
+          console.error("获取聊天消息失败:", error);
+        } finally {
+          set({ messagesLoading: false });
+        }
+      },
+
+      setMessageLoading: loading => {
+        set({ messagesLoading: loading });
+      },
+
+      addMessage: message => {
+        set(state => ({
+          currentMessages: [...state.currentMessages, message],
+        }));
+      },
+
+      updateMessage: (messageId, updates) => {
+        set(state => ({
+          currentMessages: state.currentMessages.map(msg =>
+            msg.id === messageId ? { ...msg, ...updates } : msg,
+          ),
+        }));
+      },
+
+      // 便捷选择器
+      getCurrentContact: () => get().currentContract,
+      getCurrentMessages: () => get().currentMessages,
+      getMessagesLoading: () => get().messagesLoading,
+
+      clearAllData: () => {
+        set({
+          currentContract: null,
+          currentMessages: [],
+          messagesLoading: false,
+        });
+      },
+    }),
+    {
+      name: "wechat-storage",
+      partialize: state => ({
+        currentContract: state.currentContract,
+      }),
+    },
+  ),
+);
+
+// 导出便捷的选择器函数
+export const useCurrentContact = () =>
+  useWeChatStore(state => state.currentContract);
+export const useCurrentMessages = () =>
+  useWeChatStore(state => state.currentMessages);
+export const useMessagesLoading = () =>
+  useWeChatStore(state => state.messagesLoading);

From 8b1387a8ed2d7a8424e89959b71b9cf005570f1e 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, 3 Sep 2025 15:08:29 +0800
Subject: [PATCH 17/29] =?UTF-8?q?feat(weChat):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=AF=B7=E6=B1=82=E5=A4=84=E7=90=86=E5=92=8C?=
 =?UTF-8?q?WebSocket=E7=9B=91=E5=90=AC=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在weChat store中新增pendingVideoRequests状态和相关操作方法
- 实现WebSocket监听处理视频下载响应
- 重构ChatWindow组件，将视频处理逻辑移至store
- 优化消息分组和渲染逻辑
---
 .../pc/ckbox/components/ChatWindow/index.tsx  | 149 +++---------------
 .../src/store/module/weChat/weChat.data.ts    |  16 +-
 Cunkebao/src/store/module/weChat/weChat.ts    | 117 +++++++++++++-
 3 files changed, 155 insertions(+), 127 deletions(-)

diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
index 087029ff..c4473c64 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from "react";
+import React, { useEffect, useRef } from "react";
 import { Layout, Button, Avatar, Space, Dropdown, Menu, Tooltip } from "antd";
 import {
   PhoneOutlined,
@@ -18,10 +18,7 @@ import {
 } from "@ant-design/icons";
 import { ChatRecord, ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 import styles from "./ChatWindow.module.scss";
-import {
-  useWebSocketStore,
-  WebSocketMessage,
-} from "@/store/module/websocket/websocket";
+import { useWebSocketStore } from "@/store/module/websocket/websocket";
 import { formatWechatTime } from "@/utils/common";
 import Person from "./components/Person";
 import MessageEnter from "./components/MessageEnter";
@@ -39,18 +36,13 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
   showProfile = true,
   onToggleProfile,
 }) => {
-  const [messages, setMessages] = useState<ChatRecord[]>([]);
-  const [loading, setLoading] = useState(false);
-  const [pendingVideoRequests, setPendingVideoRequests] = useState<
-    Record<string, string>
-  >({});
   const messagesEndRef = useRef<HTMLDivElement>(null);
   const currentMessages = useWeChatStore(state => state.currentMessages);
 
   useEffect(() => {
     // 只有在非视频加载操作时才自动滚动到底部
     // 检查是否有视频正在加载中
-    const hasLoadingVideo = messages.some(msg => {
+    const hasLoadingVideo = currentMessages.some(msg => {
       try {
         const content =
           typeof msg.content === "string"
@@ -65,78 +57,13 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
     if (!hasLoadingVideo) {
       scrollToBottom();
     }
-  }, [messages]);
+  }, [currentMessages]);
 
-  // 添加 WebSocket 消息订阅 - 监听视频下载响应消息
+  // 初始化WebSocket监听
   useEffect(() => {
-    // 只有当有待处理的视频请求时才订阅WebSocket消息
-    if (Object.keys(pendingVideoRequests).length === 0) {
-      return;
-    }
-
-    console.log("开始监听视频下载响应，当前待处理请求:", pendingVideoRequests);
-
-    // 订阅 WebSocket 消息变化
-    const unsubscribe = useWebSocketStore.subscribe(state => {
-      // 只处理新增的消息
-      const messages = state.messages as WebSocketMessage[];
-
-      // 筛选出视频下载响应消息
-      messages.forEach(message => {
-        if (message?.content?.cmdType === "CmdDownloadVideoResult") {
-          console.log("收到视频下载响应:", message.content);
-
-          // 检查是否是我们正在等待的视频响应
-          const messageId = Object.keys(pendingVideoRequests).find(
-            id => pendingVideoRequests[id] === message.content.friendMessageId,
-          );
-
-          if (messageId) {
-            console.log("找到对应的消息ID:", messageId);
-
-            // 从待处理队列中移除
-            setPendingVideoRequests(prev => {
-              const newRequests = { ...prev };
-              delete newRequests[messageId];
-              return newRequests;
-            });
-
-            // 更新消息内容，将视频URL添加到对应的消息中
-            setMessages(prevMessages => {
-              return prevMessages.map(msg => {
-                if (msg.id === Number(messageId)) {
-                  try {
-                    const msgContent =
-                      typeof msg.content === "string"
-                        ? JSON.parse(msg.content)
-                        : msg.content;
-
-                    // 更新消息内容，添加视频URL并移除加载状态
-                    return {
-                      ...msg,
-                      content: JSON.stringify({
-                        ...msgContent,
-                        videoUrl: message.content.url,
-                        isLoading: false,
-                      }),
-                    };
-                  } catch (e) {
-                    console.error("解析消息内容失败:", e);
-                  }
-                }
-                return msg;
-              });
-            });
-          }
-        }
-      });
-    });
-
-    // 组件卸载时取消订阅
-    return () => {
-      unsubscribe();
-    };
-  }, [pendingVideoRequests]); // 依赖于pendingVideoRequests，当队列变化时重新设置订阅
+    const unsubscribe = useWeChatStore.getState().initWebSocketListener();
+    return unsubscribe;
+  }, []);
 
   const scrollToBottom = () => {
     messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
@@ -157,29 +84,13 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
       wechatAccountId: contract.wechatAccountId,
     });
 
-    // 将消息ID和请求序列号添加到待处理队列
-    setPendingVideoRequests(prev => ({
-      ...prev,
-      [messageId]: messageId,
-    }));
+    // 将消息ID添加到待处理队列
+    useWeChatStore
+      .getState()
+      .addPendingVideoRequest(messageId.toString(), messageId.toString());
 
     // 更新消息状态为加载中
-    setMessages(prevMessages => {
-      return prevMessages.map(msg => {
-        if (msg.id === messageId) {
-          // 保存原始内容，添加loading状态
-          const originalContent = msg.content;
-          return {
-            ...msg,
-            content: JSON.stringify({
-              ...JSON.parse(originalContent),
-              isLoading: true,
-            }),
-          };
-        }
-        return msg;
-      });
-    });
+    useWeChatStore.getState().setMessageLoading(messageId.toString(), true);
   };
 
   // 解析消息内容，判断消息类型并返回对应的渲染内容
@@ -613,14 +524,10 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
 
   // 用于分组消息并添加时间戳的辅助函数
   const groupMessagesByTime = (messages: ChatRecord[]) => {
-    const groups: { time: string; messages: ChatRecord[] }[] = [];
-    messages.forEach(msg => {
-      // 使用 formatWechatTime 函数格式化时间戳
-      const formattedTime = formatWechatTime(msg.wechatTime);
-      groups.push({ time: formattedTime, messages: [msg] });
-    });
-
-    return groups;
+    return messages.map(msg => ({
+      time: formatWechatTime(msg.wechatTime),
+      messages: [msg],
+    }));
   };
 
   const renderMessage = (msg: ChatRecord) => {
@@ -721,21 +628,13 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
         {/* 聊天内容 */}
         <Content className={styles.chatContent}>
           <div className={styles.messagesContainer}>
-            {loading ? (
-              <div className={styles.loadingContainer}>
-                <div>加载中...</div>
-              </div>
-            ) : (
-              <>
-                {groupMessagesByTime(messages).map((group, groupIndex) => (
-                  <React.Fragment key={`group-${groupIndex}`}>
-                    <div className={styles.messageTime}>{group.time}</div>
-                    {group.messages.map(renderMessage)}
-                  </React.Fragment>
-                ))}
-                <div ref={messagesEndRef} />
-              </>
-            )}
+            {groupMessagesByTime(currentMessages).map((group, groupIndex) => (
+              <React.Fragment key={`group-${groupIndex}`}>
+                <div className={styles.messageTime}>{group.time}</div>
+                {group.messages.map(renderMessage)}
+              </React.Fragment>
+            ))}
+            <div ref={messagesEndRef} />
           </div>
         </Content>
 
diff --git a/Cunkebao/src/store/module/weChat/weChat.data.ts b/Cunkebao/src/store/module/weChat/weChat.data.ts
index 3bd851eb..955ce031 100644
--- a/Cunkebao/src/store/module/weChat/weChat.data.ts
+++ b/Cunkebao/src/store/module/weChat/weChat.data.ts
@@ -7,8 +7,22 @@ export interface WeChatState {
   // 当前聊天用户的消息列表（只存储当前聊天用户的消息）
   currentMessages: ChatRecord[];
 
-  setCurrentContact: (contract: ContractData | weChatGroup) => void;
   // 消息加载状态
   messagesLoading: boolean;
+
+  // 待处理的视频请求队列
+  pendingVideoRequests: Record<string, string>;
+
+  // Actions
+  setCurrentContact: (contract: ContractData | weChatGroup) => void;
   loadChatMessages: (contact: ContractData | weChatGroup) => Promise<void>;
+
+  // 视频请求相关方法
+  addPendingVideoRequest: (messageId: string, requestId: string) => void;
+  removePendingVideoRequest: (messageId: string) => void;
+  updateMessageWithVideo: (messageId: string, videoUrl: string) => void;
+  setMessageLoading: (messageId: string, isLoading: boolean) => void;
+
+  // WebSocket监听初始化
+  initWebSocketListener: () => void;
 }
diff --git a/Cunkebao/src/store/module/weChat/weChat.ts b/Cunkebao/src/store/module/weChat/weChat.ts
index 66ee7818..633969b8 100644
--- a/Cunkebao/src/store/module/weChat/weChat.ts
+++ b/Cunkebao/src/store/module/weChat/weChat.ts
@@ -5,6 +5,10 @@ import { WeChatState } from "./weChat.data";
 import { clearUnreadCount, updateConfig } from "@/pages/pc/ckbox/api";
 import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 import { addChatSession } from "@/store/module/ckchat/ckchat";
+import {
+  useWebSocketStore,
+  WebSocketMessage,
+} from "@/store/module/websocket/websocket";
 export const useWeChatStore = create<WeChatState>()(
   persist(
     (set, get) => ({
@@ -12,6 +16,7 @@ export const useWeChatStore = create<WeChatState>()(
       currentContract: null,
       currentMessages: [],
       messagesLoading: false,
+      pendingVideoRequests: {},
 
       // Actions
       setCurrentContact: (contract: ContractData | weChatGroup) => {
@@ -58,7 +63,7 @@ export const useWeChatStore = create<WeChatState>()(
       },
 
       setMessageLoading: loading => {
-        set({ messagesLoading: loading });
+        set({ messagesLoading: Boolean(loading) });
       },
 
       addMessage: message => {
@@ -80,11 +85,121 @@ export const useWeChatStore = create<WeChatState>()(
       getCurrentMessages: () => get().currentMessages,
       getMessagesLoading: () => get().messagesLoading,
 
+      // 视频请求相关方法
+      addPendingVideoRequest: (messageId: string, requestId: string) => {
+        set(state => ({
+          pendingVideoRequests: {
+            ...state.pendingVideoRequests,
+            [messageId]: requestId,
+          },
+        }));
+      },
+
+      removePendingVideoRequest: (messageId: string) => {
+        set(state => {
+          const newRequests = { ...state.pendingVideoRequests };
+          delete newRequests[messageId];
+          return { pendingVideoRequests: newRequests };
+        });
+      },
+
+      updateMessageWithVideo: (messageId: string, videoUrl: string) => {
+        set(state => ({
+          currentMessages: state.currentMessages.map(msg => {
+            if (msg.id === Number(messageId)) {
+              try {
+                const msgContent =
+                  typeof msg.content === "string"
+                    ? JSON.parse(msg.content)
+                    : msg.content;
+                return {
+                  ...msg,
+                  content: JSON.stringify({
+                    ...msgContent,
+                    videoUrl: videoUrl,
+                    isLoading: false,
+                  }),
+                };
+              } catch (e) {
+                console.error("解析消息内容失败:", e);
+              }
+            }
+            return msg;
+          }),
+        }));
+      },
+
+      setMessageLoadingStatus: (messageId: string, isLoading: boolean) => {
+        set(state => ({
+          currentMessages: state.currentMessages.map(msg => {
+            if (msg.id === Number(messageId)) {
+              try {
+                const originalContent = msg.content;
+                return {
+                  ...msg,
+                  content: JSON.stringify({
+                    ...JSON.parse(originalContent),
+                    isLoading: isLoading,
+                  }),
+                };
+              } catch (e) {
+                console.error("解析消息内容失败:", e);
+              }
+            }
+            return msg;
+          }),
+        }));
+      },
+
+      // WebSocket监听初始化
+      initWebSocketListener: () => {
+        const unsubscribe = useWebSocketStore.subscribe(state => {
+          const messages = state.messages as WebSocketMessage[];
+          const currentState = get();
+
+          // 只有当有待处理的视频请求时才处理
+          if (Object.keys(currentState.pendingVideoRequests).length === 0) {
+            return;
+          }
+
+          messages.forEach(message => {
+            if (message?.content?.cmdType === "CmdDownloadVideoResult") {
+              console.log("收到视频下载响应:", message.content);
+
+              // 检查是否是我们正在等待的视频响应
+              const messageId = Object.keys(
+                currentState.pendingVideoRequests,
+              ).find(
+                id =>
+                  currentState.pendingVideoRequests[id] ===
+                  message.content.friendMessageId,
+              );
+
+              if (messageId) {
+                console.log("找到对应的消息ID:", messageId);
+
+                // 从待处理队列中移除
+                currentState.removePendingVideoRequest(messageId);
+
+                // 更新消息内容，添加视频URL
+                currentState.updateMessageWithVideo(
+                  messageId,
+                  message.content.url,
+                );
+              }
+            }
+          });
+        });
+
+        return unsubscribe;
+      },
+
       clearAllData: () => {
         set({
           currentContract: null,
           currentMessages: [],
           messagesLoading: false,
+          pendingVideoRequests: {},
         });
       },
     }),

From ef853d273692757564007c1dcf2dfb1886516a89 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, 3 Sep 2025 16:06:12 +0800
Subject: [PATCH 18/29] =?UTF-8?q?feat(weChat):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=B6=88=E6=81=AF=E5=A4=84=E7=90=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=B9=B6=E4=BC=98=E5=8C=96=E5=8A=A0=E8=BD=BD=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除旧的待处理视频请求队列及相关方法
- 新增setVideoLoading和setVideoUrl方法简化视频状态管理
- 优化ChatWindow组件中的视频加载状态检测和滚动行为
- 添加CmdDownloadVideoResult消息处理器自动更新视频URL
---
 .../pc/ckbox/components/ChatWindow/index.tsx  | 113 +++++++++--------
 .../src/store/module/weChat/weChat.data.ts    |  14 +--
 Cunkebao/src/store/module/weChat/weChat.ts    | 116 +++++-------------
 .../src/store/module/websocket/msgManage.ts   |   6 +
 4 files changed, 96 insertions(+), 153 deletions(-)

diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
index c4473c64..bb9edc97 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
@@ -38,9 +38,37 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
 }) => {
   const messagesEndRef = useRef<HTMLDivElement>(null);
   const currentMessages = useWeChatStore(state => state.currentMessages);
+  const prevMessagesRef = useRef(currentMessages);
 
   useEffect(() => {
-    // 只有在非视频加载操作时才自动滚动到底部
+    const prevMessages = prevMessagesRef.current;
+
+    // 检查是否有视频状态变化（从加载中变为已完成）
+    const hasVideoStateChange = currentMessages.some((msg, index) => {
+      const prevMsg = prevMessages[index];
+      if (!prevMsg) return false;
+
+      try {
+        const currentContent =
+          typeof msg.content === "string"
+            ? JSON.parse(msg.content)
+            : msg.content;
+        const prevContent =
+          typeof prevMsg.content === "string"
+            ? JSON.parse(prevMsg.content)
+            : prevMsg.content;
+
+        // 检查是否从加载中变为已完成（有videoUrl）
+        return (
+          prevContent.isLoading === true &&
+          currentContent.isLoading === false &&
+          currentContent.videoUrl
+        );
+      } catch (e) {
+        return false;
+      }
+    });
+
     // 检查是否有视频正在加载中
     const hasLoadingVideo = currentMessages.some(msg => {
       try {
@@ -54,16 +82,14 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
       }
     });
 
-    if (!hasLoadingVideo) {
+    // 只有在没有视频加载且没有视频状态变化时才自动滚动到底部
+    if (!hasLoadingVideo && !hasVideoStateChange) {
       scrollToBottom();
     }
-  }, [currentMessages]);
 
-  // 初始化WebSocket监听
-  useEffect(() => {
-    const unsubscribe = useWeChatStore.getState().initWebSocketListener();
-    return unsubscribe;
-  }, []);
+    // 更新上一次的消息状态
+    prevMessagesRef.current = currentMessages;
+  }, [currentMessages]);
 
   const scrollToBottom = () => {
     messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
@@ -71,26 +97,19 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
 
   // 处理视频播放请求，发送socket请求获取真实视频地址
   const handleVideoPlayRequest = (tencentUrl: string, messageId: number) => {
-    // 生成请求ID (使用当前时间戳作为唯一标识)
-    const requestSeq = `${+new Date()}`;
-    console.log("发送视频下载请求:", { messageId, requestSeq });
+    console.log("发送视频下载请求:", { messageId, tencentUrl });
+
+    // 先设置加载状态
+    useWeChatStore.getState().setVideoLoading(messageId, true);
 
     // 构建socket请求数据
     useWebSocketStore.getState().sendCommand("CmdDownloadVideo", {
       chatroomMessageId: contract.chatroomId ? messageId : 0,
       friendMessageId: contract.chatroomId ? 0 : messageId,
-      seq: requestSeq, // 使用唯一的请求ID
+      seq: `${+new Date()}`, // 使用时间戳作为请求序列号
       tencentUrl: tencentUrl,
       wechatAccountId: contract.wechatAccountId,
     });
-
-    // 将消息ID添加到待处理队列
-    useWeChatStore
-      .getState()
-      .addPendingVideoRequest(messageId.toString(), messageId.toString());
-
-    // 更新消息状态为加载中
-    useWeChatStore.getState().setMessageLoading(messageId.toString(), true);
   };
 
   // 解析消息内容，判断消息类型并返回对应的渲染内容
@@ -121,21 +140,22 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
         content.trim().endsWith("}")
       ) {
         const videoData = JSON.parse(content);
-        // 处理用户提供的JSON格式 {"previewImage":"https://...", "tencentUrl":"..."}
+        // 处理视频消息格式 {"previewImage":"https://...", "tencentUrl":"...", "videoUrl":"...", "isLoading":true}
         if (videoData.previewImage && videoData.tencentUrl) {
           // 提取预览图URL，去掉可能的引号
           const previewImageUrl = videoData.previewImage.replace(/[`"']/g, "");
 
-          // 创建点击处理函数，调用handleVideoPlayRequest发送socket请求获取真实视频地址
+          // 创建点击处理函数
           const handlePlayClick = (e: React.MouseEvent) => {
             e.stopPropagation();
-            // 调用处理函数，传入tencentUrl和消息ID
-            handleVideoPlayRequest(videoData.tencentUrl, msg.id);
+            // 如果没有视频URL且不在加载中，则发起下载请求
+            if (!videoData.videoUrl && !videoData.isLoading) {
+              handleVideoPlayRequest(videoData.tencentUrl, msg.id);
+            }
           };
 
-          // 检查是否已下载视频URL
+          // 如果已有视频URL，显示视频播放器
           if (videoData.videoUrl) {
-            // 已获取到视频URL，显示视频播放器
             return (
               <div className={styles.videoMessage}>
                 <div className={styles.videoContainer}>
@@ -158,30 +178,7 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
             );
           }
 
-          // 检查是否处于加载状态
-          if (videoData.isLoading) {
-            return (
-              <div className={styles.videoMessage}>
-                <div className={styles.videoContainer}>
-                  <img
-                    src={previewImageUrl}
-                    alt="视频预览"
-                    className={styles.videoThumbnail}
-                    style={{
-                      maxWidth: "100%",
-                      borderRadius: "8px",
-                      opacity: "0.7",
-                    }}
-                  />
-                  <div className={styles.videoPlayIcon}>
-                    <div className={styles.loadingSpinner}></div>
-                  </div>
-                </div>
-              </div>
-            );
-          }
-
-          // 默认显示预览图和播放按钮
+          // 显示预览图，根据加载状态显示不同的图标
           return (
             <div className={styles.videoMessage}>
               <div className={styles.videoContainer} onClick={handlePlayClick}>
@@ -189,12 +186,20 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
                   src={previewImageUrl}
                   alt="视频预览"
                   className={styles.videoThumbnail}
-                  style={{ maxWidth: "100%", borderRadius: "8px" }}
+                  style={{
+                    maxWidth: "100%",
+                    borderRadius: "8px",
+                    opacity: videoData.isLoading ? "0.7" : "1",
+                  }}
                 />
                 <div className={styles.videoPlayIcon}>
-                  <PlayCircleFilled
-                    style={{ fontSize: "48px", color: "#fff" }}
-                  />
+                  {videoData.isLoading ? (
+                    <div className={styles.loadingSpinner}></div>
+                  ) : (
+                    <PlayCircleFilled
+                      style={{ fontSize: "48px", color: "#fff" }}
+                    />
+                  )}
                 </div>
               </div>
             </div>
diff --git a/Cunkebao/src/store/module/weChat/weChat.data.ts b/Cunkebao/src/store/module/weChat/weChat.data.ts
index 955ce031..1f938d32 100644
--- a/Cunkebao/src/store/module/weChat/weChat.data.ts
+++ b/Cunkebao/src/store/module/weChat/weChat.data.ts
@@ -10,19 +10,11 @@ export interface WeChatState {
   // 消息加载状态
   messagesLoading: boolean;
 
-  // 待处理的视频请求队列
-  pendingVideoRequests: Record<string, string>;
-
   // Actions
   setCurrentContact: (contract: ContractData | weChatGroup) => void;
   loadChatMessages: (contact: ContractData | weChatGroup) => Promise<void>;
 
-  // 视频请求相关方法
-  addPendingVideoRequest: (messageId: string, requestId: string) => void;
-  removePendingVideoRequest: (messageId: string) => void;
-  updateMessageWithVideo: (messageId: string, videoUrl: string) => void;
-  setMessageLoading: (messageId: string, isLoading: boolean) => void;
-
-  // WebSocket监听初始化
-  initWebSocketListener: () => void;
+  // 视频消息处理方法
+  setVideoLoading: (messageId: number, isLoading: boolean) => void;
+  setVideoUrl: (messageId: number, videoUrl: string) => void;
 }
diff --git a/Cunkebao/src/store/module/weChat/weChat.ts b/Cunkebao/src/store/module/weChat/weChat.ts
index 633969b8..30d02e14 100644
--- a/Cunkebao/src/store/module/weChat/weChat.ts
+++ b/Cunkebao/src/store/module/weChat/weChat.ts
@@ -5,10 +5,7 @@ import { WeChatState } from "./weChat.data";
 import { clearUnreadCount, updateConfig } from "@/pages/pc/ckbox/api";
 import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 import { addChatSession } from "@/store/module/ckchat/ckchat";
-import {
-  useWebSocketStore,
-  WebSocketMessage,
-} from "@/store/module/websocket/websocket";
+
 export const useWeChatStore = create<WeChatState>()(
   persist(
     (set, get) => ({
@@ -16,7 +13,6 @@ export const useWeChatStore = create<WeChatState>()(
       currentContract: null,
       currentMessages: [],
       messagesLoading: false,
-      pendingVideoRequests: {},
 
       // Actions
       setCurrentContact: (contract: ContractData | weChatGroup) => {
@@ -85,43 +81,22 @@ export const useWeChatStore = create<WeChatState>()(
       getCurrentMessages: () => get().currentMessages,
       getMessagesLoading: () => get().messagesLoading,
 
-      // 视频请求相关方法
-      addPendingVideoRequest: (messageId: string, requestId: string) => {
-        set(state => ({
-          pendingVideoRequests: {
-            ...state.pendingVideoRequests,
-            [messageId]: requestId,
-          },
-        }));
-      },
-
-      removePendingVideoRequest: (messageId: string) => {
-        set(state => {
-          const newRequests = { ...state.pendingVideoRequests };
-          delete newRequests[messageId];
-          return { pendingVideoRequests: newRequests };
-        });
-      },
-
-      updateMessageWithVideo: (messageId: string, videoUrl: string) => {
+      // 视频消息处理方法
+      setVideoLoading: (messageId: number, isLoading: boolean) => {
         set(state => ({
           currentMessages: state.currentMessages.map(msg => {
-            if (msg.id === Number(messageId)) {
+            if (msg.id === messageId) {
               try {
-                const msgContent =
-                  typeof msg.content === "string"
-                    ? JSON.parse(msg.content)
-                    : msg.content;
+                const content = JSON.parse(msg.content);
+                // 更新加载状态
+                const updatedContent = { ...content, isLoading };
                 return {
                   ...msg,
-                  content: JSON.stringify({
-                    ...msgContent,
-                    videoUrl: videoUrl,
-                    isLoading: false,
-                  }),
+                  content: JSON.stringify(updatedContent),
                 };
               } catch (e) {
-                console.error("解析消息内容失败:", e);
+                console.error("更新视频加载状态失败:", e);
+                return msg;
               }
             }
             return msg;
@@ -129,77 +104,42 @@ export const useWeChatStore = create<WeChatState>()(
         }));
       },
 
-      setMessageLoadingStatus: (messageId: string, isLoading: boolean) => {
+      setVideoUrl: (messageId: number, videoUrl: string) => {
         set(state => ({
           currentMessages: state.currentMessages.map(msg => {
-            if (msg.id === Number(messageId)) {
+            if (msg.id === messageId) {
               try {
-                const originalContent = msg.content;
+                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({
-                    ...JSON.parse(originalContent),
-                    isLoading: isLoading,
-                  }),
+                  content: JSON.stringify(updatedContent),
                 };
               } catch (e) {
-                console.error("解析消息内容失败:", e);
+                console.error("更新视频URL失败:", e);
+                return msg;
               }
             }
             return msg;
           }),
         }));
       },
-
-      // WebSocket监听初始化
-      initWebSocketListener: () => {
-        const unsubscribe = useWebSocketStore.subscribe(state => {
-          const messages = state.messages as WebSocketMessage[];
-          const currentState = get();
-
-          // 只有当有待处理的视频请求时才处理
-          if (Object.keys(currentState.pendingVideoRequests).length === 0) {
-            return;
-          }
-
-          messages.forEach(message => {
-            if (message?.content?.cmdType === "CmdDownloadVideoResult") {
-              console.log("收到视频下载响应:", message.content);
-
-              // 检查是否是我们正在等待的视频响应
-              const messageId = Object.keys(
-                currentState.pendingVideoRequests,
-              ).find(
-                id =>
-                  currentState.pendingVideoRequests[id] ===
-                  message.content.friendMessageId,
-              );
-
-              if (messageId) {
-                console.log("找到对应的消息ID:", messageId);
-
-                // 从待处理队列中移除
-                currentState.removePendingVideoRequest(messageId);
-
-                // 更新消息内容，添加视频URL
-                currentState.updateMessageWithVideo(
-                  messageId,
-                  message.content.url,
-                );
-              }
-            }
-          });
-        });
-
-        return unsubscribe;
-      },
-
       clearAllData: () => {
         set({
           currentContract: null,
           currentMessages: [],
           messagesLoading: false,
-          pendingVideoRequests: {},
         });
       },
     }),
diff --git a/Cunkebao/src/store/module/websocket/msgManage.ts b/Cunkebao/src/store/module/websocket/msgManage.ts
index 484058af..4efc7a56 100644
--- a/Cunkebao/src/store/module/websocket/msgManage.ts
+++ b/Cunkebao/src/store/module/websocket/msgManage.ts
@@ -3,6 +3,8 @@ import { deepCopy } from "@/utils/common";
 import { WebSocketMessage } from "./websocket";
 import { getkfUserList, asyncKfUserList } from "@/store/module/ckchat/ckchat";
 import { Messages } from "./msg.data";
+
+import { useWeChatStore } from "@/store/module/weChat/weChat";
 // 消息处理器类型定义
 type MessageHandler = (message: WebSocketMessage) => void;
 
@@ -52,6 +54,10 @@ const messageHandlers: Record<string, MessageHandler> = {
     }
   },
 
+  CmdDownloadVideoResult: message => {
+    // 在这里添加具体的处理逻辑
+    useWeChatStore.getState().setVideoUrl(message.friendMessageId, message.url);
+  },
   // 可以继续添加更多处理器...
 };
 

From a3ba45626d4b6c92556970f277f9632f748a6a31 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, 3 Sep 2025 16:33:52 +0800
Subject: [PATCH 19/29] =?UTF-8?q?feat(=E5=BE=AE=E4=BF=A1/websocket):=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B6=88=E6=81=AF=E5=A4=84=E7=90=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=B9=B6=E4=BC=98=E5=8C=96websocket=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在WeChatState接口中添加addMessage方法用于接收新消息
- 在websocket消息处理器中调用addMessage存储接收到的消息
- 优化websocket连接逻辑，断开时自动尝试重连
- 改进聊天窗口视频状态检测逻辑，减少不必要的滚动
---
 .../pc/ckbox/components/ChatWindow/index.tsx  | 42 +++++++++----------
 .../src/store/module/weChat/weChat.data.ts    |  1 +
 .../src/store/module/websocket/msgManage.ts   |  6 ++-
 .../src/store/module/websocket/websocket.ts   | 17 +++++++-
 4 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
index bb9edc97..72c88cb7 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
@@ -43,10 +43,10 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
   useEffect(() => {
     const prevMessages = prevMessagesRef.current;
 
-    // 检查是否有视频状态变化（从加载中变为已完成）
+    // 检查是否有视频状态变化（从加载中变为已完成或开始加载）
     const hasVideoStateChange = currentMessages.some((msg, index) => {
       const prevMsg = prevMessages[index];
-      if (!prevMsg) return false;
+      if (!prevMsg || prevMsg.id !== msg.id) return false;
 
       try {
         const currentContent =
@@ -58,37 +58,33 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
             ? JSON.parse(prevMsg.content)
             : prevMsg.content;
 
-        // 检查是否从加载中变为已完成（有videoUrl）
-        return (
-          prevContent.isLoading === true &&
-          currentContent.isLoading === false &&
-          currentContent.videoUrl
-        );
+        // 检查视频状态是否发生变化（开始加载、完成加载、获得URL）
+        const currentHasVideo =
+          currentContent.previewImage && currentContent.tencentUrl;
+        const prevHasVideo = prevContent.previewImage && prevContent.tencentUrl;
+
+        if (currentHasVideo && prevHasVideo) {
+          // 检查加载状态变化或视频URL变化
+          return (
+            currentContent.isLoading !== prevContent.isLoading ||
+            currentContent.videoUrl !== prevContent.videoUrl
+          );
+        }
+
+        return false;
       } catch (e) {
         return false;
       }
     });
 
-    // 检查是否有视频正在加载中
-    const hasLoadingVideo = currentMessages.some(msg => {
-      try {
-        const content =
-          typeof msg.content === "string"
-            ? JSON.parse(msg.content)
-            : msg.content;
-        return content.isLoading === true;
-      } catch (e) {
-        return false;
-      }
-    });
-
-    // 只有在没有视频加载且没有视频状态变化时才自动滚动到底部
-    if (!hasLoadingVideo && !hasVideoStateChange) {
+    // 只有在没有视频状态变化时才自动滚动到底部
+    if (!hasVideoStateChange) {
       scrollToBottom();
     }
 
     // 更新上一次的消息状态
     prevMessagesRef.current = currentMessages;
+    console.log("视频状态变化:", hasVideoStateChange, currentMessages);
   }, [currentMessages]);
 
   const scrollToBottom = () => {
diff --git a/Cunkebao/src/store/module/weChat/weChat.data.ts b/Cunkebao/src/store/module/weChat/weChat.data.ts
index 1f938d32..dfd2e103 100644
--- a/Cunkebao/src/store/module/weChat/weChat.data.ts
+++ b/Cunkebao/src/store/module/weChat/weChat.data.ts
@@ -17,4 +17,5 @@ export interface WeChatState {
   // 视频消息处理方法
   setVideoLoading: (messageId: number, isLoading: boolean) => void;
   setVideoUrl: (messageId: number, videoUrl: string) => void;
+  addMessage: (message: ChatRecord) => void;
 }
diff --git a/Cunkebao/src/store/module/websocket/msgManage.ts b/Cunkebao/src/store/module/websocket/msgManage.ts
index 4efc7a56..66610f93 100644
--- a/Cunkebao/src/store/module/websocket/msgManage.ts
+++ b/Cunkebao/src/store/module/websocket/msgManage.ts
@@ -7,7 +7,8 @@ import { Messages } from "./msg.data";
 import { useWeChatStore } from "@/store/module/weChat/weChat";
 // 消息处理器类型定义
 type MessageHandler = (message: WebSocketMessage) => void;
-
+const setVideoUrl = useWeChatStore.getState().setVideoUrl;
+const addMessage = useWeChatStore.getState().addMessage;
 // 消息处理器映射
 const messageHandlers: Record<string, MessageHandler> = {
   // 微信账号存活状态响应
@@ -35,6 +36,7 @@ const messageHandlers: Record<string, MessageHandler> = {
   //收到消息
   CmdNewMessage: (message: Messages) => {
     console.log("收到消息", message.friendMessage);
+    addMessage(message.friendMessage);
     // 在这里添加具体的处理逻辑
   },
 
@@ -56,7 +58,7 @@ const messageHandlers: Record<string, MessageHandler> = {
 
   CmdDownloadVideoResult: message => {
     // 在这里添加具体的处理逻辑
-    useWeChatStore.getState().setVideoUrl(message.friendMessageId, message.url);
+    setVideoUrl(message.friendMessageId, message.url);
   },
   // 可以继续添加更多处理器...
 };
diff --git a/Cunkebao/src/store/module/websocket/websocket.ts b/Cunkebao/src/store/module/websocket/websocket.ts
index 485931c6..d67e2a06 100644
--- a/Cunkebao/src/store/module/websocket/websocket.ts
+++ b/Cunkebao/src/store/module/websocket/websocket.ts
@@ -231,7 +231,16 @@ export const useWebSocketStore = createPersistStore<WebSocketState>(
         currentState.status !== WebSocketStatus.CONNECTED ||
         !currentState.ws
       ) {
-        Toast.show({ content: "WebSocket未连接", position: "top" });
+        Toast.show({
+          content: "WebSocket未连接，正在重新连接...",
+          position: "top",
+        });
+
+        // 重置连接状态并发起重新连接
+        set({ status: WebSocketStatus.DISCONNECTED });
+        if (currentState.config) {
+          currentState.connect(currentState.config);
+        }
         return;
       }
 
@@ -247,6 +256,12 @@ export const useWebSocketStore = createPersistStore<WebSocketState>(
       } catch (error) {
         // console.error("命令发送失败:", error);
         Toast.show({ content: "命令发送失败", position: "top" });
+
+        // 发送失败时也尝试重新连接
+        set({ status: WebSocketStatus.DISCONNECTED });
+        if (currentState.config) {
+          currentState.connect(currentState.config);
+        }
       }
     },
 

From c27642bc1234d5c0a447b67476c7057f0c910bc8 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, 3 Sep 2025 16:36:10 +0800
Subject: [PATCH 20/29] =?UTF-8?q?feat(websocket):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA=E8=BF=9E=E6=8E=A5=E7=8A=B6=E6=80=81=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E7=94=A8=E4=BA=8E=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增clearConnectionState方法，用于在用户退出登录时清空WebSocket连接状态。该方法会关闭现有连接、停止所有定时器并重置所有相关状态变量，确保用户登出后不会保留之前的连接信息。
---
 .../src/store/module/websocket/websocket.ts   | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/Cunkebao/src/store/module/websocket/websocket.ts b/Cunkebao/src/store/module/websocket/websocket.ts
index d67e2a06..46f9ed18 100644
--- a/Cunkebao/src/store/module/websocket/websocket.ts
+++ b/Cunkebao/src/store/module/websocket/websocket.ts
@@ -61,6 +61,7 @@ interface WebSocketState {
   clearMessages: () => void;
   markAsRead: () => void;
   reconnect: () => void;
+  clearConnectionState: () => void; // 清空连接状态
 
   // 内部方法
   _handleOpen: () => void;
@@ -289,6 +290,34 @@ export const useWebSocketStore = createPersistStore<WebSocketState>(
       }
     },
 
+    // 清空连接状态（用于退出登录时）
+    clearConnectionState: () => {
+      const currentState = get();
+
+      // 断开现有连接
+      if (currentState.ws) {
+        currentState.ws.close();
+      }
+
+      // 停止所有定时器
+      currentState._stopReconnectTimer();
+      currentState._stopAliveStatusTimer();
+
+      // 重置所有状态
+      set({
+        status: WebSocketStatus.DISCONNECTED,
+        ws: null,
+        config: null,
+        messages: [],
+        unreadCount: 0,
+        reconnectAttempts: 0,
+        reconnectTimer: null,
+        aliveStatusTimer: null,
+      });
+
+      // console.log("WebSocket连接状态已清空");
+    },
+
     // 内部方法：处理连接打开
     _handleOpen: () => {
       const currentState = get();

From 9cdfe552e0b051411f7e1d4a7a6a78470830e007 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, 3 Sep 2025 16:49:45 +0800
Subject: [PATCH 21/29] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4currentContract?=
 =?UTF-8?q?=E6=8C=81=E4=B9=85=E5=8C=96=E5=B9=B6=E6=B8=85=E7=90=86=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95=E6=97=A5=E5=BF=97=E5=92=8CWebSocket=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除weChat模块中currentContract的持久化配置，避免登录和刷新时数据残留
清理ChatWindow组件中的调试日志
在登录时清空WebSocket连接状态
---
 Cunkebao/src/pages/login/Login.tsx                          | 3 +++
 Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx | 1 -
 Cunkebao/src/store/module/weChat/weChat.ts                  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Cunkebao/src/pages/login/Login.tsx b/Cunkebao/src/pages/login/Login.tsx
index d375422a..972710b2 100644
--- a/Cunkebao/src/pages/login/Login.tsx
+++ b/Cunkebao/src/pages/login/Login.tsx
@@ -7,6 +7,7 @@ import {
   UserOutline,
 } from "antd-mobile-icons";
 import { useUserStore } from "@/store/module/user";
+import { useWebSocketStore } from "@/store/module/websocket/websocket";
 
 import { loginWithPassword, loginWithCode, sendVerificationCode } from "./api";
 import style from "./login.module.scss";
@@ -75,6 +76,8 @@ const Login: React.FC = () => {
 
     response.then(res => {
       const { member, kefuData, deviceTotal } = res;
+      // 清空WebSocket连接状态
+      useWebSocketStore.getState().clearConnectionState();
       login(res.token, member, deviceTotal);
       const { self, token } = kefuData;
       login2(token.access_token);
diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
index 72c88cb7..edff2cd2 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
@@ -84,7 +84,6 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
 
     // 更新上一次的消息状态
     prevMessagesRef.current = currentMessages;
-    console.log("视频状态变化:", hasVideoStateChange, currentMessages);
   }, [currentMessages]);
 
   const scrollToBottom = () => {
diff --git a/Cunkebao/src/store/module/weChat/weChat.ts b/Cunkebao/src/store/module/weChat/weChat.ts
index 30d02e14..fd547121 100644
--- a/Cunkebao/src/store/module/weChat/weChat.ts
+++ b/Cunkebao/src/store/module/weChat/weChat.ts
@@ -146,7 +146,7 @@ export const useWeChatStore = create<WeChatState>()(
     {
       name: "wechat-storage",
       partialize: state => ({
-        currentContract: state.currentContract,
+        // currentContract 不做持久化，登录和页面刷新时直接清空
       }),
     },
   ),

From 0bddc4dc5b7968ba3cb168e91673b2e655df2cff 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, 3 Sep 2025 17:05:53 +0800
Subject: [PATCH 22/29] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=8F=91=E9=80=81=E5=90=8E=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E6=9C=AA=E6=B8=85=E7=A9=BA=E5=8F=8A=E8=87=AA=E5=8A=A8=E7=82=B9?=
 =?UTF-8?q?=E8=B5=9E=E7=8A=B6=E6=80=81=E5=88=87=E6=8D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复消息发送后输入框未清空的问题，优化自动点赞任务状态切换逻辑
更新消息处理逻辑，修正构建文件引用路径
---
 Cunkebao/dist/.vite/manifest.json              | 18 +++++++++---------
 Cunkebao/dist/index.html                       |  8 ++++----
 .../mobile/workspace/auto-like/list/api.ts     |  4 ++--
 .../mobile/workspace/auto-like/list/index.tsx  |  3 +--
 .../components/MessageEnter/index.tsx          |  1 +
 .../src/store/module/websocket/msgManage.ts    |  7 ++++++-
 6 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/Cunkebao/dist/.vite/manifest.json b/Cunkebao/dist/.vite/manifest.json
index cc80cbd8..90e573c1 100644
--- a/Cunkebao/dist/.vite/manifest.json
+++ b/Cunkebao/dist/.vite/manifest.json
@@ -1,14 +1,14 @@
 {
-  "_charts-Cbn6yFil.js": {
-    "file": "assets/charts-Cbn6yFil.js",
+  "_charts-BET_YNJb.js": {
+    "file": "assets/charts-BET_YNJb.js",
     "name": "charts",
     "imports": [
-      "_ui-Cytu8vuP.js",
+      "_ui-BSfOMVFg.js",
       "_vendor-2vc8h_ct.js"
     ]
   },
-  "_ui-Cytu8vuP.js": {
-    "file": "assets/ui-Cytu8vuP.js",
+  "_ui-BSfOMVFg.js": {
+    "file": "assets/ui-BSfOMVFg.js",
     "name": "ui",
     "imports": [
       "_vendor-2vc8h_ct.js"
@@ -33,18 +33,18 @@
     "name": "vendor"
   },
   "index.html": {
-    "file": "assets/index-QManA_e5.js",
+    "file": "assets/index-DX2o9_TA.js",
     "name": "index",
     "src": "index.html",
     "isEntry": true,
     "imports": [
       "_vendor-2vc8h_ct.js",
       "_utils-6WF66_dS.js",
-      "_ui-Cytu8vuP.js",
-      "_charts-Cbn6yFil.js"
+      "_ui-BSfOMVFg.js",
+      "_charts-BET_YNJb.js"
     ],
     "css": [
-      "assets/index-BkBrwKGe.css"
+      "assets/index-DwDrBOQB.css"
     ]
   }
 }
\ No newline at end of file
diff --git a/Cunkebao/dist/index.html b/Cunkebao/dist/index.html
index 93421b47..d9e4faec 100644
--- a/Cunkebao/dist/index.html
+++ b/Cunkebao/dist/index.html
@@ -11,13 +11,13 @@
     </style>
     <!-- 引入 uni-app web-view SDK（必须） -->
     <script type="text/javascript" src="/websdk.js"></script>
-    <script type="module" crossorigin src="/assets/index-QManA_e5.js"></script>
+    <script type="module" crossorigin src="/assets/index-DX2o9_TA.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/vendor-2vc8h_ct.js">
     <link rel="modulepreload" crossorigin href="/assets/utils-6WF66_dS.js">
-    <link rel="modulepreload" crossorigin href="/assets/ui-Cytu8vuP.js">
-    <link rel="modulepreload" crossorigin href="/assets/charts-Cbn6yFil.js">
+    <link rel="modulepreload" crossorigin href="/assets/ui-BSfOMVFg.js">
+    <link rel="modulepreload" crossorigin href="/assets/charts-BET_YNJb.js">
     <link rel="stylesheet" crossorigin href="/assets/ui-D0C0OGrH.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-BkBrwKGe.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-DwDrBOQB.css">
   </head>
   <body>
     <div id="root"></div>
diff --git a/Cunkebao/src/pages/mobile/workspace/auto-like/list/api.ts b/Cunkebao/src/pages/mobile/workspace/auto-like/list/api.ts
index 615cb7ff..ddc48d91 100644
--- a/Cunkebao/src/pages/mobile/workspace/auto-like/list/api.ts
+++ b/Cunkebao/src/pages/mobile/workspace/auto-like/list/api.ts
@@ -5,7 +5,7 @@ import {
   UpdateLikeTaskData,
   LikeRecord,
   PaginatedResponse,
-} from "@/pages/workspace/auto-like/record/data";
+} from "@/pages/mobile/workspace/auto-like/record/data";
 
 // 获取自动点赞任务列表
 export function fetchAutoLikeTasks(
@@ -36,7 +36,7 @@ export function deleteAutoLikeTask(id: string): Promise<any> {
 
 // 切换任务状态
 export function toggleAutoLikeTask(data): Promise<any> {
-  return request("/v1/workbench/update-status", { ...data, type: 1 }, "POST");
+  return request("/v1/workbench/update-status", { ...data }, "POST");
 }
 
 // 复制自动点赞任务
diff --git a/Cunkebao/src/pages/mobile/workspace/auto-like/list/index.tsx b/Cunkebao/src/pages/mobile/workspace/auto-like/list/index.tsx
index 073603ee..a967f725 100644
--- a/Cunkebao/src/pages/mobile/workspace/auto-like/list/index.tsx
+++ b/Cunkebao/src/pages/mobile/workspace/auto-like/list/index.tsx
@@ -201,8 +201,7 @@ const AutoLike: React.FC = () => {
   // 切换任务状态
   const toggleTaskStatus = async (id: string, status: number) => {
     try {
-      const newStatus = status === 1 ? "2" : "1";
-      await toggleAutoLikeTask(id, newStatus);
+      await toggleAutoLikeTask({ id });
       Toast.show({
         content: status === 1 ? "已暂停" : "已启动",
         position: "top",
diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx
index edd49db9..a98efaf1 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx
@@ -41,6 +41,7 @@ const MessageEnter: React.FC<MessageEnterProps> = ({ contract }) => {
       content: inputValue,
     };
     sendCommand("CmdSendMessage", params);
+    setInputValue("");
     // try {
     //   onSendMessage(inputValue);
     //   setInputValue("");
diff --git a/Cunkebao/src/store/module/websocket/msgManage.ts b/Cunkebao/src/store/module/websocket/msgManage.ts
index 66610f93..3940a83b 100644
--- a/Cunkebao/src/store/module/websocket/msgManage.ts
+++ b/Cunkebao/src/store/module/websocket/msgManage.ts
@@ -26,17 +26,22 @@ const messageHandlers: Record<string, MessageHandler> = {
   // 发送消息响应
   CmdSendMessageResp: message => {
     console.log("发送消息响应", message);
+    addMessage(message.friendMessage);
+    // 在这里添加具体的处理逻辑
+  },
+  CmdSendMessageResult: message => {
+    console.log("发送消息结果", message);
     // 在这里添加具体的处理逻辑
   },
   // 接收消息响应
   CmdReceiveMessageResp: message => {
     console.log("接收消息响应", message);
+    addMessage(message.friendMessage);
     // 在这里添加具体的处理逻辑
   },
   //收到消息
   CmdNewMessage: (message: Messages) => {
     console.log("收到消息", message.friendMessage);
-    addMessage(message.friendMessage);
     // 在这里添加具体的处理逻辑
   },
 

From ff96312d53587d909f93cc77fe3958728ac80da4 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, 3 Sep 2025 17:18:19 +0800
Subject: [PATCH 23/29] =?UTF-8?q?feat(websocket):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91=E5=B9=B6?=
 =?UTF-8?q?=E6=B8=85=E7=90=86=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在websocket消息处理器中添加addMessage调用以处理新消息
移除ChatWindow组件中无用的样式和注释代码
---
 .../pc/ckbox/components/ChatWindow/ChatWindow.module.scss   | 5 -----
 .../components/ChatWindow/components/MessageEnter/index.tsx | 6 ------
 Cunkebao/src/store/module/websocket/msgManage.ts            | 1 +
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/ChatWindow.module.scss b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/ChatWindow.module.scss
index 355cb2a4..917988e3 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/ChatWindow.module.scss
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/ChatWindow.module.scss
@@ -128,9 +128,6 @@
   }
 }
 
-
-
-
 // 右侧个人资料卡片
 .profileSider {
   background: #fff;
@@ -629,8 +626,6 @@
     }
   }
 
-
-
   .messageItem {
     .messageContent {
       max-width: 85%;
diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx
index a98efaf1..e226b02a 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/MessageEnter/index.tsx
@@ -42,12 +42,6 @@ const MessageEnter: React.FC<MessageEnterProps> = ({ contract }) => {
     };
     sendCommand("CmdSendMessage", params);
     setInputValue("");
-    // try {
-    //   onSendMessage(inputValue);
-    //   setInputValue("");
-    // } catch (error) {
-    //   console.error("发送失败", error);
-    // }
   };
 
   const handleKeyPress = (e: React.KeyboardEvent) => {
diff --git a/Cunkebao/src/store/module/websocket/msgManage.ts b/Cunkebao/src/store/module/websocket/msgManage.ts
index 3940a83b..3aca7d7a 100644
--- a/Cunkebao/src/store/module/websocket/msgManage.ts
+++ b/Cunkebao/src/store/module/websocket/msgManage.ts
@@ -43,6 +43,7 @@ const messageHandlers: Record<string, MessageHandler> = {
   CmdNewMessage: (message: Messages) => {
     console.log("收到消息", message.friendMessage);
     // 在这里添加具体的处理逻辑
+    addMessage(message.friendMessage);
   },
 
   // 登录响应

From 533c16be3f3314d1aa99f604df1294625a055483 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, 3 Sep 2025 17:47:43 +0800
Subject: [PATCH 24/29] =?UTF-8?q?feat(weChat):=20=E6=B7=BB=E5=8A=A0receive?=
 =?UTF-8?q?dMsg=E6=96=B9=E6=B3=95=E5=A4=84=E7=90=86=E6=8E=A5=E6=94=B6?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增receivedMsg方法用于处理微信消息接收逻辑，区分当前会话消息和未读消息更新
优化updateChatSession实现，使用深拷贝避免直接修改状态
调整ckchat.data.ts中方法顺序，保持代码整洁
---
 .../src/store/module/ckchat/ckchat.data.ts    |  4 +--
 Cunkebao/src/store/module/ckchat/ckchat.ts    | 20 ++++---------
 .../src/store/module/weChat/weChat.data.ts    |  1 +
 Cunkebao/src/store/module/weChat/weChat.ts    | 29 ++++++++++++++++++-
 .../src/store/module/websocket/msgManage.ts   |  5 ++--
 5 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/Cunkebao/src/store/module/ckchat/ckchat.data.ts b/Cunkebao/src/store/module/ckchat/ckchat.data.ts
index f9780ab6..af7f8743 100644
--- a/Cunkebao/src/store/module/ckchat/ckchat.data.ts
+++ b/Cunkebao/src/store/module/ckchat/ckchat.data.ts
@@ -52,13 +52,13 @@ export interface CkChatState {
   asyncKfUserList: (data: KfUserListData[]) => void;
   getKfUserInfo: (wechatAccountId: number) => KfUserListData | undefined;
   asyncContractList: (data: ContractData[]) => void;
+  getChatSessions: () => any[];
   asyncChatSessions: (data: any[]) => void;
+  updateChatSession: (session: ContractData | weChatGroup) => void;
   deleteCtrlUser: (userId: number) => void;
   updateCtrlUser: (user: KfUserListData) => void;
   clearkfUserList: () => void;
-  getChatSessions: () => any[];
   addChatSession: (session: any) => void;
-  updateChatSession: (session: any) => void;
   deleteChatSession: (sessionId: string) => void;
   setUserInfo: (userInfo: CkUserInfo) => void;
   clearUserInfo: () => void;
diff --git a/Cunkebao/src/store/module/ckchat/ckchat.ts b/Cunkebao/src/store/module/ckchat/ckchat.ts
index 054c4bd5..3bdf173a 100644
--- a/Cunkebao/src/store/module/ckchat/ckchat.ts
+++ b/Cunkebao/src/store/module/ckchat/ckchat.ts
@@ -9,6 +9,7 @@ import {
 } from "@/pages/pc/ckbox/data";
 import { kfUserService, weChatGroupService, contractService } from "@/utils/db";
 import { createContractList } from "@/store/module/ckchat/api";
+import { deepCopy } from "../../../utils/common";
 
 export const useCkChatStore = createPersistStore<CkChatState>(
   set => ({
@@ -384,20 +385,11 @@ export const useCkChatStore = createPersistStore<CkChatState>(
     },
     // 更新聊天会话
     updateChatSession: (session: ContractData | weChatGroup) => {
-      set(state => ({
-        chatSessions: state.chatSessions.map(item =>
-          item.id === session.id ? session : item,
-        ),
-      }));
-      // 清除getChatSessions缓存
-      const state = useCkChatStore.getState();
-      if (
-        state.getChatSessions &&
-        typeof state.getChatSessions === "function"
-      ) {
-        // 触发缓存重新计算
-        state.getChatSessions();
-      }
+      const state = deepCopy(useCkChatStore.getState());
+      const newSession = state.chatSessions.map(item =>
+        item.id === session.id ? session : item,
+      );
+      set({ chatSessions: newSession });
     },
     // 删除聊天会话
     deleteChatSession: (sessionId: string) => {
diff --git a/Cunkebao/src/store/module/weChat/weChat.data.ts b/Cunkebao/src/store/module/weChat/weChat.data.ts
index dfd2e103..78dc6508 100644
--- a/Cunkebao/src/store/module/weChat/weChat.data.ts
+++ b/Cunkebao/src/store/module/weChat/weChat.data.ts
@@ -18,4 +18,5 @@ export interface WeChatState {
   setVideoLoading: (messageId: number, isLoading: boolean) => void;
   setVideoUrl: (messageId: number, videoUrl: string) => void;
   addMessage: (message: ChatRecord) => void;
+  receivedMsg: (message: ChatRecord) => void;
 }
diff --git a/Cunkebao/src/store/module/weChat/weChat.ts b/Cunkebao/src/store/module/weChat/weChat.ts
index fd547121..6280d68c 100644
--- a/Cunkebao/src/store/module/weChat/weChat.ts
+++ b/Cunkebao/src/store/module/weChat/weChat.ts
@@ -4,7 +4,11 @@ import { getChatMessages } from "@/pages/pc/ckbox/api";
 import { WeChatState } from "./weChat.data";
 import { clearUnreadCount, updateConfig } from "@/pages/pc/ckbox/api";
 import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
-import { addChatSession } from "@/store/module/ckchat/ckchat";
+import {
+  addChatSession,
+  getChatSessions,
+  updateChatSession,
+} from "@/store/module/ckchat/ckchat";
 
 export const useWeChatStore = create<WeChatState>()(
   persist(
@@ -68,6 +72,29 @@ export const useWeChatStore = create<WeChatState>()(
         }));
       },
 
+      receivedMsg: message => {
+        const currentContract = useWeChatStore.getState().currentContract;
+        if (
+          currentContract &&
+          currentContract.wechatAccountId == message.wechatAccountId &&
+          currentContract.id == message.wechatFriendId
+        ) {
+          set(state => ({
+            currentMessages: [...state.currentMessages, message],
+          }));
+        } else {
+          //更新消息列表unread数值，根据接收的++1 这样
+          const chatSessions = getChatSessions();
+          const session = chatSessions.find(
+            item => item.id == message.wechatFriendId,
+          );
+          session.unreadCount++;
+          console.log("新消息", session);
+
+          updateChatSession(session);
+        }
+      },
+
       updateMessage: (messageId, updates) => {
         set(state => ({
           currentMessages: state.currentMessages.map(msg =>
diff --git a/Cunkebao/src/store/module/websocket/msgManage.ts b/Cunkebao/src/store/module/websocket/msgManage.ts
index 3aca7d7a..423fab57 100644
--- a/Cunkebao/src/store/module/websocket/msgManage.ts
+++ b/Cunkebao/src/store/module/websocket/msgManage.ts
@@ -9,6 +9,8 @@ import { useWeChatStore } from "@/store/module/weChat/weChat";
 type MessageHandler = (message: WebSocketMessage) => void;
 const setVideoUrl = useWeChatStore.getState().setVideoUrl;
 const addMessage = useWeChatStore.getState().addMessage;
+const receivedMsg = useWeChatStore.getState().receivedMsg;
+
 // 消息处理器映射
 const messageHandlers: Record<string, MessageHandler> = {
   // 微信账号存活状态响应
@@ -41,9 +43,8 @@ const messageHandlers: Record<string, MessageHandler> = {
   },
   //收到消息
   CmdNewMessage: (message: Messages) => {
-    console.log("收到消息", message.friendMessage);
     // 在这里添加具体的处理逻辑
-    addMessage(message.friendMessage);
+    receivedMsg(message.friendMessage);
   },
 
   // 登录响应

From 7e5617bd80162c6ee73ecf4e55379022ff4b2dac 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, 3 Sep 2025 17:55:25 +0800
Subject: [PATCH 25/29] =?UTF-8?q?refactor(ckbox):=20=E7=A7=BB=E9=99=A4Side?=
 =?UTF-8?q?barMenu=E7=9A=84currentContract=E5=B1=9E=E6=80=A7=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除不再使用的currentContract属性和相关props传递
- 将chatSessions状态管理移至MessageList组件内部
- 添加CmdFriendInfoChanged消息处理器
- 添加调试日志用于会话更新
---
 .../components/SidebarMenu/MessageList/index.tsx     | 12 ++++++------
 .../pages/pc/ckbox/components/SidebarMenu/index.tsx  | 10 ++--------
 Cunkebao/src/pages/pc/ckbox/index.tsx                |  2 +-
 Cunkebao/src/store/module/ckchat/ckchat.ts           |  1 +
 Cunkebao/src/store/module/websocket/msgManage.ts     |  5 +++++
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx
index 3507fc6d..dc4901e1 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx
@@ -3,22 +3,22 @@ import { List, Avatar, Badge } from "antd";
 import { UserOutlined, TeamOutlined } 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 styles from "./MessageList.module.scss";
 import { formatWechatTime } from "@/utils/common";
-interface MessageListProps {
-  chatSessions: ContractData[] | weChatGroup[];
-}
+interface MessageListProps {}
 
-const MessageList: React.FC<MessageListProps> = ({ chatSessions }) => {
+const MessageList: React.FC<MessageListProps> = () => {
   const { setCurrentContact, currentContract } = useWeChatStore();
-
+  const chatSessions = useCkChatStore(state => state.getChatSessions());
   const onContactClick = (session: ContractData | weChatGroup) => {
     setCurrentContact(session);
   };
   return (
     <div className={styles.messageList}>
       <List
-        dataSource={chatSessions as ContractData[]}
+        dataSource={chatSessions as (ContractData | weChatGroup)[]}
         renderItem={session => (
           <List.Item
             key={session.id}
diff --git a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/index.tsx
index d9152f95..dd072845 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/index.tsx
@@ -10,17 +10,11 @@ import WechatFriends from "./WechatFriends";
 import MessageList from "./MessageList/index";
 import styles from "./SidebarMenu.module.scss";
 import { useCkChatStore } from "@/store/module/ckchat/ckchat";
-import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 interface SidebarMenuProps {
   loading?: boolean;
-  currentContract?: ContractData | weChatGroup;
 }
 
-const SidebarMenu: React.FC<SidebarMenuProps> = ({
-  loading = false,
-  currentContract,
-}) => {
-  const chatSessions = useCkChatStore(state => state.getChatSessions());
+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);
@@ -128,7 +122,7 @@ const SidebarMenu: React.FC<SidebarMenuProps> = ({
   const renderContent = () => {
     switch (activeTab) {
       case "chats":
-        return <MessageList chatSessions={chatSessions} />;
+        return <MessageList />;
       case "contracts":
         return <WechatFriends />;
       case "groups":
diff --git a/Cunkebao/src/pages/pc/ckbox/index.tsx b/Cunkebao/src/pages/pc/ckbox/index.tsx
index 38c9cf84..0cbe80f4 100644
--- a/Cunkebao/src/pages/pc/ckbox/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/index.tsx
@@ -64,7 +64,7 @@ const CkboxPage: React.FC = () => {
 
           {/* 左侧联系人边栏 */}
           <Sider width={280} className={styles.sider}>
-            <SidebarMenu currentContract={currentContract} loading={loading} />
+            <SidebarMenu loading={loading} />
           </Sider>
 
           {/* 主内容区 */}
diff --git a/Cunkebao/src/store/module/ckchat/ckchat.ts b/Cunkebao/src/store/module/ckchat/ckchat.ts
index 3bdf173a..b83cd436 100644
--- a/Cunkebao/src/store/module/ckchat/ckchat.ts
+++ b/Cunkebao/src/store/module/ckchat/ckchat.ts
@@ -389,6 +389,7 @@ export const useCkChatStore = createPersistStore<CkChatState>(
       const newSession = state.chatSessions.map(item =>
         item.id === session.id ? session : item,
       );
+      console.log("新数组", newSession);
       set({ chatSessions: newSession });
     },
     // 删除聊天会话
diff --git a/Cunkebao/src/store/module/websocket/msgManage.ts b/Cunkebao/src/store/module/websocket/msgManage.ts
index 423fab57..3146e213 100644
--- a/Cunkebao/src/store/module/websocket/msgManage.ts
+++ b/Cunkebao/src/store/module/websocket/msgManage.ts
@@ -46,6 +46,10 @@ const messageHandlers: Record<string, MessageHandler> = {
     // 在这里添加具体的处理逻辑
     receivedMsg(message.friendMessage);
   },
+  CmdFriendInfoChanged: message => {
+    // console.log("好友信息变更", message);
+    // 在这里添加具体的处理逻辑
+  },
 
   // 登录响应
   CmdSignInResp: message => {
@@ -67,6 +71,7 @@ const messageHandlers: Record<string, MessageHandler> = {
     // 在这里添加具体的处理逻辑
     setVideoUrl(message.friendMessageId, message.url);
   },
+
   // 可以继续添加更多处理器...
 };
 

From 30cafc5619d537dde29bb264a6c79c7d53866089 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, 3 Sep 2025 18:04:39 +0800
Subject: [PATCH 26/29] =?UTF-8?q?refactor(weChat/ckchat):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BC=9A=E8=AF=9D=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=B9=B6=E7=A7=BB=E9=99=A4=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复未读消息计数时可能出现的类型问题
- 直接使用chatSessions状态而非getChatSessions方法
- 简化会话更新逻辑，移除不必要的缓存处理
- 使用更简洁的路径引用deepCopy工具
---
 .../SidebarMenu/MessageList/index.tsx         |  2 +-
 Cunkebao/src/store/module/ckchat/ckchat.ts    | 31 ++++---------------
 Cunkebao/src/store/module/weChat/weChat.ts    |  4 +--
 3 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx
index dc4901e1..6fc7d049 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx
@@ -11,7 +11,7 @@ interface MessageListProps {}
 
 const MessageList: React.FC<MessageListProps> = () => {
   const { setCurrentContact, currentContract } = useWeChatStore();
-  const chatSessions = useCkChatStore(state => state.getChatSessions());
+  const chatSessions = useCkChatStore(state => state.chatSessions);
   const onContactClick = (session: ContractData | weChatGroup) => {
     setCurrentContact(session);
   };
diff --git a/Cunkebao/src/store/module/ckchat/ckchat.ts b/Cunkebao/src/store/module/ckchat/ckchat.ts
index b83cd436..686ee2f9 100644
--- a/Cunkebao/src/store/module/ckchat/ckchat.ts
+++ b/Cunkebao/src/store/module/ckchat/ckchat.ts
@@ -9,7 +9,7 @@ import {
 } from "@/pages/pc/ckbox/data";
 import { kfUserService, weChatGroupService, contractService } from "@/utils/db";
 import { createContractList } from "@/store/module/ckchat/api";
-import { deepCopy } from "../../../utils/common";
+import { deepCopy } from "@/utils/common";
 
 export const useCkChatStore = createPersistStore<CkChatState>(
   set => ({
@@ -373,39 +373,20 @@ export const useCkChatStore = createPersistStore<CkChatState>(
             : [...state.chatSessions, session as ContractData | weChatGroup],
         };
       });
-      // 清除getChatSessions缓存
-      const state = useCkChatStore.getState();
-      if (
-        state.getChatSessions &&
-        typeof state.getChatSessions === "function"
-      ) {
-        // 触发缓存重新计算
-        state.getChatSessions();
-      }
     },
     // 更新聊天会话
     updateChatSession: (session: ContractData | weChatGroup) => {
-      const state = deepCopy(useCkChatStore.getState());
-      const newSession = state.chatSessions.map(item =>
-        item.id === session.id ? session : item,
-      );
-      console.log("新数组", newSession);
-      set({ chatSessions: newSession });
+      set(state => ({
+        chatSessions: state.chatSessions.map(item =>
+          item.id === session.id ? { ...item, ...session } : item,
+        ),
+      }));
     },
     // 删除聊天会话
     deleteChatSession: (sessionId: string) => {
       set(state => ({
         chatSessions: state.chatSessions.filter(item => item.id !== sessionId),
       }));
-      // 清除getChatSessions缓存
-      const state = useCkChatStore.getState();
-      if (
-        state.getChatSessions &&
-        typeof state.getChatSessions === "function"
-      ) {
-        // 触发缓存重新计算
-        state.getChatSessions();
-      }
     },
     // 设置用户信息
     setUserInfo: (userInfo: CkUserInfo) => {
diff --git a/Cunkebao/src/store/module/weChat/weChat.ts b/Cunkebao/src/store/module/weChat/weChat.ts
index 6280d68c..182fa937 100644
--- a/Cunkebao/src/store/module/weChat/weChat.ts
+++ b/Cunkebao/src/store/module/weChat/weChat.ts
@@ -88,9 +88,7 @@ export const useWeChatStore = create<WeChatState>()(
           const session = chatSessions.find(
             item => item.id == message.wechatFriendId,
           );
-          session.unreadCount++;
-          console.log("新消息", session);
-
+          session.unreadCount = Number(session.unreadCount) + 1;
           updateChatSession(session);
         }
       },

From 7bd7bd3564685e2a9f7f5ee509cfb6f368f3beac 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, 3 Sep 2025 18:20:24 +0800
Subject: [PATCH 27/29] =?UTF-8?q?fix(weChat/ckchat):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=81=94=E7=B3=BB=E4=BA=BA=E6=97=B6=E6=9C=AA?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=9C=AA=E8=AF=BB=E8=AE=A1=E6=95=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在切换联系人时，确保会话的未读计数被正确重置为0。将重置逻辑统一移至addChatSession方法中处理，避免遗漏。
---
 Cunkebao/src/store/module/ckchat/ckchat.ts | 2 +-
 Cunkebao/src/store/module/weChat/weChat.ts | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Cunkebao/src/store/module/ckchat/ckchat.ts b/Cunkebao/src/store/module/ckchat/ckchat.ts
index 686ee2f9..d0a16103 100644
--- a/Cunkebao/src/store/module/ckchat/ckchat.ts
+++ b/Cunkebao/src/store/module/ckchat/ckchat.ts
@@ -9,7 +9,6 @@ import {
 } from "@/pages/pc/ckbox/data";
 import { kfUserService, weChatGroupService, contractService } from "@/utils/db";
 import { createContractList } from "@/store/module/ckchat/api";
-import { deepCopy } from "@/utils/common";
 
 export const useCkChatStore = createPersistStore<CkChatState>(
   set => ({
@@ -363,6 +362,7 @@ export const useCkChatStore = createPersistStore<CkChatState>(
     })(),
     // 添加聊天会话
     addChatSession: (session: ContractData | weChatGroup) => {
+      session.unreadCount = 0;
       set(state => {
         // 检查是否已存在相同id的会话
         const exists = state.chatSessions.some(item => item.id === session.id);
diff --git a/Cunkebao/src/store/module/weChat/weChat.ts b/Cunkebao/src/store/module/weChat/weChat.ts
index 182fa937..30d65ead 100644
--- a/Cunkebao/src/store/module/weChat/weChat.ts
+++ b/Cunkebao/src/store/module/weChat/weChat.ts
@@ -24,7 +24,6 @@ export const useWeChatStore = create<WeChatState>()(
         // 切换联系人时清空当前消息，等待重新加载
         set({ currentMessages: [] });
         clearUnreadCount([contract.id]).then(() => {
-          contract.unreadCount = 0;
           addChatSession(contract);
           set({ currentContract: contract });
           updateConfig({

From df0bbddbd5c6f9d071e64db9d6f97fb97f4e6106 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, 3 Sep 2025 18:33:05 +0800
Subject: [PATCH 28/29] =?UTF-8?q?feat(weChat):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E5=AD=98=E5=9C=A8=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=B9=B6=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在setCurrentContact方法中添加isExist参数，用于区分新增联系人和已存在联系人的处理逻辑
优化消息处理流程，确保未读消息计数正确更新
---
 .../SidebarMenu/MessageList/index.tsx         |  2 +-
 .../src/store/module/weChat/weChat.data.ts    |  5 ++++-
 Cunkebao/src/store/module/weChat/weChat.ts    | 21 +++++++++++++------
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx
index 6fc7d049..dfaab7e4 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx
@@ -13,7 +13,7 @@ const MessageList: React.FC<MessageListProps> = () => {
   const { setCurrentContact, currentContract } = useWeChatStore();
   const chatSessions = useCkChatStore(state => state.chatSessions);
   const onContactClick = (session: ContractData | weChatGroup) => {
-    setCurrentContact(session);
+    setCurrentContact(session, true);
   };
   return (
     <div className={styles.messageList}>
diff --git a/Cunkebao/src/store/module/weChat/weChat.data.ts b/Cunkebao/src/store/module/weChat/weChat.data.ts
index 78dc6508..a63ff292 100644
--- a/Cunkebao/src/store/module/weChat/weChat.data.ts
+++ b/Cunkebao/src/store/module/weChat/weChat.data.ts
@@ -11,7 +11,10 @@ export interface WeChatState {
   messagesLoading: boolean;
 
   // Actions
-  setCurrentContact: (contract: ContractData | weChatGroup) => void;
+  setCurrentContact: (
+    contract: ContractData | weChatGroup,
+    isExist?: boolean,
+  ) => void;
   loadChatMessages: (contact: ContractData | weChatGroup) => Promise<void>;
 
   // 视频消息处理方法
diff --git a/Cunkebao/src/store/module/weChat/weChat.ts b/Cunkebao/src/store/module/weChat/weChat.ts
index 30d65ead..914f5e71 100644
--- a/Cunkebao/src/store/module/weChat/weChat.ts
+++ b/Cunkebao/src/store/module/weChat/weChat.ts
@@ -6,8 +6,8 @@ import { clearUnreadCount, updateConfig } from "@/pages/pc/ckbox/api";
 import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 import {
   addChatSession,
-  getChatSessions,
   updateChatSession,
+  useCkChatStore,
 } from "@/store/module/ckchat/ckchat";
 
 export const useWeChatStore = create<WeChatState>()(
@@ -19,12 +19,19 @@ export const useWeChatStore = create<WeChatState>()(
       messagesLoading: false,
 
       // Actions
-      setCurrentContact: (contract: ContractData | weChatGroup) => {
+      setCurrentContact: (
+        contract: ContractData | weChatGroup,
+        isExist?: boolean,
+      ) => {
         const state = useWeChatStore.getState();
         // 切换联系人时清空当前消息，等待重新加载
         set({ currentMessages: [] });
         clearUnreadCount([contract.id]).then(() => {
-          addChatSession(contract);
+          if (isExist) {
+            updateChatSession({ ...contract, unreadCount: 0 });
+          } else {
+            addChatSession(contract);
+          }
           set({ currentContract: contract });
           updateConfig({
             id: contract.id,
@@ -83,12 +90,14 @@ export const useWeChatStore = create<WeChatState>()(
           }));
         } else {
           //更新消息列表unread数值，根据接收的++1 这样
-          const chatSessions = getChatSessions();
+          const chatSessions = useCkChatStore.getState().chatSessions;
           const session = chatSessions.find(
             item => item.id == message.wechatFriendId,
           );
-          session.unreadCount = Number(session.unreadCount) + 1;
-          updateChatSession(session);
+          if (session) {
+            session.unreadCount = Number(session.unreadCount) + 1;
+            updateChatSession(session);
+          }
         }
       },
 

From 1f0ef3c64d0c39ff30d612af2a995ff205a6feb1 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, 4 Sep 2025 10:47:57 +0800
Subject: [PATCH 29/29] =?UTF-8?q?refactor(chat):=20=E9=87=8D=E5=91=BD?=
 =?UTF-8?q?=E5=90=8DPerson=E7=BB=84=E4=BB=B6=E4=B8=BAProfileCard=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复微信聊天消息可能为undefined的问题
添加调试日志检查消息状态
确保wechatTime字段安全访问
---
 .../components/{Person => ProfileCard}/Person.module.scss | 0
 .../components/{Person => ProfileCard}/index.tsx          | 2 +-
 .../src/pages/pc/ckbox/components/ChatWindow/index.tsx    | 8 +++++---
 Cunkebao/src/store/module/weChat/weChat.ts                | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)
 rename Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/{Person => ProfileCard}/Person.module.scss (100%)
 rename Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/{Person => ProfileCard}/index.tsx (99%)

diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/Person/Person.module.scss b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/ProfileCard/Person.module.scss
similarity index 100%
rename from Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/Person/Person.module.scss
rename to Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/ProfileCard/Person.module.scss
diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/Person/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/ProfileCard/index.tsx
similarity index 99%
rename from Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/Person/index.tsx
rename to Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/ProfileCard/index.tsx
index c96eea65..ed60e655 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/Person/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/components/ProfileCard/index.tsx
@@ -111,7 +111,7 @@ const Person: React.FC<PersonProps> = ({
     conRemark: remarkValue, // 使用当前编辑的备注值
     alias: contract.alias,
     wechatId: contract.wechatId,
-    avatar: contract.avatar,
+    avatar: contract.avatar || contract.chatroomAvatar,
     phone: contract.phone || "-",
     email: contract.email || "-",
     department: contract.department || "-",
diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
index edff2cd2..5470c535 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
@@ -20,7 +20,7 @@ import { ChatRecord, ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 import styles from "./ChatWindow.module.scss";
 import { useWebSocketStore } from "@/store/module/websocket/websocket";
 import { formatWechatTime } from "@/utils/common";
-import Person from "./components/Person";
+import ProfileCard from "./components/ProfileCard";
 import MessageEnter from "./components/MessageEnter";
 import { useWeChatStore } from "@/store/module/weChat/weChat";
 const { Header, Content } = Layout;
@@ -44,6 +44,8 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
     const prevMessages = prevMessagesRef.current;
 
     // 检查是否有视频状态变化（从加载中变为已完成或开始加载）
+    console.log("currentMessages", currentMessages);
+
     const hasVideoStateChange = currentMessages.some((msg, index) => {
       const prevMsg = prevMessages[index];
       if (!prevMsg || prevMsg.id !== msg.id) return false;
@@ -525,7 +527,7 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
   // 用于分组消息并添加时间戳的辅助函数
   const groupMessagesByTime = (messages: ChatRecord[]) => {
     return messages.map(msg => ({
-      time: formatWechatTime(msg.wechatTime),
+      time: formatWechatTime(msg?.wechatTime),
       messages: [msg],
     }));
   };
@@ -643,7 +645,7 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
       </Layout>
 
       {/* 右侧个人资料卡片 */}
-      <Person
+      <ProfileCard
         contract={contract}
         showProfile={showProfile}
         onToggleProfile={onToggleProfile}
diff --git a/Cunkebao/src/store/module/weChat/weChat.ts b/Cunkebao/src/store/module/weChat/weChat.ts
index 914f5e71..696ba0bd 100644
--- a/Cunkebao/src/store/module/weChat/weChat.ts
+++ b/Cunkebao/src/store/module/weChat/weChat.ts
@@ -60,7 +60,7 @@ export const useWeChatStore = create<WeChatState>()(
           }
 
           const messages = await getChatMessages(params);
-          set({ currentMessages: messages });
+          set({ currentMessages: messages || [] });
         } catch (error) {
           console.error("获取聊天消息失败:", error);
         } finally {