新功能(#43): 提现前端优化 — 收款方式选择 + 收款码上传 + 取消按钮

备注保存前获取完整用户详情构造请求体，TC03 清空备注场景不再丢失其他字段。
拆出 RemarkForm 组件，增加保存中禁用态和失败错误提示。

.github/workflows/auto-merge.yml

@@ -1,30 +1,29 @@
 name: Dependabot Auto Merge
+
 on:
   pull_request_target:
-    types: [labeled, edited]
+    types: [opened, reopened, synchronize, ready_for_review, labeled]
+
+permissions:
+  contents: write
+  pull-requests: write
+
+concurrency:
+  group: dependabot-auto-merge-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
 
 jobs:
   merge:
-    if: contains(github.event.pull_request.labels.*.name, 'dependencies')
+    if: >
+      github.actor == 'dependabot[bot]' &&
+      github.event.pull_request.user.login == 'dependabot[bot]' &&
+      contains(github.event.pull_request.labels.*.name, 'dependencies')
     name: Dependabot Auto Merge
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-
-      - name: Install deps
-        run: pnpm install
-
-      - name: Merge
-        uses: ahmadnassri/action-dependabot-auto-merge@v2
-        with:
-          command: merge
-          target: minor
-          github-token: ${{ secrets.GH_TOKEN }}
+      - name: Enable auto-merge
+        env:
+          GH_TOKEN: ${{ github.token }}
+          PR_URL: ${{ github.event.pull_request.html_url }}
+        run: gh pr merge "$PR_URL" --auto --merge

.github/workflows/pr-check.yml

@@ -0,0 +1,48 @@
+name: PR Check
+
+on:
+  push:
+    branches:
+      - main
+      - internal
+  pull_request:
+    branches:
+      - main
+      - internal
+
+permissions:
+  contents: read
+
+concurrency:
+  group: pr-check-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  validate:
+    name: Lint, Check, Test and Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: '1.3.1'
+
+      - name: Install dependencies
+        run: bun install --frozen-lockfile
+
+      - name: Lint
+        run: bun run lint
+
+      - name: Check
+        run: bun run check
+
+      - name: Test
+        run: bun run test
+
+      - name: Build
+        run: bun run build

.github/workflows/release.yml

@@ -9,20 +9,25 @@ on:
 permissions:
   contents: write
 
+concurrency:
+  group: release-${{ github.ref }}
+  cancel-in-progress: false
+
 jobs:
   release:
     name: Build
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
 
       - name: Setup Bun
-        uses: oven-sh/setup-bun@v1
+        uses: oven-sh/setup-bun@v2
         with:
-          bun-version: 'latest'
+          bun-version: '1.3.1'
 
       - name: Cache Bun dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.bun
@@ -32,7 +37,7 @@ jobs:
             ${{ runner.os }}-bun-cache-
 
       - name: Install deps
-        run: bun install
+        run: bun install --frozen-lockfile
 
       - name: Build
         run: bun run build

apps/admin/public/assets/locales/en-US/menu.json

@@ -34,5 +34,6 @@
   "Traffic Details": "Traffic Details",
   "Device Group": "Device Group",
   "User Management": "User Management",
-  "Users & Support": "Users & Support"
+  "Users & Support": "Users & Support",
+  "Withdrawal Management": "Withdrawal Management"
 }

apps/admin/public/assets/locales/en-US/order.json

@@ -1,17 +1,25 @@
 {
   "amount": "Amount",
   "couponDiscount": "Coupon Discount",
+  "confirmRefund": "Confirm refund",
   "discount": "Discount Amount",
   "feeAmount": "Fee Amount",
   "method": "Payment Method",
   "orderNumber": "Order Number",
+  "refund": "Refund",
+  "refundConfirmDescription": "This refund will immediately invalidate the user's subscription and deduct the related agent commission.",
+  "refundConfirmTitle": "Confirm refund",
+  "refundConfirmWarning": "This action cannot be repeated after the order is refunded.",
+  "refundSubmitting": "Refunding...",
+  "refundSuccess": "Refund completed.",
   "status": {
     "0": "Status",
     "1": "Pending",
     "2": "Paid",
     "3": "Cancelled",
     "4": "Closed",
-    "5": "Completed"
+    "5": "Completed",
+    "6": "Refunded"
   },
   "subscribe": "Subscribe",
   "subscribePrice": "Subscription Price",

apps/admin/public/assets/locales/zh-CN/menu.json

@@ -34,5 +34,6 @@
   "Traffic Details": "流量详情",
   "Device Group": "设备组",
   "User Management": "用户管理",
-  "Users & Support": "用户与支持"
+  "Users & Support": "用户与支持",
+  "Withdrawal Management": "提现管理"
 }

apps/admin/public/assets/locales/zh-CN/order.json

