diff --git a/apps/admin/app/dashboard/withdraw-ticket/page.tsx b/apps/admin/app/dashboard/withdraw-ticket/page.tsx index 51b6117..5fbd358 100644 --- a/apps/admin/app/dashboard/withdraw-ticket/page.tsx +++ b/apps/admin/app/dashboard/withdraw-ticket/page.tsx @@ -59,6 +59,25 @@ export default function Page() { accessorKey: 'title', header: t('title'), }, + { + accessorKey: 'status', + header: t('status.0'), + cell: ({ row }) => ( + + {row.original.status === 4 ? t(`status.${row.original.status}`) : t(`status.1`)} + + ), + }, { accessorKey: 'user_id', header: t('user'), @@ -70,7 +89,7 @@ export default function Page() { cell: ({ row }) => formatDate(row.getValue('updated_at')), }, ]} - /* params={[ + /*params={[ { key: 'status', placeholder: t('status.0'), diff --git a/apps/user/app/(main)/(content)/(user)/wallet/components/Withdraw/WithdrawDialog.tsx b/apps/user/app/(main)/(content)/(user)/wallet/components/Withdraw/WithdrawDialog.tsx index d8267f6..f9697b8 100644 --- a/apps/user/app/(main)/(content)/(user)/wallet/components/Withdraw/WithdrawDialog.tsx +++ b/apps/user/app/(main)/(content)/(user)/wallet/components/Withdraw/WithdrawDialog.tsx @@ -55,7 +55,7 @@ const WalletDialog: WalletDialogProps = (props) => { const { currency } = common; // 定义支持的账户类型 - const ACCOUNT_TYPE = ['USDT', '微信', '支付宝'] as const; + const ACCOUNT_TYPE = ['USDT(TRC20)', '微信', '支付宝'] as const; // 根据账户类型定义 Zod 验证模式 const formSchema = z @@ -76,11 +76,11 @@ const WalletDialog: WalletDialogProps = (props) => { }) .superRefine((data, ctx) => { // 根据提现方式进行条件验证 - if (data.type === 'USDT') { + if (data.type === 'USDT(TRC20)') { if (!data.account || data.account.trim().length === 0) { ctx.addIssue({ code: z.ZodIssueCode.custom, - message: 'USDT 账号不能为空', + message: 'USDT(TRC20) 账号不能为空', path: ['account'], }); } @@ -111,7 +111,7 @@ const WalletDialog: WalletDialogProps = (props) => { // 构建 title 和 description const title = `提现金额-${data.money}`; let description = ''; - if (data.type === 'USDT') { + if (data.type === 'USDT(TRC20)') { description = `${data.type}-${data.account || ''}`; } else if (data.type === '微信' || data.type === '支付宝') { description = `${data.type}-${data.avatar || ''}`; @@ -181,7 +181,7 @@ const WalletDialog: WalletDialogProps = (props) => { // 根据提现方式动态生成弹窗描述 const getModalDescription = () => { - if (currentType === 'USDT') { + if (currentType === 'USDT(TRC20)') { const accountInfo = account || '未知地址'; return `请确认您的提现地址及金额无误,您将提现${money}RMB至${accountInfo}地址账号。`; } else { @@ -214,7 +214,7 @@ const WalletDialog: WalletDialogProps = (props) => {
- {currentType === 'USDT' + {currentType === 'USDT(TRC20)' ? '将佣金提现至您的个人数字钱包,无手续费' : '该提现方式需10%手续费,该费率由支付平台收取'}
@@ -250,8 +250,8 @@ const WalletDialog: WalletDialogProps = (props) => { )} /> - {/* 提现账号输入(仅当选择USDT时显示) */} - {currentType === 'USDT' && ( + {/* 提现账号输入(仅当选择USDT(TRC20)时显示) */} + {currentType === 'USDT(TRC20)' && (