Merge branch 'internal' into main

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

@@ -29,5 +29,6 @@
   "users": "Users",
   "userTitle": "User Statistics",
   "userTraffic": "User Traffic",
+  "withdrawalManagement": "Withdrawal Management",
   "yesterday": "Yesterday"
 }

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

@@ -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",

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

@@ -29,5 +29,6 @@
   "users": "用户",
   "userTitle": "用户统计",
   "userTraffic": "用户流量",
+  "withdrawalManagement": "提现管理",
   "yesterday": "昨日"
 }

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

@@ -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": "查看所有者",

apps/admin/src/sections/dashboard/components/statistics.tsx

@@ -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",
           },

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

@@ -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 }) => {
+          cell: ({ row }) => (
-            const method = row.original.auth_methods?.[0];
+            <div className="flex items-center">
-            const identifier = method?.auth_identifier || "";
+              <UserIdentifier
-            const isDevice = method?.auth_type === "device";
+                className="flex items-center"
-            const firstDevice = row.original.user_devices?.[0] as
+                user={row.original}
-              | UserDeviceWithDeviceNo
+              />
-              | undefined;
+              <Popover>
-            const deviceNo = firstDevice?.device_no;
+                <PopoverTrigger>
-            const deviceType = parseDeviceType(firstDevice?.user_agent || "");
+                  <div className={"flex items-center"}>
-            const display = isDevice ? deviceNo || identifier : identifier;
+                    {row.original?.remark ? `（${row.original.remark}）` : ""}
-            return (
+                    <FilePenLine className={"ml-2 text-primary"} size={14} />
-              <div className="flex items-center">
+                  </div>
-                {/* <Badge
+                </PopoverTrigger>
-                  className="mr-1 uppercase"
+                <PopoverContent className={"w-64"}>
-                  title={method?.verified ? t("verified", "Verified") : ""}
+                  <RemarkForm
-                >
+                    initialRemark={row.original.remark}
-                  {method?.auth_type}
+                    onSave={async (remark) => {
-                </Badge>*/}
+                      const { data } = await getUserDetail({
-                {deviceType && (
+                        id: row.original.id,
-                  <Badge className="mr-1" variant="secondary">
+                      });
-                    {deviceType}
+                      const user = data.data;
-                  </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;
 
-                        if (!user) {
+                      if (!user) {
-                          throw new Error("User detail not found");
+                        throw new Error("User detail not found");
-                        }
+                      }
 
-                        await updateUserBasicInfo(
+                      await updateUserBasicInfo(
-                          buildUserBasicInfoPayload(user, remark)
+                        buildUserBasicInfoPayload(user, remark)
-                        );
+                      );
-                        toast.success(t("updateSuccess"));
+                      toast.success(t("updateSuccess"));
-                        ref.current?.refresh();
+                      ref.current?.refresh();
-                      }}
+                    }}
-                    />
+                  />
-                  </PopoverContent>
+                </PopoverContent>
-                </Popover>
+              </Popover>
-              </div>
+            </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({
+function PreviewNodesDialog({
-  initialType,
+  userId,
-  initialValue,
+  open,
-  onSearch,
+  onOpenChange,
-  subscribes,
 }: {
-  initialType: string;
+  userId: number;
-  initialValue: string;
+  open: boolean;
-  onSearch: (type: string, value: string) => void;
+  onOpenChange: (open: boolean) => void;
-  subscribes?: API.SubscribeItem[];
 }) {
   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}>
+    <Dialog onOpenChange={onOpenChange} open={open}>
-      <DialogTrigger asChild>
-        <Button variant="outline">{t("previewNodes", "Preview Nodes")}</Button>
-      </DialogTrigger>
       <DialogContent className="max-w-2xl">
         <DialogHeader>
           <DialogTitle>

apps/admin/src/sections/user/user-detail.tsx

@@ -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 ? (
-              <>
+              <UserIdentifier className="flex items-center" 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}
-              </>
             ) : (
               t("loading", "Loading...")
             )}

apps/admin/src/sections/user/user-identifier.test.tsx

@@ -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();
+  });
+});

apps/admin/src/sections/user/user-identifier.tsx

@@ -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>
+  );
+}

apps/admin/src/sections/user/user-search-bar.test.tsx

@@ -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");
+  });
+});

apps/admin/src/sections/user/user-search-bar.tsx

@@ -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>
+  );
+}

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

@@ -9,6 +9,7 @@
     "originalPrice": "Original Price (Monthly)",
     "price": "Price",
     "productDiscount": "Product Discount",
+    "promoDiscount": "Promo Discount",
     "total": "Total"
   },
   "buy": "Buy",

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

@@ -9,6 +9,7 @@
     "originalPrice": "原价（按月）",
     "price": "价格",
     "productDiscount": "商品折扣",
+    "promoDiscount": "促销优惠",
     "total": "总价"
   },
   "buy": "购买",

apps/user/src/sections/subscribe/billing.tsx

@@ -10,6 +10,7 @@ interface SubscribeBillingProps {
       unit_price: number;
       unit_time: string;
       subscribe_discount: number;
+      promo_discount: number;
       show_original_price?: boolean;
     }
   >;
@@ -66,6 +67,14 @@ export function SubscribeBilling({ order }: Readonly<SubscribeBillingProps>) {
             <Display type="currency" value={order?.discount} />
           </span>
         </li>
+        <li>
+          <span className="text-muted-foreground">
+            {t("billing.promoDiscount", "Promo Discount")}
+          </span>
+          <span>
+            <Display type="currency" value={order?.promo_discount} />
+          </span>
+        </li>
         <li>
           <span className="text-muted-foreground">
             {t("billing.couponDiscount", "Coupon Discount")}

apps/user/src/sections/subscribe/promo-info.tsx

@@ -18,10 +18,10 @@ export function PromoInfo({ discount }: Readonly<PromoInfoProps>) {
         <span className="font-medium">
           {promo.rule_name || t("promo.available", "Promo Available")}
         </span>
-        {promo.end_time && (
+        {promo.expires_at && (
           <span className="text-muted-foreground text-xs">
             {t("promo.validUntil", "Valid until")}:{" "}
-            {new Date(promo.end_time * 1000).toLocaleString()}
+            {new Date(promo.expires_at * 1000).toLocaleString()}
           </span>
         )}
       </div>

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

@@ -548,6 +548,7 @@ declare namespace API {
     price: number;
     amount: number;
     discount: number;
+    promo_discount: number;
     gift_amount: number;
     coupon: string;
     coupon_discount: number;
@@ -1024,8 +1025,9 @@ declare namespace API {
 
   type SubscribeDiscountPromo = {
     rule_name?: string;
+    rule_type?: string;
     promo_price: number;
-    end_time?: number;
+    expires_at?: number;
   };
 
   type SubscribeGroup = {