网管列表表格操作按钮优化

src/actions/cust.ts

@@ -44,7 +44,11 @@ export async function createCust(data: {
   return callByUser<PageRecord<User>>("/api/admin/user/create", data)
 }
 
-export async function getDeposit(params: { user_id: number; amount: string }) {
+export async function getDeposit(params: {
+  user_id: number
+  amount: string
+  remark: string
+}) {
   return callByUser<PageRecord<User>>(
     "/api/admin/user/update/balance-inc",
     params,
@@ -54,6 +58,7 @@ export async function getDeposit(params: { user_id: number; amount: string }) {
 export async function getDeduction(params: {
   user_id: number
   amount: string
+  remark: string
 }) {
   return callByUser<PageRecord<User>>(
     "/api/admin/user/update/balance-dec",

src/actions/trade.ts

@@ -39,7 +39,7 @@ export async function updateTradeRemark(params: {
 }
 
 type PayCloseData = {
-  status: 0 | 1 | 2
+  Status: 0 | 1 | 2
   TransId: string
 }
 
@@ -49,3 +49,27 @@ export async function getTradeCheckk(params: {
 }) {
   return callByUser<PayCloseData>("/api/admin/trade/check", params)
 }
+
+export async function tradeComplete(params: {
+  trade_no: string
+  method: number
+  user_id: number
+}) {
+  return callByUser<PayCloseData>("/api/admin/trade/complete", params)
+}
+
+export async function tradeConvert(params: {
+  trade_no: string
+  method: number
+  user_id: number
+}) {
+  return callByUser<PayCloseData>("/api/admin/trade/convert", params)
+}
+
+export async function tradeCancel(params: {
+  trade_no: string
+  method: number
+  user_id: number
+}) {
+  return callByUser<PayCloseData>("/api/admin/trade/cancel", params)
+}

src/app/(root)/_navigation/index.tsx

@@ -1,7 +1,6 @@
 "use client"
 import {
   Activity,
-  BarChart3,
   ChevronsLeft,
   ChevronsRight,
   CircleDollarSign,

src/app/(root)/cust/deduction.tsx

@@ -18,6 +18,7 @@ import {
 } from "@/components/ui/dialog"
 import { Field, FieldError, FieldLabel } from "@/components/ui/field"
 import { Input } from "@/components/ui/input"
+import { Textarea } from "@/components/ui/textarea"
 import type { User } from "@/models/user"
 
 const Schema = z.object({
@@ -26,6 +27,7 @@ const Schema = z.object({
     .min(1, "请输入扣款金额")
     .refine(val => !Number.isNaN(Number(val)), "请输入有效的数字")
     .refine(val => Number(val) >= 0, "金额不能为负数"),
+  remark: z.string().min(1, "请输入操作说明"),
 })
 
 type FormValues = z.infer<typeof Schema>
@@ -52,6 +54,7 @@ export function DeductionDialog({
     resolver: zodResolver(Schema),
     defaultValues: {
       deduction: "",
+      remark: "",
     },
   })
 
@@ -61,6 +64,7 @@ export function DeductionDialog({
       const result = await getDeduction({
         user_id: user.id,
         amount: data.deduction,
+        remark: data.remark,
       })
 
       if (result.success) {
@@ -123,6 +127,15 @@ export function DeductionDialog({
               />
               <FieldError>{errors.deduction?.message}</FieldError>
             </Field>
+            <Field data-invalid={!!errors.remark}>
+              <FieldLabel>操作说明</FieldLabel>
+              <Textarea
+                placeholder="请输入操作说明（必填）"
+                {...register("remark")}
+                rows={3}
+              />
+              <FieldError>{errors.remark?.message}</FieldError>
+            </Field>
           </div>
 
           <DialogFooter>

src/app/(root)/cust/deposit.tsx

@@ -18,6 +18,7 @@ import {
 } from "@/components/ui/dialog"
 import { Field, FieldError, FieldLabel } from "@/components/ui/field"
 import { Input } from "@/components/ui/input"
+import { Textarea } from "@/components/ui/textarea"
 import type { User } from "@/models/user"
 
 const Schema = z.object({
@@ -26,6 +27,7 @@ const Schema = z.object({
     .min(1, "请输入余额")
     .refine(val => !Number.isNaN(Number(val)), "请输入有效的数字")
     .refine(val => Number(val) >= 0, "余额不能为负数"),
+  remark: z.string().min(1, "请输入操作说明"),
 })
 
 type FormValues = z.infer<typeof Schema>
@@ -49,6 +51,7 @@ export function DepositDialog({ user, onSuccess }: UpdateDepositDialogProps) {
     resolver: zodResolver(Schema),
     defaultValues: {
       deposit: "",
+      remark: "",
     },
   })
 
@@ -58,6 +61,7 @@ export function DepositDialog({ user, onSuccess }: UpdateDepositDialogProps) {
       const result = await getDeposit({
         user_id: user.id,
         amount: data.deposit,
+        remark: data.remark,
       })
 
       if (result.success) {
@@ -120,6 +124,15 @@ export function DepositDialog({ user, onSuccess }: UpdateDepositDialogProps) {
               />
               <FieldError>{errors.deposit?.message}</FieldError>
             </Field>
+            <Field data-invalid={!!errors.remark}>
+              <FieldLabel>操作说明</FieldLabel>
+              <Textarea
+                placeholder="请输入操作说明（必填）"
+                {...register("remark")}
+                rows={3}
+              />
+              <FieldError>{errors.remark?.message}</FieldError>
+            </Field>
           </div>
 
           <DialogFooter>

src/app/(root)/gateway/page.tsx

@@ -14,6 +14,12 @@ import { Auth } from "@/components/auth"
 import { DataTable, useDataTable } from "@/components/data-table"
 import { Page } from "@/components/page"
 import { Button } from "@/components/ui/button"
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu"
 import { ScopeChannelWriteClearExpired, ScopeProxyWrite } from "@/lib/scopes"
 import type { Gateway } from "@/models/gateway"
 import CreatePage from "./create"
@@ -168,7 +174,8 @@ export default function GatewayPage() {
               id: "action",
               meta: { pin: "right" },
               header: "操作",
-              cell: ({ row }) => (
+              cell: ({ row }) => {
+                return (
                   <div className="flex gap-2 ">
                     <Button
                       onClick={() =>
@@ -178,24 +185,41 @@ export default function GatewayPage() {
                       variant={
                         row.original.status === 0 ? "default" : "destructive"
                       }
+                      size="sm"
                     >
                       {row.original.status === 0 ? "启用" : "停用"}
                     </Button>
-                  <Auth scope={ScopeChannelWriteClearExpired}>
-                    <Button onClick={() => clearExpired(row.original)}>
-                      清理过期连接
+                    <DropdownMenu>
+                      <DropdownMenuTrigger asChild>
+                        <Button size="sm" variant="outline">
+                          打开菜单
                         </Button>
+                      </DropdownMenuTrigger>
+                      <DropdownMenuContent align="end" className="w-8">
+                        <Auth scope={ScopeChannelWriteClearExpired}>
+                          <DropdownMenuItem
+                            onClick={() => clearExpired(row.original)}
+                          >
+                            清理过期连接
+                          </DropdownMenuItem>
                         </Auth>
                         <Auth scope={ScopeProxyWrite}>
-                    <Button onClick={() => createPort(row.original)}>
+                          <DropdownMenuItem
+                            onClick={() => createPort(row.original)}
+                          >
                             重建端口池
-                    </Button>
-                    <Button onClick={() => createChains(row.original)}>
+                          </DropdownMenuItem>
+                          <DropdownMenuItem
+                            onClick={() => createChains(row.original)}
+                          >
                             重建代理链
-                    </Button>
+                          </DropdownMenuItem>
                         </Auth>
+                      </DropdownMenuContent>
+                    </DropdownMenu>
                   </div>
-              ),
+                )
+              },
             },
           ]}
         />

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) => {

src/app/(root)/trade/page.tsx

@@ -10,6 +10,9 @@ import { z } from "zod"
 import {
   getPageTrade,
   getTradeCheckk,
+  tradeCancel,
+  tradeComplete,
+  tradeConvert,
   updateTradeRemark,
 } from "@/actions/trade"
 import { DataTable, useDataTable } from "@/components/data-table"
@@ -119,7 +122,6 @@ export default function TradePage() {
     setFilters(result)
     table.pagination.onPageChange(1)
   })
-  console.log(...table.data.map(i => i.remark), "tabletabletabletable")
 
   return (
     <Page>
@@ -309,6 +311,21 @@ export default function TradePage() {
                 )
               },
             },
+            {
+              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: "支付状态",
               accessorKey: "status",
@@ -390,7 +407,12 @@ export default function TradePage() {
               meta: { pin: "right" },
               cell: ({ row }) => (
                 <div className="flex gap-2">
-                  <CheckOrder trade={row.original} />
+                  {row.original.status === 0 && (
+                    <CheckOrder
+                      trade={row.original}
+                      onSuccess={table.refresh}
+                    />
+                  )}
                   <UpdateRole trade={row.original} onSuccess={table.refresh} />
                 </div>
               ),
@@ -402,10 +424,10 @@ export default function TradePage() {
   )
 }
 type PayCloseData = {
-  status: 0 | 1 | 2
+  Status: 0 | 1 | 2
   TransId?: string
 }
-function CheckOrder(props: { trade: Trade }) {
+function CheckOrder(props: { trade: Trade; onSuccess: () => void }) {
   const [open, setOpen] = useState(false)
   const [loading, setLoading] = useState(false)
   const [data, setData] = useState<PayCloseData | null>(null)
@@ -417,8 +439,8 @@ function CheckOrder(props: { trade: Trade }) {
         trade_no: props.trade.inner_no,
         method: Number(props.trade.method),
       })
-
       console.log(res, "res")
+
       if (res.success) {
         setData(res.data)
       } else {
@@ -431,7 +453,78 @@ function CheckOrder(props: { trade: Trade }) {
     } finally {
       setLoading(false)
     }
-  }, [props.trade.inner_no, props.trade.method])
+  }, [props])
+
+  const headerClick = useCallback(async () => {
+    setLoading(true)
+    try {
+      const result = await tradeComplete({
+        trade_no: props.trade.inner_no,
+        method: Number(props.trade.method),
+        user_id: Number(props.trade.user_id),
+      })
+
+      if (result.success) {
+        toast.success("订单已完成")
+        props.onSuccess?.()
+      } else {
+        toast.error(result.message)
+      }
+    } catch (error) {
+      const message = error instanceof Error ? error.message : error
+      toast.error(`检查失败，请重试: ${message}`)
+    } finally {
+      setLoading(false)
+    }
+  }, [props])
+
+  const convert = useCallback(async () => {
+    setLoading(true)
+    try {
+      const result = await tradeConvert({
+        trade_no: props.trade.inner_no,
+        method: Number(props.trade.method),
+        user_id: Number(props.trade.user_id),
+      })
+      console.log(result, "resultresultresult")
+
+      if (result.success) {
+        toast.success("补到余额完成")
+        props.onSuccess?.()
+      } else {
+        toast.error(result.message)
+      }
+    } catch (error) {
+      const message = error instanceof Error ? error.message : error
+      toast.error(`补到余额失败，请重试: ${message}`)
+    } finally {
+      setLoading(false)
+    }
+  }, [props])
+
+  const cancel = useCallback(async () => {
+    setLoading(true)
+    try {
+      const result = await tradeCancel({
+        trade_no: props.trade.inner_no,
+        method: Number(props.trade.method),
+        user_id: Number(props.trade.user_id),
+      })
+      console.log(result, "resultresultresult")
+
+      if (result.success) {
+        toast.success("取消订单完成")
+        props.onSuccess?.()
+      } else {
+        toast.error(result.message)
+      }
+    } catch (error) {
+      const message = error instanceof Error ? error.message : error
+      toast.error(`取消订单失败，请重试: ${message}`)
+    } finally {
+      setLoading(false)
+    }
+  }, [props])
 
   return (
     <>
@@ -448,20 +541,33 @@ function CheckOrder(props: { trade: Trade }) {
           {data && (
             <div className="py-4">
               <div
-                className={`p-4 rounded-lg ${data.status === 1 ? "bg-green-50" : "bg-red-50"}`}
+                className={`p-4 rounded-lg ${data.Status === 1 ? "bg-green-100" : "bg-red-100"}`}
               >
-                <p className="font-medium">创建时间:{data?.TransId}</p>
+                <p className="font-medium">创建时间：{data?.TransId}</p>
                 <p className="mt-2">
                   支付状态：
-                  {data?.status === 1
+                  {data?.Status === 1
                     ? "已支付"
-                    : data?.status === 0
+                    : data?.Status === 0
                       ? "待支付"
                       : "已取消"}
                 </p>
               </div>
             </div>
           )}
+          {props && props.trade.status === 0 && (
+            <div className="flex gap-4 items-center justify-center">
+              <Button size="sm" className="w-32" onClick={headerClick}>
+                完成订单
+              </Button>
+              <Button size="sm" className="w-32" onClick={convert}>
+                补到余额
+              </Button>
+              <Button size="sm" className="w-32" onClick={cancel}>
+                取消订单
+              </Button>
+            </div>
+          )}
 
           <DialogFooter>
             <DialogClose asChild>

src/models/trade.ts

@@ -16,4 +16,5 @@ export type Trade = {
   updated_at: Date
   user?: User
   remark: string
+  amount:string
 }