Merge branch 'internal' into main

fix: show user subscription speed override
修复(#14 ): 调整 USDT 提现方式枚举口径
2026-06-23 08:49:48 -07:00 · 2026-06-11 02:39:16 -07:00 · 2026-06-09 06:37:15 -07:00 · 2026-06-09 06:37:14 -07:00 · 2026-05-29 02:36:30 -07:00 · 2026-05-29 00:40:33 -07:00
23 changed files with 641 additions and 562 deletions
@@ -29,5 +29,6 @@
  "users": "Users",
  "userTitle": "User Statistics",
  "userTraffic": "User Traffic",
+  "withdrawalManagement": "Withdrawal Management",
  "yesterday": "Yesterday"
 }
@@ -100,10 +100,12 @@
  "manager": "Administrator",
  "memberCount": "Member Count",
  "more": "More",
+  "neverLoggedIn": "Never logged in",
  "normal": "Normal",
  "next": "Next",
  "noInvitedUsers": "No invited users yet",
  "notifySettingsTitle": "Notify Settings",
+  "inactive": "Inactive",
  "offline": "Offline",
  "online": "Online",
  "onlineDevices": "Online Devices",
@@ -189,6 +191,7 @@
  "groupUpdated": "Group updated successfully",
  "upload": "Upload",
  "uploadTraffic": "Upload Traffic",
+  "userStatus": "User Status",
  "userAgent": "User Agent",
  "userEmail": "Email",
  "userEmailPlaceholder": "Enter email",
@@ -198,6 +201,7 @@
  "userName": "Username",
  "userProfile": "User Profile",
  "userGroup": "User Group",
+  "active": "Active",
  "verified": "Verified",
  "viewDeviceGroup": "View Device Group",
  "viewOwner": "View Owner",
@@ -29,5 +29,6 @@
  "users": "用户",
  "userTitle": "用户统计",
  "userTraffic": "用户流量",
+  "withdrawalManagement": "提现管理",
  "yesterday": "昨日"
 }
@@ -101,10 +101,12 @@
  "manager": "管理员",
  "memberCount": "成员数量",
  "more": "更多",
+  "neverLoggedIn": "从未登录",
  "normal": "正常",
  "next": "下一页",
  "noInvitedUsers": "暂无邀请用户",
  "notifySettingsTitle": "通知设置",
+  "inactive": "未活跃",
  "offline": "离线",
  "online": "在线",
  "onlineDevices": "在线设备",
@@ -190,6 +192,7 @@
  "groupUpdated": "分组更新成功",
  "upload": "上传",
  "uploadTraffic": "上传流量",
+  "userStatus": "用户状态",
  "userAgent": "用户代理",
  "userEmail": "邮箱",
  "userEmailPlaceholder": "输入邮箱",
@@ -199,6 +202,7 @@
  "userName": "用户名",
  "userProfile": "用户资料",
  "userGroup": "用户分组",
+  "active": "活跃",
  "verified": "已验证",
  "viewDeviceGroup": "查看设备组",
  "viewOwner": "查看所有者",
@@ -241,11 +241,11 @@ export default function Statistics() {
            iconBg: "bg-green-100 dark:bg-green-900/30",
          },
          {
-            title: t("pendingTickets", "Pending Tickets"),
+            title: t("withdrawalManagement", "提现管理"),
            value: TicketTotal || 0,
            subtitle: t("pending", "Pending"),
            icon: "uil:clipboard-notes",
-            href: "/dashboard/ticket",
+            href: "/dashboard/withdrawal",
            color: "text-red-600 dark:text-red-400",
            iconBg: "bg-red-100 dark:bg-red-900/30",
          },
@@ -1,34 +1,25 @@
 import { useQuery } from "@tanstack/react-query";
 import { Link, useSearch } from "@tanstack/react-router";
