Compare commits

..

2 Commits

Author SHA1 Message Date
shanshanzhong147 7bc1e58bc1 chore: 调整 dashboard 续费英文文案 2026-05-24 17:48:31 -07:00
shanshanzhong147 057cafd9a3 feat: add admin order refund action 2026-05-24 09:11:02 -07:00
24 changed files with 86 additions and 1187 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
# API base URL # API base URL
VITE_API_BASE_URL=https://tapi.hifast.biz VITE_API_BASE_URL=
# API prefix path # API prefix path
VITE_API_PREFIX= VITE_API_PREFIX=
@@ -34,6 +34,5 @@
"Traffic Details": "Traffic Details", "Traffic Details": "Traffic Details",
"Device Group": "Device Group", "Device Group": "Device Group",
"User Management": "User Management", "User Management": "User Management",
"Users & Support": "Users & Support", "Users & Support": "Users & Support"
"Withdrawal Management": "Withdrawal Management"
} }
@@ -34,6 +34,5 @@
"Traffic Details": "流量详情", "Traffic Details": "流量详情",
"Device Group": "设备组", "Device Group": "设备组",
"User Management": "用户管理", "User Management": "用户管理",
"Users & Support": "用户与支持", "Users & Support": "用户与支持"
"Withdrawal Management": "提现管理"
} }
-5
View File
@@ -93,11 +93,6 @@ export function useNavs() {
url: "/dashboard/user", url: "/dashboard/user",
icon: "flat-color-icons:conference-call", icon: "flat-color-icons:conference-call",
}, },
{
title: t("Withdrawal Management", "Withdrawal Management"),
url: "/dashboard/withdrawal",
icon: "flat-color-icons:money-transfer",
},
{ {
title: t("Device Group", "Device Group"), title: t("Device Group", "Device Group"),
url: "/dashboard/family", url: "/dashboard/family",
-51
View File
@@ -15,14 +15,8 @@ import { Route as rootRouteImport } from './routes/__root'
const DashboardRouteLazyRouteImport = createFileRoute('/dashboard')() const DashboardRouteLazyRouteImport = createFileRoute('/dashboard')()
const IndexLazyRouteImport = createFileRoute('/')() const IndexLazyRouteImport = createFileRoute('/')()
const DashboardIndexLazyRouteImport = createFileRoute('/dashboard/')() const DashboardIndexLazyRouteImport = createFileRoute('/dashboard/')()
const DashboardWithdrawalLazyRouteImport = createFileRoute(
'/dashboard/withdrawal',
)()
const DashboardServersLazyRouteImport = createFileRoute('/dashboard/servers')() const DashboardServersLazyRouteImport = createFileRoute('/dashboard/servers')()
const DashboardNodesLazyRouteImport = createFileRoute('/dashboard/nodes')() const DashboardNodesLazyRouteImport = createFileRoute('/dashboard/nodes')()
const DashboardWithdrawalIndexLazyRouteImport = createFileRoute(
'/dashboard/withdrawal/',
)()
const DashboardUserIndexLazyRouteImport = createFileRoute('/dashboard/user/')() const DashboardUserIndexLazyRouteImport = createFileRoute('/dashboard/user/')()
const DashboardTicketIndexLazyRouteImport = const DashboardTicketIndexLazyRouteImport =
createFileRoute('/dashboard/ticket/')() createFileRoute('/dashboard/ticket/')()
@@ -115,13 +109,6 @@ const DashboardIndexLazyRoute = DashboardIndexLazyRouteImport.update({
} as any).lazy(() => } as any).lazy(() =>
import('./routes/dashboard/index.lazy').then((d) => d.Route), import('./routes/dashboard/index.lazy').then((d) => d.Route),
) )
const DashboardWithdrawalLazyRoute = DashboardWithdrawalLazyRouteImport.update({
id: '/withdrawal',
path: '/withdrawal',
getParentRoute: () => DashboardRouteLazyRoute,
} as any).lazy(() =>
import('./routes/dashboard/withdrawal.lazy').then((d) => d.Route),
)
const DashboardServersLazyRoute = DashboardServersLazyRouteImport.update({ const DashboardServersLazyRoute = DashboardServersLazyRouteImport.update({
id: '/servers', id: '/servers',
path: '/servers', path: '/servers',
@@ -136,14 +123,6 @@ const DashboardNodesLazyRoute = DashboardNodesLazyRouteImport.update({
} as any).lazy(() => } as any).lazy(() =>
import('./routes/dashboard/nodes.lazy').then((d) => d.Route), import('./routes/dashboard/nodes.lazy').then((d) => d.Route),
) )
const DashboardWithdrawalIndexLazyRoute =
DashboardWithdrawalIndexLazyRouteImport.update({
id: '/withdrawal/',
path: '/withdrawal/',
getParentRoute: () => DashboardRouteLazyRoute,
} as any).lazy(() =>
import('./routes/dashboard/withdrawal/index.lazy').then((d) => d.Route),
)
const DashboardUserIndexLazyRoute = DashboardUserIndexLazyRouteImport.update({ const DashboardUserIndexLazyRoute = DashboardUserIndexLazyRouteImport.update({
id: '/user/', id: '/user/',
path: '/user/', path: '/user/',
@@ -367,7 +346,6 @@ export interface FileRoutesByFullPath {
'/dashboard': typeof DashboardRouteLazyRouteWithChildren '/dashboard': typeof DashboardRouteLazyRouteWithChildren
'/dashboard/nodes': typeof DashboardNodesLazyRoute '/dashboard/nodes': typeof DashboardNodesLazyRoute
'/dashboard/servers': typeof DashboardServersLazyRoute '/dashboard/servers': typeof DashboardServersLazyRoute
'/dashboard/withdrawal': typeof DashboardWithdrawalLazyRoute
'/dashboard/': typeof DashboardIndexLazyRoute '/dashboard/': typeof DashboardIndexLazyRoute
'/dashboard/log/balance': typeof DashboardLogBalanceLazyRoute '/dashboard/log/balance': typeof DashboardLogBalanceLazyRoute
'/dashboard/log/commission': typeof DashboardLogCommissionLazyRoute '/dashboard/log/commission': typeof DashboardLogCommissionLazyRoute
@@ -397,13 +375,11 @@ export interface FileRoutesByFullPath {
'/dashboard/system': typeof DashboardSystemIndexLazyRoute '/dashboard/system': typeof DashboardSystemIndexLazyRoute
'/dashboard/ticket': typeof DashboardTicketIndexLazyRoute '/dashboard/ticket': typeof DashboardTicketIndexLazyRoute
'/dashboard/user': typeof DashboardUserIndexLazyRoute '/dashboard/user': typeof DashboardUserIndexLazyRoute
'/dashboard/withdrawal': typeof DashboardWithdrawalIndexLazyRoute
} }
export interface FileRoutesByTo { export interface FileRoutesByTo {
'/': typeof IndexLazyRoute '/': typeof IndexLazyRoute
'/dashboard/nodes': typeof DashboardNodesLazyRoute '/dashboard/nodes': typeof DashboardNodesLazyRoute
'/dashboard/servers': typeof DashboardServersLazyRoute '/dashboard/servers': typeof DashboardServersLazyRoute
'/dashboard/withdrawal': typeof DashboardWithdrawalLazyRoute
'/dashboard': typeof DashboardIndexLazyRoute '/dashboard': typeof DashboardIndexLazyRoute
'/dashboard/log/balance': typeof DashboardLogBalanceLazyRoute '/dashboard/log/balance': typeof DashboardLogBalanceLazyRoute
'/dashboard/log/commission': typeof DashboardLogCommissionLazyRoute '/dashboard/log/commission': typeof DashboardLogCommissionLazyRoute
@@ -433,7 +409,6 @@ export interface FileRoutesByTo {
'/dashboard/system': typeof DashboardSystemIndexLazyRoute '/dashboard/system': typeof DashboardSystemIndexLazyRoute
'/dashboard/ticket': typeof DashboardTicketIndexLazyRoute '/dashboard/ticket': typeof DashboardTicketIndexLazyRoute
'/dashboard/user': typeof DashboardUserIndexLazyRoute '/dashboard/user': typeof DashboardUserIndexLazyRoute
'/dashboard/withdrawal': typeof DashboardWithdrawalIndexLazyRoute
} }
export interface FileRoutesById { export interface FileRoutesById {
__root__: typeof rootRouteImport __root__: typeof rootRouteImport
@@ -441,7 +416,6 @@ export interface FileRoutesById {
'/dashboard': typeof DashboardRouteLazyRouteWithChildren '/dashboard': typeof DashboardRouteLazyRouteWithChildren
'/dashboard/nodes': typeof DashboardNodesLazyRoute '/dashboard/nodes': typeof DashboardNodesLazyRoute
'/dashboard/servers': typeof DashboardServersLazyRoute '/dashboard/servers': typeof DashboardServersLazyRoute
'/dashboard/withdrawal': typeof DashboardWithdrawalLazyRoute
'/dashboard/': typeof DashboardIndexLazyRoute '/dashboard/': typeof DashboardIndexLazyRoute
'/dashboard/log/balance': typeof DashboardLogBalanceLazyRoute '/dashboard/log/balance': typeof DashboardLogBalanceLazyRoute
'/dashboard/log/commission': typeof DashboardLogCommissionLazyRoute '/dashboard/log/commission': typeof DashboardLogCommissionLazyRoute
@@ -471,7 +445,6 @@ export interface FileRoutesById {
'/dashboard/system/': typeof DashboardSystemIndexLazyRoute '/dashboard/system/': typeof DashboardSystemIndexLazyRoute
'/dashboard/ticket/': typeof DashboardTicketIndexLazyRoute '/dashboard/ticket/': typeof DashboardTicketIndexLazyRoute
'/dashboard/user/': typeof DashboardUserIndexLazyRoute '/dashboard/user/': typeof DashboardUserIndexLazyRoute
'/dashboard/withdrawal/': typeof DashboardWithdrawalIndexLazyRoute
} }
export interface FileRouteTypes { export interface FileRouteTypes {
fileRoutesByFullPath: FileRoutesByFullPath fileRoutesByFullPath: FileRoutesByFullPath
@@ -480,7 +453,6 @@ export interface FileRouteTypes {
| '/dashboard' | '/dashboard'
| '/dashboard/nodes' | '/dashboard/nodes'
| '/dashboard/servers' | '/dashboard/servers'
| '/dashboard/withdrawal'
| '/dashboard/' | '/dashboard/'
| '/dashboard/log/balance' | '/dashboard/log/balance'
| '/dashboard/log/commission' | '/dashboard/log/commission'
@@ -510,13 +482,11 @@ export interface FileRouteTypes {
| '/dashboard/system' | '/dashboard/system'
| '/dashboard/ticket' | '/dashboard/ticket'
| '/dashboard/user' | '/dashboard/user'
| '/dashboard/withdrawal'
fileRoutesByTo: FileRoutesByTo fileRoutesByTo: FileRoutesByTo
to: to:
| '/' | '/'
| '/dashboard/nodes' | '/dashboard/nodes'
| '/dashboard/servers' | '/dashboard/servers'
| '/dashboard/withdrawal'
| '/dashboard' | '/dashboard'
| '/dashboard/log/balance' | '/dashboard/log/balance'
| '/dashboard/log/commission' | '/dashboard/log/commission'
@@ -546,14 +516,12 @@ export interface FileRouteTypes {
| '/dashboard/system' | '/dashboard/system'
| '/dashboard/ticket' | '/dashboard/ticket'
| '/dashboard/user' | '/dashboard/user'
| '/dashboard/withdrawal'
id: id:
| '__root__' | '__root__'
| '/' | '/'
| '/dashboard' | '/dashboard'
| '/dashboard/nodes' | '/dashboard/nodes'
| '/dashboard/servers' | '/dashboard/servers'
| '/dashboard/withdrawal'
| '/dashboard/' | '/dashboard/'
| '/dashboard/log/balance' | '/dashboard/log/balance'
| '/dashboard/log/commission' | '/dashboard/log/commission'
@@ -583,7 +551,6 @@ export interface FileRouteTypes {
| '/dashboard/system/' | '/dashboard/system/'
| '/dashboard/ticket/' | '/dashboard/ticket/'
| '/dashboard/user/' | '/dashboard/user/'
| '/dashboard/withdrawal/'
fileRoutesById: FileRoutesById fileRoutesById: FileRoutesById
} }
export interface RootRouteChildren { export interface RootRouteChildren {
@@ -614,13 +581,6 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof DashboardIndexLazyRouteImport preLoaderRoute: typeof DashboardIndexLazyRouteImport
parentRoute: typeof DashboardRouteLazyRoute parentRoute: typeof DashboardRouteLazyRoute
} }
'/dashboard/withdrawal': {
id: '/dashboard/withdrawal'
path: '/withdrawal'
fullPath: '/dashboard/withdrawal'
preLoaderRoute: typeof DashboardWithdrawalLazyRouteImport
parentRoute: typeof DashboardRouteLazyRoute
}
'/dashboard/servers': { '/dashboard/servers': {
id: '/dashboard/servers' id: '/dashboard/servers'
path: '/servers' path: '/servers'
@@ -635,13 +595,6 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof DashboardNodesLazyRouteImport preLoaderRoute: typeof DashboardNodesLazyRouteImport
parentRoute: typeof DashboardRouteLazyRoute parentRoute: typeof DashboardRouteLazyRoute
} }
'/dashboard/withdrawal/': {
id: '/dashboard/withdrawal/'
path: '/withdrawal'
fullPath: '/dashboard/withdrawal'
preLoaderRoute: typeof DashboardWithdrawalIndexLazyRouteImport
parentRoute: typeof DashboardRouteLazyRoute
}
'/dashboard/user/': { '/dashboard/user/': {
id: '/dashboard/user/' id: '/dashboard/user/'
path: '/user' path: '/user'
@@ -844,7 +797,6 @@ declare module '@tanstack/react-router' {
interface DashboardRouteLazyRouteChildren { interface DashboardRouteLazyRouteChildren {
DashboardNodesLazyRoute: typeof DashboardNodesLazyRoute DashboardNodesLazyRoute: typeof DashboardNodesLazyRoute
DashboardServersLazyRoute: typeof DashboardServersLazyRoute DashboardServersLazyRoute: typeof DashboardServersLazyRoute
DashboardWithdrawalLazyRoute: typeof DashboardWithdrawalLazyRoute
DashboardIndexLazyRoute: typeof DashboardIndexLazyRoute DashboardIndexLazyRoute: typeof DashboardIndexLazyRoute
DashboardLogBalanceLazyRoute: typeof DashboardLogBalanceLazyRoute DashboardLogBalanceLazyRoute: typeof DashboardLogBalanceLazyRoute
DashboardLogCommissionLazyRoute: typeof DashboardLogCommissionLazyRoute DashboardLogCommissionLazyRoute: typeof DashboardLogCommissionLazyRoute
@@ -874,13 +826,11 @@ interface DashboardRouteLazyRouteChildren {
DashboardSystemIndexLazyRoute: typeof DashboardSystemIndexLazyRoute DashboardSystemIndexLazyRoute: typeof DashboardSystemIndexLazyRoute
DashboardTicketIndexLazyRoute: typeof DashboardTicketIndexLazyRoute DashboardTicketIndexLazyRoute: typeof DashboardTicketIndexLazyRoute
DashboardUserIndexLazyRoute: typeof DashboardUserIndexLazyRoute DashboardUserIndexLazyRoute: typeof DashboardUserIndexLazyRoute
DashboardWithdrawalIndexLazyRoute: typeof DashboardWithdrawalIndexLazyRoute
} }
const DashboardRouteLazyRouteChildren: DashboardRouteLazyRouteChildren = { const DashboardRouteLazyRouteChildren: DashboardRouteLazyRouteChildren = {
DashboardNodesLazyRoute: DashboardNodesLazyRoute, DashboardNodesLazyRoute: DashboardNodesLazyRoute,
DashboardServersLazyRoute: DashboardServersLazyRoute, DashboardServersLazyRoute: DashboardServersLazyRoute,
DashboardWithdrawalLazyRoute: DashboardWithdrawalLazyRoute,
DashboardIndexLazyRoute: DashboardIndexLazyRoute, DashboardIndexLazyRoute: DashboardIndexLazyRoute,
DashboardLogBalanceLazyRoute: DashboardLogBalanceLazyRoute, DashboardLogBalanceLazyRoute: DashboardLogBalanceLazyRoute,
DashboardLogCommissionLazyRoute: DashboardLogCommissionLazyRoute, DashboardLogCommissionLazyRoute: DashboardLogCommissionLazyRoute,
@@ -910,7 +860,6 @@ const DashboardRouteLazyRouteChildren: DashboardRouteLazyRouteChildren = {
DashboardSystemIndexLazyRoute: DashboardSystemIndexLazyRoute, DashboardSystemIndexLazyRoute: DashboardSystemIndexLazyRoute,
DashboardTicketIndexLazyRoute: DashboardTicketIndexLazyRoute, DashboardTicketIndexLazyRoute: DashboardTicketIndexLazyRoute,
DashboardUserIndexLazyRoute: DashboardUserIndexLazyRoute, DashboardUserIndexLazyRoute: DashboardUserIndexLazyRoute,
DashboardWithdrawalIndexLazyRoute: DashboardWithdrawalIndexLazyRoute,
} }
const DashboardRouteLazyRouteWithChildren = const DashboardRouteLazyRouteWithChildren =
@@ -1,6 +0,0 @@
import { createLazyFileRoute } from "@tanstack/react-router";
import WithdrawalManagementPage from "@/sections/withdrawal";
export const Route = createLazyFileRoute("/dashboard/withdrawal")({
component: WithdrawalManagementPage,
});
@@ -1,6 +0,0 @@
import { createLazyFileRoute } from "@tanstack/react-router";
import WithdrawalPage from "@/sections/withdrawal";
export const Route = createLazyFileRoute("/dashboard/withdrawal/")({
component: WithdrawalPage,
});
+69 -43
View File
@@ -16,11 +16,6 @@ import {
DropdownMenuTrigger, DropdownMenuTrigger,
} from "@workspace/ui/components/dropdown-menu"; } from "@workspace/ui/components/dropdown-menu";
import { Input } from "@workspace/ui/components/input"; import { Input } from "@workspace/ui/components/input";
import {
Popover,
PopoverContent,
PopoverTrigger,
} from "@workspace/ui/components/popover";
import { ScrollArea } from "@workspace/ui/components/scroll-area"; import { ScrollArea } from "@workspace/ui/components/scroll-area";
import { import {
Select, Select,
@@ -36,6 +31,13 @@ import {
SheetTitle, SheetTitle,
SheetTrigger, SheetTrigger,
} from "@workspace/ui/components/sheet"; } 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 { Switch } from "@workspace/ui/components/switch";
import { import {
Tabs, Tabs,
@@ -61,16 +63,13 @@ import {
updateUserBasicInfo, updateUserBasicInfo,
} from "@workspace/ui/services/admin/user"; } from "@workspace/ui/services/admin/user";
import { parseDeviceType } from "@workspace/ui/utils/device"; import { parseDeviceType } from "@workspace/ui/utils/device";
import { FilePenLine } from "lucide-react"; import React, { useRef, useState, useCallback } from 'react';
import { useCallback, useRef, useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { toast } from "sonner"; import { toast } from "sonner";
import { Display } from "@/components/display"; import { Display } from "@/components/display";
import { useSubscribe } from "@/stores/subscribe"; import { useSubscribe } from "@/stores/subscribe";
import { formatDate } from "@/utils/common"; import { formatDate } from "@/utils/common";
import FamilyManagement from "./family"; import FamilyManagement from "./family";
import { RemarkForm } from "./remark-form";
import { buildUserBasicInfoPayload } from "./user-basic-info-payload";
import { UserDetail } from "./user-detail"; import { UserDetail } from "./user-detail";
import UserForm from "./user-form"; import UserForm from "./user-form";
import { UserInviteStatsSheet } from "./user-invite-stats-sheet"; import { UserInviteStatsSheet } from "./user-invite-stats-sheet";
@@ -78,11 +77,44 @@ import { AuthMethodsForm } from "./user-profile/auth-methods-form";
import { BasicInfoForm } from "./user-profile/basic-info-form"; import { BasicInfoForm } from "./user-profile/basic-info-form";
import { NotifySettingsForm } from "./user-profile/notify-settings-form"; import { NotifySettingsForm } from "./user-profile/notify-settings-form";
import UserSubscription from "./user-subscription"; import UserSubscription from "./user-subscription";
// import EditUserGroupDialog from "./edit-user-group-dialog"; // import EditUserGroupDialog from "./edit-user-group-dialog";
type UserDeviceWithDeviceNo = API.UserDevice & {
device_no?: string; // 为 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() { export default function User() {
@@ -152,7 +184,7 @@ export default function User() {
userId={row.id} userId={row.id}
/>, />,
<PreviewNodesDialog key="preview-nodes" userId={row.id} />, <PreviewNodesDialog key="preview-nodes" userId={row.id} />,
/* <ConfirmButton /* <ConfirmButton
cancelText={t("cancel", "Cancel")} cancelText={t("cancel", "Cancel")}
confirmText={t("confirm", "Confirm")} confirmText={t("confirm", "Confirm")}
description={t( description={t(
@@ -261,57 +293,51 @@ export default function User() {
{ {
id: "auth_methods", id: "auth_methods",
accessorKey: "auth_methods", accessorKey: "auth_methods",
header: "设备码/邮箱", header: '设备码/邮箱',
cell: ({ row }) => { cell: ({ row }) => {
const method = row.original.auth_methods?.[0]; const method = row.original.auth_methods?.[0];
const identifier = method?.auth_identifier || ""; const identifier = method?.auth_identifier || "";
const isDevice = method?.auth_type === "device"; const isDevice = method?.auth_type === "device";
const firstDevice = row.original.user_devices?.[0] as const firstDevice = row.original.user_devices?.[0] as any;
| UserDeviceWithDeviceNo
| undefined;
const deviceNo = firstDevice?.device_no; const deviceNo = firstDevice?.device_no;
const deviceType = parseDeviceType(firstDevice?.user_agent || ""); const deviceType = parseDeviceType(firstDevice?.user_agent || "");
const display = isDevice ? deviceNo || identifier : identifier; const display = isDevice ? deviceNo || identifier : identifier;
return ( return (
<div className="flex items-center"> <div className="flex items-center">
{/* <Badge {/* <Badge
className="mr-1 uppercase" className="mr-1 uppercase"
title={method?.verified ? t("verified", "Verified") : ""} title={method?.verified ? t("verified", "Verified") : ""}
> >
{method?.auth_type} {method?.auth_type}
</Badge>*/} </Badge>*/}
{deviceType && ( {deviceType && (
<Badge className="mr-1" variant="secondary"> <Badge className="mr-1" variant="secondary">
{deviceType} {deviceType}
</Badge> </Badge>
)} )}
<span title={isDevice ? display : undefined}>{display}</span> <span title={isDevice ? display : undefined}>{display}</span>
<Popover> <Popover>
<PopoverTrigger> <PopoverTrigger>
<div className={"flex items-center"}> <div className={'flex items-center'}>
{row.original?.remark ? `${row.original.remark}` : ""} {row.original?.remark ? `${row.original.remark}` : ''}
<FilePenLine className={"ml-2 text-primary"} size={14} /> <FilePenLine size={14} className={'text-primary ml-2'} />
</div> </div>
</PopoverTrigger> </PopoverTrigger>
<PopoverContent className={"w-64"}> <PopoverContent className={'w-64'}>
<RemarkForm <RemarkForm
initialRemark={row.original.remark} initialRemark={row.original.remark}
onSave={async (remark) => { CloseComponent={PopoverClose}
const { data } = await getUserDetail({ onSave={async (remark) => {
id: row.original.id, const {
}); id,
const user = data.data; } = row.original;
await updateUserBasicInfo({
if (!user) { user_id: id,
throw new Error("User detail not found"); remark,
} } as unknown as API.UpdateUserBasiceInfoRequest);
toast.success(t('updateSuccess'));
await updateUserBasicInfo( ref.current?.refresh();
buildUserBasicInfoPayload(user, remark) }}
);
toast.success(t("updateSuccess"));
ref.current?.refresh();
}}
/> />
</PopoverContent> </PopoverContent>
</Popover> </Popover>
@@ -319,7 +345,7 @@ export default function User() {
); );
}, },
}, },
/* { /* {
id: "balance", id: "balance",
accessorKey: "balance", accessorKey: "balance",
header: t("balance", "Balance"), header: t("balance", "Balance"),
@@ -1,85 +0,0 @@
/**
* @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();
});
});
@@ -1,69 +0,0 @@
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>
);
}
@@ -1,53 +0,0 @@
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("");
});
});
@@ -1,26 +0,0 @@
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,
};
}
@@ -1,302 +0,0 @@
"use client";
import { zodResolver } from "@hookform/resolvers/zod";
import { useMutation } from "@tanstack/react-query";
import { Badge } from "@workspace/ui/components/badge";
import { Button } from "@workspace/ui/components/button";
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
} from "@workspace/ui/components/dialog";
import {
Form,
FormControl,
FormField,
FormItem,
FormLabel,
FormMessage,
} from "@workspace/ui/components/form";
import { Textarea } from "@workspace/ui/components/textarea";
import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
import {
ProTable,
type ProTableActions,
} from "@workspace/ui/composed/pro-table/pro-table";
import {
approveWithdrawal,
getWithdrawalList,
rejectWithdrawal,
} from "@workspace/ui/services/admin/withdrawal";
import { useRef, useState } from "react";
import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next";
import { toast } from "sonner";
import { z } from "zod";
import { Display } from "@/components/display";
import { UserDetail } from "@/sections/user/user-detail";
import { formatDate } from "@/utils/common";
const rejectSchema = z.object({
reason: z
.string()
.trim()
.min(2, "请填写拒绝原因")
.max(500, "拒绝原因不能超过 500 个字符"),
});
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 form = useForm<z.infer<typeof rejectSchema>>({
resolver: zodResolver(rejectSchema),
defaultValues: {
reason: "",
},
});
const approveMutation = useMutation({
mutationFn: async (withdrawalId: number) =>
approveWithdrawal({ withdrawal_id: withdrawalId }),
onSuccess: () => {
toast.success("提现申请已通过");
ref.current?.refresh();
},
onError: (error) => {
console.error("Approve withdrawal failed", error);
toast.error("提现通过失败");
},
});
const rejectMutation = useMutation({
mutationFn: async (values: { withdrawal_id: number; reason: string }) =>
rejectWithdrawal(values),
onSuccess: () => {
toast.success("提现申请已拒绝");
setRejectOpen(false);
setCurrentRow(null);
form.reset({ reason: "" });
ref.current?.refresh();
},
onError: (error) => {
console.error("Reject withdrawal failed", error);
toast.error("提现拒绝失败");
},
});
const statusOptions = [
{ value: "0", label: "审核中" },
{ value: "1", label: "已通过" },
{ value: "2", label: "已拒绝" },
];
const statusMap: Record<number, { label: string; className: string }> = {
0: {
label: "审核中",
className: "bg-amber-100 text-amber-700 border-amber-200",
},
1: {
label: "已通过",
className: "bg-emerald-100 text-emerald-700 border-emerald-200",
},
2: {
label: "已拒绝",
className: "bg-rose-100 text-rose-700 border-rose-200",
},
};
return (
<>
<ProTable<API.WithdrawalLog, { status?: string; user_id?: string }>
action={ref}
actions={{
render: (row) => {
if (row.status !== 0) return [];
return [
<ConfirmButton
cancelText={t("cancel", "Cancel")}
confirmText={t("confirm", "Confirm")}
description="确认后将标记该提现为已通过,请确保线下打款流程已完成。"
key="approve"
onConfirm={async () => {
await approveMutation.mutateAsync(row.id);
}}
title="确认通过提现吗?"
trigger={
<Button
disabled={approveMutation.isPending}
size="sm"
variant="default"
>
</Button>
}
/>,
<Button
key="reject"
onClick={() => {
setCurrentRow(row);
setRejectOpen(true);
}}
size="sm"
variant="destructive"
>
</Button>,
];
},
}}
columns={[
{
accessorKey: "id",
header: "ID",
},
{
accessorKey: "user_id",
header: t("user", "User"),
cell: ({ row }) => <UserDetail id={row.original.user_id} />,
},
{
accessorKey: "amount",
header: "提现金额",
cell: ({ row }) => (
<Display type="currency" value={row.original.amount} />
),
},
{
accessorKey: "content",
header: "收款信息",
cell: ({ row }) => (
<div className="max-w-[360px] break-all text-sm">
{row.original.content || "--"}
</div>
),
},
{
accessorKey: "status",
header: "状态",
cell: ({ row }) => {
const status = statusMap[row.original.status] ?? {
label: `未知 (${row.original.status})`,
className: "",
};
return (
<Badge className={status.className} variant="outline">
{status.label}
</Badge>
);
},
},
{
accessorKey: "reason",
header: "拒绝原因",
cell: ({ row }) => row.original.reason || "--",
},
{
accessorKey: "created_at",
header: "申请时间",
cell: ({ row }) => formatDate(row.original.created_at),
},
{
accessorKey: "updated_at",
header: "更新时间",
cell: ({ row }) => formatDate(row.original.updated_at),
},
]}
header={{ title: "提现管理" }}
params={[
{
key: "status",
options: statusOptions,
placeholder: "状态",
},
{
key: "user_id",
placeholder: "用户 ID",
},
]}
request={async (pagination, filter) => {
const { data } = await getWithdrawalList({
page: pagination.page,
size: pagination.size,
status: filter.status ? Number(filter.status) : undefined,
user_id: filter.user_id ? Number(filter.user_id) : undefined,
});
return {
list: data.data?.list || [],
total: data.data?.total || 0,
};
}}
/>
<Dialog
onOpenChange={(open) => {
setRejectOpen(open);
if (!open) {
setCurrentRow(null);
form.reset({ reason: "" });
}
}}
open={rejectOpen}
>
<DialogContent>
<DialogHeader>
<DialogTitle></DialogTitle>
<DialogDescription>
</DialogDescription>
</DialogHeader>
<Form {...form}>
<form
className="space-y-4"
onSubmit={form.handleSubmit(async (values) => {
if (!currentRow) return;
await rejectMutation.mutateAsync({
withdrawal_id: currentRow.id,
reason: values.reason.trim(),
});
})}
>
<FormField
control={form.control}
name="reason"
render={({ field }) => (
<FormItem>
<FormLabel></FormLabel>
<FormControl>
<Textarea
placeholder="请输入拒绝原因,用户端会看到这条说明"
rows={5}
{...field}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<DialogFooter>
<Button
onClick={() => setRejectOpen(false)}
type="button"
variant="outline"
>
{t("cancel", "Cancel")}
</Button>
<Button disabled={rejectMutation.isPending} type="submit">
{rejectMutation.isPending ? "提交中..." : "确认拒绝"}
</Button>
</DialogFooter>
</form>
</Form>
</DialogContent>
</Dialog>
</>
);
}
@@ -1,37 +1,11 @@
{ {
"accountInfo": "Payout Details",
"accountPlaceholder": "Enter bank card, Alipay, USDT wallet, or other payout details",
"accountRequired": "Payout details are required",
"accountTooLong": "Payout details must be 200 characters or fewer",
"amountInvalid": "Enter a valid amount",
"amountPositive": "Withdrawal amount must be greater than 0",
"applyTime": "Applied At",
"applyWithdraw": "Request Withdrawal",
"cancel": "Cancel",
"commissionInfo": "Commission Info", "commissionInfo": "Commission Info",
"commissionRate": "Commission Rate", "commissionRate": "Commission Rate",
"copyInviteLink": "Copy Invite Link", "copyInviteLink": "Copy Invite Link",
"copySuccess": "Copy Success", "copySuccess": "Copy Success",
"currentCommission": "Current Commission",
"inviteCode": "Invite Code", "inviteCode": "Invite Code",
"inviteRecords": "Invite Records", "inviteRecords": "Invite Records",
"noReason": "None",
"rejectReason": "Reject Reason",
"registrationTime": "Registration Time", "registrationTime": "Registration Time",
"submitWithdraw": "Submit Request",
"submitting": "Submitting...",
"totalCommission": "Total Commission", "totalCommission": "Total Commission",
"unknownStatus": "Unknown Status", "userIdentifier": "User Identifier"
"userIdentifier": "User Identifier",
"withdrawAmount": "Withdrawal Amount",
"withdrawAmountPlaceholder": "Enter the withdrawal amount in dollars",
"withdrawDescription": "Submit the withdrawal amount and payout details, then wait for review.",
"withdrawError": "Failed to submit withdrawal request",
"withdrawRecords": "Withdrawal Records",
"withdrawStatus": {
"approved": "Approved",
"pending": "Pending Review",
"rejected": "Rejected"
},
"withdrawSuccess": "Withdrawal request submitted"
} }
@@ -1,37 +1,11 @@
{ {
"accountInfo": "收款信息",
"accountPlaceholder": "请输入银行卡、支付宝、USDT 地址等收款信息",
"accountRequired": "请填写收款信息",
"accountTooLong": "收款信息不能超过 200 个字符",
"amountInvalid": "请输入有效金额",
"amountPositive": "提现金额必须大于 0",
"applyTime": "申请时间",
"applyWithdraw": "申请提现",
"cancel": "取消",
"commissionInfo": "佣金信息", "commissionInfo": "佣金信息",
"commissionRate": "佣金比例", "commissionRate": "佣金比例",
"copyInviteLink": "复制邀请链接", "copyInviteLink": "复制邀请链接",
"copySuccess": "复制成功", "copySuccess": "复制成功",
"currentCommission": "当前可见佣金",
"inviteCode": "邀请码", "inviteCode": "邀请码",
"inviteRecords": "邀请记录", "inviteRecords": "邀请记录",
"noReason": "无",
"rejectReason": "拒绝原因",
"registrationTime": "注册时间", "registrationTime": "注册时间",
"submitWithdraw": "提交申请",
"submitting": "提交中...",
"totalCommission": "累计佣金", "totalCommission": "累计佣金",
"unknownStatus": "未知状态", "userIdentifier": "用户标识"
"userIdentifier": "用户标识",
"withdrawAmount": "提现金额",
"withdrawAmountPlaceholder": "请输入提现金额,单位为元",
"withdrawDescription": "填写提现金额和收款信息后提交申请,等待后台审核。",
"withdrawError": "提现申请提交失败",
"withdrawRecords": "提现记录",
"withdrawStatus": {
"approved": "已通过",
"pending": "审核中",
"rejected": "已拒绝"
},
"withdrawSuccess": "提现申请已提交"
} }
+11 -321
View File
@@ -1,6 +1,5 @@
"use client"; "use client";
import { zodResolver } from "@hookform/resolvers/zod";
import { useQuery } from "@tanstack/react-query"; import { useQuery } from "@tanstack/react-query";
import { Button } from "@workspace/ui/components/button"; import { Button } from "@workspace/ui/components/button";
import { import {
@@ -10,146 +9,29 @@ import {
CardHeader, CardHeader,
CardTitle, CardTitle,
} from "@workspace/ui/components/card"; } from "@workspace/ui/components/card";
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
DialogTrigger,
} from "@workspace/ui/components/dialog";
import {
Form,
FormControl,
FormField,
FormItem,
FormLabel,
FormMessage,
} from "@workspace/ui/components/form";
import { Input } from "@workspace/ui/components/input";
import { Textarea } from "@workspace/ui/components/textarea";
import type { ProListActions } from "@workspace/ui/composed/pro-list/pro-list";
import { ProList } from "@workspace/ui/composed/pro-list/pro-list"; import { ProList } from "@workspace/ui/composed/pro-list/pro-list";
import { import {
commissionWithdraw,
queryUserAffiliate, queryUserAffiliate,
queryUserAffiliateList, queryUserAffiliateList,
queryWithdrawalLog,
} from "@workspace/ui/services/user/user"; } from "@workspace/ui/services/user/user";
import { formatDate } from "@workspace/ui/utils/formatting"; import { formatDate } from "@workspace/ui/utils/formatting";
import { unitConversion } from "@workspace/ui/utils/unit-conversions";
import { Copy } from "lucide-react"; import { Copy } from "lucide-react";
import { useRef, useState, useTransition } from "react";
import { CopyToClipboard } from "react-copy-to-clipboard"; import { CopyToClipboard } from "react-copy-to-clipboard";
import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { toast } from "sonner"; import { toast } from "sonner";
import { z } from "zod";
import { Display } from "@/components/display"; import { Display } from "@/components/display";
import { useGlobalStore } from "@/stores/global"; import { useGlobalStore } from "@/stores/global";
function getWithdrawalStatusMeta(
status: number,
t: ReturnType<typeof useTranslation<"affiliate">>["t"]
) {
switch (status) {
case 1:
return {
label: t("withdrawal.status.approved", "Approved"),
className: "bg-emerald-500/10 text-emerald-600",
};
case 2:
return {
label: t("withdrawal.status.rejected", "Rejected"),
className: "bg-destructive/10 text-destructive",
};
default:
return {
label: t("withdrawal.status.pending", "Pending"),
className: "bg-amber-500/10 text-amber-600",
};
}
}
export default function Affiliate() { export default function Affiliate() {
const { t } = useTranslation("affiliate"); const { t } = useTranslation("affiliate");
const { user, common, getUserInfo } = useGlobalStore(); const { user, common } = useGlobalStore();
const [withdrawalOpen, setWithdrawalOpen] = useState(false); const { data } = useQuery({
const [submitting, startTransition] = useTransition();
const withdrawalListActionRef = useRef<ProListActions | undefined>(undefined);
const affiliateQuery = useQuery({
queryKey: ["queryUserAffiliate"], queryKey: ["queryUserAffiliate"],
queryFn: async () => { queryFn: async () => {
const response = await queryUserAffiliate(); const response = await queryUserAffiliate();
return response.data.data; return response.data.data;
}, },
}); });
const availableCommission = Number(
user?.commission ?? affiliateQuery.data?.total_commission ?? 0
);
const withdrawalFormSchema = z.object({
amount: z
.number()
.int(t("withdrawal.validation.amountInvalid", "Amount is invalid"))
.positive(
t(
"withdrawal.validation.amountPositive",
"Amount must be greater than 0"
)
)
.max(
availableCommission,
t(
"withdrawal.validation.amountExceeded",
"Amount cannot exceed available commission"
)
),
content: z
.string()
.trim()
.min(
1,
t(
"withdrawal.validation.contentRequired",
"Withdrawal info is required"
)
)
.max(
1000,
t("withdrawal.validation.contentTooLong", "Withdrawal info is too long")
),
});
const withdrawalForm = useForm<z.infer<typeof withdrawalFormSchema>>({
resolver: zodResolver(withdrawalFormSchema),
defaultValues: {
amount: 0,
content: "",
},
});
const submitWithdrawal = (values: z.infer<typeof withdrawalFormSchema>) => {
startTransition(async () => {
await commissionWithdraw({
amount: values.amount,
content: values.content.trim(),
});
toast.success(
t("withdrawal.submitSuccess", "Withdrawal request submitted")
);
await Promise.all([
affiliateQuery.refetch(),
getUserInfo(),
withdrawalListActionRef.current?.refresh(),
]);
setWithdrawalOpen(false);
withdrawalForm.reset({
amount: 0,
content: "",
});
});
};
return ( return (
<div className="flex flex-col gap-4"> <div className="flex flex-col gap-4">
@@ -161,146 +43,15 @@ export default function Affiliate() {
</CardDescription> </CardDescription>
</CardHeader> </CardHeader>
<CardContent> <CardContent>
<div className="flex flex-col gap-4 md:flex-row md:items-end md:justify-between"> <div className="flex items-baseline gap-2">
<div className="flex items-baseline gap-2"> <span className="font-bold text-3xl">
<span className="font-bold text-3xl"> <Display type="currency" value={data?.total_commission} />
<Display </span>
type="currency" <span className="text-muted-foreground text-sm">
value={affiliateQuery.data?.total_commission} ({t("commissionRate", "Commission Rate")}:{" "}
/> {user?.referral_percentage || common?.invite?.referral_percentage}
</span> %)
<span className="text-muted-foreground text-sm"> </span>
({t("commissionRate", "Commission Rate")}:{" "}
{user?.referral_percentage ||
common?.invite?.referral_percentage}
%)
</span>
</div>
<div className="flex flex-col items-start gap-2 md:items-end">
<div className="text-muted-foreground text-sm">
{t(
"withdrawal.availableCommission",
"Available for withdrawal"
)}
</div>
<div className="font-semibold text-xl">
<Display type="currency" value={availableCommission} />
</div>
<Dialog onOpenChange={setWithdrawalOpen} open={withdrawalOpen}>
<DialogTrigger asChild>
<Button>
{t("withdrawal.apply", "Apply for Withdrawal")}
</Button>
</DialogTrigger>
<DialogContent>
<DialogHeader>
<DialogTitle>
{t("withdrawal.applyTitle", "Apply for Withdrawal")}
</DialogTitle>
<DialogDescription>
{t(
"withdrawal.applyDescription",
"Enter the withdrawal amount and payout details."
)}
</DialogDescription>
</DialogHeader>
<Form {...withdrawalForm}>
<form
className="space-y-4"
id="withdrawal-form"
onSubmit={withdrawalForm.handleSubmit(submitWithdrawal)}
>
<FormField
control={withdrawalForm.control}
name="amount"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("withdrawal.amount", "Amount")}
</FormLabel>
<FormControl>
<Input
inputMode="decimal"
min="0"
onChange={(event) => {
const cents = unitConversion(
"dollarsToCents",
Number(event.target.value || 0)
);
field.onChange(Number(cents) || 0);
}}
placeholder={t(
"withdrawal.amountPlaceholder",
"Enter withdrawal amount"
)}
step="0.01"
type="number"
value={
field.value
? unitConversion(
"centsToDollars",
Number(field.value)
)
: ""
}
/>
</FormControl>
<p className="text-muted-foreground text-xs">
{t("withdrawal.amountHint", "Available")}:{" "}
<Display
type="currency"
value={availableCommission}
/>
</p>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={withdrawalForm.control}
name="content"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("withdrawal.content", "Payout Information")}
</FormLabel>
<FormControl>
<Textarea
placeholder={t(
"withdrawal.contentPlaceholder",
"Bank account, wallet address, recipient name, or other payout details"
)}
rows={4}
{...field}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
</form>
</Form>
<DialogFooter>
<Button
disabled={submitting}
onClick={() => setWithdrawalOpen(false)}
variant="outline"
>
{t("withdrawal.cancel", "Cancel")}
</Button>
<Button
disabled={submitting || availableCommission <= 0}
form="withdrawal-form"
type="submit"
>
{submitting
? t("withdrawal.submitting", "Submitting...")
: t("withdrawal.submit", "Submit Withdrawal")}
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
</div>
</div> </div>
</CardContent> </CardContent>
</Card> </Card>
@@ -331,67 +82,6 @@ export default function Affiliate() {
</div> </div>
</CardContent> </CardContent>
</Card> </Card>
<ProList<API.WithdrawalLog, Record<string, unknown>>
action={withdrawalListActionRef}
header={{
title: t("withdrawal.records", "Withdrawal Records"),
}}
renderItem={(item) => {
const statusMeta = getWithdrawalStatusMeta(item.status, t);
return (
<Card className="overflow-hidden">
<CardContent className="space-y-3 p-4 text-sm">
<div className="flex flex-wrap items-center justify-between gap-2">
<div className="font-semibold text-lg">
<Display type="currency" value={item.amount} />
</div>
<span
className={`inline-flex rounded-full px-3 py-1 font-medium text-xs ${statusMeta.className}`}
>
{statusMeta.label}
</span>
</div>
<ul className="grid gap-3 md:grid-cols-2">
<li className="flex flex-col gap-1">
<span className="text-muted-foreground">
{t("withdrawal.record.content", "Payout Information")}
</span>
<span className="whitespace-pre-wrap break-words">
{item.content}
</span>
</li>
<li className="flex flex-col gap-1">
<span className="text-muted-foreground">
{t("withdrawal.record.createdAt", "Created At")}
</span>
<time>{formatDate(item.created_at)}</time>
</li>
{item.reason ? (
<li className="flex flex-col gap-1 md:col-span-2">
<span className="text-muted-foreground">
{t("withdrawal.record.reason", "Reject Reason")}
</span>
<span className="whitespace-pre-wrap break-words text-destructive">
{item.reason}
</span>
</li>
) : null}
</ul>
</CardContent>
</Card>
);
}}
request={async (pagination) => {
const response = await queryWithdrawalLog({
page: pagination.page,
size: pagination.size,
});
return {
list: response.data.data?.list || [],
total: response.data.data?.total || 0,
};
}}
/>
<ProList<API.UserAffiliate, Record<string, unknown>> <ProList<API.UserAffiliate, Record<string, unknown>>
header={{ header={{
title: t("inviteRecords", "Invite Records"), title: t("inviteRecords", "Invite Records"),
-4
View File
@@ -49,9 +49,7 @@
"motion": "^12.23.24", "motion": "^12.23.24",
"qrcode.react": "^4.2.0", "qrcode.react": "^4.2.0",
"radash": "^12.1.1", "radash": "^12.1.1",
"react": "^19.2.0",
"react-copy-to-clipboard": "^5.1.0", "react-copy-to-clipboard": "^5.1.0",
"react-dom": "^19.2.0",
"react-helmet-async": "^2.0.5", "react-helmet-async": "^2.0.5",
"react-turnstile": "^1.1.4", "react-turnstile": "^1.1.4",
"zustand": "^5.0.8", "zustand": "^5.0.8",
@@ -87,9 +85,7 @@
"framer-motion": "^12.23.24", "framer-motion": "^12.23.24",
"js-yaml": "^4.1.1", "js-yaml": "^4.1.1",
"qrcode.react": "^4.2.0", "qrcode.react": "^4.2.0",
"react": "^19.2.0",
"react-copy-to-clipboard": "^5.1.0", "react-copy-to-clipboard": "^5.1.0",
"react-dom": "^19.2.0",
"react-helmet-async": "^2.0.5", "react-helmet-async": "^2.0.5",
"react-turnstile": "^1.1.4", "react-turnstile": "^1.1.4",
"zustand": "^5.0.8", "zustand": "^5.0.8",
-1
View File
@@ -13,7 +13,6 @@
[context.admin.environment] [context.admin.environment]
NODE_VERSION = "20" NODE_VERSION = "20"
VITE_API_BASE_URL = "https://tapi.hifast.biz"
# User 用户前台应用 # User 用户前台应用
[context.user] [context.user]
-2
View File
@@ -22,7 +22,6 @@ import * as system from "./system";
import * as ticket from "./ticket"; import * as ticket from "./ticket";
import * as tool from "./tool"; import * as tool from "./tool";
import * as user from "./user"; import * as user from "./user";
import * as withdrawal from "./withdrawal";
export default { export default {
ads, ads,
announcement, announcement,
@@ -44,5 +43,4 @@ export default {
ticket, ticket,
tool, tool,
user, user,
withdrawal,
}; };
-64
View File
@@ -28,21 +28,6 @@ declare namespace API {
updated_at: number; 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 = { type AnyTLS = {
port: number; port: number;
security_config: SecurityConfig; security_config: SecurityConfig;
@@ -86,18 +71,6 @@ declare namespace API {
is_default: boolean; is_default: boolean;
}; };
type GetWithdrawalListParams = {
page: number;
size: number;
user_id?: number;
status?: number;
};
type GetWithdrawalListResponse = {
list: AdminWithdrawalLog[];
total: number;
};
type AppUserSubcbribe = { type AppUserSubcbribe = {
id: number; id: number;
name: string; name: string;
@@ -133,10 +106,6 @@ declare namespace API {
port: number; port: number;
}; };
type ApproveWithdrawalRequest = {
withdrawal_id: number;
};
type AuthConfig = { type AuthConfig = {
mobile: MobileAuthenticateConfig; mobile: MobileAuthenticateConfig;
email: EmailAuthticateConfig; email: EmailAuthticateConfig;
@@ -1185,18 +1154,6 @@ declare namespace API {
list: User[]; list: User[];
}; };
type GetWithdrawalListParams = {
page: number;
size: number;
user_id?: number;
status?: number;
};
type GetWithdrawalListResponse = {
total: number;
list: WithdrawalLog[];
};
type GetUserLoginLogsParams = { type GetUserLoginLogsParams = {
page: number; page: number;
size: number; size: number;
@@ -1801,11 +1758,6 @@ declare namespace API {
total: number; total: number;
}; };
type RejectWithdrawalRequest = {
withdrawal_id: number;
reason: string;
};
type QuotaTask = { type QuotaTask = {
id: number; id: number;
subscribers: number[]; subscribers: number[];
@@ -3102,11 +3054,6 @@ declare namespace API {
confirm: boolean; confirm: boolean;
}; };
type RejectWithdrawalRequest = {
withdrawal_id: number;
reason: string;
};
type PreviewUserNodesRequest = { type PreviewUserNodesRequest = {
user_id: number; user_id: number;
}; };
@@ -3124,15 +3071,4 @@ declare namespace API {
}>; }>;
}>; }>;
}; };
type WithdrawalLog = {
id: number;
user_id: number;
amount: number;
content: string;
status: number;
reason?: string;
created_at: number;
updated_at: number;
};
} }
+1 -9
View File
@@ -1,14 +1,6 @@
/* eslint-disable */ /* eslint-disable */
import request from "@workspace/ui/lib/request"; import request from "@workspace/ui/lib/request";
export type UpdateUserBasicInfoBody = Omit<
API.UpdateUserBasiceInfoRequest,
"password"
> & {
password?: string;
remark?: string;
};
/** Create user POST /v1/admin/user/ */ /** Create user POST /v1/admin/user/ */
export async function createUser( export async function createUser(
body: API.CreateUserRequest, body: API.CreateUserRequest,
@@ -112,7 +104,7 @@ export async function deleteUserAuthMethod(
/** Update user basic info PUT /v1/admin/user/basic */ /** Update user basic info PUT /v1/admin/user/basic */
export async function updateUserBasicInfo( export async function updateUserBasicInfo(
body: UpdateUserBasicInfoBody, body: API.UpdateUserBasiceInfoRequest,
options?: { [key: string]: any } options?: { [key: string]: any }
) { ) {
return request<API.Response & { data?: any }>( return request<API.Response & { data?: any }>(
@@ -1,55 +0,0 @@
/* eslint-disable */
import request from "@workspace/ui/lib/request";
/** Get withdrawal list GET /v1/admin/user/withdrawal/list */
export async function getWithdrawalList(
params: API.GetWithdrawalListParams,
options?: { [key: string]: any }
) {
return request<API.Response & { data?: API.GetWithdrawalListResponse }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/user/withdrawal/list`,
{
method: "GET",
params: {
...params,
},
...(options || {}),
}
);
}
/** Approve withdrawal POST /v1/admin/user/withdrawal/approve */
export async function approveWithdrawal(
body: API.ApproveWithdrawalRequest,
options?: { [key: string]: any }
) {
return request<API.Response & { data?: any }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/user/withdrawal/approve`,
{
method: "POST",
headers: {
"Content-Type": "application/json",
},
data: body,
...(options || {}),
}
);
}
/** Reject withdrawal POST /v1/admin/user/withdrawal/reject */
export async function rejectWithdrawal(
body: API.RejectWithdrawalRequest,
options?: { [key: string]: any }
) {
return request<API.Response & { data?: any }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/user/withdrawal/reject`,
{
method: "POST",
headers: {
"Content-Type": "application/json",
},
data: body,
...(options || {}),
}
);
}
-8
View File
@@ -846,14 +846,6 @@ declare namespace API {
order_no: string; order_no: string;
}; };
type RedeemCodeRequest = {
code: string;
};
type RedeemCodeResponse = {
message: string;
};
type RegisterConfig = { type RegisterConfig = {
stop_register: boolean; stop_register: boolean;
enable_trial: boolean; enable_trial: boolean;
-18
View File
@@ -251,24 +251,6 @@ export async function updateUserPassword(
); );
} }
/** Redeem Code POST /v1/public/redemption/ */
export async function redeemCode(
body: API.RedeemCodeRequest,
options?: { [key: string]: any }
) {
return request<API.Response & { data?: API.RedeemCodeResponse }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/public/redemption/`,
{
method: "POST",
headers: {
"Content-Type": "application/json",
},
data: body,
...(options || {}),
}
);
}
/** Update User Rules PUT /v1/public/user/rules */ /** Update User Rules PUT /v1/public/user/rules */
export async function updateUserRules( export async function updateUserRules(
body: API.UpdateUserRulesRequest, body: API.UpdateUserRulesRequest,