统一前后端代码格式化配置
This commit is contained in:
@@ -102,9 +102,7 @@ export default function AdminTaskDetailPage() {
|
||||
return lastClaimUrl || detail?.claimToken?.claimUrl || ''
|
||||
}, [detail?.claimToken?.claimUrl, detail?.claimToken?.status, detail?.task.status, lastClaimUrl])
|
||||
const claimLinkInvalid = Boolean(
|
||||
detail?.claimToken?.claimUrl &&
|
||||
claimTokenStatus &&
|
||||
!isUsableClaimLinkStatus(claimTokenStatus),
|
||||
detail?.claimToken?.claimUrl && claimTokenStatus && !isUsableClaimLinkStatus(claimTokenStatus),
|
||||
)
|
||||
|
||||
useEffect(() => {
|
||||
@@ -364,7 +362,8 @@ export default function AdminTaskDetailPage() {
|
||||
{resolvedDetail.orderItem?.skuName || resolvedDetail.task.skuName || '-'}
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="角色">
|
||||
{resolvedDetail.task.roleName || '-'} {resolvedDetail.task.roleId ? `(${resolvedDetail.task.roleId})` : ''}
|
||||
{resolvedDetail.task.roleName || '-'}{' '}
|
||||
{resolvedDetail.task.roleId ? `(${resolvedDetail.task.roleId})` : ''}
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="更新时间">
|
||||
{formatAdminDateTime(resolvedDetail.task.updatedAt)}
|
||||
@@ -654,7 +653,10 @@ function TaskActionPanel({
|
||||
</section>
|
||||
) : null}
|
||||
|
||||
{!canManageTaskLifecycle && !canOperateIndustryVoucher && !canCloseTasks && !hasCloudActions ? (
|
||||
{!canManageTaskLifecycle &&
|
||||
!canOperateIndustryVoucher &&
|
||||
!canCloseTasks &&
|
||||
!hasCloudActions ? (
|
||||
<Typography.Text type="secondary">当前账号没有可执行的任务操作</Typography.Text>
|
||||
) : null}
|
||||
</div>
|
||||
@@ -668,7 +670,9 @@ function TaskActionPanel({
|
||||
}
|
||||
|
||||
function isUsableClaimLinkStatus(value: unknown) {
|
||||
const normalized = String(value || '').trim().toLowerCase()
|
||||
const normalized = String(value || '')
|
||||
.trim()
|
||||
.toLowerCase()
|
||||
return normalized === 'active' || normalized === 'external'
|
||||
}
|
||||
|
||||
@@ -684,12 +688,7 @@ function FulfillmentOverviewPanel({
|
||||
const executor = resolveTaskExecutorDisplay(detail.task.executorKey)
|
||||
const steps = buildFulfillmentOverviewSteps(detail, claimUrl, claimLinkInvalid)
|
||||
const claimIdentity = detail.claimIdentity
|
||||
const currentBlocker = resolveTaskBlocker(
|
||||
detail.task,
|
||||
claimUrl,
|
||||
claimLinkInvalid,
|
||||
claimIdentity,
|
||||
)
|
||||
const currentBlocker = resolveTaskBlocker(detail.task, claimUrl, claimLinkInvalid, claimIdentity)
|
||||
const uidMatchTag =
|
||||
claimIdentity?.uidMatched === true
|
||||
? { color: 'success' as const, text: 'UID 已匹配' }
|
||||
@@ -700,10 +699,7 @@ function FulfillmentOverviewPanel({
|
||||
: { color: 'warning' as const, text: '未填 UID' }
|
||||
|
||||
return (
|
||||
<Card
|
||||
title="履约链路总览"
|
||||
extra={<Tag color={executor.color}>{executor.label}</Tag>}
|
||||
>
|
||||
<Card title="履约链路总览" extra={<Tag color={executor.color}>{executor.label}</Tag>}>
|
||||
<Descriptions
|
||||
size="small"
|
||||
column={{ xs: 1, sm: 2, md: 3 }}
|
||||
@@ -711,9 +707,7 @@ function FulfillmentOverviewPanel({
|
||||
style={{ marginBottom: 12 }}
|
||||
>
|
||||
<Descriptions.Item label="填写 UID">
|
||||
{claimIdentity?.expectedUid || (
|
||||
<Typography.Text type="warning">未提交</Typography.Text>
|
||||
)}
|
||||
{claimIdentity?.expectedUid || <Typography.Text type="warning">未提交</Typography.Text>}
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="绑定角色 ID">
|
||||
{claimIdentity?.boundUid || detail.task.roleId || '-'}
|
||||
@@ -855,7 +849,10 @@ function resolveTaskBlocker(
|
||||
claimLinkInvalid: boolean,
|
||||
claimIdentity?: AdminTaskDetail['claimIdentity'],
|
||||
): { level: 'success' | 'info' | 'warning' | 'error'; title: string; detail: string } {
|
||||
if (['completed', 'redeemed', 'delivered'].includes(task.status) || task.deliveryStatus === 'delivered') {
|
||||
if (
|
||||
['completed', 'redeemed', 'delivered'].includes(task.status) ||
|
||||
task.deliveryStatus === 'delivered'
|
||||
) {
|
||||
return {
|
||||
level: 'success',
|
||||
title: '履约已完成',
|
||||
@@ -871,11 +868,7 @@ function resolveTaskBlocker(
|
||||
}
|
||||
}
|
||||
|
||||
if (
|
||||
task.executorKey === 'kuaishou_ct_assisted' &&
|
||||
claimIdentity &&
|
||||
!claimIdentity.ready
|
||||
) {
|
||||
if (task.executorKey === 'kuaishou_ct_assisted' && claimIdentity && !claimIdentity.ready) {
|
||||
return {
|
||||
level: 'warning',
|
||||
title: '等待用户填写 UID',
|
||||
@@ -883,10 +876,7 @@ function resolveTaskBlocker(
|
||||
}
|
||||
}
|
||||
|
||||
if (
|
||||
task.executorKey === 'kuaishou_ct_assisted' &&
|
||||
claimIdentity?.uidMatched === false
|
||||
) {
|
||||
if (task.executorKey === 'kuaishou_ct_assisted' && claimIdentity?.uidMatched === false) {
|
||||
return {
|
||||
level: 'error',
|
||||
title: 'UID 与绑定角色不一致',
|
||||
@@ -963,7 +953,11 @@ function resolveDeliveryStepSummary(detail: AdminTaskDetail) {
|
||||
}
|
||||
|
||||
if (detail.manualDispatch) {
|
||||
return detail.manualDispatch.resultMessage || detail.manualDispatch.deliveryReference || '人工履约已回写'
|
||||
return (
|
||||
detail.manualDispatch.resultMessage ||
|
||||
detail.manualDispatch.deliveryReference ||
|
||||
'人工履约已回写'
|
||||
)
|
||||
}
|
||||
|
||||
return detail.task.resultMessage || detail.task.lastError || '等待执行器推进'
|
||||
@@ -1119,9 +1113,7 @@ function KuaishouIndustryVoucherPanel({ voucher }: { voucher: KuaishouIndustryVo
|
||||
<Descriptions.Item label="发码时间">
|
||||
{formatAdminDateTime(voucher.sendCallbackSentAt)}
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="核销流水">
|
||||
{voucher.consumeSerialNum || '-'}
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="核销流水">{voucher.consumeSerialNum || '-'}</Descriptions.Item>
|
||||
<Descriptions.Item label="核销时间">
|
||||
{formatAdminDateTime(voucher.consumedAt)}
|
||||
</Descriptions.Item>
|
||||
|
||||
Reference in New Issue
Block a user