-import { Badge } from "@workspace/ui/components/badge";
 import { Button } from "@workspace/ui/components/button";
 import {
  Dialog,
  DialogContent,
  DialogHeader,
  DialogTitle,
-  DialogTrigger,
 } from "@workspace/ui/components/dialog";
 import {
  DropdownMenu,
  DropdownMenuContent,
  DropdownMenuItem,
+  DropdownMenuSeparator,
  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,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@workspace/ui/components/select";
 import {
  Sheet,
  SheetContent,
@@ -43,7 +34,12 @@ import {
  TabsList,
  TabsTrigger,
 } from "@workspace/ui/components/tabs";
-import { Combobox } from "@workspace/ui/composed/combobox";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@workspace/ui/components/tooltip";
 // import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
 import {
  ProTable,
@@ -60,9 +56,8 @@ import {
  getUserList,
  updateUserBasicInfo,
 } from "@workspace/ui/services/admin/user";
-import { parseDeviceType } from "@workspace/ui/utils/device";
 import { FilePenLine } from "lucide-react";
-import { useCallback, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 import { Display } from "@/components/display";
@@ -73,18 +68,16 @@ import { RemarkForm } from "./remark-form";
 import { buildUserBasicInfoPayload } from "./user-basic-info-payload";
 import { UserDetail } from "./user-detail";
 import UserForm from "./user-form";
+import { UserIdentifier } from "./user-identifier";
 import { UserInviteStatsSheet } from "./user-invite-stats-sheet";
 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 { UserSearchBar } from "./user-search-bar";
 import UserSubscription from "./user-subscription";

 // import EditUserGroupDialog from "./edit-user-group-dialog";

-type UserDeviceWithDeviceNo = API.UserDevice & {
-  device_no?: string;
-};
-
 export default function User() {
  const { t } = useTranslation("user");
  const [loading, setLoading] = useState(false);
@@ -98,6 +91,14 @@ export default function User() {
    value: sp.search || sp.user_id || "",
  });

+  useEffect(() => {
+    searchRef.current = {
+      type: sp.user_id ? "user_id" : "email",
+      value: sp.search || sp.user_id || "",
+    };
+    ref.current?.refresh();
+  }, [sp.search, sp.user_id]);
+
  const handleSearch = useCallback((type: string, value: string) => {
    searchRef.current = { type, value };
    ref.current?.refresh();
@@ -151,7 +152,6 @@ export default function User() {
            onChanged={() => ref.current?.refresh()}
            userId={row.id}
          />,
-          <PreviewNodesDialog key="preview-nodes" userId={row.id} />,
          /* <ConfirmButton
            cancelText={t("cancel", "Cancel")}
            confirmText={t("confirm", "Confirm")}
@@ -176,6 +176,8 @@ export default function User() {
            </DropdownMenuTrigger>
            <DropdownMenuContent align="end">
              <InviteStatsMenuItem userId={row.id} />
+              <PreviewNodesMenuItem userId={row.id} />
+              <DropdownMenuSeparator />
              <DropdownMenuItem asChild>
                <Link search={{ user_id: row.id }} to="/dashboard/order">
                  {t("orderList", "Order List")}
@@ -262,62 +264,43 @@ export default function User() {
          id: "auth_methods",
          accessorKey: "auth_methods",
          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
-              | 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
-                  className="mr-1 uppercase"
-                  title={method?.verified ? t("verified", "Verified") : ""}
-                >
-                  {method?.auth_type}
-                </Badge>*/}
-                {deviceType && (
-                  <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 className={"ml-2 text-primary"} size={14} />
-                    </div>
-                  </PopoverTrigger>
-                  <PopoverContent className={"w-64"}>
-                    <RemarkForm
-                      initialRemark={row.original.remark}
-                      onSave={async (remark) => {
-                        const { data } = await getUserDetail({
-                          id: row.original.id,
-                        });
-                        const user = data.data;
+          cell: ({ row }) => (
+            <div className="flex items-center">
+              <UserIdentifier
+                className="flex items-center"
+                user={row.original}
+              />
+              <Popover>
+                <PopoverTrigger>
+                  <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"}>
+                  <RemarkForm
+                    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");
-                        }
+                      if (!user) {
+                        throw new Error("User detail not found");
+                      }

-                        await updateUserBasicInfo(
-                          buildUserBasicInfoPayload(user, remark)
-                        );
-                        toast.success(t("updateSuccess"));
-                        ref.current?.refresh();
-                      }}
-                    />
-                  </PopoverContent>
-                </Popover>
-              </div>
-            );
-          },
+                      await updateUserBasicInfo(
+                        buildUserBasicInfoPayload(user, remark)
+                      );
+                      toast.success(t("updateSuccess"));
+                      ref.current?.refresh();
+                    }}
+                  />
+                </PopoverContent>
+              </Popover>
+            </div>
+          ),
        },
        /* {
          id: "balance",
@@ -355,6 +338,48 @@ export default function User() {
          header: t("referer", "Referer"),
          cell: ({ row }) => <UserDetail id={row.original.referer_id} />,
        },
+        {
+          id: "last_login_time",
+          accessorKey: "last_login_time",
+          header: t("userStatus", "用户状态"),
+          cell: ({ row }) => {
+            const lastLoginTime = (
+              row.original as API.User & {
+                last_login_time?: number;
+              }
+            ).last_login_time;
+            const isOnline = Boolean(lastLoginTime);
+            const dotClassName = isOnline ? "bg-green-500" : "bg-gray-400";
+            const statusLabel = isOnline
+              ? t("active", "Active")
+              : t("inactive", "Inactive");
+
+            return (
+              <TooltipProvider>
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    <div className="inline-flex items-center gap-2">
+                      <span
+                        aria-hidden="true"
+                        className={`h-2.5 w-2.5 rounded-full ${dotClassName}`}
+                      />
+                      <span className="sr-only">
+                        {isOnline
+                          ? `${statusLabel}: ${formatDate(lastLoginTime)}`
+                          : statusLabel}
+                      </span>
+                    </div>
+                  </TooltipTrigger>
+                  <TooltipContent>
+                    {isOnline
+                      ? formatDate(lastLoginTime)
+                      : t("neverLoggedIn", "Never logged in")}
+                  </TooltipContent>
+                </Tooltip>
+              </TooltipProvider>
+            );
+          },
+        },
        {
          id: "created_at",
          accessorKey: "created_at",
@@ -523,6 +548,25 @@ function InviteStatsMenuItem({ userId }: { userId: number }) {
  );
 }

+function PreviewNodesMenuItem({ userId }: { userId: number }) {
+  const { t } = useTranslation("user");
+  const [open, setOpen] = useState(false);
+
+  return (
+    <>
+      <DropdownMenuItem
+        onSelect={(e) => {
+          e.preventDefault();
+          setOpen(true);
+        }}
+      >
+        {t("previewNodes", "Preview Nodes")}
+      </DropdownMenuItem>
+      <PreviewNodesDialog onOpenChange={setOpen} open={open} userId={userId} />
+    </>
+  );
+}
+
 function DeviceGroupSheet({
  userId,
  onChanged,
@@ -551,92 +595,16 @@ function DeviceGroupSheet({
  );
 }

-function UserSearchBar({
-  initialType,
-  initialValue,
-  onSearch,
-  subscribes,
+function PreviewNodesDialog({
+  userId,
+  open,
+  onOpenChange,
 }: {
-  initialType: string;
-  initialValue: string;
-  onSearch: (type: string, value: string) => void;
-  subscribes?: API.SubscribeItem[];
+  userId: number;
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
 }) {
  const { t } = useTranslation("user");
-  const [searchType, setSearchType] = useState(initialType);
-  const [searchValue, setSearchValue] = useState(initialValue);
-
-  return (
-    <div className="flex items-center gap-2">
-      <Select
-        onValueChange={(v) => {
-          setSearchType(v);
-          setSearchValue("");
-        }}
-        value={searchType}
-      >
-        <SelectTrigger className="w-48">
-          <SelectValue />
-        </SelectTrigger>
-        <SelectContent>
-          <SelectItem value="email">设备码/邮箱</SelectItem>
-          <SelectItem value="user_id">{t("userId", "User ID")}</SelectItem>
-          <SelectItem value="subscribe_id">
-            {t("subscription", "Subscription")}
-          </SelectItem>
-        </SelectContent>
-      </Select>
-      {searchType === "subscribe_id" ? (
-        <Combobox
-          className="w-48"
-          onChange={(value) => {
-            setSearchValue(value);
-            onSearch("subscribe_id", value);
-          }}
-          options={subscribes?.map((item) => ({
-            label: item.name!,
-            value: String(item.id!),
-          }))}
-          placeholder={t("subscription", "Subscription")}
-          value={searchValue}
-        />
-      ) : (
-        <>
-          <Input
-            className="w-48"
-            onChange={(e) => setSearchValue(e.target.value)}
-            onKeyDown={(e) =>
-              e.key === "Enter" && onSearch(searchType, searchValue)
-            }
-            placeholder={t("searchInputPlaceholder", "Enter search term")}
-            value={searchValue}
-          />
-          <Button
-            onClick={() => onSearch(searchType, searchValue)}
-            variant="default"
-          >
-            {t("search", "Search")}
-          </Button>
-          {searchValue && (
-            <Button
-              onClick={() => {
-                setSearchValue("");
-                onSearch(searchType, "");
-              }}
-              variant="outline"
-            >
-              {t("resetSearch", "Reset")}
-            </Button>
-          )}
-        </>
-      )}
-    </div>
-  );
-}
-
-function PreviewNodesDialog({ userId }: { userId: number }) {
-  const { t } = useTranslation("user");
-  const [open, setOpen] = useState(false);
  const { data: previewData, isLoading } = useQuery({
    enabled: open,
    queryKey: ["previewUserNodes", userId],
@@ -647,10 +615,7 @@ function PreviewNodesDialog({ userId }: { userId: number }) {
  });

  return (
-    <Dialog onOpenChange={setOpen} open={open}>
-      <DialogTrigger asChild>
-        <Button variant="outline">{t("previewNodes", "Preview Nodes")}</Button>
-      </DialogTrigger>
+    <Dialog onOpenChange={onOpenChange} open={open}>
      <DialogContent className="max-w-2xl">
        <DialogHeader>
          <DialogTitle>
@@ -16,6 +16,7 @@ import { formatBytes } from "@workspace/ui/utils/formatting";
 import { useTranslation } from "react-i18next";
 import { Display } from "@/components/display";
 import { formatDate } from "@/utils/common";
+import { UserIdentifier } from "./user-identifier";
 // import EditUserGroupDialog from "./edit-user-group-dialog";
 // import { getUserGroupList } from "@workspace/ui/services/admin/group";

@@ -229,26 +230,13 @@ export function UserDetail({ id }: { id: number }) {

  if (!id) return "--";

-  const firstMethod = data?.auth_methods[0];
-  const isDevice = firstMethod?.auth_type === "device";
-  const deviceNo = (data as any)?.user_devices?.[0]?.device_no;
-  const rawIdentifier = firstMethod?.auth_identifier || "";
-  const identifier = isDevice ? deviceNo || rawIdentifier : rawIdentifier;
-
  return (
    <HoverCard>
      <HoverCardTrigger asChild>
        <Button asChild className="p-0" variant="link">
          <Link search={{ user_id: id }} to="/dashboard/user">
            {data ? (
-              <>
-                {firstMethod && (
-                  <span className="mr-1 inline-flex items-center rounded border px-1 py-0.5 font-mono text-xs uppercase">
-                    {firstMethod.auth_type}
-                  </span>
-                )}
-                {identifier}
-              </>
+              <UserIdentifier className="flex items-center" user={data} />
            ) : (
              t("loading", "Loading...")
            )}
@@ -0,0 +1,101 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, it } from "vitest";
+import { getUserIdentifierParts, UserIdentifier } from "./user-identifier";
+
+afterEach(() => {
+  cleanup();
+});
+
+type DeviceWithOptionalNo = API.UserDevice & { device_no?: string };
+
+describe("getUserIdentifierParts", () => {
+  it("uses the device number and D label for device-auth users", () => {
+    expect(
+      getUserIdentifierParts({
+        auth_methods: [
+          {
+            auth_type: "device",
+            auth_identifier: "raw-device-id",
+            verified: true,
+          },
+        ],
+        user_devices: [
+          {
+            id: 1,
+            ip: "127.0.0.1",
+            identifier: "device-id",
+            user_agent:
+              "Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X)",
+            online: true,
+            enabled: true,
+            created_at: 0,
+            updated_at: 0,
+            device_no: "DVC-001",
+          } satisfies DeviceWithOptionalNo,
+        ],
+      })
+    ).toMatchObject({
+      authLabel: "(D)",
+      identifier: "DVC-001",
+      isDevice: true,
+    });
+  });
+
+  it("falls back to the raw identifier and E label for email-auth users", () => {
+    expect(
+      getUserIdentifierParts({
+        auth_methods: [
+          {
+            auth_type: "email",
+            auth_identifier: "user@example.com",
+            verified: true,
+          },
+        ],
+        user_devices: [],
+      })
+    ).toMatchObject({
+      authLabel: "(E)",
+      identifier: "user@example.com",
+      isDevice: false,
+    });
+  });
+});
+
+describe("UserIdentifier", () => {
+  it("renders the compact auth label and visible identifier", () => {
+    render(
+      <UserIdentifier
+        user={{
+          auth_methods: [
+            {
+              auth_type: "email",
+              auth_identifier: "referrer@example.com",
+              verified: true,
+            },
+          ],
+          user_devices: [],
+        }}
+      />
+    );
+
+    expect(screen.getByText("(E)")).not.toBeNull();
+    expect(screen.getByText("referrer@example.com")).not.toBeNull();
+  });
+
+  it("renders an empty fallback when no identifier is available", () => {
+    render(
+      <UserIdentifier
+        user={{
+          auth_methods: [],
+          user_devices: [],
+        }}
+      />
+    );
+
+    expect(screen.getByText("(E)")).not.toBeNull();
+    expect(screen.getByText("--")).not.toBeNull();
+  });
+});
@@ -0,0 +1,66 @@
+"use client";
+
+import { Badge } from "@workspace/ui/components/badge";
+import { parseDeviceType } from "@workspace/ui/utils/device";
+
+type UserDeviceWithDeviceNo = API.UserDevice & {
+  device_no?: string;
+};
+
+type UserIdentifierUser = {
+  auth_methods?: API.UserAuthMethod[];
+  user_devices?: UserDeviceWithDeviceNo[];
+};
+
+type UserIdentifierParts = {
+  authLabel: "(D)" | "(E)";
+  deviceBadge?: string;
+  identifier: string;
+  isDevice: boolean;
+};
+
+export function getUserIdentifierParts(
+  user?: UserIdentifierUser
+): UserIdentifierParts {
+  const method = user?.auth_methods?.[0];
+  const firstDevice = user?.user_devices?.[0] as
+    | UserDeviceWithDeviceNo
+    | undefined;
+  const isDevice = method?.auth_type === "device";
+  const rawIdentifier = method?.auth_identifier || "";
+  const identifier = isDevice
+    ? firstDevice?.device_no || rawIdentifier
+    : rawIdentifier;
+
+  return {
+    authLabel: isDevice ? "(D)" : "(E)",
+    deviceBadge: parseDeviceType(firstDevice?.user_agent || ""),
+    identifier,
+    isDevice,
+  };
+}
+
+export function UserIdentifier({
+  className,
+  user,
+}: {
+  className?: string;
+  user?: UserIdentifierUser;
+}) {
+  const { authLabel, deviceBadge, identifier, isDevice } =
+    getUserIdentifierParts(user);
+
+  return (
+    <div className={className}>
+      {deviceBadge ? (
+        <Badge className="mr-1" variant="secondary">
+          {deviceBadge}
+        </Badge>
+      ) : null}
+      <span className="mr-1 font-mono text-xs uppercase">{authLabel}</span>
+      <span title={isDevice ? identifier : undefined}>
+        {identifier || "--"}
+      </span>
+    </div>
+  );
+}
@@ -0,0 +1,92 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { cleanup, fireEvent, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { UserSearchBar } from "./user-search-bar";
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({
+    t: (_key: string, fallback: string): string => fallback,
+  }),
+}));
+
+afterEach(() => {
+  cleanup();
+});
+
+describe("UserSearchBar", () => {
+  it("keeps the controls usable on a narrow mobile viewport", () => {
+    Object.defineProperty(window, "innerWidth", {
+      configurable: true,
+      value: 390,
+    });
+
+    render(
+      <UserSearchBar
+        initialType="email"
+        initialValue=""
+        onSearch={vi.fn()}
+        subscribes={[]}
+      />
+    );
+
+    expect(screen.getByRole("combobox")).not.toBeNull();
+    expect(screen.getByRole("button", { name: "Search" })).not.toBeNull();
+  });
+
+  it("keeps the typed happy-path value and triggers search", () => {
+    const onSearch = vi.fn();
+
+    render(
+      <UserSearchBar
+        initialType="email"
+        initialValue=""
+        onSearch={onSearch}
+        subscribes={[]}
+      />
+    );
+
+    fireEvent.change(screen.getByPlaceholderText("Enter search term"), {
+      target: { value: "user@example.com" },
+    });
+    fireEvent.click(screen.getByRole("button", { name: "Search" }));
+
+    expect(onSearch).toHaveBeenCalledWith("email", "user@example.com");
+    expect(
+      (screen.getByPlaceholderText("Enter search term") as HTMLInputElement)
+        .value
+    ).toBe("user@example.com");
+  });
+
+  it("syncs to external search changes for precise referrer navigation", () => {
+    const onSearch = vi.fn();
+    const { rerender } = render(
+      <UserSearchBar
+        initialType="email"
+        initialValue="old@example.com"
+        onSearch={onSearch}
+        subscribes={[]}
+      />
+    );
+
+    expect(
+      (screen.getByPlaceholderText("Enter search term") as HTMLInputElement)
+        .value
+    ).toBe("old@example.com");
+
+    rerender(
+      <UserSearchBar
+        initialType="user_id"
+        initialValue="1024"
+        onSearch={onSearch}
+        subscribes={[]}
+      />
+    );
+
+    expect(
+      (screen.getByPlaceholderText("Enter search term") as HTMLInputElement)
+        .value
+    ).toBe("1024");
+  });
+});
@@ -0,0 +1,102 @@
+"use client";
+
+import { Button } from "@workspace/ui/components/button";
+import { Input } from "@workspace/ui/components/input";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@workspace/ui/components/select";
+import { Combobox } from "@workspace/ui/composed/combobox";
+import { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+
+export function UserSearchBar({
+  initialType,
+  initialValue,
+  onSearch,
+  subscribes,
+}: {
+  initialType: string;
+  initialValue: string;
+  onSearch: (type: string, value: string) => void;
+  subscribes?: API.SubscribeItem[];
+}) {
+  const { t } = useTranslation("user");
+  const [searchType, setSearchType] = useState(initialType);
+  const [searchValue, setSearchValue] = useState(initialValue);
+
+  useEffect(() => {
+    setSearchType(initialType);
+    setSearchValue(initialValue);
+  }, [initialType, initialValue]);
+
+  return (
+    <div className="flex items-center gap-2">
+      <Select
+        onValueChange={(v) => {
+          setSearchType(v);
+          setSearchValue("");
+        }}
+        value={searchType}
+      >
+        <SelectTrigger className="w-48">
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem value="email">设备码/邮箱</SelectItem>
+          <SelectItem value="user_id">{t("userId", "User ID")}</SelectItem>
+          <SelectItem value="subscribe_id">
+            {t("subscription", "Subscription")}
+          </SelectItem>
+        </SelectContent>
+      </Select>
+      {searchType === "subscribe_id" ? (
+        <Combobox
+          className="w-48"
+          onChange={(value) => {
+            setSearchValue(value);
+            onSearch("subscribe_id", value);
+          }}
+          options={subscribes?.map((item) => ({
+            label: item.name!,
+            value: String(item.id!),
+          }))}
+          placeholder={t("subscription", "Subscription")}
+          value={searchValue}
+        />
+      ) : (
+        <>
+          <Input
+            className="w-48"
+            onChange={(e) => setSearchValue(e.target.value)}
+            onKeyDown={(e) =>
+              e.key === "Enter" && onSearch(searchType, searchValue)
+            }
+            placeholder={t("searchInputPlaceholder", "Enter search term")}
+            value={searchValue}
+          />
+          <Button
+            onClick={() => onSearch(searchType, searchValue)}
+            variant="default"
+          >
+            {t("search", "Search")}
+          </Button>
+          {searchValue && (
+            <Button
+              onClick={() => {
+                setSearchValue("");
+                onSearch(searchType, "");
+              }}
+              variant="outline"
+            >
+              {t("resetSearch", "Reset")}
+            </Button>
+          )}
+        </>
+      )}
+    </div>
+  );
+}
@@ -54,6 +54,10 @@ function toUserSubscribePayload(values: SubscriptionFormValues) {
  };
 }

+function resolvePlanSpeed(row: API.UserSubscribe) {
+  return row.plan_speed_limit ?? row.subscribe?.speed_limit ?? 0;
+}
+
 export default function UserSubscription({ userId }: { userId: number }) {
  const { t } = useTranslation("user");
  const [loading, setLoading] = useState(false);
@@ -315,10 +319,11 @@ export default function UserSubscription({ userId }: { userId: number }) {
            cell: ({ row }) => {
              const userSpeed = row.original.speed_limit ?? 0;
              const effectiveSpeed = row.original.effective_speed ?? 0;
-              const planSpeed = row.original.subscribe?.speed_limit ?? 0;
+              const planSpeed = resolvePlanSpeed(row.original);
              const speed = effectiveSpeed || userSpeed || planSpeed;
-              const source =
-                userSpeed > 0
+              const source = row.original.is_throttled
+                ? t("effectiveSpeed", "Effective Speed")
+                : userSpeed > 0
                  ? t("userOverride", "User Override")
                  : t("subscriptionDefault", "Subscription Default");

@@ -335,6 +340,16 @@ export default function UserSubscription({ userId }: { userId: number }) {
                  <span className="text-muted-foreground text-xs">
                    {source}
                  </span>
+                  <span className="text-muted-foreground text-xs">
+                    {t("userOverride", "User Override")}:{" "}
+                    <span className="inline-block">
+                      <Display type="trafficSpeed" value={userSpeed} />
+                    </span>{" "}
+                    / {t("subscriptionDefault", "Subscription Default")}:{" "}
+                    <span className="inline-block">
+                      <Display type="trafficSpeed" value={planSpeed} />
+                    </span>
+                  </span>
                </div>
              );
            },
@@ -87,11 +87,12 @@ function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {

  if (detail.status !== 1) return null;

-  const baseSpeed = detail.subscribe?.speed_limit ?? 0;
+  const baseSpeed =
+    detail.plan_speed_limit ?? detail.subscribe?.speed_limit ?? 0;
  const userSpeed = detail.speed_limit ?? 0;
  const effectiveSpeed = detail.effective_speed ?? 0;
  const isThrottled = detail.is_throttled;
-  const rules = detail.traffic_limit || [];
+  const rules = detail.user_traffic_limit || detail.traffic_limit || [];
  const hasLimitConfig =
    baseSpeed > 0 || userSpeed > 0 || effectiveSpeed > 0 || rules.length > 0;

@@ -40,6 +40,12 @@ interface Props {

 type SubscriptionTrafficLimitRule = API.UserSubscribeTrafficLimitRule;

+function getUserTrafficLimitRules(
+  data?: Pick<API.UserSubscribe, "traffic_limit" | "user_traffic_limit">
+) {
+  return data?.user_traffic_limit || data?.traffic_limit || [];
+}
+
 const defaultLimitRule: SubscriptionTrafficLimitRule = {
  stat_type: "day",
  stat_value: 1,
@@ -98,7 +104,7 @@ export function SubscriptionForm({
      traffic: initialData?.traffic || 0,
      speed_limit: initialData?.speed_limit || 0,
      device_limit: initialData?.device_limit || 0,
-      traffic_limit: initialData?.traffic_limit || [],
+      traffic_limit: getUserTrafficLimitRules(initialData),
      upload: initialData?.upload || 0,
      download: initialData?.download || 0,
      expired_at: initialData?.expire_time || 0,
@@ -44,7 +44,7 @@ const WITHDRAWAL_METHOD_MAP: Record<number, string> = {
  0: "其他",
  1: "支付宝",
  2: "微信",
-  3: "银行卡",
+  3: "USDT(TRC20)",
 };

 const rejectSchema = z.object({
@@ -143,7 +143,7 @@ export default function WithdrawalPage() {
  const methodOptions = [
    { value: "1", label: "支付宝" },
    { value: "2", label: "微信" },
-    { value: "3", label: "银行卡" },
+    { value: "3", label: "USDT(TRC20)" },
    { value: "0", label: "其他" },
  ];

@@ -16,10 +16,6 @@
  "inviteCode": "Invite Code",
  "inviteRecords": "Invite Records",
  "noReason": "None",
-  "recordsTabs": {
-    "withdrawal": "Withdrawal Records",
-    "refund": "Refund Records"
-  },
  "rejectReason": "Reject Reason",
  "registrationTime": "Registration Time",
  "submitWithdraw": "Submit Request",
@@ -32,27 +28,10 @@
  "withdrawDescription": "Submit the withdrawal amount and payout details, then wait for review.",
  "withdrawError": "Failed to submit withdrawal request",
  "withdrawRecords": "Withdrawal Records",
-  "withdrawalRecordsDescription": "Review your withdrawal requests, statuses, and payout details.",
-  "withdrawalEmpty": "No withdrawal records yet",
  "withdrawStatus": {
    "approved": "Approved",
    "pending": "Pending Review",
    "rejected": "Rejected"
  },
-  "withdrawSuccess": "Withdrawal request submitted",
-  "commissionReturn": {
-    "description": "Review order refunds and returned withdrawal commissions.",
-    "empty": "No refund records yet",
-    "eventType": {
-      "orderRefund": "Order Refund",
-      "withdrawRejectReturn": "Withdrawal Rejected Return",
-      "withdrawCancelReturn": "Withdrawal Cancel Return",
-      "unknown": "Commission Return"
-    },
-    "fields": {
-      "eventType": "Type",
-      "orderNo": "Order No.",
-      "createdAt": "Created At"
-    }
-  }
+  "withdrawSuccess": "Withdrawal request submitted"
 }
@@ -16,10 +16,6 @@
  "inviteCode": "邀请码",
  "inviteRecords": "邀请记录",
  "noReason": "无",
-  "recordsTabs": {
-    "withdrawal": "提现记录",
-    "refund": "退款记录"
-  },
  "rejectReason": "拒绝原因",
  "registrationTime": "注册时间",
  "submitWithdraw": "提交申请",
@@ -32,27 +28,10 @@
  "withdrawDescription": "填写提现金额和收款信息后提交申请，等待后台审核。",
  "withdrawError": "提现申请提交失败",
  "withdrawRecords": "提现记录",
-  "withdrawalRecordsDescription": "查看你的提现申请、审核状态和收款信息。",
-  "withdrawalEmpty": "暂无提现记录",
  "withdrawStatus": {
    "approved": "已通过",
    "pending": "审核中",
    "rejected": "已拒绝"
  },
-  "withdrawSuccess": "提现申请已提交",
-  "commissionReturn": {
-    "description": "查看订单退款和提现退回记录。",
-    "empty": "暂无退款记录",
-    "eventType": {
-      "orderRefund": "订单退款",
-      "withdrawRejectReturn": "提现拒绝退回",
-      "withdrawCancelReturn": "用户取消提现退回",
-      "unknown": "佣金返回"
-    },
-    "fields": {
-      "eventType": "类型",
-      "orderNo": "订单号",
-      "createdAt": "创建时间"
-    }
-  }
+  "withdrawSuccess": "提现申请已提交"
 }
@@ -1,37 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-import { getCommissionReturnEventLabel } from "./commission-return";
-
-const translations = {
-  "commissionReturn.eventType.orderRefund": "订单退款",
-  "commissionReturn.eventType.withdrawRejectReturn": "提现拒绝退回",
-  "commissionReturn.eventType.withdrawCancelReturn": "用户取消提现退回",
-  "commissionReturn.eventType.unknown": "佣金返回",
-} as const;
-
-describe("getCommissionReturnEventLabel", () => {
-  const t = (key: string, defaultValue: string) =>
-    translations[key as keyof typeof translations] ?? defaultValue ?? key;
-
-  it("maps 333 to order refund", () => {
-    expect(getCommissionReturnEventLabel(333, t)).toBe("订单退款");
-  });
-
-  it("maps 337 to withdraw reject return", () => {
-    expect(getCommissionReturnEventLabel(337, t)).toBe("提现拒绝退回");
-  });
-
-  it("maps 338 to withdraw cancel return", () => {
-    expect(getCommissionReturnEventLabel(338, t)).toBe("用户取消提现退回");
-  });
-
-  it("falls back for unknown event types and warns", () => {
-    const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {
-      /* intentional noop */
-    });
-
-    expect(getCommissionReturnEventLabel(999, t)).toBe("佣金返回");
-    expect(warnSpy).toHaveBeenCalledWith(999);
-
-    warnSpy.mockRestore();
-  });
-});
@@ -1,27 +0,0 @@
-export type AffiliateTranslation = (
-  key: string,
-  defaultValue: string
-) => string;
-
-export function getCommissionReturnEventLabel(
-  eventType: number,
-  t: AffiliateTranslation
-) {
-  switch (eventType) {
-    case 333:
-      return t("commissionReturn.eventType.orderRefund", "Order Refund");
-    case 337:
-      return t(
-        "commissionReturn.eventType.withdrawRejectReturn",
-        "Withdrawal Rejected Return"
-      );
-    case 338:
-      return t(
-        "commissionReturn.eventType.withdrawCancelReturn",
-        "Withdrawal Cancel Return"
-      );
-    default:
-      console.warn(eventType);
-      return t("commissionReturn.eventType.unknown", "Commission Return");
-  }
-}
@@ -35,21 +35,13 @@ import {
  SelectTrigger,
  SelectValue,
 } from "@workspace/ui/components/select";
