Merge branch 'internal' into main

新增 /dashboard/invite-management 页面，调用 GET /v1/admin/invite/list 接口展示全局邀请关系列表。
包含邀请人/被邀请人信息、状态、佣金、赠送天数等列，支持关键词和 ID 筛选、分页。
附带修复提现页收款码图片缺少 width/height 的 lint 问题。

.github/workflows/auto-merge.yml

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

.github/workflows/pr-check.yml

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

.github/workflows/release.yml

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

apps/admin/public/assets/locales/en-US/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/invite.json

@@ -0,0 +1,23 @@
+{
+  "commission": "Commission",
+  "days": "{{count}} days",
+  "disabled": "Disabled",
+  "empty": "No invite records",
+  "enabled": "Enabled",
+  "hasPurchased": "Purchased",
+  "invitee": "Invitee",
+  "inviteeGiftDays": "Invitee Gift Days",
+  "inviteeId": "Invitee ID",
+  "invitedAt": "Invited At",
+  "inviter": "Inviter",
+  "inviterGiftDays": "Inviter Gift Days",
+  "inviterId": "Inviter ID",
+  "loadErrorDescription": "Refresh the table or try again later.",
+  "loadErrorTitle": "Failed to load invites",
+  "no": "No",
+  "orderCount": "Orders",
+  "searchPlaceholder": "Email or phone",
+  "status": "Status",
+  "title": "Invite Management",
+  "yes": "Yes"
+}

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

@@ -11,6 +11,7 @@
   "Email": "Email",
   "Gift": "Gift",
   "Group Management": "Group Management",
+  "Invite Management": "Invite Management",
   "Login": "Login",
   "Logs & Analytics": "Logs & Analytics",
   "Maintenance": "Maintenance",
@@ -20,6 +21,7 @@
   "Order Management": "Order Management",
   "Payment Config": "Payment Config",
   "Product Management": "Product Management",
+  "Promo Management": "Promo Management",
   "Redemption Management": "Redemption Management",
   "Register": "Register",
   "Reset Subscribe": "Reset Subscribe",

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

@@ -0,0 +1,70 @@
+{
+  "cancel": "Cancel",
+  "confirm": "Confirm",
+  "confirmDelete": "Are you sure you want to delete?",
+  "createPrice": "Create Promo Price",
+  "createRule": "Create Rule",
+  "createSuccess": "Create Success",
+  "delete": "Delete",
+  "deleteSuccess": "Delete Success",
+  "deleteWarning": "Once deleted, data cannot be recovered. Please proceed with caution.",
+  "detail": "Detail",
+  "edit": "Edit",
+  "editRule": "Edit Rule",
+  "emptyPrices": "No promo prices",
+  "emptyRules": "No promo rules",
+  "emptyUsage": "No promo usage records",
+  "enabled": "Enabled",
+  "endTime": "End Time",
+  "form": {
+    "enterPromoPrice": "Enter price",
+    "inactiveMonths": "Inactive Months",
+    "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",
+    "windowHoursPlaceholder": "Hours after registration"
+  },
+  "loadErrorDescription": "Refresh the table or try again later.",
+  "loadPricesError": "Failed to load promo prices",
+  "loadRulesError": "Failed to load promo rules",
+  "loadUsageError": "Failed to load promo usage",
+  "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",
+  "searchRule": "Rule name",
+  "startTime": "Start Time",
+  "subscribe": "Subscribe",
+  "type": "Type",
+  "types": {
+    "campaign": "Campaign",
+    "inactive_user": "Inactive User",
+    "new_user": "New User"
+  },
+  "unitPrice": "Unit Price",
+  "unitPriceHint": "Unit price",
+  "updateSuccess": "Update Success",
+  "usage": "Usage",
+  "usedAt": "Used At",
+  "userId": "User ID",
+  "validityPeriod": "Validity Period",
+  "yes": "Yes"
+}

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/invite.json

@@ -0,0 +1,23 @@
+{
+  "commission": "佣金",
+  "days": "{{count}} 天",
+  "disabled": "禁用",
+  "empty": "暂无邀请记录",
+  "enabled": "启用",
+  "hasPurchased": "已购买",
+  "invitee": "被邀请人",
+  "inviteeGiftDays": "被邀请人赠送天数",
+  "inviteeId": "被邀请人 ID",
+  "invitedAt": "邀请时间",
+  "inviter": "邀请人",
+  "inviterGiftDays": "邀请人赠送天数",
+  "inviterId": "邀请人 ID",
+  "loadErrorDescription": "刷新表格或稍后重试。",
+  "loadErrorTitle": "邀请记录加载失败",
+  "no": "否",
+  "orderCount": "订单数",
+  "searchPlaceholder": "邮箱/手机号关键词",
+  "status": "状态",
+  "title": "邀请管理",
+  "yes": "是"
+}

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

@@ -11,6 +11,7 @@
   "Email": "邮件",
   "Gift": "赠送",
   "Group Management": "分组管理",
+  "Invite Management": "邀请管理",
   "Login": "登录",
   "Logs & Analytics": "日志与分析",
   "Maintenance": "维护",
@@ -20,6 +21,7 @@
   "Order Management": "订单管理",
   "Payment Config": "支付配置",
   "Product Management": "商品管理",
+  "Promo Management": "促销管理",
   "Redemption Management": "兑换码管理",
   "Register": "注册",
   "Reset Subscribe": "重置订阅",

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

@@ -0,0 +1,70 @@
+{
+  "cancel": "取消",
+  "confirm": "确认",
+  "confirmDelete": "确定要删除吗？",
+  "createPrice": "创建促销价",
+  "createRule": "创建规则",
+  "createSuccess": "创建成功",
+  "delete": "删除",
+  "deleteSuccess": "删除成功",
+  "deleteWarning": "删除后数据无法恢复，请谨慎操作。",
+  "detail": "详情",
+  "edit": "编辑",
+  "editRule": "编辑规则",
+  "emptyPrices": "暂无商品促销价",
+  "emptyRules": "暂无促销规则",
+  "emptyUsage": "暂无促销使用记录",
+  "enabled": "启用",
+  "endTime": "结束时间",
+  "form": {
+    "enterPromoPrice": "输入价格",
+    "inactiveMonths": "未活跃月数",
+    "inactiveMonthsPlaceholder": "未购买的月数",
+    "name": "名称",
+    "namePlaceholder": "规则名称",
+    "noDiscounts": "该订阅没有 discount 档位，不能配置促销价。",
+    "promoPriceLessThanOriginalPrice": "促销价必须低于原价",
+    "promoPriceLessThanUnitPrice": "促销价必须低于原价",
+    "selectEndTime": "选择时间",
+    "selectRule": "选择规则",
+    "selectStartTime": "选择时间",
+    "selectQuantity": "选择 discount 档位",
+    "selectSubscribe": "选择订阅",
+    "type": "规则类型",
+    "windowHours": "新用户窗口小时数",
+    "windowHoursPlaceholder": "注册后的小时数"
+  },
+  "loadErrorDescription": "请刷新表格或稍后重试。",
+  "loadPricesError": "促销价加载失败",
+  "loadRulesError": "促销规则加载失败",
+  "loadUsageError": "促销使用记录加载失败",
+  "name": "名称",
+  "no": "否",
+  "orderNo": "订单号",
+  "originalPriceHint": "原价",
+  "params": "参数",
+  "prices": "商品促销价",
+  "priority": "优先级",
+  "promoPrice": "促销价",
+  "quantity": "档位",
+  "rule": "规则",
+  "ruleDetail": "规则详情",
+  "rules": "促销规则",
+  "searchRule": "规则名称",
+  "startTime": "开始时间",
+  "subscribe": "订阅",
+  "type": "类型",
+  "types": {
+    "campaign": "活动",
+    "inactive_user": "回归用户",
+    "new_user": "新用户"
+  },
+  "unitPrice": "原价",
+  "unitPriceHint": "原价",
+  "updateSuccess": "更新成功",
+  "usage": "使用记录",
+  "usedAt": "使用时间",
+  "userId": "用户 ID",
+  "validityPeriod": "有效期",
+  "yes": "是"
+}

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/layout/navs.ts

@@ -49,6 +49,11 @@ export function useNavs() {
             url: "/dashboard/product",
             icon: "flat-color-icons:shop",
           },
+          {
+            title: t("Promo Management", "Promo Management"),
+            url: "/dashboard/promo",
+            icon: "flat-color-icons:briefcase",
+          },
         ],
       },
 
@@ -98,6 +103,11 @@ export function useNavs() {
             url: "/dashboard/withdrawal",
             icon: "flat-color-icons:money-transfer",
           },
