Merge branch 'develop' into yongpxu-dev2

Cunkebao/src/pages/mobile/mine/content/form/index.tsx

@@ -38,7 +38,7 @@ export default function ContentForm() {
     GroupSelectionItem[]
   >([]);
   const [useAI, setUseAI] = useState(false);
-  const [aiPrompt, setAIPrompt] = useState("");
+  const [aiPrompt, setAIPrompt] = useState("重写这条朋友圈 要求：  1、原本的字数和意思不要修改超过10%  2、出现品牌名或个人名字就去除");
   const [enabled, setEnabled] = useState(true);
   const [dateRange, setDateRange] = useState<[Date | null, Date | null]>([
     null,
@@ -296,12 +296,13 @@ export default function ContentForm() {
           {useAI && (
             <div className={style["form-section"]}>
               <label className={style["form-label"]}>AI提示词</label>
-              <AntdInput
-                placeholder="请输入AI提示词"
-                value={aiPrompt}
-                onChange={e => setAIPrompt(e.target.value)}
-                className={style["input"]}
-              />
+              <TextArea
+                  placeholder="请输入AI提示词"
+                  value={aiPrompt}
+                  onChange={e => setAIPrompt(e.target.value)}
+                  className={style["input"]}
+                  autoSize={{ minRows: 4, maxRows: 10 }}
+                />
             </div>
           )}
 

Cunkebao/src/pages/mobile/mine/wechat-accounts/detail/api.ts

@@ -27,3 +27,12 @@ export function getWechatFriends(params: {
 export function getWechatFriendDetail(id: string) {
   return request("/v1/WechatFriend/detail", { id }, "GET");
 }
+
+// 好友转移接口
+export function transferWechatFriends(params: {
+  wechatId: string;
+  devices: number[];
+  inherit: boolean;
+}) {
+  return request("/v1/wechats/transfer-friends", params, "POST");
+}

Cunkebao/src/pages/mobile/mine/wechat-accounts/detail/detail.module.scss

@@ -582,6 +582,36 @@
     line-height: 1.5;
   }
 
+  .transfer-form {
+    margin-top: 20px;
+
+    .form-item {
+      margin-bottom: 16px;
+
+      .form-label {
+        font-size: 14px;
+        font-weight: 500;
+        color: #333;
+        margin-bottom: 8px;
+      }
+
+      .form-control {
+        width: 100%;
+      }
+
+      .form-control-switch {
+        display: flex;
+        align-items: center;
+
+        .switch-label {
+          margin-left: 8px;
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+  }
+
   .popup-actions {
     display: flex;
     flex-direction: column;

Cunkebao/src/pages/mobile/mine/wechat-accounts/detail/index.tsx

@@ -10,6 +10,7 @@ import {
   Toast,
   Avatar,
   Tag,
+  Switch,
 } from "antd-mobile";
 import { Input, Pagination } from "antd";
 import NavCommon from "@/components/NavCommon";
@@ -20,7 +21,9 @@ import {
 } from "@ant-design/icons";
 import Layout from "@/components/Layout/Layout";
 import style from "./detail.module.scss";
-import { getWechatAccountDetail, getWechatFriends } from "./api";
+import { getWechatAccountDetail, getWechatFriends, transferWechatFriends } from "./api";
+import DeviceSelection from "@/components/DeviceSelection";
+import { DeviceSelectionItem } from "@/components/DeviceSelection/data";
 
 import { WechatAccountSummary, Friend } from "./data";
 
@@ -33,6 +36,9 @@ const WechatAccountDetail: React.FC = () => {
   const [accountInfo, setAccountInfo] = useState<any>(null);
   const [showRestrictions, setShowRestrictions] = useState(false);
   const [showTransferConfirm, setShowTransferConfirm] = useState(false);
+  const [selectedDevices, setSelectedDevices] = useState<DeviceSelectionItem[]>([]);
+  const [inheritInfo, setInheritInfo] = useState(true);
+  const [transferLoading, setTransferLoading] = useState(false);
   const [searchQuery, setSearchQuery] = useState("");
   const [activeTab, setActiveTab] = useState("overview");
   const [loadingInfo, setLoadingInfo] = useState(true);
@@ -181,16 +187,54 @@ const WechatAccountDetail: React.FC = () => {
   };
 
   const handleTransferFriends = () => {
+    setSelectedDevices([]);
+    setInheritInfo(true);
     setShowTransferConfirm(true);
   };
 
-  const confirmTransferFriends = () => {
-    Toast.show({
-      content: "好友转移计划已创建，请在场景获客中查看详情",
-      position: "top",
-    });
-    setShowTransferConfirm(false);
-    navigate("/scenarios");
+  const confirmTransferFriends = async () => {
+    if (!id) {
+      Toast.show({
+        content: "微信账号ID不存在",
+        position: "top",
+      });
+      return;
+    }
+
+    if (selectedDevices.length === 0) {
+      Toast.show({
+        content: "请选择至少一个目标设备",
+        position: "top",
+      });
+      return;
+    }
+
+    try {
+      setTransferLoading(true);
+
+      // 调用好友转移API
+      await transferWechatFriends({
+        wechatId: id,
+        devices: selectedDevices.map(device => device.id),
+        inherit: inheritInfo
+      });
+
+      Toast.show({
+        content: "好友转移计划已创建，请在场景获客中查看详情",
+        position: "top",
+      });
+      setShowTransferConfirm(false);
+      setSelectedDevices([]);
+      navigate("/scenarios");
+    } catch (error) {
+      console.error("好友转移失败:", error);
+      Toast.show({
+        content: "好友转移失败，请重试",
+        position: "top",
+      });
+    } finally {
+      setTransferLoading(false);
+    }
   };
 
   const getRestrictionLevelColor = (level: number) => {
@@ -545,15 +589,54 @@ const WechatAccountDetail: React.FC = () => {
           <p className={style["popup-description"]}>
             确定要将该微信号的好友转移到其他账号吗？此操作将创建一个好友转移计划。
           </p>
+
+          <div className={style["transfer-form"]}>
+            {/* 设备选择 */}
+            <div className={style["form-item"]}>
+              <div className={style["form-label"]}>迁移的新设备</div>
+              <div className={style["form-control"]}>
+                <DeviceSelection
+                  selectedOptions={selectedDevices}
+                  onSelect={setSelectedDevices}
+                  placeholder="请选择目标设备"
+                  showSelectedList={true}
+                />
+              </div>
+            </div>
+
+            {/* 同步原有信息 */}
+            <div className={style["form-item"]}>
+              <div className={style["form-label"]}>同步原有信息</div>
+              <div className={style["form-control-switch"]}>
+                <Switch
+                  checked={inheritInfo}
+                  onChange={setInheritInfo}
+                />
+                <span className={style["switch-label"]}>
+                  {inheritInfo ? "是" : "否"}
+                </span>
+              </div>
+            </div>
+          </div>
+
           <div className={style["popup-actions"]}>
-            <Button block color="primary" onClick={confirmTransferFriends}>
-              确认转移
+            <Button
+              block
+              color="primary"
+              onClick={confirmTransferFriends}
+              loading={transferLoading}
+              disabled={transferLoading}
+            >
+              {transferLoading ? "转移中..." : "确认转移"}
             </Button>
             <Button
               block
               color="danger"
               fill="outline"
-              onClick={() => setShowTransferConfirm(false)}
+              onClick={() => {
+                setShowTransferConfirm(false);
+                setSelectedDevices([]);
+              }}
             >
               取消
             </Button>