diff --git a/web/src/components/settings/PersonalSetting.jsx b/web/src/components/settings/PersonalSetting.jsx index 3120227..a9bf92c 100644 --- a/web/src/components/settings/PersonalSetting.jsx +++ b/web/src/components/settings/PersonalSetting.jsx @@ -84,7 +84,6 @@ const PersonalSetting = () => { const [passkeyRegisterLoading, setPasskeyRegisterLoading] = useState(false); const [passkeyDeleteLoading, setPasskeyDeleteLoading] = useState(false); const [passkeySupported, setPasskeySupported] = useState(false); - const [studentApplying, setStudentApplying] = useState(false); const [notificationSettings, setNotificationSettings] = useState({ warningType: 'email', warningThreshold: 100000, @@ -554,24 +553,6 @@ const PersonalSetting = () => { } }; - const handleApplyStudent = async () => { - setStudentApplying(true); - try { - const res = await API.post('/api/user/student/apply'); - const { success, message } = res.data; - if (success) { - showSuccess(message || t('学员申请已提交')); - await getUserData(); - } else { - showError(message || t('提交申请失败')); - } - } catch (error) { - showError(t('提交申请失败')); - } finally { - setStudentApplying(false); - } - }; - return (
@@ -582,32 +563,6 @@ const PersonalSetting = () => {
- {t('学员身份申请')} - - {userState?.user?.is_student - ? t('当前已是学员身份') - : userState?.user?.student_status === 1 - ? t('申请已提交,等待管理员审批') - : t('提交申请后由管理员审批,审批通过将发放学员奖励')} - -
- -
-
{/* 签到日历 - 仅在启用时显示 */} diff --git a/web/src/components/table/users/UsersColumnDefs.jsx b/web/src/components/table/users/UsersColumnDefs.jsx index 010e439..39e1aee 100644 --- a/web/src/components/table/users/UsersColumnDefs.jsx +++ b/web/src/components/table/users/UsersColumnDefs.jsx @@ -270,35 +270,6 @@ const renderInviteInfo = (text, record, t) => { ); }; -const renderStudentStatus = (record, t) => { - if (record.is_student === 1 || record.is_student === true) { - return ( - - {t('学员')} - - ); - } - if (record.student_status === 1) { - return ( - - {t('待审批')} - - ); - } - if (record.student_status === 3) { - return ( - - {t('已拒绝')} - - ); - } - return ( - - {t('非学员')} - - ); -}; - /** * Render operations column */ @@ -400,21 +371,7 @@ const renderOperations = ( }, ] : []), - ...(record.role === USER_ROLES.USER && - record.status === 1 && - record.student_status !== 1 && - !(record.is_student === 1 || record.is_student === true) - ? [ - { - node: 'item', - name: t('设为学员'), - onClick: () => manageUser(record.id, 'set_student', record), - }, - { - node: 'divider', - }, - ] - : []), + { node: 'item', name: t('注销'), @@ -562,11 +519,7 @@ export const getUsersColumns = ({ return
{renderRole(text, record, t)}
; }, }, - { - title: t('学员状态'), - dataIndex: 'student_status', - render: (text, record) => renderStudentStatus(record, t), - }, + { title: t('邀请信息'), dataIndex: 'invite',