Merge branch 'yongpxu-dev2' of https://e.coding.net/g-xtcy5189/cunkebao/cunkebao_v3 into yongpxu-dev2

# Conflicts:
#	nkebao/src/pages/workspace/auto-like/new/index.tsx   resolved by origin/yongpxu-dev2(远端) version
This commit is contained in:
笔记本里的永平
2025-07-22 13:56:49 +08:00
22 changed files with 2507 additions and 309 deletions

View File

@@ -5,7 +5,7 @@ import {
UpdateLikeTaskData,
LikeRecord,
PaginatedResponse,
} from "@/types/auto-like";
} from "@/pages/workspace/auto-like/record/api";
// 获取自动点赞任务列表
export function fetchAutoLikeTasks(

View File

@@ -22,7 +22,7 @@ import {
toggleAutoLikeTask,
copyAutoLikeTask,
} from "./api";
import { LikeTask } from "@/types/auto-like";
import { LikeTask } from "@/pages/workspace/auto-like/record/api";
import style from "./index.module.scss";
// 卡片菜单组件

View File

@@ -3,7 +3,7 @@ import {
CreateLikeTaskData,
UpdateLikeTaskData,
LikeTask,
} from "@/types/auto-like";
} from "@/pages/workspace/auto-like/record/api";
// 获取自动点赞任务详情
export function fetchAutoLikeTaskDetail(id: string): Promise<LikeTask | null> {

View File

@@ -1,12 +1,11 @@
import React, { useState, useEffect } from "react";
import { useNavigate, useParams } from "react-router-dom";
import { Button, Input, Switch, message, Spin } from "antd";
import {
ArrowLeftOutlined,
PlusOutlined,
MinusOutlined,
CheckOutlined,
ArrowLeftOutlined,
} from "@ant-design/icons";
import { Button, Input, Switch, message, Spin } from "antd";
import { NavBar } from "antd-mobile";
import Layout from "@/components/Layout/Layout";
import {
@@ -14,7 +13,11 @@ import {
updateAutoLikeTask,
fetchAutoLikeTaskDetail,
} from "./api";
import { ContentType } from "@/types/auto-like";
import {
CreateLikeTaskData,
UpdateLikeTaskData,
ContentType,
} from "@/pages/workspace/auto-like/record/api";
import style from "./new.module.scss";
const contentTypeLabels: Record<ContentType, string> = {
@@ -24,32 +27,28 @@ const contentTypeLabels: Record<ContentType, string> = {
link: "链接",
};
const steps = ["基础设置", "设备选择", "人群选择"];
const defaultForm = {
name: "",
interval: 5,
maxLikes: 200,
startTime: "08:00",
endTime: "22:00",
contentTypes: ["text", "image", "video"] as ContentType[],
devices: [] as string[],
friends: [] as string[],
targetTags: [] as string[],
friendMaxLikes: 10,
enableFriendTags: false,
friendTags: "",
};
const NewAutoLike: React.FC = () => {
const navigate = useNavigate();
const { id } = useParams<{ id: string }>();
const isEditMode = !!id;
const [currentStep, setCurrentStep] = useState(0);
const [currentStep, setCurrentStep] = useState(1);
const [isSubmitting, setIsSubmitting] = useState(false);
const [isLoading, setIsLoading] = useState(isEditMode);
const [autoEnabled, setAutoEnabled] = useState(false);
const [formData, setFormData] = useState({ ...defaultForm });
const [formData, setFormData] = useState<CreateLikeTaskData>({
name: "",
interval: 5,
maxLikes: 200,
startTime: "08:00",
endTime: "22:00",
contentTypes: ["text", "image", "video"],
devices: [],
friends: [],
targetTags: [],
friendMaxLikes: 10,
enableFriendTags: false,
friendTags: "",
});
useEffect(() => {
if (isEditMode && id) {
@@ -90,12 +89,12 @@ const NewAutoLike: React.FC = () => {
}
};
const handleUpdateFormData = (data: Partial<typeof formData>) => {
const handleUpdateFormData = (data: Partial<CreateLikeTaskData>) => {
setFormData((prev) => ({ ...prev, ...data }));
};
const handleNext = () => setCurrentStep((prev) => Math.min(prev + 1, 2));
const handlePrev = () => setCurrentStep((prev) => Math.max(prev - 1, 0));
const handleNext = () => setCurrentStep((prev) => Math.min(prev + 1, 3));
const handlePrev = () => setCurrentStep((prev) => Math.max(prev - 1, 1));
const handleComplete = async () => {
if (!formData.name.trim()) {
@@ -125,104 +124,90 @@ const NewAutoLike: React.FC = () => {
// 步骤1基础设置
const renderBasicSettings = () => (
<div className={style.formStep}>
<div className={style.formItem}>
<div className={style.formLabel}></div>
<div className={style["form-section"]}>
<div className={style["form-item"]}>
<label className={style["form-label"]}></label>
<Input
placeholder="请输入任务名称"
value={formData.name}
onChange={(e) => handleUpdateFormData({ name: e.target.value })}
className={style.input}
className={style["form-input"]}
/>
</div>
<div className={style.formItem}>
<div className={style.formLabel}></div>
<div className={style.counterRow}>
<button
type="button"
className={style.counterBtn}
<div className={style["form-item"]}>
<label className={style["form-label"]}></label>
<div className={style["stepper-group"]}>
<Button
icon={<MinusOutlined />}
onClick={() =>
handleUpdateFormData({
interval: Math.max(1, formData.interval - 1),
})
}
>
<MinusOutlined />
</button>
<span className={style.counterValue}>{formData.interval} </span>
<button
type="button"
className={style.counterBtn}
className={style["stepper-btn"]}
/>
<span className={style["stepper-value"]}>{formData.interval} </span>
<Button
icon={<PlusOutlined />}
onClick={() =>
handleUpdateFormData({ interval: formData.interval + 1 })
}
>
<PlusOutlined />
</button>
className={style["stepper-btn"]}
/>
</div>
<div className={style.counterTip}></div>
</div>
<div className={style.formItem}>
<div className={style.formLabel}></div>
<div className={style.counterRow}>
<button
type="button"
className={style.counterBtn}
<div className={style["form-item"]}>
<label className={style["form-label"]}></label>
<div className={style["stepper-group"]}>
<Button
icon={<MinusOutlined />}
onClick={() =>
handleUpdateFormData({
maxLikes: Math.max(1, formData.maxLikes - 10),
})
}
>
<MinusOutlined />
</button>
<span className={style.counterValue}>{formData.maxLikes} </span>
<button
type="button"
className={style.counterBtn}
className={style["stepper-btn"]}
/>
<span className={style["stepper-value"]}>{formData.maxLikes} </span>
<Button
icon={<PlusOutlined />}
onClick={() =>
handleUpdateFormData({ maxLikes: formData.maxLikes + 10 })
}
>
<PlusOutlined />
</button>
className={style["stepper-btn"]}
/>
</div>
<div className={style.counterTip}></div>
</div>
<div className={style.formItem}>
<div className={style.formLabel}></div>
<div className={style.timeRow}>
<div className={style["form-item"]}>
<label className={style["form-label"]}></label>
<div className={style["time-range"]}>
<Input
type="time"
value={formData.startTime}
onChange={(e) =>
handleUpdateFormData({ startTime: e.target.value })
}
className={style.inputTime}
className={style["time-input"]}
/>
<span className={style.timeTo}></span>
<span className={style["time-separator"]}></span>
<Input
type="time"
value={formData.endTime}
onChange={(e) => handleUpdateFormData({ endTime: e.target.value })}
className={style.inputTime}
className={style["time-input"]}
/>
</div>
</div>
<div className={style.formItem}>
<div className={style.formLabel}></div>
<div className={style.contentTypes}>
{(["text", "image", "video"] as ContentType[]).map((type) => (
<div className={style["form-item"]}>
<label className={style["form-label"]}></label>
<div className={style["content-types"]}>
{(["text", "image", "video", "link"] as ContentType[]).map((type) => (
<span
key={type}
className={
formData.contentTypes.includes(type)
? style.contentTypeTagActive
: style.contentTypeTag
? style["content-type-tag-active"]
: style["content-type-tag"]
}
onClick={() => {
const newTypes = formData.contentTypes.includes(type)
@@ -236,109 +221,78 @@ const NewAutoLike: React.FC = () => {
))}
</div>
</div>
<div className={style.formItem}>
<div className={style.switchRow}>
<span className={style.switchLabel}></span>
<Switch
checked={formData.enableFriendTags}
onChange={(checked) =>
handleUpdateFormData({ enableFriendTags: checked })
}
className={style.switch}
/>
</div>
{formData.enableFriendTags && (
<div className={style.formItem}>
<div className={style.formLabel}></div>
<Input
placeholder="请输入标签"
value={formData.friendTags}
onChange={(e) =>
handleUpdateFormData({ friendTags: e.target.value })
}
className={style.input}
/>
<div className={style.counterTip}></div>
</div>
)}
<div className={style["form-item"]}>
<label className={style["form-label"]}></label>
<Switch checked={autoEnabled} onChange={setAutoEnabled} />
</div>
<div className={style.formItem}>
<div className={style.switchRow}>
<span className={style.switchLabel}></span>
<Switch
checked={autoEnabled}
onChange={setAutoEnabled}
className={style.switch}
/>
</div>
</div>
<div className={style.formStepBtnRow}>
<Button type="primary" onClick={handleNext} className={style.nextBtn}>
<div className={style["form-actions"]}>
<Button
type="primary"
block
onClick={handleNext}
size="large"
className={style["main-btn"]}
>
</Button>
</div>
</div>
);
// 步骤2设备选择
// 步骤2设备选择(占位)
const renderDeviceSelection = () => (
<div className={style.formStep}>
<div className={style.formItem}>
<div className={style.formLabel}></div>
<Input
placeholder="请选择设备"
value={formData.devices.join(", ")}
readOnly
onClick={() => message.info("这里应弹出设备选择器")}
className={style.input}
/>
{formData.devices.length > 0 && (
<div className={style.selectedTip}>
: {formData.devices.length}
</div>
)}
<div className={style["form-section"]}>
<div className={style["placeholder-content"]}>
<span className={style["placeholder-icon"]}>[]</span>
<div className={style["placeholder-text"]}>...</div>
<div className={style["placeholder-subtext"]}>
{formData.devices?.length || 0}
</div>
</div>
<div className={style.formStepBtnRow}>
<Button onClick={handlePrev} className={style.prevBtn}>
<div className={style["form-actions"]}>
<Button
onClick={handlePrev}
size="large"
className={style["secondary-btn"]}
>
</Button>
<Button type="primary" onClick={handleNext} className={style.nextBtn}>
<Button
type="primary"
onClick={handleNext}
size="large"
className={style["main-btn"]}
>
</Button>
</div>
</div>
);
// 步骤3人群选择
const renderFriendSelection = () => (
<div className={style.formStep}>
<div className={style.formItem}>
<div className={style.formLabel}></div>
<Input
placeholder="请选择微信好友"
value={formData.friends.join(", ")}
readOnly
onClick={() => message.info("这里应弹出好友选择器")}
className={style.input}
/>
{formData.friends.length > 0 && (
<div className={style.selectedTip}>
: {formData.friends.length}
</div>
)}
// 步骤3好友设置(占位)
const renderFriendSettings = () => (
<div className={style["form-section"]}>
<div className={style["placeholder-content"]}>
<span className={style["placeholder-icon"]}>[]</span>
<div className={style["placeholder-text"]}>...</div>
<div className={style["placeholder-subtext"]}>
{formData.friends?.length || 0}
</div>
</div>
<div className={style.formStepBtnRow}>
<Button onClick={handlePrev} className={style.prevBtn}>
<div className={style["form-actions"]}>
<Button
onClick={handlePrev}
size="large"
className={style["secondary-btn"]}
>
</Button>
<Button
type="primary"
onClick={handleComplete}
size="large"
loading={isSubmitting}
className={style.completeBtn}
className={style["main-btn"]}
>
{isEditMode ? "更新任务" : "创建任务"}
</Button>
@@ -367,39 +321,21 @@ const NewAutoLike: React.FC = () => {
</NavBar>
}
>
<div className={style.formBg}>
<div className={style.formSteps}>
{steps.map((s, i) => (
<div
key={s}
className={
style.formStepIndicator +
" " +
(i === currentStep
? style.formStepActive
: i < currentStep
? style.formStepDone
: "")
}
>
<span className={style.formStepNum}>
{i < currentStep ? <CheckOutlined /> : i + 1}
</span>
<span>{s}</span>
</div>
))}
</div>
{isLoading ? (
<div className={style.formLoading}>
<Spin />
<div className={style["new-page-bg"]}>
<div className={style["new-page-center"]}>
{/* 步骤器保留新项目的 */}
{/* 你可以在这里插入新项目的步骤器组件 */}
<div className={style["form-card"]}>
{currentStep === 1 && renderBasicSettings()}
{currentStep === 2 && renderDeviceSelection()}
{currentStep === 3 && renderFriendSettings()}
{isLoading && (
<div className={style["loading"]}>
<Spin />
</div>
)}
</div>
) : (
<>
{currentStep === 0 && renderBasicSettings()}
{currentStep === 1 && renderDeviceSelection()}
{currentStep === 2 && renderFriendSelection()}
</>
)}
</div>
</div>
</Layout>
);

View File

@@ -0,0 +1,119 @@
// 自动点赞任务状态
export type LikeTaskStatus = 1 | 2; // 1: 开启, 2: 关闭
// 内容类型
export type ContentType = "text" | "image" | "video" | "link";
// 设备信息
export interface Device {
id: string;
name: string;
status: "online" | "offline";
lastActive: string;
}
// 好友信息
export interface Friend {
id: string;
nickname: string;
wechatId: string;
avatar: string;
tags: string[];
region: string;
source: string;
}
// 点赞记录
export interface LikeRecord {
id: string;
workbenchId: string;
momentsId: string;
snsId: string;
wechatAccountId: string;
wechatFriendId: string;
likeTime: string;
content: string;
resUrls: string[];
momentTime: string;
userName: string;
operatorName: string;
operatorAvatar: string;
friendName: string;
friendAvatar: string;
}
// 自动点赞任务
export interface LikeTask {
id: string;
name: string;
status: LikeTaskStatus;
deviceCount: number;
targetGroup: string;
likeCount: number;
lastLikeTime: string;
createTime: string;
creator: string;
likeInterval: number;
maxLikesPerDay: number;
timeRange: { start: string; end: string };
contentTypes: ContentType[];
targetTags: string[];
devices: string[];
friends: string[];
friendMaxLikes: number;
friendTags: string;
enableFriendTags: boolean;
todayLikeCount: number;
totalLikeCount: number;
updateTime: string;
}
// 创建任务数据
export interface CreateLikeTaskData {
name: string;
interval: number;
maxLikes: number;
startTime: string;
endTime: string;
contentTypes: ContentType[];
devices: string[];
friends?: string[];
friendMaxLikes: number;
friendTags?: string;
enableFriendTags: boolean;
targetTags: string[];
}
// 更新任务数据
export interface UpdateLikeTaskData extends CreateLikeTaskData {
id: string;
}
// 任务配置
export interface TaskConfig {
interval: number;
maxLikes: number;
startTime: string;
endTime: string;
contentTypes: ContentType[];
devices: string[];
friends: string[];
friendMaxLikes: number;
friendTags: string;
enableFriendTags: boolean;
}
// API响应类型
export interface ApiResponse<T = any> {
code: number;
msg: string;
data: T;
}
// 分页响应类型
export interface PaginatedResponse<T> {
list: T[];
total: number;
page: number;
limit: number;
}

View File

@@ -0,0 +1,173 @@
import { request } from "../../../../api/request";
import {
LikeTask,
CreateLikeTaskData,
UpdateLikeTaskData,
LikeRecord,
ApiResponse,
PaginatedResponse,
} from "@/pages/workspace/auto-like/record/api";
// 获取自动点赞任务列表
export async function fetchAutoLikeTasks(): Promise<LikeTask[]> {
try {
const res = await request<ApiResponse<PaginatedResponse<LikeTask>>>({
url: "/v1/workbench/list",
method: "GET",
params: {
type: 1,
page: 1,
limit: 100,
},
});
if (res.code === 200 && res.data) {
return res.data.list || [];
}
return [];
} catch (error) {
console.error("获取自动点赞任务失败:", error);
return [];
}
}
// 获取单个任务详情
export async function fetchAutoLikeTaskDetail(
id: string
): Promise<LikeTask | null> {
try {
console.log(`Fetching task detail for id: ${id}`);
const res = await request<any>({
url: "/v1/workbench/detail",
method: "GET",
params: { id },
});
console.log("Task detail API response:", res);
if (res.code === 200) {
if (res.data) {
if (typeof res.data === "object") {
return res.data;
} else {
console.error(
"Task detail API response data is not an object:",
res.data
);
return null;
}
} else {
console.error("Task detail API response missing data field:", res);
return null;
}
}
console.error("Task detail API error:", res.msg || "Unknown error");
return null;
} catch (error) {
console.error("获取任务详情失败:", error);
return null;
}
}
// 创建自动点赞任务
export async function createAutoLikeTask(
data: CreateLikeTaskData
): Promise<ApiResponse> {
return request({
url: "/v1/workbench/create",
method: "POST",
data: {
...data,
type: 1, // 自动点赞类型
},
});
}
// 更新自动点赞任务
export async function updateAutoLikeTask(
data: UpdateLikeTaskData
): Promise<ApiResponse> {
return request({
url: "/v1/workbench/update",
method: "POST",
data: {
...data,
type: 1, // 自动点赞类型
},
});
}
// 删除自动点赞任务
export async function deleteAutoLikeTask(id: string): Promise<ApiResponse> {
return request({
url: "/v1/workbench/delete",
method: "DELETE",
params: { id },
});
}
// 切换任务状态
export async function toggleAutoLikeTask(
id: string,
status: string
): Promise<ApiResponse> {
return request({
url: "/v1/workbench/update-status",
method: "POST",
data: { id, status },
});
}
// 复制自动点赞任务
export async function copyAutoLikeTask(id: string): Promise<ApiResponse> {
return request({
url: "/v1/workbench/copy",
method: "POST",
data: { id },
});
}
// 获取点赞记录
export async function fetchLikeRecords(
workbenchId: string,
page: number = 1,
limit: number = 20,
keyword?: string
): Promise<PaginatedResponse<LikeRecord>> {
try {
const params: any = {
workbenchId,
page: page.toString(),
limit: limit.toString(),
};
if (keyword) {
params.keyword = keyword;
}
const res = await request<ApiResponse<PaginatedResponse<LikeRecord>>>({
url: "/v1/workbench/records",
method: "GET",
params,
});
if (res.code === 200 && res.data) {
return res.data;
}
return {
list: [],
total: 0,
page: 1,
limit: 20,
};
} catch (error) {
console.error("获取点赞记录失败:", error);
return {
list: [],
total: 0,
page: 1,
limit: 20,
};
}
}

View File

@@ -12,8 +12,8 @@ import {
import Layout from "@/components/Layout/Layout";
import MeauMobile from "@/components/MeauMobile/MeauMoible";
import { fetchLikeRecords, fetchAutoLikeTaskDetail } from "@/api/autoLike";
import { LikeRecord, LikeTask } from "@/types/auto-like";
import { fetchLikeRecords, fetchAutoLikeTaskDetail } from "./data";
import { LikeRecord, LikeTask } from "./api";
import style from "./record.module.scss";
// 格式化日期

View File

@@ -0,0 +1,73 @@
import request from "../../../../api/request";
export interface GroupPushTask {
id: string;
name: string;
status: number; // 1: 运行中, 2: 已暂停
deviceCount: number;
targetGroups: string[];
pushCount: number;
successCount: number;
lastPushTime: string;
createTime: string;
creator: string;
pushInterval: number;
maxPushPerDay: number;
timeRange: { start: string; end: string };
messageType: "text" | "image" | "video" | "link";
messageContent: string;
targetTags: string[];
pushMode: "immediate" | "scheduled";
scheduledTime?: string;
}
interface ApiResponse<T = any> {
code: number;
message: string;
data: T;
}
export async function fetchGroupPushTasks(): Promise<GroupPushTask[]> {
const response = await request("/v1/workbench/list", { type: 3 }, "GET");
if (Array.isArray(response)) return response;
if (response && Array.isArray(response.data)) return response.data;
return [];
}
export async function deleteGroupPushTask(id: string): Promise<ApiResponse> {
return request(`/v1/workspace/group-push/tasks/${id}`, {}, "DELETE");
}
export async function toggleGroupPushTask(
id: string,
status: string
): Promise<ApiResponse> {
return request(
`/v1/workspace/group-push/tasks/${id}/toggle`,
{ status },
"POST"
);
}
export async function copyGroupPushTask(id: string): Promise<ApiResponse> {
return request(`/v1/workspace/group-push/tasks/${id}/copy`, {}, "POST");
}
export async function createGroupPushTask(
taskData: Partial<GroupPushTask>
): Promise<ApiResponse> {
return request("/v1/workspace/group-push/tasks", taskData, "POST");
}
export async function updateGroupPushTask(
id: string,
taskData: Partial<GroupPushTask>
): Promise<ApiResponse> {
return request(`/v1/workspace/group-push/tasks/${id}`, taskData, "PUT");
}
export async function getGroupPushTaskDetail(
id: string
): Promise<GroupPushTask> {
return request(`/v1/workspace/group-push/tasks/${id}`);
}

View File

@@ -10,7 +10,10 @@ import {
} from "@ant-design/icons";
import Layout from "@/components/Layout/Layout";
import MeauMobile from "@/components/MeauMobile/MeauMoible";
import { getGroupPushTaskDetail, GroupPushTask } from "@/api/groupPush";
import {
getGroupPushTaskDetail,
GroupPushTask,
} from "@/pages/workspace/group-push/detail/groupPush";
import styles from "./index.module.scss";
const Detail: React.FC = () => {

View File

@@ -3,7 +3,7 @@ import { useNavigate } from "react-router-dom";
import { Button } from "antd-mobile";
import { NavBar } from "antd-mobile";
import { LeftOutline } from "antd-mobile-icons";
import { createGroupPushTask } from "@/api/groupPush";
import { createGroupPushTask } from "@/pages/workspace/group-push/detail/groupPush";
import Layout from "@/components/Layout/Layout";
import MeauMobile from "@/components/MeauMobile/MeauMoible";
import StepIndicator from "./components/StepIndicator";

View File

@@ -38,7 +38,7 @@ import {
toggleGroupPushTask,
copyGroupPushTask,
GroupPushTask,
} from "@/api/groupPush";
} from "@/pages/workspace/group-push/detail/groupPush";
import styles from "./index.module.scss";
const { Search } = Input;