修复(#119): 补齐用户限速与促销后台实现

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

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

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

@@ -22,13 +22,10 @@
     "inactiveMonthsPlaceholder": "Months without purchase",
     "name": "Name",
     "namePlaceholder": "Rule name",
-    "noDiscounts": "This subscribe has no discount quantities and cannot be configured.",
-    "promoPriceLessThanOriginalPrice": "Promo price must be lower than original price",
     "promoPriceLessThanUnitPrice": "Promo price must be lower than unit price",
     "selectEndTime": "Select time",
     "selectRule": "Select rule",
     "selectStartTime": "Select time",
-    "selectQuantity": "Select discount quantity",
     "selectSubscribe": "Select subscribe",
     "type": "Rule Type",
     "windowHours": "Window Hours",
@@ -41,12 +38,10 @@
   "name": "Name",
   "no": "No",
   "orderNo": "Order No.",
-  "originalPriceHint": "Original price",
   "params": "Params",
   "prices": "Prices",
   "priority": "Priority",
   "promoPrice": "Promo Price",
-  "quantity": "Quantity",
   "rule": "Rule",
   "ruleDetail": "Rule Detail",
   "rules": "Rules",

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

@@ -100,12 +100,10 @@
   "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",
@@ -191,7 +189,6 @@
   "groupUpdated": "Group updated successfully",
   "upload": "Upload",
   "uploadTraffic": "Upload Traffic",
-  "userStatus": "User Status",
   "userAgent": "User Agent",
   "userEmail": "Email",
   "userEmailPlaceholder": "Enter email",
@@ -201,7 +198,6 @@
   "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,6 +29,5 @@
   "users": "用户",
   "userTitle": "用户统计",
   "userTraffic": "用户流量",
-  "withdrawalManagement": "提现管理",
   "yesterday": "昨日"
 }

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

@@ -22,13 +22,10 @@
     "inactiveMonthsPlaceholder": "未购买的月数",
     "name": "名称",
     "namePlaceholder": "规则名称",
-    "noDiscounts": "该订阅没有 discount 档位，不能配置促销价。",
-    "promoPriceLessThanOriginalPrice": "促销价必须低于原价",
     "promoPriceLessThanUnitPrice": "促销价必须低于原价",
     "selectEndTime": "选择时间",
     "selectRule": "选择规则",
     "selectStartTime": "选择时间",
-    "selectQuantity": "选择 discount 档位",
     "selectSubscribe": "选择订阅",
     "type": "规则类型",
     "windowHours": "新用户窗口小时数",
@@ -41,12 +38,10 @@
   "name": "名称",
   "no": "否",
   "orderNo": "订单号",
-  "originalPriceHint": "原价",
   "params": "参数",
   "prices": "商品促销价",
   "priority": "优先级",
   "promoPrice": "促销价",
-  "quantity": "档位",
   "rule": "规则",
   "ruleDetail": "规则详情",
   "rules": "促销规则",

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

@@ -101,12 +101,10 @@
   "manager": "管理员",
   "memberCount": "成员数量",
   "more": "更多",
-  "neverLoggedIn": "从未登录",
   "normal": "正常",
   "next": "下一页",
   "noInvitedUsers": "暂无邀请用户",
   "notifySettingsTitle": "通知设置",
-  "inactive": "未活跃",
   "offline": "离线",
   "online": "在线",
   "onlineDevices": "在线设备",
@@ -192,7 +190,6 @@
   "groupUpdated": "分组更新成功",
   "upload": "上传",
   "uploadTraffic": "上传流量",
-  "userStatus": "用户状态",
   "userAgent": "用户代理",
   "userEmail": "邮箱",
   "userEmailPlaceholder": "输入邮箱",
@@ -202,7 +199,6 @@
   "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("withdrawalManagement", "提现管理"),
+            title: t("pendingTickets", "Pending Tickets"),
             value: TicketTotal || 0,
             subtitle: t("pending", "Pending"),
             icon: "uil:clipboard-notes",
-            href: "/dashboard/withdrawal",
+            href: "/dashboard/ticket",
             color: "text-red-600 dark:text-red-400",
             iconBg: "bg-red-100 dark:bg-red-900/30",
           },

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

@@ -46,7 +46,7 @@ type RuleFilters = {
 };
 
 type PriceFilters = {
-  promo_rule_id?: string;
+  rule_id?: string;
   subscribe_id?: string;
 };
 
