Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 shanshanzhong147
|
d6399cf796 |
@@ -1,5 +1,5 @@
|
||||
# API base URL
|
||||
VITE_API_BASE_URL=https://tapi.hifast.biz
|
||||
VITE_API_BASE_URL=
|
||||
# API prefix path
|
||||
VITE_API_PREFIX=
|
||||
|
||||
|
||||
@@ -34,6 +34,5 @@
|
||||
"Traffic Details": "Traffic Details",
|
||||
"Device Group": "Device Group",
|
||||
"User Management": "User Management",
|
||||
"Users & Support": "Users & Support",
|
||||
"Withdrawal Management": "Withdrawal Management"
|
||||
"Users & Support": "Users & Support"
|
||||
}
|
||||
|
||||
@@ -1,25 +1,17 @@
|
||||
{
|
||||
"amount": "Amount",
|
||||
"couponDiscount": "Coupon Discount",
|
||||
"confirmRefund": "Confirm refund",
|
||||
"discount": "Discount Amount",
|
||||
"feeAmount": "Fee Amount",
|
||||
"method": "Payment Method",
|
||||
"orderNumber": "Order Number",
|
||||
"refund": "Refund",
|
||||
"refundConfirmDescription": "This refund will immediately invalidate the user's subscription and deduct the related agent commission.",
|
||||
"refundConfirmTitle": "Confirm refund",
|
||||
"refundConfirmWarning": "This action cannot be repeated after the order is refunded.",
|
||||
"refundSubmitting": "Refunding...",
|
||||
"refundSuccess": "Refund completed.",
|
||||
"status": {
|
||||
"0": "Status",
|
||||
"1": "Pending",
|
||||
"2": "Paid",
|
||||
"3": "Cancelled",
|
||||
"4": "Closed",
|
||||
"5": "Completed",
|
||||
"6": "Refunded"
|
||||
"5": "Completed"
|
||||
},
|
||||
"subscribe": "Subscribe",
|
||||
"subscribePrice": "Subscription Price",
|
||||
|
||||
@@ -34,6 +34,5 @@
|
||||
"Traffic Details": "流量详情",
|
||||
"Device Group": "设备组",
|
||||
"User Management": "用户管理",
|
||||
"Users & Support": "用户与支持",
|
||||
"Withdrawal Management": "提现管理"
|
||||
"Users & Support": "用户与支持"
|
||||
}
|
||||
|
||||
@@ -1,25 +1,17 @@
|
||||
{
|
||||
"amount": "金额",
|
||||
"couponDiscount": "优惠券折扣",
|
||||
"confirmRefund": "确认退费",
|
||||
"discount": "折扣金额",
|
||||
"feeAmount": "手续费",
|
||||
"method": "支付方式",
|
||||
"orderNumber": "订单编号",
|
||||
"refund": "退费",
|
||||
"refundConfirmDescription": "该退费操作会使用户订阅立即失效，并扣减关联代理佣金。",
|
||||
"refundConfirmTitle": "确认退费",
|
||||
"refundConfirmWarning": "订单退费后不可再次重复执行，请谨慎操作。",
|
||||
"refundSubmitting": "退费中...",
|
||||
"refundSuccess": "退费成功。",
|
||||
"status": {
|
||||
"0": "状态",
|
||||
"1": "待支付",
|
||||
"2": "已支付",
|
||||
"3": "已取消",
|
||||
"4": "已关闭",
|
||||
"5": "已完成",
|
||||
"6": "已退费"
|
||||
"5": "已完成"
|
||||
},
|
||||
"subscribe": "订阅",
|
||||
"subscribePrice": "订阅价格",
|
||||
|
||||
@@ -20,9 +20,6 @@ const DashboardWithdrawalLazyRouteImport = createFileRoute(
|
||||
)()
|
||||
const DashboardServersLazyRouteImport = createFileRoute('/dashboard/servers')()
|
||||
const DashboardNodesLazyRouteImport = createFileRoute('/dashboard/nodes')()
|
||||
const DashboardWithdrawalIndexLazyRouteImport = createFileRoute(
|
||||
'/dashboard/withdrawal/',
|
||||
)()
|
||||
const DashboardUserIndexLazyRouteImport = createFileRoute('/dashboard/user/')()
|
||||
const DashboardTicketIndexLazyRouteImport =
|
||||
createFileRoute('/dashboard/ticket/')()
|
||||
@@ -136,14 +133,6 @@ const DashboardNodesLazyRoute = DashboardNodesLazyRouteImport.update({
|
||||
} as any).lazy(() =>
|
||||
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({
|
||||
id: '/user/',
|
||||
path: '/user/',
|
||||
@@ -397,7 +386,6 @@ export interface FileRoutesByFullPath {
|
||||
'/dashboard/system': typeof DashboardSystemIndexLazyRoute
|
||||
'/dashboard/ticket': typeof DashboardTicketIndexLazyRoute
|
||||
'/dashboard/user': typeof DashboardUserIndexLazyRoute
|
||||
'/dashboard/withdrawal': typeof DashboardWithdrawalIndexLazyRoute
|
||||
}
|
||||
export interface FileRoutesByTo {
|
||||
'/': typeof IndexLazyRoute
|
||||
@@ -433,7 +421,6 @@ export interface FileRoutesByTo {
|
||||
'/dashboard/system': typeof DashboardSystemIndexLazyRoute
|
||||
'/dashboard/ticket': typeof DashboardTicketIndexLazyRoute
|
||||
'/dashboard/user': typeof DashboardUserIndexLazyRoute
|
||||
'/dashboard/withdrawal': typeof DashboardWithdrawalIndexLazyRoute
|
||||
}
|
||||
export interface FileRoutesById {
|
||||
__root__: typeof rootRouteImport
|
||||
@@ -471,7 +458,6 @@ export interface FileRoutesById {
|
||||
'/dashboard/system/': typeof DashboardSystemIndexLazyRoute
|
||||
'/dashboard/ticket/': typeof DashboardTicketIndexLazyRoute
|
||||
'/dashboard/user/': typeof DashboardUserIndexLazyRoute
|
||||
'/dashboard/withdrawal/': typeof DashboardWithdrawalIndexLazyRoute
|
||||
}
|
||||
export interface FileRouteTypes {
|
||||
fileRoutesByFullPath: FileRoutesByFullPath
|
||||
@@ -510,7 +496,6 @@ export interface FileRouteTypes {
|
||||
| '/dashboard/system'
|
||||
| '/dashboard/ticket'
|
||||
| '/dashboard/user'
|
||||
| '/dashboard/withdrawal'
|
||||
fileRoutesByTo: FileRoutesByTo
|
||||
to:
|
||||
| '/'
|
||||
@@ -546,7 +531,6 @@ export interface FileRouteTypes {
|
||||
| '/dashboard/system'
|
||||
| '/dashboard/ticket'
|
||||
| '/dashboard/user'
|
||||
| '/dashboard/withdrawal'
|
||||
id:
|
||||
| '__root__'
|
||||
| '/'
|
||||
@@ -583,7 +567,6 @@ export interface FileRouteTypes {
|
||||
| '/dashboard/system/'
|
||||
| '/dashboard/ticket/'
|
||||
| '/dashboard/user/'
|
||||
| '/dashboard/withdrawal/'
|
||||
fileRoutesById: FileRoutesById
|
||||
}
|
||||
export interface RootRouteChildren {
|
||||
@@ -635,13 +618,6 @@ declare module '@tanstack/react-router' {
|
||||
preLoaderRoute: typeof DashboardNodesLazyRouteImport
|
||||
parentRoute: typeof DashboardRouteLazyRoute
|
||||
}
|
||||
'/dashboard/withdrawal/': {
|
||||
id: '/dashboard/withdrawal/'
|
||||
path: '/withdrawal'
|
||||
fullPath: '/dashboard/withdrawal'
|
||||
preLoaderRoute: typeof DashboardWithdrawalIndexLazyRouteImport
|
||||
parentRoute: typeof DashboardRouteLazyRoute
|
||||
}
|
||||
'/dashboard/user/': {
|
||||
id: '/dashboard/user/'
|
||||
path: '/user'
|
||||
@@ -874,7 +850,6 @@ interface DashboardRouteLazyRouteChildren {
|
||||
DashboardSystemIndexLazyRoute: typeof DashboardSystemIndexLazyRoute
|
||||
DashboardTicketIndexLazyRoute: typeof DashboardTicketIndexLazyRoute
|
||||
DashboardUserIndexLazyRoute: typeof DashboardUserIndexLazyRoute
|
||||
DashboardWithdrawalIndexLazyRoute: typeof DashboardWithdrawalIndexLazyRoute
|
||||
}
|
||||
|
||||
const DashboardRouteLazyRouteChildren: DashboardRouteLazyRouteChildren = {
|
||||
@@ -910,7 +885,6 @@ const DashboardRouteLazyRouteChildren: DashboardRouteLazyRouteChildren = {
|
||||
DashboardSystemIndexLazyRoute: DashboardSystemIndexLazyRoute,
|
||||
DashboardTicketIndexLazyRoute: DashboardTicketIndexLazyRoute,
|
||||
DashboardUserIndexLazyRoute: DashboardUserIndexLazyRoute,
|
||||
DashboardWithdrawalIndexLazyRoute: DashboardWithdrawalIndexLazyRoute,
|
||||
}
|
||||
|
||||
const DashboardRouteLazyRouteWithChildren =
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
import { createLazyFileRoute } from "@tanstack/react-router";
|
||||
import WithdrawalPage from "@/sections/withdrawal";
|
||||
|
||||
export const Route = createLazyFileRoute("/dashboard/withdrawal/")({
|
||||
component: WithdrawalPage,
|
||||
});
|
||||
@@ -1,16 +1,4 @@
|
||||
import { useMutation } from "@tanstack/react-query";
|
||||
import { useSearch } from "@tanstack/react-router";
|
||||
import {
|
||||
AlertDialog,
|
||||
AlertDialogAction,
|
||||
AlertDialogCancel,
|
||||
AlertDialogContent,
|
||||
AlertDialogDescription,
|
||||
AlertDialogFooter,
|
||||
AlertDialogHeader,
|
||||
AlertDialogTitle,
|
||||
AlertDialogTrigger,
|
||||
} from "@workspace/ui/components/alert-dialog";
|
||||
import { Badge } from "@workspace/ui/components/badge";
|
||||
import { Button } from "@workspace/ui/components/button";
|
||||
import {
|
||||
@@ -28,27 +16,18 @@ import { cn } from "@workspace/ui/lib/utils";
|
||||
import {
|
||||
activateOrder,
|
||||
getOrderList,
|
||||
refundOrder,
|
||||
updateOrderStatus,
|
||||
} from "@workspace/ui/services/admin/order";
|
||||
import { useRef, useState } from "react";
|
||||
import { useRef } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { toast } from "sonner";
|
||||
import { Display } from "@/components/display";
|
||||
import { useGlobalStore } from "@/stores/global";
|
||||
import { useSubscribe } from "@/stores/subscribe";
|
||||
import { formatDate } from "@/utils/common";
|
||||
import { UserDetail } from "../user/user-detail";
|
||||
|
||||
const REFUNDED_ORDER_STATUS = 6;
|
||||
|
||||
export default function Order() {
|
||||
const { t } = useTranslation("order");
|
||||
const sp = useSearch({ strict: false }) as Record<string, string | undefined>;
|
||||
const user = useGlobalStore((state) => state.user);
|
||||
const [confirmingOrderId, setConfirmingOrderId] = useState<number | null>(
|
||||
null
|
||||
);
|
||||
const initialFilters = {
|
||||
user_id: sp.user_id ? Number(sp.user_id) : undefined,
|
||||
search: sp.search || undefined,
|
||||
@@ -74,11 +53,6 @@ export default function Order() {
|
||||
label: t("status.5", "Completed"),
|
||||
className: "bg-green-500",
|
||||
},
|
||||
{
|
||||
value: REFUNDED_ORDER_STATUS,
|
||||
label: t("status.6", "Refunded"),
|
||||
className: "bg-red-500",
|
||||
},
|
||||
];
|
||||
|
||||
const typeOptions = [
|
||||
@@ -91,101 +65,10 @@ export default function Order() {
|
||||
const ref = useRef<ProTableActions>(null);
|
||||
|
||||
const { subscribes, getSubscribeName } = useSubscribe();
|
||||
const canRefundOrders = Boolean(user?.is_admin);
|
||||
|
||||
const refundMutation = useMutation({
|
||||
mutationFn: async (order: API.Order) => {
|
||||
await refundOrder({ id: order.id });
|
||||
},
|
||||
onSuccess: () => {
|
||||
toast.success(t("refundSuccess", "Refund completed."));
|
||||
setConfirmingOrderId(null);
|
||||
ref.current?.refresh();
|
||||
},
|
||||
onError: (error) => {
|
||||
console.error("Refund order failed", error);
|
||||
setConfirmingOrderId(null);
|
||||
},
|
||||
});
|
||||
|
||||
const isRefundedOrder = (order: API.Order) =>
|
||||
order.status === REFUNDED_ORDER_STATUS ||
|
||||
order.status_name === t("status.6", "Refunded") ||
|
||||
order.status_name?.toLowerCase() === "refunded";
|
||||
|
||||
const canRefundOrder = (order: API.Order) =>
|
||||
canRefundOrders && !isRefundedOrder(order);
|
||||
|
||||
return (
|
||||
<ProTable<API.Order, any>
|
||||
action={ref}
|
||||
actions={{
|
||||
render: (order) => {
|
||||
if (!canRefundOrder(order)) return [];
|
||||
|
||||
const isPending =
|
||||
refundMutation.isPending && confirmingOrderId === order.id;
|
||||
|
||||
return [
|
||||
<AlertDialog
|
||||
key={`refund-${order.id}`}
|
||||
onOpenChange={(open) => {
|
||||
setConfirmingOrderId(open ? order.id : null);
|
||||
}}
|
||||
open={confirmingOrderId === order.id}
|
||||
>
|
||||
<AlertDialogTrigger asChild>
|
||||
<Button disabled={isPending} size="sm" variant="destructive">
|
||||
{isPending
|
||||
? t("refundSubmitting", "Refunding...")
|
||||
: t("refund", "Refund")}
|
||||
</Button>
|
||||
</AlertDialogTrigger>
|
||||
<AlertDialogContent>
|
||||
<AlertDialogHeader>
|
||||
<AlertDialogTitle>
|
||||
{t("refundConfirmTitle", "Confirm refund")}
|
||||
</AlertDialogTitle>
|
||||
<AlertDialogDescription asChild>
|
||||
<div className="space-y-2">
|
||||
<p>
|
||||
{t(
|
||||
"refundConfirmDescription",
|
||||
"This refund will immediately invalidate the user's subscription and deduct the related agent commission."
|
||||
)}
|
||||
</p>
|
||||
<p className="font-medium text-foreground">
|
||||
{t(
|
||||
"refundConfirmWarning",
|
||||
"This action cannot be repeated after the order is refunded."
|
||||
)}
|
||||
</p>
|
||||
</div>
|
||||
</AlertDialogDescription>
|
||||
</AlertDialogHeader>
|
||||
<AlertDialogFooter>
|
||||
<AlertDialogCancel disabled={isPending}>
|
||||
{t("cancel", "Cancel")}
|
||||
</AlertDialogCancel>
|
||||
<AlertDialogAction
|
||||
className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
|
||||
disabled={isPending}
|
||||
onClick={async (event) => {
|
||||
event.preventDefault();
|
||||
if (isPending) return;
|
||||
await refundMutation.mutateAsync(order);
|
||||
}}
|
||||
>
|
||||
{isPending
|
||||
? t("refundSubmitting", "Refunding...")
|
||||
: t("confirmRefund", "Confirm refund")}
|
||||
</AlertDialogAction>
|
||||
</AlertDialogFooter>
|
||||
</AlertDialogContent>
|
||||
</AlertDialog>,
|
||||
];
|
||||
},
|
||||
}}
|
||||
columns={[
|
||||
{
|
||||
accessorKey: "order_no",
|
||||
@@ -370,13 +253,8 @@ export default function Order() {
|
||||
);
|
||||
}
|
||||
return (
|
||||
<Badge
|
||||
variant={isRefundedOrder(order) ? "destructive" : "default"}
|
||||
>
|
||||
{option?.label ||
|
||||
(order.status_name
|
||||
? t(`status.${row.getValue("status")}`, order.status_name)
|
||||
: t(`status.${row.getValue("status")}`))}
|
||||
<Badge>
|
||||
{option?.label || t(`status.${row.getValue("status")}`)}
|
||||
</Badge>
|
||||
);
|
||||
},
|
||||
|
||||
@@ -16,11 +16,6 @@ import {
|
||||
DropdownMenuTrigger,
|
||||
} from "@workspace/ui/components/dropdown-menu";
|
||||
import { Input } from "@workspace/ui/components/input";
|
||||
import {
|
||||
Popover,
|
||||
PopoverContent,
|
||||
PopoverTrigger,
|
||||
} from "@workspace/ui/components/popover";
|
||||
import { ScrollArea } from "@workspace/ui/components/scroll-area";
|
||||
import {
|
||||
Select,
|
||||
@@ -36,6 +31,13 @@ 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,
|
||||
@@ -61,16 +63,13 @@ import {
|
||||
updateUserBasicInfo,
|
||||
} from "@workspace/ui/services/admin/user";
|
||||
import { parseDeviceType } from "@workspace/ui/utils/device";
|
||||
import { FilePenLine } from "lucide-react";
|
||||
import { useCallback, useRef, useState } from "react";
|
||||
import React, { useRef, useState, useCallback } 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 { 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 { NotifySettingsForm } from "./user-profile/notify-settings-form";
|
||||
import UserSubscription from "./user-subscription";
|
||||
|
||||
// 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() {
|
||||
@@ -152,7 +184,7 @@ export default function User() {
|
||||
userId={row.id}
|
||||
/>,
|
||||
<PreviewNodesDialog key="preview-nodes" userId={row.id} />,
|
||||
/* <ConfirmButton
|
||||
/* <ConfirmButton
|
||||
cancelText={t("cancel", "Cancel")}
|
||||
confirmText={t("confirm", "Confirm")}
|
||||
description={t(
|
||||
@@ -261,57 +293,51 @@ export default function User() {
|
||||
{
|
||||
id: "auth_methods",
|
||||
accessorKey: "auth_methods",
|
||||
header: "设备码/邮箱",
|
||||
header: '设备码/邮箱',
|
||||
cell: ({ row }) => {
|
||||
const method = row.original.auth_methods?.[0];
|
||||
const identifier = method?.auth_identifier || "";
|
||||
const isDevice = method?.auth_type === "device";
|
||||
const firstDevice = row.original.user_devices?.[0] as
|
||||
| UserDeviceWithDeviceNo
|
||||
| undefined;
|
||||
const firstDevice = row.original.user_devices?.[0] as any;
|
||||
const deviceNo = firstDevice?.device_no;
|
||||
const deviceType = parseDeviceType(firstDevice?.user_agent || "");
|
||||
const display = isDevice ? deviceNo || identifier : identifier;
|
||||
return (
|
||||
<div className="flex items-center">
|
||||
{/* <Badge
|
||||
{/* <Badge
|
||||
className="mr-1 uppercase"
|
||||
title={method?.verified ? t("verified", "Verified") : ""}
|
||||
>
|
||||
{method?.auth_type}
|
||||
</Badge>*/}
|
||||
{deviceType && (
|
||||
<Badge className="mr-1" variant="secondary">
|
||||
{deviceType}
|
||||
</Badge>
|
||||
<Badge className="mr-1" variant="secondary">
|
||||
{deviceType}
|
||||
</Badge>
|
||||
)}
|
||||
<span title={isDevice ? display : undefined}>{display}</span>
|
||||
<Popover>
|
||||
<PopoverTrigger>
|
||||
<div className={"flex items-center"}>
|
||||
{row.original?.remark ? `（${row.original.remark}）` : ""}
|
||||
<FilePenLine className={"ml-2 text-primary"} size={14} />
|
||||
<div className={'flex items-center'}>
|
||||
{row.original?.remark ? `（${row.original.remark}）` : ''}
|
||||
<FilePenLine size={14} className={'text-primary ml-2'} />
|
||||
</div>
|
||||
</PopoverTrigger>
|
||||
<PopoverContent className={"w-64"}>
|
||||
<PopoverContent className={'w-64'}>
|
||||
<RemarkForm
|
||||
initialRemark={row.original.remark}
|
||||
onSave={async (remark) => {
|
||||
const { data } = await getUserDetail({
|
||||
id: row.original.id,
|
||||
});
|
||||
const user = data.data;
|
||||
|
||||
if (!user) {
|
||||
throw new Error("User detail not found");
|
||||
}
|
||||
|
||||
await updateUserBasicInfo(
|
||||
buildUserBasicInfoPayload(user, remark)
|
||||
);
|
||||
toast.success(t("updateSuccess"));
|
||||
ref.current?.refresh();
|
||||
}}
|
||||
initialRemark={row.original.remark}
|
||||
CloseComponent={PopoverClose}
|
||||
onSave={async (remark) => {
|
||||
const {
|
||||
id,
|
||||
} = row.original;
|
||||
await updateUserBasicInfo({
|
||||
user_id: id,
|
||||
remark,
|
||||
} as unknown as API.UpdateUserBasiceInfoRequest);
|
||||
toast.success(t('updateSuccess'));
|
||||
ref.current?.refresh();
|
||||
}}
|
||||
/>
|
||||
</PopoverContent>
|
||||
</Popover>
|
||||
@@ -319,7 +345,7 @@ export default function User() {
|
||||
);
|
||||
},
|
||||
},
|
||||
/* {
|
||||
/* {
|
||||
id: "balance",
|
||||
accessorKey: "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,7 +1,6 @@
|
||||
"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 {
|
||||
@@ -11,6 +10,7 @@ import {
|
||||
DialogFooter,
|
||||
DialogHeader,
|
||||
DialogTitle,
|
||||
DialogTrigger,
|
||||
} from "@workspace/ui/components/dialog";
|
||||
import {
|
||||
Form,
|
||||
@@ -21,17 +21,15 @@ import {
|
||||
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 type { ProTableActions } from "@workspace/ui/composed/pro-table/pro-table";
|
||||
import { ProTable } from "@workspace/ui/composed/pro-table/pro-table";
|
||||
import {
|
||||
approveWithdrawal,
|
||||
getWithdrawalList,
|
||||
rejectWithdrawal,
|
||||
} from "@workspace/ui/services/admin/withdrawal";
|
||||
import { useRef, useState } from "react";
|
||||
import { LoaderCircle } from "lucide-react";
|
||||
import { useRef, useState, useTransition } from "react";
|
||||
import { useForm } from "react-hook-form";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { toast } from "sonner";
|
||||
@@ -40,263 +38,291 @@ import { Display } from "@/components/display";
|
||||
import { UserDetail } from "@/sections/user/user-detail";
|
||||
import { formatDate } from "@/utils/common";
|
||||
|
||||
const rejectSchema = z.object({
|
||||
const rejectionSchema = z.object({
|
||||
reason: z
|
||||
.string()
|
||||
.trim()
|
||||
.min(2, "请填写拒绝原因")
|
||||
.max(500, "拒绝原因不能超过 500 个字符"),
|
||||
.min(1, "Reason is required")
|
||||
.max(500, "Reason must be 500 characters or fewer"),
|
||||
});
|
||||
|
||||
export default function WithdrawalPage() {
|
||||
const WITHDRAWAL_STATUS_OPTIONS = [
|
||||
{ label: "All", value: "all" },
|
||||
{ label: "Pending", value: "0" },
|
||||
{ label: "Approved", value: "1" },
|
||||
{ label: "Rejected", value: "2" },
|
||||
] as const;
|
||||
|
||||
function getStatusMeta(
|
||||
status: number,
|
||||
t: ReturnType<typeof useTranslation<"user">>["t"]
|
||||
) {
|
||||
switch (status) {
|
||||
case 1:
|
||||
return {
|
||||
label: t("withdrawal.status.approved", "Approved"),
|
||||
variant: "default" as const,
|
||||
};
|
||||
case 2:
|
||||
return {
|
||||
label: t("withdrawal.status.rejected", "Rejected"),
|
||||
variant: "destructive" as const,
|
||||
};
|
||||
default:
|
||||
return {
|
||||
label: t("withdrawal.status.pending", "Pending"),
|
||||
variant: "secondary" as const,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
function RejectWithdrawalDialog({
|
||||
row,
|
||||
onSuccess,
|
||||
}: {
|
||||
row: API.AdminWithdrawalLog;
|
||||
onSuccess: () => Promise<void> | void;
|
||||
}) {
|
||||
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),
|
||||
const [open, setOpen] = useState(false);
|
||||
const [loading, startTransition] = useTransition();
|
||||
const form = useForm<z.infer<typeof rejectionSchema>>({
|
||||
resolver: zodResolver(rejectionSchema),
|
||||
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",
|
||||
},
|
||||
const handleSubmit = (values: z.infer<typeof rejectionSchema>) => {
|
||||
startTransition(async () => {
|
||||
await rejectWithdrawal({
|
||||
withdrawal_id: row.id,
|
||||
reason: values.reason.trim(),
|
||||
});
|
||||
toast.success(t("withdrawal.rejectSuccess", "Withdrawal rejected"));
|
||||
await onSuccess();
|
||||
setOpen(false);
|
||||
form.reset();
|
||||
});
|
||||
};
|
||||
|
||||
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>
|
||||
</>
|
||||
<Dialog
|
||||
onOpenChange={(nextOpen) => {
|
||||
setOpen(nextOpen);
|
||||
if (!nextOpen) form.reset();
|
||||
}}
|
||||
open={open}
|
||||
>
|
||||
<DialogTrigger asChild>
|
||||
<Button size="sm" variant="destructive">
|
||||
{t("withdrawal.reject", "Reject")}
|
||||
</Button>
|
||||
</DialogTrigger>
|
||||
<DialogContent>
|
||||
<DialogHeader>
|
||||
<DialogTitle>
|
||||
{t("withdrawal.rejectTitle", "Reject Withdrawal")}
|
||||
</DialogTitle>
|
||||
<DialogDescription>
|
||||
{t(
|
||||
"withdrawal.rejectDescription",
|
||||
"Provide a reason that will be shown in the user's withdrawal history."
|
||||
)}
|
||||
</DialogDescription>
|
||||
</DialogHeader>
|
||||
<Form {...form}>
|
||||
<form
|
||||
className="space-y-4"
|
||||
id={`reject-withdrawal-${row.id}`}
|
||||
onSubmit={form.handleSubmit(handleSubmit)}
|
||||
>
|
||||
<FormField
|
||||
control={form.control}
|
||||
name="reason"
|
||||
render={({ field }) => (
|
||||
<FormItem>
|
||||
<FormLabel>
|
||||
{t("withdrawal.rejectReason", "Reject Reason")}
|
||||
</FormLabel>
|
||||
<FormControl>
|
||||
<Textarea
|
||||
placeholder={t(
|
||||
"withdrawal.rejectReasonPlaceholder",
|
||||
"Explain why this withdrawal cannot be approved"
|
||||
)}
|
||||
rows={4}
|
||||
{...field}
|
||||
/>
|
||||
</FormControl>
|
||||
<FormMessage />
|
||||
</FormItem>
|
||||
)}
|
||||
/>
|
||||
</form>
|
||||
</Form>
|
||||
<DialogFooter>
|
||||
<Button
|
||||
disabled={loading}
|
||||
onClick={() => setOpen(false)}
|
||||
variant="outline"
|
||||
>
|
||||
{t("cancel", "Cancel")}
|
||||
</Button>
|
||||
<Button
|
||||
disabled={loading}
|
||||
form={`reject-withdrawal-${row.id}`}
|
||||
type="submit"
|
||||
variant="destructive"
|
||||
>
|
||||
{loading && <LoaderCircle className="mr-2 h-4 w-4 animate-spin" />}
|
||||
{t("withdrawal.rejectConfirm", "Reject Withdrawal")}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
);
|
||||
}
|
||||
|
||||
export default function WithdrawalManagementPage() {
|
||||
const { t } = useTranslation("user");
|
||||
const [approvingId, setApprovingId] = useState<number | null>(null);
|
||||
const tableActionRef = useRef<ProTableActions | undefined>(undefined);
|
||||
|
||||
return (
|
||||
<ProTable<API.AdminWithdrawalLog, { user_id?: string; status?: string }>
|
||||
action={tableActionRef}
|
||||
actions={{
|
||||
render: (row) => {
|
||||
if (Number(row.status) !== 0) return [];
|
||||
|
||||
const handleApprove = async () => {
|
||||
try {
|
||||
await approveWithdrawal({
|
||||
withdrawal_id: Number(row.id),
|
||||
});
|
||||
toast.success(
|
||||
t("withdrawal.approveSuccess", "Withdrawal approved")
|
||||
);
|
||||
await tableActionRef.current?.refresh();
|
||||
} finally {
|
||||
setApprovingId(null);
|
||||
}
|
||||
};
|
||||
|
||||
return [
|
||||
<Button
|
||||
disabled={approvingId === Number(row.id)}
|
||||
key={`approve-${row.id}`}
|
||||
onClick={() => {
|
||||
setApprovingId(Number(row.id));
|
||||
handleApprove();
|
||||
}}
|
||||
size="sm"
|
||||
>
|
||||
{approvingId === Number(row.id) && (
|
||||
<LoaderCircle className="mr-2 h-4 w-4 animate-spin" />
|
||||
)}
|
||||
{t("withdrawal.approve", "Approve")}
|
||||
</Button>,
|
||||
<RejectWithdrawalDialog
|
||||
key={`reject-${row.id}`}
|
||||
onSuccess={() => tableActionRef.current?.refresh()}
|
||||
row={row}
|
||||
/>,
|
||||
];
|
||||
},
|
||||
}}
|
||||
columns={[
|
||||
{
|
||||
accessorKey: "id",
|
||||
header: t("withdrawal.column.id", "ID"),
|
||||
},
|
||||
{
|
||||
accessorKey: "user_id",
|
||||
header: t("withdrawal.column.user", "User"),
|
||||
cell: ({ row }) => <UserDetail id={Number(row.original.user_id)} />,
|
||||
},
|
||||
{
|
||||
accessorKey: "amount",
|
||||
header: t("withdrawal.column.amount", "Amount"),
|
||||
cell: ({ row }) => (
|
||||
<Display type="currency" value={Number(row.original.amount)} />
|
||||
),
|
||||
},
|
||||
{
|
||||
accessorKey: "content",
|
||||
header: t("withdrawal.column.content", "Withdrawal Info"),
|
||||
cell: ({ row }) => (
|
||||
<div className="max-w-[280px] whitespace-pre-wrap break-words text-sm">
|
||||
{row.original.content}
|
||||
</div>
|
||||
),
|
||||
},
|
||||
{
|
||||
accessorKey: "status",
|
||||
header: t("withdrawal.column.status", "Status"),
|
||||
cell: ({ row }) => {
|
||||
const meta = getStatusMeta(Number(row.original.status), t);
|
||||
return <Badge variant={meta.variant}>{meta.label}</Badge>;
|
||||
},
|
||||
},
|
||||
{
|
||||
accessorKey: "reason",
|
||||
header: t("withdrawal.column.reason", "Reject Reason"),
|
||||
cell: ({ row }) =>
|
||||
row.original.reason ? (
|
||||
<div className="max-w-[220px] whitespace-pre-wrap break-words text-muted-foreground text-sm">
|
||||
{row.original.reason}
|
||||
</div>
|
||||
) : (
|
||||
<span className="text-muted-foreground text-sm">-</span>
|
||||
),
|
||||
},
|
||||
{
|
||||
accessorKey: "created_at",
|
||||
header: t("withdrawal.column.createdAt", "Created At"),
|
||||
cell: ({ row }) => formatDate(Number(row.original.created_at)),
|
||||
},
|
||||
]}
|
||||
header={{
|
||||
title: t("withdrawal.title", "Withdrawal Management"),
|
||||
}}
|
||||
params={[
|
||||
{
|
||||
key: "status",
|
||||
type: "select",
|
||||
placeholder: t("withdrawal.filter.status", "Status"),
|
||||
options: WITHDRAWAL_STATUS_OPTIONS.map((option) => ({
|
||||
label: t(`withdrawal.statusOption.${option.value}`, option.label),
|
||||
value: option.value,
|
||||
})),
|
||||
},
|
||||
{
|
||||
key: "user_id",
|
||||
placeholder: t("withdrawal.filter.userId", "User ID"),
|
||||
},
|
||||
]}
|
||||
request={async (pagination, filter) => {
|
||||
const status =
|
||||
filter.status && filter.status !== "all"
|
||||
? Number(filter.status)
|
||||
: undefined;
|
||||
const userId = filter.user_id ? Number(filter.user_id) : undefined;
|
||||
|
||||
const { data } = await getWithdrawalList({
|
||||
page: pagination.page,
|
||||
size: pagination.size,
|
||||
status,
|
||||
user_id: Number.isFinite(userId) ? userId : undefined,
|
||||
});
|
||||
|
||||
const list = (data.data?.list || []) as API.AdminWithdrawalLog[];
|
||||
return {
|
||||
list,
|
||||
total: Number(data.data?.total || list.length),
|
||||
};
|
||||
}}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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",
|
||||
"commissionRate": "Commission Rate",
|
||||
"copyInviteLink": "Copy Invite Link",
|
||||
"copySuccess": "Copy Success",
|
||||
"currentCommission": "Current Commission",
|
||||
"inviteCode": "Invite Code",
|
||||
"inviteRecords": "Invite Records",
|
||||
"noReason": "None",
|
||||
"rejectReason": "Reject Reason",
|
||||
"registrationTime": "Registration Time",
|
||||
"submitWithdraw": "Submit Request",
|
||||
"submitting": "Submitting...",
|
||||
"totalCommission": "Total Commission",
|
||||
"unknownStatus": "Unknown Status",
|
||||
"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"
|
||||
"userIdentifier": "User Identifier"
|
||||
}
|
||||
|
||||
@@ -1,37 +1,11 @@
|
||||
{
|
||||
"accountInfo": "收款信息",
|
||||
"accountPlaceholder": "请输入银行卡、支付宝、USDT 地址等收款信息",
|
||||
"accountRequired": "请填写收款信息",
|
||||
"accountTooLong": "收款信息不能超过 200 个字符",
|
||||
"amountInvalid": "请输入有效金额",
|
||||
"amountPositive": "提现金额必须大于 0",
|
||||
"applyTime": "申请时间",
|
||||
"applyWithdraw": "申请提现",
|
||||
"cancel": "取消",
|
||||
"commissionInfo": "佣金信息",
|
||||
"commissionRate": "佣金比例",
|
||||
"copyInviteLink": "复制邀请链接",
|
||||
"copySuccess": "复制成功",
|
||||
"currentCommission": "当前可见佣金",
|
||||
"inviteCode": "邀请码",
|
||||
"inviteRecords": "邀请记录",
|
||||
"noReason": "无",
|
||||
"rejectReason": "拒绝原因",
|
||||
"registrationTime": "注册时间",
|
||||
"submitWithdraw": "提交申请",
|
||||
"submitting": "提交中...",
|
||||
"totalCommission": "累计佣金",
|
||||
"unknownStatus": "未知状态",
|
||||
"userIdentifier": "用户标识",
|
||||
"withdrawAmount": "提现金额",
|
||||
"withdrawAmountPlaceholder": "请输入提现金额，单位为元",
|
||||
"withdrawDescription": "填写提现金额和收款信息后提交申请，等待后台审核。",
|
||||
"withdrawError": "提现申请提交失败",
|
||||
"withdrawRecords": "提现记录",
|
||||
"withdrawStatus": {
|
||||
"approved": "已通过",
|
||||
"pending": "审核中",
|
||||
"rejected": "已拒绝"
|
||||
},
|
||||
"withdrawSuccess": "提现申请已提交"
|
||||
"userIdentifier": "用户标识"
|
||||
}
|
||||
|
||||
@@ -49,9 +49,7 @@
|
||||
"motion": "^12.23.24",
|
||||
"qrcode.react": "^4.2.0",
|
||||
"radash": "^12.1.1",
|
||||
"react": "^19.2.0",
|
||||
"react-copy-to-clipboard": "^5.1.0",
|
||||
"react-dom": "^19.2.0",
|
||||
"react-helmet-async": "^2.0.5",
|
||||
"react-turnstile": "^1.1.4",
|
||||
"zustand": "^5.0.8",
|
||||
@@ -87,9 +85,7 @@
|
||||
"framer-motion": "^12.23.24",
|
||||
"js-yaml": "^4.1.1",
|
||||
"qrcode.react": "^4.2.0",
|
||||
"react": "^19.2.0",
|
||||
"react-copy-to-clipboard": "^5.1.0",
|
||||
"react-dom": "^19.2.0",
|
||||
"react-helmet-async": "^2.0.5",
|
||||
"react-turnstile": "^1.1.4",
|
||||
"zustand": "^5.0.8",
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
|
||||
[context.admin.environment]
|
||||
NODE_VERSION = "20"
|
||||
VITE_API_BASE_URL = "https://tapi.hifast.biz"
|
||||
|
||||
# User 用户前台应用
|
||||
[context.user]
|
||||
|
||||
@@ -78,21 +78,3 @@ export async function activateOrder(
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
/** Refund order POST /v1/admin/order/refund */
|
||||
export async function refundOrder(
|
||||
body: API.RefundOrderRequest,
|
||||
options?: { [key: string]: any }
|
||||
) {
|
||||
return request<API.Response & { data?: any }>(
|
||||
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/order/refund`,
|
||||
{
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
data: body,
|
||||
...(options || {}),
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
-39
@@ -133,10 +133,6 @@ declare namespace API {
|
||||
port: number;
|
||||
};
|
||||
|
||||
type ApproveWithdrawalRequest = {
|
||||
withdrawal_id: number;
|
||||
};
|
||||
|
||||
type AuthConfig = {
|
||||
mobile: MobileAuthenticateConfig;
|
||||
email: EmailAuthticateConfig;
|
||||
@@ -1185,18 +1181,6 @@ declare namespace API {
|
||||
list: User[];
|
||||
};
|
||||
|
||||
type GetWithdrawalListParams = {
|
||||
page: number;
|
||||
size: number;
|
||||
user_id?: number;
|
||||
status?: number;
|
||||
};
|
||||
|
||||
type GetWithdrawalListResponse = {
|
||||
total: number;
|
||||
list: WithdrawalLog[];
|
||||
};
|
||||
|
||||
type GetUserLoginLogsParams = {
|
||||
page: number;
|
||||
size: number;
|
||||
@@ -1466,7 +1450,6 @@ declare namespace API {
|
||||
fee_amount: number;
|
||||
trade_no: string;
|
||||
status: number;
|
||||
status_name?: string;
|
||||
subscribe_id: number;
|
||||
created_at: number;
|
||||
updated_at: number;
|
||||
@@ -1490,7 +1473,6 @@ declare namespace API {
|
||||
fee_amount: number;
|
||||
trade_no: string;
|
||||
status: number;
|
||||
status_name?: string;
|
||||
subscribe_id: number;
|
||||
subscribe: Subscribe;
|
||||
created_at: number;
|
||||
@@ -1801,11 +1783,6 @@ declare namespace API {
|
||||
total: number;
|
||||
};
|
||||
|
||||
type RejectWithdrawalRequest = {
|
||||
withdrawal_id: number;
|
||||
reason: string;
|
||||
};
|
||||
|
||||
type QuotaTask = {
|
||||
id: number;
|
||||
subscribers: number[];
|
||||
@@ -2777,11 +2754,6 @@ declare namespace API {
|
||||
order_no: string;
|
||||
};
|
||||
|
||||
type RefundOrderRequest = {
|
||||
id: number;
|
||||
reason?: string;
|
||||
};
|
||||
|
||||
type RedemptionCode = {
|
||||
id: number;
|
||||
code: string;
|
||||
@@ -3124,15 +3096,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,14 +1,6 @@
|
||||
/* 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,
|
||||
@@ -112,7 +104,7 @@ export async function deleteUserAuthMethod(
|
||||
|
||||
/** Update user basic info PUT /v1/admin/user/basic */
|
||||
export async function updateUserBasicInfo(
|
||||
body: UpdateUserBasicInfoBody,
|
||||
body: API.UpdateUserBasiceInfoRequest,
|
||||
options?: { [key: string]: any }
|
||||
) {
|
||||
return request<API.Response & { data?: any }>(
|
||||
|
||||
@@ -23,7 +23,7 @@ export async function approveWithdrawal(
|
||||
body: API.ApproveWithdrawalRequest,
|
||||
options?: { [key: string]: any }
|
||||
) {
|
||||
return request<API.Response & { data?: any }>(
|
||||
return request<API.Response>(
|
||||
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/user/withdrawal/approve`,
|
||||
{
|
||||
method: "POST",
|
||||
@@ -41,7 +41,7 @@ export async function rejectWithdrawal(
|
||||
body: API.RejectWithdrawalRequest,
|
||||
options?: { [key: string]: any }
|
||||
) {
|
||||
return request<API.Response & { data?: any }>(
|
||||
return request<API.Response>(
|
||||
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/user/withdrawal/reject`,
|
||||
{
|
||||
method: "POST",
|
||||
|
||||
Reference in New Issue
Block a user