-
-
- 文本
-
-
-
- 图片
-
-
-
- 视频
-
-
setShowExportPopup(true)}
- >
-
- 导出
-
+ {/* 功能按钮栏 - 移到白色背景上 */}
+
+
+
+
+
+
+
+
{
+ // 默认设置近7天
+ const today = new Date();
+ const sevenDaysAgo = dayjs(today).subtract(7, "day").toDate();
+ setExportStartTime(sevenDaysAgo);
+ setExportEndTime(today);
+ setShowExportPopup(true);
+ }}
+ >
+
+
+
+
{/* 朋友圈列表 */}
{isFetchingMoments && moments.length === 0 ? (
@@ -949,18 +1065,25 @@ const WechatAccountDetail: React.FC = () => {
)}
- {moments.length < momentsTotal && (
-
-
-
- )}
+
+ {isFetchingMoments && moments.length > 0 && (
+
+
+
+ 加载中...
+
+
+ )}
+ {moments.length >= momentsTotal && moments.length > 0 && (
+
+ 没有更多了
+
+ )}
+
@@ -1124,7 +1247,11 @@ const WechatAccountDetail: React.FC = () => {
{/* 朋友圈导出弹窗 */}
setShowExportPopup(false)}
+ onMaskClick={() => {
+ setShowExportPopup(false);
+ setShowStartTimePicker(false);
+ setShowEndTimePicker(false);
+ }}
bodyStyle={{ borderRadius: "16px 16px 0 0" }}
>
@@ -1133,7 +1260,11 @@ const WechatAccountDetail: React.FC = () => {
@@ -1207,11 +1338,13 @@ const WechatAccountDetail: React.FC = () => {
visible={showStartTimePicker}
title="开始时间"
value={exportStartTime}
+ max={exportEndTime || new Date()}
onClose={() => setShowStartTimePicker(false)}
onConfirm={val => {
setExportStartTime(val);
setShowStartTimePicker(false);
}}
+ onCancel={() => setShowStartTimePicker(false)}
/>
@@ -1230,6 +1363,8 @@ const WechatAccountDetail: React.FC = () => {
visible={showEndTimePicker}
title="结束时间"
value={exportEndTime}
+ min={exportStartTime || undefined}
+ max={new Date()}
onClose={() => setShowEndTimePicker(false)}
onConfirm={val => {
setExportEndTime(val);
@@ -1259,6 +1394,8 @@ const WechatAccountDetail: React.FC = () => {
setExportType(undefined);
setExportStartTime(null);
setExportEndTime(null);
+ setShowStartTimePicker(false);
+ setShowEndTimePicker(false);
}}
style={{ marginTop: 12 }}
>
diff --git a/Server/application/cunkebao/controller/wechat/PostTransferFriends.php b/Server/application/cunkebao/controller/wechat/PostTransferFriends.php
index 99ef4d7b..f408ae41 100644
--- a/Server/application/cunkebao/controller/wechat/PostTransferFriends.php
+++ b/Server/application/cunkebao/controller/wechat/PostTransferFriends.php
@@ -67,7 +67,7 @@ class PostTransferFriends extends BaseController
'endTime' => '18:00',
'remarkType' => 'phone',
'addFriendInterval' => 60,
- 'greeting' => !empty($greeting) ? $greeting :'这个是'. $wechat['nickname'] .'的新号，之前那个号没用了，重新加一下您'
+ 'greeting' => !empty($greeting) ? $greeting :'我是'. $wechat['nickname'] .'的新号，请通过'
];
if (!empty($firstMessage)){
From 198e0434b3e36f87dcc57b5a989b310088ff75ca Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Wed, 10 Dec 2025 17:58:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BE=A4=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../form/components/OwnerAdminSelector.tsx | 235 ++++++++++
.../workspace/auto-group/form/index.tsx | 79 ++--
.../mobile/workspace/auto-group/form/types.ts | 19 +-
.../command/WorkbenchGroupCreateCommand.php | 1 +
.../controller/WorkbenchController.php | 32 +-
.../WorkbenchGroupCreateAdminFriendJob.php | 155 +++++++
.../job/WorkbenchGroupCreateJob.php | 431 +++++++++++++-----
.../WorkbenchGroupCreateOwnerFriendJob.php | 109 +++++
.../job/WorkbenchGroupCreateRetryJob.php | 179 ++++++++
.../job/WorkbenchGroupCreateVerifyJob.php | 248 ++++++++++
10 files changed, 1346 insertions(+), 142 deletions(-)
create mode 100644 Cunkebao/src/pages/mobile/workspace/auto-group/form/components/OwnerAdminSelector.tsx
create mode 100644 Server/application/job/WorkbenchGroupCreateAdminFriendJob.php
create mode 100644 Server/application/job/WorkbenchGroupCreateOwnerFriendJob.php
create mode 100644 Server/application/job/WorkbenchGroupCreateRetryJob.php
create mode 100644 Server/application/job/WorkbenchGroupCreateVerifyJob.php
diff --git a/Cunkebao/src/pages/mobile/workspace/auto-group/form/components/OwnerAdminSelector.tsx b/Cunkebao/src/pages/mobile/workspace/auto-group/form/components/OwnerAdminSelector.tsx
new file mode 100644
index 00000000..b96c73db
--- /dev/null
+++ b/Cunkebao/src/pages/mobile/workspace/auto-group/form/components/OwnerAdminSelector.tsx
@@ -0,0 +1,235 @@
+import React, { useImperativeHandle, forwardRef } from "react";
+import { Form, Card, Tabs } from "antd";
+import DeviceSelection from "@/components/DeviceSelection";
+import FriendSelection from "@/components/FriendSelection";
+import { DeviceSelectionItem } from "@/components/DeviceSelection/data";
+import { FriendSelectionItem } from "@/components/FriendSelection/data";
+
+interface OwnerAdminSelectorProps {
+ selectedOwners: DeviceSelectionItem[];
+ selectedAdmins: FriendSelectionItem[];
+ onNext: (data: {
+ devices: string[];
+ devicesOptions: DeviceSelectionItem[];
+ admins: string[];
+ adminsOptions: FriendSelectionItem[];
+ }) => void;
+}
+
+export interface OwnerAdminSelectorRef {
+ validate: () => Promise;
+ getValues: () => any;
+}
+
+const OwnerAdminSelector = forwardRef<
+ OwnerAdminSelectorRef,
+ OwnerAdminSelectorProps
+>(({ selectedOwners, selectedAdmins, onNext }, ref) => {
+ const [form] = Form.useForm();
+ const [owners, setOwners] = React.useState(
+ selectedOwners || []
+ );
+ const [admins, setAdmins] = React.useState(
+ selectedAdmins || []
+ );
+
+ // 当外部传入的 selectedOwners 或 selectedAdmins 变化时，同步内部状态
+ React.useEffect(() => {
+ setOwners(selectedOwners || []);
+ }, [selectedOwners]);
+
+ React.useEffect(() => {
+ setAdmins(selectedAdmins || []);
+ }, [selectedAdmins]);
+
+ // 暴露方法给父组件
+ useImperativeHandle(ref, () => ({
+ validate: async () => {
+ // 验证群主和管理员
+ if (owners.length === 0) {
+ form.setFields([
+ {
+ name: "devices",
+ errors: ["请选择一个群主"],
+ },
+ ]);
+ return false;
+ }
+ if (owners.length > 1) {
+ form.setFields([
+ {
+ name: "devices",
+ errors: ["群主只能选择一个设备"],
+ },
+ ]);
+ return false;
+ }
+ if (admins.length === 0) {
+ form.setFields([
+ {
+ name: "admins",
+ errors: ["请至少选择一个管理员"],
+ },
+ ]);
+ return false;
+ }
+ // 清除错误
+ form.setFields([
+ {
+ name: "devices",
+ errors: [],
+ },
+ {
+ name: "admins",
+ errors: [],
+ },
+ ]);
+ return true;
+ },
+ getValues: () => {
+ return {
+ devices: owners.map(o => o.id.toString()),
+ admins: admins.map(a => a.id.toString()),
+ devicesOptions: owners,
+ adminsOptions: admins,
+ };
+ },
+ }));
+
+ // 群主选择（设备选择）
+ const handleOwnersSelect = (selectedDevices: DeviceSelectionItem[]) => {
+ const previousOwnerId = owners.length > 0 ? owners[0]?.id : null;
+ const newOwnerId = selectedDevices.length > 0 ? selectedDevices[0]?.id : null;
+
+ // 当群主改变时，清空已选的管理员（因为筛选条件变了）
+ const shouldClearAdmins = previousOwnerId !== newOwnerId;
+
+ setOwners(selectedDevices);
+ const ownerIds = selectedDevices.map(d => d.id.toString());
+ form.setFieldValue("devices", ownerIds);
+
+ if (shouldClearAdmins) {
+ setAdmins([]);
+ form.setFieldValue("admins", []);
+ }
+
+ // 通知父组件数据变化
+ onNext({
+ devices: ownerIds,
+ devicesOptions: selectedDevices,
+ admins: shouldClearAdmins ? [] : admins.map(a => a.id.toString()),
+ adminsOptions: shouldClearAdmins ? [] : admins,
+ });
+ };
+
+ // 管理员选择
+ const handleAdminsSelect = (selectedFriends: FriendSelectionItem[]) => {
+ setAdmins(selectedFriends);
+ const adminIds = selectedFriends.map(f => f.id.toString());
+ form.setFieldValue("admins", adminIds);
+ // 通知父组件数据变化
+ onNext({
+ devices: owners.map(o => o.id.toString()),
+ devicesOptions: owners,
+ admins: adminIds,
+ adminsOptions: selectedFriends,
+ });
+ };
+
+ const tabItems = [
+ {
+ key: "devices",
+ label: `群主 (${owners.length})`,
+ children: (
+
+
+
+ 请选择一个群主（设备），该设备将作为新建群聊的群主
+
+
+
1 ? "error" : ""}
+ help={
+ owners.length === 0
+ ? "请选择一个群主（设备）"
+ : owners.length > 1
+ ? "群主只能选择一个设备"
+ : ""
+ }
+ >
+
+
+
+
+
+ {owners.length === 0
+ ? "请先选择群主（设备），然后选择该设备下的好友作为管理员"
+ : "请选择管理员，管理员将协助管理新建的群聊（仅显示所选设备下的好友）"}
+
+
+
+ 0 ? owners.map(d => d.id) : []}
+ enableDeviceFilter={true}
+ readonly={owners.length === 0}
+ />
+
+