+          {
+            title: t("Invite Management", "Invite Management"),
+            url: "/dashboard/invite-management",
+            icon: "flat-color-icons:add-user",
+          },
           {
             title: t("Device Group", "Device Group"),
             url: "/dashboard/family",

apps/admin/src/main.tsx

@@ -35,12 +35,14 @@ initializeI18n({
     "coupon",
     "dashboard",
     "document",
+    "invite",
     "log",
     "marketing",
     "menu",
     "nodes",
     "order",
     "payment",
+    "promo",
     "product",
     "servers",
     "subscribe",

apps/admin/src/routeTree.gen.ts

@@ -34,6 +34,8 @@ const DashboardSubscribeIndexLazyRouteImport = createFileRoute(
 const DashboardRedemptionIndexLazyRouteImport = createFileRoute(
   '/dashboard/redemption/',
 )()
+const DashboardPromoIndexLazyRouteImport =
+  createFileRoute('/dashboard/promo/')()
 const DashboardProductIndexLazyRouteImport = createFileRoute(
   '/dashboard/product/',
 )()
@@ -45,6 +47,9 @@ const DashboardOrderIndexLazyRouteImport =
 const DashboardMarketingIndexLazyRouteImport = createFileRoute(
   '/dashboard/marketing/',
 )()
+const DashboardInviteManagementIndexLazyRouteImport = createFileRoute(
+  '/dashboard/invite-management/',
+)()
 const DashboardGroupIndexLazyRouteImport =
   createFileRoute('/dashboard/group/')()
 const DashboardFamilyIndexLazyRouteImport =
@@ -138,9 +143,9 @@ const DashboardNodesLazyRoute = DashboardNodesLazyRouteImport.update({
 )
 const DashboardWithdrawalIndexLazyRoute =
   DashboardWithdrawalIndexLazyRouteImport.update({
-    id: '/withdrawal/',
+    id: '/',
-    path: '/withdrawal/',
+    path: '/',
-    getParentRoute: () => DashboardRouteLazyRoute,
+    getParentRoute: () => DashboardWithdrawalLazyRoute,
   } as any).lazy(() =>
     import('./routes/dashboard/withdrawal/index.lazy').then((d) => d.Route),
   )
@@ -183,6 +188,13 @@ const DashboardRedemptionIndexLazyRoute =
   } as any).lazy(() =>
     import('./routes/dashboard/redemption/index.lazy').then((d) => d.Route),
   )
+const DashboardPromoIndexLazyRoute = DashboardPromoIndexLazyRouteImport.update({
+  id: '/promo/',
+  path: '/promo/',
+  getParentRoute: () => DashboardRouteLazyRoute,
+} as any).lazy(() =>
+  import('./routes/dashboard/promo/index.lazy').then((d) => d.Route),
+)
 const DashboardProductIndexLazyRoute =
   DashboardProductIndexLazyRouteImport.update({
     id: '/product/',
@@ -214,6 +226,16 @@ const DashboardMarketingIndexLazyRoute =
   } as any).lazy(() =>
     import('./routes/dashboard/marketing/index.lazy').then((d) => d.Route),
   )
+const DashboardInviteManagementIndexLazyRoute =
+  DashboardInviteManagementIndexLazyRouteImport.update({
+    id: '/invite-management/',
+    path: '/invite-management/',
+    getParentRoute: () => DashboardRouteLazyRoute,
+  } as any).lazy(() =>
+    import('./routes/dashboard/invite-management/index.lazy').then(
+      (d) => d.Route,
+    ),
+  )
 const DashboardGroupIndexLazyRoute = DashboardGroupIndexLazyRouteImport.update({
   id: '/group/',
   path: '/group/',
@@ -367,7 +389,7 @@ export interface FileRoutesByFullPath {
   '/dashboard': typeof DashboardRouteLazyRouteWithChildren
   '/dashboard/nodes': typeof DashboardNodesLazyRoute
   '/dashboard/servers': typeof DashboardServersLazyRoute
-  '/dashboard/withdrawal': typeof DashboardWithdrawalLazyRoute
+  '/dashboard/withdrawal': typeof DashboardWithdrawalLazyRouteWithChildren
   '/dashboard/': typeof DashboardIndexLazyRoute
   '/dashboard/log/balance': typeof DashboardLogBalanceLazyRoute
   '/dashboard/log/commission': typeof DashboardLogCommissionLazyRoute
@@ -388,22 +410,23 @@ export interface FileRoutesByFullPath {
   '/dashboard/document': typeof DashboardDocumentIndexLazyRoute
   '/dashboard/family': typeof DashboardFamilyIndexLazyRoute
   '/dashboard/group': typeof DashboardGroupIndexLazyRoute
+  '/dashboard/invite-management': typeof DashboardInviteManagementIndexLazyRoute
   '/dashboard/marketing': typeof DashboardMarketingIndexLazyRoute
   '/dashboard/order': typeof DashboardOrderIndexLazyRoute
   '/dashboard/payment': typeof DashboardPaymentIndexLazyRoute
   '/dashboard/product': typeof DashboardProductIndexLazyRoute
+  '/dashboard/promo': typeof DashboardPromoIndexLazyRoute
   '/dashboard/redemption': typeof DashboardRedemptionIndexLazyRoute
   '/dashboard/subscribe': typeof DashboardSubscribeIndexLazyRoute
   '/dashboard/system': typeof DashboardSystemIndexLazyRoute
   '/dashboard/ticket': typeof DashboardTicketIndexLazyRoute
   '/dashboard/user': typeof DashboardUserIndexLazyRoute
-  '/dashboard/withdrawal': typeof DashboardWithdrawalIndexLazyRoute
+  '/dashboard/withdrawal/': typeof DashboardWithdrawalIndexLazyRoute
 }
 export interface FileRoutesByTo {
   '/': typeof IndexLazyRoute
   '/dashboard/nodes': typeof DashboardNodesLazyRoute
   '/dashboard/servers': typeof DashboardServersLazyRoute
-  '/dashboard/withdrawal': typeof DashboardWithdrawalLazyRoute
   '/dashboard': typeof DashboardIndexLazyRoute
   '/dashboard/log/balance': typeof DashboardLogBalanceLazyRoute
   '/dashboard/log/commission': typeof DashboardLogCommissionLazyRoute
@@ -424,10 +447,12 @@ export interface FileRoutesByTo {
   '/dashboard/document': typeof DashboardDocumentIndexLazyRoute
   '/dashboard/family': typeof DashboardFamilyIndexLazyRoute
   '/dashboard/group': typeof DashboardGroupIndexLazyRoute
+  '/dashboard/invite-management': typeof DashboardInviteManagementIndexLazyRoute
   '/dashboard/marketing': typeof DashboardMarketingIndexLazyRoute
   '/dashboard/order': typeof DashboardOrderIndexLazyRoute
   '/dashboard/payment': typeof DashboardPaymentIndexLazyRoute
   '/dashboard/product': typeof DashboardProductIndexLazyRoute
+  '/dashboard/promo': typeof DashboardPromoIndexLazyRoute
   '/dashboard/redemption': typeof DashboardRedemptionIndexLazyRoute
   '/dashboard/subscribe': typeof DashboardSubscribeIndexLazyRoute
   '/dashboard/system': typeof DashboardSystemIndexLazyRoute
@@ -441,7 +466,7 @@ export interface FileRoutesById {
   '/dashboard': typeof DashboardRouteLazyRouteWithChildren
   '/dashboard/nodes': typeof DashboardNodesLazyRoute
   '/dashboard/servers': typeof DashboardServersLazyRoute
-  '/dashboard/withdrawal': typeof DashboardWithdrawalLazyRoute
+  '/dashboard/withdrawal': typeof DashboardWithdrawalLazyRouteWithChildren
   '/dashboard/': typeof DashboardIndexLazyRoute
   '/dashboard/log/balance': typeof DashboardLogBalanceLazyRoute
   '/dashboard/log/commission': typeof DashboardLogCommissionLazyRoute
@@ -462,10 +487,12 @@ export interface FileRoutesById {
   '/dashboard/document/': typeof DashboardDocumentIndexLazyRoute
   '/dashboard/family/': typeof DashboardFamilyIndexLazyRoute
   '/dashboard/group/': typeof DashboardGroupIndexLazyRoute
+  '/dashboard/invite-management/': typeof DashboardInviteManagementIndexLazyRoute
   '/dashboard/marketing/': typeof DashboardMarketingIndexLazyRoute
   '/dashboard/order/': typeof DashboardOrderIndexLazyRoute
   '/dashboard/payment/': typeof DashboardPaymentIndexLazyRoute
   '/dashboard/product/': typeof DashboardProductIndexLazyRoute
+  '/dashboard/promo/': typeof DashboardPromoIndexLazyRoute
   '/dashboard/redemption/': typeof DashboardRedemptionIndexLazyRoute
   '/dashboard/subscribe/': typeof DashboardSubscribeIndexLazyRoute
   '/dashboard/system/': typeof DashboardSystemIndexLazyRoute
@@ -501,22 +528,23 @@ export interface FileRouteTypes {
     | '/dashboard/document'
     | '/dashboard/family'
     | '/dashboard/group'
+    | '/dashboard/invite-management'
     | '/dashboard/marketing'
     | '/dashboard/order'
     | '/dashboard/payment'
     | '/dashboard/product'
+    | '/dashboard/promo'
     | '/dashboard/redemption'
     | '/dashboard/subscribe'
     | '/dashboard/system'
     | '/dashboard/ticket'
     | '/dashboard/user'
-    | '/dashboard/withdrawal'
+    | '/dashboard/withdrawal/'
   fileRoutesByTo: FileRoutesByTo
   to:
     | '/'
     | '/dashboard/nodes'
     | '/dashboard/servers'
-    | '/dashboard/withdrawal'
     | '/dashboard'
     | '/dashboard/log/balance'
     | '/dashboard/log/commission'
@@ -537,10 +565,12 @@ export interface FileRouteTypes {
     | '/dashboard/document'
     | '/dashboard/family'
     | '/dashboard/group'
+    | '/dashboard/invite-management'
     | '/dashboard/marketing'
     | '/dashboard/order'
     | '/dashboard/payment'
     | '/dashboard/product'
+    | '/dashboard/promo'
     | '/dashboard/redemption'
     | '/dashboard/subscribe'
     | '/dashboard/system'
@@ -574,10 +604,12 @@ export interface FileRouteTypes {
     | '/dashboard/document/'
     | '/dashboard/family/'
     | '/dashboard/group/'
+    | '/dashboard/invite-management/'
     | '/dashboard/marketing/'
     | '/dashboard/order/'
     | '/dashboard/payment/'
     | '/dashboard/product/'
+    | '/dashboard/promo/'
     | '/dashboard/redemption/'
     | '/dashboard/subscribe/'
     | '/dashboard/system/'
@@ -637,10 +669,10 @@ declare module '@tanstack/react-router' {
     }
     '/dashboard/withdrawal/': {
       id: '/dashboard/withdrawal/'
-      path: '/withdrawal'
+      path: '/'
-      fullPath: '/dashboard/withdrawal'
+      fullPath: '/dashboard/withdrawal/'
       preLoaderRoute: typeof DashboardWithdrawalIndexLazyRouteImport
-      parentRoute: typeof DashboardRouteLazyRoute
+      parentRoute: typeof DashboardWithdrawalLazyRoute
     }
     '/dashboard/user/': {
       id: '/dashboard/user/'
@@ -677,6 +709,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof DashboardRedemptionIndexLazyRouteImport
       parentRoute: typeof DashboardRouteLazyRoute
     }
+    '/dashboard/promo/': {
+      id: '/dashboard/promo/'
+      path: '/promo'
+      fullPath: '/dashboard/promo'
+      preLoaderRoute: typeof DashboardPromoIndexLazyRouteImport
+      parentRoute: typeof DashboardRouteLazyRoute
+    }
     '/dashboard/product/': {
       id: '/dashboard/product/'
       path: '/product'
@@ -705,6 +744,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof DashboardMarketingIndexLazyRouteImport
       parentRoute: typeof DashboardRouteLazyRoute
     }
+    '/dashboard/invite-management/': {
+      id: '/dashboard/invite-management/'
+      path: '/invite-management'
+      fullPath: '/dashboard/invite-management'
+      preLoaderRoute: typeof DashboardInviteManagementIndexLazyRouteImport
+      parentRoute: typeof DashboardRouteLazyRoute
+    }
     '/dashboard/group/': {
       id: '/dashboard/group/'
       path: '/group'
@@ -841,10 +887,24 @@ declare module '@tanstack/react-router' {
   }
 }
 
+interface DashboardWithdrawalLazyRouteChildren {
+  DashboardWithdrawalIndexLazyRoute: typeof DashboardWithdrawalIndexLazyRoute
+}
+
+const DashboardWithdrawalLazyRouteChildren: DashboardWithdrawalLazyRouteChildren =
+  {
+    DashboardWithdrawalIndexLazyRoute: DashboardWithdrawalIndexLazyRoute,
+  }
+
+const DashboardWithdrawalLazyRouteWithChildren =
+  DashboardWithdrawalLazyRoute._addFileChildren(
+    DashboardWithdrawalLazyRouteChildren,
+  )
+
 interface DashboardRouteLazyRouteChildren {
   DashboardNodesLazyRoute: typeof DashboardNodesLazyRoute
   DashboardServersLazyRoute: typeof DashboardServersLazyRoute
-  DashboardWithdrawalLazyRoute: typeof DashboardWithdrawalLazyRoute
+  DashboardWithdrawalLazyRoute: typeof DashboardWithdrawalLazyRouteWithChildren
   DashboardIndexLazyRoute: typeof DashboardIndexLazyRoute
   DashboardLogBalanceLazyRoute: typeof DashboardLogBalanceLazyRoute
   DashboardLogCommissionLazyRoute: typeof DashboardLogCommissionLazyRoute
@@ -865,22 +925,23 @@ interface DashboardRouteLazyRouteChildren {
   DashboardDocumentIndexLazyRoute: typeof DashboardDocumentIndexLazyRoute
   DashboardFamilyIndexLazyRoute: typeof DashboardFamilyIndexLazyRoute
   DashboardGroupIndexLazyRoute: typeof DashboardGroupIndexLazyRoute
+  DashboardInviteManagementIndexLazyRoute: typeof DashboardInviteManagementIndexLazyRoute
   DashboardMarketingIndexLazyRoute: typeof DashboardMarketingIndexLazyRoute
   DashboardOrderIndexLazyRoute: typeof DashboardOrderIndexLazyRoute
   DashboardPaymentIndexLazyRoute: typeof DashboardPaymentIndexLazyRoute
   DashboardProductIndexLazyRoute: typeof DashboardProductIndexLazyRoute
+  DashboardPromoIndexLazyRoute: typeof DashboardPromoIndexLazyRoute
   DashboardRedemptionIndexLazyRoute: typeof DashboardRedemptionIndexLazyRoute
   DashboardSubscribeIndexLazyRoute: typeof DashboardSubscribeIndexLazyRoute
   DashboardSystemIndexLazyRoute: typeof DashboardSystemIndexLazyRoute
   DashboardTicketIndexLazyRoute: typeof DashboardTicketIndexLazyRoute
   DashboardUserIndexLazyRoute: typeof DashboardUserIndexLazyRoute
-  DashboardWithdrawalIndexLazyRoute: typeof DashboardWithdrawalIndexLazyRoute
 }
 
 const DashboardRouteLazyRouteChildren: DashboardRouteLazyRouteChildren = {
   DashboardNodesLazyRoute: DashboardNodesLazyRoute,
   DashboardServersLazyRoute: DashboardServersLazyRoute,
-  DashboardWithdrawalLazyRoute: DashboardWithdrawalLazyRoute,
+  DashboardWithdrawalLazyRoute: DashboardWithdrawalLazyRouteWithChildren,
   DashboardIndexLazyRoute: DashboardIndexLazyRoute,
   DashboardLogBalanceLazyRoute: DashboardLogBalanceLazyRoute,
   DashboardLogCommissionLazyRoute: DashboardLogCommissionLazyRoute,
@@ -901,16 +962,18 @@ const DashboardRouteLazyRouteChildren: DashboardRouteLazyRouteChildren = {
   DashboardDocumentIndexLazyRoute: DashboardDocumentIndexLazyRoute,
   DashboardFamilyIndexLazyRoute: DashboardFamilyIndexLazyRoute,
   DashboardGroupIndexLazyRoute: DashboardGroupIndexLazyRoute,
+  DashboardInviteManagementIndexLazyRoute:
+    DashboardInviteManagementIndexLazyRoute,
   DashboardMarketingIndexLazyRoute: DashboardMarketingIndexLazyRoute,
   DashboardOrderIndexLazyRoute: DashboardOrderIndexLazyRoute,
   DashboardPaymentIndexLazyRoute: DashboardPaymentIndexLazyRoute,
   DashboardProductIndexLazyRoute: DashboardProductIndexLazyRoute,
+  DashboardPromoIndexLazyRoute: DashboardPromoIndexLazyRoute,
   DashboardRedemptionIndexLazyRoute: DashboardRedemptionIndexLazyRoute,
   DashboardSubscribeIndexLazyRoute: DashboardSubscribeIndexLazyRoute,
   DashboardSystemIndexLazyRoute: DashboardSystemIndexLazyRoute,
   DashboardTicketIndexLazyRoute: DashboardTicketIndexLazyRoute,
   DashboardUserIndexLazyRoute: DashboardUserIndexLazyRoute,
-  DashboardWithdrawalIndexLazyRoute: DashboardWithdrawalIndexLazyRoute,
 }
 
 const DashboardRouteLazyRouteWithChildren =

apps/admin/src/routes/dashboard/invite-management/index.lazy.tsx

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

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

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

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/invite/index.test.tsx

@@ -0,0 +1,159 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { cleanup, render, screen, waitFor } from "@testing-library/react";
+import { getAdminInviteList } from "@workspace/ui/services/admin/invite";
+import type { AxiosResponse } from "axios";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import InviteManagement from ".";
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({
+    t: (
+      _key: string,
+      fallback: string,
+      options?: { count?: number }
+    ): string => {
+      if (typeof options?.count === "number") {
+        return `${options.count} days`;
+      }
+      return fallback;
+    },
+  }),
+}));
+
+vi.mock("@/stores/global", () => ({
+  useGlobalStore: () => ({
+    common: {
+      currency: {
+        currency_symbol: "$",
+      },
+    },
+  }),
+}));
+
+vi.mock("@/utils/common", () => ({
+  formatDate: (timestamp: number) => `date-${timestamp}`,
+}));
+
+vi.mock("@workspace/ui/services/admin/invite", () => ({
+  getAdminInviteList: vi.fn(),
+}));
+
+const mockedGetAdminInviteList = vi.mocked(getAdminInviteList);
+
+function createInviteListResponse(
+  data: API.GetAdminInviteListResponse
+): AxiosResponse<API.Response & { data?: API.GetAdminInviteListResponse }> {
+  return {
+    data: {
+      code: 200,
+      data,
+    },
+    status: 200,
+    statusText: "OK",
+    headers: {},
+    config: {
+      headers: {} as AxiosResponse["config"]["headers"],
+    },
+  };
+}
+
+afterEach(() => {
+  cleanup();
+  vi.clearAllMocks();
+});
+
+beforeEach(() => {
+  localStorage.setItem("timezone", "UTC");
+});
+
+describe("InviteManagement", () => {
+  it("renders invite rows with status, purchase state, commission, and gift days", async () => {
+    mockedGetAdminInviteList.mockResolvedValue(
+      createInviteListResponse({
+        total: 1,
+        list: [
+          {
+            inviter_id: 10,
+            inviter_identifier: "agent@example.com",
+            invitee_id: 123,
+            invitee_identifier: "user@example.com",
+            invitee_avatar: "",
+            invitee_enable: true,
+            invited_at: 1_716_800_000,
+            order_count: 3,
+            has_purchased: true,
+            inviter_commission: 1500,
+            inviter_gift_days: 30,
+            invitee_gift_days: 7,
+          },
+        ],
+      })
+    );
+
+    render(<InviteManagement />);
+
+    await waitFor(() =>
+      expect(mockedGetAdminInviteList).toHaveBeenCalledWith({
+        page: 1,
+        size: 200,
+        search: undefined,
+        inviter_id: undefined,
+        invitee_id: undefined,
+      })
+    );
+
+    expect(await screen.findByText("agent@example.com")).not.toBeNull();
+    expect(screen.getByText("user@example.com")).not.toBeNull();
+    expect(screen.getByText("Enabled")).not.toBeNull();
+    expect(screen.getByText("Yes")).not.toBeNull();
+    expect(screen.getByText("$15.00")).not.toBeNull();
+    expect(screen.getByText("30 days")).not.toBeNull();
+    expect(screen.getByText("7 days")).not.toBeNull();
+    expect(screen.getByText("date-1716800000")).not.toBeNull();
+  });
+
+  it("shows the empty state when the API returns no rows", async () => {
+    mockedGetAdminInviteList.mockResolvedValue(
+      createInviteListResponse({
+        total: 0,
+        list: [],
+      })
+    );
+
+    render(<InviteManagement />);
+
+    expect(await screen.findByText("No invite records")).not.toBeNull();
+  });
+
+  it("shows a loading state while invites are being fetched", () => {
+    let resolveRequest:
+      | ((
+          value: AxiosResponse<
+            API.Response & { data?: API.GetAdminInviteListResponse }
+          >
+        ) => void)
+      | undefined;
+    mockedGetAdminInviteList.mockReturnValue(
+      new Promise((resolve) => {
+        resolveRequest = resolve;
+      })
+    );
+
+    render(<InviteManagement />);
+
+    expect(screen.getByRole("status", { name: "Loading data" })).not.toBeNull();
+    expect(resolveRequest).toBeTypeOf("function");
+  });
+
+  it("shows an error state when the request fails", async () => {
+    mockedGetAdminInviteList.mockRejectedValue(new Error("network failed"));
+
+    render(<InviteManagement />);
+
+    await waitFor(() => expect(mockedGetAdminInviteList).toHaveBeenCalled());
+    expect(await screen.findByText("Failed to load invites")).not.toBeNull();
+    expect(screen.queryByText("No invite records")).toBeNull();
+  });
+});

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

@@ -0,0 +1,213 @@
+"use client";
+
+import {
+  Alert,
+  AlertDescription,
+  AlertTitle,
+} from "@workspace/ui/components/alert";
+import {
+  Avatar,
+  AvatarFallback,
+  AvatarImage,
+} from "@workspace/ui/components/avatar";
+import { Badge } from "@workspace/ui/components/badge";
+import Empty from "@workspace/ui/composed/empty";
+import {
+  ProTable,
+  type ProTableActions,
+} from "@workspace/ui/composed/pro-table/pro-table";
+import { getAdminInviteList } from "@workspace/ui/services/admin/invite";
+import { CircleAlert } from "lucide-react";
+import { useRef } from "react";
+import { useTranslation } from "react-i18next";
+import { Display } from "@/components/display";
+import { formatDate } from "@/utils/common";
+
+type InviteFilters = {
+  search?: string;
+  inviter_id?: string;
+  invitee_id?: string;
+};
+
+function toOptionalNumber(value?: string) {
+  if (!value) return;
+  const parsed = Number(value);
+  return Number.isFinite(parsed) ? parsed : undefined;
+}
+
+function InviteUserCell({
+  id,
+  identifier,
+  avatar,
+}: {
+  id: number;
+  identifier: string;
+  avatar?: string;
+}) {
+  const fallback = identifier?.charAt(0)?.toUpperCase() || "U";
+
+  return (
+    <div className="flex min-w-48 items-center gap-2">
+      <Avatar className="h-8 w-8">
+        <AvatarImage alt={identifier || `#${id}`} src={avatar} />
+        <AvatarFallback className="text-xs">{fallback}</AvatarFallback>
+      </Avatar>
+      <div className="min-w-0">
+        <div className="font-medium text-sm">#{id}</div>
+        <div className="max-w-52 truncate text-muted-foreground text-xs">
+          {identifier || "--"}
+        </div>
+      </div>
+    </div>
+  );
+}
+
+function InviteIdentifierCell({
+  id,
+  identifier,
+}: {
+  id: number;
+  identifier: string;
+}) {
+  return (
+    <div className="min-w-44">
+      <div className="font-medium text-sm">#{id}</div>
+      <div className="max-w-52 truncate text-muted-foreground text-xs">
+        {identifier || "--"}
+      </div>
+    </div>
+  );
+}
+
+export default function InviteManagement() {
+  const { t } = useTranslation("invite");
+  const ref = useRef<ProTableActions>(null);
+
+  return (
+    <ProTable<API.AdminInviteRelation, InviteFilters>
+      action={ref}
+      columns={[
+        {
+          accessorKey: "inviter_id",
+          header: t("inviter", "Inviter"),
+          cell: ({ row }) => (
+            <InviteIdentifierCell
+              id={row.original.inviter_id}
+              identifier={row.original.inviter_identifier}
+            />
+          ),
+        },
+        {
+          accessorKey: "invitee_id",
+          header: t("invitee", "Invitee"),
+          cell: ({ row }) => (
+            <InviteUserCell
+              avatar={row.original.invitee_avatar}
+              id={row.original.invitee_id}
+              identifier={row.original.invitee_identifier}
+            />
+          ),
+        },
+        {
+          accessorKey: "invitee_enable",
+          header: t("status", "Status"),
+          cell: ({ row }) => (
+            <Badge
+              variant={row.original.invitee_enable ? "default" : "secondary"}
+            >
+              {row.original.invitee_enable
+                ? t("enabled", "Enabled")
+                : t("disabled", "Disabled")}
+            </Badge>
+          ),
+        },
+        {
+          accessorKey: "invited_at",
+          header: t("invitedAt", "Invited At"),
+          cell: ({ row }) => formatDate(row.original.invited_at),
+        },
+        {
+          accessorKey: "order_count",
+          header: t("orderCount", "Orders"),
+        },
+        {
+          accessorKey: "has_purchased",
+          header: t("hasPurchased", "Purchased"),
+          cell: ({ row }) => (
+            <Badge variant={row.original.has_purchased ? "default" : "outline"}>
+              {row.original.has_purchased ? t("yes", "Yes") : t("no", "No")}
+            </Badge>
+          ),
+        },
+        {
+          accessorKey: "inviter_commission",
+          header: t("commission", "Commission"),
+          cell: ({ row }) => (
+            <Display type="currency" value={row.original.inviter_commission} />
+          ),
+        },
+        {
+          accessorKey: "inviter_gift_days",
+          header: t("inviterGiftDays", "Inviter Gift Days"),
+          cell: ({ row }) =>
+            t("days", "{{count}} days", {
+              count: row.original.inviter_gift_days,
+            }),
+        },
+        {
+          accessorKey: "invitee_gift_days",
+          header: t("inviteeGiftDays", "Invitee Gift Days"),
+          cell: ({ row }) =>
+            t("days", "{{count}} days", {
+              count: row.original.invitee_gift_days,
+            }),
+        },
+      ]}
+      empty={<Empty description={t("empty", "No invite records")} />}
+      error={
+        <Alert className="mx-auto max-w-md" variant="destructive">
+          <CircleAlert aria-hidden="true" />
+          <AlertTitle>
+            {t("loadErrorTitle", "Failed to load invites")}
+          </AlertTitle>
+          <AlertDescription>
+            {t("loadErrorDescription", "Refresh the table or try again later.")}
+          </AlertDescription>
+        </Alert>
+      }
+      header={{ title: t("title", "Invite Management") }}
+      params={[
+        {
+          key: "search",
+          placeholder: t("searchPlaceholder", "Email or phone"),
+        },
+        {
+          key: "inviter_id",
+          placeholder: t("inviterId", "Inviter ID"),
+        },
+        {
+          key: "invitee_id",
+          placeholder: t("inviteeId", "Invitee ID"),
+        },
+      ]}
+      request={async (pagination, filters) => {
+        const { data } = await getAdminInviteList({
+          page: pagination.page,
+          size: pagination.size,
+          search: filters.search?.trim() || undefined,
+          inviter_id: toOptionalNumber(filters.inviter_id),
+          invitee_id: toOptionalNumber(filters.invitee_id),
+        });
+
+        return {
+          list:
+            data.data?.list.map((item) => ({
+              ...item,
+              id: `${item.inviter_id}-${item.invitee_id}-${item.invited_at}`,
+            })) || [],
+          total: data.data?.total || 0,
+        };
+      }}
+    />
+  );
+}

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

@@ -0,0 +1,155 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { cleanup, render, screen, waitFor } from "@testing-library/react";
+import { getPromoRuleList } from "@workspace/ui/services/admin/promo";
+import type { AxiosResponse } from "axios";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import PromoPage from ".";
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({
+    t: (_key: string, fallback: string): string => fallback,
+  }),
+}));
+
+vi.mock("@/stores/subscribe", () => ({
+  useSubscribe: () => ({
+    subscribes: [
+      {
+        id: 8,
+        name: "Monthly Plan",
+        unit_price: 1200,
+        sold: 0,
+      },
+    ],
+    getSubscribeName: (id?: number) => (id === 8 ? "Monthly Plan" : "--"),
+  }),
+}));
+
+vi.mock("@/utils/common", () => ({
+  formatDate: (timestamp: number) => `date-${timestamp}`,
+}));
+
+vi.mock("@workspace/ui/services/admin/promo", () => ({
+  createPromoPrice: vi.fn(),
+  createPromoRule: vi.fn(),
+  deletePromoPrice: vi.fn(),
+  deletePromoRule: vi.fn(),
+  getPromoPriceList: vi.fn(),
+  getPromoRuleList: vi.fn(),
+  getPromoUsageList: vi.fn(),
+  updatePromoRule: vi.fn(),
+}));
+
+const mockedGetPromoRuleList = vi.mocked(getPromoRuleList);
+
+function createRuleListResponse(
+  data: API.GetPromoRuleListResponse
+): AxiosResponse<API.Response & { data?: API.GetPromoRuleListResponse }> {
+  return {
+    data: {
+      code: 200,
+      data,
+    },
+    status: 200,
+    statusText: "OK",
+    headers: {},
+    config: {
+      headers: {} as AxiosResponse["config"]["headers"],
+    },
+  };
+}
+
+beforeEach(() => {
+  localStorage.setItem("timezone", "UTC");
+});
+
+afterEach(() => {
+  cleanup();
+  vi.clearAllMocks();
+});
+
+describe("PromoPage", () => {
+  it("renders promo rules with type, priority, status, and validity period", async () => {
+    mockedGetPromoRuleList.mockResolvedValue(
+      createRuleListResponse({
+        total: 1,
+        list: [
+          {
+            id: 1,
+            name: "Return User Price",
+            type: "inactive_user",
+            params: { inactive_months: 3 },
+            priority: 5,
+            enabled: true,
+            start_time: 1_716_800_000,
+            end_time: 1_716_900_000,
+          },
+        ],
+      })
+    );
+
+    render(<PromoPage />);
+
+    await waitFor(() =>
+      expect(mockedGetPromoRuleList).toHaveBeenCalledWith({
+        page: 1,
+        size: 200,
+        search: undefined,
+        type: undefined,
+        enabled: undefined,
+      })
+    );
+    expect(await screen.findByText("Return User Price")).not.toBeNull();
+    expect(screen.getByText("inactive_user")).not.toBeNull();
+    expect(screen.getByText("5")).not.toBeNull();
+    expect(screen.getByText("date-1716800000")).not.toBeNull();
+    expect(screen.getByText("date-1716900000")).not.toBeNull();
+  });
+
+  it("shows the empty state when there are no promo rules", async () => {
+    mockedGetPromoRuleList.mockResolvedValue(
+      createRuleListResponse({
+        total: 0,
+        list: [],
+      })
+    );
+
+    render(<PromoPage />);
+
+    expect(await screen.findByText("No promo rules")).not.toBeNull();
+  });
+
+  it("shows a loading state while promo rules are being fetched", () => {
+    let resolveRequest:
+      | ((
+          value: AxiosResponse<
+            API.Response & { data?: API.GetPromoRuleListResponse }
+          >
+        ) => void)
+      | undefined;
+    mockedGetPromoRuleList.mockReturnValue(
+      new Promise((resolve) => {
+        resolveRequest = resolve;
+      })
+    );
+
+    render(<PromoPage />);
+
+    expect(screen.getByRole("status", { name: "Loading data" })).not.toBeNull();
+    expect(resolveRequest).toBeTypeOf("function");
+  });
+
+  it("shows an error state when promo rules fail to load", async () => {
+    mockedGetPromoRuleList.mockRejectedValue(new Error("network failed"));
+
+    render(<PromoPage />);
+
+    await waitFor(() => expect(mockedGetPromoRuleList).toHaveBeenCalled());
+    expect(
+      await screen.findByText("Failed to load promo rules")
+    ).not.toBeNull();
+    expect(screen.queryByText("No promo rules")).toBeNull();
+  });
+});

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

@@ -0,0 +1,504 @@
+import {
+  Alert,
+  AlertDescription,
+  AlertTitle,
+} from "@workspace/ui/components/alert";
+import { Badge } from "@workspace/ui/components/badge";
+import { Button } from "@workspace/ui/components/button";
+import { Switch } from "@workspace/ui/components/switch";
+import {
+  Tabs,
+  TabsContent,
+  TabsList,
+  TabsTrigger,
+} from "@workspace/ui/components/tabs";
+import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
+import Empty from "@workspace/ui/composed/empty";
+import {
+  ProTable,
+  type ProTableActions,
+} from "@workspace/ui/composed/pro-table/pro-table";
+import {
+  createPromoPrice,
+  createPromoRule,
+  deletePromoPrice,
+  deletePromoRule,
+  getPromoPriceList,
+  getPromoRuleList,
+  getPromoUsageList,
+  updatePromoRule,
+} from "@workspace/ui/services/admin/promo";
+import { CircleAlert } from "lucide-react";
+import { useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { toast } from "sonner";
+import { useSubscribe } from "@/stores/subscribe";
+import { formatDate } from "@/utils/common";
+import PriceForm from "./price-form";
+import RuleDetail from "./rule-detail";
+import RuleForm from "./rule-form";
+import { formatCurrency, parseOptionalNumber, promoRuleTypes } from "./utils";
+
+type RuleFilters = {
+  search?: string;
+  type?: API.PromoRuleType;
+  enabled?: string;
+};
+
+type PriceFilters = {
+  promo_rule_id?: string;
+  subscribe_id?: string;
+};
+
+type UsageFilters = PriceFilters & {
+  user_id?: string;
+  order_no?: string;
+};
+
+function ErrorState({
+  title,
+  description,
+}: {
+  title: string;
+  description: string;
+}) {
+  return (
+    <Alert className="mx-auto max-w-md" variant="destructive">
+      <CircleAlert aria-hidden="true" />
+      <AlertTitle>{title}</AlertTitle>
+      <AlertDescription>{description}</AlertDescription>
+    </Alert>
+  );
+}
+
+export default function PromoPage() {
+  const { t } = useTranslation("promo");
+  const { subscribes, getSubscribeName } = useSubscribe();
+  const [loading, setLoading] = useState(false);
+  const [rules, setRules] = useState<API.PromoRule[]>([]);
+  const [detailRule, setDetailRule] = useState<API.PromoRule>();
+  const [detailOpen, setDetailOpen] = useState(false);
+  const ruleRef = useRef<ProTableActions>(null);
+  const priceRef = useRef<ProTableActions>(null);
+  const usageRef = useRef<ProTableActions>(null);
+
+  return (
+    <>
+      <Tabs className="space-y-4" defaultValue="rules">
+        <TabsList className="grid w-full grid-cols-3 md:w-fit">
+          <TabsTrigger value="rules">{t("rules", "Rules")}</TabsTrigger>
+          <TabsTrigger value="prices">{t("prices", "Prices")}</TabsTrigger>
+          <TabsTrigger value="usage">{t("usage", "Usage")}</TabsTrigger>
+        </TabsList>
+
+        <TabsContent value="rules">
+          <ProTable<API.PromoRule, RuleFilters>
+            action={ruleRef}
+            actions={{
+              render: (row) => [
+                <Button
+                  key="detail"
+                  onClick={() => {
+                    setDetailRule(row);
+                    setDetailOpen(true);
+                  }}
+                  size="sm"
+                  variant="outline"
+                >
+                  {t("detail", "Detail")}
+                </Button>,
+                <RuleForm
+                  initialValues={row}
+                  key="edit"
+                  loading={loading}
+                  onSubmit={async (values) => {
+                    setLoading(true);
+                    try {
+                      await updatePromoRule({ id: row.id }, values);
+                      toast.success(t("updateSuccess", "Update Success"));
+                      ruleRef.current?.refresh();
+                      setLoading(false);
+                      return true;
+                    } catch (_error) {
+                      setLoading(false);
+                      return false;
+                    }
+                  }}
+                  title={t("editRule", "Edit Rule")}
+                  trigger={t("edit", "Edit")}
+                />,
+                <ConfirmButton
+                  cancelText={t("cancel", "Cancel")}
+                  confirmText={t("confirm", "Confirm")}
+                  description={t(
+                    "deleteWarning",
+                    "Once deleted, data cannot be recovered. Please proceed with caution."
+                  )}
+                  key="delete"
+                  onConfirm={async () => {
+                    await deletePromoRule({ id: row.id });
+                    toast.success(t("deleteSuccess", "Delete Success"));
+                    ruleRef.current?.refresh();
+                  }}
+                  title={t("confirmDelete", "Are you sure you want to delete?")}
+                  trigger={
+                    <Button size="sm" variant="destructive">
+                      {t("delete", "Delete")}
+                    </Button>
+                  }
+                />,
+              ],
+            }}
+            columns={[
+              {
+                accessorKey: "name",
+                header: t("name", "Name"),
+              },
+              {
+                accessorKey: "type",
+                header: t("type", "Type"),
+                cell: ({ row }) => (
+                  <Badge variant="outline">
+                    {t(`types.${row.original.type}`, row.original.type)}
+                  </Badge>
+                ),
+              },
+              {
+                accessorKey: "priority",
+                header: t("priority", "Priority"),
+              },
+              {
+                accessorKey: "enabled",
+                header: t("enabled", "Enabled"),
+                cell: ({ row }) => (
+                  <Switch
+                    defaultChecked={row.original.enabled}
+                    onCheckedChange={async (checked) => {
+                      await updatePromoRule(
+                        { id: row.original.id },
+                        { ...row.original, enabled: checked }
+                      );
+                      toast.success(t("updateSuccess", "Update Success"));
+                      ruleRef.current?.refresh();
+                    }}
+                  />
+                ),
+              },
+              {
+                accessorKey: "start_time",
+                header: t("startTime", "Start Time"),
+                cell: ({ row }) =>
+                  row.original.start_time
+                    ? formatDate(row.original.start_time)
+                    : "--",
+              },
+              {
+                accessorKey: "end_time",
+                header: t("endTime", "End Time"),
+                cell: ({ row }) =>
+                  row.original.end_time
+                    ? formatDate(row.original.end_time)
+                    : "--",
+              },
+            ]}
+            empty={<Empty description={t("emptyRules", "No promo rules")} />}
+            error={
+              <ErrorState
+                description={t(
+                  "loadErrorDescription",
+                  "Refresh the table or try again later."
+                )}
+                title={t("loadRulesError", "Failed to load promo rules")}
+              />
+            }
+            header={{
+              toolbar: (
+                <RuleForm
+                  loading={loading}
+                  onSubmit={async (values) => {
+                    setLoading(true);
+                    try {
+                      await createPromoRule(values);
+                      toast.success(t("createSuccess", "Create Success"));
+                      ruleRef.current?.refresh();
+                      setLoading(false);
+                      return true;
+                    } catch (_error) {
+                      setLoading(false);
+                      return false;
+                    }
+                  }}
+                  title={t("createRule", "Create Rule")}
+                  trigger={t("createRule", "Create Rule")}
+                />
+              ),
+            }}
+            params={[
+              { key: "search", placeholder: t("searchRule", "Rule name") },
+              {
+                key: "type",
+                placeholder: t("type", "Type"),
+                options: promoRuleTypes.map((type) => ({
+                  label: t(`types.${type}`, type),
+                  value: type,
+                })),
+              },
+              {
+                key: "enabled",
+                placeholder: t("enabled", "Enabled"),
+                options: [
+                  { label: t("yes", "Yes"), value: "true" },
+                  { label: t("no", "No"), value: "false" },
+                ],
+              },
+            ]}
+            request={async (pagination, filters) => {
+              const { data } = await getPromoRuleList({
+                ...pagination,
+                search: filters.search?.trim() || undefined,
+                type: filters.type,
+                enabled:
+                  filters.enabled === undefined || filters.enabled === ""
+                    ? undefined
+                    : filters.enabled === "true",
+              });
+              const list = data.data?.list || [];
+              setRules(list);
+              return {
+                list,
+                total: data.data?.total || 0,
+              };
+            }}
+          />
+        </TabsContent>
+
+        <TabsContent value="prices">
+          <ProTable<API.PromoPrice, PriceFilters>
+            action={priceRef}
+            actions={{
+              render: (row) => [
+                <ConfirmButton
+                  cancelText={t("cancel", "Cancel")}
+                  confirmText={t("confirm", "Confirm")}
+                  description={t(
+                    "deleteWarning",
+                    "Once deleted, data cannot be recovered. Please proceed with caution."
+                  )}
+                  key="delete"
+                  onConfirm={async () => {
+                    await deletePromoPrice({ id: row.id });
+                    toast.success(t("deleteSuccess", "Delete Success"));
+                    priceRef.current?.refresh();
+                  }}
+                  title={t("confirmDelete", "Are you sure you want to delete?")}
+                  trigger={
+                    <Button size="sm" variant="destructive">
+                      {t("delete", "Delete")}
+                    </Button>
+                  }
+                />,
+              ],
+            }}
+            columns={[
+              {
+                accessorKey: "promo_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}`
+                    : "--",
+              },
+              {
+                accessorKey: "subscribe_id",
+                header: t("subscribe", "Subscribe"),
+                cell: ({ row }) =>
+                  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"),
+                cell: ({ row }) => formatCurrency(row.original.unit_price),
+              },
+              {
+                accessorKey: "promo_price",
+                header: t("promoPrice", "Promo Price"),
+                cell: ({ row }) => formatCurrency(row.original.promo_price),
+              },
+            ]}
+            empty={<Empty description={t("emptyPrices", "No promo prices")} />}
+            error={
+              <ErrorState
+                description={t(
+                  "loadErrorDescription",
+                  "Refresh the table or try again later."
+                )}
+                title={t("loadPricesError", "Failed to load promo prices")}
+              />
+            }
+            header={{
+              toolbar: (
+                <PriceForm
+                  loading={loading}
+                  onSubmit={async (values) => {
+                    setLoading(true);
+                    try {
+                      await createPromoPrice(values);
+                      toast.success(t("createSuccess", "Create Success"));
+                      priceRef.current?.refresh();
+                      setLoading(false);
+                      return true;
+                    } catch (_error) {
+                      setLoading(false);
+                      return false;
+                    }
+                  }}
+                  rules={rules}
+                  subscribes={subscribes}
+                />
+              ),
+            }}
+            params={[
+              {
+                key: "promo_rule_id",
+                placeholder: t("rule", "Rule"),
+                options: rules.map((rule) => ({
+                  label: rule.name,
+                  value: String(rule.id),
+                })),
+              },
+              {
+                key: "subscribe_id",
+                placeholder: t("subscribe", "Subscribe"),
+                options: subscribes
+                  .filter((item) => typeof item.id === "number")
+                  .map((item) => ({
+                    label: item.name || `#${item.id}`,
+                    value: String(item.id),
+                  })),
+              },
+            ]}
+            request={async (pagination, filters) => {
+              const { data } = await getPromoPriceList({
+                ...pagination,
+                promo_rule_id: parseOptionalNumber(filters.promo_rule_id),
+                subscribe_id: parseOptionalNumber(filters.subscribe_id),
+              });
+              return {
+                list: data.data?.list || [],
+                total: data.data?.total || 0,
+              };
+            }}
+          />
+        </TabsContent>
+
+        <TabsContent value="usage">
+          <ProTable<API.PromoUsage, UsageFilters>
+            action={usageRef}
+            columns={[
+              {
+                accessorKey: "promo_rule_id",
+                header: t("rule", "Rule"),
+                cell: ({ row }) =>
+                  row.original.rule_name ||
+                  rules.find((rule) => rule.id === row.original.promo_rule_id)
+                    ?.name ||
+                  `#${row.original.promo_rule_id}`,
+              },
+              {
+                accessorKey: "user_id",
+                header: t("userId", "User ID"),
+                cell: ({ row }) => `#${row.original.user_id}`,
+              },
+              {
+                accessorKey: "subscribe_id",
+                header: t("subscribe", "Subscribe"),
+                cell: ({ row }) =>
+                  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."),
+              },
+              {
+                accessorKey: "promo_price",
+                header: t("promoPrice", "Promo Price"),
+                cell: ({ row }) => formatCurrency(row.original.promo_price),
+              },
+              {
+                accessorKey: "used_at",
+                header: t("usedAt", "Used At"),
+                cell: ({ row }) => formatDate(row.original.used_at),
+              },
+            ]}
+            empty={
+              <Empty description={t("emptyUsage", "No promo usage records")} />
+            }
+            error={
+              <ErrorState
+                description={t(
+                  "loadErrorDescription",
+                  "Refresh the table or try again later."
+                )}
+                title={t("loadUsageError", "Failed to load promo usage")}
+              />
+            }
+            params={[
+              {
+                key: "promo_rule_id",
+                placeholder: t("rule", "Rule"),
+                options: rules.map((rule) => ({
+                  label: rule.name,
+                  value: String(rule.id),
+                })),
+              },
+              {
+                key: "subscribe_id",
+                placeholder: t("subscribe", "Subscribe"),
+                options: subscribes
+                  .filter((item) => typeof item.id === "number")
+                  .map((item) => ({
+                    label: item.name || `#${item.id}`,
+                    value: String(item.id),
+                  })),
+              },
+              { key: "user_id", placeholder: t("userId", "User ID") },
+              { key: "order_no", placeholder: t("orderNo", "Order No.") },
+            ]}
+            request={async (pagination, filters) => {
+              const { data } = await getPromoUsageList({
+                ...pagination,
+                promo_rule_id: parseOptionalNumber(filters.promo_rule_id),
+                subscribe_id: parseOptionalNumber(filters.subscribe_id),
+                user_id: parseOptionalNumber(filters.user_id),
+                order_no: filters.order_no?.trim() || undefined,
+              });
+              return {
+                list: data.data?.list || [],
+                total: data.data?.total || 0,
+              };
+            }}
+          />
+        </TabsContent>
+      </Tabs>
+      <RuleDetail
+        onOpenChange={setDetailOpen}
+        open={detailOpen}
+        rule={detailRule}
+      />
+    </>
+  );
+}

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

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

@@ -0,0 +1,260 @@
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Button } from "@workspace/ui/components/button";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "@workspace/ui/components/form";
+import {
+  Sheet,
+  SheetContent,
+  SheetFooter,
+  SheetHeader,
+  SheetTitle,
+  SheetTrigger,
+} from "@workspace/ui/components/sheet";
+import { Combobox } from "@workspace/ui/composed/combobox";
+import { EnhancedInput } from "@workspace/ui/composed/enhanced-input";
+import { unitConversion } from "@workspace/ui/utils/unit-conversions";
+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";
+
+const priceSchema = z.object({
+  promo_rule_id: z.number().min(1),
+  subscribe_id: z.number().min(1),
+  quantity: z.number().min(1),
+  promo_price: z.number().min(1),
+});
+
+type PriceFormValues = z.infer<typeof priceSchema>;
+
+interface PriceFormProps {
+  loading?: boolean;
+  rules: API.PromoRule[];
+  subscribes: API.SubscribeItem[];
+  onSubmit: (data: API.CreatePromoPriceRequest) => Promise<boolean> | boolean;
+}
+
+export default function PriceForm({
+  loading,
+  rules,
+  subscribes,
+  onSubmit,
+}: PriceFormProps) {
+  const { t } = useTranslation("promo");
+  const [open, setOpen] = useState(false);
+  const form = useForm<PriceFormValues>({
+    resolver: zodResolver(priceSchema),
+    defaultValues: {
+      promo_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) {
+      form.setError("promo_price", {
+        message: t(
+          "form.promoPriceLessThanOriginalPrice",
+          "Promo price must be lower than original 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,
+        },
+      ],
+    });
+    if (success) setOpen(false);
+  }
+
+  return (
+    <Sheet onOpenChange={setOpen} open={open}>
+      <SheetTrigger asChild>
+        <Button
+          onClick={() => {
+            form.reset({
+              promo_rule_id: 0,
+              subscribe_id: 0,
+              quantity: 0,
+              promo_price: 0,
+            });
+            setOpen(true);
+          }}
+          size="sm"
+        >
+          {t("createPrice", "Create Promo Price")}
+        </Button>
+      </SheetTrigger>
+      <SheetContent className="w-[520px] max-w-full md:max-w-screen-md">
+        <SheetHeader>
+          <SheetTitle>{t("createPrice", "Create Promo Price")}</SheetTitle>
+        </SheetHeader>
+        <Form {...form}>
+          <form
+            className="space-y-4 px-6 pt-4"
+            id="promo-price-form"
+            onSubmit={form.handleSubmit(handleSubmit)}
+          >
+            <FormField
+              control={form.control}
+              name="promo_rule_id"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>{t("rule", "Rule")}</FormLabel>
+                  <FormControl>
+                    <Combobox<number>
+                      onChange={field.onChange}
+                      options={rules.map((rule) => ({
+                        label: rule.name,
+                        value: rule.id,
+                      }))}
+                      placeholder={t("form.selectRule", "Select rule")}
+                      value={field.value}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="subscribe_id"
+              render={({ field }) => (
+                <FormItem>
+                  <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"]);
+                      }}
+                      options={subscribes
+                        .filter((item) => typeof item.id === "number")
+                        .map((item) => ({
+                          label: item.name || `#${item.id}`,
+                          value: item.id as number,
+                        }))}
+                      placeholder={t(
+                        "form.selectSubscribe",
+                        "Select subscribe"
+                      )}
+                      value={field.value}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </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"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>{t("promoPrice", "Promo Price")}</FormLabel>
+                  <FormControl>
+                    <EnhancedInput
+                      formatInput={(value) =>
+                        unitConversion("centsToDollars", value)
+                      }
+                      formatOutput={(value) =>
+                        unitConversion("dollarsToCents", value)
+                      }
+                      min={0.01}
+                      onValueChange={(value) => field.onChange(value)}
+                      placeholder={t("form.enterPromoPrice", "Enter price")}
+                      type="number"
+                      value={field.value}
+                    />
+                  </FormControl>
+                  {originalPrice > 0 && (
+                    <p className="text-muted-foreground text-xs">
+                      {t("originalPriceHint", "Original price")}:{" "}
+                      {formatCurrency(originalPrice)}
+                    </p>
+                  )}
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </form>
+        </Form>
+        <SheetFooter>
+          <Button
+            disabled={loading || (hasSelectedSubscribe && !hasDiscounts)}
+            form="promo-price-form"
+            type="submit"
+          >
+            {t("confirm", "Confirm")}
+          </Button>
+        </SheetFooter>
+      </SheetContent>
+    </Sheet>
+  );
+}

apps/admin/src/sections/promo/rule-detail.tsx

@@ -0,0 +1,84 @@
+import { Badge } from "@workspace/ui/components/badge";
+import {
+  Sheet,
+  SheetContent,
+  SheetHeader,
+  SheetTitle,
+} from "@workspace/ui/components/sheet";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableRow,
+} from "@workspace/ui/components/table";
+import { useTranslation } from "react-i18next";
+import { formatDate } from "@/utils/common";
+
+interface RuleDetailProps {
+  open: boolean;
+  rule?: API.PromoRule;
+  onOpenChange: (open: boolean) => void;
+}
+
+export default function RuleDetail({
+  open,
+  rule,
+  onOpenChange,
+}: RuleDetailProps) {
+  const { t } = useTranslation("promo");
+
+  return (
+    <Sheet onOpenChange={onOpenChange} open={open}>
+      <SheetContent className="w-[520px] max-w-full md:max-w-screen-md">
+        <SheetHeader>
+          <SheetTitle>
+            {rule?.name || t("ruleDetail", "Rule Detail")}
+          </SheetTitle>
+        </SheetHeader>
+        {rule && (
+          <div className="px-6 pt-4">
+            <Table>
+              <TableBody>
+                <TableRow>
+                  <TableCell>{t("type", "Type")}</TableCell>
+                  <TableCell>
+                    <Badge variant="outline">
+                      {t(`types.${rule.type}`, rule.type)}
+                    </Badge>
+                  </TableCell>
+                </TableRow>
+                <TableRow>
+                  <TableCell>{t("priority", "Priority")}</TableCell>
+                  <TableCell>{rule.priority}</TableCell>
+                </TableRow>
+                <TableRow>
+                  <TableCell>{t("enabled", "Enabled")}</TableCell>
+                  <TableCell>
+                    {rule.enabled ? t("yes", "Yes") : t("no", "No")}
+                  </TableCell>
+                </TableRow>
+                <TableRow>
+                  <TableCell>{t("params", "Params")}</TableCell>
+                  <TableCell>
+                    <code className="whitespace-pre-wrap rounded bg-muted px-2 py-1 text-xs">
+                      {JSON.stringify(rule.params || {}, null, 2)}
+                    </code>
+                  </TableCell>
+                </TableRow>
+                <TableRow>
+                  <TableCell>
+                    {t("validityPeriod", "Validity Period")}
+                  </TableCell>
+                  <TableCell>
+                    {rule.start_time ? formatDate(rule.start_time) : "--"} -{" "}
+                    {rule.end_time ? formatDate(rule.end_time) : "--"}
+                  </TableCell>
+                </TableRow>
+              </TableBody>
+            </Table>
+          </div>
+        )}
+      </SheetContent>
+    </Sheet>
+  );
+}

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

@@ -0,0 +1,353 @@
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Button } from "@workspace/ui/components/button";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "@workspace/ui/components/form";
+import {
+  RadioGroup,
+  RadioGroupItem,
+} from "@workspace/ui/components/radio-group";
+import { ScrollArea } from "@workspace/ui/components/scroll-area";
+import {
+  Sheet,
+  SheetContent,
+  SheetFooter,
+  SheetHeader,
+  SheetTitle,
+  SheetTrigger,
+} from "@workspace/ui/components/sheet";
+import { Switch } from "@workspace/ui/components/switch";
+import { DatePicker } from "@workspace/ui/composed/date-picker";
+import { EnhancedInput } from "@workspace/ui/composed/enhanced-input";
+import { useEffect, useState } from "react";
+import { useForm } from "react-hook-form";
+import { useTranslation } from "react-i18next";
+import { z } from "zod";
+import { promoRuleTypes } from "./utils";
+
+const ruleSchema = z
+  .object({
+    name: z.string().min(1),
+    type: z.enum(["new_user", "inactive_user", "campaign"]),
+    inactive_months: z.number().optional(),
+    window_hours: z.number().optional(),
+    priority: z.number().min(0),
+    enabled: z.boolean(),
+    start_time: z.number().optional(),
+    end_time: z.number().optional(),
+  })
+  .superRefine((data, ctx) => {
+    if (
+      data.start_time !== undefined &&
+      data.end_time !== undefined &&
+      data.start_time >= data.end_time
+    ) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "End time must be later than start time",
+        path: ["end_time"],
+      });
+    }
+    if (
+      data.type === "inactive_user" &&
+      (!data.inactive_months || data.inactive_months <= 0)
+    ) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "Inactive months must be greater than 0",
+        path: ["inactive_months"],
+      });
+    }
+    if (
+      data.type === "new_user" &&
+      (!data.window_hours || data.window_hours <= 0)
+    ) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "Window hours must be greater than 0",
+        path: ["window_hours"],
+      });
+    }
+  });
+
+type RuleFormValues = z.infer<typeof ruleSchema>;
+
+interface RuleFormProps {
+  initialValues?: API.PromoRule;
+  loading?: boolean;
+  onSubmit: (data: API.CreatePromoRuleRequest) => Promise<boolean> | boolean;
+  title: string;
+  trigger: string;
+}
+
+function toFormValues(rule?: API.PromoRule): RuleFormValues {
+  return {
+    name: rule?.name ?? "",
+    type: rule?.type ?? "inactive_user",
+    inactive_months: rule?.params?.inactive_months,
+    window_hours: rule?.params?.window_hours,
+    priority: rule?.priority ?? 0,
+    enabled: rule?.enabled ?? false,
+    start_time: rule?.start_time,
+    end_time: rule?.end_time,
+  };
+}
+
+function toRequest(values: RuleFormValues): API.CreatePromoRuleRequest {
+  const params: API.PromoRuleParams =
+    values.type === "inactive_user"
+      ? { inactive_months: values.inactive_months }
+      : values.type === "new_user"
+        ? { window_hours: values.window_hours }
+        : {};
+
+  return {
+    name: values.name.trim(),
+    type: values.type,
+    params,
+    priority: values.priority,
+    enabled: values.enabled,
+    start_time: values.start_time || undefined,
+    end_time: values.end_time || undefined,
+  };
+}
+
+export default function RuleForm({
+  initialValues,
+  loading,
+  onSubmit,
+  title,
+  trigger,
+}: RuleFormProps) {
+  const { t } = useTranslation("promo");
+  const [open, setOpen] = useState(false);
+  const form = useForm<RuleFormValues>({
+    resolver: zodResolver(ruleSchema),
+    defaultValues: toFormValues(initialValues),
+  });
+  const type = form.watch("type");
+
+  useEffect(() => {
+    form.reset(toFormValues(initialValues));
+  }, [form, initialValues]);
+
+  async function handleSubmit(values: RuleFormValues) {
+    const success = await onSubmit(toRequest(values));
+    if (success) setOpen(false);
+  }
+
+  return (
+    <Sheet onOpenChange={setOpen} open={open}>
+      <SheetTrigger asChild>
+        <Button
+          onClick={() => {
+            form.reset(toFormValues(initialValues));
+            setOpen(true);
+          }}
+          size="sm"
+        >
+          {trigger}
+        </Button>
+      </SheetTrigger>
+      <SheetContent className="w-[520px] max-w-full md:max-w-screen-md">
+        <SheetHeader>
+          <SheetTitle>{title}</SheetTitle>
+        </SheetHeader>
+        <ScrollArea className="h-[calc(100vh-48px-36px-36px-env(safe-area-inset-top))]">
+          <Form {...form}>
+            <form
+              className="space-y-4 px-6 pt-4"
+              id="promo-rule-form"
+              onSubmit={form.handleSubmit(handleSubmit)}
+            >
+              <FormField
+                control={form.control}
+                name="name"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>{t("form.name", "Name")}</FormLabel>
+                    <FormControl>
+                      <EnhancedInput
+                        onValueChange={(value) => field.onChange(value)}
+                        placeholder={t("form.namePlaceholder", "Rule name")}
+                        value={field.value}
+                      />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+              <FormField
+                control={form.control}
+                name="type"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>{t("form.type", "Rule Type")}</FormLabel>
+                    <FormControl>
+                      <RadioGroup
+                        className="grid gap-2 sm:grid-cols-3"
+                        onValueChange={(value) =>
+                          field.onChange(value as API.PromoRuleType)
+                        }
+                        value={field.value}
+                      >
+                        {promoRuleTypes.map((item) => (
+                          <FormItem
+                            className="flex items-center space-x-2 space-y-0"
+                            key={item}
+                          >
+                            <FormControl>
+                              <RadioGroupItem value={item} />
+                            </FormControl>
+                            <FormLabel className="font-normal">
+                              {t(`types.${item}`, item)}
+                            </FormLabel>
+                          </FormItem>
+                        ))}
+                      </RadioGroup>
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+              {type === "inactive_user" && (
+                <FormField
+                  control={form.control}
+                  name="inactive_months"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>
+                        {t("form.inactiveMonths", "Inactive Months")}
+                      </FormLabel>
+                      <FormControl>
+                        <EnhancedInput
+                          min={1}
+                          onValueChange={(value) => field.onChange(value)}
+                          placeholder={t(
+                            "form.inactiveMonthsPlaceholder",
+                            "Months without purchase"
+                          )}
+                          type="number"
+                          value={field.value}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+              )}
+              {type === "new_user" && (
+                <FormField
+                  control={form.control}
+                  name="window_hours"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>
+                        {t("form.windowHours", "Window Hours")}
+                      </FormLabel>
+                      <FormControl>
+                        <EnhancedInput
+                          min={1}
+                          onValueChange={(value) => field.onChange(value)}
+                          placeholder={t(
+                            "form.windowHoursPlaceholder",
+                            "Hours after registration"
+                          )}
+                          type="number"
+                          value={field.value}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+              )}
+              <FormField
+                control={form.control}
+                name="priority"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>{t("priority", "Priority")}</FormLabel>
+                    <FormControl>
+                      <EnhancedInput
+                        min={0}
+                        onValueChange={(value) => field.onChange(value)}
+                        placeholder="0"
+                        type="number"
+                        value={field.value}
+                      />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+              <div className="grid gap-4 sm:grid-cols-2">
+                <FormField
+                  control={form.control}
+                  name="start_time"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>{t("startTime", "Start Time")}</FormLabel>
+                      <FormControl>
+                        <DatePicker
+                          onChange={(value) => field.onChange(value)}
+                          placeholder={t("form.selectStartTime", "Select time")}
+                          value={field.value}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="end_time"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>{t("endTime", "End Time")}</FormLabel>
+                      <FormControl>
+                        <DatePicker
+                          onChange={(value) => field.onChange(value)}
+                          placeholder={t("form.selectEndTime", "Select time")}
+                          value={field.value}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+              </div>
+              <FormField
+                control={form.control}
+                name="enabled"
+                render={({ field }) => (
+                  <FormItem className="flex items-center justify-between rounded-md border p-3">
+                    <div>
+                      <FormLabel>{t("enabled", "Enabled")}</FormLabel>
+                    </div>
+                    <FormControl>
+                      <Switch
+                        checked={field.value}
+                        onCheckedChange={field.onChange}
+                      />
+                    </FormControl>
+                  </FormItem>
+                )}
+              />
+            </form>
+          </Form>
+        </ScrollArea>
+        <SheetFooter>
+          <Button disabled={loading} form="promo-rule-form" type="submit">
+            {t("confirm", "Confirm")}
+          </Button>
+        </SheetFooter>
+      </SheetContent>
+    </Sheet>
+  );
+}

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

