From f5a305130a9d02321fa96e8975d85a850ba7cd0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B4=BE=E5=A4=A7=E6=98=9F?=
 <9441438+zhang96110@user.noreply.gitee.com>
Date: Sat, 9 May 2026 00:56:59 +0000
Subject: [PATCH] =?UTF-8?q?Revert=20"fix(auth):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=A6=96=E6=AC=A1=E7=94=A8=E6=88=B7=E8=AE=BE=E7=BD=AE=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=92=8C=E6=B3=A8=E5=86=8C=E8=A1=A8=E5=8D=95=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6f2271351da551c29bdd5029bc974a187920defd.
---
 frontend/src/pages/Login.jsx | 39 +++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/frontend/src/pages/Login.jsx b/frontend/src/pages/Login.jsx
index 3f5b5e3..6df37e0 100644
--- a/frontend/src/pages/Login.jsx
+++ b/frontend/src/pages/Login.jsx
@@ -33,8 +33,6 @@ const Login = () => {
   const { login, register, checkAdmin } = useAuth();
   const navigate = useNavigate();
 
-  const isSetupMode = isFirstUser && !registerMode;
-
   useEffect(() => {
     checkIsFirstUser();
   }, []);
@@ -78,12 +76,10 @@ const Login = () => {
         realName: values.realName,
       });
       if (result.success) {
+        message.success(result.isFirstUser ? '管理员账号创建成功' : '注册成功，请等待管理员审核');
         if (result.isFirstUser) {
-          message.success('管理员账号创建成功');
-          setIsFirstUser(false);
           navigate('/dashboard');
         } else {
-          message.success('注册成功，请等待管理员审核');
           setRegisterMode(false);
         }
       } else {
@@ -246,13 +242,13 @@ const Login = () => {
             )}
 
             <Form
-              name={isSetupMode || registerMode ? 'register' : 'login'}
+              name={registerMode ? 'register' : 'login'}
               layout="vertical"
-              onFinish={isSetupMode ? onFinishRegister : (registerMode ? onFinishRegister : onFinishLogin)}
+              onFinish={registerMode ? onFinishRegister : onFinishLogin}
               size="large"
               className="login-form"
             >
-              {registerMode && !isFirstUser && (
+              {registerMode && (
                 <>
                   <Form.Item
                     name="realName"
@@ -265,6 +261,17 @@ const Login = () => {
                       prefix={<UserOutlined className="input-icon" />}
                     />
                   </Form.Item>
+                  <Form.Item
+                    name="username"
+                    label="用户名"
+                    rules={[{ required: true, message: '请输入用户名' }]}
+                  >
+                    <Input
+                      placeholder="请输入用户名"
+                      className="login-input"
+                      prefix={<UserOutlined className="input-icon" />}
+                    />
+                  </Form.Item>
                   <Form.Item
                     name="email"
                     label="邮箱"
@@ -295,32 +302,32 @@ const Login = () => {
 
               <Form.Item
                 name="username"
-                label={isSetupMode ? '管理员账号' : (registerMode ? '用户名' : '用户名')}
-                rules={[{ required: true, message: isSetupMode ? '请设置管理员账号' : '请输入用户名' }]}
+                label={isFirstUser ? '管理员账号' : '用户名'}
+                rules={[{ required: true, message: isFirstUser ? '请设置管理员账号' : '请输入用户名' }]}
               >
                 <Input
                   prefix={<UserOutlined className="input-icon" />}
-                  placeholder={isSetupMode ? '请设置管理员账号' : '请输入用户名'}
+                  placeholder={isFirstUser ? '请设置管理员账号' : '请输入用户名'}
                   className="login-input"
                 />
               </Form.Item>
 
               <Form.Item
                 name="password"
-                label={isSetupMode ? '管理员密码' : '密码'}
+                label={isFirstUser ? '管理员密码' : '密码'}
                 rules={[
-                  { required: true, message: isSetupMode ? '请设置管理员密码' : '请输入密码' },
+                  { required: true, message: isFirstUser ? '请设置管理员密码' : '请输入密码' },
                   { min: 6, message: '密码长度不能少于6位' },
                 ]}
               >
                 <Input.Password
                   prefix={<LockOutlined className="input-icon" />}
-                  placeholder={isSetupMode ? '请设置管理员密码' : '请输入密码'}
+                  placeholder={isFirstUser ? '请设置管理员密码' : '请输入密码'}
                   className="login-input"
                 />
               </Form.Item>
 
-              {(registerMode || isSetupMode) && (
+              {registerMode && (
                 <Form.Item
                   name="confirmPassword"
                   label="确认密码"
@@ -352,7 +359,7 @@ const Login = () => {
                   loading={loading}
                   className="submit-button"
                 >
-                  {isSetupMode ? '创建管理员' : (registerMode ? '立即注册' : '登 录')}
+                  {registerMode ? '立即注册' : '登 录'}
                 </Button>
               </Form.Item>
             </Form>