yml/affiliate_dash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

统一时间格式和时区

Browse Source
This commit is contained in:
yml2213
2026-07-31 12:57:17 +08:00
parent 667bfbde06
commit 949a0eb8f7
24 changed files with 342 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/pages/MerchantCenter.tsx
+7 -11
View File
@@ -23,8 +23,8 @@ import {
WalletOutlined,
} from '@ant-design/icons'
import type { ColumnsType } from 'antd/es/table'
import dayjs from 'dayjs'
import { merchantApi } from '../api'
import { formatDateTime } from '../utils/time'
import type {
ApiClient,
ApiCredential,
@@ -473,9 +473,9 @@ export default function MerchantCenter() {
title: '链接有效期',
dataIndex: 'delivery_link_expires_at',
width: 160,
render: (_, record) => record.delivery_link_revoked_at ? <Tag color="red">已作废</Tag> : formatTime(record.delivery_link_expires_at),
render: (_, record) => record.delivery_link_revoked_at ? <Tag color="red">已作废</Tag> : formatDateTime(record.delivery_link_expires_at),
},
{ title: '时间', dataIndex: 'created_at', width: 160, render: formatTime },
{ title: '时间', dataIndex: 'created_at', width: 180, render: formatDateTime },
{
title: '发货链接',
key: 'delivery_link',
@@ -499,7 +499,7 @@ export default function MerchantCenter() {
{ title: '余额', dataIndex: 'balance_after', width: 110, render: money },
{ title: '关联单号', dataIndex: 'reference_no', ellipsis: true },
{ title: '备注', dataIndex: 'note', ellipsis: true, render: (v) => v || '-' },
{ title: '时间', dataIndex: 'created_at', width: 160, render: formatTime },
{ title: '时间', dataIndex: 'created_at', width: 180, render: formatDateTime },
]
const apiClientColumns: ColumnsType<ApiClient> = [
@@ -508,7 +508,7 @@ export default function MerchantCenter() {
{ title: '签名', dataIndex: 'signature_version', width: 110, render: (v) => <Tag>{v}</Tag> },
{ title: '权限', dataIndex: 'scopes', ellipsis: true },
{ title: '状态', dataIndex: 'status', width: 90, render: activeStatusTag },
{ title: '最后使用', dataIndex: 'last_used_at', width: 160, render: formatTime },
{ title: '最后使用', dataIndex: 'last_used_at', width: 180, render: formatDateTime },
{
title: '操作',
key: 'action',
@@ -526,7 +526,7 @@ export default function MerchantCenter() {
{ title: 'URL', dataIndex: 'url', ellipsis: true },
{ title: '事件', dataIndex: 'events', width: 260, ellipsis: true },
{ title: '状态', dataIndex: 'status', width: 90, render: activeStatusTag },
{ title: '创建时间', dataIndex: 'created_at', width: 160, render: formatTime },
{ title: '创建时间', dataIndex: 'created_at', width: 180, render: formatDateTime },
{
title: '操作',
key: 'action',
@@ -824,7 +824,7 @@ export default function MerchantCenter() {
</Tag>
</Descriptions.Item>
<Descriptions.Item label="链接有效期">
{testOrderResult.order.delivery_link_revoked_at ? <Tag color="red">已作废</Tag> : formatTime(testOrderResult.order.delivery_link_expires_at)}
{testOrderResult.order.delivery_link_revoked_at ? <Tag color="red">已作废</Tag> : formatDateTime(testOrderResult.order.delivery_link_expires_at)}
</Descriptions.Item>
<Descriptions.Item label="链接状态">
<Typography.Text type="secondary">由后端签名生成，可复制、打开或作废。</Typography.Text>
@@ -969,10 +969,6 @@ function moneyWithSign(value?: number | null) {
return `${prefix}${money(amount)}`
}
function formatTime(value?: string | null) {
return value ? dayjs(value).format('YYYY-MM-DD HH:mm') : '-'
}
function productStatusTag(value: string) {
return value === 'active' ? <Tag color="green">上架</Tag> : <Tag>下架</Tag>
}