@@ -0,0 +1,28 @@
+import { unitConversion } from "@workspace/ui/utils/unit-conversions";
+
+export const promoRuleTypes: API.PromoRuleType[] = [
+  "inactive_user",
+  "new_user",
+  "campaign",
+];
+
+export function formatCurrency(value?: number) {
+  if (typeof value !== "number") return "--";
+  return `$${unitConversion("centsToDollars", value)}`;
+}
+
+export function parseOptionalNumber(value?: string) {
+  if (!value) return;
+  const parsed = Number(value);
+  return Number.isFinite(parsed) ? parsed : undefined;
+}
+
+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,29 +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 { ScrollArea } from "@workspace/ui/components/scroll-area";
 import {
-  Select,
+  Popover,
-  SelectContent,
+  PopoverContent,
-  SelectItem,
+  PopoverTrigger,
-  SelectTrigger,
+} from "@workspace/ui/components/popover";
-  SelectValue,
+import { ScrollArea } from "@workspace/ui/components/scroll-area";
-} from "@workspace/ui/components/select";
 import {
   Sheet,
   SheetContent,
@@ -31,13 +27,6 @@ import {
   SheetTitle,
   SheetTrigger,
 } from "@workspace/ui/components/sheet";
-import { FilePenLine } from 'lucide-react';
-import {
-  Popover,
-  PopoverClose,
-  PopoverContent,
-  PopoverTrigger,
-} from '@workspace/ui/components/popover';
 import { Switch } from "@workspace/ui/components/switch";
 import {
   Tabs,
@@ -45,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,
@@ -62,61 +56,28 @@ import {
   getUserList,
   updateUserBasicInfo,
 } from "@workspace/ui/services/admin/user";
-import { parseDeviceType } from "@workspace/ui/utils/device";
+import { FilePenLine } from "lucide-react";
-import React, { useRef, useState, useCallback } from 'react';
+import { useCallback, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 import { Display } from "@/components/display";
 import { useSubscribe } from "@/stores/subscribe";
 import { formatDate } from "@/utils/common";
 import FamilyManagement from "./family";
+import { RemarkForm } from "./remark-form";
+import { buildUserBasicInfoPayload } from "./user-basic-info-payload";
 import { UserDetail } from "./user-detail";
 import UserForm from "./user-form";
+import { 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";
 
-
-// 为 RemarkForm 组件定义 props 类型
-interface RemarkFormProps {
-  initialRemark?: string | null;
-  onSave: (remark: string) => void;
-  CloseComponent: React.ComponentType<{ asChild?: boolean; children: React.ReactNode }>;
-}
-// 新的子组件，在管理它自己的备注状态
-const RemarkForm: React.FC<RemarkFormProps> = ({ onSave, initialRemark, CloseComponent }) => {
-  const [remark, setRemark] = useState<string>(initialRemark ?? '');
-
-  const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    setRemark(event.target.value);
-  };
-
-  const handleSaveClick = () => {
-    onSave(remark);
-  };
-
-  return (
-      <>
-        <div className='mb-2 text-sm font-semibold'>备注</div>
-        <Input
-            type='text'
-            value={remark}
-            onChange={handleInputChange}
-            placeholder='在此输入备注...'
-            className='w-full'
-        />
-        <CloseComponent asChild>
-          <Button onClick={handleSaveClick} variant='default' size={'sm'} className={'mt-2'}>
-            保存
-          </Button>
-        </CloseComponent>
-      </>
-  );
-};
-
 export default function User() {
   const { t } = useTranslation("user");
   const [loading, setLoading] = useState(false);
@@ -130,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();
@@ -183,8 +152,7 @@ export default function User() {
             onChanged={() => ref.current?.refresh()}
             userId={row.id}
           />,
-          <PreviewNodesDialog key="preview-nodes" userId={row.id} />,
+          /* <ConfirmButton
-         /* <ConfirmButton
             cancelText={t("cancel", "Cancel")}
             confirmText={t("confirm", "Confirm")}
             description={t(
@@ -208,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")}
@@ -293,69 +263,46 @@ export default function User() {
         {
           id: "auth_methods",
           accessorKey: "auth_methods",
-          header: '设备码/邮箱',
+          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 any;
+                user={row.original}
-            const deviceNo = firstDevice?.device_no;
+              />
-            const deviceType = parseDeviceType(firstDevice?.user_agent || "");
+              <Popover>
-            const display = isDevice ? deviceNo || identifier : identifier;
+                <PopoverTrigger>
-            return (
+                  <div className={"flex items-center"}>
-              <div className="flex items-center">
+                    {row.original?.remark ? `（${row.original.remark}）` : ""}
-               {/* <Badge
+                    <FilePenLine className={"ml-2 text-primary"} size={14} />
-                  className="mr-1 uppercase"
+                  </div>
-                  title={method?.verified ? t("verified", "Verified") : ""}
+                </PopoverTrigger>
-                >
+                <PopoverContent className={"w-64"}>
-                  {method?.auth_type}
+                  <RemarkForm
-                </Badge>*/}
+                    initialRemark={row.original.remark}
-                {deviceType && (
+                    onSave={async (remark) => {
-                    <Badge className="mr-1" variant="secondary">
+                      const { data } = await getUserDetail({
-                      {deviceType}
+                        id: row.original.id,
-                    </Badge>
+                      });
-                )}
+                      const user = data.data;
-                <span title={isDevice ? display : undefined}>{display}</span>
+
-                <Popover>
+                      if (!user) {
-                  <PopoverTrigger>
+                        throw new Error("User detail not found");
-                    <div className={'flex items-center'}>
+                      }
-                      {row.original?.remark ? `（${row.original.remark}）` : ''}
+
-                      <FilePenLine size={14} className={'text-primary ml-2'} />
+                      await updateUserBasicInfo(
-                    </div>
+                        buildUserBasicInfoPayload(user, remark)
-                  </PopoverTrigger>
+                      );
-                  <PopoverContent className={'w-64'}>
+                      toast.success(t("updateSuccess"));
-                    <RemarkForm
+                      ref.current?.refresh();
-                        initialRemark={row.original.remark}
+                    }}
-                        CloseComponent={PopoverClose}
+                  />
-                        onSave={async (remark) => {
+                </PopoverContent>
-                          const {
+              </Popover>
-                            auth_methods: _auth_methods,
+            </div>
-                            user_devices: _user_devices,
+          ),
-                            enable_balance_notify: _enable_balance_notify,
-                            enable_login_notify: _enable_login_notify,
-                            enable_subscribe_notify: _enable_subscribe_notify,
-                            enable_trade_notify: _enable_trade_notify,
-                            updated_at: _updated_at,
-                            created_at: _created_at,
-                            id,
-                            ...rest
-                          } = row.original;
-                          await updateUserBasicInfo({
-                            user_id: id,
-                            ...rest,
-                            remark,
-                          } as unknown as API.UpdateUserBasiceInfoRequest);
-                          toast.success(t('updateSuccess'));
-                          ref.current?.refresh();
-                        }}
-                    />
-                  </PopoverContent>
-                </Popover>
-              </div>
-            );
-          },
         },
