Skip to content

Let's use AI to Earn!

fix: web task (#454)

布莱恩·奥夫托·杰森张403efa5c6d4b
diff --git a/project/web/.env b/project/web/.env
index 663c2354..853fb6fc 100644
--- a/project/web/.env
+++ b/project/web/.env
@@ -1,5 +1,5 @@
# OSS URL
-NEXT_PUBLIC_OSS_URL="https://aitoearn.s3.ap-southeast-1.amazonaws.com/"
+NEXT_PUBLIC_OSS_URL="https://assets.aitoearn.ai/"
# OSS URL 代理
NEXT_PUBLIC_OSS_URL_PROXY="/ossProxy/"
diff --git a/project/web/docs/DATA.md b/project/web/docs/DATA.md
deleted file mode 100644
index 53234771..00000000
--- a/project/web/docs/DATA.md
+++ /dev/null
@@ -1,95 +0,0 @@
-
-12.9 -- 问题整理
-
-!!!优先angent落地 -- 第一优先
-!!!发布和历史功能排查 -- 并列第一
-
-功能稳定后,进行推广,推广带来用户真实反馈。
-
- 功能稳定后有助于推广的功能&有助于留存的功能思考
-
-邀请码功能没有真正的使用上,对于流量推广有一些帮助。
- 邀请码用户送的和开通会员送的。
- -- 延申问题。 注册用户没有实名,薅羊毛问题。
-
-UI体验的用户调查功能
- 结合我们目前的客观条件,不去大动是更好的一切以用户为主导做出行动。
- 要以用户为主导纪要有反馈去掉,要增加反馈接口。 -- 评星&留言
-
-即时问题:
- 测试发现app下载国内缓慢,建议增加备用下载渠道 -- 蓝奏云
-
-现有功能,测试问题:
- /api/ai/chat 图生图情况偶发性超时。 -- 永生 -- 待处理。
- 小红书数据监控图片资源链接失效 -- 张伟 -- 待处理。
- AI工具排行榜无数据 -- 张伟 -- 待处理。
- 测试下载二维码扫描问题,二维码小内容密集容错率低,进行大小和样式修改。 -- 已处理,待发布。
-
-完成功能:
- 官网的新手引导,已完成待发布。
-
-功能聚焦:
- - 把两个视频拼接起来
- -- 输出结果在markdown输出视频
- - 把这个中文视频翻译成英文
- -- 输出结果在markdown输出视频
- - 给我创作一个“xxx”主题的30秒的视频
- -- 生成视频
- -- 放到素材库
- -- 延申漏洞,默认分组不能删除 -- 牛文政
- - “以xxx主题”创作内容,并直接发布到xxx频道
- -- 这里有两个不同状态
- -- 可以后端直接发布的,直接发布
- -- 如果用户指定的是小红书,抖音,那么需要返回数据携带类型指定并携带对应提示(抖音小红书需要您手动发布,如需发布请点击立即前往)。
- - “以xxx主题”创作7天内容,并在接下来一周帮我直接发布到xxx频道
- 历史内容查看
-
- 普通生成是否直接跳转发布? - 不用了
-
- 行动代码
- {
- 跳转发布
- 跳转草稿
- 频道授权 -- 没有频道
- 频道授权过期
- 后端不支持频道(抖音小红书)需要携带内容并返回行动代码
- }
-
- 注意问题:
- 1.angent生成作品需要注意如果用户说了生成图片发布到快手。类型不允许的问题。
- 2.有独立参数问题默认选择第一个。
-
-
- 发布界面,先从按钮颜色 层级 提示开始。 -- 添加频道没有频道需要闪烁
-
-
-
-
-
-12.10
-
-/api/task/opportunity/getNotViewCount
-Referrer Policy
-no-referrer
-
-
-
-{"type":"result","message":{"type":"result","subtype":"success","uuid":"f71410ec-3b27-45a7-9241-128f818aaf1b","duration_ms":186431,"duration_api_ms":121959,"is_error":false,"num_turns":16,"message":"完成!已成功为您处理红色风格图片并发布到三个平台:\n\n✅ **推特(Twitter)**:已成功发布\n- 内容:🔴 Red Vibes Only! Embracing the power and passion of red aesthetics ❤️\n- 标签:#RedAesthetic #VibrantVibes #ColorPop #ArtisticVision\n\n📱 **抖音**:内容已准备好,请前往发布页面手动发布\n- 标题:红色美学|热情活力的视觉盛宴\n- 话题:#红色美学 #色彩艺术 #视觉设计 #摄影调色 #艺术分享\n\n📱 **小红书**:内容已准备好,请前往发布页面手动发布\n- 标题:🔴红色美学|热情活力的视觉盛宴\n- 话题:#红色美学 #色彩艺术 #摄影调色 #视觉设计 #艺术分享\n\n由于抖音和小红书平台暂不支持自动发布,系统已为您准备好内容和图片,您可以前往对应平台的发布页面完成发布操作。",
-
-"result":[{"type":"fullContent","title":"🔴 Red Vibes Only! Embracing the power and passion of red aesthetics ❤️","description":"🔴 Red Vibes Only! Embracing the power and passion of red aesthetics ❤️ #RedAesthetic #VibrantVibes #ColorPop #ArtisticVision","tags":[],
-"medias":[{"type":"IMAGE","url":"https://aitoearn.s3.ap-southeast-1.amazonaws.com/ai/images/gemini-3-pro-image-preview/68abbe6af812ccb3e1a53d68/mj9tg7gz.png"}],"action":"none","platform":"twitter"},
-
-{"type":"fullContent","title":"红色美学|热情活力的视觉盛宴","description":"🔴 红色美学来袭!感受红色带来的热情与力量,每一帧都充满艺术感染力。这组红色调色让整个画面都充满了温暖和活力✨ 你喜欢这种红色风格吗?",
-"tags":["红色美学","色彩艺术","视觉设计","摄影调色","艺术分享"],"medias":[{"type":"IMAGE","url":"https://aitoearn.s3.ap-southeast-1.amazonaws.com/ai/images/gemini-3-pro-image-preview/68abbe6af812ccb3e1a53d68/mj9tg7gz.png"}],"action":"navigateToPublish","platform":"douyin","accountId":"douyin_MS4wLjABAAAATHE9sjNjL2xUmIvoGev3Q1wNVZCAsEzwX06VlzyCZztj0jBV-dMdN6cETZghdV3y_web","errorMessage":"抖音平台发布工具暂不支持,请前往发布页面手动发布"},
-
-{"type":"fullContent","title":"🔴红色美学|热情活力的视觉盛宴","description":"🔴 红色美学来袭!\n\n感受红色带来的热情与力量,每一帧都充满艺术感染力💫\n\n这组红色调色让整个画面都充满了温暖和活力,红色不仅是一种颜色,更是一种态度和表达✨\n\n你最喜欢哪种风格的调色呢?评论区告诉我~","tags":["红色美学","色彩艺术","摄影调色","视觉设计","艺术分享"],"medias":[{"type":"IMAGE","url":"https://aitoearn.s3.ap-southeast-1.amazonaws.com/ai/images/gemini-3-pro-image-preview/68abbe6af812ccb3e1a53d68/mj9tg7gz.png"}],"action":"navigateToPublish","platform":"xhs","accountId":"xhs_681b9361000000000801588b_web","errorMessage":"小红书平台发布工具暂不支持,请前往发布页面手动发布"}],"total_cost_usd":1.26249485,"usage":{"cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":299859},"cache_creation_input_tokens":299859,"cache_read_input_tokens":246602,"input_tokens":75,"output_tokens":3697,"server_tool_use":{"web_search_requests":0}},"permission_denials":[]}}
-
-将今天修改写一个日报 要简洁明了 12345 这种 每条都要表达清楚 不要追加描述
-
-
-推特:图文内容成功;
-抖音: 图文发布成功 -- 新版本调用方法失败,调整调用方法
-小红书: 图文发布成功 --- 修改插件振强更新新版本插件
-
-视频-生成成功:
-快手 视频发布成功
diff --git a/project/web/docs/aa.js b/project/web/docs/aa.js
deleted file mode 100644
index 1bddfc5c..00000000
--- a/project/web/docs/aa.js
+++ /dev/null
@@ -1,2 +0,0 @@
-let aa = '芒果英语启蒙 | 3岁以下宝宝学英语 | Mango Learning';
-console.log(aa.length);
\ No newline at end of file
diff --git "a/project/web/public/\344\273\273\345\212\241\350\256\260\345\275\225\350\257\246\346\203\205data.txt" "b/project/web/public/\344\273\273\345\212\241\350\256\260\345\275\225\350\257\246\346\203\205data.txt"
index 0d590a85..8e8cb377 100644
--- "a/project/web/public/\344\273\273\345\212\241\350\256\260\345\275\225\350\257\246\346\203\205data.txt"
+++ "b/project/web/public/\344\273\273\345\212\241\350\256\260\345\275\225\350\257\246\346\203\205data.txt"
@@ -13,7 +13,7 @@
"type": "video",
"source": {
"type": "url",
- "url": "https://aitoearn.s3.ap-southeast-1.amazonaws.com/68b503b421b15a40e511dfa4/8e9372f8014244760dc2194378302dac30348543864-1-192.mp4"
+ "url": "https://aitoearn.ap-southeast-1.amazonaws.com/68b503b421b15a40e511dfa4/8e9372f8014244760dc2194378302dac30348543864-1-192.mp4"
}
},
{
@@ -1108,7 +1108,7 @@
"index": 2,
"delta": {
"type": "input_json_delta",
- "partial_json": "earn.s3.a"
+ "partial_json": "earn.s8.a"
}
},
"parent_tool_use_id": null
@@ -1322,7 +1322,7 @@
"userId": "68b503b421b15a40e511dfa4",
"prompt": "将这个中文视频翻译成英文,包括翻译字幕、克隆语音并保持情感、同步唇形到英文",
"multiInputs": [
- "https://aitoearn.s3.ap-southeast-1.amazonaws.com/68b503b421b15a40e511dfa4/8e9372f8014244760dc2194378302dac30348543864-1-192.mp4"
+ "https://aitoearn.ap-southeast-1.amazonaws.com/68b503b421b15a40e511dfa4/8e9372f8014244760dc2194378302dac30348543864-1-192.mp4"
]
}
}
diff --git a/project/web/src/api/notification.ts b/project/web/src/api/notification.ts
index 992d549c..f40e6350 100644
--- a/project/web/src/api/notification.ts
+++ b/project/web/src/api/notification.ts
@@ -106,6 +106,6 @@ export function acceptTask(taskId: string, opportunityId: string, accountId?: st
}
// 提交任务
-export function submitTask(userTaskId: string, materialId: string) {
+export function submitTask(userTaskId: string, materialId?: string) {
return http.post('task/submit', { userTaskId, materialId })
}
diff --git a/project/web/src/api/task.ts b/project/web/src/api/task.ts
index 3281f7a9..23d35dd1 100644
--- a/project/web/src/api/task.ts
+++ b/project/web/src/api/task.ts
@@ -68,14 +68,6 @@ export function apiGetTaskOpportunityList(params: {
return http.get<{ list: TaskOpportunity[] }>(`task/opportunity/list/${params.page}/${params.pageSize}`)
}
-/**
- * 接取任务
- * @param opportunityId
- * @returns
- */
-export function apiAcceptTask(opportunityId: string) {
- return http.post<any>(`task/accept`, { opportunityId })
-}
// 获取已接受的任务列表
export function apiGetUserTaskList(params: {
@@ -94,14 +86,6 @@ export function apiGetUserTaskDetail(id: string) {
return http.get<any>(`task/userTask/info/${id}`)
}
-/**
- * 接取任务
- * @param userTaskId
- * @returns
- */
-export function apiSubmitTask(userTaskId: string, submissionUrl: string) {
- return http.post<any>(`task/submit`, { userTaskId, submissionUrl })
-}
/**
* 获取未读任务数量
diff --git a/project/web/src/app/[lng]/chat/[taskId]/README.md b/project/web/src/app/[lng]/chat/[taskId]/README.md
deleted file mode 100644
index 74cc0ff1..00000000
--- a/project/web/src/app/[lng]/chat/[taskId]/README.md
+++ /dev/null
@@ -1,200 +0,0 @@
-# Chat 对话详情页
-
-## 功能说明
-
-对话详情页支持实时模式和历史模式,可以显示 AI 生成任务的完整对话历史。
-
-## 消息格式支持
-
-### 1. 普通文本消息
-
-```
-将图片换成红色风格生成图文内容发布到抖音小红书推特
-```
-
-### 2. Markdown 引用格式
-
-支持在消息中使用 Markdown 引用格式来附加媒体文件:
-
-```
-将图片换成红色风格生成图文内容发布到抖音小红书推特
-
-[image]: https://aitoearn.s3.ap-southeast-1.amazonaws.com/68abbe6af812ccb3e1a53d68/f646899220b7f9b0cc9bfe2b27ad0d571671121320.jpeg
-```
-
-支持的媒体类型:
-- `[image]: url` - 图片
-- `[video]: url` - 视频
-- `[document]: url` - 文档
-
-### 3. Claude Prompt 格式
-
-支持 Claude API 的标准 prompt 格式(JSON 数组):
-
-```json
-[
- {
- "type": "text",
- "text": "将图片换成红色风格生成图文内容发布到抖音小红书推特"
- },
- {
- "type": "image",
- "source": {
- "type": "url",
- "url": "https://aitoearn.s3.ap-southeast-1.amazonaws.com/68abbe6af812ccb3e1a53d68/f646899220b7f9b0cc9bfe2b27ad0d571671121320.jpeg"
- }
- },
- {
- "type": "video",
- "source": {
- "type": "url",
- "url": "https://example.com/video.mp4"
- }
- },
- {
- "type": "document",
- "source": {
- "type": "url",
- "url": "https://example.com/document.pdf"
- },
- "cache_control": {
- "type": "ephemeral"
- }
- }
-]
-```
-
-支持的内容类型:
-- `text` - 文本内容
-- `image` - 图片(需要 source.url)
-- `video` - 视频(需要 source.url)
-- `document` - 文档(需要 source.url)
-
-可选字段:
-- `cache_control` - 缓存控制配置
-
-## 工作流展示
-
-每条 AI 消息都可以包含多个步骤(steps),每个步骤可以有自己的工作流(workflowSteps):
-
-- 工具调用(tool_call)
-- 工具结果(tool_result)
-- 思考过程(thinking)
-
-工作流会自动展开/收起,活跃步骤默认展开,非活跃步骤默认收起。
-
-## 技术实现
-
-### 核心文件
-
-1. **page.tsx** - 页面主文件
-2. **components/** - 页面私有组件
- - ChatHeader - 顶部导航栏
- - ChatMessageList - 消息列表
- - ChatLoadingSkeleton - 加载骨架屏
-3. **hooks/** - 页面私有 hooks
- - useChatState - 聊天状态管理
- - useScrollControl - 滚动控制
- - useTaskPolling - 任务轮询
-4. **utils/** - 工具函数
- - convertMessages - 消息格式转换
- - parseMessageContent - 消息内容解析(支持多种格式)
- - taskStatus - 任务状态判断
-
-### 消息解析流程
-
-1. 接收后端消息(TaskMessage[])
-2. 使用 `parseUserMessageContent` 解析用户消息内容
- - 自动识别格式(普通文本/Markdown引用/Claude Prompt)
- - 提取文本和媒体文件
-3. 使用 `convertMessages` 转换为显示格式(IDisplayMessage[])
-4. 在 ChatMessage 组件中渲染
-
-### 类型定义
-
-核心类型定义在 `src/store/agent/agent.types.ts`:
-
-```typescript
-// 媒体文件
-interface IUploadedMedia {
- url: string
- type: 'image' | 'video' | 'document'
- progress?: number
- file?: File
- name?: string
- cache_control?: { type: 'ephemeral' }
-}
-
-// Claude Prompt 内容项
-interface IPromptContentItem {
- type: 'text' | 'image' | 'video' | 'document'
- text?: string
- source?: {
- type: 'url' | 'base64'
- url?: string
- data?: string
- media_type?: string
- }
- cache_control?: { type: 'ephemeral' }
-}
-
-// 解析后的内容
-interface IParsedUserContent {
- text: string
- medias: IUploadedMedia[]
- hasSpecialFormat: boolean
-}
-```
-
-## 使用示例
-
-### 发送普通消息
-
-```typescript
-await continueTask({
- prompt: '生成一篇关于AI的文章',
- medias: [],
- t,
- taskId,
-})
-```
-
-### 发送带图片的消息(Markdown 格式)
-
-```typescript
-await continueTask({
- prompt: `将图片换成红色风格
-
-[image]: https://example.com/image.jpg`,
- medias: [],
- t,
- taskId,
-})
-```
-
-### 发送带多媒体的消息(Claude 格式)
-
-```typescript
-const promptArray = [
- { type: 'text', text: '分析这个视频和文档' },
- { type: 'video', source: { type: 'url', url: 'https://example.com/video.mp4' } },
- { type: 'document', source: { type: 'url', url: 'https://example.com/doc.pdf' } },
-]
-
-await continueTask({
- prompt: JSON.stringify(promptArray),
- medias: [],
- t,
- taskId,
-})
-```
-
-## 注意事项
-
-1. **格式自动识别**:系统会自动识别消息格式,无需手动指定
-2. **媒体文件显示**:
- - 图片和视频:显示为缩略图
- - 文档:显示为文件图标 + 文件名
-3. **工作流展示**:活跃步骤自动展开,非活跃步骤自动收起
-4. **滚动行为**:用户在底部附近时,新消息会自动滚动到底部
-5. **错误处理**:解析失败时会回退到普通文本显示
diff --git a/project/web/src/app/[lng]/chat/[taskId]/page.tsx b/project/web/src/app/[lng]/chat/[taskId]/page.tsx
index 570ed91e..22d32865 100644
--- a/project/web/src/app/[lng]/chat/[taskId]/page.tsx
+++ b/project/web/src/app/[lng]/chat/[taskId]/page.tsx
@@ -20,20 +20,9 @@ import { ChatHeader, ChatMessageList, ChatLoadingSkeleton } from './components'
import { useScrollControl, useChatState } from './hooks'
// 测试数据 - 用于测试 createChannel action
-const TEST_RESULT_DATA = {"type":"result","message":{"type":"result","subtype":"success","uuid":"507f3578-d539-43dd-8214-67eee1613e87","duration_ms":198689,"duration_api_ms":41362,"is_error":false,"num_turns":9,"message":"完成!我已经生成了三张竖屏狗狗图片,并准备好发布到推特。由于你的账户还未绑定推特,系统会引导你进入发布页面,在那里你可以:\n\n1. **绑定推特账户**(如果还未绑定)\n2. **查看三条准备好的推文**:\n - 推文1:陪你看过海 + 海边图片\n - 推文2:陪你爬过山 + 山上图片\n - 推文3:你怎么忍心割我蛋蛋 + 傍晚图片\n\n3. **发布到推特**\n\n所有图片和文案都已准备就绪,你只需要完成账户连接并确认发布即可!🐕","result":[
- {"type":"fullContent","title":"陪你看过海","description":"陪你看过海","tags":["狗狗","陪伴","回忆"],"medias":[{"type":"IMAGE","url":"https://aitoearn.s3.ap-southeast-1.amazonaws.com/ai/images/gemini-3-pro-image-preview/690df0fea7aa4267575e2d9c/mjcqx6ux.png"}],
- "action":"navigateToPublish","platform":"twitter"},
- // {"type":"fullContent","title":"陪你爬过山","description":"陪你爬过山","tags":["狗狗","陪伴","冒险"],"medias":[{"type":"IMAGE","url":"https://aitoearn.s3.ap-southeast-1.amazonaws.com/ai/images/gemini-3-pro-image-preview/690df0fea7aa4267575e2d9c/mjcqykej.png"}],
- // "action":"navigateToPublish","platform":"twitter"},
- // {"type":"fullContent","title":"你怎么忍心割我蛋蛋","description":"你怎么忍心割我蛋蛋","tags":["狗狗","可爱","搞笑"],"medias":[{"type":"IMAGE","url":"https://aitoearn.s3.ap-southeast-1.amazonaws.com/ai/images/gemini-3-pro-image-preview/690df0fea7aa4267575e2d9c/mjcqzehm.png"}],
- // "action":"navigateToPublish","platform":"twitter"}
-],"total_cost_usd":0.2299501,"usage":{"cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":164958},"cache_creation_input_tokens":164958,"cache_read_input_tokens":63716,"input_tokens":34,"output_tokens":1922,"server_tool_use":{"web_search_requests":0}},"permission_denials":[]}}
+const TEST_RESULT_DATA = {}
-
-// {"type":"result","message":{"type":"result","subtype":"success","uuid":"653d19f6-b1a4-4bc6-910b-f813c68c65a0","duration_ms":23024,"duration_api_ms":28454,"is_error":false,"num_turns":5,"message":"完成!我已经为你准备好了小红书发布内容。系统已引导你进入小红书发布页面,你可以:\n\n1. **绑定小红书账户**(如果还未绑定)\n2. **查看准备好的内容**:\n - 标题:陪你看过海,陪你爬过山\n - 描述:包含三分图的完整文案\n - 标签:#狗狗 #陪伴 #回忆 #搞笑 #宠物\n\n3. **上传并发布**这张精美的三分图到小红书\n\n所有内容都已准备就绪,你只需要完成账户连接并确认发布即可!🐕✨","result":[{"type":"fullContent","title":"陪你看过海,陪你爬过山","description":"上方小狗在海边眺望远方 陪你看过海,中方小狗在山上眺望远方 陪你爬过山,下方傍晚天气小狗正脸 你怎么忍心割我蛋蛋。三分图设计,温馨搞笑兼具的狗狗陪伴主题。","tags":["狗狗","陪伴","回忆","搞笑","宠物"],"medias":[{"type":"IMAGE","url":"https://aitoearn.s3.ap-southeast-1.amazonaws.com/ai/images/gemini-3-pro-image-preview/690df0fea7aa4267575e2d9c/mjcrjbr6.png"}],
-// "action":"navigateToPublish","platform":"xhs"}],"total_cost_usd":0.1240453,"usage":{"cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":82734},"cache_creation_input_tokens":82734,"cache_read_input_tokens":94298,"input_tokens":21,"output_tokens":844,"server_tool_use":{"web_search_requests":0}},"permission_denials":[]}}
-
// 测试模式:设置为 true 时,点击发送不发送请求,直接返回测试数据 00.00
const TEST_MODE = false
diff --git a/project/web/src/app/[lng]/chat/test/page.tsx b/project/web/src/app/[lng]/chat/test/page.tsx
deleted file mode 100644
index e5be2828..00000000
--- a/project/web/src/app/[lng]/chat/test/page.tsx
+++ /dev/null
@@ -1,565 +0,0 @@
-/**
- * SSE 消息处理测试页面
- * 功能:模拟 SSE 返回数据,测试消息处理和插件发布流程
- */
-'use client'
-
-import { useState, useCallback, useEffect } from 'react'
-import { useRouter, useParams } from 'next/navigation'
-import { useShallow } from 'zustand/react/shallow'
-import { Button } from '@/components/ui/button'
-import { useAgentStore } from '@/store/agent'
-import { usePluginStore } from '@/store/plugin'
-import { useAccountStore } from '@/store/account'
-import { PluginStatus } from '@/store/plugin/types/baseTypes'
-import type { PluginPlatformType } from '@/store/plugin/types/baseTypes'
-import { useTransClient } from '@/app/i18n/client'
-import type { ISSEMessage } from '@/store/agent/agent.types'
-
-// 完整的 SSE 返回数据
-const SSE_RESULT_DATA: ISSEMessage = {
- type: 'result',
- message: {
- type: 'result',
- subtype: 'success',
- uuid: 'f71410ec-3b27-45a7-9241-128f818aaf1b',
- duration_ms: 186431,
- duration_api_ms: 121959,
- is_error: false,
- num_turns: 16,
- message: `完成!已成功为您处理红色风格图片并发布到三个平台:
-
-✅ **推特(Twitter)**:已成功发布
-- 内容:🔴 Red Vibes Only! Embracing the power and passion of red aesthetics ❤️
-- 标签:#RedAesthetic #VibrantVibes #ColorPop #ArtisticVision
-
-📱 **抖音**:内容已准备好,请前往发布页面手动发布
-- 标题:红色美学|热情活力的视觉盛宴
-- 话题:#红色美学 #色彩艺术 #视觉设计 #摄影调色 #艺术分享
-
-📱 **小红书**:内容已准备好,请前往发布页面手动发布
-- 标题:🔴红色美学|热情活力的视觉盛宴
-- 话题:#红色美学 #色彩艺术 #摄影调色 #视觉设计 #艺术分享
-
-由于抖音和小红书平台暂不支持自动发布,系统已为您准备好内容和图片,您可以前往对应平台的发布页面完成发布操作。`,
- result: [
- {
- type: 'fullContent',
- title: '🔴 Red Vibes Only! Embracing the power and passion of red aesthetics ❤️',
- description:
- '🔴 Red Vibes Only! Embracing the power and passion of red aesthetics ❤️ #RedAesthetic #VibrantVibes #ColorPop #ArtisticVision',
- tags: [],
- medias: [
- {
- type: 'IMAGE',
- url: 'https://aitoearn.s3.ap-southeast-1.amazonaws.com/ai/images/gemini-3-pro-image-preview/68abbe6af812ccb3e1a53d68/mj9tg7gz.png',
- },
- ],
- action: 'none',
- platform: 'twitter',
- },
- {
- type: 'fullContent',
- title: '红色美学|热情活力的视觉盛宴',
- description:
- '🔴 红色美学来袭!感受红色带来的热情与力量,每一帧都充满艺术感染力。这组红色调色让整个画面都充满了温暖和活力✨ 你喜欢这种红色风格吗?',
- tags: ['红色美学', '色彩艺术', '视觉设计', '摄影调色', '艺术分享'],
- medias: [
- {
- type: 'IMAGE',
- url: 'https://aitoearn.s3.ap-southeast-1.amazonaws.com/ai/images/gemini-3-pro-image-preview/68abbe6af812ccb3e1a53d68/mj9tg7gz.png',
- },
- ],
- action: 'navigateToPublish',
- platform: 'douyin',
- accountId: 'douyin_MS4wLjABAAAATHE9sjNjL2xUmIvoGev3Q1wNVZCAsEzwX06VlzyCZztj0jBV-dMdN6cETZghdV3y_web',
- errorMessage: '抖音平台发布工具暂不支持,请前往发布页面手动发布',
- },
- {
- type: 'fullContent',
- title: '🔴红色美学|热情活力的视觉盛宴',
- description: `🔴 红色美学来袭!
-
-感受红色带来的热情与力量,每一帧都充满艺术感染力💫
-
-这组红色调色让整个画面都充满了温暖和活力,红色不仅是一种颜色,更是一种态度和表达✨
-
-你最喜欢哪种风格的调色呢?评论区告诉我~`,
- tags: ['红色美学', '色彩艺术', '摄影调色', '视觉设计', '艺术分享'],
- medias: [
- {
- type: 'IMAGE',
- url: 'https://aitoearn.s3.ap-southeast-1.amazonaws.com/ai/images/gemini-3-pro-image-preview/68abbe6af812ccb3e1a53d68/mj9tg7gz.png',
- },
- ],
- action: 'navigateToPublish',
- platform: 'xhs',
- accountId: 'xhs_681b9361000000000801588b_web',
- errorMessage: '小红书平台发布工具暂不支持,请前往发布页面手动发布',
- },
- ],
- total_cost_usd: 1.26249485,
- usage: {
- cache_creation: {
- ephemeral_1h_input_tokens: 0,
- ephemeral_5m_input_tokens: 299859,
- },
- cache_creation_input_tokens: 299859,
- cache_read_input_tokens: 246602,
- input_tokens: 75,
- output_tokens: 3697,
- server_tool_use: {
- web_search_requests: 0,
- },
- },
- permission_denials: [],
- },
-}
-
-// 只测试小红书的数据
-const XHS_ONLY_RESULT: ISSEMessage = {
- type: 'result',
- message: {
- type: 'result',
- subtype: 'success',
- uuid: 'test-xhs-only',
- message: '小红书发布测试',
- result: [
- {
- type: 'fullContent',
- title: '🔴红色美学|热情活力的视觉盛宴',
- description: `🔴 红色美学来袭!
-
-感受红色带来的热情与力量,每一帧都充满艺术感染力💫
-
-这组红色调色让整个画面都充满了温暖和活力,红色不仅是一种颜色,更是一种态度和表达✨
-
-你最喜欢哪种风格的调色呢?评论区告诉我~`,
- tags: ['红色美学', '色彩艺术', '摄影调色', '视觉设计', '艺术分享'],
- medias: [
- {
- type: 'IMAGE',
- url: 'https://aitoearn.s3.ap-southeast-1.amazonaws.com/ai/images/gemini-3-pro-image-preview/68abbe6af812ccb3e1a53d68/mj9tg7gz.png',
- },
- ],
- action: 'navigateToPublish',
- platform: 'xhs',
- accountId: 'xhs_681b9361000000000801588b_web',
- },
- ],
- total_cost_usd: 0.5,
- },
-}
-
-// 只测试抖音的数据
-const DOUYIN_ONLY_RESULT: ISSEMessage = {
- type: 'result',
- message: {
- type: 'result',
- subtype: 'success',
- uuid: 'test-douyin-only',
- message: '抖音发布测试',
- result: [
- {
- type: 'fullContent',
- title: '红色美学|热情活力的视觉盛宴',
- description:
- '🔴 红色美学来袭!感受红色带来的热情与力量,每一帧都充满艺术感染力。这组红色调色让整个画面都充满了温暖和活力✨ 你喜欢这种红色风格吗?',
- tags: ['红色美学', '色彩艺术', '视觉设计', '摄影调色', '艺术分享'],
- medias: [
- {
- type: 'IMAGE',
- url: 'https://aitoearn.s3.ap-southeast-1.amazonaws.com/ai/images/gemini-3-pro-image-preview/68abbe6af812ccb3e1a53d68/mj9tg7gz.png',
- },
- ],
- action: 'navigateToPublish',
- platform: 'douyin',
- accountId: 'douyin_MS4wLjABAAAATHE9sjNjL2xUmIvoGev3Q1wNVZCAsEzwX06VlzyCZztj0jBV-dMdN6cETZghdV3y_web',
- },
- ],
- total_cost_usd: 0.5,
- },
-}
-
-export default function SSEMessageTestPage() {
- const router = useRouter()
- const { lng } = useParams()
- const { t } = useTransClient('chat')
-
- // Agent Store
- const { handleSSEMessage, handleResult, setActionContext, getActionContext } = useAgentStore(
- useShallow((state) => ({
- handleSSEMessage: state.handleSSEMessage,
- handleResult: state.handleResult,
- setActionContext: state.setActionContext,
- getActionContext: state.getActionContext,
- })),
- )
-
- // Agent 状态
- const { isGenerating, progress, currentCost, messages } = useAgentStore(
- useShallow((state) => ({
- isGenerating: state.isGenerating,
- progress: state.progress,
- currentCost: state.currentCost,
- messages: state.messages,
- })),
- )
-
- // 插件状态
- const { status: pluginStatus, isPublishing, platformAccounts } = usePluginStore(
- useShallow((state) => ({
- status: state.status,
- isPublishing: state.isPublishing,
- platformAccounts: state.platformAccounts,
- })),
- )
-
- // 账号列表
- const { accountGroupList } = useAccountStore(
- useShallow((state) => ({
- accountGroupList: state.accountGroupList,
- })),
- )
-
- // 日志
- const [logs, setLogs] = useState<string[]>([])
- // 选择的测试数据
- const [selectedTest, setSelectedTest] = useState<'all' | 'xhs' | 'douyin'>('xhs')
- // Action Context 是否已设置
- const [isContextSet, setIsContextSet] = useState(false)
-
- // 添加日志
- const addLog = useCallback((message: string) => {
- const timestamp = new Date().toLocaleTimeString()
- setLogs((prev) => [...prev, `[${timestamp}] ${message}`])
- }, [])
-
- // 清空日志
- const clearLogs = useCallback(() => {
- setLogs([])
- }, [])
-
- // 设置 Action 上下文(组件挂载时)
- useEffect(() => {
- addLog('🔧 设置 Action 上下文...')
- setActionContext({
- router,
- lng: lng as string,
- t: t as any,
- })
- setIsContextSet(true)
- addLog('✅ Action 上下文已设置')
-
- // 检查当前上下文
- const ctx = getActionContext()
- addLog(`📋 当前上下文: ${ctx ? 'OK' : 'NULL'}`)
- }, [router, lng, t, setActionContext, getActionContext, addLog])
-
- // 获取所有账号
- const allAccounts = accountGroupList.reduce<any[]>((acc, group) => {
- return [...acc, ...group.children]
- }, [])
-
- // 获取测试数据
- const getTestData = (): ISSEMessage => {
- switch (selectedTest) {
- case 'xhs':
- return XHS_ONLY_RESULT
- case 'douyin':
- return DOUYIN_ONLY_RESULT
- default:
- return SSE_RESULT_DATA
- }
- }
-
- // 测试 handleSSEMessage
- const handleTestSSEMessage = () => {
- const testData = getTestData()
- addLog(`🚀 开始测试 handleSSEMessage (${selectedTest})...`)
- addLog(`📦 消息类型: ${testData.type}`)
- addLog(`📋 结果数量: ${testData.message?.result?.length || 0}`)
-
- // 检查 Action 上下文
- const ctx = getActionContext()
- if (!ctx) {
- addLog('❌ Action 上下文未设置!')
- return
- }
- addLog('✅ Action 上下文已就绪')
-
- try {
- // 调用 handleSSEMessage
- handleSSEMessage(testData)
- addLog('✅ handleSSEMessage 调用完成')
- } catch (error: any) {
- addLog(`❌ handleSSEMessage 错误: ${error.message}`)
- }
- }
-
- // 测试 handleResult (直接调用)
- const handleTestResult = () => {
- const testData = getTestData()
- addLog(`🚀 开始测试 handleResult (${selectedTest})...`)
-
- // 检查 Action 上下文
- const ctx = getActionContext()
- if (!ctx) {
- addLog('❌ Action 上下文未设置!请先点击"设置 Action 上下文"')
- return
- }
- addLog('✅ Action 上下文已就绪')
- addLog(`📋 router: ${ctx.router ? 'OK' : 'NULL'}`)
- addLog(`📋 lng: ${ctx.lng}`)
- addLog(`📋 t: ${typeof ctx.t === 'function' ? 'OK' : 'NULL'}`)
-
- const resultMsg = testData.message
- addLog(`📦 结果消息: ${resultMsg?.message?.substring(0, 50)}...`)
- addLog(`📋 result 数组: ${resultMsg?.result?.length || 0} 个`)
-
- if (resultMsg?.result) {
- resultMsg.result.forEach((item: any, index: number) => {
- addLog(` [${index}] platform: ${item.platform}, action: ${item.action}, type: ${item.type}`)
- })
- }
-
- try {
- // 直接调用 handleResult
- handleResult(resultMsg)
- addLog('✅ handleResult 调用完成')
- } catch (error: any) {
- addLog(`❌ handleResult 错误: ${error.message}`)
- console.error(error)
- }
- }
-
- // 手动重新设置 Action 上下文
- const handleSetContext = () => {
- addLog('🔧 手动设置 Action 上下文...')
- setActionContext({
- router,
- lng: lng as string,
- t: t as any,
- })
- addLog('✅ Action 上下文已设置')
-
- const ctx = getActionContext()
- addLog(`📋 验证上下文: ${ctx ? 'OK' : 'NULL'}`)
- }
-
- // 刷新插件状态
- const handleRefreshPlugin = async () => {
- addLog('🔄 刷新插件状态...')
- await usePluginStore.getState().init()
- addLog(`✅ 插件状态: ${usePluginStore.getState().status}`)
- }
-
- // 登录平台
- const handleLogin = async (platform: PluginPlatformType) => {
- addLog(`🔑 登录 ${platform}...`)
- try {
- const result = await usePluginStore.getState().login(platform)
- addLog(`✅ 登录成功: ${result.nickname} (${result.uid})`)
- await usePluginStore.getState().syncAccountToDatabase(platform)
- addLog('✅ 账号已同步')
- } catch (error: any) {
- addLog(`❌ 登录失败: ${error.message}`)
- }
- }
-
- return (
- <div className="min-h-screen bg-background p-6">
- <div className="max-w-5xl mx-auto">
- <h1 className="text-2xl font-bold text-foreground mb-6">
- 🧪 SSE 消息处理测试
- </h1>
-
- {/* 状态面板 */}
- <div className="grid grid-cols-2 gap-4 mb-6">
- {/* Agent 状态 */}
- <div className="bg-card rounded-lg shadow p-4">
- <h2 className="text-lg font-semibold mb-3">📊 Agent 状态</h2>
- <div className="space-y-2 text-sm">
- <div className="flex justify-between">
- <span className="text-muted-foreground">生成中:</span>
- <span className={isGenerating ? 'text-warning' : 'text-muted-foreground'}>
- {isGenerating ? '是' : '否'}
- </span>
- </div>
- <div className="flex justify-between">
- <span className="text-muted-foreground">进度:</span>
- <span>{progress}%</span>
- </div>
- <div className="flex justify-between">
- <span className="text-muted-foreground">消费:</span>
- <span>${currentCost.toFixed(4)}</span>
- </div>
- <div className="flex justify-between">
- <span className="text-muted-foreground">消息数:</span>
- <span>{messages.length}</span>
- </div>
- <div className="flex justify-between">
- <span className="text-muted-foreground">Action 上下文:</span>
- <span className={isContextSet ? 'text-success' : 'text-destructive'}>
- {isContextSet ? '已设置' : '未设置'}
- </span>
- </div>
- </div>
- </div>
-
- {/* 插件状态 */}
- <div className="bg-card rounded-lg shadow p-4">
- <h2 className="text-lg font-semibold mb-3">🔌 插件状态</h2>
- <div className="space-y-2 text-sm">
- <div className="flex justify-between">
- <span className="text-muted-foreground">插件状态:</span>
- <span
- className={
- pluginStatus === PluginStatus.READY
- ? 'text-success'
- : pluginStatus === PluginStatus.NOT_INSTALLED
- ? 'text-destructive'
- : 'text-warning'
- }
- >
- {pluginStatus}
- </span>
- </div>
- <div className="flex justify-between">
- <span className="text-muted-foreground">发布中:</span>
- <span>{isPublishing ? '是' : '否'}</span>
- </div>
- <div className="flex justify-between">
- <span className="text-muted-foreground">小红书:</span>
- <span>{platformAccounts.xhs?.nickname || '未登录'}</span>
- </div>
- <div className="flex justify-between">
- <span className="text-muted-foreground">抖音:</span>
- <span>{platformAccounts.douyin?.nickname || '未登录'}</span>
- </div>
- <div className="flex justify-between">
- <span className="text-muted-foreground">账号总数:</span>
- <span>{allAccounts.length}</span>
- </div>
- </div>
- </div>
- </div>
-
- {/* 测试数据选择 */}
- <div className="bg-card rounded-lg shadow p-4 mb-6">
- <h2 className="text-lg font-semibold mb-3">📝 测试数据选择</h2>
- <div className="flex gap-2 mb-4">
- <Button
- variant={selectedTest === 'xhs' ? 'default' : 'outline'}
- onClick={() => setSelectedTest('xhs')}
- >
- 仅小红书
- </Button>
- <Button
- variant={selectedTest === 'douyin' ? 'default' : 'outline'}
- onClick={() => setSelectedTest('douyin')}
- >
- 仅抖音
- </Button>
- <Button
- variant={selectedTest === 'all' ? 'default' : 'outline'}
- onClick={() => setSelectedTest('all')}
- >
- 全部平台
- </Button>
- </div>
- <div className="text-sm text-muted-foreground">
- 当前选择: <span className="font-medium text-foreground">{selectedTest}</span>
- {' | '}
- 结果数量: <span className="font-medium text-foreground">{getTestData().message?.result?.length || 0}</span>
- </div>
- </div>
-
- {/* 操作按钮 */}
- <div className="bg-card rounded-lg shadow p-4 mb-6">
- <h2 className="text-lg font-semibold mb-3">🎮 操作</h2>
- <div className="flex flex-wrap gap-3">
- <Button onClick={handleSetContext} variant="outline">
- 🔧 设置 Action 上下文
- </Button>
- <Button onClick={handleRefreshPlugin} variant="outline">
- 🔄 刷新插件状态
- </Button>
- <Button onClick={() => handleLogin('xhs' as PluginPlatformType)} variant="outline">
- 🔑 登录小红书
- </Button>
- <Button onClick={() => handleLogin('douyin' as PluginPlatformType)} variant="outline">
- 🔑 登录抖音
- </Button>
- </div>
- <div className="flex flex-wrap gap-3 mt-4 pt-4 border-t">
- <Button
- onClick={handleTestSSEMessage}
- disabled={!isContextSet}
- className="bg-info hover:bg-info/90"
- >
- 📨 测试 handleSSEMessage
- </Button>
- <Button
- onClick={handleTestResult}
- disabled={!isContextSet}
- className="bg-destructive hover:bg-destructive/90"
- >
- 🚀 测试 handleResult (直接调用)
- </Button>
- <Button onClick={clearLogs} variant="ghost">
- 🗑️ 清空日志
- </Button>
- </div>
- </div>
-
- {/* 测试数据预览 */}
- <div className="bg-card rounded-lg shadow p-4 mb-6">
- <h2 className="text-lg font-semibold mb-3">📋 测试数据预览</h2>
- <div className="bg-muted p-3 rounded text-xs font-mono overflow-auto max-h-48">
- <pre>{JSON.stringify(getTestData().message?.result, null, 2)}</pre>
- </div>
- </div>
-
- {/* 日志输出 */}
- <div className="bg-card rounded-lg shadow p-4">
- <h2 className="text-lg font-semibold mb-3">📋 日志输出</h2>
- <div className="bg-zinc-900 text-success p-4 rounded font-mono text-xs h-80 overflow-auto dark:bg-zinc-950">
- {logs.length === 0 ? (
- <p className="text-zinc-500">等待操作...</p>
- ) : (
- logs.map((log, index) => (
- <p key={index} className="mb-1">
- {log}
- </p>
- ))
- )}
- </div>
- </div>
-
- {/* 使用说明 */}
- <div className="mt-6 text-sm text-muted-foreground">
- <h3 className="font-semibold mb-2">📖 使用说明:</h3>
- <ol className="list-decimal list-inside space-y-1">
- <li>页面加载后会自动设置 Action 上下文(router, lng, t)</li>
- <li>确保插件状态为 READY(如果需要测试发布功能)</li>
- <li>选择要测试的平台(小红书/抖音/全部)</li>
- <li>
- 点击「测试 handleSSEMessage」模拟完整 SSE 消息处理流程
- </li>
- <li>
- 或点击「测试 handleResult」直接调用结果处理(跳过 SSE 解析)
- </li>
- <li>观察日志和控制台输出</li>
- </ol>
- <div className="mt-4 p-3 bg-warning/10 border border-warning/20 rounded">
- <p className="text-warning-foreground">
- <strong>关键点:</strong> handleResult 需要 actionContext 才能执行 ActionRegistry.executeBatch。
- 本页面会在挂载时自动设置上下文,也可以手动点击「设置 Action 上下文」按钮。
- </p>
- </div>
- </div>
- </div>
- </div>
- )
-}
diff --git a/project/web/src/app/[lng]/tasks/taskPageCore.module.scss b/project/web/src/app/[lng]/tasks/taskPageCore.module.scss
index 3c1f83ca..0ee2cef7 100644
--- a/project/web/src/app/[lng]/tasks/taskPageCore.module.scss
+++ b/project/web/src/app/[lng]/tasks/taskPageCore.module.scss
@@ -106,6 +106,36 @@
.ant-spin-container {
min-height: 200px;
}
+
+ /* 任务机会详情(taskDetail modal)布局:左右列,移动端堆叠 */
+ .taskDetailContainer {
+ display: flex;
+ gap: 24px;
+ align-items: flex-start;
+ margin-bottom: 16px;
+
+ .taskDetailLeft {
+ flex: 0 0 320px;
+ }
+
+ .taskDetailRight {
+ flex: 1;
+ min-width: 260px;
+ }
+ }
+
+ @media (max-width: 768px) {
+ .taskDetailContainer {
+ flex-direction: column;
+ gap: 12px;
+ .taskDetailLeft {
+ width: 100%;
+ }
+ .taskDetailRight {
+ width: 100%;
+ }
+ }
+ }
}
// 响应式设计
@@ -145,3 +175,81 @@
}
}
}
+
+/* 任务详情模态框布局(接受的任务详情与机会详情) */
+.taskPage {
+ .acceptedTaskDetailContainer {
+ display: flex;
+ gap: 32px;
+ margin-bottom: 24px;
+ align-items: flex-start;
+
+ .left {
+ flex: 0 0 320px;
+ }
+
+ .right {
+ flex: 1;
+ min-width: 300px;
+ }
+ }
+
+ .taskDetailActions {
+ text-align: center;
+ padding-top: 16px;
+ border-top: 1px solid #e8e8e8;
+ display: flex;
+ gap: 12px;
+ justify-content: space-between;
+ align-items: center;
+
+ .ant-btn {
+ min-width: 140px;
+ }
+
+ .firstSubmissionWrap {
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ min-width: 120px;
+ }
+
+ .firstSubmission {
+ font-size: 12px;
+ color: #52c41a;
+ font-weight: 600;
+ margin-left: 8px;
+ }
+ }
+
+ /* 改进首次提交 pill 风格 */
+ .firstSubmission {
+ display: inline-block;
+ background: #e6ffed;
+ color: #237804;
+ padding: 6px 10px;
+ border-radius: 9999px;
+ font-size: 12px;
+ font-weight: 600;
+ border: 1px solid rgba(35,120,4,0.12);
+ }
+
+ @media (max-width: 768px) {
+ .acceptedTaskDetailContainer {
+ flex-direction: column;
+ gap: 12px;
+
+ .left {
+ flex: none;
+ width: 100%;
+ }
+
+ .right {
+ min-width: 0;
+ width: 100%;
+ }
+ }
+
+ /* 保持状态和首次提交在同一行,移动端也采用左右对齐 */
+ }
+}
\ No newline at end of file
diff --git a/project/web/src/app/[lng]/tasks/taskPageCore.tsx b/project/web/src/app/[lng]/tasks/taskPageCore.tsx
index 55aeb5b9..217eeca8 100644
--- a/project/web/src/app/[lng]/tasks/taskPageCore.tsx
+++ b/project/web/src/app/[lng]/tasks/taskPageCore.tsx
@@ -21,10 +21,8 @@ import { Badge } from '@/components/ui/badge'
import { Spin } from '@/components/ui/spin'
import { Empty } from '@/components/ui/empty'
import { Card } from '@/components/ui/card'
-import { Steps } from '@/components/ui/steps'
import { List } from '@/components/ui/list'
import { Pagination } from '@/components/ui/pagination'
-import { Radio } from '@/components/ui/radio'
import { Row, Col } from '@/components/ui/grid'
import Image from 'next/image'
import { useParams, useRouter } from 'next/navigation'
@@ -32,22 +30,16 @@ import React, { useEffect, useState } from 'react'
import { getAccountListApi } from '@/api/account'
import { apiGetMaterialList } from '@/api/material'
import { acceptTask, getTaskDetail, submitTask } from '@/api/notification'
-import { apiCreatePublish } from '@/api/plat/publish'
import {
- apiAcceptTask,
apiGetTaskOpportunityList,
apiGetUserTaskDetail,
apiGetUserTaskList,
- apiMarkTaskAsViewed,
- apiSubmitTask,
+ apiMarkTaskAsViewed
} from '@/api/task'
-import { getDays, getUtcDays } from '@/app/[lng]/accounts/components/CalendarTiming/calendarTiming.utils'
-import { getAppDownloadConfig, getTasksRequiringApp } from '@/app/config/appDownloadConfig'
import { AccountPlatInfoMap } from '@/app/config/platConfig'
import { useTransClient } from '@/app/i18n/client'
-import DownloadAppModal from '@/components/common/DownloadAppModal'
+import MediaPreview from '@/components/common/MediaPreview'
import { useUserStore } from '@/store/user'
-import { generateUUID } from '@/utils'
import { getOssUrl } from '@/utils/oss'
import styles from './taskPageCore.module.scss'
import PublishDialog from '@/components/PublishDialog'
@@ -117,28 +109,6 @@ export default function TaskPageCore() {
url: string
title?: string
} | null>(null)
- const [videoRef, setVideoRef] = useState<HTMLVideoElement | null>(null)
-
- // Task progress modal state
- const [taskProgressVisible, setTaskProgressVisible] = useState(false)
- const [taskProgress, setTaskProgress] = useState({
- currentStep: 0,
- steps: [
- { title: t('acceptingTask' as any), status: 'processing' },
- { title: t('publishingTask' as any), status: 'wait' },
- { title: t('submittingTask' as any), status: 'wait' },
- { title: t('taskCompleted' as any), status: 'wait' },
- ],
- })
-
- // 下载App弹窗状态 - 暂时注释
- const [downloadAppVisible, setDownloadAppVisible] = useState(false)
- const [downloadAppConfig, setDownloadAppConfig] = useState({
- platform: '',
- appName: '',
- downloadUrl: '',
- qrCodeUrl: '' as string | undefined,
- })
// 账号选择弹窗状态
const [accountSelectVisible, setAccountSelectVisible] = useState(false)
@@ -154,18 +124,22 @@ export default function TaskPageCore() {
total: 0,
})
- // 推荐草稿选择状态
- const [selectedMaterial, setSelectedMaterial] = useState<any>(null) // 选中的推荐草稿
+ // 推荐草稿选择状态(已移除:任务提交/发布不再依赖草稿,详情仅作展示)
const [requiredAccountTypes, setRequiredAccountTypes] = useState<string[]>([])
// Accepted task detail material list state
const [acceptedTaskMaterialList, setAcceptedTaskMaterialList] = useState<any[]>([])
const [acceptedTaskMaterialLoading, setAcceptedTaskMaterialLoading] = useState(false)
+ // 任务信息卡片数量,用于控制对齐(只有一个时左对齐)
+ const infoItemsCount = (
+ (taskDetail?.reward && taskDetail.reward > 0 ? 1 : 0) +
+ (taskDetail?.cpmReward && taskDetail.cpmReward > 0 ? 1 : 0) +
+ (taskDetail?.type ? 1 : 0)
+ )
// Publish dialog state
const [publishDialogOpen, setPublishDialogOpen] = useState(false)
const [publishDefaultAccountId, setPublishDefaultAccountId] = useState<string | undefined>(undefined)
const [pendingUserTaskIdForPublish, setPendingUserTaskIdForPublish] = useState<string | undefined>(undefined)
- const [pendingTaskMaterialIdForPublish, setPendingTaskMaterialIdForPublish] = useState<string | undefined>(undefined)
const [pendingTaskForPublish, setPendingTaskForPublish] = useState<any | null>(null)
// Fetch pending tasks list
@@ -246,60 +220,6 @@ export default function TaskPageCore() {
}
}
- // 接受任务
- const handleAcceptTask = async (task: any) => {
- // 打开任务详情让用户选择素材并完成接取/发布流程
- await handleViewTaskDetail(task.id)
-
- // TODO: 添加平台限制检查
- // if (!task.accountTypes || task.accountTypes.length === 0) {
- // // 没有账号类型限制,直接接取任务
- // await doAcceptTask(task);
- // return;
- // }
-
- // // Check platforms that require App operation
- // const appRequiredPlatforms = getTasksRequiringApp(task.accountTypes);
-
- // if (appRequiredPlatforms.length > 0) {
- // // 有需要App操作的平台,显示第一个平台的下载提示
- // const firstPlatform = appRequiredPlatforms[0];
- // const config = getAppDownloadConfig(firstPlatform);
-
- // if (config) {
- // setDownloadAppConfig({
- // platform: config.platform,
- // appName: config.appName,
- // downloadUrl: config.downloadUrl,
- // qrCodeUrl: config.qrCodeUrl
- // });
- // setDownloadAppVisible(true);
- // return;
- // }
- // }
-
- // // Other task types can be accepted normally
- // await doAcceptTask(task);
- }
-
- // 执行接受任务
- const doAcceptTask = async (task: TaskOpportunity) => {
- try {
- const response = await apiAcceptTask(task.id)
- if (response && response.code === 0) {
- toast.success(t('messages.acceptTaskSuccess'))
- // 刷新任务列表
- fetchPendingTasks()
- fetchAcceptedTasks()
- // 切换到已接受任务标签
- setActiveTab('accepted')
- }
- }
- catch (error) {
- toast.error(t('messages.acceptTaskFailed'))
- console.error('接受任务失败:', error)
- }
- }
// 获取平台显示名称
const getPlatformName = (type: string) => {
@@ -384,8 +304,8 @@ export default function TaskPageCore() {
// Get task status tag
const getTaskStatusTag = (status: string) => {
const statusMap: Record<string, { color: string, text: string }> = {
- pending: { color: 'green', text: t('taskStatus.pending' as any) }, // pending means completed
- doing: { color: 'orange', text: t('taskStatus.doing' as any) }, // doing means pending
+ pending: { color: 'green', text: t('taskStatus.pending' as any) }, // pending: 已完成
+ doing: { color: 'blue', text: t('taskStatus.doing' as any) }, // doing: 进行中
accepted: { color: 'blue', text: t('taskStatus.accepted' as any) },
completed: { color: 'green', text: t('taskStatus.completed' as any) },
rejected: { color: 'red', text: t('taskStatus.rejected' as any) },
@@ -396,11 +316,11 @@ export default function TaskPageCore() {
// 将 antd Tag 的 color 转换为 Badge 的样式类
const getBadgeClassName = (color?: string) => {
const colorMap: Record<string, string> = {
- orange: 'bg-orange-100 text-orange-800 border-orange-200',
- green: 'bg-green-100 text-green-800 border-green-200',
- blue: 'bg-blue-100 text-blue-800 border-blue-200',
- red: 'bg-red-100 text-red-800 border-red-200',
- default: 'bg-gray-100 text-gray-800 border-gray-200',
+ orange: 'bg-orange-100 text-orange-800 border-orange-200 hover:bg-orange-100',
+ green: 'bg-green-100 text-green-800 border-green-200 hover:bg-green-100',
+ blue: 'bg-blue-100 text-blue-800 border-blue-200 hover:bg-blue-100',
+ red: 'bg-red-100 text-red-800 border-red-200 hover:bg-red-100',
+ default: 'bg-gray-100 text-gray-800 border-gray-200 hover:bg-gray-100',
}
return colorMap[color || 'default'] || colorMap.default
}
@@ -420,51 +340,10 @@ export default function TaskPageCore() {
// 处理任务操作(接受任务)
const handleTaskAction = (task: any) => {
- // 首先检查任务支持的所有平台是否都需要App操作
- const taskPlatforms = task.accountTypes || []
- const appRequiredPlatforms = getTasksRequiringApp(taskPlatforms)
-
- // 如果所有平台都需要App操作,直接显示下载App提示
- if (appRequiredPlatforms.length > 0 && appRequiredPlatforms.length === taskPlatforms.length) {
- const firstPlatform = appRequiredPlatforms[0]
- const config = getAppDownloadConfig(firstPlatform)
-
- if (config) {
- setDownloadAppConfig({
- platform: config.platform,
- appName: config.appName,
- downloadUrl: config.downloadUrl,
- qrCodeUrl: config.qrCodeUrl,
- })
- setDownloadAppVisible(true)
- return
- }
- }
-
// 如果任务指定了账号,使用指定账号的逻辑
if (task.accountId) {
const publishAccount = getAccountById(task.accountId)
if (publishAccount) {
- // 检查发布账号的平台是否需要App操作
- const appRequiredPlatforms = getTasksRequiringApp([publishAccount.type])
-
- if (appRequiredPlatforms.length > 0) {
- // 有需要App操作的平台,显示第一个平台的下载提示
- const firstPlatform = appRequiredPlatforms[0]
- const config = getAppDownloadConfig(firstPlatform)
-
- if (config) {
- setDownloadAppConfig({
- platform: config.platform,
- appName: config.appName,
- downloadUrl: config.downloadUrl,
- qrCodeUrl: config.qrCodeUrl,
- })
- setDownloadAppVisible(true)
- return
- }
- }
-
// 直接使用指定账号接受任务
handleAcceptTaskFromDetail(task, publishAccount)
return
@@ -478,7 +357,6 @@ export default function TaskPageCore() {
// 没有符合条件的账号,跳转到账户界面并弹出授权界面
setRequiredAccountTypes(task.accountTypes || [])
setTaskDetailModalVisible(false) // 关闭任务详情弹窗
- // 关闭消息通知弹窗
toast.info(t('accountSelect.redirectingToAccounts' as any))
// 构建跳转URL,包含需要的平台类型参数
@@ -495,26 +373,6 @@ export default function TaskPageCore() {
if (availableAccounts.length === 1) {
// 只有一个符合条件的账号,直接使用
const account = availableAccounts[0]
-
- // 检查是否需要App操作
- const appRequiredPlatforms = getTasksRequiringApp([account.type])
- if (appRequiredPlatforms.length > 0) {
- const firstPlatform = appRequiredPlatforms[0]
- const config = getAppDownloadConfig(firstPlatform)
-
- if (config) {
- setDownloadAppConfig({
- platform: config.platform,
- appName: config.appName,
- downloadUrl: config.downloadUrl,
- qrCodeUrl: config.qrCodeUrl,
- })
- setDownloadAppVisible(true)
- return
- }
- }
-
- // 直接使用这个账号接受任务
handleAcceptTaskFromDetail(task, account)
return
}
@@ -529,24 +387,6 @@ export default function TaskPageCore() {
setSelectedAccount(account)
setAccountSelectVisible(false)
- // 检查是否需要App操作
- const appRequiredPlatforms = getTasksRequiringApp([account.type])
- if (appRequiredPlatforms.length > 0) {
- const firstPlatform = appRequiredPlatforms[0]
- const config = getAppDownloadConfig(firstPlatform)
-
- if (config) {
- setDownloadAppConfig({
- platform: config.platform,
- appName: config.appName,
- downloadUrl: config.downloadUrl,
- qrCodeUrl: config.qrCodeUrl,
- })
- setDownloadAppVisible(true)
- return
- }
- }
-
// 使用选择的账号接受任务
if (taskDetail) {
handleAcceptTaskFromDetail(taskDetail, account)
@@ -565,26 +405,6 @@ export default function TaskPageCore() {
if (newAvailableAccounts.length === 1) {
// 只有一个新账号,直接使用
const account = newAvailableAccounts[0]
-
- // 检查是否需要App操作
- const appRequiredPlatforms = getTasksRequiringApp([account.type])
- if (appRequiredPlatforms.length > 0) {
- const firstPlatform = appRequiredPlatforms[0]
- const config = getAppDownloadConfig(firstPlatform)
-
- if (config) {
- setDownloadAppConfig({
- platform: config.platform,
- appName: config.appName,
- downloadUrl: config.downloadUrl,
- qrCodeUrl: config.qrCodeUrl,
- })
- setDownloadAppVisible(true)
- return
- }
- }
-
- // 直接使用这个账号接受任务
handleAcceptTaskFromDetail(taskDetail, account)
}
else {
@@ -614,10 +434,7 @@ export default function TaskPageCore() {
pageSize,
total: response.data.total || 0,
})
- // 默认选中第一个素材
- if (response.data.list && response.data.list.length > 0 && !selectedMaterial) {
- setSelectedMaterial(response.data.list[0])
- }
+ // 示例仅用于展示,不在任务提交/发布流程中自动选择素材
}
}
catch (error) {
@@ -638,8 +455,7 @@ export default function TaskPageCore() {
setTaskDetail(response.data)
setTaskDetailModalVisible(true)
- // 重置推荐草稿选择状态
- setSelectedMaterial(null)
+ // 示例仅用于展示,不在任务提交/发布流程中自动选择素材
// 如果有 materialGroupId,获取素材列表
if (response.data.materialGroupId) {
@@ -720,92 +536,26 @@ export default function TaskPageCore() {
if (!task)
return
- // 使用选中的推荐草稿(如果有); 不要使用回退素材,直接发布模式下不自动填充
- // const material will be read again after accept to ensure current selectedMaterial is used
-
// Close detail modal
setTaskDetailModalVisible(false)
- // Show progress modal
- setTaskProgressVisible(true)
- setTaskProgress({
- currentStep: 0,
- steps: [
- { title: t('acceptingTask'), status: 'processing' },
- { title: t('publishingTask'), status: 'wait' },
- { title: t('submittingTask'), status: 'wait' },
- { title: t('taskCompleted'), status: 'wait' },
- ],
- })
-
try {
- // 第一步:接受任务(只接受,不自动发布)
+ // 接受任务(只接受,不自动发布)
const response: any = await acceptTask(task.id, task.opportunityId, account?.id)
if (response && response.code === 0 && response.data.id) {
// 接受成功,准备打开发布弹窗以供用户确认发布
const publishAccount = account || getAccountById(task.accountId)
- const material = selectedMaterial
+ // 不再使用推荐草稿作为发布/提交必须参数
- // 保存待提交任务信息,等待用户在发布弹窗发布后调用提交接口(可能没有 material)
+ // 保存待提交任务信息(不再依赖素材 id)
setPendingUserTaskIdForPublish(response.data.id)
- setPendingTaskMaterialIdForPublish(material?._id)
setPendingTaskForPublish(task)
// 初始化发布弹窗的数据(传入当前的账号列表并默认选中发布账号)
try {
usePublishDialog.getState().init(accountList.length > 0 ? accountList : (publishAccount ? [publishAccount] : []), publishAccount?.id)
- // 预填充当前账号的发布参数(优先使用推荐草稿 material,否则使用 task 的描述/标题)
- const videos = material?.mediaList?.filter((m: any) => m.type === 'video') || []
- const images = material?.mediaList?.filter((m: any) => m.type !== 'video') || []
-
- const imgFiles = images.map((img: any) => ({
- id: generateUUID(),
- size: 0,
- file: {} as any,
- imgUrl: getOssUrl(img.url),
- filename: '',
- imgPath: '',
- width: 0,
- height: 0,
- ossUrl: getOssUrl(img.url),
- }))
-
- const videoFile = videos.length > 0 ? {
- size: 0,
- file: {} as any,
- videoUrl: '',
- ossUrl: getOssUrl(videos[0].url),
- filename: '',
- width: 0,
- height: 0,
- duration: 0,
- cover: {
- id: generateUUID(),
- size: 0,
- file: {} as any,
- imgUrl: material?.coverUrl ? getOssUrl(material.coverUrl) : (videos[0].cover ? getOssUrl(videos[0].cover) : ''),
- filename: '',
- imgPath: '',
- width: 0,
- height: 0,
- ossUrl: material?.coverUrl ? getOssUrl(material.coverUrl) : (videos[0].cover ? getOssUrl(videos[0].cover) : ''),
- },
- } as any : undefined
-
- const pubParmas: any = {
- des: material?.desc || task.description || '',
- title: material?.title || task.title || '',
- images: imgFiles.length > 0 ? imgFiles : undefined,
- video: videoFile,
- option: {},
- }
-
if (publishAccount) {
- // 如果选择了草稿则预填参数,否则不预填
- if (material) {
- usePublishDialog.getState().setOnePubParams(pubParmas, publishAccount.id)
- }
setPublishDefaultAccountId(publishAccount.id)
}
}
@@ -815,7 +565,6 @@ export default function TaskPageCore() {
// 打开发布弹窗,用户手动确认发布
setTaskDetailModalVisible(false)
- // 把 taskId 传入 PublishDialog,供其在发布完成时调用回调
setPublishDialogOpen(true)
// 切换到已接受任务标签
setActiveTab('accepted')
@@ -826,7 +575,6 @@ export default function TaskPageCore() {
}
catch (error) {
toast.error('Task processing failed')
- setTaskProgressVisible(false)
}
}
@@ -835,149 +583,34 @@ export default function TaskPageCore() {
if (!currentTaskId)
return
- // Check if the platform requires App operation
+ // 获取发布账号
const publishAccount = getAccountById(acceptedTaskDetail.accountId)
- if (publishAccount) {
- const appRequiredPlatforms = getTasksRequiringApp([publishAccount.type])
-
- if (appRequiredPlatforms.length > 0) {
- // Platform requires App operation, show download prompt
- const firstPlatform = appRequiredPlatforms[0]
- const config = getAppDownloadConfig(firstPlatform)
-
- if (config) {
- setDownloadAppConfig({
- platform: config.platform,
- appName: config.appName,
- downloadUrl: config.downloadUrl,
- qrCodeUrl: config.qrCodeUrl,
- })
- setDownloadAppVisible(true)
- return
- }
- }
+ if (!publishAccount) {
+ toast.error(t('messages.accountNotFound' as any) || 'Account not found')
+ return
}
- // 显示进度弹窗
- setTaskProgressVisible(true)
- setTaskProgress({
- currentStep: 0,
- steps: [
- { title: t('completeTask' as any), status: 'processing' },
- { title: t('publishingTask' as any), status: 'wait' },
- { title: t('submittingTask' as any), status: 'wait' },
- { title: t('taskCompleted' as any), status: 'wait' },
- ],
- })
-
- try {
- // Update progress: step 1 complete, start step 2
- setTaskProgress(prev => ({
- ...prev,
- currentStep: 1,
- steps: [
- { title: t('completeTask'), status: 'finish' },
- { title: t('publishingTask'), status: 'processing' },
- { title: t('submittingTask'), status: 'wait' },
- { title: t('taskCompleted'), status: 'wait' },
- ],
- }))
-
- // 第二步:发布任务
- const publishAccount = getAccountById(acceptedTaskDetail.accountId)
- if (publishAccount) {
- // 处理素材链接,确保使用完整链接
- const processedMaterials = acceptedTaskDetail.task?.materials?.map((material: any) => ({
- ...material,
- coverUrl: material.coverUrl ? getOssUrl(material.coverUrl) : undefined,
- mediaList: material.mediaList?.map((media: any) => ({
- ...media,
- url: getOssUrl(media.url),
- coverUrl: media.coverUrl ? getOssUrl(media.coverUrl) : undefined,
- })),
- }))
-
- const publishData = {
- flowId: `${publishAccount.uid}_${generateUUID()}`, // 使用账号的uid作为flowId
- accountType: publishAccount.type,
- accountId: publishAccount.id,
- title: acceptedTaskDetail.task?.title,
- desc: acceptedTaskDetail.task?.description,
- type: acceptedTaskDetail.task?.type as any, // 转换为PubType
- // 处理素材数据
- videoUrl: processedMaterials?.[0]?.mediaList?.[0]?.type === 'video'
- ? getOssUrl(processedMaterials[0].mediaList[0].url)
- : undefined,
- coverUrl: processedMaterials?.[0]?.coverUrl,
- imgUrlList: processedMaterials?.flatMap((material: any) =>
- material.mediaList?.filter((media: any) => media.type !== 'video')
- .map((media: any) => getOssUrl(media.url)) || [],
- ),
- option: {},
- topics: [],
- publishTime: getUtcDays(getDays().add(6, 'minute')).format(),
- userTaskId: acceptedTaskDetail.task?.id,
- taskMaterialId: acceptedTaskDetail.task?.materialIds[0],
+ // 获取任务素材
+ const materials = acceptedTaskDetail.task?.materials || []
+ const material = materials.length > 0 ? materials[0] : null
- }
+ // 保存待提交任务信息(不再依赖素材 id)
+ setPendingUserTaskIdForPublish(acceptedTaskDetail.id)
+ // material id 不再用于提交流程
+ setPendingTaskForPublish(acceptedTaskDetail.task)
- const publishResponse: any = await apiCreatePublish(publishData)
- if (publishResponse && publishResponse.code === 0) {
- // Update progress: step 2 complete, start step 3
- setTaskProgress(prev => ({
- ...prev,
- currentStep: 2,
- steps: [
- { title: t('completeTask'), status: 'finish' },
- { title: t('publishingTask'), status: 'finish' },
- { title: t('submittingTask'), status: 'processing' },
- { title: t('taskCompleted'), status: 'wait' },
- ],
- }))
-
- // 第三步:提交任务
- const userTaskId = acceptedTaskDetail.id
- const submitResponse: any = await submitTask(userTaskId, acceptedTaskDetail.task?.materialIds[0])
-
- if (submitResponse && submitResponse.code === 0) {
- // Update progress: step 3 complete, start step 4
- setTaskProgress(prev => ({
- ...prev,
- currentStep: 3,
- steps: [
- { title: t('completeTask'), status: 'finish' },
- { title: t('publishingTask'), status: 'finish' },
- { title: t('submittingTask'), status: 'finish' },
- { title: t('taskCompleted'), status: 'finish' },
- ],
- }))
-
- // 延迟1秒后关闭进度窗口并刷新任务列表
- setTimeout(() => {
- setTaskProgressVisible(false)
- setAcceptedTaskDetailModalVisible(false)
- setAcceptedTaskDetail(null)
- setCurrentTaskId(null)
- fetchAcceptedTasks()
- }, 1000)
- }
- else {
- throw new Error('Failed to submit task')
- }
- }
- else {
- throw new Error('Failed to publish task')
- }
- }
- else {
- throw new Error('Cannot find publish account info')
- }
+ // 初始化发布弹窗的数据
+ try {
+ usePublishDialog.getState().init(accountList.length > 0 ? accountList : [publishAccount], publishAccount.id)
+ setPublishDefaultAccountId(publishAccount.id)
}
- catch (error) {
- console.error('Task processing failed:', error)
- toast.error('Task processing failed')
- setTaskProgressVisible(false)
+ catch (err) {
+ console.error('初始化发布弹窗数据失败', err)
}
+
+ // 打开发布弹窗
+ setAcceptedTaskDetailModalVisible(false)
+ setPublishDialogOpen(true)
}
// Handle pending task page change
@@ -1019,18 +652,6 @@ export default function TaskPageCore() {
setMediaPreviewVisible(true)
}
- // 关闭媒体预览
- const handleCloseMediaPreview = () => {
- // 停止视频播放
- if (videoRef) {
- videoRef.pause()
- videoRef.currentTime = 0
- }
- setMediaPreviewVisible(false)
- setPreviewMedia(null)
- setVideoRef(null)
- }
-
useEffect(() => {
if (token) {
fetchPendingTasks()
@@ -1048,16 +669,34 @@ export default function TaskPageCore() {
// 发布弹窗发布成功回调:校验选中账户是否符合任务要求,符合则提交任务
const handlePublishSuccess = async () => {
+ console.log('完成发布2222@@@')
try {
// 取得发布时选中的账户
const pubListChoosed = usePublishDialog.getState().pubListChoosed || []
- if (pubListChoosed.length === 0) {
+
+ // If opened from task flow and dialog didn't have an explicit selection,
+ // fall back to the task's account (task specifies accountId).
+ let usedAccount: SocialAccount | undefined
+ if (pubListChoosed.length > 0) {
+ usedAccount = pubListChoosed[0].account
+ }
+ else {
+ // Prefer explicit publish default account if set
+ if (publishDefaultAccountId) {
+ usedAccount = getAccountById(publishDefaultAccountId) || undefined
+ }
+ // Otherwise, if the pending task has an accountId, use that
+ if (!usedAccount && pendingTaskForPublish && pendingTaskForPublish.accountId) {
+ usedAccount = getAccountById(pendingTaskForPublish.accountId) || undefined
+ }
+ }
+
+ if (!usedAccount) {
+ console.log('publish.noAccountSelected')
toast.error(t('publish.noAccountSelected' as any) || 'No account selected for publish')
return
}
- const usedAccount = pubListChoosed[0].account
-
// 校验:如果任务指定了 accountId,则必须一致;否则检查账户类型是否被任务接受
const task = pendingTaskForPublish
let ok = false
@@ -1074,13 +713,14 @@ export default function TaskPageCore() {
}
if (!ok) {
+ console.log('publish.accountNotMatchTask')
toast.error(t('publish.accountNotMatchTask' as any) || 'Selected account does not match task requirement')
return
}
- // 直接调用提交任务接口(不再弹出“任务处理中”弹窗)
- if (pendingUserTaskIdForPublish && pendingTaskMaterialIdForPublish) {
- const submitResp: any = await submitTask(pendingUserTaskIdForPublish, pendingTaskMaterialIdForPublish)
+ // 直接调用提交任务接口(不再依赖素材 id)
+ if (pendingUserTaskIdForPublish) {
+ const submitResp: any = await submitTask(pendingUserTaskIdForPublish)
if (submitResp && submitResp.code === 0) {
toast.success(t('messages.submitTaskSuccess' as any) || 'Submit task success')
fetchAcceptedTasks()
@@ -1099,7 +739,6 @@ export default function TaskPageCore() {
setPublishDialogOpen(false)
setPublishDefaultAccountId(undefined)
setPendingUserTaskIdForPublish(undefined)
- setPendingTaskMaterialIdForPublish(undefined)
setPendingTaskForPublish(null)
try {
usePublishDialog.getState().clear()
@@ -1113,10 +752,6 @@ export default function TaskPageCore() {
return (
<div className={styles.taskPage}>
- {/* <div className={styles.header}>
- <h1>任务中心</h1>
- <p>接受任务,完成任务,获得奖励</p>
- </div> */}
<Tabs
value={activeTab}
@@ -1184,7 +819,6 @@ export default function TaskPageCore() {
: `${getPlatformName(task.accountType)} Task`}
</h3>
</div>
- <Badge className={getBadgeClassName('orange')}>{t('taskStatus.pending' as any)}</Badge>
</div>
<div className={styles.taskContent}>
@@ -1481,10 +1115,9 @@ export default function TaskPageCore() {
title={t('taskDetails')}
open={taskDetailModalVisible}
onCancel={() => {
- setTaskDetailModalVisible(false)
- setTaskDetail(null)
- setMaterialList([])
- setSelectedMaterial(null)
+ setTaskDetailModalVisible(false)
+ setTaskDetail(null)
+ setMaterialList([])
}}
footer={null}
width={1200}
@@ -1494,102 +1127,42 @@ export default function TaskPageCore() {
{taskDetail ? (
<div>
{/* 任务基本信息 */}
- <div style={{
- marginBottom: '24px',
- padding: '16px',
- backgroundColor: '#f8f9fa',
- borderRadius: '8px',
- border: '1px solid #e9ecef',
- }}
- >
- <h2 style={{
- margin: '0 0 12px 0',
- fontSize: '18px',
- fontWeight: '600',
- color: '#1a1a1a',
- }}
- >
+ <div className="mb-6 p-4 bg-background rounded-lg border border-border">
+ <h2 className="mb-3 text-lg font-semibold text-foreground">
{taskDetail.title}
</h2>
- <div style={{
- fontSize: '14px',
- lineHeight: '1.6',
- color: '#495057',
- marginBottom: '12px',
- }}
- >
+ <div className="text-sm leading-7 text-muted-foreground mb-3">
<div dangerouslySetInnerHTML={{ __html: taskDetail.description }} />
</div>
{/* 任务信息卡片 */}
- <Row gutter={12}>
+ <div className={`${infoItemsCount === 1 ? 'grid grid-cols-1 justify-items-start' : 'grid grid-cols-3'} gap-3`}>
{taskDetail.reward > 0 && (
- <Col span={8}>
- <div style={{
- padding: '12px',
- backgroundColor: '#fff3cd',
- border: '1px solid #ffeaa7',
- borderRadius: '8px',
- textAlign: 'center',
- }}
- >
- <div style={{ fontSize: '12px', color: '#856404', marginBottom: '4px' }}>
- {t('taskInfo.reward' as any)}
- </div>
- <div style={{ fontSize: '14px', fontWeight: 'bold', color: '#d63031' }}>
- CNY
- {' '}
- {taskDetail.reward / 100}
- </div>
- </div>
- </Col>
+ <div className="bg-warning/10 border border-warning/30 rounded-md text-center">
+ <div className="text-xs text-warning mb-1">{t('taskInfo.reward' as any)}</div>
+ <div className="text-sm font-bold text-destructive">CNY {taskDetail.reward / 100}</div>
+ </div>
)}
{taskDetail.cpmReward > 0 && (
- <Col span={8}>
- <div style={{
- padding: '12px',
- backgroundColor: '#fff3cd',
- border: '1px solid #ffeaa7',
- borderRadius: '8px',
- textAlign: 'center',
- }}
- >
- <div style={{ fontSize: '12px', color: '#856404', marginBottom: '4px' }}>
- {t('taskInfo.CPM' as any)}
- </div>
- <div style={{ fontSize: '18px', fontWeight: 'bold', color: '#d63031' }}>
- CNY
- {' '}
- {taskDetail.cpmReward / 100}
- </div>
- </div>
- </Col>
+ <div className="bg-warning/10 border border-warning/30 rounded-md text-center">
+ <div className="text-xs text-warning mb-1">{t('taskInfo.CPM' as any)}</div>
+ <div className="text-sm font-bold text-destructive">CNY {taskDetail.cpmReward / 100}</div>
+ </div>
)}
- <Col span={8}>
- <div style={{
- padding: '12px',
- backgroundColor: '#d1ecf1',
- border: '1px solid #bee5eb',
- borderRadius: '8px',
- textAlign: 'center',
- }}
- >
- <div style={{ fontSize: '12px', color: '#0c5460', marginBottom: '4px' }}>
- {t('taskInfo.type' as any)}
- </div>
- <div style={{ fontSize: '14px', fontWeight: '500', color: '#0c5460' }}>
- {getTaskTypeName(taskDetail.type)}
- </div>
+ {taskDetail.type && (
+ <div className="bg-muted/10 border border-muted/30 rounded-md text-center">
+ <div className="text-xs text-muted-foreground mb-1">{t('taskInfo.type' as any)}</div>
+ <div className="text-sm font-medium text-foreground">{getTaskTypeName(taskDetail.type)}</div>
</div>
- </Col>
- </Row>
+ )}
+ </div>
</div>
- {/* 草稿选择区域 */}
- <div style={{ marginBottom: '24px' }}>
+ {/* 示例展示区域 */}
+ <div style={{ marginBottom: '24px', marginTop: '12px' }}>
<div style={{
display: 'flex',
alignItems: 'center',
@@ -1598,11 +1171,11 @@ export default function TaskPageCore() {
}}
>
<div style={{ display: 'flex', alignItems: 'center', gap: '16px' }}>
- <span style={{ fontSize: '16px', fontWeight: '600' }}>{t('draft.recommendedDraft' as any) || t('draft.selectDraft')}</span>
+ <span style={{ fontSize: '16px', fontWeight: '600' }}>{t('draft.examples' as any) || '示例'}</span>
</div>
</div>
- {/* 推荐任务草稿列表 */}
+ {/* 示例列表 */}
<Spin spinning={materialLoading}>
{materialList.length > 0 ? (
<>
@@ -1616,20 +1189,18 @@ export default function TaskPageCore() {
{materialList.map((material: any) => (
<div
key={material._id}
- onClick={(e) => { e.stopPropagation(); setSelectedMaterial(material) }}
style={{
- border: selectedMaterial?._id === material._id ? '2px solid #1890ff' : '1px solid #e8e8e8',
+ border: '1px solid #e8e8e8',
borderRadius: '8px',
overflow: 'hidden',
- cursor: 'pointer',
transition: 'all 0.3s ease',
- backgroundColor: selectedMaterial?._id === material._id ? '#e6f7ff' : '#fff',
+ backgroundColor: '#fff',
}}
>
{/* 素材封面 */}
- <div style={{
+ <div style={{
position: 'relative',
- paddingTop: '56.25%',
+ paddingTop: '42%',
background: '#f0f0f0',
}}
>
@@ -1658,25 +1229,6 @@ export default function TaskPageCore() {
▶
</div>
)}
- {selectedMaterial?._id === material._id && (
- <div style={{
- position: 'absolute',
- top: '8px',
- right: '8px',
- width: '24px',
- height: '24px',
- borderRadius: '50%',
- backgroundColor: '#1890ff',
- display: 'flex',
- alignItems: 'center',
- justifyContent: 'center',
- color: 'white',
- fontSize: '14px',
- }}
- >
- ✓
- </div>
- )}
</div>
{/* 素材信息 */}
@@ -1728,51 +1280,6 @@ export default function TaskPageCore() {
<Empty description={t('draft.noDrafts')} />
)}
</Spin>
-
- {/* 选中的推荐草稿信息展示 */}
- {selectedMaterial && (
- <div style={{
- border: '2px solid #1890ff',
- borderRadius: '8px',
- overflow: 'hidden',
- backgroundColor: '#e6f7ff',
- padding: '16px',
- }}
- >
- <div style={{ display: 'flex', gap: '16px' }}>
- {selectedMaterial.coverUrl && (
- <div style={{
- width: '120px',
- height: '120px',
- borderRadius: '8px',
- overflow: 'hidden',
- flexShrink: 0,
- }}
- >
- <Image
- src={getOssUrl(selectedMaterial.coverUrl)}
- alt={selectedMaterial.title}
- width={120}
- height={120}
- style={{
- objectFit: 'cover',
- width: '100%',
- height: '100%',
- }}
- />
- </div>
- )}
- <div style={{ flex: 1 }}>
- <div style={{ fontSize: '16px', fontWeight: '600', marginBottom: '8px' }}>
- {selectedMaterial.title || t('draft.noTitle')}
- </div>
- <div style={{ fontSize: '14px', color: '#666' }}>
- {selectedMaterial.desc || t('draft.noDescription')}
- </div>
- </div>
- </div>
- </div>
- )}
</div>
{/* 底部按钮 */}
@@ -1786,31 +1293,13 @@ export default function TaskPageCore() {
justifyContent: 'center',
}}
>
- {materialList.length > 0 && (
- <Button
- size="lg"
- onClick={() => {
- // 模式1:使用推荐草稿发布(必须选中推荐草稿)
- if (!selectedMaterial) {
- toast.error(t('draft.pleaseSelectDraftMaterial'))
- return
- }
- // 复用账号选择流程
- handleTaskAction(taskDetail)
- }}
- >
- {t('publish.useRecommended' as any) || '推荐草稿发布'}
- </Button>
- )}
-
- <Button
- size="lg"
- onClick={() => {
- // 模式2:直接发布(不使用推荐草稿)
- setSelectedMaterial(null)
- handleTaskAction(taskDetail)
- }}
- >
+ <Button
+ size="lg"
+ onClick={() => {
+ // 模式2:直接发布
+ handleTaskAction(taskDetail)
+ }}
+ >
{t('publish.directPublish' as any) || '直接发布'}
</Button>
@@ -1857,98 +1346,12 @@ export default function TaskPageCore() {
{acceptedTaskDetail ? (
<div>
{/* 视频发布风格布局 */}
- <div style={{
- display: 'flex',
- gap: '24px',
- marginBottom: '24px',
- }}
- >
- {/* Left side: Video/Media content */}
- <div style={{ flex: '0 0 400px' }}>
- <Spin spinning={acceptedTaskMaterialLoading}>
- {acceptedTaskMaterialList.length > 0 && acceptedTaskMaterialList[0].mediaList && acceptedTaskMaterialList[0].mediaList.length > 0 && (
- <div style={{
- border: '1px solid #e8e8e8',
- borderRadius: '12px',
- overflow: 'hidden',
- backgroundColor: '#000',
- }}
- >
- <div style={{ position: 'relative', cursor: 'pointer' }}>
- {acceptedTaskMaterialList[0].mediaList[0].type === 'video' ? (
- <div
- style={{
- position: 'relative',
- overflow: 'hidden',
- }}
- onClick={(e) => { e.stopPropagation(); handleVideoCoverClick(acceptedTaskMaterialList[0].mediaList[0], acceptedTaskDetail.task.title) }}
- >
- {/* Video cover image */}
- <Image
- src={acceptedTaskMaterialList[0].coverUrl ? getOssUrl(acceptedTaskMaterialList[0].coverUrl) : getOssUrl(acceptedTaskMaterialList[0].mediaList[0].url)}
- alt="video cover"
- width={400}
- height={300}
- style={{
- width: '100%',
- height: 'auto',
- display: 'block',
- }}
- />
- {/* Play button */}
- <div style={{
- position: 'absolute',
- top: '50%',
- left: '50%',
- transform: 'translate(-50%, -50%)',
- color: 'white',
- fontSize: '24px',
- background: 'rgba(0,0,0,0.7)',
- borderRadius: '50%',
- width: '60px',
- height: '60px',
- display: 'flex',
- alignItems: 'center',
- justifyContent: 'center',
- cursor: 'pointer',
- transition: 'all 0.3s ease',
- }}
- >
- ▶
- </div>
- </div>
- ) : acceptedTaskMaterialList[0].mediaList[0].type === 'img' ? (
- <Image
- src={getOssUrl(acceptedTaskMaterialList[0].mediaList[0].url)}
- alt="media"
- width={400}
- height={300}
- style={{
- width: '100%',
- height: 'auto',
- display: 'block',
- }}
- onClick={(e) => { e.stopPropagation(); handleMediaClick(acceptedTaskMaterialList[0].mediaList[0], acceptedTaskDetail.task.title) }}
- />
- ) : null}
- </div>
- </div>
- )}
- </Spin>
- </div>
-
- {/* 右侧:标题和描述 */}
- <div style={{ flex: '1', minWidth: '300px' }}>
+ <div className="space-y-4">
+ {/* 右侧:标题和描述(已移除顶部媒体展示) */}
+ <div className="flex-1">
{/* 标题区域 */}
- <div style={{ marginBottom: '16px' }}>
- <h2 style={{
- margin: '0 0 8px 0',
- fontSize: '20px',
- fontWeight: '600',
- lineHeight: '1.4',
- color: '#1a1a1a',
- }}
- >
+ <div className="mb-4">
+ <h2 className="mb-2 text-xl font-semibold text-foreground">
{acceptedTaskDetail.task?.title}
</h2>
@@ -2180,31 +1583,13 @@ export default function TaskPageCore() {
</div>
</div>
- {/* 底部状态栏 */}
- <div style={{
- display: 'flex',
- justifyContent: 'space-between',
- alignItems: 'center',
- padding: '16px 0',
- borderTop: '1px solid #e8e8e8',
- marginTop: '16px',
- }}
- >
- <div style={{ display: 'flex', alignItems: 'center', gap: '12px' }}>
- <Badge
- className={getBadgeClassName(getTaskStatusTag(acceptedTaskDetail.status).color)}
- style={{
- fontSize: '12px',
- padding: '4px 8px',
- }}
- >
+ {/* 底部状态栏:左侧状态,右侧首次提交 */}
+ <div className="flex items-center justify-between gap-4 border-t border-border pt-4">
+ <div className="flex items-center gap-3">
+ <Badge className={getBadgeClassName(getTaskStatusTag(acceptedTaskDetail.status).color)} style={{ fontSize: 12, padding: '4px 8px' }}>
{getTaskStatusTag(acceptedTaskDetail.status).text}
</Badge>
- <span style={{
- fontSize: '12px',
- color: '#666',
- }}
- >
+ <span className="text-sm text-muted-foreground">
{acceptedTaskDetail.status === 'doing'
? t('taskStatuses.taskPending')
: acceptedTaskDetail.status === 'pending'
@@ -2213,15 +1598,11 @@ export default function TaskPageCore() {
</span>
</div>
- <div style={{
- fontSize: '12px',
- color: '#999',
- }}
- >
- {acceptedTaskDetail.isFirstTimeSubmission && (
- <span style={{ color: '#52c41a' }}>{t('taskInfo.firstSubmission')}</span>
- )}
- </div>
+ {acceptedTaskDetail.isFirstTimeSubmission && (
+ <span className="inline-flex items-center px-3 py-1 bg-emerald-50 text-emerald-700 rounded-full text-sm font-semibold border border-emerald-100">
+ {t('taskInfo.firstSubmission')}
+ </span>
+ )}
</div>
{/* 根据任务状态显示不同按钮 */}
@@ -2253,57 +1634,14 @@ export default function TaskPageCore() {
</Modal>
{/* 媒体预览弹窗 */}
- <Modal
- title={previewMedia?.title || t('modal.mediaPreview')}
- open={mediaPreviewVisible}
- onCancel={handleCloseMediaPreview}
- footer={[
- <Button key="close" onClick={handleCloseMediaPreview}>
- {t('modal.close')}
- </Button>,
- ]}
- width={previewMedia?.type === 'video' ? 800 : 600}
- zIndex={3000}
- >
- {previewMedia && (
- <div>
- {previewMedia.type === 'video' ? (
- <video
- ref={setVideoRef}
- src={previewMedia.url}
- controls
- style={{
- width: '100%',
- maxHeight: '500px',
- borderRadius: '8px',
- }}
- autoPlay
- onEnded={() => {
- // 视频播放结束时重置到开始
- if (videoRef) {
- videoRef.currentTime = 0
- }
- }}
- />
- ) : (
- <Image
- src={previewMedia.url}
- alt="preview"
- width={600}
- height={500}
- style={{
- width: '100%',
- maxHeight: '500px',
- objectFit: 'contain',
- borderRadius: '8px',
- }}
- />
- )}
- </div>
- )}
- </Modal>
-
- {/* 任务进度弹窗(已移除,提交后只显示 Toast 提示) */}
+ {previewMedia && (
+ <MediaPreview
+ open={mediaPreviewVisible}
+ onClose={() => setMediaPreviewVisible(false)}
+ items={[{ type: previewMedia.type, src: previewMedia.url, title: previewMedia.title || t('modal.mediaPreview') }]}
+ initialIndex={0}
+ />
+ )}
{/* 账号选择弹窗 */}
<Modal
@@ -2387,16 +1725,6 @@ export default function TaskPageCore() {
/>
</Modal>
- {/* 下载App提示弹窗 */}
- <DownloadAppModal
- visible={downloadAppVisible}
- onClose={() => setDownloadAppVisible(false)}
- platform={downloadAppConfig.platform}
- appName={downloadAppConfig.appName}
- downloadUrl={downloadAppConfig.downloadUrl}
- qrCodeUrl={downloadAppConfig.qrCodeUrl}
- zIndex={3000}
- />
{/* 发布作品弹窗(用于任务流程触发) */}
{accountList.length > 0 && (
<PublishDialog
@@ -2405,12 +1733,10 @@ export default function TaskPageCore() {
setPublishDialogOpen(false)
setPublishDefaultAccountId(undefined)
setPendingUserTaskIdForPublish(undefined)
- setPendingTaskMaterialIdForPublish(undefined)
setPendingTaskForPublish(null)
}}
accounts={accountList}
defaultAccountId={publishDefaultAccountId}
- onPubSuccess={handlePublishSuccess}
suppressAutoPublish={true}
taskIdForPublish={pendingUserTaskIdForPublish}
onPublishConfirmed={(taskId?: string) => {
diff --git a/project/web/src/app/i18n/locales/en/task.json b/project/web/src/app/i18n/locales/en/task.json
index c6fe752a..06432b8f 100644
--- a/project/web/src/app/i18n/locales/en/task.json
+++ b/project/web/src/app/i18n/locales/en/task.json
@@ -14,8 +14,8 @@
"submittingTask": "Submitting task...",
"taskCompleted": "Task Completed",
"taskStatus": {
- "pending": "Pending",
- "doing": "Completed",
+ "pending": "Completed",
+ "doing": "In Progress",
"accepted": "Accepted",
"completed": "Completed",
"rejected": "Rejected",
@@ -108,6 +108,7 @@
"draft": {
"selectDraft": "Select Draft:",
"recommendedDraft": "Recommended Draft",
+ "examples": "Examples",
"taskDraft": "Task Draft",
"myDraft": "My Draft",
"reselect": "Reselect",
diff --git a/project/web/src/app/i18n/locales/zh-CN/task.json b/project/web/src/app/i18n/locales/zh-CN/task.json
index 3e4aa64c..4594406a 100644
--- a/project/web/src/app/i18n/locales/zh-CN/task.json
+++ b/project/web/src/app/i18n/locales/zh-CN/task.json
@@ -1,7 +1,7 @@
{
"title": "任务中心",
"subtitle": "接受任务,完成任务,获得奖励",
- "pendingTasks": "待接受任务",
+ "pendingTasks": "可接受任务",
"acceptedTasks": "已接受任务",
"taskDetails": "任务详情",
"acceptTask": "接受任务",
@@ -14,8 +14,8 @@
"submittingTask": "正在提交任务...",
"taskCompleted": "任务完成",
"taskStatus": {
- "pending": "待完成",
- "doing": "已完成",
+ "pending": "已完成",
+ "doing": "进行中",
"accepted": "已接受",
"completed": "已完成",
"rejected": "已拒绝",
@@ -60,7 +60,7 @@
},
"messages": {
"pleaseLoginFirst": "请先登录以查看任务",
- "getPendingTasksFailed": "获取待接受任务失败",
+ "getPendingTasksFailed": "获取可接受任务失败",
"getAcceptedTasksFailed": "获取已接受任务失败",
"acceptTaskSuccess": "接受任务成功!",
"acceptTaskFailed": "接受任务失败",
@@ -69,7 +69,7 @@
"publishTaskFailed": "发布任务失败",
"getTaskDetailFailed": "获取任务详情失败",
"taskProcessFailed": "任务处理失败",
- "noPendingTasks": "暂无待接受任务",
+ "noPendingTasks": "暂无可接受任务",
"noAcceptedTasks": "暂无已接受任务",
"noTaskDetails": "暂无任务详情",
"loading": "加载中...",
@@ -108,6 +108,7 @@
"draft": {
"selectDraft": "选择草稿:",
"recommendedDraft": "推荐草稿",
+ "examples": "示例",
"taskDraft": "任务草稿",
"myDraft": "我的草稿",
"reselect": "重新选择",
diff --git a/project/web/src/components/PublishDialog/compoents/PublishDialogAi.tsx b/project/web/src/components/PublishDialog/compoents/PublishDialogAi.tsx
index c0037c5f..46d6026a 100644
--- a/project/web/src/components/PublishDialog/compoents/PublishDialogAi.tsx
+++ b/project/web/src/components/PublishDialog/compoents/PublishDialogAi.tsx
@@ -961,7 +961,6 @@ const PublishDialogAi = memo(
try {
// Convert relative path to full S3 URL for publishing
// API returns: ai/video/sora-2/...
- // Publishing expects: https://aitoearn.s3.ap-southeast-1.amazonaws.com/ai/video/...
const ossUrl = `${getOssUrl(url)}`
const filename = `ai-generated-video.mp4`
diff --git a/project/web/src/components/PublishDialog/index.tsx b/project/web/src/components/PublishDialog/index.tsx
index 843fe70e..48d35966 100644
--- a/project/web/src/components/PublishDialog/index.tsx
+++ b/project/web/src/components/PublishDialog/index.tsx
@@ -694,6 +694,8 @@ const PublishDialog = memo(
desc: item.params.des,
accountId: item.account.id,
accountType: item.account.type,
+ // If opened from task flow, include the user task id for server-side linking
+ userTaskId: taskIdForPublish,
videoUrl: item.params.video?.ossUrl,
coverUrl:
item.params.video?.cover.ossUrl ||
@@ -728,31 +730,40 @@ const PublishDialog = memo(
});
}
- // 如果抑制自动发布,跳过自动发布流程
+ // 如果抑制自动发布(来自任务流程),不要自动调用平台 API,但仍需通知外部父组件
if (suppressAutoPublish) {
setCreateLoading(false)
- return
- }
-
- // 给用户提示:发布已提交,可能需要一些时间处理(符合 TikTok API 客户端要求)
- toast.success(t("messages.publishSubmitted" as any), {
- key: "publish_submitted",
- duration: 3,
- });
-
- // 关闭发布弹框
- onClose()
- setCreateLoading(false)
-
- // 通知外部发布已完成(携带任务 id,如果有)
- if (onPublishConfirmed) {
- onPublishConfirmed(taskIdForPublish)
- }
- if (onPubSuccess) {
- onPubSuccess()
+ // 关闭发布弹框
+ try {
+ onClose()
+ }
+ catch (e) {
+ // ignore
+ }
+
+ // 通知外部发布已完成(携带任务 id,如果父组件需要)
+ if (onPublishConfirmed) {
+ try {
+ onPublishConfirmed(taskIdForPublish)
+ }
+ catch (e) {
+ console.error("onPublishConfirmed callback failed", e)
+ }
+ }
+
+ if (onPubSuccess) {
+ try {
+ onPubSuccess()
+ }
+ catch (e) {
+ console.error("onPubSuccess callback failed", e)
+ }
+ }
+
+ usePublishDialogStorageStore.getState().clearPubData()
+ return
}
- usePublishDialogStorageStore.getState().clearPubData()
}, [pubListChoosed, pubTime, isPluginSupportedPlatform, t])
// 处理划词操作
diff --git a/project/web/src/hooks/README.md b/project/web/src/hooks/README.md
index 6c34abfe..ad6c7f5f 100644
--- a/project/web/src/hooks/README.md
+++ b/project/web/src/hooks/README.md
@@ -97,7 +97,7 @@ function MyComponent() {
### 特性
-- **全路径 URL**:上传完成后自动返回完整的 S3 URL(如 `https://aitoearn.s3.ap-southeast-1.amazonaws.com/userId/hash/filename.jpg`)
+- **全路径 URL**:上传完成后自动返回完整的 S3 URL(如 `https://aitoearn.ap-southeast-1.amazonaws.com/userId/hash/filename.jpg`)
- **进度显示**:支持实时上传进度
- **中断上传**:支持取消正在进行的上传
- **多文件上传**:支持同时上传多个文件