Skip to content

Let's use AI to Earn!

fix(web): Remove outdated component libraries and replace them with newer versi… (#205)

布莱恩·奥夫托·杰森张cffd3f0fa342
diff --git a/project/web/next.config.mjs b/project/web/next.config.mjs
index 53de5fa8..e09efaa6 100644
--- a/project/web/next.config.mjs
+++ b/project/web/next.config.mjs
@@ -5,6 +5,18 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url))
/** @type {import('next').NextConfig} */
const nextConfig = {
+ images: {
+ remotePatterns: [
+ {
+ protocol: 'https',
+ hostname: '**',
+ },
+ {
+ protocol: 'http',
+ hostname: '**',
+ },
+ ],
+ },
webpack(config) {
config.module.rules.push({
test: /\.svg$/,
diff --git a/project/web/package.json b/project/web/package.json
index 09c75ab0..698bfb84 100644
--- a/project/web/package.json
+++ b/project/web/package.json
@@ -24,6 +24,7 @@
"@fullcalendar/core": "^6.1.17",
"@fullcalendar/daygrid": "^6.1.17",
"@fullcalendar/react": "^6.1.17",
+ "@hello-pangea/dnd": "^16.6.0",
"@kwooshung/react-no-ssr": "^1.1.4",
"@lexical/react": "^0.37.0",
"@react-oauth/google": "^0.12.2",
@@ -51,7 +52,6 @@
"next-sitemap": "^4.2.3",
"qs": "^6.14.0",
"react": "^18",
- "react-beautiful-dnd": "^13.1.1",
"react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1",
"react-dom": "^18",
@@ -72,6 +72,7 @@
"devDependencies": {
"@antfu/eslint-config": "^6.2.0",
"@eslint/eslintrc": "^3",
+ "@hello-pangea/dnd": "^16.6.0",
"@next/eslint-plugin-next": "^15.5.3",
"@types/blueimp-md5": "^2.18.2",
"@types/crypto-js": "^4.2.2",
@@ -80,7 +81,6 @@
"@types/node": "^20",
"@types/qs": "^6.14.0",
"@types/react": "^18",
- "@types/react-beautiful-dnd": "^13.1.8",
"@types/react-dom": "^18",
"@types/react-transition-group": "^4.4.12",
"eslint": "^9.39.1",
diff --git a/project/web/pnpm-lock.yaml b/project/web/pnpm-lock.yaml
index 6df5e104..5b62f3d7 100644
--- a/project/web/pnpm-lock.yaml
+++ b/project/web/pnpm-lock.yaml
@@ -26,6 +26,9 @@ importers:
'@fullcalendar/react':
specifier: ^6.1.17
+ '@hello-pangea/dnd':
+ specifier: ^16.6.0
'@kwooshung/react-no-ssr':
specifier: ^1.1.4
@@ -107,9 +110,6 @@ importers:
react:
specifier: ^18
version: 18.3.1
- react-beautiful-dnd:
- specifier: ^13.1.1
react-dnd:
specifier: ^16.0.1
@@ -157,7 +157,7 @@ importers:
version: 3.15.3([email protected])
zustand:
specifier: ^5.0.5
- version: 5.0.5(@types/[email protected])([email protected])
devDependencies:
'@antfu/eslint-config':
specifier: ^6.2.0
@@ -189,9 +189,6 @@ importers:
'@types/react':
specifier: ^18
version: 18.3.23
- '@types/react-beautiful-dnd':
- specifier: ^13.1.8
- version: 13.1.8
'@types/react-dom':
specifier: ^18
version: 18.3.7(@types/[email protected])
@@ -1077,6 +1074,12 @@ packages:
react: ^16.7.0 || ^17 || ^18 || ^19
react-dom: ^16.7.0 || ^17 || ^18 || ^19
+ '@hello-pangea/[email protected]':
+ resolution: {integrity: sha512-vfZ4GydqbtUPXSLfAvKvXQ6xwRzIjUSjVU0Sx+70VOhc2xx6CdmJXJ8YhH70RpbTUGjxctslQTHul9sIOxCfFQ==}
+ peerDependencies:
+ react: ^16.8.5 || ^17.0.0 || ^18.0.0
+ react-dom: ^16.8.5 || ^17.0.0 || ^18.0.0
+
'@humanfs/[email protected]':
resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==}
engines: {node: '>=18.18.0'}
@@ -1751,17 +1754,11 @@ packages:
resolution: {integrity: sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==}
- '@types/[email protected]':
- resolution: {integrity: sha512-E3TyFsro9pQuK4r8S/OL6G99eq7p8v29sX0PM7oT8Z+PJfZvSQTx4zTQbUJ+QZXioAF0e7TGBEcA1XhYhCweyQ==}
-
resolution: {integrity: sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==}
peerDependencies:
'@types/react': ^18.0.0
- '@types/[email protected]':
- resolution: {integrity: sha512-GdFaVjEbYv4Fthm2ZLvj1VSCedV7TqE5y1kNwnjSdBOTXuRSgowux6J8TAct15T3CKBr63UMk+2CO7ilRhyrAQ==}
-
resolution: {integrity: sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==}
peerDependencies:
@@ -1776,6 +1773,9 @@ packages:
resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==}
+
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-R48VhmTJqplNyDxCyqqVkFSZIx1qX6PzwqgcXn1olLrzxcSBDlOsbtcnQuQhNtnNiJ4Xe5gREI1foajYaYU2Vg==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -3737,8 +3737,8 @@ packages:
resolution: {integrity: sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==}
- resolution: {integrity: sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==}
+ resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==}
resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
@@ -4457,13 +4457,6 @@ packages:
resolution: {integrity: sha512-L6wBhp64fAr/FPhjfkuf9Lx6dAbfkznROcBMj55tVamw6ddTvhcgoqu89a3lUJCaALJkZe/mTcQoNM0P09RpQg==}
hasBin: true
- resolution: {integrity: sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==}
- deprecated: 'react-beautiful-dnd is now deprecated. Context and options: https://github.com/atlassian/react-beautiful-dnd/issues/2672'
- peerDependencies:
- react: ^16.8.5 || ^17.0.0 || ^18.0.0
- react-dom: ^16.8.5 || ^17.0.0 || ^18.0.0
-
resolution: {integrity: sha512-Wu3dw5aDJmOGw8WjH1I1/yTH+vlXEL4vmjk5p+MHxP8HuHJS1lAGeIdG/hze1AvNeXWo/JgULV87LyQOr+r5jw==}
@@ -4518,9 +4511,6 @@ packages:
resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
- resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
-
resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==}
@@ -4530,17 +4520,26 @@ packages:
react: '>=18.0.0'
react-dom: '>=18.0.0'
- resolution: {integrity: sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==}
+ resolution: {integrity: sha512-n0ZrutD7DaX/j9VscF+uTALI3oUPa/pO4Z3soOBIjuRn/FzVu6aehhysxZCLi6y7duMf52WNZGMl7CtuK5EnRw==}
peerDependencies:
- react: ^16.8.3 || ^17 || ^18
- react-dom: '*'
- react-native: '*'
+ '@types/react': ^16.8 || ^17.0 || ^18.0
+ '@types/react-dom': ^16.8 || ^17.0 || ^18.0
+ react: ^16.8 || ^17.0 || ^18.0
+ react-dom: ^16.8 || ^17.0 || ^18.0
+ react-native: '>=0.59'
+ redux: ^4 || ^5.0.0-beta.0
peerDependenciesMeta:
+ '@types/react':
+ optional: true
+ '@types/react-dom':
+ optional: true
react-dom:
optional: true
react-native:
optional: true
+ redux:
+ optional: true
resolution: {integrity: sha512-fc7cBosfhnbh53Mbm6a45W+F735jwZ1UFIYSrIqcO/gRIFoDyZeMtgKlpV4DdyQfbCzdh5LoALLTDRxhMpTyXQ==}
@@ -5213,6 +5212,11 @@ packages:
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
+ resolution: {integrity: sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==}
+ peerDependencies:
+ react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
@@ -6543,6 +6547,22 @@ snapshots:
react: 18.3.1
react-dom: 18.3.1([email protected])
+ dependencies:
+ '@babel/runtime': 7.27.6
+ css-box-model: 1.2.1
+ memoize-one: 6.0.0
+ raf-schd: 4.0.3
+ react: 18.3.1
+ react-dom: 18.3.1([email protected])
+ redux: 4.2.1
+ use-memo-one: 1.1.3([email protected])
+ transitivePeerDependencies:
+ - '@types/react'
+ - '@types/react-dom'
+ - react-native
+
'@humanfs/[email protected]': {}
'@humanfs/[email protected]':
@@ -7247,21 +7267,10 @@ snapshots:
'@types/[email protected]': {}
- '@types/[email protected]':
- dependencies:
- '@types/react': 18.3.23
-
dependencies:
'@types/react': 18.3.23
- '@types/[email protected]':
- dependencies:
- '@types/hoist-non-react-statics': 3.3.7(@types/[email protected])
- '@types/react': 18.3.23
- hoist-non-react-statics: 3.3.2
- redux: 4.2.1
-
dependencies:
'@types/react': 18.3.23
@@ -7275,6 +7284,8 @@ snapshots:
'@types/[email protected]': {}
+ '@types/[email protected]': {}
+
dependencies:
'@eslint-community/regexpp': 4.12.1
@@ -9789,7 +9800,7 @@ snapshots:
@@ -10718,20 +10729,6 @@ snapshots:
is-stream: 2.0.1
process.argv: 0.6.1
- dependencies:
- '@babel/runtime': 7.27.6
- css-box-model: 1.2.1
- memoize-one: 5.2.1
- raf-schd: 4.0.3
- react: 18.3.1
- react-dom: 18.3.1([email protected])
- redux: 4.2.1
- use-memo-one: 1.1.3([email protected])
- transitivePeerDependencies:
- - react-native
-
dependencies:
dnd-core: 16.0.1
@@ -10780,8 +10777,6 @@ snapshots:
-
@@ -10790,17 +10785,20 @@ snapshots:
react: 18.3.1
react-dom: 18.3.1([email protected])
dependencies:
'@babel/runtime': 7.27.6
- '@types/react-redux': 7.1.34
+ '@types/hoist-non-react-statics': 3.3.7(@types/[email protected])
+ '@types/use-sync-external-store': 0.0.3
hoist-non-react-statics: 3.3.2
- loose-envify: 1.4.0
- prop-types: 15.8.1
react: 18.3.1
- react-is: 17.0.2
+ react-is: 18.3.1
+ use-sync-external-store: 1.6.0([email protected])
optionalDependencies:
+ '@types/react': 18.3.23
+ '@types/react-dom': 18.3.7(@types/[email protected])
react-dom: 18.3.1([email protected])
+ redux: 4.2.1
dependencies:
@@ -11617,6 +11615,10 @@ snapshots:
dependencies:
react: 18.3.1
+ dependencies:
+ react: 18.3.1
+
@@ -11846,9 +11848,10 @@ snapshots:
dependencies:
tslib: 2.3.0
optionalDependencies:
'@types/react': 18.3.23
react: 18.3.1
+ use-sync-external-store: 1.6.0([email protected])
diff --git a/project/web/src/app/[lng]/accounts/components/AccountSidebar/AccountSidebar.tsx b/project/web/src/app/[lng]/accounts/components/AccountSidebar/AccountSidebar.tsx
index adecb0b3..08a54d0f 100644
--- a/project/web/src/app/[lng]/accounts/components/AccountSidebar/AccountSidebar.tsx
+++ b/project/web/src/app/[lng]/accounts/components/AccountSidebar/AccountSidebar.tsx
@@ -19,6 +19,7 @@ import {
UserOutlined,
WarningOutlined,
} from '@ant-design/icons'
+import { DragDropContext, Draggable, Droppable } from '@hello-pangea/dnd'
import {
Avatar,
Button,
@@ -30,6 +31,7 @@ import {
Skeleton,
Tooltip,
} from 'antd'
+import Image from 'next/image'
import {
forwardRef,
memo,
@@ -39,7 +41,6 @@ import {
useRef,
useState,
} from 'react'
-import { DragDropContext, Draggable, Droppable } from 'react-beautiful-dnd'
import { useShallow } from 'zustand/react/shallow'
import { createAccountGroupApi, updateAccountApi } from '@/api/account'
import { apiUpdateAccountGroupSortRank, apiUpdateAccountSortRank } from '@/api/accountSort'
@@ -928,7 +929,7 @@ const AccountSidebar = memo(
</div>
<div className="accountList-item-right-footer">
<p className="accountList-item-right-plat">
- <img src={platInfo?.icon} />
+ <Image src={platInfo?.icon} alt={platInfo?.name || ''} width={16} height={16} />
<span>{platInfo?.name}</span>
</p>
<Popover
diff --git a/project/web/src/app/[lng]/accounts/components/AccountSidebar/UserManageModal.tsx b/project/web/src/app/[lng]/accounts/components/AccountSidebar/UserManageModal.tsx
index 7753b7f7..6b8884cb 100644
--- a/project/web/src/app/[lng]/accounts/components/AccountSidebar/UserManageModal.tsx
+++ b/project/web/src/app/[lng]/accounts/components/AccountSidebar/UserManageModal.tsx
@@ -503,11 +503,11 @@ const UserManageModal = memo(
<Drawer
title={(
<>
- 已选择
+ {t('userManage.selected' as any)}
<span style={{ color: 'var(--successColor)' }}>
{selectedRows.length}
</span>
- 个账号
+ {t('userManage.accounts' as any)}
</>
)}
placement="bottom"
@@ -530,7 +530,7 @@ const UserManageModal = memo(
<div className="userManage-content-multiple-item-icon">
<DeleteOutlined />
</div>
- <span>删除账号</span>
+ <span>{t('userManage.deleteAccount' as any)}</span>
</div>
</div>
</Drawer>
diff --git a/project/web/src/app/[lng]/cgmaterial/cgmaterialPageCore.tsx b/project/web/src/app/[lng]/cgmaterial/cgmaterialPageCore.tsx
index 0519c130..71ea5dbc 100644
--- a/project/web/src/app/[lng]/cgmaterial/cgmaterialPageCore.tsx
+++ b/project/web/src/app/[lng]/cgmaterial/cgmaterialPageCore.tsx
@@ -3,6 +3,7 @@
import type { EngagementPostsParams } from '@/api/types/engagement'
import { DeleteOutlined, EditOutlined, FileTextOutlined, FolderOpenOutlined, ImportOutlined, PlusOutlined, VideoCameraOutlined } from '@ant-design/icons'
import { Avatar, Button, Card, Form, Input, InputNumber, List, message, Modal, Select, Space, Spin } from 'antd'
+import Image from 'next/image'
import { useParams } from 'next/navigation'
import { useEffect, useState } from 'react'
import { getAccountListApi } from '@/api/account'
@@ -178,9 +179,11 @@ export default function CgMaterialPageCore() {
/>
)
: (
- <img
+ <Image
src={getOssUrl(media.url)}
alt={t('detail.materialImageAlt' as any)}
+ width={400}
+ height={320}
style={{ width: '100%', height: '320px', objectFit: 'cover', borderRadius: 8 }}
/>
)}
@@ -1119,12 +1122,12 @@ export default function CgMaterialPageCore() {
</div>
{item.cover && (
<div style={{ marginTop: 8 }}>
- <img
+ <Image
src={item.cover}
alt={t('import.cover' as any)}
+ width={60}
+ height={60}
style={{
- width: 60,
- height: 60,
objectFit: 'cover',
borderRadius: 4,
border: '1px solid #f0f0f0',
@@ -1415,16 +1418,22 @@ export default function CgMaterialPageCore() {
// onMouseEnter={(e) => (e.target as HTMLVideoElement).play()}
// onMouseLeave={(e) => (e.target as HTMLVideoElement).pause()}
// />
- <img
+ <Image
src={getOssUrl(item.coverUrl)}
alt="cover"
className={styles.cardCover}
+ width={320}
+ height={180}
+ style={{ objectFit: 'cover' }}
/>
) : (
- <img
+ <Image
src={getOssUrl(item.coverUrl || item.mediaList[0].url)}
alt="cover"
className={styles.cardCover}
+ width={320}
+ height={180}
+ style={{ objectFit: 'cover' }}
/>
)
)}
@@ -1642,10 +1651,12 @@ export default function CgMaterialPageCore() {
>
<div style={{ display: 'flex', gap: 12, width: '100%' }}>
{item.thumbnail && (
- <img
+ <Image
src={item.thumbnail}
alt="cover"
- style={{ width: 60, height: 60, objectFit: 'cover', borderRadius: 6 }}
+ width={60}
+ height={60}
+ style={{ objectFit: 'cover', borderRadius: 6 }}
/>
)}
<div style={{ flex: 1 }}>
@@ -2144,13 +2155,13 @@ export default function CgMaterialPageCore() {
</div>
<div style={{ display: 'flex', gap: 8, flexWrap: 'wrap' }}>
{mediaList.map((media: any) => (
- <img
+ <Image
key={media._id}
src={getOssUrl(media.url)}
alt=""
+ width={60}
+ height={60}
style={{
- width: 60,
- height: 60,
border: selectedCover === media.url ? '2px solid #1677ff' : '1px solid #eee',
borderRadius: 4,
cursor: 'pointer',
@@ -2167,13 +2178,13 @@ export default function CgMaterialPageCore() {
</div>
<div style={{ display: 'flex', gap: 8, flexWrap: 'wrap' }}>
{mediaList.map((media: any) => (
- <img
+ <Image
key={media._id}
src={getOssUrl(media.url)}
alt=""
+ width={60}
+ height={60}
style={{
- width: 60,
- height: 60,
border: selectedMaterials.includes(media.url) ? '2px solid #1677ff' : '1px solid #eee',
borderRadius: 4,
cursor: 'pointer',
@@ -2248,13 +2259,13 @@ export default function CgMaterialPageCore() {
</div>
<div style={{ display: 'flex', gap: 8, flexWrap: 'wrap' }}>
{coverList.map((media: any) => (
- <img
+ <Image
key={media._id}
src={getOssUrl(media.url)}
alt=""
+ width={60}
+ height={60}
style={{
- width: 60,
- height: 60,
border: selectedCover === media.url ? '2px solid #1677ff' : '1px solid #eee',
borderRadius: 4,
cursor: 'pointer',
@@ -2316,13 +2327,13 @@ export default function CgMaterialPageCore() {
/>
)
: (
- <img
+ <Image
key={media._id}
src={getOssUrl(media.url)}
alt=""
+ width={60}
+ height={60}
style={{
- width: 60,
- height: 60,
border: selectedMaterials.includes(media.url) ? '2px solid #1677ff' : '1px solid #eee',
borderRadius: 4,
cursor: 'pointer',
@@ -2441,9 +2452,11 @@ export default function CgMaterialPageCore() {
<b>{t('detail.coverLabel' as any)}</b>
<div style={{ marginTop: 4 }}>
{previewData.coverUrl && (
- <img
+ <Image
src={getOssUrl(previewData.coverUrl)}
alt="cover"
+ width={320}
+ height={120}
style={{ width: '100%', maxWidth: 320, height: 120, objectFit: 'cover', borderRadius: 8, display: 'block' }}
/>
)}
@@ -2489,9 +2502,11 @@ export default function CgMaterialPageCore() {
<div style={{ marginTop: 4 }}>
{detailData.coverUrl && (
- <img
+ <Image
src={getOssUrl(detailData.coverUrl)}
alt="cover"
+ width={320}
+ height={180}
style={{ maxWidth: 320, objectFit: 'cover', borderRadius: 8, display: 'block' }}
/>
@@ -2924,13 +2939,13 @@ export default function CgMaterialPageCore() {
</div>
<div style={{ display: 'flex', gap: 8, flexWrap: 'wrap' }}>
{editMaterialMediaList.map((media: any) => (
- <img
+ <Image
key={media._id}
src={getOssUrl(media.url)}
alt=""
+ width={60}
+ height={60}
style={{
- width: 60,
- height: 60,
border: editMaterialSelectedCover === media.url ? '2px solid #1677ff' : '1px solid #eee',
borderRadius: 4,
cursor: 'pointer',
@@ -2947,13 +2962,13 @@ export default function CgMaterialPageCore() {
</div>
<div style={{ display: 'flex', gap: 8, flexWrap: 'wrap' }}>
{editMaterialMediaList.map((media: any) => (
- <img
+ <Image
key={media._id}
src={getOssUrl(media.url)}
alt=""
+ width={60}
+ height={60}
style={{
- width: 60,
- height: 60,
border: editMaterialSelectedMaterials.includes(media.url) ? '2px solid #1677ff' : '1px solid #eee',
borderRadius: 4,
cursor: 'pointer',
@@ -3028,13 +3043,13 @@ export default function CgMaterialPageCore() {
</div>
<div style={{ display: 'flex', gap: 8, flexWrap: 'wrap' }}>
{editMaterialCoverList.map((media: any) => (
- <img
+ <Image
key={media._id}
src={getOssUrl(media.url)}
alt=""
+ width={60}
+ height={60}
style={{
- width: 60,
- height: 60,
border: editMaterialSelectedCover === media.url ? '2px solid #1677ff' : '1px solid #eee',
borderRadius: 4,
cursor: 'pointer',
@@ -3096,13 +3111,13 @@ export default function CgMaterialPageCore() {
/>
)
: (
- <img
+ <Image
key={media._id}
src={getOssUrl(media.url)}
alt=""
+ width={60}
+ height={60}
style={{
- width: 60,
- height: 60,
border: editMaterialSelectedMaterials.includes(media.url) ? '2px solid #1677ff' : '1px solid #eee',
borderRadius: 4,
cursor: 'pointer',
diff --git a/project/web/src/app/[lng]/material/materialPageCore.tsx b/project/web/src/app/[lng]/material/materialPageCore.tsx
index ef1044f3..9dce5852 100644
--- a/project/web/src/app/[lng]/material/materialPageCore.tsx
+++ b/project/web/src/app/[lng]/material/materialPageCore.tsx
@@ -10,6 +10,7 @@ import {
VideoCameraOutlined,
} from '@ant-design/icons'
import { Input, message, Modal, Popconfirm, Select } from 'antd'
+import Image from 'next/image'
import { useRouter } from 'next/navigation'
import { useEffect, useRef, useState } from 'react'
import { createMediaGroup, deleteMediaGroup, getMediaGroupList, updateMediaGroupInfo } from '@/api/media'
@@ -97,7 +98,6 @@ export function MaterialPageCore() {
if (mediaList && mediaList.list.length > 0) {
// 优先查找视频,如果没有视频则使用图片
previewMedia = mediaList.list.find(media => media.type === 'video') || mediaList.list[0]
- console.log('Found preview media for group:', group.title, previewMedia)
}
const processedGroup = {
@@ -205,7 +205,6 @@ export function MaterialPageCore() {
const getCoverDisplay = (group: MediaGroup) => {
// 如果有预览媒体,优先显示预览媒体
if (group.previewMedia) {
- console.log('Using preview media:', group.previewMedia)
if (group.previewMedia.type === 'video') {
const videoUrl = getOssUrl(group.previewMedia.url)
console.log('Video URL:', videoUrl)
@@ -224,10 +223,13 @@ export function MaterialPageCore() {
else {
return (
<div className={styles.coverContent}>
- <img
+ <Image
alt={group.title}
src={getOssUrl(group.previewMedia.url)}
className={styles.coverImage}
+ fill
+ sizes="(max-width: 768px) 100vw, (max-width: 1200px) 50vw, 33vw"
+ style={{ objectFit: 'cover' }}
/>
<div className={styles.imageTypeIcon}>
<PictureOutlined />
@@ -260,10 +262,13 @@ export function MaterialPageCore() {
else {
return (
<div className={styles.coverContent}>
- <img
+ <Image
alt={group.title}
src={getOssUrl(firstMedia.url)}
className={styles.coverImage}
+ fill
+ sizes="(max-width: 768px) 100vw, (max-width: 1200px) 50vw, 33vw"
+ style={{ objectFit: 'cover' }}
/>
<div className={styles.imageTypeIcon}>
<PictureOutlined />
@@ -288,10 +293,13 @@ export function MaterialPageCore() {
</div>
)
: (
- <img
+ <Image
alt={group.title}
src={group.cover}
className={styles.coverImage}
+ fill
+ sizes="(max-width: 768px) 100vw, (max-width: 1200px) 50vw, 33vw"
+ style={{ objectFit: 'cover' }}
/>
)}
</div>
@@ -318,10 +326,13 @@ export function MaterialPageCore() {
else {
return (
<div className={styles.coverContent}>
- <img
+ <Image
alt={group.title}
src={getOssUrl(firstMedia.url)}
className={styles.coverImage}
+ fill
+ sizes="(max-width: 768px) 100vw, (max-width: 1200px) 50vw, 33vw"
+ style={{ objectFit: 'cover' }}
/>
<div className={styles.imageTypeIcon}>
<PictureOutlined />
diff --git a/project/web/src/app/[lng]/tasks/taskPageCore.tsx b/project/web/src/app/[lng]/tasks/taskPageCore.tsx
index 3d60cf8f..61a1a845 100644
--- a/project/web/src/app/[lng]/tasks/taskPageCore.tsx
+++ b/project/web/src/app/[lng]/tasks/taskPageCore.tsx
@@ -7,8 +7,8 @@ import type {
import type { SocialAccount } from '@/api/types/account.type'
import type { PlatType } from '@/app/config/platConfig'
import { CheckOutlined, ClockCircleOutlined, EyeOutlined, PlayCircleOutlined, UploadOutlined } from '@ant-design/icons'
-import { Button, Card, Col, Empty, Image, Input, List, message, Modal, Pagination, Radio, Row, Spin, Steps, Tabs, Tag, Tooltip } from 'antd'
-
+import { Button, Card, Col, Empty, Input, List, message, Modal, Pagination, Radio, Row, Spin, Steps, Tabs, Tag, Tooltip } from 'antd'
+import Image from 'next/image'
import { useParams, useRouter } from 'next/navigation'
import React, { useEffect, useState } from 'react'
import { getAccountListApi } from '@/api/account'
@@ -43,7 +43,7 @@ export default function TaskPageCore() {
const params = useParams()
const lng = params.lng as string
- // 如果未登录,显示登录提示
+ // Show login prompt if not logged in
if (!token) {
return (
<div className={styles.taskPage}>
@@ -58,13 +58,13 @@ export default function TaskPageCore() {
)
}
- // 状态管理
- const [activeTab, setActiveTab] = useState('pending') // pending: 待接受, accepted: 已接受
+ // State management
+ const [activeTab, setActiveTab] = useState('pending') // pending: Pending tasks, accepted: Accepted tasks
const [pendingTasks, setPendingTasks] = useState<TaskOpportunity[]>([])
const [acceptedTasks, setAcceptedTasks] = useState<UserTask[]>([])
const [loading, setLoading] = useState(false)
- // 分页状态
+ // Pagination state
const [pendingPagination, setPendingPagination] = useState({
current: 1,
pageSize: 15,
@@ -80,19 +80,19 @@ export default function TaskPageCore() {
const [submissionUrl, setSubmissionUrl] = useState('')
const [submittingTaskId, setSubmittingTaskId] = useState<string | null>(null)
- // 新增状态
+ // Additional states
const [accountList, setAccountList] = useState<SocialAccount[]>([])
const [taskDetailModalVisible, setTaskDetailModalVisible] = useState(false)
const [taskDetail, setTaskDetail] = useState<any>(null)
const [taskDetailLoading, setTaskDetailLoading] = useState(false)
const [currentTaskId, setCurrentTaskId] = useState<string | null>(null)
- // 已接受任务详情弹窗状态
+ // Accepted task detail modal state
const [acceptedTaskDetailModalVisible, setAcceptedTaskDetailModalVisible] = useState(false)
const [acceptedTaskDetail, setAcceptedTaskDetail] = useState<any>(null)
const [acceptedTaskDetailLoading, setAcceptedTaskDetailLoading] = useState(false)
- // 媒体预览弹窗状态
+ // Media preview modal state
const [mediaPreviewVisible, setMediaPreviewVisible] = useState(false)
const [previewMedia, setPreviewMedia] = useState<{
type: 'video' | 'image'
@@ -101,7 +101,7 @@ export default function TaskPageCore() {
} | null>(null)
const [videoRef, setVideoRef] = useState<HTMLVideoElement | null>(null)
- // 任务进度弹窗状态
+ // Task progress modal state
const [taskProgressVisible, setTaskProgressVisible] = useState(false)
const [taskProgress, setTaskProgress] = useState({
currentStep: 0,
@@ -137,12 +137,16 @@ export default function TaskPageCore() {
})
// 草稿选择状态
- const [draftSource, setDraftSource] = useState<'task' | 'own'>('task') // 'task': 任务草稿, 'own': 自己的草稿
- const [selectedMaterial, setSelectedMaterial] = useState<any>(null) // 选中的任务素材
- const [draftModalOpen, setDraftModalOpen] = useState(false) // 自己草稿选择弹窗
+ const [draftSource, setDraftSource] = useState<'task' | 'own'>('task') // 'task': Task draft, 'own': My draft
+ const [selectedMaterial, setSelectedMaterial] = useState<any>(null) // Selected task material
+ const [draftModalOpen, setDraftModalOpen] = useState(false) // My draft selection modal
const [requiredAccountTypes, setRequiredAccountTypes] = useState<string[]>([])
- // 获取待接受任务列表
+ // Accepted task detail material list state
+ const [acceptedTaskMaterialList, setAcceptedTaskMaterialList] = useState<any[]>([])
+ const [acceptedTaskMaterialLoading, setAcceptedTaskMaterialLoading] = useState(false)
+
+ // Fetch pending tasks list
const fetchPendingTasks = async (page: number = 1, pageSize: number = 15) => {
if (!token)
return
@@ -163,7 +167,7 @@ export default function TaskPageCore() {
}
}
catch (error) {
- console.error('获取待接受任务失败:', error)
+ console.error('Failed to get pending tasks:', error)
message.error(t('messages.getPendingTasksFailed'))
setPendingTasks([])
}
@@ -172,7 +176,7 @@ export default function TaskPageCore() {
}
}
- // 获取已接受任务列表
+ // Fetch accepted tasks list
const fetchAcceptedTasks = async (page: number = 1, pageSize: number = 15) => {
if (!token)
return
@@ -193,7 +197,7 @@ export default function TaskPageCore() {
}
}
catch (error) {
- console.error('获取已接受任务失败:', error)
+ console.error('Failed to get accepted tasks:', error)
message.error(t('messages.getAcceptedTasksFailed'))
setAcceptedTasks([])
}
@@ -202,7 +206,7 @@ export default function TaskPageCore() {
}
}
- // 获取账号列表
+ // Fetch account list
const fetchAccountList = async () => {
if (!token) {
setAccountList([])
@@ -216,7 +220,7 @@ export default function TaskPageCore() {
}
}
catch (error) {
- console.error('获取账号列表失败:', error)
+ console.error('Failed to get account list:', error)
}
}
@@ -232,7 +236,7 @@ export default function TaskPageCore() {
// return;
// }
- // // 检查需要App操作的平台
+ // // Check platforms that require App operation
// const appRequiredPlatforms = getTasksRequiringApp(task.accountTypes);
// if (appRequiredPlatforms.length > 0) {
@@ -252,7 +256,7 @@ export default function TaskPageCore() {
// }
// }
- // // 其他任务类型正常接取
+ // // Other task types can be accepted normally
// await doAcceptTask(task);
}
@@ -636,7 +640,7 @@ export default function TaskPageCore() {
}
}
- // 查看已接受任务详情
+ // View accepted task detail
const handleViewAcceptedTaskDetail = async (taskId: string) => {
try {
setAcceptedTaskDetailLoading(true)
@@ -645,6 +649,11 @@ export default function TaskPageCore() {
if (response && response.data && response.code === 0) {
setAcceptedTaskDetail(response.data)
setAcceptedTaskDetailModalVisible(true)
+
+ // If materialGroupId exists, fetch material list
+ if (response.data.task?.materialGroupId) {
+ fetchAcceptedTaskMaterialList(response.data.task.materialGroupId)
+ }
}
else {
message.error(t('messages.getTaskDetailFailed'))
@@ -652,13 +661,30 @@ export default function TaskPageCore() {
}
catch (error) {
message.error(t('messages.getTaskDetailFailed'))
- console.error('获取任务详情失败:', error)
+ console.error('Failed to get task detail:', error)
}
finally {
setAcceptedTaskDetailLoading(false)
}
}
+ // Fetch material list for accepted task detail
+ const fetchAcceptedTaskMaterialList = async (groupId: string) => {
+ try {
+ setAcceptedTaskMaterialLoading(true)
+ const response: any = await apiGetMaterialList(groupId, 1, 10)
+ if (response && response.data && response.code === 0) {
+ setAcceptedTaskMaterialList(response.data.list || [])
+ }
+ }
+ catch (error) {
+ console.error('Failed to get material list:', error)
+ }
+ finally {
+ setAcceptedTaskMaterialLoading(false)
+ }
+ }
+
// 从任务详情接受任务
const handleAcceptTaskFromDetail = async (task: any, account?: SocialAccount) => {
if (!task)
@@ -801,6 +827,29 @@ 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
+ }
+ }
+ }
+
// 显示进度弹窗
setTaskProgressVisible(true)
setTaskProgress({
@@ -1045,11 +1094,12 @@ export default function TaskPageCore() {
{/* 显示多个平台图标 */}
<div style={{ display: 'flex', gap: '4px' }}>
{(task.accountTypes && task.accountTypes.length > 0 ? task.accountTypes : [task.accountType]).map((platformType: string, index: number) => (
- <img
+ <Image
key={platformType}
src={getPlatformIcon(platformType)}
alt="platform"
- style={{ width: '20px', height: '20px' }}
+ width={20}
+ height={20}
/>
))}
</div>
@@ -1118,17 +1168,17 @@ export default function TaskPageCore() {
marginBottom: '12px',
}}
>
- <img
+ <Image
src={publishAccount.avatar ? getOssUrl(publishAccount.avatar) : '/default-avatar.png'}
alt="账号头像"
+ width={32}
+ height={32}
style={{
- width: '32px',
- height: '32px',
borderRadius: '50%',
objectFit: 'cover',
}}
- onError={(e) => {
- e.currentTarget.src = '/default-avatar.png'
+ onError={(e: any) => {
+ e.target.src = '/default-avatar.png'
}}
/>
<div>
@@ -1205,18 +1255,19 @@ export default function TaskPageCore() {
{/* 显示多个平台图标 */}
<div style={{ display: 'flex', gap: '4px' }}>
{(task.accountTypes && task.accountTypes.length > 0 ? task.accountTypes : [task.accountType]).map((platformType: string, index: number) => (
- <img
+ <Image
key={platformType}
src={getPlatformIcon(platformType)}
alt="platform"
- style={{ width: '20px', height: '20px' }}
+ width={20}
+ height={20}
/>
))}
</div>
<h3 style={{ margin: 0, fontSize: '16px' }}>
{task.accountTypes && task.accountTypes.length > 0
- ? `${task.accountTypes.map((type: string) => getPlatformName(type)).join('、')}任务`
- : `${getPlatformName(task.accountType)}任务`}
+ ? `${task.accountTypes.map((type: string) => getPlatformName(type)).join('、')}Task`
+ : `${getPlatformName(task.accountType)}Task`}
</h3>
</div>
<Tag color={getTaskStatusTag(task.status).color}>
@@ -1236,16 +1287,31 @@ export default function TaskPageCore() {
<span> </span>
</div>
- <div style={{ marginBottom: '12px' }}>
- <strong>
- {t('taskInfo.reward' as any)}
- :
- </strong>
- <span style={{ color: '#f50', fontWeight: 'bold' }}>
- ¥
- {task.reward / 100}
- </span>
- </div>
+ {task.reward > 0 && (
+ <div style={{ marginBottom: '12px' }}>
+ <strong>
+ {t('taskInfo.reward' as any)}
+ :
+ </strong>
+ <span style={{ color: '#f50', fontWeight: 'bold' }}>
+ ¥
+ {task.reward / 100}
+ </span>
+ </div>
+ )}
+
+ {task.cpmReward > 0 && (
+ <div style={{ marginBottom: '12px' }}>
+ <strong>
+ {t('taskInfo.CPM' as any)}
+ :
+ </strong>
+ <span style={{ color: '#f50', fontWeight: 'bold' }}>
+ ¥
+ {task.cpmReward / 100}
+ </span>
+ </div>
+ )}
{/* 发布账号信息 */}
{publishAccount && (
@@ -1259,17 +1325,17 @@ export default function TaskPageCore() {
marginBottom: '12px',
}}
>
- <img
+ <Image
src={publishAccount.avatar ? getOssUrl(publishAccount.avatar) : '/default-avatar.png'}
alt="账号头像"
+ width={32}
+ height={32}
style={{
- width: '32px',
- height: '32px',
borderRadius: '50%',
objectFit: 'cover',
}}
- onError={(e) => {
- e.currentTarget.src = '/default-avatar.png'
+ onError={(e: any) => {
+ e.target.src = '/default-avatar.png'
}}
/>
<div>
@@ -1477,7 +1543,7 @@ export default function TaskPageCore() {
}}
>
<div style={{ display: 'flex', alignItems: 'center', gap: '16px' }}>
- <span style={{ fontSize: '16px', fontWeight: '600' }}>选择草稿:</span>
+ <span style={{ fontSize: '16px', fontWeight: '600' }}>{t('draft.selectDraft')}</span>
<Radio.Group
value={draftSource}
onChange={(e) => {
@@ -1487,8 +1553,8 @@ export default function TaskPageCore() {
}
}}
>
- <Radio value="task">任务草稿</Radio>
- <Radio value="own">我的草稿</Radio>
+ <Radio value="task">{t('draft.taskDraft')}</Radio>
+ <Radio value="own">{t('draft.myDraft')}</Radio>
</Radio.Group>
</div>
{draftSource === 'own' && selectedMaterial && (
@@ -1496,7 +1562,7 @@ export default function TaskPageCore() {
type="link"
onClick={() => setDraftModalOpen(true)}
>
- 重新选择
+ {t('draft.reselect')}
</Button>
)}
</div>
@@ -1534,15 +1600,12 @@ export default function TaskPageCore() {
}}
>
{material.coverUrl && (
- <img
+ <Image
src={getOssUrl(material.coverUrl)}
alt={material.title}
+ fill
+ sizes="(max-width: 768px) 100vw, 33vw"
style={{
- position: 'absolute',
- top: 0,
- left: 0,
- width: '100%',
- height: '100%',
objectFit: 'cover',
}}
/>
@@ -1653,12 +1716,12 @@ export default function TaskPageCore() {
flexShrink: 0,
}}
>
- <img
+ <Image
src={getOssUrl(selectedMaterial.coverUrl)}
alt={selectedMaterial.title}
+ fill
+ sizes="120px"
style={{
- width: '100%',
- height: '100%',
objectFit: 'cover',
}}
/>
@@ -1666,10 +1729,10 @@ export default function TaskPageCore() {
)}
<div style={{ flex: 1 }}>
<div style={{ fontSize: '16px', fontWeight: '600', marginBottom: '8px' }}>
- {selectedMaterial.title || '无标题'}
+ {selectedMaterial.title || t('draft.noTitle')}
</div>
<div style={{ fontSize: '14px', color: '#666' }}>
- {selectedMaterial.desc || '无描述'}
+ {selectedMaterial.desc || t('draft.noDescription')}
</div>
</div>
</div>
@@ -1677,7 +1740,7 @@ export default function TaskPageCore() {
)}
{draftSource === 'own' && !selectedMaterial && (
- <Empty description="请选择一个草稿" />
+ <Empty description={t('draft.pleaseSelectDraft')} />
)}
</div>
@@ -1699,7 +1762,7 @@ export default function TaskPageCore() {
</Button>
{!selectedMaterial && (
<div style={{ marginTop: '8px', color: '#ff4d4f', fontSize: '12px' }}>
- 请先选择一个草稿素材
+ {t('draft.pleaseSelectDraftMaterial')}
</div>
)}
</div>
@@ -1762,37 +1825,39 @@ export default function TaskPageCore() {
marginBottom: '24px',
}}
>
- {/* 左侧:视频/媒体内容 */}
+ {/* Left side: Video/Media content */}
<div style={{ flex: '0 0 400px' }}>
- {acceptedTaskDetail.task?.materials && acceptedTaskDetail.task.materials.length > 0 && (
- <div style={{
- border: '1px solid #e8e8e8',
- borderRadius: '12px',
- overflow: 'hidden',
- backgroundColor: '#000',
- }}
- >
- {acceptedTaskDetail.task.materials[0].mediaList && acceptedTaskDetail.task.materials[0].mediaList.length > 0 && (
+ <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' }}>
- {acceptedTaskDetail.task.materials[0].mediaList[0].type === 'video' ? (
+ {acceptedTaskMaterialList[0].mediaList[0].type === 'video' ? (
<div
style={{
position: 'relative',
overflow: 'hidden',
}}
- onClick={() => handleVideoCoverClick(acceptedTaskDetail.task.materials[0].mediaList[0], acceptedTaskDetail.task.title)}
+ onClick={() => handleVideoCoverClick(acceptedTaskMaterialList[0].mediaList[0], acceptedTaskDetail.task.title)}
>
- {/* 视频封面图片 */}
- <img
- src={acceptedTaskDetail.task.materials[0].coverUrl ? getOssUrl(acceptedTaskDetail.task.materials[0].coverUrl) : getOssUrl(acceptedTaskDetail.task.materials[0].mediaList[0].url)}
+ {/* 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%',
@@ -1814,22 +1879,24 @@ export default function TaskPageCore() {
▶
</div>
</div>
- ) : (
- <img
- src={getOssUrl(acceptedTaskDetail.task.materials[0].mediaList[0].url)}
+ ) : 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={() => handleMediaClick(acceptedTaskDetail.task.materials[0].mediaList[0], acceptedTaskDetail.task.title)}
+ onClick={() => handleMediaClick(acceptedTaskMaterialList[0].mediaList[0], acceptedTaskDetail.task.title)}
/>
- )}
+ ) : null}
</div>
- )}
- </div>
- )}
+ </div>
+ )}
+ </Spin>
</div>
{/* 右侧:标题和描述 */}
@@ -1859,17 +1926,17 @@ export default function TaskPageCore() {
marginBottom: '12px',
}}
>
- <img
+ <Image
src={publishAccount.avatar ? getOssUrl(publishAccount.avatar) : '/default-avatar.png'}
alt="账号头像"
+ width={32}
+ height={32}
style={{
- width: '32px',
- height: '32px',
borderRadius: '50%',
objectFit: 'cover',
}}
- onError={(e) => {
- e.currentTarget.src = '/default-avatar.png'
+ onError={(e: any) => {
+ e.target.src = '/default-avatar.png'
}}
/>
<div>
@@ -1921,34 +1988,67 @@ export default function TaskPageCore() {
marginBottom: '16px',
}}
>
- <div style={{
- flex: '1',
- padding: '12px',
- backgroundColor: '#fff3cd',
- border: '1px solid #ffeaa7',
- borderRadius: '8px',
- textAlign: 'center',
- }}
- >
+ {acceptedTaskDetail.reward > 0 && (
<div style={{
- fontSize: '12px',
- color: '#856404',
- marginBottom: '4px',
+ flex: '1',
+ padding: '12px',
+ backgroundColor: '#fff3cd',
+ border: '1px solid #ffeaa7',
+ borderRadius: '8px',
+ textAlign: 'center',
}}
>
- {t('taskInfo.reward' as any)}
+ <div style={{
+ fontSize: '12px',
+ color: '#856404',
+ marginBottom: '4px',
+ }}
+ >
+ {t('taskInfo.reward' as any)}
+ </div>
+ <div style={{
+ fontSize: '18px',
+ fontWeight: 'bold',
+ color: '#d63031',
+ }}
+ >
+ ¥
+ {' '}
+ {acceptedTaskDetail.reward / 100}
+ </div>
</div>
+ )}
+
+ {acceptedTaskDetail.cpmReward > 0 && (
<div style={{
- fontSize: '18px',
- fontWeight: 'bold',
- color: '#d63031',
+ flex: '1',
+ padding: '12px',
+ backgroundColor: '#fff3cd',
+ border: '1px solid #ffeaa7',
+ borderRadius: '8px',
+ textAlign: 'center',
}}
>
- ¥
- {' '}
- {acceptedTaskDetail.reward / 100}
+ <div style={{
+ fontSize: '12px',
+ color: '#856404',
+ marginBottom: '4px',
+ }}
+ >
+ {t('taskInfo.CPM' as any)}
+ </div>
+ <div style={{
+ fontSize: '18px',
+ fontWeight: 'bold',
+ color: '#d63031',
+ }}
+ >
+ ¥
+ {' '}
+ {acceptedTaskDetail.cpmReward / 100}
+ </div>
</div>
- </div>
+ )}
<div style={{
flex: '1',
@@ -2157,9 +2257,11 @@ export default function TaskPageCore() {
}}
/>
) : (
- <img
+ <Image
src={previewMedia.url}
alt="preview"
+ width={600}
+ height={500}
style={{
width: '100%',
maxHeight: '500px',
@@ -2251,17 +2353,17 @@ export default function TaskPageCore() {
>
<List.Item.Meta
avatar={(
- <img
+ <Image
src={account.avatar ? getOssUrl(account.avatar) : '/default-avatar.png'}
alt="账号头像"
+ width={48}
+ height={48}
style={{
- width: '48px',
- height: '48px',
borderRadius: '50%',
objectFit: 'cover',
}}
- onError={(e) => {
- e.currentTarget.src = '/default-avatar.png'
+ onError={(e: any) => {
+ e.target.src = '/default-avatar.png'
}}
/>
)}
diff --git a/project/web/src/app/i18n/locales/en/account.json b/project/web/src/app/i18n/locales/en/account.json
index 2f467ba7..67bc0bab 100644
--- a/project/web/src/app/i18n/locales/en/account.json
+++ b/project/web/src/app/i18n/locales/en/account.json
@@ -147,5 +147,10 @@
"title": "Session Expired",
"content": "Your {{platformName}} account \"{{nickname}}\" (in {{spaceName}}) session has expired. Would you like to log in again?",
"loginAgain": "Reauthorize"
+ },
+ "userManage": {
+ "selected": "Selected",
+ "accounts": "accounts",
+ "deleteAccount": "Delete Accounts"
}
}
diff --git a/project/web/src/app/i18n/locales/en/task.json b/project/web/src/app/i18n/locales/en/task.json
index 7b2506fc..3b775d80 100644
--- a/project/web/src/app/i18n/locales/en/task.json
+++ b/project/web/src/app/i18n/locales/en/task.json
@@ -99,6 +99,30 @@
"title": "Select Account",
"description": "Please select an account to use for publishing the task",
"accountId": "Account ID",
- "redirectingToAccounts": "Redirecting to accounts page, please add channel account"
- }
+ "redirectingToAccounts": "Redirecting to accounts page, please add channel account",
+ "nickname": "Nickname"
+ },
+ "draft": {
+ "selectDraft": "Select Draft:",
+ "taskDraft": "Task Draft",
+ "myDraft": "My Draft",
+ "reselect": "Reselect",
+ "noTitle": "No Title",
+ "noDescription": "No Description",
+ "noDrafts": "No drafts available",
+ "pleaseSelectDraft": "Please select a draft",
+ "pleaseSelectDraftMaterial": "Please select a draft material first"
+ },
+ "progress": {
+ "acceptingTask": "Accepting task...",
+ "publishingTask": "Publishing task...",
+ "submittingTask": "Submitting task...",
+ "completingTask": "Completing task...",
+ "taskCompleted": "Task Completed"
+ },
+ "taskStatuses": {
+ "pending": "Task Pending",
+ "completed": "Task Completed"
+ },
+ "accountAvatar": "Account Avatar"
}
diff --git a/project/web/src/app/i18n/locales/zh-CN/account.json b/project/web/src/app/i18n/locales/zh-CN/account.json
index 3e9818f4..51ec3ae9 100644
--- a/project/web/src/app/i18n/locales/zh-CN/account.json
+++ b/project/web/src/app/i18n/locales/zh-CN/account.json
@@ -147,5 +147,10 @@
"title": "会话已过期",
"content": "您的 {{platformName}} 账号 \"{{nickname}}\"(位于 {{spaceName}})会话已过期。是否重新登录?",
"loginAgain": "重新登录"
+ },
+ "userManage": {
+ "selected": "已选择",
+ "accounts": "个账号",
+ "deleteAccount": "删除账号"
}
}
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 c11cacff..18d9866e 100644
--- a/project/web/src/app/i18n/locales/zh-CN/task.json
+++ b/project/web/src/app/i18n/locales/zh-CN/task.json
@@ -99,6 +99,30 @@
"title": "选择账号",
"description": "请选择要用于发布任务的账号",
"accountId": "账号ID",
- "redirectingToAccounts": "正在跳转到账户页面,请添加频道账号"
- }
+ "redirectingToAccounts": "正在跳转到账户页面,请添加频道账号",
+ "nickname": "昵称"
+ },
+ "draft": {
+ "selectDraft": "选择草稿:",
+ "taskDraft": "任务草稿",
+ "myDraft": "我的草稿",
+ "reselect": "重新选择",
+ "noTitle": "无标题",
+ "noDescription": "无描述",
+ "noDrafts": "暂无草稿素材",
+ "pleaseSelectDraft": "请选择一个草稿",
+ "pleaseSelectDraftMaterial": "请先选择一个草稿素材"
+ },
+ "progress": {
+ "acceptingTask": "正在接受任务...",
+ "publishingTask": "正在发布任务...",
+ "submittingTask": "正在提交任务...",
+ "completingTask": "正在完成任务...",
+ "taskCompleted": "任务完成"
+ },
+ "taskStatuses": {
+ "pending": "任务待完成",
+ "completed": "任务已完成"
+ },
+ "accountAvatar": "账号头像"
}