-       /* {
+        /* {
           id: "balance",
           accessorKey: "balance",
           header: t("balance", "Balance"),
@@ -391,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",
@@ -559,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,
@@ -587,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],
@@ -683,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/remark-form.test.tsx

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

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

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

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

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

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

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

apps/admin/src/sections/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/admin/src/sections/user/user-subscription/index.tsx

@@ -30,13 +30,34 @@ import { Display } from "@/components/display";
 import { useGlobalStore } from "@/stores/global";
 import { formatDate } from "@/utils/common";
 import { SubscriptionDetail } from "./subscription-detail";
-import { SubscriptionForm } from "./subscription-form";
+import {
+  SubscriptionForm,
+  type SubscriptionFormValues,
+} 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);
@@ -166,7 +187,7 @@ export default function UserSubscription({ userId }: { userId: number }) {
                       await updateUserSubscribe({
                         user_id: Number(userId),
                         user_subscribe_id: row.id,
-                        ...values,
+                        ...toUserSubscribePayload(values),
                       });
                       toast.success(t("updateSuccess", "Updated successfully"));
                       ref.current?.refresh();
@@ -296,15 +317,50 @@ export default function UserSubscription({ userId }: { userId: number }) {
             accessorKey: "speed_limit",
             header: t("speedLimit", "Speed Limit"),
             cell: ({ row }) => {
-              const speed = row.original?.subscribe?.speed_limit;
+              const userSpeed = row.original.speed_limit ?? 0;
-              return <Display type="trafficSpeed" value={speed} />;
+              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>
+              );
             },
           },
           {
             accessorKey: "device_limit",
             header: t("deviceLimit", "Device Limit"),
             cell: ({ row }) => {
-              const limit = row.original?.subscribe?.device_limit;
+              const limit =
+                row.original.device_limit ||
+                row.original?.subscribe?.device_limit;
               return <Display type="number" unlimited value={limit} />;
             },
           },
@@ -352,7 +408,7 @@ export default function UserSubscription({ userId }: { userId: number }) {
                 setLoading(true);
                 await createUserSubscribe({
                   user_id: Number(userId),
-                  ...values,
+                  ...toUserSubscribePayload(values),
                 });
                 toast.success(t("createSuccess", "Created successfully"));
                 ref.current?.refresh();

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

@@ -7,6 +7,7 @@ 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";
@@ -16,7 +17,7 @@ import {
   kickOfflineByUserDevice,
 } from "@workspace/ui/services/admin/user";
 import { deviceIdToHash } from "@workspace/ui/utils/device";
-import { AlertTriangle, Gauge } from "lucide-react";
+import { AlertCircle, AlertTriangle, Gauge } from "lucide-react";
 import { type ReactNode, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
@@ -26,20 +27,82 @@ 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(() => {
-    getUserSubscribeById({ id: subscriptionId }).then(({ data }) => {
+    let ignore = false;
-      if (data.data) setDetail(data.data);
+
-    });
+    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;
+    };
   }, [subscriptionId]);
 
-  if (!detail || detail.status !== 1) return null;
+  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>
+    );
+  }
 
-  const baseSpeed = detail.subscribe?.speed_limit ?? 0;
+  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 userSpeed = detail.speed_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 (baseSpeed === 0 && !isThrottled) return null;
+  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>
+    );
+  }
 
   return (
     <div
@@ -54,7 +117,7 @@ function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
       ) : (
         <Gauge className="mt-0.5 h-4 w-4 shrink-0 text-muted-foreground" />
       )}
-      <div className="space-y-1">
+      <div className="min-w-0 flex-1 space-y-3">
         <div className="flex flex-wrap items-center gap-2 font-medium">
           {isThrottled ? (
             <>
@@ -64,6 +127,7 @@ function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
               </Badge>
               {baseSpeed > 0 && (
                 <span className="text-muted-foreground text-xs line-through">
+                  {t("subscriptionDefault", "Subscription Default")}:{" "}
                   {baseSpeed} Mbps
                 </span>
               )}
@@ -81,6 +145,20 @@ 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}
@@ -92,6 +170,46 @@ 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>
+              ))}
+            </div>
+          </div>
+        )}
+      </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>
   );
@@ -155,12 +273,7 @@ export function SubscriptionDetail({
                 accessorKey: "enabled",
                 header: t("enable", "Enable"),
                 cell: ({ row }) => (
-                  <Switch
+                  <Switch checked={row.getValue("enabled")} disabled />
-                    checked={row.getValue("enabled")}
-                    onChange={(checked) => {
-                      console.log("Switch:", checked);
-                    }}
-                  />
                 ),
               },
               { accessorKey: "id", header: "ID" },

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

@@ -3,6 +3,7 @@ import { Button } from "@workspace/ui/components/button";
 import {
   Form,
   FormControl,
+  FormDescription,
   FormField,
   FormItem,
   FormLabel,
@@ -19,10 +20,11 @@ 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 ReactNode, useState } from "react";
+import { type KeyboardEvent, type ReactNode, useState } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { z } from "zod";
@@ -33,18 +35,56 @@ interface Props {
   title: string;
   loading?: boolean;
   initialData?: API.UserSubscribe;
-  onSubmit: (values: any) => Promise<boolean>;
+  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().optional(),
+  traffic: z.number().min(0).optional(),
-  speed_limit: z.number().optional(),
+  speed_limit: z.number().min(0).optional(),
-  device_limit: z.number().optional(),
+  device_limit: z.number().min(0).optional(),
   expired_at: z.number().nullish().optional(),
-  upload: z.number().optional(),
+  upload: z.number().min(0).optional(),
-  download: z.number().optional(),
+  download: z.number().min(0).optional(),
   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 function SubscriptionForm({
@@ -57,11 +97,14 @@ export function SubscriptionForm({
   const { t } = useTranslation("user");
   const [open, setOpen] = useState(false);
 
-  const form = useForm({
+  const form = useForm<SubscriptionFormValues>({
     resolver: zodResolver(formSchema),
     defaultValues: {
       subscribe_id: initialData?.subscribe_id || 0,
       traffic: initialData?.traffic || 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,
@@ -69,7 +112,7 @@ export function SubscriptionForm({
     },
   });
 
-  const handleSubmit = async (values: any) => {
+  const handleSubmit = async (values: SubscriptionFormValues) => {
     const success = await onSubmit(values);
     if (success) {
       setOpen(false);
@@ -135,6 +178,7 @@ export function SubscriptionForm({
                       </FormLabel>
                       <FormControl>
                         <EnhancedInput
+                          min={0}
                           placeholder={t("unlimited", "Unlimited")}
                           type="number"
                           {...field}
@@ -154,6 +198,56 @@ export function SubscriptionForm({
                     </FormItem>
                   )}
                 />
+                <FormField
+                  control={form.control}
+                  name="speed_limit"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>{t("speedLimit", "Speed Limit")}</FormLabel>
+                      <FormControl>
+                        <EnhancedInput
+                          min={0}
+                          placeholder={t("unlimited", "Unlimited")}
+                          type="number"
+                          {...field}
+                          onValueChange={(value) => {
+                            form.setValue(field.name, value as number);
+                          }}
+                          suffix="Mbps"
+                        />
+                      </FormControl>
+                      <FormDescription>
+                        {t(
+                          "userSpeedLimitDescription",
+                          "Set to 0 to use the subscription default speed limit."
+                        )}
+                      </FormDescription>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="device_limit"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>{t("deviceLimit", "Device Limit")}</FormLabel>
+                      <FormControl>
+                        <EnhancedInput
+                          min={0}
+                          placeholder={t("unlimited", "Unlimited")}
+                          step={1}
+                          type="number"
+                          {...field}
+                          onValueChange={(value) => {
+                            form.setValue(field.name, value as number);
+                          }}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
                 <FormField
                   control={form.control}
                   name="upload"
@@ -164,6 +258,7 @@ export function SubscriptionForm({
                       </FormLabel>
                       <FormControl>
                         <EnhancedInput
+                          min={0}
                           placeholder="0"
                           type="number"
                           {...field}
@@ -193,6 +288,7 @@ export function SubscriptionForm({
                       </FormLabel>
                       <FormControl>
                         <EnhancedInput
+                          min={0}
                           placeholder="0"
                           type="number"
                           {...field}
@@ -212,6 +308,119 @@ 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

@@ -40,6 +40,13 @@ import { Display } from "@/components/display";
 import { UserDetail } from "@/sections/user/user-detail";
 import { formatDate } from "@/utils/common";
 
+const WITHDRAWAL_METHOD_MAP: Record<number, string> = {
+  0: "其他",
+  1: "支付宝",
+  2: "微信",
+  3: "USDT(TRC20)",
+};
+
 const rejectSchema = z.object({
   reason: z
     .string()
@@ -48,11 +55,48 @@ const rejectSchema = z.object({
     .max(500, "拒绝原因不能超过 500 个字符"),
 });
 
+function QrCodeCell({ url }: { url?: string }) {
+  const [zoomOpen, setZoomOpen] = useState(false);
+  if (!url) return <span>--</span>;
+  return (
+    <>
+      <button
+        className="block overflow-hidden rounded border"
+        onClick={() => setZoomOpen(true)}
+        type="button"
+      >
+        <img
+          alt="收款码"
+          className="h-12 w-12 cursor-zoom-in object-cover"
+          height={48}
+          src={url}
+          width={48}
+        />
+      </button>
+      {zoomOpen && (
+        <Dialog onOpenChange={setZoomOpen} open={zoomOpen}>
+          <DialogContent className="max-w-sm">
+            <img
+              alt="收款码"
+              className="w-full"
+              height={320}
+              src={url}
+              width={320}
+            />
+          </DialogContent>
+        </Dialog>
+      )}
+    </>
+  );
+}
+
 export default function WithdrawalPage() {
   const { t } = useTranslation("user");
   const ref = useRef<ProTableActions>(null);
   const [rejectOpen, setRejectOpen] = useState(false);
-  const [currentRow, setCurrentRow] = useState<API.WithdrawalLog | null>(null);
+  const [currentRow, setCurrentRow] = useState<API.AdminWithdrawalLog | null>(
+    null
+  );
   const form = useForm<z.infer<typeof rejectSchema>>({
     resolver: zodResolver(rejectSchema),
     defaultValues: {
@@ -93,6 +137,14 @@ export default function WithdrawalPage() {
     { value: "0", label: "审核中" },
     { value: "1", label: "已通过" },
     { value: "2", label: "已拒绝" },
+    { value: "3", label: "已取消" },
+  ];
+
+  const methodOptions = [
+    { value: "1", label: "支付宝" },
+    { value: "2", label: "微信" },
+    { value: "3", label: "USDT(TRC20)" },
+    { value: "0", label: "其他" },
   ];
 
   const statusMap: Record<number, { label: string; className: string }> = {
@@ -108,11 +160,18 @@ export default function WithdrawalPage() {
       label: "已拒绝",
       className: "bg-rose-100 text-rose-700 border-rose-200",
     },
+    3: {
+      label: "已取消",
+      className: "bg-gray-100 text-gray-500 border-gray-200",
+    },
   };
 
   return (
     <>
-      <ProTable<API.WithdrawalLog, { status?: string; user_id?: string }>
+      <ProTable<
+        API.AdminWithdrawalLog,
+        { status?: string; user_id?: string; method?: string }
+      >
         action={ref}
         actions={{
           render: (row) => {
@@ -170,10 +229,30 @@ export default function WithdrawalPage() {
             ),
           },
           {
-            accessorKey: "content",
+            accessorKey: "method",
-            header: "收款信息",
+            header: "收款方式",
+            cell: ({ row }) =>
+              WITHDRAWAL_METHOD_MAP[row.original.method] ?? "--",
+          },
+          {
+            accessorKey: "account",
+            header: "收款账号",
             cell: ({ row }) => (
-              <div className="max-w-[360px] break-all text-sm">
+              <div className="max-w-[200px] break-all text-sm">
+                {row.original.account || "--"}
+              </div>
+            ),
+          },
+          {
+            accessorKey: "qr_code_url",
+            header: "收款码",
+            cell: ({ row }) => <QrCodeCell url={row.original.qr_code_url} />,
+          },
+          {
+            accessorKey: "content",
+            header: "备注",
+            cell: ({ row }) => (
+              <div className="max-w-[200px] break-all text-sm">
                 {row.original.content || "--"}
               </div>
             ),
@@ -216,6 +295,11 @@ export default function WithdrawalPage() {
             options: statusOptions,
             placeholder: "状态",
           },
+          {
+            key: "method",
+            options: methodOptions,
+            placeholder: "收款方式",
+          },
           {
             key: "user_id",
             placeholder: "用户 ID",
@@ -226,6 +310,7 @@ export default function WithdrawalPage() {
             page: pagination.page,
             size: pagination.size,
             status: filter.status ? Number(filter.status) : undefined,
+            method: filter.method ? Number(filter.method) : undefined,
             user_id: filter.user_id ? Number(filter.user_id) : undefined,
           });
 

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

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

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

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

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

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

@@ -17,6 +17,7 @@ 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({
@@ -49,6 +50,9 @@ 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,
@@ -103,7 +107,10 @@ export default function Content({
           navigate({ to: "/purchasing/order", search: { order_no } });
         }
       } catch (error) {
-        console.log(error);
+        setIsEmailValid((prev) => ({
+          ...prev,
+          message: error instanceof Error ? error.message : prev.message,
+        }));
       }
     });
   }, [params, navigate]);
@@ -285,6 +292,7 @@ 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,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

@@ -0,0 +1,33 @@
+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,6 +18,7 @@ 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";
@@ -41,7 +42,12 @@ export default function Purchase({
     coupon: "",
   });
   const [loading, startTransition] = useTransition();
-  const lastSuccessOrderRef = useRef<any>(null);
+  const lastSuccessOrderRef = useRef<API.PreOrderResponse | undefined>(
+    undefined
+  );
+  const selectedDiscount = subscribe?.discount?.find(
+    (item) => item.quantity === params.quantity
+  );
 
   const { data: order } = useQuery({
     enabled: !!subscribe?.id,
@@ -140,6 +146,7 @@ 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

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

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

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

packages/ui/src/composed/pro-table/pro-table.tsx

@@ -39,7 +39,13 @@ import { SortableRow } from "@workspace/ui/composed/pro-table/sortable-row";
 import { ProTableWrapper } from "@workspace/ui/composed/pro-table/wrapper";
 import { cn } from "@workspace/ui/lib/utils";
 import { useSize } from "ahooks";
-import { GripVertical, ListRestart, Loader, RefreshCcw } from "lucide-react";
+import {
+  CircleAlert,
+  GripVertical,
+  ListRestart,
+  Loader,
+  RefreshCcw,
+} from "lucide-react";
 import type React from "react";
 import {
   Fragment,
@@ -79,6 +85,7 @@ export interface ProTableProps<TData, TValue> {
     selectedRowsText: (total: number) => string;
   }>;
   empty?: React.ReactNode;
+  error?: React.ReactNode;
   onSort?: (
     sourceId: string | number,
     targetId: string | number | null,
@@ -104,6 +111,7 @@ export function ProTable<
   action,
   texts,
   empty,
+  error,
   onSort,
   initialFilters,
 }: ProTableProps<TData, TValue>) {
@@ -121,6 +129,8 @@ export function ProTable<
   const [rowSelection, setRowSelection] = useState({});
   const [data, setData] = useState<TData[]>([]);
   const [rowCount, setRowCount] = useState<number>(0);
+  const [isLoading, setIsLoading] = useState(false);
+  const [requestError, setRequestError] = useState(false);
   const [pagination, setPagination] = useState({
     pageIndex: 0,
     pageSize: 200,
@@ -193,6 +203,8 @@ export function ProTable<
   const fetchData = async () => {
     if (loading.current) return;
     loading.current = true;
+    setIsLoading(true);
+    setRequestError(false);
     try {
       const response = await request(
         {
@@ -205,10 +217,13 @@ export function ProTable<
       );
       setData(response.list);
       setRowCount(response.total);
-    } catch (error) {
+    } catch (_error) {
-      console.log("Fetch data error:", error);
+      setData([]);
+      setRowCount(0);
+      setRequestError(true);
     } finally {
       loading.current = false;
+      setIsLoading(false);
     }
   };
   const reset = async () => {
@@ -316,7 +331,16 @@ export function ProTable<
               ))}
             </TableHeader>
             <TableBody>
-              {table.getRowModel()?.rows?.length ? (
+              {requestError ? (
+                <TableRow>
+                  <TableCell
+                    className="py-12"
+                    colSpan={table.getAllLeafColumns().length}
+                  >
+                    {error || <ProTableErrorState />}
+                  </TableCell>
+                </TableRow>
+              ) : table.getRowModel()?.rows?.length ? (
                 onSort ? (
                   table.getRowModel().rows.map((row) => (
                     <SortableRow
@@ -371,7 +395,10 @@ export function ProTable<
                 )
               ) : (
                 <TableRow>
-                  <TableCell className="py-24" colSpan={columns.length + 2}>
+                  <TableCell
+                    className="py-24"
+                    colSpan={table.getAllLeafColumns().length}
+                  >
                     {empty || <Empty />}
                   </TableCell>
                 </TableRow>
@@ -380,8 +407,12 @@ export function ProTable<
           </Table>
         </ProTableWrapper>
 
-        {loading.current && (
+        {isLoading && (
-          <div className="absolute top-0 z-20 flex h-full w-full items-center justify-center bg-muted/80">
+          <div
+            aria-label="Loading data"
+            className="absolute top-0 z-20 flex h-full w-full items-center justify-center bg-muted/80"
+            role="status"
+          >
             <Loader className="h-4 w-4 animate-spin" />
           </div>
         )}
@@ -391,6 +422,16 @@ export function ProTable<
   );
 }
 
+function ProTableErrorState() {
+  return (
+    <Alert className="mx-auto max-w-md" variant="destructive">
+      <CircleAlert aria-hidden="true" />
+      <AlertTitle>Failed to load data</AlertTitle>
+      <AlertDescription>Refresh the table or try again later.</AlertDescription>
+    </Alert>
+  );
+}
+
 function createSelectColumn<TData, TValue>(): ColumnDef<TData, TValue> {
   return {
     id: "selected",

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

@@ -15,6 +15,7 @@ import * as log from "./log";
 import * as marketing from "./marketing";
 import * as order from "./order";
 import * as payment from "./payment";
+import * as promo from "./promo";
 import * as redemption from "./redemption";
 import * as server from "./server";
 import * as subscribe from "./subscribe";
@@ -37,6 +38,7 @@ export default {
   marketing,
   order,
   payment,
+  promo,
   redemption,
   server,
   subscribe,

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

@@ -0,0 +1,19 @@
+/* eslint-disable */
+import request from "@workspace/ui/lib/request";
+
+/** Get global invite list GET /v1/admin/invite/list */
+export async function getAdminInviteList(
+  params: API.GetAdminInviteListParams,
+  options?: Record<string, unknown>
+) {
+  return request<API.Response & { data?: API.GetAdminInviteListResponse }>(
+    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/invite/list`,
+    {
+      method: "GET",
+      params: {
+        ...params,
+      },
+      ...(options || {}),
+    }
+  );
+}

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

@@ -0,0 +1,150 @@
+/* eslint-disable */
+import request from "@workspace/ui/lib/request";
+
+/** Create promo rule POST /v1/admin/promo/rule */
+export async function createPromoRule(
+  body: API.CreatePromoRuleRequest,
+  options?: Record<string, unknown>
+) {
+  return request<API.Response & { data?: API.PromoRule }>(
+    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/rule`,
+    {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      data: body,
+      ...(options || {}),
+    }
+  );
+}
+
+/** Get promo rule list GET /v1/admin/promo/rule/list */
+export async function getPromoRuleList(
+  params: API.GetPromoRuleListParams,
+  options?: Record<string, unknown>
+) {
+  return request<API.Response & { data?: API.GetPromoRuleListResponse }>(
+    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/rule/list`,
+    {
+      method: "GET",
+      params: {
+        ...params,
+      },
+      ...(options || {}),
+    }
+  );
+}
+
+/** Get promo rule detail GET /v1/admin/promo/rule/:id */
+export async function getPromoRuleDetail(
+  params: API.GetPromoRuleDetailParams,
+  options?: Record<string, unknown>
+) {
+  return request<API.Response & { data?: API.PromoRule }>(
+    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/rule/${params.id}`,
+    {
+      method: "GET",
+      ...(options || {}),
+    }
+  );
+}
+
+/** Update promo rule PUT /v1/admin/promo/rule/:id */
+export async function updatePromoRule(
+  params: API.UpdatePromoRuleParams,
+  body: API.UpdatePromoRuleRequest,
+  options?: Record<string, unknown>
+) {
+  return request<API.Response & { data?: API.PromoRule }>(
+    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/rule/${params.id}`,
+    {
+      method: "PUT",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      data: body,
+      ...(options || {}),
+    }
+  );
+}
+
+/** Delete promo rule DELETE /v1/admin/promo/rule/:id */
+export async function deletePromoRule(
+  params: API.DeletePromoRuleParams,
+  options?: Record<string, unknown>
+) {
+  return request<API.Response & { data?: unknown }>(
+    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/rule/${params.id}`,
+    {
+      method: "DELETE",
+      ...(options || {}),
+    }
+  );
+}
+
+/** Create promo price POST /v1/admin/promo/price */
+export async function createPromoPrice(
+  body: API.CreatePromoPriceRequest,
+  options?: Record<string, unknown>
+) {
+  return request<API.Response & { data?: API.PromoPrice }>(
+    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/price`,
+    {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      data: body,
+      ...(options || {}),
+    }
+  );
+}
+
+/** Get promo price list GET /v1/admin/promo/price/list */
+export async function getPromoPriceList(
+  params: API.GetPromoPriceListParams,
+  options?: Record<string, unknown>
+) {
+  return request<API.Response & { data?: API.GetPromoPriceListResponse }>(
+    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/price/list`,
+    {
+      method: "GET",
+      params: {
+        ...params,
+      },
+      ...(options || {}),
+    }
+  );
+}
+
+/** Delete promo price DELETE /v1/admin/promo/price/:id */
+export async function deletePromoPrice(
+  params: API.DeletePromoPriceParams,
+  options?: Record<string, unknown>
+) {
+  return request<API.Response & { data?: unknown }>(
+    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/price/${params.id}`,
+    {
+      method: "DELETE",
+      ...(options || {}),
+    }
+  );
+}
+
+/** Get promo usage list GET /v1/admin/promo/usage/list */
+export async function getPromoUsageList(
+  params: API.GetPromoUsageListParams,
+  options?: Record<string, unknown>
+) {
+  return request<API.Response & { data?: API.GetPromoUsageListResponse }>(
+    `${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/usage/list`,
+    {
+      method: "GET",
+      params: {
+        ...params,
+      },
+      ...(options || {}),
+    }
+  );
+}

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

@@ -28,21 +28,6 @@ declare namespace API {
     updated_at: number;
   };
 
-  type AdminWithdrawalLog = {
-    id: number;
-    user_id: number;
-    amount: number;
-    content: string;
-    status: number;
-    reason?: string;
-    created_at: number;
-    updated_at: number;
-  };
-
-  type ApproveWithdrawalRequest = {
-    withdrawal_id: number;
-  };
-
   type AnyTLS = {
     port: number;
     security_config: SecurityConfig;
@@ -86,18 +71,6 @@ declare namespace API {
     is_default: boolean;
   };
 
-  type GetWithdrawalListParams = {
-    page: number;
-    size: number;
-    user_id?: number;
-    status?: number;
-  };
-
-  type GetWithdrawalListResponse = {
-    list: AdminWithdrawalLog[];
-    total: number;
-  };
-
   type AppUserSubcbribe = {
     id: number;
     name: string;
@@ -299,6 +272,76 @@ declare namespace API {
     enabled: boolean;
   };
 
+  type PromoRuleType = "new_user" | "inactive_user" | "campaign";
+
+  type PromoRuleParams = {
+    inactive_months?: number;
+    window_hours?: number;
+    [key: string]: unknown;
+  };
+
+  type PromoRule = {
+    id: number;
+    name: string;
+    type: PromoRuleType;
+    params: PromoRuleParams;
+    priority: number;
+    enabled: boolean;
+    start_time?: number;
+    end_time?: number;
+    created_at?: number;
+    updated_at?: number;
+  };
+
+  type CreatePromoRuleRequest = {
+    name: string;
+    type: PromoRuleType;
+    params: PromoRuleParams;
+    priority: number;
+    enabled: boolean;
+    start_time?: number;
+    end_time?: number;
+  };
+
+  type UpdatePromoRuleRequest = CreatePromoRuleRequest;
+
+  type PromoPrice = {
+    id: number;
+    promo_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[];
+  };
+
+  type PromoUsage = {
+    id: number;
+    promo_rule_id: number;
+    rule_name?: string;
+    subscribe_id: number;
+    subscribe_name?: string;
+    quantity: number;
+    user_id: number;
+    order_no: string;
+    unit_price: number;
+    promo_price: number;
+    used_at: number;
+  };
+
   type CreateOrderRequest = {
     user_id: number;
     type: number;
@@ -425,6 +468,9 @@ declare namespace API {
     expired_at: number;
     traffic: number;
     subscribe_id: number;
+    speed_limit?: number;
+    device_limit?: number;
+    traffic_limit?: UserSubscribeTrafficLimitRule[];
   };
 
   type CurrencyConfig = {
@@ -953,6 +999,61 @@ declare namespace API {
     list: Coupon[];
   };
 
+  type GetPromoRuleListParams = {
+    page: number;
+    size: number;
+    type?: PromoRuleType;
+    enabled?: boolean;
+    search?: string;
+  };
+
+  type GetPromoRuleListResponse = {
+    total: number;
+    list: PromoRule[];
+  };
+
+  type GetPromoRuleDetailParams = {
+    id: number;
+  };
+
+  type UpdatePromoRuleParams = {
+    id: number;
+  };
+
+  type DeletePromoRuleParams = {
+    id: number;
+  };
+
+  type GetPromoPriceListParams = {
+    page: number;
+    size: number;
+    promo_rule_id?: number;
+    subscribe_id?: number;
+  };
+
+  type GetPromoPriceListResponse = {
+    total: number;
+    list: PromoPrice[];
+  };
+
+  type DeletePromoPriceParams = {
+    id: number;
+  };
+
+  type GetPromoUsageListParams = {
+    page: number;
+    size: number;
+    promo_rule_id?: number;
+    subscribe_id?: number;
+    user_id?: number;
+    order_no?: string;
+  };
+
+  type GetPromoUsageListResponse = {
+    total: number;
+    list: PromoUsage[];
+  };
+
   type GetDetailRequest = {
     id: number;
   };
@@ -1190,6 +1291,7 @@ declare namespace API {
     size: number;
     user_id?: number;
     status?: number;
+    method?: number;
   };
 
   type GetWithdrawalListResponse = {
@@ -1801,11 +1903,6 @@ declare namespace API {
     total: number;
   };
 
-  type RejectWithdrawalRequest = {
-    withdrawal_id: number;
-    reason: string;
-  };
-
   type QuotaTask = {
     id: number;
     subscribers: number[];
@@ -2129,6 +2226,13 @@ 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 = {
@@ -2459,12 +2563,16 @@ declare namespace API {
   };
 
   type UpdateUserSubscribeRequest = {
+    user_id?: number;
     user_subscribe_id: number;
     subscribe_id: number;
     traffic: number;
     expired_at: number;
     upload: number;
     download: number;
+    speed_limit?: number;
+    device_limit?: number;
+    traffic_limit?: UserSubscribeTrafficLimitRule[];
   };
 
   type User = {
@@ -2555,6 +2663,14 @@ declare namespace API {
     traffic: 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;
@@ -2564,6 +2680,13 @@ 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;
@@ -2577,6 +2700,11 @@ declare namespace API {
     traffic: 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;
@@ -2773,6 +2901,35 @@ declare namespace API {
     list: AdminInvitedUser[];
   };
 
+  type GetAdminInviteListParams = {
+    page: number;
+    size: number;
+    search?: string;
+    inviter_id?: number;
+    invitee_id?: number;
+  };
+
+  type AdminInviteRelation = {
+    id?: string;
+    inviter_id: number;
+    inviter_identifier: string;
+    invitee_id: number;
+    invitee_identifier: string;
+    invitee_avatar: string;
+    invitee_enable: boolean;
+    invited_at: number;
+    order_count: number;
+    has_purchased: boolean;
+    inviter_commission: number;
+    inviter_gift_days: number;
+    invitee_gift_days: number;
+  };
+
+  type GetAdminInviteListResponse = {
+    total: number;
+    list: AdminInviteRelation[];
+  };
+
   type ActivateOrderRequest = {
     order_no: string;
   };
@@ -3129,10 +3286,15 @@ declare namespace API {
     id: number;
     user_id: number;
     amount: number;
-    content: string;
+    method: number;
+    account?: string;
+    qr_code_url?: string;
+    content?: string;
     status: number;
     reason?: string;
     created_at: number;
     updated_at: number;
   };
+
+  type AdminWithdrawalLog = WithdrawalLog;
 }

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

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

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

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

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

@@ -910,6 +910,13 @@ 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/announcement.ts

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

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

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

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

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

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

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

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

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

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

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

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

@@ -172,7 +172,14 @@ declare namespace API {
 
   type CommissionWithdrawRequest = {
     amount: number;
-    content: string;
+    method: number;
+    account?: string;
+    qr_code_url?: string;
+    content?: string;
+  };
+
+  type WithdrawalCancelRequest = {
+    withdrawal_id: number;
   };
 
   type Coupon = {
@@ -541,6 +548,7 @@ declare namespace API {
     price: number;
     amount: number;
     discount: number;
+    promo_discount: number;
     gift_amount: number;
     coupon: string;
     coupon_discount: number;
@@ -1012,6 +1020,14 @@ 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 = {
@@ -1296,7 +1312,10 @@ declare namespace API {
     id: number;
     user_id: number;
     amount: number;
-    content: string;
+    method: number;
+    account?: string;
+    qr_code_url?: string;
+    content?: string;
     status: number;
     reason?: string;
     created_at: number;

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

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