From 07c22e06ba9770b738075a371489083e45fe51f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Fri, 19 Sep 2025 16:59:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/TransmitModal/index.tsx        |  4 ++--
 .../components/MessageRecord/index.tsx        | 22 ++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/TransmitModal/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/TransmitModal/index.tsx
index 832ac7832..671888ff9 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/TransmitModal/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/TransmitModal/index.tsx
@@ -199,7 +199,7 @@ const TransmitModal: React.FC = () => {
                       <div className={styles.contactInfo}>
                         <Avatar
                           size={32}
-                          src={contact.avatar}
+                          src={contact.avatar || contact.chatroomAvatar}
                           icon={
                             contact.type === "group" ? (
                               <TeamOutlined />
@@ -258,7 +258,7 @@ const TransmitModal: React.FC = () => {
                     <div className={styles.contactInfo}>
                       <Avatar
                         size={32}
-                        src={contact.avatar}
+                        src={contact.avatar || contact.chatroomAvatar}
                         icon={
                           contact.type === "group" ? (
                             <TeamOutlined />
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
index 530debf77..2ca2a1e26 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
@@ -687,17 +687,29 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
   };
   const handQuote = (messageData: ChatRecord) => {
     //判断如果是用户
-    const isWechatUser = !!currentContract?.chatroomId;
+    const isGroupUser = !!currentContract?.chatroomId;
+    const isSend = messageData.isSend; //是否为我方发送
     const nickname = currentContract.nickname;
-    if (isWechatUser) {
+    const kfNickName = currentKf.nickname;
+    let sendMessageText = "";
+    if (isGroupUser) {
+      if (isSend) {
+        sendMessageText = `${messageData.content}\n----------------------------------\n`;
+      } else {
+        sendMessageText = `@${nickname}：${messageData.content}\n----------------------------------\n`;
+      }
     } else {
-      console.log(isWechatUser, nickname);
+      if (isSend) {
+        sendMessageText = `${messageData.content}\n----------------------------------\n`;
+      } else {
+        sendMessageText = `@${nickname}：${messageData.content}\n----------------------------------\n`;
+      }
       //当前用户的昵称
     }
 
-    updateQuoteMessageContent(JSON.stringify(messageData));
+    updateQuoteMessageContent(sendMessageText);
     //更新值
-    console.log("handQuote 引入逻辑", messageData);
+    console.log("handQuote 引入逻辑", sendMessageText);
   };
 
   const handCommad = (action: string) => {