|
@@ -6,6 +6,7 @@ import {
|
|
|
import { useQuery } from '@tanstack/react-query';
|
|
import { useQuery } from '@tanstack/react-query';
|
|
|
import dayjs from 'dayjs';
|
|
import dayjs from 'dayjs';
|
|
|
import { UserAPI } from './api/users.ts';
|
|
import { UserAPI } from './api/users.ts';
|
|
|
|
|
+import { AxiosError } from "axios";
|
|
|
|
|
|
|
|
const { Title } = Typography;
|
|
const { Title } = Typography;
|
|
|
|
|
|
|
@@ -115,7 +116,10 @@ export const UsersPage = () => {
|
|
|
refetch(); // 刷新用户列表
|
|
refetch(); // 刷新用户列表
|
|
|
} catch (error) {
|
|
} catch (error) {
|
|
|
console.error('转为学员失败:', error);
|
|
console.error('转为学员失败:', error);
|
|
|
- message.error('操作失败,请重试');
|
|
|
|
|
|
|
+ if(error instanceof AxiosError)
|
|
|
|
|
+ message.error(error.response?.data.error || '操作失败,请重试');
|
|
|
|
|
+ else
|
|
|
|
|
+ message.error('操作失败,请重试');
|
|
|
} finally {
|
|
} finally {
|
|
|
setConvertingId(null);
|
|
setConvertingId(null);
|
|
|
}
|
|
}
|
|
@@ -143,7 +147,7 @@ export const UsersPage = () => {
|
|
|
key: 'role',
|
|
key: 'role',
|
|
|
render: (role: string) => (
|
|
render: (role: string) => (
|
|
|
<Tag color={role === 'admin' ? 'red' : 'blue'}>
|
|
<Tag color={role === 'admin' ? 'red' : 'blue'}>
|
|
|
- {role === 'admin' ? '管理员' : '普通用户'}
|
|
|
|
|
|
|
+ {role }
|
|
|
</Tag>
|
|
</Tag>
|
|
|
),
|
|
),
|
|
|
},
|
|
},
|