@@ -301,13 +301,12 @@ export default function PromoPage() {
             }}
             columns={[
               {
-                accessorKey: "promo_rule_id",
+                accessorKey: "rule_id",
                 header: t("rule", "Rule"),
                 cell: ({ row }) =>
-                  row.original.promo_rule_id
-                    ? rules.find(
-                        (rule) => rule.id === row.original.promo_rule_id
-                      )?.name || `#${row.original.promo_rule_id}`
+                  row.original.rule_id
+                    ? rules.find((rule) => rule.id === row.original.rule_id)
+                        ?.name || `#${row.original.rule_id}`
                     : "--",
               },
               {
@@ -317,11 +316,6 @@ export default function PromoPage() {
                   row.original.subscribe_name ||
                   getSubscribeName(row.original.subscribe_id),
               },
-              {
-                accessorKey: "quantity",
-                header: t("quantity", "Quantity"),
-                cell: ({ row }) => row.original.quantity || "--",
-              },
               {
                 accessorKey: "unit_price",
                 header: t("unitPrice", "Unit Price"),
@@ -367,7 +361,7 @@ export default function PromoPage() {
             }}
             params={[
               {
-                key: "promo_rule_id",
+                key: "rule_id",
                 placeholder: t("rule", "Rule"),
                 options: rules.map((rule) => ({
                   label: rule.name,
@@ -388,7 +382,7 @@ export default function PromoPage() {
             request={async (pagination, filters) => {
               const { data } = await getPromoPriceList({
                 ...pagination,
-                promo_rule_id: parseOptionalNumber(filters.promo_rule_id),
+                rule_id: parseOptionalNumber(filters.rule_id),
                 subscribe_id: parseOptionalNumber(filters.subscribe_id),
               });
               return {
@@ -404,13 +398,13 @@ export default function PromoPage() {
             action={usageRef}
             columns={[
               {
-                accessorKey: "promo_rule_id",
+                accessorKey: "rule_id",
                 header: t("rule", "Rule"),
                 cell: ({ row }) =>
                   row.original.rule_name ||
-                  rules.find((rule) => rule.id === row.original.promo_rule_id)
+                  rules.find((rule) => rule.id === row.original.rule_id)
                     ?.name ||
-                  `#${row.original.promo_rule_id}`,
+                  `#${row.original.rule_id}`,
               },
               {
                 accessorKey: "user_id",
@@ -424,11 +418,6 @@ export default function PromoPage() {
                   row.original.subscribe_name ||
                   getSubscribeName(row.original.subscribe_id),
               },
-              {
-                accessorKey: "quantity",
-                header: t("quantity", "Quantity"),
-                cell: ({ row }) => row.original.quantity || "--",
-              },
               {
                 accessorKey: "order_no",
                 header: t("orderNo", "Order No."),
@@ -458,7 +447,7 @@ export default function PromoPage() {
             }
             params={[
               {
-                key: "promo_rule_id",
+                key: "rule_id",
                 placeholder: t("rule", "Rule"),
                 options: rules.map((rule) => ({
                   label: rule.name,
@@ -481,7 +470,7 @@ export default function PromoPage() {
             request={async (pagination, filters) => {
               const { data } = await getPromoUsageList({
                 ...pagination,
-                promo_rule_id: parseOptionalNumber(filters.promo_rule_id),
+                rule_id: parseOptionalNumber(filters.rule_id),
                 subscribe_id: parseOptionalNumber(filters.subscribe_id),
                 user_id: parseOptionalNumber(filters.user_id),
                 order_no: filters.order_no?.trim() || undefined,

apps/admin/src/sections/promo/price-form.test.tsx

@@ -1,152 +0,0 @@
-/**
- * @vitest-environment jsdom
- */
-import {
-  cleanup,
-  fireEvent,
-  render,
-  screen,
-  waitFor,
-} from "@testing-library/react";
-import { afterEach, describe, expect, it, vi } from "vitest";
-import PriceForm from "./price-form";
-
-globalThis.ResizeObserver = class ResizeObserver {
-  observe() {
-    return;
-  }
-  unobserve() {
-    return;
-  }
-  disconnect() {
-    return;
-  }
-};
-Element.prototype.scrollIntoView = function scrollIntoView() {
-  return;
-};
-
-vi.mock("react-i18next", () => ({
-  useTranslation: () => ({
-    t: (_key: string, fallback: string): string => fallback,
-  }),
-}));
-
-const rules: API.PromoRule[] = [
-  {
-    id: 1,
-    name: "Campaign Rule",
-    type: "campaign",
-    params: {},
-    priority: 1,
-    enabled: true,
-  },
-];
-
-const subscribes: API.SubscribeItem[] = [
-  {
-    id: 8,
-    name: "Monthly Plan",
-    unit_price: 1200,
-    unit_time: "Month",
-    sold: 0,
-    discount: [
-      {
-        quantity: 3,
-        discount: 90,
-      },
-    ],
-  },
-];
-const subscribesWithoutDiscounts: API.SubscribeItem[] = [
-  {
-    id: 8,
-    name: "Monthly Plan",
-    unit_price: 1200,
-    unit_time: "Month",
-    sold: 0,
-    discount: [],
-  },
-];
-
-async function selectCombobox(index: number, option: string) {
-  const combobox = screen.getAllByRole("combobox")[index];
-  if (!combobox) throw new Error(`Combobox ${index} not found`);
-  fireEvent.click(combobox);
-  fireEvent.click(await screen.findByText(option));
-}
-
-afterEach(() => {
-  cleanup();
-  vi.clearAllMocks();
-});
-
-describe("PriceForm", () => {
-  it("submits promo price with promo_rule_id and selected quantity item", async () => {
-    const onSubmit = vi.fn().mockResolvedValue(true);
-    render(
-      <PriceForm onSubmit={onSubmit} rules={rules} subscribes={subscribes} />
-    );
-
-    fireEvent.click(screen.getByRole("button", { name: "Create Promo Price" }));
-    await selectCombobox(0, "Campaign Rule");
-    await selectCombobox(1, "Monthly Plan");
-    await selectCombobox(2, "3 x Month");
-    fireEvent.change(screen.getByPlaceholderText("Enter price"), {
-      target: { value: "20" },
-    });
-    fireEvent.click(screen.getByRole("button", { name: "Confirm" }));
-
-    await waitFor(() =>
-      expect(onSubmit).toHaveBeenCalledWith({
-        promo_rule_id: 1,
-        items: [{ subscribe_id: 8, quantity: 3, promo_price: 2000 }],
-      })
-    );
-  });
-
-  it("blocks submit when subscribe has no discount quantities", async () => {
-    const onSubmit = vi.fn();
-    render(
-      <PriceForm
-        onSubmit={onSubmit}
-        rules={rules}
-        subscribes={subscribesWithoutDiscounts}
-      />
-    );
-
-    fireEvent.click(screen.getByRole("button", { name: "Create Promo Price" }));
-    await selectCombobox(1, "Monthly Plan");
-
-    expect(
-      screen.getByText(
-        "This subscribe has no discount quantities and cannot be configured."
-      )
-    ).not.toBeNull();
-    expect(screen.getByRole("button", { name: "Confirm" })).toHaveProperty(
-      "disabled",
-      true
-    );
-  });
-
-  it("keeps the form open and shows an error when promo price reaches original price", async () => {
-    const onSubmit = vi.fn();
-    render(
-      <PriceForm onSubmit={onSubmit} rules={rules} subscribes={subscribes} />
-    );
-
-    fireEvent.click(screen.getByRole("button", { name: "Create Promo Price" }));
-    await selectCombobox(0, "Campaign Rule");
-    await selectCombobox(1, "Monthly Plan");
-    await selectCombobox(2, "3 x Month");
-    fireEvent.change(screen.getByPlaceholderText("Enter price"), {
-      target: { value: "36" },
-    });
-    fireEvent.click(screen.getByRole("button", { name: "Confirm" }));
-
-    expect(
-      await screen.findByText("Promo price must be lower than original price")
-    ).not.toBeNull();
-    expect(onSubmit).not.toHaveBeenCalled();
-  });
-});

apps/admin/src/sections/promo/price-form.tsx

@@ -23,16 +23,11 @@ import { useState } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { z } from "zod";
-import {
-  formatCurrency,
-  getSubscribeDiscounts,
-  getSubscribeUnitPrice,
-} from "./utils";
+import { getSubscribeUnitPrice } from "./utils";
 
 const priceSchema = z.object({
-  promo_rule_id: z.number().min(1),
+  rule_id: z.number().min(1),
   subscribe_id: z.number().min(1),
-  quantity: z.number().min(1),
   promo_price: z.number().min(1),
 });
 
@@ -56,42 +51,26 @@ export default function PriceForm({
   const form = useForm<PriceFormValues>({
     resolver: zodResolver(priceSchema),
     defaultValues: {
-      promo_rule_id: 0,
+      rule_id: 0,
       subscribe_id: 0,
-      quantity: 0,
       promo_price: 0,
     },
   });
   const subscribeId = form.watch("subscribe_id");
-  const quantity = form.watch("quantity");
   const subscribe = subscribes.find((item) => item.id === subscribeId);
-  const discounts = getSubscribeDiscounts(subscribe);
   const unitPrice = getSubscribeUnitPrice(subscribe);
-  const originalPrice = unitPrice * quantity;
-  const hasSelectedSubscribe = subscribeId > 0;
-  const hasDiscounts = discounts.length > 0;
 
   async function handleSubmit(values: PriceFormValues) {
-    const maxPrice = unitPrice * values.quantity;
-    if (maxPrice > 0 && values.promo_price >= maxPrice) {
+    if (unitPrice > 0 && values.promo_price >= unitPrice) {
       form.setError("promo_price", {
         message: t(
-          "form.promoPriceLessThanOriginalPrice",
-          "Promo price must be lower than original price"
+          "form.promoPriceLessThanUnitPrice",
+          "Promo price must be lower than unit price"
         ),
       });
       return;
     }
-    const success = await onSubmit({
-      promo_rule_id: values.promo_rule_id,
-      items: [
-        {
-          subscribe_id: values.subscribe_id,
-          quantity: values.quantity,
-          promo_price: values.promo_price,
-        },
-      ],
-    });
+    const success = await onSubmit(values);
     if (success) setOpen(false);
   }
 
@@ -100,12 +79,7 @@ export default function PriceForm({
       <SheetTrigger asChild>
         <Button
           onClick={() => {
-            form.reset({
-              promo_rule_id: 0,
-              subscribe_id: 0,
-              quantity: 0,
-              promo_price: 0,
-            });
+            form.reset({ rule_id: 0, subscribe_id: 0, promo_price: 0 });
             setOpen(true);
           }}
           size="sm"
@@ -125,7 +99,7 @@ export default function PriceForm({
           >
             <FormField
               control={form.control}
-              name="promo_rule_id"
+              name="rule_id"
               render={({ field }) => (
                 <FormItem>
                   <FormLabel>{t("rule", "Rule")}</FormLabel>
@@ -152,14 +126,7 @@ export default function PriceForm({
                   <FormLabel>{t("subscribe", "Subscribe")}</FormLabel>
                   <FormControl>
                     <Combobox<number>
-                      onChange={(value) => {
-                        field.onChange(value);
-                        form.setValue("quantity", 0, {
-                          shouldDirty: true,
-                          shouldValidate: true,
-                        });
-                        form.clearErrors(["quantity", "promo_price"]);
-                      }}
+                      onChange={field.onChange}
                       options={subscribes
                         .filter((item) => typeof item.id === "number")
                         .map((item) => ({
@@ -177,41 +144,6 @@ export default function PriceForm({
                 </FormItem>
               )}
             />
-            <FormField
-              control={form.control}
-              name="quantity"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>{t("quantity", "Quantity")}</FormLabel>
-                  <FormControl>
-                    <Combobox<number>
-                      onChange={field.onChange}
-                      options={discounts.map((item) => ({
-                        label: `${item.quantity} x ${t(
-                          subscribe?.unit_time || "Month",
-                          subscribe?.unit_time || "Month"
-                        )}`,
-                        value: item.quantity,
-                      }))}
-                      placeholder={t(
-                        "form.selectQuantity",
-                        "Select discount quantity"
-                      )}
-                      value={field.value}
-                    />
-                  </FormControl>
-                  {hasSelectedSubscribe && !hasDiscounts && (
-                    <p className="text-destructive text-xs">
-                      {t(
-                        "form.noDiscounts",
-                        "This subscribe has no discount quantities and cannot be configured."
-                      )}
-                    </p>
-                  )}
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
             <FormField
               control={form.control}
               name="promo_price"
@@ -233,10 +165,10 @@ export default function PriceForm({
                       value={field.value}
                     />
                   </FormControl>
-                  {originalPrice > 0 && (
+                  {unitPrice > 0 && (
                     <p className="text-muted-foreground text-xs">
-                      {t("originalPriceHint", "Original price")}:{" "}
-                      {formatCurrency(originalPrice)}
+                      {t("unitPriceHint", "Unit price")}:{" "}
+                      {unitConversion("centsToDollars", unitPrice)}
                     </p>
                   )}
                   <FormMessage />
@@ -246,11 +178,7 @@ export default function PriceForm({
           </form>
         </Form>
         <SheetFooter>
-          <Button
-            disabled={loading || (hasSelectedSubscribe && !hasDiscounts)}
-            form="promo-price-form"
-            type="submit"
-          >
+          <Button disabled={loading} form="promo-price-form" type="submit">
             {t("confirm", "Confirm")}
           </Button>
         </SheetFooter>

apps/admin/src/sections/promo/utils.ts

@@ -20,9 +20,3 @@ export function parseOptionalNumber(value?: string) {
 export function getSubscribeUnitPrice(subscribe?: API.SubscribeItem) {
   return typeof subscribe?.unit_price === "number" ? subscribe.unit_price : 0;
 }
-
-export function getSubscribeDiscounts(subscribe?: API.SubscribeItem) {
-  return (subscribe?.discount || []).filter(
-    (item) => typeof item.quantity === "number" && item.quantity > 0
-  );
-}

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

@@ -1,25 +1,34 @@
 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,
@@ -34,12 +43,7 @@ import {
   TabsList,
   TabsTrigger,
 } from "@workspace/ui/components/tabs";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "@workspace/ui/components/tooltip";
+import { Combobox } from "@workspace/ui/composed/combobox";
 // import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
 import {
   ProTable,
@@ -56,8 +60,9 @@ import {
   getUserList,
   updateUserBasicInfo,
 } from "@workspace/ui/services/admin/user";
+import { parseDeviceType } from "@workspace/ui/utils/device";
 import { FilePenLine } from "lucide-react";
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useCallback, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 import { Display } from "@/components/display";
@@ -68,16 +73,18 @@ 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);
@@ -91,14 +98,6 @@ 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();
@@ -152,6 +151,7 @@ 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,8 +176,6 @@ 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")}
@@ -264,43 +262,62 @@ export default function User() {
           id: "auth_methods",
           accessorKey: "auth_methods",
           header: "设备码/邮箱",
-          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;
+          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;
 
-                      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",
@@ -338,48 +355,6 @@ 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",
@@ -548,25 +523,6 @@ 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,
@@ -595,16 +551,92 @@ function DeviceGroupSheet({
   );
 }
 
-function PreviewNodesDialog({
-  userId,
-  open,
-  onOpenChange,
+function UserSearchBar({
+  initialType,
+  initialValue,
+  onSearch,
+  subscribes,
 }: {
-  userId: number;
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
+  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);
+
+  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],
@@ -615,7 +647,10 @@ function PreviewNodesDialog({
   });
 
   return (
-    <Dialog onOpenChange={onOpenChange} open={open}>
+    <Dialog onOpenChange={setOpen} 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,7 +16,6 @@ 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";
 
@@ -230,13 +229,26 @@ 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

@@ -1,101 +0,0 @@
-/**
- * @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

@@ -1,66 +0,0 @@
-"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

@@ -1,92 +0,0 @@
-/**
- * @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

@@ -1,102 +0,0 @@
-"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/admin/src/sections/user/user-subscription/index.tsx

@@ -30,34 +30,13 @@ import { Display } from "@/components/display";
 import { useGlobalStore } from "@/stores/global";
 import { formatDate } from "@/utils/common";
 import { SubscriptionDetail } from "./subscription-detail";
-import {
-  SubscriptionForm,
-  type SubscriptionFormValues,
-} from "./subscription-form";
+import { SubscriptionForm } from "./subscription-form";
 
 interface SharedInfo {
   ownerUserId: number;
   familyId: number;
 }
 
-function toUserSubscribePayload(values: SubscriptionFormValues) {
-  return {
-    ...values,
-    expired_at: values.expired_at || 0,
-    subscribe_id: values.subscribe_id || 0,
-    traffic: values.traffic || 0,
-    upload: values.upload || 0,
-    download: values.download || 0,
-    speed_limit: values.speed_limit || 0,
-    device_limit: values.device_limit || 0,
-    traffic_limit: values.traffic_limit || [],
-  };
-}
-
-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);
@@ -187,7 +166,7 @@ export default function UserSubscription({ userId }: { userId: number }) {
                       await updateUserSubscribe({
                         user_id: Number(userId),
                         user_subscribe_id: row.id,
-                        ...toUserSubscribePayload(values),
+                        ...values,
                       });
                       toast.success(t("updateSuccess", "Updated successfully"));
                       ref.current?.refresh();
@@ -299,6 +278,17 @@ export default function UserSubscription({ userId }: { userId: number }) {
               />
             ),
           },
+          {
+            accessorKey: "traffic_limit",
+            header: t("userTrafficLimit", "User Traffic Limit"),
+            cell: ({ row }) => (
+              <Display
+                type="traffic"
+                unlimited
+                value={row.original.traffic_limit}
+              />
+            ),
+          },
           {
             id: "remaining_traffic",
             header: t("remainingTraffic", "Remaining Traffic"),
@@ -317,41 +307,10 @@ export default function UserSubscription({ userId }: { userId: number }) {
             accessorKey: "speed_limit",
             header: t("speedLimit", "Speed Limit"),
             cell: ({ row }) => {
-              const userSpeed = row.original.speed_limit ?? 0;
-              const effectiveSpeed = row.original.effective_speed ?? 0;
-              const planSpeed = resolvePlanSpeed(row.original);
-              const speed = effectiveSpeed || userSpeed || planSpeed;
-              const source = row.original.is_throttled
-                ? t("effectiveSpeed", "Effective Speed")
-                : userSpeed > 0
-                  ? t("userOverride", "User Override")
-                  : t("subscriptionDefault", "Subscription Default");
-
-              return (
-                <div className="flex flex-col gap-1">
-                  <div className="flex items-center gap-2">
-                    <Display type="trafficSpeed" value={speed} />
-                    {row.original.is_throttled && (
-                      <Badge variant="destructive">
-                        {t("throttled", "Throttled")}
-                      </Badge>
-                    )}
-                  </div>
-                  <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>
-              );
+              const speed =
+                row.original.speed_limit ||
+                row.original?.subscribe?.speed_limit;
+              return <Display type="trafficSpeed" unlimited value={speed} />;
             },
           },
           {
@@ -408,7 +367,7 @@ export default function UserSubscription({ userId }: { userId: number }) {
                 setLoading(true);
                 await createUserSubscribe({
                   user_id: Number(userId),
-                  ...toUserSubscribePayload(values),
+                  ...values,
                 });
                 toast.success(t("createSuccess", "Created successfully"));
                 ref.current?.refresh();

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

@@ -7,7 +7,6 @@ import {
   SheetTitle,
   SheetTrigger,
 } from "@workspace/ui/components/sheet";
-import { Skeleton } from "@workspace/ui/components/skeleton";
 import { Switch } from "@workspace/ui/components/switch";
 import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
 import { ProTable } from "@workspace/ui/composed/pro-table/pro-table";
@@ -17,91 +16,41 @@ import {
   kickOfflineByUserDevice,
 } from "@workspace/ui/services/admin/user";
 import { deviceIdToHash } from "@workspace/ui/utils/device";
-import { AlertCircle, AlertTriangle, Gauge } from "lucide-react";
+import { AlertTriangle, Gauge } from "lucide-react";
 import { type ReactNode, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
+import { Display } from "@/components/display";
 import { IpLink } from "@/components/ip-link";
 import { formatDate } from "@/utils/common";
 
 function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
   const { t } = useTranslation("user");
   const [detail, setDetail] = useState<API.UserSubscribeDetail | null>(null);
-  const [isLoading, setIsLoading] = useState(false);
-  const [isError, setIsError] = useState(false);
 
   useEffect(() => {
-    let ignore = false;
-
-    setIsLoading(true);
-    setIsError(false);
-    getUserSubscribeById({ id: subscriptionId })
-      .then(({ data }) => {
-        if (!ignore) setDetail(data.data || null);
-      })
-      .catch(() => {
-        if (!ignore) {
-          setDetail(null);
-          setIsError(true);
-        }
-      })
-      .finally(() => {
-        if (!ignore) setIsLoading(false);
-      });
-
-    return () => {
-      ignore = true;
-    };
+    getUserSubscribeById({ id: subscriptionId }).then(({ data }) => {
+      if (data.data) setDetail(data.data);
+    });
   }, [subscriptionId]);
 
-  if (isLoading) {
-    return (
-      <div className="mb-4 rounded-lg border bg-muted/30 p-3">
-        <Skeleton className="mb-3 h-5 w-40" />
-        <div className="grid grid-cols-2 gap-3">
-          <Skeleton className="h-16" />
-          <Skeleton className="h-16" />
-        </div>
-      </div>
-    );
-  }
+  if (!detail || detail.status !== 1) return null;
 
-  if (isError) {
-    return (
-      <div className="mb-4 flex items-start gap-3 rounded-lg border border-destructive/40 bg-destructive/5 p-3 text-destructive text-sm">
-        <AlertCircle className="mt-0.5 h-4 w-4 shrink-0" />
-        <span>
-          {t("subscriptionDetailLoadFailed", "Failed to load speed settings.")}
-        </span>
-      </div>
-    );
-  }
-
-  if (!detail) {
-    return (
-      <div className="mb-4 rounded-lg border bg-muted/30 p-3 text-muted-foreground text-sm">
-        {t("subscriptionDetailEmpty", "No subscription details found.")}
-      </div>
-    );
-  }
-
-  if (detail.status !== 1) return null;
-
-  const baseSpeed =
-    detail.plan_speed_limit ?? detail.subscribe?.speed_limit ?? 0;
+  const baseSpeed = detail.subscribe?.speed_limit ?? 0;
   const userSpeed = detail.speed_limit ?? 0;
+  const userTraffic = detail.traffic_limit ?? 0;
+  const userDeviceLimit = detail.device_limit ?? 0;
   const effectiveSpeed = detail.effective_speed ?? 0;
   const isThrottled = detail.is_throttled;
-  const rules = detail.user_traffic_limit || detail.traffic_limit || [];
-  const hasLimitConfig =
-    baseSpeed > 0 || userSpeed > 0 || effectiveSpeed > 0 || rules.length > 0;
 
-  if (!(hasLimitConfig || isThrottled)) {
-    return (
-      <div className="mb-4 rounded-lg border bg-muted/30 p-3 text-muted-foreground text-sm">
-        {t("speedLimitEmpty", "No user-level speed limit rules configured.")}
-      </div>
-    );
+  if (
+    baseSpeed === 0 &&
+    userSpeed === 0 &&
+    userTraffic === 0 &&
+    userDeviceLimit === 0 &&
+    !isThrottled
+  ) {
+    return null;
   }
 
   return (
@@ -117,7 +66,7 @@ function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
       ) : (
         <Gauge className="mt-0.5 h-4 w-4 shrink-0 text-muted-foreground" />
       )}
-      <div className="min-w-0 flex-1 space-y-3">
+      <div className="space-y-1">
         <div className="flex flex-wrap items-center gap-2 font-medium">
           {isThrottled ? (
             <>
@@ -127,7 +76,6 @@ function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
               </Badge>
               {baseSpeed > 0 && (
                 <span className="text-muted-foreground text-xs line-through">
-                  {t("subscriptionDefault", "Subscription Default")}:{" "}
                   {baseSpeed} Mbps
                 </span>
               )}
@@ -145,20 +93,6 @@ function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
             </>
           )}
         </div>
-        <div className="grid gap-2 sm:grid-cols-3">
-          <SpeedMetric
-            label={t("subscriptionDefault", "Subscription Default")}
-            value={baseSpeed}
-          />
-          <SpeedMetric
-            label={t("userOverride", "User Override")}
-            value={userSpeed}
-          />
-          <SpeedMetric
-            label={t("effectiveSpeed", "Effective Speed")}
-            value={effectiveSpeed}
-          />
-        </div>
         {isThrottled && detail.throttle_rule && (
           <p className="text-muted-foreground text-xs">
             {detail.throttle_rule}
@@ -170,51 +104,39 @@ function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
             {formatDate(detail.throttle_end)}
           </p>
         )}
-        {rules.length > 0 && (
-          <div className="space-y-2">
-            <p className="font-medium text-foreground text-xs">
-              {t("trafficLimitRules", "Traffic Limit Rules")}
-            </p>
-            <div className="grid gap-2">
-              {rules.map((rule, index) => (
-                <div
-                  className="rounded-md border bg-background/60 px-3 py-2 text-muted-foreground text-xs"
-                  key={`${rule.stat_type}-${rule.stat_value}-${index}`}
-                >
-                  {t("trafficLimitRuleSummary", {
-                    defaultValue:
-                      "{{traffic}} GB in {{value}} {{type}} -> {{speed}} Mbps",
-                    traffic: rule.traffic_usage,
-                    value: rule.stat_value,
-                    type:
-                      rule.stat_type === "hour"
-                        ? t("hour", "Hour")
-                        : t("day", "Day"),
-                    speed: rule.speed_limit,
-                  })}
-                </div>
-              ))}
+        {(userSpeed > 0 || userTraffic > 0 || userDeviceLimit > 0) && (
+          <dl className="grid gap-2 pt-2 text-xs sm:grid-cols-3">
+            <div>
+              <dt className="text-muted-foreground">
+                {t("userSpeedLimit", "User Speed Limit")}
+              </dt>
+              <dd className="font-medium">
+                <Display type="trafficSpeed" unlimited value={userSpeed} />
+              </dd>
             </div>
-          </div>
+            <div>
+              <dt className="text-muted-foreground">
+                {t("userTrafficLimit", "User Traffic Limit")}
+              </dt>
+              <dd className="font-medium">
+                <Display type="traffic" unlimited value={userTraffic} />
+              </dd>
+            </div>
+            <div>
+              <dt className="text-muted-foreground">
+                {t("userDeviceLimit", "User Device Limit")}
+              </dt>
+              <dd className="font-medium">
+                <Display type="number" unlimited value={userDeviceLimit} />
+              </dd>
+            </div>
+          </dl>
         )}
       </div>
     </div>
   );
 }
 
-function SpeedMetric({ label, value }: { label: string; value: number }) {
-  const { t } = useTranslation("user");
-
-  return (
-    <div className="rounded-md border bg-background/60 p-2">
-      <div className="text-muted-foreground text-xs">{label}</div>
-      <div className="font-medium text-foreground">
-        {value > 0 ? `${value} Mbps` : t("unlimited", "Unlimited")}
-      </div>
-    </div>
-  );
-}
-
 export function SubscriptionDetail({
   trigger,
   userId,
@@ -273,7 +195,11 @@ export function SubscriptionDetail({
                 accessorKey: "enabled",
                 header: t("enable", "Enable"),
                 cell: ({ row }) => (
-                  <Switch checked={row.getValue("enabled")} disabled />
+                  <Switch
+                    aria-label={t("deviceEnabled", "Device enabled")}
+                    checked={row.getValue("enabled")}
+                    disabled
+                  />
                 ),
               },
               { accessorKey: "id", header: "ID" },

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

@@ -3,7 +3,6 @@ import { Button } from "@workspace/ui/components/button";
 import {
   Form,
   FormControl,
-  FormDescription,
   FormField,
   FormItem,
   FormLabel,
@@ -20,11 +19,10 @@ import {
 } from "@workspace/ui/components/sheet";
 import { Combobox } from "@workspace/ui/composed/combobox";
 import { DatePicker } from "@workspace/ui/composed/date-picker";
-import { ArrayInput } from "@workspace/ui/composed/dynamic-inputs";
 import { EnhancedInput } from "@workspace/ui/composed/enhanced-input";
 import { Icon } from "@workspace/ui/composed/icon";
 import { unitConversion } from "@workspace/ui/utils/unit-conversions";
-import { type KeyboardEvent, type ReactNode, useState } from "react";
+import { type ReactNode, useState } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { z } from "zod";
@@ -38,54 +36,19 @@ interface Props {
   onSubmit: (values: SubscriptionFormValues) => Promise<boolean>;
 }
 
-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,
-  traffic_usage: 0,
-  speed_limit: 0,
-};
-
 const formSchema = z.object({
-  subscribe_id: z.number().optional(),
-  traffic: z.number().min(0).optional(),
-  speed_limit: z.number().min(0).optional(),
-  device_limit: z.number().min(0).optional(),
-  expired_at: z.number().nullish().optional(),
-  upload: z.number().min(0).optional(),
-  download: z.number().min(0).optional(),
+  subscribe_id: z.number().default(0),
+  traffic: z.number().default(0),
+  speed_limit: z.number().optional(),
+  traffic_limit: z.number().optional(),
+  device_limit: z.number().optional(),
+  expired_at: z.number().default(0),
+  upload: z.number().default(0),
+  download: z.number().default(0),
   id: z.number().optional(),
-  traffic_limit: z
-    .array(
-      z.object({
-        stat_type: z.string(),
-        stat_value: z.number().int().min(1),
-        traffic_usage: z.number().min(0),
-        speed_limit: z.number().min(0),
-      })
-    )
-    .optional(),
 });
 
-type SubscriptionFormValues = z.infer<typeof formSchema>;
-
-export type { SubscriptionFormValues };
-
-const normalizeLimitRule = (
-  item: SubscriptionTrafficLimitRule
-): SubscriptionTrafficLimitRule => ({
-  stat_type: item.stat_type || "day",
-  stat_value: Math.max(1, Math.floor(Number(item.stat_value) || 1)),
-  traffic_usage: Math.max(0, Number(item.traffic_usage) || 0),
-  speed_limit: Math.max(0, Number(item.speed_limit) || 0),
-});
+export type SubscriptionFormValues = z.infer<typeof formSchema>;
 
 export function SubscriptionForm({
   trigger,
@@ -97,14 +60,14 @@ export function SubscriptionForm({
   const { t } = useTranslation("user");
   const [open, setOpen] = useState(false);
 
-  const form = useForm<SubscriptionFormValues>({
+  const form = useForm({
     resolver: zodResolver(formSchema),
     defaultValues: {
       subscribe_id: initialData?.subscribe_id || 0,
       traffic: initialData?.traffic || 0,
+      traffic_limit: initialData?.traffic_limit || 0,
       speed_limit: initialData?.speed_limit || 0,
       device_limit: initialData?.device_limit || 0,
-      traffic_limit: getUserTrafficLimitRules(initialData),
       upload: initialData?.upload || 0,
       download: initialData?.download || 0,
       expired_at: initialData?.expire_time || 0,
@@ -178,7 +141,6 @@ export function SubscriptionForm({
                       </FormLabel>
                       <FormControl>
                         <EnhancedInput
-                          min={0}
                           placeholder={t("unlimited", "Unlimited")}
                           type="number"
                           {...field}
@@ -198,16 +160,52 @@ export function SubscriptionForm({
                     </FormItem>
                   )}
                 />
+                <FormField
+                  control={form.control}
+                  name="traffic_limit"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>
+                        {t("userTrafficLimit", "User Traffic Limit")}
+                      </FormLabel>
+                      <FormControl>
+                        <EnhancedInput
+                          placeholder={t(
+                            "followSubscription",
+                            "Follow Subscription"
+                          )}
+                          type="number"
+                          {...field}
+                          formatInput={(value) =>
+                            unitConversion("bytesToGb", value)
+                          }
+                          formatOutput={(value) =>
+                            unitConversion("gbToBytes", value)
+                          }
+                          onValueChange={(value) => {
+                            form.setValue(field.name, value as number);
+                          }}
+                          suffix="GB"
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
                 <FormField
                   control={form.control}
                   name="speed_limit"
                   render={({ field }) => (
                     <FormItem>
-                      <FormLabel>{t("speedLimit", "Speed Limit")}</FormLabel>
+                      <FormLabel>
+                        {t("userSpeedLimit", "User Speed Limit")}
+                      </FormLabel>
                       <FormControl>
                         <EnhancedInput
-                          min={0}
-                          placeholder={t("unlimited", "Unlimited")}
+                          placeholder={t(
+                            "followSubscription",
+                            "Follow Subscription"
+                          )}
                           type="number"
                           {...field}
                           onValueChange={(value) => {
@@ -216,12 +214,6 @@ export function SubscriptionForm({
                           suffix="Mbps"
                         />
                       </FormControl>
-                      <FormDescription>
-                        {t(
-                          "userSpeedLimitDescription",
-                          "Set to 0 to use the subscription default speed limit."
-                        )}
-                      </FormDescription>
                       <FormMessage />
                     </FormItem>
                   )}
@@ -231,12 +223,15 @@ export function SubscriptionForm({
                   name="device_limit"
                   render={({ field }) => (
                     <FormItem>
-                      <FormLabel>{t("deviceLimit", "Device Limit")}</FormLabel>
+                      <FormLabel>
+                        {t("userDeviceLimit", "User Device Limit")}
+                      </FormLabel>
                       <FormControl>
                         <EnhancedInput
-                          min={0}
-                          placeholder={t("unlimited", "Unlimited")}
-                          step={1}
+                          placeholder={t(
+                            "followSubscription",
+                            "Follow Subscription"
+                          )}
                           type="number"
                           {...field}
                           onValueChange={(value) => {
@@ -258,7 +253,6 @@ export function SubscriptionForm({
                       </FormLabel>
                       <FormControl>
                         <EnhancedInput
-                          min={0}
                           placeholder="0"
                           type="number"
                           {...field}
@@ -288,7 +282,6 @@ export function SubscriptionForm({
                       </FormLabel>
                       <FormControl>
                         <EnhancedInput
-                          min={0}
                           placeholder="0"
                           type="number"
                           {...field}
@@ -308,119 +301,6 @@ export function SubscriptionForm({
                     </FormItem>
                   )}
                 />
-                <FormField
-                  control={form.control}
-                  name="traffic_limit"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>
-                        {t("trafficLimitRules", "Traffic Limit Rules")}
-                      </FormLabel>
-                      <FormControl>
-                        <ArrayInput<SubscriptionTrafficLimitRule>
-                          className="grid grid-cols-2 gap-3 lg:grid-cols-4"
-                          fields={[
-                            {
-                              name: "stat_type",
-                              type: "select",
-                              placeholder: t("statType", "Statistics Type"),
-                              value: "day",
-                              options: [
-                                {
-                                  label: t("statTypeHour", "Hour"),
-                                  value: "hour",
-                                },
-                                {
-                                  label: t("statTypeDay", "Day"),
-                                  value: "day",
-                                },
-                              ],
-                            },
-                            {
-                              name: "stat_value",
-                              type: "number",
-                              placeholder: t("statValue", "Time Value"),
-                              min: 1,
-                              step: 1,
-                              onKeyDown: (
-                                e: KeyboardEvent<HTMLInputElement>
-                              ) => {
-                                if (e.key === "." || e.key === ",") {
-                                  e.preventDefault();
-                                }
-                              },
-                              formatOutput: (value: string | number) => {
-                                const num = Number(value);
-                                return String(
-                                  Number.isNaN(num) ? 1 : Math.floor(num)
-                                );
-                              },
-                            },
-                            {
-                              name: "traffic_usage",
-                              type: "number",
-                              placeholder: t(
-                                "trafficUsage",
-                                "Traffic Usage (GB)"
-                              ),
-                              min: 0,
-                              onKeyDown: (
-                                e: KeyboardEvent<HTMLInputElement>
-                              ) => {
-                                if (e.key === "." || e.key === ",") {
-                                  e.preventDefault();
-                                }
-                              },
-                              formatOutput: (value: string | number) => {
-                                const num = Number(value);
-                                return String(
-                                  Number.isNaN(num) ? 0 : Math.floor(num)
-                                );
-                              },
-                            },
-                            {
-                              name: "speed_limit",
-                              type: "number",
-                              placeholder: t(
-                                "speedLimitMbps",
-                                "Speed Limit (Mbps)"
-                              ),
-                              min: 0,
-                              onKeyDown: (
-                                e: KeyboardEvent<HTMLInputElement>
-                              ) => {
-                                if (e.key === "." || e.key === ",") {
-                                  e.preventDefault();
-                                }
-                              },
-                              formatOutput: (value: string | number) => {
-                                const num = Number(value);
-                                return String(
-                                  Number.isNaN(num) ? 0 : Math.floor(num)
-                                );
-                              },
-                            },
-                          ]}
-                          onChange={(items) => {
-                            field.onChange(items.map(normalizeLimitRule));
-                          }}
-                          value={
-                            field.value && field.value.length > 0
-                              ? field.value
-                              : [defaultLimitRule]
-                          }
-                        />
-                      </FormControl>
-                      <FormDescription>
-                        {t(
-                          "trafficLimitDescription",
-                          "Limit speed when usage reaches the configured amount in the selected time window."
-                        )}
-                      </FormDescription>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
                 <FormField
                   control={form.control}
                   name="expired_at"

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

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

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

@@ -9,7 +9,6 @@
     "originalPrice": "Original Price (Monthly)",
     "price": "Price",
     "productDiscount": "Product Discount",
-    "promoDiscount": "Promo Discount",
     "total": "Total"
   },
   "buy": "Buy",
@@ -38,10 +37,6 @@
   "passwordHint": "If you do not enter a password, we will automatically generate one and send it to your email.",
   "paymentMethod": "Payment Method",
   "productDescription": "productDescription",
-  "promo": {
-    "available": "Promo Available",
-    "validUntil": "Valid until"
-  },
   "purchaseDuration": "Purchase Duration",
   "recharge": "Recharge",
   "rechargeAmount": "Recharge Amount",

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

@@ -9,7 +9,6 @@
     "originalPrice": "原价（按月）",
     "price": "价格",
     "productDiscount": "商品折扣",
-    "promoDiscount": "促销优惠",
     "total": "总价"
   },
   "buy": "购买",
@@ -38,10 +37,6 @@
   "passwordHint": "如果您不输入密码，我们将自动生成一个并发送到您的邮箱。",
   "paymentMethod": "支付方式",
   "productDescription": "商品描述",
-  "promo": {
-    "available": "促销可用",
-    "validUntil": "有效期至"
-  },
   "purchaseDuration": "购买时长",
   "recharge": "充值",
   "rechargeAmount": "充值金额",

apps/user/src/sections/purchasing/content.tsx

@@ -17,7 +17,6 @@ import CouponInput from "@/sections/subscribe/coupon-input";
 import { SubscribeDetail } from "@/sections/subscribe/detail";
 import DurationSelector from "@/sections/subscribe/duration-selector";
 import PaymentMethods from "@/sections/subscribe/payment-methods";
-import { PromoInfo } from "@/sections/subscribe/promo-info";
 import { useGlobalStore } from "@/stores/global";
 
 export default function Content({
@@ -50,9 +49,6 @@ export default function Content({
     valid: false,
     message: "",
   });
-  const selectedDiscount = subscription?.discount?.find(
-    (item) => item.quantity === params.quantity
-  );
 
   const { data: order } = useQuery({
     enabled: !!subscription?.id && !!params.payment,
@@ -107,10 +103,7 @@ export default function Content({
           navigate({ to: "/purchasing/order", search: { order_no } });
         }
       } catch (error) {
-        setIsEmailValid((prev) => ({
-          ...prev,
-          message: error instanceof Error ? error.message : prev.message,
-        }));
+        console.log(error);
       }
     });
   }, [params, navigate]);
@@ -292,7 +285,6 @@ export default function Content({
                 show_original_price: subscription?.show_original_price,
               }}
             />
-            <PromoInfo discount={selectedDiscount} />
           </CardContent>
         </Card>
       </div>

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

@@ -10,7 +10,6 @@ interface SubscribeBillingProps {
       unit_price: number;
       unit_time: string;
       subscribe_discount: number;
-      promo_discount: number;
       show_original_price?: boolean;
     }
   >;
@@ -67,14 +66,6 @@ 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

@@ -1,33 +0,0 @@
-import { Badge } from "@workspace/ui/components/badge";
-import { useTranslation } from "react-i18next";
-import { Display } from "@/components/display";
-
-interface PromoInfoProps {
-  discount?: API.SubscribeDiscount;
-}
-
-export function PromoInfo({ discount }: Readonly<PromoInfoProps>) {
-  const { t } = useTranslation("subscribe");
-  const promo = discount?.promo;
-
-  if (!promo) return null;
-
-  return (
-    <div className="flex flex-wrap items-center justify-between gap-2 rounded-md border bg-muted/40 p-3 text-sm">
-      <div className="grid gap-1">
-        <span className="font-medium">
-          {promo.rule_name || t("promo.available", "Promo Available")}
-        </span>
-        {promo.expires_at && (
-          <span className="text-muted-foreground text-xs">
-            {t("promo.validUntil", "Valid until")}:{" "}
-            {new Date(promo.expires_at * 1000).toLocaleString()}
-          </span>
-        )}
-      </div>
-      <Badge variant="secondary">
-        <Display type="currency" value={promo.promo_price} />
-      </Badge>
-    </div>
-  );
-}

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

@@ -18,7 +18,6 @@ import { useTranslation } from "react-i18next";
 import CouponInput from "@/sections/subscribe/coupon-input";
 import DurationSelector from "@/sections/subscribe/duration-selector";
 import PaymentMethods from "@/sections/subscribe/payment-methods";
-import { PromoInfo } from "@/sections/subscribe/promo-info";
 import { useGlobalStore } from "@/stores/global";
 import { SubscribeBilling } from "./billing";
 import { SubscribeDetail } from "./detail";
@@ -42,12 +41,7 @@ export default function Purchase({
     coupon: "",
   });
   const [loading, startTransition] = useTransition();
-  const lastSuccessOrderRef = useRef<API.PreOrderResponse | undefined>(
-    undefined
-  );
-  const selectedDiscount = subscribe?.discount?.find(
-    (item) => item.quantity === params.quantity
-  );
+  const lastSuccessOrderRef = useRef<any>(null);
 
   const { data: order } = useQuery({
     enabled: !!subscribe?.id,
@@ -146,7 +140,6 @@ export default function Purchase({
                   show_original_price: subscribe?.show_original_price,
                 }}
               />
-              <PromoInfo discount={selectedDiscount} />
             </CardContent>
           </Card>
           <div className="flex flex-col justify-between text-sm">

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

@@ -63,7 +63,7 @@ import { useGlobalStore } from "@/stores/global";
 const WITHDRAWAL_METHODS = [
   { value: 1, label: "支付宝" },
   { value: 2, label: "微信" },
-  { value: 3, label: "USDT(TRC20)" },
+  { value: 3, label: "银行卡" },
   { value: 0, label: "其他" },
 ] as const;
 
@@ -111,21 +111,13 @@ function QrCodeView({ url }: { url: string }) {
         <img
           alt="收款码"
           className="h-16 w-16 cursor-zoom-in object-cover"
-          height={64}
           src={url}
-          width={64}
         />
       </button>
       {zoomOpen && (
         <Dialog onOpenChange={setZoomOpen} open={zoomOpen}>
           <DialogContent className="max-w-sm">
-            <img
-              alt="收款码"
-              className="w-full"
-              height={320}
-              src={url}
-              width={320}
-            />
+            <img alt="收款码" className="w-full" src={url} />
           </DialogContent>
         </Dialog>
       )}
@@ -161,16 +153,18 @@ const withdrawalFormSchema = z
       if (!data.account) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,
-          message: "USDT(TRC20) 地址为必填",
+          message: "银行卡收款账号为必填",
+          path: ["account"],
+        });
+      }
+    } else if (data.method === 0) {
+      if (!data.account && !data.content) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "收款账号和备注至少填一项",
           path: ["account"],
         });
       }
-    } else if (data.method === 0 && !(data.account || data.content)) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: "收款账号和备注至少填一项",
-        path: ["account"],
-      });
     }
   });
 
@@ -427,7 +421,9 @@ export default function Affiliate() {
                             <FormItem>
                               <FormLabel>
                                 收款码
-                                <span className="ml-1 text-destructive">*</span>
+                                <span className="ml-1 text-destructive">
+                                  *
+                                </span>
                               </FormLabel>
                               {watchedQrCodeUrl ? (
                                 <div className="relative inline-block">
@@ -450,9 +446,7 @@ export default function Affiliate() {
                                   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收款码"}
+                                    {qrUploading ? "上传中..." : "点击上传\n收款码"}
                                   </div>
                                 </UploadImage>
                               )}
@@ -480,7 +474,7 @@ export default function Affiliate() {
                                 <Input
                                   placeholder={
                                     watchedMethod === 3
-                                      ? "请输入 USDT(TRC20) 收款地址"
+                                      ? "请输入银行卡号或账户信息"
                                       : "请输入收款账号（与备注至少填一项）"
                                   }
                                   {...field}
@@ -525,7 +519,9 @@ export default function Affiliate() {
                     </Button>
                     <Button
                       disabled={
-                        submitting || qrUploading || availableCommission <= 0
+                        submitting ||
+                        qrUploading ||
+                        availableCommission <= 0
                       }
                       form="withdrawal-form"
                       type="submit"

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

@@ -307,34 +307,27 @@ declare namespace API {
 
   type PromoPrice = {
     id: number;
-    promo_rule_id: number;
+    rule_id: number;
     subscribe_id: number;
     subscribe_name?: string;
-    quantity: number;
     unit_price: number;
     promo_price: number;
     created_at?: number;
     updated_at?: number;
   };
 
-  type CreatePromoPriceItem = {
-    subscribe_id: number;
-    quantity: number;
-    promo_price: number;
-  };
-
   type CreatePromoPriceRequest = {
-    promo_rule_id: number;
-    items: CreatePromoPriceItem[];
+    rule_id: number;
+    subscribe_id: number;
+    promo_price: number;
   };
 
   type PromoUsage = {
     id: number;
-    promo_rule_id: number;
+    rule_id: number;
     rule_name?: string;
     subscribe_id: number;
     subscribe_name?: string;
-    quantity: number;
     user_id: number;
     order_no: string;
     unit_price: number;
@@ -469,8 +462,10 @@ declare namespace API {
     traffic: number;
     subscribe_id: number;
     speed_limit?: number;
+    traffic_limit?: number;
     device_limit?: number;
-    traffic_limit?: UserSubscribeTrafficLimitRule[];
+    upload?: number;
+    download?: number;
   };
 
   type CurrencyConfig = {
@@ -1027,7 +1022,7 @@ declare namespace API {
   type GetPromoPriceListParams = {
     page: number;
     size: number;
-    promo_rule_id?: number;
+    rule_id?: number;
     subscribe_id?: number;
   };
 
@@ -1043,7 +1038,7 @@ declare namespace API {
   type GetPromoUsageListParams = {
     page: number;
     size: number;
-    promo_rule_id?: number;
+    rule_id?: number;
     subscribe_id?: number;
     user_id?: number;
     order_no?: string;
@@ -2226,13 +2221,6 @@ declare namespace API {
     quantity: number;
     discount: number;
     map_apple?: string;
-    promo?: SubscribeDiscountPromo;
-  };
-
-  type SubscribeDiscountPromo = {
-    rule_name?: string;
-    promo_price: number;
-    end_time?: number;
   };
 
   type SubscribeGroup = {
@@ -2571,8 +2559,8 @@ declare namespace API {
     upload: number;
     download: number;
     speed_limit?: number;
+    traffic_limit?: number;
     device_limit?: number;
-    traffic_limit?: UserSubscribeTrafficLimitRule[];
   };
 
   type User = {
@@ -2661,16 +2649,11 @@ declare namespace API {
     finished_at: number;
     reset_time: number;
     traffic: number;
+    traffic_limit?: number;
+    speed_limit?: number;
+    device_limit?: number;
     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;
@@ -2680,13 +2663,6 @@ declare namespace API {
     updated_at: number;
   };
 
-  type UserSubscribeTrafficLimitRule = {
-    stat_type: string;
-    stat_value: number;
-    traffic_usage: number;
-    speed_limit: number;
-  };
-
   type UserSubscribeDetail = {
     id: number;
     user_id: number;
@@ -2698,13 +2674,11 @@ declare namespace API {
     expire_time: number;
     reset_time: number;
     traffic: number;
+    traffic_limit?: number;
+    speed_limit?: number;
+    device_limit?: number;
     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;

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

@@ -910,13 +910,6 @@ declare namespace API {
     quantity: number;
     discount: number;
     map_apple?: string;
-    promo?: SubscribeDiscountPromo;
-  };
-
-  type SubscribeDiscountPromo = {
-    rule_name?: string;
-    promo_price: number;
-    end_time?: number;
   };
 
   type SubscribeGroup = {

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

@@ -548,7 +548,6 @@ declare namespace API {
     price: number;
     amount: number;
     discount: number;
-    promo_discount: number;
     gift_amount: number;
     coupon: string;
     coupon_discount: number;
@@ -1020,14 +1019,6 @@ declare namespace API {
     quantity: number;
     discount: number;
     map_apple?: string;
-    promo?: SubscribeDiscountPromo;
-  };
-
-  type SubscribeDiscountPromo = {
-    rule_name?: string;
-    rule_type?: string;
-    promo_price: number;
-    expires_at?: number;
   };
 
   type SubscribeGroup = {