|
|
@@ -127,8 +127,7 @@ const UserListPage: React.FC = () => {
|
|
|
email: values.email?.trim?.() || undefined,
|
|
|
nickname: values.nickname?.trim?.() || undefined,
|
|
|
playmate: values.playmate ?? undefined,
|
|
|
- deleted:
|
|
|
- typeof values.deleted === "boolean" ? values.deleted : undefined,
|
|
|
+ deleted: typeof values.deleted === "boolean" ? values.deleted : undefined,
|
|
|
walletHasBalance: values.walletHasBalance === true ? true : undefined,
|
|
|
regChannel: values.regChannel?.trim?.() || undefined,
|
|
|
startDay: startDay || undefined,
|
|
|
@@ -195,9 +194,7 @@ const UserListPage: React.FC = () => {
|
|
|
const handleTableChange = (
|
|
|
pagination: TablePaginationConfig,
|
|
|
_filters: unknown,
|
|
|
- sorter:
|
|
|
- | SorterResult<UserInfoAdminDTO>
|
|
|
- | SorterResult<UserInfoAdminDTO>[],
|
|
|
+ sorter: SorterResult<UserInfoAdminDTO> | SorterResult<UserInfoAdminDTO>[],
|
|
|
) => {
|
|
|
const newQueryParams: UserInfoAdminQuery = {
|
|
|
...queryParams,
|
|
|
@@ -531,9 +528,9 @@ const UserListPage: React.FC = () => {
|
|
|
sorter: true,
|
|
|
sortOrder:
|
|
|
queryParams.sort?.field === "walletGoldCoinAmount"
|
|
|
- ? (queryParams.sort?.order === 1
|
|
|
- ? "ascend"
|
|
|
- : "descend") as "ascend" | "descend"
|
|
|
+ ? ((queryParams.sort?.order === 1 ? "ascend" : "descend") as
|
|
|
+ | "ascend"
|
|
|
+ | "descend")
|
|
|
: undefined,
|
|
|
render: (val: number | undefined) =>
|
|
|
val != null ? String(val) : "-",
|
|
|
@@ -634,7 +631,11 @@ const UserListPage: React.FC = () => {
|
|
|
]}
|
|
|
/>
|
|
|
</Form.Item>
|
|
|
- <Form.Item label="有余额用户" name="walletHasBalance" valuePropName="checked">
|
|
|
+ <Form.Item
|
|
|
+ label="有余额用户"
|
|
|
+ name="walletHasBalance"
|
|
|
+ valuePropName="checked"
|
|
|
+ >
|
|
|
<Checkbox>仅显示有余额</Checkbox>
|
|
|
</Form.Item>
|
|
|
<Form.Item label="创建时间" name="createdAtRange">
|
|
|
@@ -1146,7 +1147,7 @@ const UserListPage: React.FC = () => {
|
|
|
<Descriptions.Item label="更新时间">
|
|
|
{formatDate(userDetail.userBaseInfo?.updatedAt || 0)}
|
|
|
</Descriptions.Item>
|
|
|
- <Descriptions.Item label="是否删除">
|
|
|
+ <Descriptions.Item label="是否注销">
|
|
|
{userDetail.userBaseInfo?.deleted ? (
|
|
|
<Tag color="error">是</Tag>
|
|
|
) : (
|