添加获取价格响应异常显示loading & 时间显示到秒

This commit is contained in:
Eamon-meng
2026-05-12 16:15:02 +08:00
parent 84a5e27c05
commit 670961c17d
8 changed files with 129 additions and 102 deletions

View File

@@ -1,5 +1,5 @@
'use client'
import {useCallback, useEffect, useState} from 'react'
import {Suspense, useCallback, useEffect, useState} from 'react'
import {PageRecord} from '@/lib/api'
import {Balance} from '@/lib/models'
import {useStatus} from '@/lib/states'
@@ -136,100 +136,101 @@ export default function BalancePage(props: BalancePageProps) {
</Button>
</Form>
</section>
<DataTable
data={data.list}
status={status}
pagination={{
total: data.total,
page: data.page,
size: data.size,
onPageChange: async (page: number) => {
await refresh(page, data.size)
},
onSizeChange: async (size: number) => {
await refresh(data.page, size)
},
}}
columns={[
{accessorKey: 'bill_no', header: `账单编号`,
accessorFn: row => row.bill?.bill_no || '',
},
{
accessorKey: 'status',
header: `状态`,
cell: ({row}) => {
const trade = row.original.trade
if (![1, 2, 3, 4, 5].includes(trade?.method)) {
<Suspense>
<DataTable
data={data.list}
status={status}
pagination={{
total: data.total,
page: data.page,
size: data.size,
onPageChange: async (page: number) => {
await refresh(page, data.size)
},
onSizeChange: async (size: number) => {
await refresh(data.page, size)
},
}}
columns={[
{accessorKey: 'bill_no', header: `账单编号`,
accessorFn: row => row.bill?.bill_no || '',
},
{
accessorKey: 'status',
header: `状态`,
cell: ({row}) => {
const trade = row.original.trade
if (![1, 2, 3, 4, 5].includes(trade?.method)) {
return (
<div className="flex items-center gap-2">
<CheckCircle size={16} className="text-done"/>
<span></span>
</div>
)
}
if (!trade) return <span>-</span>
return (
<div className="flex items-center gap-2">
<CheckCircle size={16} className="text-done"/>
<span></span>
{trade?.status === 1 ? (
<CheckCircle size={16} className="text-done"/>
) : trade?.status === 2 ? (
<AlertCircle size={16} className="text-weak"/>
) : trade?.status === 3 ? (
<AlertCircle size={16} className="text-fail"/>
) : null}
<span>
{trade?.status === 1 ? '已完成'
: trade?.status === 2 ? '已取消'
: trade?.status === 3 ? '已退款' : '-'}
</span>
</div>
)
}
if (!trade) return <span>-</span>
return (
},
},
{
accessorKey: 'amount',
header: '变动金额',
cell: ({row}) => {
const amount = row.original.amount
const isPositive = Number(amount) > 0
return (
<div className="flex items-center gap-1">
<span
className={`font-semibold ${
isPositive ? 'text-green-600' : 'text-red-600'
}`}
>
{isPositive ? '+' : ''}
{Number(amount).toFixed(2)}
</span>
</div>
)
},
},
{
header: '余额变化',
accessorKey: 'balance_prev',
cell: ({row}) => (
<div className="flex items-center gap-2">
{trade?.status === 1 ? (
<CheckCircle size={16} className="text-done"/>
) : trade?.status === 2 ? (
<AlertCircle size={16} className="text-weak"/>
) : trade?.status === 3 ? (
<AlertCircle size={16} className="text-fail"/>
) : null}
<span>
{trade?.status === 1 ? '已完成'
: trade?.status === 2 ? '已取消'
: trade?.status === 3 ? '已退款' : '-'}
</span>
<span className="text-gray-500 text-sm">¥{Number(row.original.balance_prev).toFixed(2)}</span>
<span className="text-muted-foreground"></span>
<span>¥{Number(row.original.balance_curr).toFixed(2)}</span>
</div>
)
),
},
},
{
accessorKey: 'amount',
header: '变动金额',
cell: ({row}) => {
const amount = row.original.amount
const isPositive = Number(amount) > 0
return (
<div className="flex items-center gap-1">
<span
className={`font-semibold ${
isPositive ? 'text-green-600' : 'text-red-600'
}`}
>
{isPositive ? '+' : ''}
{Number(amount).toFixed(2)}
</span>
</div>
)
{
header: '备注',
accessorKey: 'remark',
},
},
{
header: '余额变化',
accessorKey: 'balance_prev',
cell: ({row}) => (
<div className="flex items-center gap-2">
<span className="text-gray-500 text-sm">¥{Number(row.original.balance_prev).toFixed(2)}</span>
<span className="text-muted-foreground"></span>
<span>¥{Number(row.original.balance_curr).toFixed(2)}</span>
</div>
),
},
{
header: '备注',
accessorKey: 'remark',
},
{
header: '创建时间',
accessorKey: 'created_at',
cell: ({row}) =>
format(new Date(row.original.created_at), 'yyyy-MM-dd HH:mm'),
},
]}
/>
{
header: '创建时间',
accessorKey: 'created_at',
cell: ({row}) =>
format(new Date(row.original.created_at), 'yyyy-MM-dd HH:mm:ss'),
},
]}
/>
</Suspense>
</Page>
)
}

View File

@@ -88,7 +88,7 @@ export default function BillsPage(props: BillsPageProps) {
<div>
</div>
<Form form={form} handler={form.handleSubmit(onSubmit)} className="flex items-end gap-4 flex-wrap">
<Form form={form} handler={form.handleSubmit(onSubmit)} className="flex-auto flex flex-wrap gap-4 items-end">
<FormField name="type" label={<span className="text-sm"></span>}>
{({id, field}) => (
<Select value={field.value} onValueChange={field.onChange}>
@@ -281,7 +281,7 @@ export default function BillsPage(props: BillsPageProps) {
},
{
accessorKey: 'created_at', header: '创建时间', cell: ({row}) => (
format(new Date(row.original.created_at), 'yyyy-MM-dd HH:mm')
format(new Date(row.original.created_at), 'yyyy-MM-dd HH:mm:ss')
),
},
// {

View File

@@ -93,6 +93,7 @@ export default function ChannelsPage(props: ChannelsPageProps) {
// ======================
// render
// ======================
console.log(data.list, 'data.listdata.list')
return (
<Page>
@@ -214,7 +215,7 @@ export default function ChannelsPage(props: ChannelsPageProps) {
},
{
header: '提取时间',
cell: ({row}) => format(row.original.created_at, 'yyyy-MM-dd HH:mm'),
cell: ({row}) => format(row.original.created_at, 'yyyy-MM-dd HH:mm:ss'),
},
{
header: '过期时间',

View File

@@ -29,7 +29,7 @@ export default function ResourceFilter({form, onSubmit, onReset}: ResourceFilter
const handler = form.handleSubmit(onSubmit)
return (
<Form form={form} handler={handler} className="flex items-end gap-4 flex-wrap">
<Form form={form} handler={handler} className="flex-auto flex flex-wrap gap-4 items-end">
<FormField name="resource_no" label={<span className="text-sm"></span>}>
{({id, field}) => (
<Input {...field} id={id} className="h-9"/>

View File

@@ -44,7 +44,7 @@ export function ExpireBadge({expireAt}: {expireAt: Date}) {
// 格式化日期
export function formatDateTime(date: Date | null | undefined) {
if (!date) return '-'
return format(date, 'yyyy-MM-dd HH:mm')
return format(date, 'yyyy-MM-dd HH:mm:ss')
}
// 计算今日使用量

View File

@@ -269,7 +269,7 @@ export default function WhitelistPage(props: WhitelistPageProps) {
header: `备注`, accessorKey: 'remark',
},
{
header: `添加时间`, cell: ({row}) => format(parseISO(row.original.created_at), 'yyyy-MM-dd HH:mm'),
header: `添加时间`, cell: ({row}) => format(parseISO(row.original.created_at), 'yyyy-MM-dd HH:mm:ss'),
},
{
id: 'actions', header: `操作`, cell: ({row}) => (