@@ -1,17 +1,25 @@
 {
   "amount": "金额",
   "couponDiscount": "优惠券折扣",
+  "confirmRefund": "确认退费",
   "discount": "折扣金额",
   "feeAmount": "手续费",
   "method": "支付方式",
   "orderNumber": "订单编号",
+  "refund": "退费",
+  "refundConfirmDescription": "该退费操作会使用户订阅立即失效，并扣减关联代理佣金。",
+  "refundConfirmTitle": "确认退费",
+  "refundConfirmWarning": "订单退费后不可再次重复执行，请谨慎操作。",
+  "refundSubmitting": "退费中...",
+  "refundSuccess": "退费成功。",
   "status": {
     "0": "状态",
     "1": "待支付",
     "2": "已支付",
     "3": "已取消",
     "4": "已关闭",
-    "5": "已完成"
+    "5": "已完成",
+    "6": "已退费"
   },
   "subscribe": "订阅",
   "subscribePrice": "订阅价格",

apps/admin/src/routeTree.gen.ts

@@ -20,6 +20,9 @@ const DashboardWithdrawalLazyRouteImport = createFileRoute(
 )()
 const DashboardServersLazyRouteImport = createFileRoute('/dashboard/servers')()
 const DashboardNodesLazyRouteImport = createFileRoute('/dashboard/nodes')()
+const DashboardWithdrawalIndexLazyRouteImport = createFileRoute(
+  '/dashboard/withdrawal/',
+)()
 const DashboardUserIndexLazyRouteImport = createFileRoute('/dashboard/user/')()
 const DashboardTicketIndexLazyRouteImport =
   createFileRoute('/dashboard/ticket/')()
@@ -133,6 +136,14 @@ const DashboardNodesLazyRoute = DashboardNodesLazyRouteImport.update({
 } as any).lazy(() =>
   import('./routes/dashboard/nodes.lazy').then((d) => d.Route),
 )
+const DashboardWithdrawalIndexLazyRoute =
+  DashboardWithdrawalIndexLazyRouteImport.update({
+    id: '/',
+    path: '/',
+    getParentRoute: () => DashboardWithdrawalLazyRoute,
+  } as any).lazy(() =>
+    import('./routes/dashboard/withdrawal/index.lazy').then((d) => d.Route),
+  )
 const DashboardUserIndexLazyRoute = DashboardUserIndexLazyRouteImport.update({
   id: '/user/',
   path: '/user/',
@@ -356,7 +367,7 @@ export interface FileRoutesByFullPath {
   '/dashboard': typeof DashboardRouteLazyRouteWithChildren
   '/dashboard/nodes': typeof DashboardNodesLazyRoute
   '/dashboard/servers': typeof DashboardServersLazyRoute
-  '/dashboard/withdrawal': typeof DashboardWithdrawalLazyRoute
+  '/dashboard/withdrawal': typeof DashboardWithdrawalLazyRouteWithChildren
   '/dashboard/': typeof DashboardIndexLazyRoute
   '/dashboard/log/balance': typeof DashboardLogBalanceLazyRoute
   '/dashboard/log/commission': typeof DashboardLogCommissionLazyRoute
@@ -386,12 +397,12 @@ export interface FileRoutesByFullPath {
   '/dashboard/system': typeof DashboardSystemIndexLazyRoute
   '/dashboard/ticket': typeof DashboardTicketIndexLazyRoute
   '/dashboard/user': typeof DashboardUserIndexLazyRoute
+  '/dashboard/withdrawal/': typeof DashboardWithdrawalIndexLazyRoute
 }
 export interface FileRoutesByTo {
   '/': typeof IndexLazyRoute
   '/dashboard/nodes': typeof DashboardNodesLazyRoute
   '/dashboard/servers': typeof DashboardServersLazyRoute
-  '/dashboard/withdrawal': typeof DashboardWithdrawalLazyRoute
   '/dashboard': typeof DashboardIndexLazyRoute
   '/dashboard/log/balance': typeof DashboardLogBalanceLazyRoute
   '/dashboard/log/commission': typeof DashboardLogCommissionLazyRoute
@@ -421,6 +432,7 @@ export interface FileRoutesByTo {
   '/dashboard/system': typeof DashboardSystemIndexLazyRoute
   '/dashboard/ticket': typeof DashboardTicketIndexLazyRoute
   '/dashboard/user': typeof DashboardUserIndexLazyRoute
+  '/dashboard/withdrawal': typeof DashboardWithdrawalIndexLazyRoute
 }
 export interface FileRoutesById {
   __root__: typeof rootRouteImport
@@ -428,7 +440,7 @@ export interface FileRoutesById {
   '/dashboard': typeof DashboardRouteLazyRouteWithChildren
   '/dashboard/nodes': typeof DashboardNodesLazyRoute
   '/dashboard/servers': typeof DashboardServersLazyRoute
-  '/dashboard/withdrawal': typeof DashboardWithdrawalLazyRoute
+  '/dashboard/withdrawal': typeof DashboardWithdrawalLazyRouteWithChildren
   '/dashboard/': typeof DashboardIndexLazyRoute
   '/dashboard/log/balance': typeof DashboardLogBalanceLazyRoute
   '/dashboard/log/commission': typeof DashboardLogCommissionLazyRoute
@@ -458,6 +470,7 @@ export interface FileRoutesById {
   '/dashboard/system/': typeof DashboardSystemIndexLazyRoute
   '/dashboard/ticket/': typeof DashboardTicketIndexLazyRoute
   '/dashboard/user/': typeof DashboardUserIndexLazyRoute
+  '/dashboard/withdrawal/': typeof DashboardWithdrawalIndexLazyRoute
 }
 export interface FileRouteTypes {
   fileRoutesByFullPath: FileRoutesByFullPath
@@ -496,12 +509,12 @@ export interface FileRouteTypes {
     | '/dashboard/system'
     | '/dashboard/ticket'
     | '/dashboard/user'
+    | '/dashboard/withdrawal/'
   fileRoutesByTo: FileRoutesByTo
   to:
     | '/'
     | '/dashboard/nodes'
     | '/dashboard/servers'
-    | '/dashboard/withdrawal'
     | '/dashboard'
     | '/dashboard/log/balance'
     | '/dashboard/log/commission'
@@ -531,6 +544,7 @@ export interface FileRouteTypes {
     | '/dashboard/system'
     | '/dashboard/ticket'
     | '/dashboard/user'
+    | '/dashboard/withdrawal'
   id:
     | '__root__'
     | '/'
@@ -567,6 +581,7 @@ export interface FileRouteTypes {
     | '/dashboard/system/'
     | '/dashboard/ticket/'
     | '/dashboard/user/'
+    | '/dashboard/withdrawal/'
   fileRoutesById: FileRoutesById
 }
 export interface RootRouteChildren {
@@ -618,6 +633,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof DashboardNodesLazyRouteImport
       parentRoute: typeof DashboardRouteLazyRoute
     }
+    '/dashboard/withdrawal/': {
+      id: '/dashboard/withdrawal/'
+      path: '/'
+      fullPath: '/dashboard/withdrawal/'
+      preLoaderRoute: typeof DashboardWithdrawalIndexLazyRouteImport
+      parentRoute: typeof DashboardWithdrawalLazyRoute
+    }
     '/dashboard/user/': {
       id: '/dashboard/user/'
       path: '/user'
@@ -817,10 +839,24 @@ declare module '@tanstack/react-router' {
   }
 }
 
+interface DashboardWithdrawalLazyRouteChildren {
+  DashboardWithdrawalIndexLazyRoute: typeof DashboardWithdrawalIndexLazyRoute
+}
+
+const DashboardWithdrawalLazyRouteChildren: DashboardWithdrawalLazyRouteChildren =
+  {
+    DashboardWithdrawalIndexLazyRoute: DashboardWithdrawalIndexLazyRoute,
+  }
+
+const DashboardWithdrawalLazyRouteWithChildren =
+  DashboardWithdrawalLazyRoute._addFileChildren(
+    DashboardWithdrawalLazyRouteChildren,
+  )
+
 interface DashboardRouteLazyRouteChildren {
   DashboardNodesLazyRoute: typeof DashboardNodesLazyRoute
   DashboardServersLazyRoute: typeof DashboardServersLazyRoute
-  DashboardWithdrawalLazyRoute: typeof DashboardWithdrawalLazyRoute
+  DashboardWithdrawalLazyRoute: typeof DashboardWithdrawalLazyRouteWithChildren
   DashboardIndexLazyRoute: typeof DashboardIndexLazyRoute
   DashboardLogBalanceLazyRoute: typeof DashboardLogBalanceLazyRoute
   DashboardLogCommissionLazyRoute: typeof DashboardLogCommissionLazyRoute
@@ -855,7 +891,7 @@ interface DashboardRouteLazyRouteChildren {
 const DashboardRouteLazyRouteChildren: DashboardRouteLazyRouteChildren = {
   DashboardNodesLazyRoute: DashboardNodesLazyRoute,
   DashboardServersLazyRoute: DashboardServersLazyRoute,
-  DashboardWithdrawalLazyRoute: DashboardWithdrawalLazyRoute,
+  DashboardWithdrawalLazyRoute: DashboardWithdrawalLazyRouteWithChildren,
   DashboardIndexLazyRoute: DashboardIndexLazyRoute,
   DashboardLogBalanceLazyRoute: DashboardLogBalanceLazyRoute,
   DashboardLogCommissionLazyRoute: DashboardLogCommissionLazyRoute,

apps/admin/src/routes/dashboard/withdrawal/index.lazy.tsx

@@ -0,0 +1,6 @@
+import { createLazyFileRoute } from "@tanstack/react-router";
+import WithdrawalPage from "@/sections/withdrawal";
+
+export const Route = createLazyFileRoute("/dashboard/withdrawal/")({
+  component: WithdrawalPage,
+});

apps/admin/src/sections/order/index.tsx

@@ -1,4 +1,16 @@
+import { useMutation } from "@tanstack/react-query";
 import { useSearch } from "@tanstack/react-router";
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+  AlertDialogTrigger,
+} from "@workspace/ui/components/alert-dialog";
 import { Badge } from "@workspace/ui/components/badge";
 import { Button } from "@workspace/ui/components/button";
 import {
@@ -16,18 +28,27 @@ import { cn } from "@workspace/ui/lib/utils";
 import {
   activateOrder,
   getOrderList,
+  refundOrder,
   updateOrderStatus,
 } from "@workspace/ui/services/admin/order";
-import { useRef } from "react";
+import { useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
+import { toast } from "sonner";
 import { Display } from "@/components/display";
+import { useGlobalStore } from "@/stores/global";
 import { useSubscribe } from "@/stores/subscribe";
 import { formatDate } from "@/utils/common";
 import { UserDetail } from "../user/user-detail";
 
+const REFUNDED_ORDER_STATUS = 6;
+
 export default function Order() {
   const { t } = useTranslation("order");
   const sp = useSearch({ strict: false }) as Record<string, string | undefined>;
+  const user = useGlobalStore((state) => state.user);
+  const [confirmingOrderId, setConfirmingOrderId] = useState<number | null>(
+    null
+  );
   const initialFilters = {
     user_id: sp.user_id ? Number(sp.user_id) : undefined,
     search: sp.search || undefined,
@@ -53,6 +74,11 @@ export default function Order() {
       label: t("status.5", "Completed"),
       className: "bg-green-500",
     },
+    {
+      value: REFUNDED_ORDER_STATUS,
+      label: t("status.6", "Refunded"),
+      className: "bg-red-500",
+    },
   ];
 
   const typeOptions = [
@@ -65,10 +91,101 @@ export default function Order() {
   const ref = useRef<ProTableActions>(null);
 
   const { subscribes, getSubscribeName } = useSubscribe();
+  const canRefundOrders = Boolean(user?.is_admin);
+
+  const refundMutation = useMutation({
+    mutationFn: async (order: API.Order) => {
+      await refundOrder({ id: order.id });
+    },
+    onSuccess: () => {
+      toast.success(t("refundSuccess", "Refund completed."));
+      setConfirmingOrderId(null);
+      ref.current?.refresh();
+    },
+    onError: (error) => {
+      console.error("Refund order failed", error);
+      setConfirmingOrderId(null);
+    },
+  });
+
+  const isRefundedOrder = (order: API.Order) =>
+    order.status === REFUNDED_ORDER_STATUS ||
+    order.status_name === t("status.6", "Refunded") ||
+    order.status_name?.toLowerCase() === "refunded";
+
+  const canRefundOrder = (order: API.Order) =>
+    canRefundOrders && !isRefundedOrder(order);
 
   return (
     <ProTable<API.Order, any>
       action={ref}
+      actions={{
+        render: (order) => {
+          if (!canRefundOrder(order)) return [];
+
+          const isPending =
+            refundMutation.isPending && confirmingOrderId === order.id;
+
+          return [
+            <AlertDialog
+              key={`refund-${order.id}`}
+              onOpenChange={(open) => {
+                setConfirmingOrderId(open ? order.id : null);
+              }}
+              open={confirmingOrderId === order.id}
+            >
+              <AlertDialogTrigger asChild>
+                <Button disabled={isPending} size="sm" variant="destructive">
+                  {isPending
+                    ? t("refundSubmitting", "Refunding...")
+                    : t("refund", "Refund")}
+                </Button>
+              </AlertDialogTrigger>
+              <AlertDialogContent>
+                <AlertDialogHeader>
+                  <AlertDialogTitle>
+                    {t("refundConfirmTitle", "Confirm refund")}
+                  </AlertDialogTitle>
+                  <AlertDialogDescription asChild>
+                    <div className="space-y-2">
+                      <p>
+                        {t(
+                          "refundConfirmDescription",
+                          "This refund will immediately invalidate the user's subscription and deduct the related agent commission."
+                        )}
+                      </p>
+                      <p className="font-medium text-foreground">
+                        {t(
+                          "refundConfirmWarning",
+                          "This action cannot be repeated after the order is refunded."
+                        )}
+                      </p>
+                    </div>
+                  </AlertDialogDescription>
+                </AlertDialogHeader>
+                <AlertDialogFooter>
+                  <AlertDialogCancel disabled={isPending}>
+                    {t("cancel", "Cancel")}
+                  </AlertDialogCancel>
+                  <AlertDialogAction
+                    className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+                    disabled={isPending}
+                    onClick={async (event) => {
+                      event.preventDefault();
+                      if (isPending) return;
+                      await refundMutation.mutateAsync(order);
+                    }}
+                  >
+                    {isPending
+                      ? t("refundSubmitting", "Refunding...")
+                      : t("confirmRefund", "Confirm refund")}
+                  </AlertDialogAction>
+                </AlertDialogFooter>
+              </AlertDialogContent>
+            </AlertDialog>,
+          ];
+        },
+      }}
       columns={[
         {
           accessorKey: "order_no",
@@ -253,8 +370,13 @@ export default function Order() {
               );
             }
             return (
-              <Badge>
-                {option?.label || t(`status.${row.getValue("status")}`)}
+              <Badge
+                variant={isRefundedOrder(order) ? "destructive" : "default"}
+              >
+                {option?.label ||
+                  (order.status_name
+                    ? t(`status.${row.getValue("status")}`, order.status_name)
+                    : t(`status.${row.getValue("status")}`))}
               </Badge>
             );
           },

apps/admin/src/sections/user/index.tsx

@@ -16,6 +16,11 @@ import {
   DropdownMenuTrigger,
 } from "@workspace/ui/components/dropdown-menu";
 import { Input } from "@workspace/ui/components/input";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@workspace/ui/components/popover";
 import { ScrollArea } from "@workspace/ui/components/scroll-area";
 import {
   Select,
@@ -31,13 +36,6 @@ import {
   SheetTitle,
   SheetTrigger,
 } from "@workspace/ui/components/sheet";
-import { FilePenLine } from 'lucide-react';
-import {
-  Popover,
-  PopoverClose,
-  PopoverContent,
-  PopoverTrigger,
-} from '@workspace/ui/components/popover';
 import { Switch } from "@workspace/ui/components/switch";
 import {
   Tabs,
@@ -63,13 +61,16 @@ import {
   updateUserBasicInfo,
 } from "@workspace/ui/services/admin/user";
 import { parseDeviceType } from "@workspace/ui/utils/device";
-import React, { useRef, useState, useCallback } from 'react';
+import { FilePenLine } from "lucide-react";
+import { useCallback, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 import { Display } from "@/components/display";
 import { useSubscribe } from "@/stores/subscribe";
 import { formatDate } from "@/utils/common";
 import FamilyManagement from "./family";
+import { RemarkForm } from "./remark-form";
+import { buildUserBasicInfoPayload } from "./user-basic-info-payload";
 import { UserDetail } from "./user-detail";
 import UserForm from "./user-form";
 import { UserInviteStatsSheet } from "./user-invite-stats-sheet";
@@ -77,44 +78,11 @@ import { AuthMethodsForm } from "./user-profile/auth-methods-form";
 import { BasicInfoForm } from "./user-profile/basic-info-form";
 import { NotifySettingsForm } from "./user-profile/notify-settings-form";
 import UserSubscription from "./user-subscription";
+
 // import EditUserGroupDialog from "./edit-user-group-dialog";
 
-
-// 为 RemarkForm 组件定义 props 类型
-interface RemarkFormProps {
-  initialRemark?: string | null;
-  onSave: (remark: string) => void;
-  CloseComponent: React.ComponentType<{ asChild?: boolean; children: React.ReactNode }>;
-}
-// 新的子组件，在管理它自己的备注状态
-const RemarkForm: React.FC<RemarkFormProps> = ({ onSave, initialRemark, CloseComponent }) => {
-  const [remark, setRemark] = useState<string>(initialRemark ?? '');
-
-  const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    setRemark(event.target.value);
-  };
-
-  const handleSaveClick = () => {
-    onSave(remark);
-  };
-
-  return (
-      <>
-        <div className='mb-2 text-sm font-semibold'>备注</div>
-        <Input
-            type='text'
-            value={remark}
-            onChange={handleInputChange}
-            placeholder='在此输入备注...'
-            className='w-full'
-        />
-        <CloseComponent asChild>
-          <Button onClick={handleSaveClick} variant='default' size={'sm'} className={'mt-2'}>
-            保存
-          </Button>
-        </CloseComponent>
-      </>
-  );
+type UserDeviceWithDeviceNo = API.UserDevice & {
+  device_no?: string;
 };
 
 export default function User() {
@@ -184,7 +152,7 @@ export default function User() {
             userId={row.id}
           />,
           <PreviewNodesDialog key="preview-nodes" userId={row.id} />,
-         /* <ConfirmButton
+          /* <ConfirmButton
             cancelText={t("cancel", "Cancel")}
             confirmText={t("confirm", "Confirm")}
             description={t(
@@ -293,51 +261,57 @@ export default function User() {
         {
           id: "auth_methods",
           accessorKey: "auth_methods",
-          header: '设备码/邮箱',
+          header: "设备码/邮箱",
           cell: ({ row }) => {
             const method = row.original.auth_methods?.[0];
             const identifier = method?.auth_identifier || "";
             const isDevice = method?.auth_type === "device";
-            const firstDevice = row.original.user_devices?.[0] as any;
+            const firstDevice = row.original.user_devices?.[0] as
+              | UserDeviceWithDeviceNo
+              | undefined;
             const deviceNo = firstDevice?.device_no;
             const deviceType = parseDeviceType(firstDevice?.user_agent || "");
             const display = isDevice ? deviceNo || identifier : identifier;
             return (
               <div className="flex items-center">
-               {/* <Badge
+                {/* <Badge
                   className="mr-1 uppercase"
                   title={method?.verified ? t("verified", "Verified") : ""}
                 >
                   {method?.auth_type}
                 </Badge>*/}
                 {deviceType && (
-                    <Badge className="mr-1" variant="secondary">
-                      {deviceType}
-                    </Badge>
+                  <Badge className="mr-1" variant="secondary">
+                    {deviceType}
+                  </Badge>
                 )}
                 <span title={isDevice ? display : undefined}>{display}</span>
                 <Popover>
                   <PopoverTrigger>
-                    <div className={'flex items-center'}>
-                      {row.original?.remark ? `（${row.original.remark}）` : ''}
-                      <FilePenLine size={14} className={'text-primary ml-2'} />
+                    <div className={"flex items-center"}>
+                      {row.original?.remark ? `（${row.original.remark}）` : ""}
+                      <FilePenLine className={"ml-2 text-primary"} size={14} />
                     </div>
                   </PopoverTrigger>
-                  <PopoverContent className={'w-64'}>
+                  <PopoverContent className={"w-64"}>
                     <RemarkForm
-                        initialRemark={row.original.remark}
-                        CloseComponent={PopoverClose}
-                        onSave={async (remark) => {
-                          const {
-                            id,
-                          } = row.original;
-                          await updateUserBasicInfo({
-                            user_id: id,
-                            remark,
-                          } as unknown as API.UpdateUserBasiceInfoRequest);
-                          toast.success(t('updateSuccess'));
-                          ref.current?.refresh();
-                        }}
+                      initialRemark={row.original.remark}
+                      onSave={async (remark) => {
+                        const { data } = await getUserDetail({
+                          id: row.original.id,
+                        });
+                        const user = data.data;
+
+                        if (!user) {
+                          throw new Error("User detail not found");
+                        }
+
+                        await updateUserBasicInfo(
+                          buildUserBasicInfoPayload(user, remark)
+                        );
+                        toast.success(t("updateSuccess"));
+                        ref.current?.refresh();
+                      }}
                     />
                   </PopoverContent>
                 </Popover>
@@ -345,7 +319,7 @@ export default function User() {
             );
           },
         },
-       /* {
+        /* {
           id: "balance",
           accessorKey: "balance",
           header: t("balance", "Balance"),

apps/admin/src/sections/user/remark-form.test.tsx

@@ -0,0 +1,85 @@
+/**
+ * @vitest-environment jsdom
+ */
+import {
+  cleanup,
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+} from "@testing-library/react";
+import { Popover } from "@workspace/ui/components/popover";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { RemarkForm } from "./remark-form";
+
+afterEach(() => {
+  cleanup();
+});
+
+function renderRemarkForm(props: Parameters<typeof RemarkForm>[0]) {
+  return render(
+    <Popover open>
+      <RemarkForm {...props} />
+    </Popover>
+  );
+}
+
+describe("RemarkForm", () => {
+  it("submits an intentionally cleared remark", async () => {
+    const onSave = vi.fn<Parameters<typeof RemarkForm>[0]["onSave"]>();
+
+    renderRemarkForm({ initialRemark: "old remark", onSave });
+
+    fireEvent.change(screen.getByPlaceholderText("在此输入备注..."), {
+      target: { value: "" },
+    });
+    fireEvent.click(screen.getByRole("button", { name: "保存" }));
+
+    await waitFor(() => expect(onSave).toHaveBeenCalledWith(""));
+  });
+
+  it("shows loading and keeps the input disabled while saving", async () => {
+    let resolveSave: (() => void) | undefined;
+    const onSave = vi.fn(
+      () =>
+        new Promise<void>((resolve) => {
+          resolveSave = resolve;
+        })
+    );
+
+    renderRemarkForm({ initialRemark: "old remark", onSave });
+
+    fireEvent.click(screen.getByRole("button", { name: "保存" }));
+
+    expect(
+      screen.getByRole("button", { name: "保存中..." }).hasAttribute("disabled")
+    ).toBe(true);
+    expect(
+      screen.getByPlaceholderText("在此输入备注...").hasAttribute("disabled")
+    ).toBe(true);
+
+    resolveSave?.();
+    await waitFor(() =>
+      expect(
+        screen.getByRole("button", { name: "保存" }).hasAttribute("disabled")
+      ).toBe(false)
+    );
+  });
+
+  it("shows an error state and preserves input after save failure", async () => {
+    const onSave = vi.fn<Parameters<typeof RemarkForm>[0]["onSave"]>();
+    onSave.mockRejectedValue(new Error("failed"));
+
+    renderRemarkForm({ initialRemark: "old remark", onSave });
+
+    fireEvent.change(screen.getByPlaceholderText("在此输入备注..."), {
+      target: { value: "kept remark" },
+    });
+    fireEvent.click(screen.getByRole("button", { name: "保存" }));
+
+    expect((await screen.findByRole("alert")).textContent).toBe(
+      "备注保存失败，请重试"
+    );
+    expect(screen.getByDisplayValue("kept remark")).not.toBeNull();
+  });
+});

apps/admin/src/sections/user/remark-form.tsx

@@ -0,0 +1,69 @@
+import { Button } from "@workspace/ui/components/button";
+import { Input } from "@workspace/ui/components/input";
+import { PopoverClose } from "@workspace/ui/components/popover";
+import { useRef, useState } from "react";
+
+interface RemarkFormProps {
+  initialRemark?: string | null;
+  onSave: (remark: string) => Promise<void> | void;
+}
+
+export function RemarkForm({ onSave, initialRemark }: RemarkFormProps) {
+  const [remark, setRemark] = useState<string>(initialRemark ?? "");
+  const [saving, setSaving] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const closeRef = useRef<HTMLButtonElement>(null);
+
+  const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    setRemark(event.target.value);
+  };
+
+  const handleSave = async (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    setError(null);
+    setSaving(true);
+
+    try {
+      await onSave(remark);
+      closeRef.current?.click();
+    } catch {
+      setError("备注保存失败，请重试");
+    } finally {
+      setSaving(false);
+    }
+  };
+
+  return (
+    <form onSubmit={handleSave}>
+      <div className="mb-2 font-semibold text-sm">备注</div>
+      <Input
+        aria-invalid={Boolean(error)}
+        className="w-full"
+        disabled={saving}
+        onChange={handleInputChange}
+        placeholder="在此输入备注..."
+        type="text"
+        value={remark}
+      />
+      {error ? (
+        <p className="mt-2 text-destructive text-sm" role="alert">
+          {error}
+        </p>
+      ) : null}
+      <Button
+        className="mt-2"
+        disabled={saving}
+        size="sm"
+        type="submit"
+        variant="default"
+      >
+        {saving ? "保存中..." : "保存"}
+      </Button>
+      <PopoverClose asChild>
+        <button className="sr-only" ref={closeRef} type="button">
+          关闭
+        </button>
+      </PopoverClose>
+    </form>
+  );
+}

apps/admin/src/sections/user/user-basic-info-payload.test.ts

@@ -0,0 +1,53 @@
+import { describe, expect, it } from "vitest";
+import { buildUserBasicInfoPayload } from "./user-basic-info-payload";
+
+const user = {
+  id: 37,
+  avatar: "https://example.com/avatar.png",
+  balance: 1200,
+  commission: 300,
+  referral_percentage: 10,
+  only_first_purchase: true,
+  gift_amount: 500,
+  telegram: 123_456,
+  refer_code: "INVITE37",
+  referer_id: 7,
+  enable: true,
+  is_admin: false,
+  enable_balance_notify: true,
+  enable_login_notify: true,
+  enable_subscribe_notify: false,
+  enable_trade_notify: false,
+  user_group_id: 2,
+  group_locked: false,
+  auth_methods: [],
+  user_devices: [],
+  remark: "old remark",
+  rules: [],
+  created_at: 1_700_000_000,
+  updated_at: 1_700_000_100,
+} satisfies API.User;
+
+describe("buildUserBasicInfoPayload", () => {
+  it("keeps the full basic user fields when updating a remark", () => {
+    expect(buildUserBasicInfoPayload(user, "new remark")).toEqual({
+      user_id: 37,
+      avatar: "https://example.com/avatar.png",
+      balance: 1200,
+      commission: 300,
+      referral_percentage: 10,
+      only_first_purchase: true,
+      gift_amount: 500,
+      telegram: 123_456,
+      refer_code: "INVITE37",
+      referer_id: 7,
+      enable: true,
+      is_admin: false,
+      remark: "new remark",
+    });
+  });
+
+  it("preserves an intentionally cleared remark", () => {
+    expect(buildUserBasicInfoPayload(user, "").remark).toBe("");
+  });
+});

apps/admin/src/sections/user/user-basic-info-payload.ts

@@ -0,0 +1,26 @@
+import type { UpdateUserBasicInfoBody } from "@workspace/ui/services/admin/user";
+
+export type UserBasicInfoPayload = Omit<UpdateUserBasicInfoBody, "remark"> & {
+  remark: string;
+};
+
+export function buildUserBasicInfoPayload(
+  user: API.User,
+  remark: string
+): UserBasicInfoPayload {
+  return {
+    user_id: user.id,
+    avatar: user.avatar,
+    balance: user.balance,
+    commission: user.commission,
+    referral_percentage: user.referral_percentage,
+    only_first_purchase: user.only_first_purchase,
+    gift_amount: user.gift_amount,
+    telegram: user.telegram,
+    refer_code: user.refer_code,
+    referer_id: user.referer_id,
+    enable: user.enable,
+    is_admin: user.is_admin ?? false,
+    remark,
+  };
+}

apps/admin/src/sections/withdrawal/index.tsx

@@ -1,6 +1,7 @@
 "use client";
 
 import { zodResolver } from "@hookform/resolvers/zod";
+import { useMutation } from "@tanstack/react-query";
 import { Badge } from "@workspace/ui/components/badge";
 import { Button } from "@workspace/ui/components/button";
 import {
@@ -10,7 +11,6 @@ import {
   DialogFooter,
   DialogHeader,
   DialogTitle,
-  DialogTrigger,
 } from "@workspace/ui/components/dialog";
 import {
   Form,
@@ -21,15 +21,17 @@ import {
   FormMessage,
 } from "@workspace/ui/components/form";
 import { Textarea } from "@workspace/ui/components/textarea";
-import type { ProTableActions } from "@workspace/ui/composed/pro-table/pro-table";
-import { ProTable } from "@workspace/ui/composed/pro-table/pro-table";
+import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
+import {
+  ProTable,
+  type ProTableActions,
+} from "@workspace/ui/composed/pro-table/pro-table";
 import {
   approveWithdrawal,
   getWithdrawalList,
   rejectWithdrawal,
 } from "@workspace/ui/services/admin/withdrawal";
-import { LoaderCircle } from "lucide-react";
-import { useRef, useState, useTransition } from "react";
+import { useRef, useState } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
@@ -38,291 +40,342 @@ import { Display } from "@/components/display";
 import { UserDetail } from "@/sections/user/user-detail";
 import { formatDate } from "@/utils/common";
 
-const rejectionSchema = z.object({
+const WITHDRAWAL_METHOD_MAP: Record<number, string> = {
+  0: "其他",
+  1: "支付宝",
+  2: "微信",
+  3: "银行卡",
+};
+
+const rejectSchema = z.object({
   reason: z
     .string()
     .trim()
-    .min(1, "Reason is required")
-    .max(500, "Reason must be 500 characters or fewer"),
+    .min(2, "请填写拒绝原因")
+    .max(500, "拒绝原因不能超过 500 个字符"),
 });
 
-const WITHDRAWAL_STATUS_OPTIONS = [
-  { label: "All", value: "all" },
-  { label: "Pending", value: "0" },
-  { label: "Approved", value: "1" },
-  { label: "Rejected", value: "2" },
-] as const;
-
-function getStatusMeta(
-  status: number,
-  t: ReturnType<typeof useTranslation<"user">>["t"]
-) {
-  switch (status) {
-    case 1:
-      return {
-        label: t("withdrawal.status.approved", "Approved"),
-        variant: "default" as const,
-      };
-    case 2:
-      return {
-        label: t("withdrawal.status.rejected", "Rejected"),
-        variant: "destructive" as const,
-      };
-    default:
-      return {
-        label: t("withdrawal.status.pending", "Pending"),
-        variant: "secondary" as const,
-      };
-  }
+function QrCodeCell({ url }: { url?: string }) {
+  const [zoomOpen, setZoomOpen] = useState(false);
+  if (!url) return <span>--</span>;
+  return (
+    <>
+      <button
+        className="block overflow-hidden rounded border"
+        onClick={() => setZoomOpen(true)}
+        type="button"
+      >
+        <img
+          alt="收款码"
+          className="h-12 w-12 cursor-zoom-in object-cover"
+          src={url}
+        />
+      </button>
+      {zoomOpen && (
+        <Dialog onOpenChange={setZoomOpen} open={zoomOpen}>
+          <DialogContent className="max-w-sm">
+            <img alt="收款码" className="w-full" src={url} />
+          </DialogContent>
+        </Dialog>
+      )}
+    </>
+  );
 }
 
-function RejectWithdrawalDialog({
-  row,
-  onSuccess,
-}: {
-  row: API.AdminWithdrawalLog;
-  onSuccess: () => Promise<void> | void;
-}) {
+export default function WithdrawalPage() {
   const { t } = useTranslation("user");
-  const [open, setOpen] = useState(false);
-  const [loading, startTransition] = useTransition();
-  const form = useForm<z.infer<typeof rejectionSchema>>({
-    resolver: zodResolver(rejectionSchema),
+  const ref = useRef<ProTableActions>(null);
+  const [rejectOpen, setRejectOpen] = useState(false);
+  const [currentRow, setCurrentRow] = useState<API.AdminWithdrawalLog | null>(
+    null
+  );
+  const form = useForm<z.infer<typeof rejectSchema>>({
+    resolver: zodResolver(rejectSchema),
     defaultValues: {
       reason: "",
     },
   });
 
-  const handleSubmit = (values: z.infer<typeof rejectionSchema>) => {
-    startTransition(async () => {
-      await rejectWithdrawal({
-        withdrawal_id: row.id,
-        reason: values.reason.trim(),
-      });
-      toast.success(t("withdrawal.rejectSuccess", "Withdrawal rejected"));
-      await onSuccess();
-      setOpen(false);
-      form.reset();
-    });
+  const approveMutation = useMutation({
+    mutationFn: async (withdrawalId: number) =>
+      approveWithdrawal({ withdrawal_id: withdrawalId }),
+    onSuccess: () => {
+      toast.success("提现申请已通过");
+      ref.current?.refresh();
+    },
+    onError: (error) => {
+      console.error("Approve withdrawal failed", error);
+      toast.error("提现通过失败");
+    },
+  });
+
+  const rejectMutation = useMutation({
+    mutationFn: async (values: { withdrawal_id: number; reason: string }) =>
+      rejectWithdrawal(values),
+    onSuccess: () => {
+      toast.success("提现申请已拒绝");
+      setRejectOpen(false);
+      setCurrentRow(null);
+      form.reset({ reason: "" });
+      ref.current?.refresh();
+    },
+    onError: (error) => {
+      console.error("Reject withdrawal failed", error);
+      toast.error("提现拒绝失败");
+    },
+  });
+
+  const statusOptions = [
+    { value: "0", label: "审核中" },
+    { value: "1", label: "已通过" },
+    { value: "2", label: "已拒绝" },
+    { value: "3", label: "已取消" },
+  ];
+
+  const methodOptions = [
+    { value: "1", label: "支付宝" },
+    { value: "2", label: "微信" },
+    { value: "3", label: "银行卡" },
+    { value: "0", label: "其他" },
+  ];
+
+  const statusMap: Record<number, { label: string; className: string }> = {
+    0: {
+      label: "审核中",
+      className: "bg-amber-100 text-amber-700 border-amber-200",
+    },
+    1: {
+      label: "已通过",
+      className: "bg-emerald-100 text-emerald-700 border-emerald-200",
+    },
+    2: {
+      label: "已拒绝",
+      className: "bg-rose-100 text-rose-700 border-rose-200",
+    },
+    3: {
+      label: "已取消",
+      className: "bg-gray-100 text-gray-500 border-gray-200",
+    },
   };
 
   return (
-    <Dialog
-      onOpenChange={(nextOpen) => {
-        setOpen(nextOpen);
-        if (!nextOpen) form.reset();
-      }}
-      open={open}
-    >
-      <DialogTrigger asChild>
-        <Button size="sm" variant="destructive">
-          {t("withdrawal.reject", "Reject")}
-        </Button>
-      </DialogTrigger>
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>
-            {t("withdrawal.rejectTitle", "Reject Withdrawal")}
-          </DialogTitle>
-          <DialogDescription>
-            {t(
-              "withdrawal.rejectDescription",
-              "Provide a reason that will be shown in the user's withdrawal history."
-            )}
-          </DialogDescription>
-        </DialogHeader>
-        <Form {...form}>
-          <form
-            className="space-y-4"
-            id={`reject-withdrawal-${row.id}`}
-            onSubmit={form.handleSubmit(handleSubmit)}
-          >
-            <FormField
-              control={form.control}
-              name="reason"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>
-                    {t("withdrawal.rejectReason", "Reject Reason")}
-                  </FormLabel>
-                  <FormControl>
-                    <Textarea
-                      placeholder={t(
-                        "withdrawal.rejectReasonPlaceholder",
-                        "Explain why this withdrawal cannot be approved"
-                      )}
-                      rows={4}
-                      {...field}
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-          </form>
-        </Form>
-        <DialogFooter>
-          <Button
-            disabled={loading}
-            onClick={() => setOpen(false)}
-            variant="outline"
-          >
-            {t("cancel", "Cancel")}
-          </Button>
-          <Button
-            disabled={loading}
-            form={`reject-withdrawal-${row.id}`}
-            type="submit"
-            variant="destructive"
-          >
-            {loading && <LoaderCircle className="mr-2 h-4 w-4 animate-spin" />}
-            {t("withdrawal.rejectConfirm", "Reject Withdrawal")}
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-}
+    <>
+      <ProTable<
+        API.AdminWithdrawalLog,
+        { status?: string; user_id?: string; method?: string }
+      >
+        action={ref}
+        actions={{
+          render: (row) => {
+            if (row.status !== 0) return [];
 
-export default function WithdrawalManagementPage() {
-  const { t } = useTranslation("user");
-  const [approvingId, setApprovingId] = useState<number | null>(null);
-  const tableActionRef = useRef<ProTableActions | undefined>(undefined);
-
-  return (
-    <ProTable<API.AdminWithdrawalLog, { user_id?: string; status?: string }>
-      action={tableActionRef}
-      actions={{
-        render: (row) => {
-          if (Number(row.status) !== 0) return [];
-
-          const handleApprove = async () => {
-            try {
-              await approveWithdrawal({
-                withdrawal_id: Number(row.id),
-              });
-              toast.success(
-                t("withdrawal.approveSuccess", "Withdrawal approved")
-              );
-              await tableActionRef.current?.refresh();
-            } finally {
-              setApprovingId(null);
-            }
-          };
-
-          return [
-            <Button
-              disabled={approvingId === Number(row.id)}
-              key={`approve-${row.id}`}
-              onClick={() => {
-                setApprovingId(Number(row.id));
-                handleApprove();
-              }}
-              size="sm"
-            >
-              {approvingId === Number(row.id) && (
-                <LoaderCircle className="mr-2 h-4 w-4 animate-spin" />
-              )}
-              {t("withdrawal.approve", "Approve")}
-            </Button>,
-            <RejectWithdrawalDialog
-              key={`reject-${row.id}`}
-              onSuccess={() => tableActionRef.current?.refresh()}
-              row={row}
-            />,
-          ];
-        },
-      }}
-      columns={[
-        {
-          accessorKey: "id",
-          header: t("withdrawal.column.id", "ID"),
-        },
-        {
-          accessorKey: "user_id",
-          header: t("withdrawal.column.user", "User"),
-          cell: ({ row }) => <UserDetail id={Number(row.original.user_id)} />,
-        },
-        {
-          accessorKey: "amount",
-          header: t("withdrawal.column.amount", "Amount"),
-          cell: ({ row }) => (
-            <Display type="currency" value={Number(row.original.amount)} />
-          ),
-        },
-        {
-          accessorKey: "content",
-          header: t("withdrawal.column.content", "Withdrawal Info"),
-          cell: ({ row }) => (
-            <div className="max-w-[280px] whitespace-pre-wrap break-words text-sm">
-              {row.original.content}
-            </div>
-          ),
-        },
-        {
-          accessorKey: "status",
-          header: t("withdrawal.column.status", "Status"),
-          cell: ({ row }) => {
-            const meta = getStatusMeta(Number(row.original.status), t);
-            return <Badge variant={meta.variant}>{meta.label}</Badge>;
+            return [
+              <ConfirmButton
+                cancelText={t("cancel", "Cancel")}
+                confirmText={t("confirm", "Confirm")}
+                description="确认后将标记该提现为已通过，请确保线下打款流程已完成。"
+                key="approve"
+                onConfirm={async () => {
+                  await approveMutation.mutateAsync(row.id);
+                }}
+                title="确认通过提现吗？"
+                trigger={
+                  <Button
+                    disabled={approveMutation.isPending}
+                    size="sm"
+                    variant="default"
+                  >
+                    通过
+                  </Button>
+                }
+              />,
+              <Button
+                key="reject"
+                onClick={() => {
+                  setCurrentRow(row);
+                  setRejectOpen(true);
+                }}
+                size="sm"
+                variant="destructive"
+              >
+                拒绝
+              </Button>,
+            ];
           },
-        },
-        {
-          accessorKey: "reason",
-          header: t("withdrawal.column.reason", "Reject Reason"),
-          cell: ({ row }) =>
-            row.original.reason ? (
-              <div className="max-w-[220px] whitespace-pre-wrap break-words text-muted-foreground text-sm">
-                {row.original.reason}
-              </div>
-            ) : (
-              <span className="text-muted-foreground text-sm">-</span>
+        }}
+        columns={[
+          {
+            accessorKey: "id",
+            header: "ID",
+          },
+          {
+            accessorKey: "user_id",
+            header: t("user", "User"),
+            cell: ({ row }) => <UserDetail id={row.original.user_id} />,
+          },
+          {
+            accessorKey: "amount",
+            header: "提现金额",
+            cell: ({ row }) => (
+              <Display type="currency" value={row.original.amount} />
             ),
-        },
-        {
-          accessorKey: "created_at",
-          header: t("withdrawal.column.createdAt", "Created At"),
-          cell: ({ row }) => formatDate(Number(row.original.created_at)),
-        },
-      ]}
-      header={{
-        title: t("withdrawal.title", "Withdrawal Management"),
-      }}
-      params={[
-        {
-          key: "status",
-          type: "select",
-          placeholder: t("withdrawal.filter.status", "Status"),
-          options: WITHDRAWAL_STATUS_OPTIONS.map((option) => ({
-            label: t(`withdrawal.statusOption.${option.value}`, option.label),
-            value: option.value,
-          })),
-        },
-        {
-          key: "user_id",
-          placeholder: t("withdrawal.filter.userId", "User ID"),
-        },
-      ]}
-      request={async (pagination, filter) => {
-        const status =
-          filter.status && filter.status !== "all"
-            ? Number(filter.status)
-            : undefined;
-        const userId = filter.user_id ? Number(filter.user_id) : undefined;
+          },
+          {
+            accessorKey: "method",
+            header: "收款方式",
+            cell: ({ row }) =>
+              WITHDRAWAL_METHOD_MAP[row.original.method] ?? "--",
+          },
+          {
+            accessorKey: "account",
+            header: "收款账号",
+            cell: ({ row }) => (
+              <div className="max-w-[200px] break-all text-sm">
+                {row.original.account || "--"}
+              </div>
+            ),
+          },
+          {
+            accessorKey: "qr_code_url",
+            header: "收款码",
+            cell: ({ row }) => (
+              <QrCodeCell url={row.original.qr_code_url} />
+            ),
+          },
+          {
+            accessorKey: "content",
+            header: "备注",
+            cell: ({ row }) => (
+              <div className="max-w-[200px] break-all text-sm">
+                {row.original.content || "--"}
+              </div>
+            ),
+          },
+          {
+            accessorKey: "status",
+            header: "状态",
+            cell: ({ row }) => {
+              const status = statusMap[row.original.status] ?? {
+                label: `未知 (${row.original.status})`,
+                className: "",
+              };
+              return (
+                <Badge className={status.className} variant="outline">
+                  {status.label}
+                </Badge>
+              );
+            },
+          },
+          {
+            accessorKey: "reason",
+            header: "拒绝原因",
+            cell: ({ row }) => row.original.reason || "--",
+          },
+          {
+            accessorKey: "created_at",
+            header: "申请时间",
+            cell: ({ row }) => formatDate(row.original.created_at),
+          },
+          {
+            accessorKey: "updated_at",
+            header: "更新时间",
+            cell: ({ row }) => formatDate(row.original.updated_at),
+          },
+        ]}
+        header={{ title: "提现管理" }}
+        params={[
+          {
+            key: "status",
+            options: statusOptions,
+            placeholder: "状态",
+          },
+          {
+            key: "method",
+            options: methodOptions,
+            placeholder: "收款方式",
+          },
+          {
+            key: "user_id",
+            placeholder: "用户 ID",
+          },
+        ]}
+        request={async (pagination, filter) => {
+          const { data } = await getWithdrawalList({
+            page: pagination.page,
+            size: pagination.size,
+            status: filter.status ? Number(filter.status) : undefined,
+            method: filter.method ? Number(filter.method) : undefined,
+            user_id: filter.user_id ? Number(filter.user_id) : undefined,
+          });
 
-        const { data } = await getWithdrawalList({
-          page: pagination.page,
-          size: pagination.size,
-          status,
-          user_id: Number.isFinite(userId) ? userId : undefined,
-        });
+          return {
+            list: data.data?.list || [],
+            total: data.data?.total || 0,
+          };
+        }}
+      />
 
-        const list = (data.data?.list || []) as API.AdminWithdrawalLog[];
-        return {
-          list,
-          total: Number(data.data?.total || list.length),
-        };
-      }}
-    />
+      <Dialog
+        onOpenChange={(open) => {
+          setRejectOpen(open);
+          if (!open) {
+            setCurrentRow(null);
+            form.reset({ reason: "" });
+          }
+        }}
+        open={rejectOpen}
+      >
+        <DialogContent>
+          <DialogHeader>
+            <DialogTitle>拒绝提现申请</DialogTitle>
+            <DialogDescription>
+              为用户填写本次拒绝原因，提交后该记录会更新为已拒绝。
+            </DialogDescription>
+          </DialogHeader>
+          <Form {...form}>
+            <form
+              className="space-y-4"
+              onSubmit={form.handleSubmit(async (values) => {
+                if (!currentRow) return;
+                await rejectMutation.mutateAsync({
+                  withdrawal_id: currentRow.id,
+                  reason: values.reason.trim(),
+                });
+              })}
+            >
+              <FormField
+                control={form.control}
+                name="reason"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>拒绝原因</FormLabel>
+                    <FormControl>
+                      <Textarea
+                        placeholder="请输入拒绝原因，用户端会看到这条说明"
+                        rows={5}
+                        {...field}
+                      />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+              <DialogFooter>
+                <Button
+                  onClick={() => setRejectOpen(false)}
+                  type="button"
+                  variant="outline"
+                >
+                  {t("cancel", "Cancel")}
+                </Button>
+                <Button disabled={rejectMutation.isPending} type="submit">
+                  {rejectMutation.isPending ? "提交中..." : "确认拒绝"}
+                </Button>
+              </DialogFooter>
+            </form>
+          </Form>
+        </DialogContent>
+      </Dialog>
+    </>
   );
 }

apps/user/public/assets/locales/en-US/affiliate.json

@@ -1,11 +1,37 @@
 {
+  "accountInfo": "Payout Details",
+  "accountPlaceholder": "Enter bank card, Alipay, USDT wallet, or other payout details",
+  "accountRequired": "Payout details are required",
+  "accountTooLong": "Payout details must be 200 characters or fewer",
+  "amountInvalid": "Enter a valid amount",
+  "amountPositive": "Withdrawal amount must be greater than 0",
+  "applyTime": "Applied At",
+  "applyWithdraw": "Request Withdrawal",
+  "cancel": "Cancel",
   "commissionInfo": "Commission Info",
   "commissionRate": "Commission Rate",
   "copyInviteLink": "Copy Invite Link",
   "copySuccess": "Copy Success",
+  "currentCommission": "Current Commission",
   "inviteCode": "Invite Code",
   "inviteRecords": "Invite Records",
+  "noReason": "None",
+  "rejectReason": "Reject Reason",
   "registrationTime": "Registration Time",
+  "submitWithdraw": "Submit Request",
+  "submitting": "Submitting...",
   "totalCommission": "Total Commission",
-  "userIdentifier": "User Identifier"
+  "unknownStatus": "Unknown Status",
+  "userIdentifier": "User Identifier",
+  "withdrawAmount": "Withdrawal Amount",
+  "withdrawAmountPlaceholder": "Enter the withdrawal amount in dollars",
+  "withdrawDescription": "Submit the withdrawal amount and payout details, then wait for review.",
+  "withdrawError": "Failed to submit withdrawal request",
+  "withdrawRecords": "Withdrawal Records",
+  "withdrawStatus": {
+    "approved": "Approved",
+    "pending": "Pending Review",
+    "rejected": "Rejected"
+  },
+  "withdrawSuccess": "Withdrawal request submitted"
 }

apps/user/public/assets/locales/zh-CN/affiliate.json

@@ -1,11 +1,37 @@
 {
+  "accountInfo": "收款信息",
+  "accountPlaceholder": "请输入银行卡、支付宝、USDT 地址等收款信息",
+  "accountRequired": "请填写收款信息",
+  "accountTooLong": "收款信息不能超过 200 个字符",
+  "amountInvalid": "请输入有效金额",
+  "amountPositive": "提现金额必须大于 0",
+  "applyTime": "申请时间",
+  "applyWithdraw": "申请提现",
+  "cancel": "取消",
   "commissionInfo": "佣金信息",
   "commissionRate": "佣金比例",
   "copyInviteLink": "复制邀请链接",
   "copySuccess": "复制成功",
+  "currentCommission": "当前可见佣金",
   "inviteCode": "邀请码",
   "inviteRecords": "邀请记录",
+  "noReason": "无",
+  "rejectReason": "拒绝原因",
   "registrationTime": "注册时间",
+  "submitWithdraw": "提交申请",
+  "submitting": "提交中...",
   "totalCommission": "累计佣金",
-  "userIdentifier": "用户标识"
+  "unknownStatus": "未知状态",
+  "userIdentifier": "用户标识",
+  "withdrawAmount": "提现金额",
+  "withdrawAmountPlaceholder": "请输入提现金额，单位为元",
+  "withdrawDescription": "填写提现金额和收款信息后提交申请，等待后台审核。",
+  "withdrawError": "提现申请提交失败",
+  "withdrawRecords": "提现记录",
+  "withdrawStatus": {
+    "approved": "已通过",
+    "pending": "审核中",
+    "rejected": "已拒绝"
+  },
+  "withdrawSuccess": "提现申请已提交"
 }

apps/user/src/sections/auth/local-captcha.tsx

@@ -2,7 +2,12 @@ import { Button } from "@workspace/ui/components/button";
 import { Input } from "@workspace/ui/components/input";
 import { Icon } from "@workspace/ui/composed/icon";
 import { generateCaptcha } from "@workspace/ui/services/common/auth";
-import { useEffect, useImperativeHandle, useState } from "react";
+import {
+  type RefObject,
+  useEffect,
+  useImperativeHandle,
+  useState,
+} from "react";
 import { useTranslation } from "react-i18next";
 
 export interface LocalCaptchaRef {

apps/user/src/sections/auth/slider-captcha.tsx

@@ -10,7 +10,13 @@ import {
   generateCaptcha,
   verifyCaptchaSlider,
 } from "@workspace/ui/services/common/auth";
-import { useCallback, useImperativeHandle, useRef, useState } from "react";
+import {
+  type RefObject,
+  useCallback,
+  useImperativeHandle,
+  useRef,
+  useState,
+} from "react";
 import { useTranslation } from "react-i18next";
 
 export interface SliderCaptchaRef {

apps/user/src/sections/user/affiliate/index.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { zodResolver } from "@hookform/resolvers/zod";
-import { useQuery } from "@tanstack/react-query";
+import { useMutation, useQuery } from "@tanstack/react-query";
 import { Button } from "@workspace/ui/components/button";
 import {
   Card,
@@ -28,18 +28,29 @@ import {
   FormMessage,
 } from "@workspace/ui/components/form";
 import { Input } from "@workspace/ui/components/input";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@workspace/ui/components/select";
 import { Textarea } from "@workspace/ui/components/textarea";
+import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
 import type { ProListActions } from "@workspace/ui/composed/pro-list/pro-list";
 import { ProList } from "@workspace/ui/composed/pro-list/pro-list";
+import { UploadImage } from "@workspace/ui/composed/upload-image";
 import {
   commissionWithdraw,
   queryUserAffiliate,
   queryUserAffiliateList,
   queryWithdrawalLog,
+  uploadFile,
+  withdrawalCancel,
 } from "@workspace/ui/services/user/user";
 import { formatDate } from "@workspace/ui/utils/formatting";
 import { unitConversion } from "@workspace/ui/utils/unit-conversions";
-import { Copy } from "lucide-react";
+import { Copy, X } from "lucide-react";
 import { useRef, useState, useTransition } from "react";
 import { CopyToClipboard } from "react-copy-to-clipboard";
 import { useForm } from "react-hook-form";
@@ -49,6 +60,17 @@ import { z } from "zod";
 import { Display } from "@/components/display";
 import { useGlobalStore } from "@/stores/global";
 
+const WITHDRAWAL_METHODS = [
+  { value: 1, label: "支付宝" },
+  { value: 2, label: "微信" },
+  { value: 3, label: "银行卡" },
+  { value: 0, label: "其他" },
+] as const;
+
+function getWithdrawalMethodLabel(method: number): string {
+  return WITHDRAWAL_METHODS.find((m) => m.value === method)?.label ?? "未知";
+}
+
 function getWithdrawalStatusMeta(
   status: number,
   t: ReturnType<typeof useTranslation<"affiliate">>["t"]
@@ -64,6 +86,11 @@ function getWithdrawalStatusMeta(
         label: t("withdrawal.status.rejected", "Rejected"),
         className: "bg-destructive/10 text-destructive",
       };
+    case 3:
+      return {
+        label: t("withdrawal.status.cancelled", "Cancelled"),
+        className: "bg-muted text-muted-foreground",
+      };
     default:
       return {
         label: t("withdrawal.status.pending", "Pending"),
@@ -72,11 +99,83 @@ function getWithdrawalStatusMeta(
   }
 }
 
+function QrCodeView({ url }: { url: string }) {
+  const [zoomOpen, setZoomOpen] = useState(false);
+  return (
+    <>
+      <button
+        className="block overflow-hidden rounded border"
+        onClick={() => setZoomOpen(true)}
+        type="button"
+      >
+        <img
+          alt="收款码"
+          className="h-16 w-16 cursor-zoom-in object-cover"
+          src={url}
+        />
+      </button>
+      {zoomOpen && (
+        <Dialog onOpenChange={setZoomOpen} open={zoomOpen}>
+          <DialogContent className="max-w-sm">
+            <img alt="收款码" className="w-full" src={url} />
+          </DialogContent>
+        </Dialog>
+      )}
+    </>
+  );
+}
+
+const withdrawalFormSchema = z
+  .object({
+    amount: z.number(),
+    method: z.number(),
+    account: z.string().trim().max(200).optional(),
+    qr_code_url: z.string().optional(),
+    content: z.string().trim().max(1000).optional(),
+  })
+  .superRefine((data, ctx) => {
+    if (!data.amount || data.amount <= 0) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "提现金额必须大于 0",
+        path: ["amount"],
+      });
+    }
+    if (data.method === 1 || data.method === 2) {
+      if (!data.qr_code_url) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "请上传收款码",
+          path: ["qr_code_url"],
+        });
+      }
+    } else if (data.method === 3) {
+      if (!data.account) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "银行卡收款账号为必填",
+          path: ["account"],
+        });
+      }
+    } else if (data.method === 0) {
+      if (!data.account && !data.content) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "收款账号和备注至少填一项",
+          path: ["account"],
+        });
+      }
+    }
+  });
+
+type WithdrawalFormValues = z.infer<typeof withdrawalFormSchema>;
+
 export default function Affiliate() {
   const { t } = useTranslation("affiliate");
   const { user, common, getUserInfo } = useGlobalStore();
   const [withdrawalOpen, setWithdrawalOpen] = useState(false);
   const [submitting, startTransition] = useTransition();
+  const [qrUploading, setQrUploading] = useState(false);
   const withdrawalListActionRef = useRef<ProListActions | undefined>(undefined);
 
   const affiliateQuery = useQuery({
@@ -89,51 +188,69 @@ export default function Affiliate() {
   const availableCommission = Number(
     user?.commission ?? affiliateQuery.data?.total_commission ?? 0
   );
-  const withdrawalFormSchema = z.object({
-    amount: z
-      .number()
-      .int(t("withdrawal.validation.amountInvalid", "Amount is invalid"))
-      .positive(
-        t(
-          "withdrawal.validation.amountPositive",
-          "Amount must be greater than 0"
-        )
-      )
-      .max(
-        availableCommission,
-        t(
-          "withdrawal.validation.amountExceeded",
-          "Amount cannot exceed available commission"
-        )
-      ),
-    content: z
-      .string()
-      .trim()
-      .min(
-        1,
-        t(
-          "withdrawal.validation.contentRequired",
-          "Withdrawal info is required"
-        )
-      )
-      .max(
-        1000,
-        t("withdrawal.validation.contentTooLong", "Withdrawal info is too long")
-      ),
-  });
-  const withdrawalForm = useForm<z.infer<typeof withdrawalFormSchema>>({
+
+  const withdrawalForm = useForm<WithdrawalFormValues>({
     resolver: zodResolver(withdrawalFormSchema),
     defaultValues: {
       amount: 0,
+      method: 1,
+      account: "",
+      qr_code_url: "",
       content: "",
     },
   });
 
-  const submitWithdrawal = (values: z.infer<typeof withdrawalFormSchema>) => {
+  const watchedMethod = withdrawalForm.watch("method");
+  const watchedQrCodeUrl = withdrawalForm.watch("qr_code_url");
+
+  const handleQrUpload = async (file: string | File) => {
+    if (!(file instanceof File)) return;
+    setQrUploading(true);
+    try {
+      const formData = new FormData();
+      formData.append("file", file);
+      formData.append("biz_type", "withdrawal_qrcode");
+      const response = await uploadFile(formData);
+      const uploadedUrl =
+        response.data.data?.url || response.data.data?.key || "";
+      withdrawalForm.setValue("qr_code_url", uploadedUrl);
+      withdrawalForm.clearErrors("qr_code_url");
+    } catch {
+      toast.error("收款码上传失败，请重试");
+    } finally {
+      setQrUploading(false);
+    }
+  };
+
+  const cancelMutation = useMutation({
+    mutationFn: async (withdrawalId: number) =>
+      withdrawalCancel({ withdrawal_id: withdrawalId }),
+    onSuccess: () => {
+      toast.success("提现申请已取消");
+      withdrawalListActionRef.current?.refresh();
+    },
+    onError: () => {
+      toast.error("取消失败，请重试");
+    },
+  });
+
+  const submitWithdrawal = (values: WithdrawalFormValues) => {
+    if (values.amount > availableCommission) {
+      withdrawalForm.setError("amount", {
+        message: t(
+          "withdrawal.validation.amountExceeded",
+          "Amount cannot exceed available commission"
+        ),
+      });
+      return;
+    }
     startTransition(async () => {
       await commissionWithdraw({
         amount: values.amount,
-        content: values.content.trim(),
+        method: values.method,
+        account: values.account || undefined,
+        qr_code_url: values.qr_code_url || undefined,
+        content: values.content || undefined,
       });
       toast.success(
         t("withdrawal.submitSuccess", "Withdrawal request submitted")
@@ -146,6 +263,9 @@ export default function Affiliate() {
       setWithdrawalOpen(false);
       withdrawalForm.reset({
         amount: 0,
+        method: 1,
+        account: "",
+        qr_code_url: "",
         content: "",
       });
     });
@@ -192,7 +312,7 @@ export default function Affiliate() {
                     {t("withdrawal.apply", "Apply for Withdrawal")}
                   </Button>
                 </DialogTrigger>
-                <DialogContent>
+                <DialogContent className="max-h-[90vh] overflow-y-auto">
                   <DialogHeader>
                     <DialogTitle>
                       {t("withdrawal.applyTitle", "Apply for Withdrawal")}
@@ -256,21 +376,130 @@ export default function Affiliate() {
                           </FormItem>
                         )}
                       />
+
+                      <FormField
+                        control={withdrawalForm.control}
+                        name="method"
+                        render={({ field }) => (
+                          <FormItem>
+                            <FormLabel>收款方式</FormLabel>
+                            <Select
+                              onValueChange={(val) => {
+                                field.onChange(Number(val));
+                                withdrawalForm.setValue("qr_code_url", "");
+                                withdrawalForm.setValue("account", "");
+                                withdrawalForm.clearErrors();
+                              }}
+                              value={String(field.value)}
+                            >
+                              <FormControl>
+                                <SelectTrigger>
+                                  <SelectValue placeholder="请选择收款方式" />
+                                </SelectTrigger>
+                              </FormControl>
+                              <SelectContent>
+                                {WITHDRAWAL_METHODS.map((m) => (
+                                  <SelectItem
+                                    key={m.value}
+                                    value={String(m.value)}
+                                  >
+                                    {m.label}
+                                  </SelectItem>
+                                ))}
+                              </SelectContent>
+                            </Select>
+                            <FormMessage />
+                          </FormItem>
+                        )}
+                      />
+
+                      {(watchedMethod === 1 || watchedMethod === 2) && (
+                        <FormField
+                          control={withdrawalForm.control}
+                          name="qr_code_url"
+                          render={() => (
+                            <FormItem>
+                              <FormLabel>
+                                收款码
+                                <span className="ml-1 text-destructive">
+                                  *
+                                </span>
+                              </FormLabel>
+                              {watchedQrCodeUrl ? (
+                                <div className="relative inline-block">
+                                  <QrCodeView url={watchedQrCodeUrl} />
+                                  <button
+                                    className="-top-2 -right-2 absolute flex h-5 w-5 items-center justify-center rounded-full bg-destructive text-destructive-foreground"
+                                    onClick={() =>
+                                      withdrawalForm.setValue("qr_code_url", "")
+                                    }
+                                    type="button"
+                                  >
+                                    <X className="h-3 w-3" />
+                                  </button>
+                                </div>
+                              ) : (
+                                <UploadImage
+                                  className="h-24 w-24"
+                                  id="qr-code-upload"
+                                  onChange={handleQrUpload}
+                                  returnType="file"
+                                >
+                                  <div className="flex h-24 w-24 flex-col items-center justify-center rounded border-2 border-dashed text-muted-foreground text-xs">
+                                    {qrUploading ? "上传中..." : "点击上传\n收款码"}
+                                  </div>
+                                </UploadImage>
+                              )}
+                              <FormMessage />
+                            </FormItem>
+                          )}
+                        />
+                      )}
+
+                      {(watchedMethod === 3 || watchedMethod === 0) && (
+                        <FormField
+                          control={withdrawalForm.control}
+                          name="account"
+                          render={({ field }) => (
+                            <FormItem>
+                              <FormLabel>
+                                收款账号
+                                {watchedMethod === 3 && (
+                                  <span className="ml-1 text-destructive">
+                                    *
+                                  </span>
+                                )}
+                              </FormLabel>
+                              <FormControl>
+                                <Input
+                                  placeholder={
+                                    watchedMethod === 3
+                                      ? "请输入银行卡号或账户信息"
+                                      : "请输入收款账号（与备注至少填一项）"
+                                  }
+                                  {...field}
+                                />
+                              </FormControl>
+                              <FormMessage />
+                            </FormItem>
+                          )}
+                        />
+                      )}
+
                       <FormField
                         control={withdrawalForm.control}
                         name="content"
                         render={({ field }) => (
                           <FormItem>
-                            <FormLabel>
-                              {t("withdrawal.content", "Payout Information")}
-                            </FormLabel>
+                            <FormLabel>备注</FormLabel>
                             <FormControl>
                               <Textarea
-                                placeholder={t(
-                                  "withdrawal.contentPlaceholder",
-                                  "Bank account, wallet address, recipient name, or other payout details"
-                                )}
-                                rows={4}
+                                placeholder={
+                                  watchedMethod === 0
+                                    ? "备注（与账号至少填一项）"
+                                    : "备注（可选）"
+                                }
+                                rows={3}
                                 {...field}
                               />
                             </FormControl>
@@ -289,7 +518,11 @@ export default function Affiliate() {
                       {t("withdrawal.cancel", "Cancel")}
                     </Button>
                     <Button
-                      disabled={submitting || availableCommission <= 0}
+                      disabled={
+                        submitting ||
+                        qrUploading ||
+                        availableCommission <= 0
+                      }
                       form="withdrawal-form"
                       type="submit"
                     >
@@ -345,28 +578,68 @@ export default function Affiliate() {
                   <div className="font-semibold text-lg">
                     <Display type="currency" value={item.amount} />
                   </div>
-                  <span
-                    className={`inline-flex rounded-full px-3 py-1 font-medium text-xs ${statusMeta.className}`}
-                  >
-                    {statusMeta.label}
-                  </span>
+                  <div className="flex items-center gap-2">
+                    <span
+                      className={`inline-flex rounded-full px-3 py-1 font-medium text-xs ${statusMeta.className}`}
+                    >
+                      {statusMeta.label}
+                    </span>
+                    {item.status === 0 && (
+                      <ConfirmButton
+                        cancelText="取消"
+                        confirmText="确认取消"
+                        description="取消后该提现申请将关闭，佣金不会退还。确定取消吗？"
+                        onConfirm={async () => {
+                          await cancelMutation.mutateAsync(item.id);
+                        }}
+                        title="取消提现申请"
+                        trigger={
+                          <Button
+                            disabled={cancelMutation.isPending}
+                            size="sm"
+                            variant="outline"
+                          >
+                            取消申请
+                          </Button>
+                        }
+                      />
+                    )}
+                  </div>
                 </div>
                 <ul className="grid gap-3 md:grid-cols-2">
                   <li className="flex flex-col gap-1">
-                    <span className="text-muted-foreground">
-                      {t("withdrawal.record.content", "Payout Information")}
-                    </span>
-                    <span className="whitespace-pre-wrap break-words">
-                      {item.content}
-                    </span>
+                    <span className="text-muted-foreground">收款方式</span>
+                    <span>{getWithdrawalMethodLabel(item.method)}</span>
                   </li>
+                  {item.account && (
+                    <li className="flex flex-col gap-1">
+                      <span className="text-muted-foreground">收款账号</span>
+                      <span className="break-all">{item.account}</span>
+                    </li>
+                  )}
+                  {item.qr_code_url && (
+                    <li className="flex flex-col gap-1">
+                      <span className="text-muted-foreground">收款码</span>
+                      <QrCodeView url={item.qr_code_url} />
+                    </li>
+                  )}
+                  {item.content && (
+                    <li className="flex flex-col gap-1">
+                      <span className="text-muted-foreground">
+                        {t("withdrawal.record.content", "Payout Information")}
+                      </span>
+                      <span className="whitespace-pre-wrap break-words">
+                        {item.content}
+                      </span>
+                    </li>
+                  )}
                   <li className="flex flex-col gap-1">
                     <span className="text-muted-foreground">
                       {t("withdrawal.record.createdAt", "Created At")}
                     </span>
                     <time>{formatDate(item.created_at)}</time>
                   </li>
-                  {item.reason ? (
+                  {item.reason && (
                     <li className="flex flex-col gap-1 md:col-span-2">
                       <span className="text-muted-foreground">
                         {t("withdrawal.record.reason", "Reject Reason")}
@@ -375,7 +648,7 @@ export default function Affiliate() {
                         {item.reason}
                       </span>
                     </li>
-                  ) : null}
+                  )}
                 </ul>
               </CardContent>
             </Card>

apps/user/src/sections/user/profile/notify-settings.tsx

@@ -27,23 +27,52 @@ const FormSchema = z.object({
   enable_balance_notify: z.boolean(),
   enable_login_notify: z.boolean(),
   enable_subscribe_notify: z.boolean(),
-  // enable_trade_notify: z.boolean(),
+  enable_trade_notify: z.boolean(),
 });
 
+type NotifyFormValues = z.infer<typeof FormSchema>;
+
+const notificationFields = [
+  {
+    name: "enable_balance_notify",
+    labelKey: "notify.balanceChange",
+    fallbackLabel: "Balance Change",
+  },
+  {
+    name: "enable_login_notify",
+    labelKey: "notify.login",
+    fallbackLabel: "Login",
+  },
+  {
+    name: "enable_subscribe_notify",
+    labelKey: "notify.subscribe",
+    fallbackLabel: "Subscribe",
+  },
+  {
+    name: "enable_trade_notify",
+    labelKey: "notify.finance",
+    fallbackLabel: "Finance",
+  },
+] satisfies Array<{
+  name: keyof NotifyFormValues;
+  labelKey: string;
+  fallbackLabel: string;
+}>;
+
 export default function NotifySettings() {
   const { t } = useTranslation("profile");
   const { user, getUserInfo } = useGlobalStore();
-  const form = useForm<z.infer<typeof FormSchema>>({
+  const form = useForm<NotifyFormValues>({
     resolver: zodResolver(FormSchema),
     defaultValues: {
       enable_balance_notify: user?.enable_balance_notify ?? false,
       enable_login_notify: user?.enable_login_notify ?? false,
       enable_subscribe_notify: user?.enable_subscribe_notify ?? false,
-      // enable_trade_notify: user?.enable_trade_notify ?? false,
+      enable_trade_notify: user?.enable_trade_notify ?? false,
     },
   });
 
-  async function onSubmit(data: z.infer<typeof FormSchema>) {
+  async function onSubmit(data: NotifyFormValues) {
     await updateUserNotify(data);
     toast.success(t("notify.updateSuccess", "Update Successful"));
     await getUserInfo();
@@ -67,32 +96,15 @@ export default function NotifySettings() {
             onSubmit={form.handleSubmit(onSubmit)}
           >
             <div className="space-y-4">
-              {[
-                {
-                  name: "enable_balance_notify",
-                  label: t("notify.balanceChange", "Balance Change"),
-                },
-                {
-                  name: "enable_login_notify",
-                  label: t("notify.login", "Login"),
-                },
-                {
-                  name: "enable_subscribe_notify",
-                  label: t("notify.subscribe", "Subscribe"),
-                },
-                // {
-                //   name: "enable_trade_notify",
-                //   label: t("notify.finance", "Finance"),
-                // },
-              ].map(({ name, label }) => (
+              {notificationFields.map(({ fallbackLabel, labelKey, name }) => (
                 <FormField
                   control={form.control}
                   key={name}
-                  name={name as any}
+                  name={name}
                   render={({ field }) => (
                     <FormItem className="flex items-center justify-between space-x-4">
                       <FormLabel className="text-muted-foreground">
-                        {label}
+                        {t(labelKey, fallbackLabel)}
                       </FormLabel>
                       <FormControl>
                         <Switch

bun.lock

@@ -49,7 +49,9 @@
         "motion": "^12.23.24",
         "qrcode.react": "^4.2.0",
         "radash": "^12.1.1",
+        "react": "^19.2.0",
         "react-copy-to-clipboard": "^5.1.0",
+        "react-dom": "^19.2.0",
         "react-helmet-async": "^2.0.5",
         "react-turnstile": "^1.1.4",
         "zustand": "^5.0.8",
@@ -85,7 +87,9 @@
         "framer-motion": "^12.23.24",
         "js-yaml": "^4.1.1",
         "qrcode.react": "^4.2.0",
+        "react": "^19.2.0",
         "react-copy-to-clipboard": "^5.1.0",
+        "react-dom": "^19.2.0",
         "react-helmet-async": "^2.0.5",
         "react-turnstile": "^1.1.4",
         "zustand": "^5.0.8",

packages/ui/src/services/admin/order.ts

@@ -78,3 +78,21 @@ export async function activateOrder(
     }
   );
 }
+
+/** Refund order POST /v1/admin/order/refund */
+export async function refundOrder(
+  body: API.RefundOrderRequest,
+  options?: { [key: string]: any }
+) {
+  return request<API.Response & { data?: any }>(
+    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/order/refund`,
+    {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      data: body,
+      ...(options || {}),
+    }
+  );
+}

packages/ui/src/services/admin/typings.d.ts

@@ -28,21 +28,6 @@ declare namespace API {
     updated_at: number;
   };
 
-  type AdminWithdrawalLog = {
-    id: number;
-    user_id: number;
-    amount: number;
-    content: string;
-    status: number;
-    reason?: string;
-    created_at: number;
-    updated_at: number;
-  };
-
-  type ApproveWithdrawalRequest = {
-    withdrawal_id: number;
-  };
-
   type AnyTLS = {
     port: number;
     security_config: SecurityConfig;
@@ -86,18 +71,6 @@ declare namespace API {
     is_default: boolean;
   };
 
-  type GetWithdrawalListParams = {
-    page: number;
-    size: number;
-    user_id?: number;
-    status?: number;
-  };
-
-  type GetWithdrawalListResponse = {
-    list: AdminWithdrawalLog[];
-    total: number;
-  };
-
   type AppUserSubcbribe = {
     id: number;
     name: string;
@@ -133,6 +106,10 @@ declare namespace API {
     port: number;
   };
 
+  type ApproveWithdrawalRequest = {
+    withdrawal_id: number;
+  };
+
   type AuthConfig = {
     mobile: MobileAuthenticateConfig;
     email: EmailAuthticateConfig;
@@ -1181,6 +1158,19 @@ declare namespace API {
     list: User[];
   };
 
+  type GetWithdrawalListParams = {
+    page: number;
+    size: number;
+    user_id?: number;
+    status?: number;
+    method?: number;
+  };
+
+  type GetWithdrawalListResponse = {
+    total: number;
+    list: WithdrawalLog[];
+  };
+
   type GetUserLoginLogsParams = {
     page: number;
     size: number;
@@ -1450,6 +1440,7 @@ declare namespace API {
     fee_amount: number;
     trade_no: string;
     status: number;
+    status_name?: string;
     subscribe_id: number;
     created_at: number;
     updated_at: number;
@@ -1473,6 +1464,7 @@ declare namespace API {
     fee_amount: number;
     trade_no: string;
     status: number;
+    status_name?: string;
     subscribe_id: number;
     subscribe: Subscribe;
     created_at: number;
@@ -2754,6 +2746,11 @@ declare namespace API {
     order_no: string;
   };
 
+  type RefundOrderRequest = {
+    id: number;
+    reason?: string;
+  };
+
   type RedemptionCode = {
     id: number;
     code: string;
@@ -3096,4 +3093,18 @@ declare namespace API {
       }>;
     }>;
   };
+
+  type WithdrawalLog = {
+    id: number;
+    user_id: number;
+    amount: number;
+    method: number;
+    account?: string;
+    qr_code_url?: string;
+    content?: string;
+    status: number;
+    reason?: string;
+    created_at: number;
+    updated_at: number;
+  };
 }

packages/ui/src/services/admin/user.ts

@@ -1,6 +1,14 @@
 /* eslint-disable */
 import request from "@workspace/ui/lib/request";
 
+export type UpdateUserBasicInfoBody = Omit<
+  API.UpdateUserBasiceInfoRequest,
+  "password"
+> & {
+  password?: string;
+  remark?: string;
+};
+
 /** Create user POST /v1/admin/user/ */
 export async function createUser(
   body: API.CreateUserRequest,
@@ -104,7 +112,7 @@ export async function deleteUserAuthMethod(
 
 /** Update user basic info PUT /v1/admin/user/basic */
 export async function updateUserBasicInfo(
-  body: API.UpdateUserBasiceInfoRequest,
+  body: UpdateUserBasicInfoBody,
   options?: { [key: string]: any }
 ) {
   return request<API.Response & { data?: any }>(

packages/ui/src/services/admin/withdrawal.ts

@@ -23,7 +23,7 @@ export async function approveWithdrawal(
   body: API.ApproveWithdrawalRequest,
   options?: { [key: string]: any }
 ) {
-  return request<API.Response>(
+  return request<API.Response & { data?: any }>(
     `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/user/withdrawal/approve`,
     {
       method: "POST",
@@ -41,7 +41,7 @@ export async function rejectWithdrawal(
   body: API.RejectWithdrawalRequest,
   options?: { [key: string]: any }
 ) {
-  return request<API.Response>(
+  return request<API.Response & { data?: any }>(
     `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/user/withdrawal/reject`,
     {
       method: "POST",

packages/ui/src/services/common/oauth.ts

@@ -1,4 +1,3 @@
-// @ts-expect-error
 /* eslint-disable */
 import request from "@workspace/ui/lib/request";
 

packages/ui/src/services/user/announcement.ts

@@ -1,4 +1,3 @@
-// @ts-expect-error
 /* eslint-disable */
 import request from "@workspace/ui/lib/request";
 

packages/ui/src/services/user/document.ts

@@ -1,4 +1,3 @@
-// @ts-expect-error
 /* eslint-disable */
 import request from "@workspace/ui/lib/request";
 

packages/ui/src/services/user/order.ts

@@ -1,4 +1,3 @@
-// @ts-expect-error
 /* eslint-disable */
 import request from "@workspace/ui/lib/request";
 

packages/ui/src/services/user/portal.ts

@@ -1,4 +1,3 @@
-// @ts-expect-error
 /* eslint-disable */
 import request from "@workspace/ui/lib/request";
 

packages/ui/src/services/user/subscribe.ts

@@ -1,4 +1,3 @@
-// @ts-expect-error
 /* eslint-disable */
 import request from "@workspace/ui/lib/request";
 

packages/ui/src/services/user/ticket.ts

@@ -1,4 +1,3 @@
-// @ts-expect-error
 /* eslint-disable */
 import request from "@workspace/ui/lib/request";
 

packages/ui/src/services/user/typings.d.ts

@@ -172,7 +172,14 @@ declare namespace API {
 
   type CommissionWithdrawRequest = {
     amount: number;
-    content: string;
+    method: number;
+    account?: string;
+    qr_code_url?: string;
+    content?: string;
+  };
+
+  type WithdrawalCancelRequest = {
+    withdrawal_id: number;
   };
 
   type Coupon = {
@@ -1296,7 +1303,10 @@ declare namespace API {
     id: number;
     user_id: number;
     amount: number;
-    content: string;
+    method: number;
+    account?: string;
+    qr_code_url?: string;
+    content?: string;
     status: number;
     reason?: string;
     created_at: number;

packages/ui/src/services/user/user.ts

@@ -470,3 +470,36 @@ export async function queryWithdrawalLog(
     }
   );
 }
+
+/** Cancel Withdrawal POST /v1/public/user/withdrawal_cancel */
+export async function withdrawalCancel(
+  body: API.WithdrawalCancelRequest,
+  options?: { [key: string]: any }
+) {
+  return request<API.Response & { data?: any }>(
+    `${import.meta.env.VITE_API_PREFIX || ""}/v1/public/user/withdrawal_cancel`,
+    {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      data: body,
+      ...(options || {}),
+    }
+  );
+}
+
+/** Upload File POST /v1/public/file/upload */
+export async function uploadFile(
+  formData: FormData,
+  options?: { [key: string]: any }
+) {
+  return request<API.Response & { data?: { url: string; key: string } }>(
+    `${import.meta.env.VITE_API_PREFIX || ""}/v1/public/file/upload`,
+    {
+      method: "POST",
+      data: formData,
+      ...(options || {}),
+    }
+  );
+}