交易明细添加订单金额 & 长效套餐表格滚动问题
This commit is contained in:
@@ -209,7 +209,7 @@ export default function ResourcesPage() {
|
||||
>
|
||||
<ResourceList resourceType="short" />
|
||||
</TabsContent>
|
||||
<TabsContent value="long" className="flex flex-col gap-4">
|
||||
<TabsContent value="long" className="flex flex-col gap-4 overflow-hidden">
|
||||
<ResourceList resourceType="long" />
|
||||
</TabsContent>
|
||||
</Tabs>
|
||||
@@ -268,7 +268,6 @@ function ResourceList({ resourceType }: ResourceListProps) {
|
||||
)
|
||||
|
||||
const table = useDataTable<Resources>(fetchResources)
|
||||
console.log(table, "table")
|
||||
|
||||
const handleStatusChange = useCallback(
|
||||
async (resource: Resources, newStatusValue: string) => {
|
||||
|
||||
@@ -119,7 +119,7 @@ export default function TradePage() {
|
||||
setFilters(result)
|
||||
table.pagination.onPageChange(1)
|
||||
})
|
||||
console.log(...table.data.map(i => i.remark), "tabletabletabletable")
|
||||
// console.log(...table.data.map(i => i.remark), "tabletabletabletable")
|
||||
|
||||
return (
|
||||
<Page>
|
||||
@@ -308,6 +308,22 @@ export default function TradePage() {
|
||||
</div>
|
||||
)
|
||||
},
|
||||
},{
|
||||
header:"订单金额",
|
||||
accessorKey:"amount",
|
||||
cell: ({ row }) => {
|
||||
const amount =
|
||||
typeof row.original.amount === "string"
|
||||
? parseFloat(row.original.amount)
|
||||
: row.original.amount || 0
|
||||
return (
|
||||
<div className="flex gap-1">
|
||||
<span>
|
||||
¥{amount.toFixed(2)}
|
||||
</span>
|
||||
</div>
|
||||
)
|
||||
},
|
||||
},
|
||||
{
|
||||
header: "支付状态",
|
||||
@@ -418,7 +434,6 @@ function CheckOrder(props: { trade: Trade }) {
|
||||
method: Number(props.trade.method),
|
||||
})
|
||||
|
||||
console.log(res, "res")
|
||||
if (res.success) {
|
||||
setData(res.data)
|
||||
} else {
|
||||
|
||||
@@ -16,4 +16,5 @@ export type Trade = {
|
||||
updated_at: Date
|
||||
user?: User
|
||||
remark: string
|
||||
amount:string
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user