From ed58b824aca83ec3b3bc43ee75384fbf45e8ed23 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 14:44:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(TransmitModal):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=BD=AC=E5=8F=91=E7=A1=AE=E8=AE=A4=E9=80=BB=E8=BE=91=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=81=94=E7=B3=BB=E4=BA=BA=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修正了转发确认时的参数传递，确保选中的微信好友能够正确传递给onConfirm回调。同时，在联系人显示中添加了备注信息的支持，提升了用户体验。
---
 .../components/TransmitModal/index.tsx              | 13 ++++++-------
 1 file changed, 6 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 4c331bd5..1184bca6 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
@@ -21,7 +21,7 @@ import { useWeChatStore } from "@/store/module/weChat/weChat";
 import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 
 export interface TransmitModalProps {
-  onConfirm?: (params: ContractData[] | weChatGroup[]) => void; // 可选，因为会自动更新到store
+  onConfirm?: (params: (ContractData | weChatGroup)[]) => void; // 可选，因为会自动更新到store
 }
 
 const TransmitModal: React.FC<TransmitModalProps> = ({ onConfirm }) => {
@@ -100,7 +100,9 @@ const TransmitModal: React.FC<TransmitModalProps> = ({ onConfirm }) => {
 
   // 确认转发
   const handleConfirm = () => {
-    console.log("handleConfirm");
+    console.log("handleConfirm", selectedWechatFriend);
+    onConfirm?.(selectedWechatFriend);
+    updateTransmitModal(false);
   };
 
   // 检查联系人是否已选择
@@ -108,11 +110,6 @@ const TransmitModal: React.FC<TransmitModalProps> = ({ onConfirm }) => {
     return selectedWechatFriend.some(contact => contact.id === contactId);
   };
 
-  // 重试加载
-  const handleRetry = () => {
-    loadContacts();
-  };
-
   return (
     <Modal
       title="转发消息"
@@ -187,6 +184,7 @@ const TransmitModal: React.FC<TransmitModalProps> = ({ onConfirm }) => {
                         />
                         <span className={styles.contactName}>
                           {contact.nickname}
+                          {contact.conRemark && `-(${contact.conRemark})`}
                         </span>
                         {contact.type === "group" && (
                           <TeamOutlined className={styles.groupIcon} />
@@ -229,6 +227,7 @@ const TransmitModal: React.FC<TransmitModalProps> = ({ onConfirm }) => {
                       />
                       <span className={styles.contactName}>
                         {contact.nickname}
+                        {contact.conRemark && `-(${contact.conRemark})`}
                       </span>
                       {contact.type === "group" && (
                         <TeamOutlined className={styles.groupIcon} />