From b82f4cab1c2f5acb8e49f09f066dcfe3b66784a5 Mon Sep 17 00:00:00 2001
From: Eamon <17516219072@163.com>
Date: Tue, 23 Jun 2026 14:32:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E6=98=8E=E7=BB=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=A2=E5=8D=95=E9=87=91=E9=A2=9D=20=20&=20?=
 =?UTF-8?q?=E9=95=BF=E6=95=88=E5=A5=97=E9=A4=90=E8=A1=A8=E6=A0=BC=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/(root)/resources/page.tsx |  3 +--
 src/app/(root)/trade/page.tsx     | 19 +++++++++++++++++--
 src/models/trade.ts               |  1 +
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/app/(root)/resources/page.tsx b/src/app/(root)/resources/page.tsx
index f98243a..b00d46f 100644
--- a/src/app/(root)/resources/page.tsx
+++ b/src/app/(root)/resources/page.tsx
@@ -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) => {
diff --git a/src/app/(root)/trade/page.tsx b/src/app/(root)/trade/page.tsx
index 90c8aee..4c62007 100644
--- a/src/app/(root)/trade/page.tsx
+++ b/src/app/(root)/trade/page.tsx
@@ -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 {
diff --git a/src/models/trade.ts b/src/models/trade.ts
index 90364a8..0b1b468 100644
--- a/src/models/trade.ts
+++ b/src/models/trade.ts
@@ -16,4 +16,5 @@ export type Trade = {
   updated_at: Date
   user?: User
   remark: string
+  amount:string
 }