-import {
-  Tabs,
-  TabsContent,
-  TabsList,
-  TabsTrigger,
-} from "@workspace/ui/components/tabs";
 import { Textarea } from "@workspace/ui/components/textarea";
 import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
-import Empty from "@workspace/ui/composed/empty";
 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,
-  queryCommissionReturnLog,
  queryUserAffiliate,
  queryUserAffiliateList,
  queryWithdrawalLog,
@@ -67,12 +59,11 @@ import { toast } from "sonner";
 import { z } from "zod";
 import { Display } from "@/components/display";
 import { useGlobalStore } from "@/stores/global";
-import { getCommissionReturnEventLabel } from "./commission-return";

 const WITHDRAWAL_METHODS = [
  { value: 1, label: "支付宝" },
  { value: 2, label: "微信" },
-  { value: 3, label: "银行卡" },
+  { value: 3, label: "USDT(TRC20)" },
  { value: 0, label: "其他" },
 ] as const;

@@ -131,9 +122,9 @@ function QrCodeView({ url }: { url: string }) {
            <img
              alt="收款码"
              className="w-full"
-              height={512}
+              height={320}
              src={url}
-              width={512}
+              width={320}
            />
          </DialogContent>
        </Dialog>
@@ -170,7 +161,7 @@ const withdrawalFormSchema = z
      if (!data.account) {
        ctx.addIssue({
          code: z.ZodIssueCode.custom,
-          message: "银行卡收款账号为必填",
+          message: "USDT(TRC20) 地址为必填",
          path: ["account"],
        });
      }
@@ -188,7 +179,6 @@ type WithdrawalFormValues = z.infer<typeof withdrawalFormSchema>;
 export default function Affiliate() {
  const { t } = useTranslation("affiliate");
  const { user, common, getUserInfo } = useGlobalStore();
-  const [activeRecordTab, setActiveRecordTab] = useState("withdrawal");
  const [withdrawalOpen, setWithdrawalOpen] = useState(false);
  const [submitting, startTransition] = useTransition();
  const [qrUploading, setQrUploading] = useState(false);
@@ -490,7 +480,7 @@ export default function Affiliate() {
                                <Input
                                  placeholder={
                                    watchedMethod === 3
-                                      ? "请输入银行卡号或账户信息"
+                                      ? "请输入 USDT(TRC20) 收款地址"
                                      : "请输入收款账号（与备注至少填一项）"
                                  }
                                  {...field}
@@ -578,218 +568,107 @@ export default function Affiliate() {
          </div>
        </CardContent>
      </Card>
-      <Card>
-        <CardHeader className="gap-3">
-          <CardTitle>{t("withdrawRecords", "Withdrawal Records")}</CardTitle>
-          <CardDescription>
-            {activeRecordTab === "withdrawal"
-              ? t(
-                  "withdrawalRecordsDescription",
-                  "Review your withdrawal requests, statuses, and payout details."
-                )
-              : t(
-                  "commissionReturn.description",
-                  "Review order refunds and returned withdrawal commissions."
-                )}
-          </CardDescription>
-          <Tabs
-            defaultValue="withdrawal"
-            onValueChange={setActiveRecordTab}
-            value={activeRecordTab}
-          >
-            <TabsList className="grid w-full grid-cols-2 md:w-fit">
-              <TabsTrigger value="withdrawal">
-                {t("recordsTabs.withdrawal", "Withdrawal Records")}
-              </TabsTrigger>
-              <TabsTrigger value="refund">
-                {t("recordsTabs.refund", "Refund Records")}
-              </TabsTrigger>
-            </TabsList>
-
-            <TabsContent className="mt-4" value="withdrawal">
-              <ProList<API.WithdrawalLog, Record<string, unknown>>
-                action={withdrawalListActionRef}
-                empty={
-                  <Empty
-                    description={t(
-                      "withdrawalEmpty",
-                      "No withdrawal records yet"
+      <ProList<API.WithdrawalLog, Record<string, unknown>>
+        action={withdrawalListActionRef}
+        header={{
+          title: t("withdrawal.records", "Withdrawal Records"),
+        }}
+        renderItem={(item) => {
+          const statusMeta = getWithdrawalStatusMeta(item.status, t);
+          return (
+            <Card className="overflow-hidden">
+              <CardContent className="space-y-3 p-4 text-sm">
+                <div className="flex flex-wrap items-center justify-between gap-2">
+                  <div className="font-semibold text-lg">
+                    <Display type="currency" value={item.amount} />
+                  </div>
+                  <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>
+                        }
+                      />
                    )}
-                  />
-                }
-                renderItem={(item) => {
-                  const statusMeta = getWithdrawalStatusMeta(item.status, t);
-                  return (
-                    <Card className="overflow-hidden">
-                      <CardContent className="space-y-3 p-4 text-sm">
-                        <div className="flex flex-wrap items-center justify-between gap-2">
-                          <div className="font-semibold text-lg">
-                            <Display type="currency" value={item.amount} />
-                          </div>
-                          <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">
-                              收款方式
-                            </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 && (
-                            <li className="flex flex-col gap-1 md:col-span-2">
-                              <span className="text-muted-foreground">
-                                {t("withdrawal.record.reason", "Reject Reason")}
-                              </span>
-                              <span className="whitespace-pre-wrap break-words text-destructive">
-                                {item.reason}
-                              </span>
-                            </li>
-                          )}
-                        </ul>
-                      </CardContent>
-                    </Card>
-                  );
-                }}
-                request={async (pagination) => {
-                  const response = await queryWithdrawalLog({
-                    page: pagination.page,
-                    size: pagination.size,
-                  });
-                  return {
-                    list: response.data.data?.list || [],
-                    total: response.data.data?.total || 0,
-                  };
-                }}
-              />
-            </TabsContent>
-
-            <TabsContent className="mt-4" value="refund">
-              <ProList<API.CommissionReturnLog, Record<string, unknown>>
-                empty={
-                  <Empty
-                    description={t(
-                      "commissionReturn.empty",
-                      "No refund records yet"
-                    )}
-                  />
-                }
-                renderItem={(item) => (
-                  <Card className="overflow-hidden">
-                    <CardContent className="space-y-3 p-4 text-sm">
-                      <div className="flex flex-wrap items-center justify-between gap-2">
-                        <div className="font-semibold text-lg">
-                          <Display type="currency" value={item.amount} />
-                        </div>
-                        <span className="inline-flex rounded-full bg-primary/10 px-3 py-1 font-medium text-primary text-xs">
-                          {getCommissionReturnEventLabel(item.event_type, t)}
-                        </span>
-                      </div>
-                      <ul className="grid gap-3 md:grid-cols-2">
-                        <li className="flex flex-col gap-1">
-                          <span className="text-muted-foreground">
-                            {t("commissionReturn.fields.eventType", "Type")}
-                          </span>
-                          <span>
-                            {getCommissionReturnEventLabel(item.event_type, t)}
-                          </span>
-                        </li>
-                        <li className="flex flex-col gap-1">
-                          <span className="text-muted-foreground">
-                            {t("commissionReturn.fields.orderNo", "Order No.")}
-                          </span>
-                          <span className="break-all">
-                            {item.order_no || "-"}
-                          </span>
-                        </li>
-                        <li className="flex flex-col gap-1">
-                          <span className="text-muted-foreground">
-                            {t(
-                              "commissionReturn.fields.createdAt",
-                              "Created At"
-                            )}
-                          </span>
-                          <time>{formatDate(item.created_at)}</time>
-                        </li>
-                      </ul>
-                    </CardContent>
-                  </Card>
-                )}
-                request={async (pagination) => {
-                  const response = await queryCommissionReturnLog({
-                    page: pagination.page,
-                    size: pagination.size,
-                  });
-                  return {
-                    list: response.data.data?.list || [],
-                    total: response.data.data?.total || 0,
-                  };
-                }}
-              />
-            </TabsContent>
-          </Tabs>
-        </CardHeader>
-      </Card>
+                  </div>
+                </div>
+                <ul className="grid gap-3 md:grid-cols-2">
+                  <li className="flex flex-col gap-1">
+                    <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 && (
+                    <li className="flex flex-col gap-1 md:col-span-2">
+                      <span className="text-muted-foreground">
+                        {t("withdrawal.record.reason", "Reject Reason")}
+                      </span>
+                      <span className="whitespace-pre-wrap break-words text-destructive">
+                        {item.reason}
+                      </span>
+                    </li>
+                  )}
+                </ul>
+              </CardContent>
+            </Card>
+          );
+        }}
+        request={async (pagination) => {
+          const response = await queryWithdrawalLog({
+            page: pagination.page,
+            size: pagination.size,
+          });
+          return {
+            list: response.data.data?.list || [],
+            total: response.data.data?.total || 0,
+          };
+        }}
+      />
      <ProList<API.UserAffiliate, Record<string, unknown>>
        header={{
          title: t("inviteRecords", "Invite Records"),
@@ -2664,11 +2664,13 @@ declare namespace API {
    download: number;
    upload: number;
    speed_limit?: number;
+    plan_speed_limit?: number;
    device_limit?: number;
    effective_speed?: number;
    is_throttled?: boolean;
    throttle_rule?: string;
    traffic_limit?: UserSubscribeTrafficLimitRule[];
+    user_traffic_limit?: UserSubscribeTrafficLimitRule[];
    token: string;
    status: number;
    short: string;
@@ -2699,8 +2701,10 @@ declare namespace API {
    download: number;
    upload: number;
    speed_limit?: number;
+    plan_speed_limit?: number;
    device_limit?: number;
    traffic_limit?: UserSubscribeTrafficLimitRule[];
+    user_traffic_limit?: UserSubscribeTrafficLimitRule[];
    token: string;
    status: number;
    effective_speed: number;
@@ -170,17 +170,6 @@ declare namespace API {
    timestamp: number;
  };

-  type CommissionReturnLog = {
-    id: number;
-    user_id: number;
-    amount: number;
-    event_type: number;
-    order_no?: string;
-    content?: string;
-    created_at: number;
-    updated_at: number;
-  };
-
  type CommissionWithdrawRequest = {
    amount: number;
    method: number;
@@ -832,21 +821,6 @@ declare namespace API {
    size: number;
  };

-  type QueryCommissionReturnLogListRequest = {
-    page: number;
-    size: number;
-  };
-
-  type QueryCommissionReturnLogListResponse = {
-    list: CommissionReturnLog[];
-    total: number;
-  };
-
-  type QueryCommissionReturnLogParams = {
-    page: number;
-    size: number;
-  };
-
  type QueryUserSubscribeListResponse = {
    list: UserSubscribe[];
    total: number;
@@ -1,3 +1,4 @@
+// @ts-expect-error
 /* eslint-disable */
 import request from "@workspace/ui/lib/request";

@@ -470,25 +471,6 @@ export async function queryWithdrawalLog(
  );
 }

-/** Query Commission Return Log GET /v1/public/user/commission_return_log */
-export async function queryCommissionReturnLog(
-  params: API.QueryCommissionReturnLogParams,
-  options?: { [key: string]: any }
-) {
-  return request<
-    API.Response & { data?: API.QueryCommissionReturnLogListResponse }
-  >(
-    `${import.meta.env.VITE_API_PREFIX || ""}/v1/public/user/commission_return_log`,
-    {
-      method: "GET",
-      params: {
-        ...params,
-      },
-      ...(options || {}),
-    }
-  );
-}
-
 /** Cancel Withdrawal POST /v1/public/user/withdrawal_cancel */
 export async function withdrawalCancel(
  body: API.WithdrawalCancelRequest,
Author	SHA1	Message	Date
shanshanzhong147	511ce4ff65	Merge branch 'internal' into main PR Check / Lint, Check, Test and Build (push) Has been cancelled Details Build and Release / Build (push) Has been cancelled Details	2026-06-23 08:49:48 -07:00
shanshanzhong147	64fe23f877	fix: show user subscription speed override PR Check / Lint, Check, Test and Build (push) Has been cancelled Details Build and Release / Build (push) Has been cancelled Details	2026-06-11 02:39:16 -07:00
shanshanzhong147	09c5216f60	修复(#14 ): 调整 USDT 提现方式枚举口径 PR Check / Lint, Check, Test and Build (push) Has been cancelled Details Build and Release / Build (push) Has been cancelled Details	2026-06-09 06:37:15 -07:00
shanshanzhong147	4d84095af2	修复(#14 ): 支持 USDT 提现方式展示	2026-06-09 06:37:14 -07:00
shanshanzhong147	d66b664198	修复(#122 ): 补齐促销价档位提交 PR Check / Lint, Check, Test and Build (push) Has been cancelled Details Build and Release / Build (push) Has been cancelled Details	2026-05-29 02:36:30 -07:00
shanshanzhong147	a7d89acc7f	新功能(#113 ): 发布促销管理后台页面到main PR Check / Lint, Check, Test and Build (push) Has been cancelled Details Build and Release / Build (push) Has been cancelled Details	2026-05-29 00:40:33 -07:00