u

code/base-project/base-app/src/app/auth/_layout.tsx

@@ -25,6 +25,5 @@ export default function AuthLayout() {
     <StepLayout steps={steps}>
       <Slot />
     </StepLayout>
-
   )
 }

code/base-project/base-app/src/app/auth/login.tsx

@@ -6,10 +6,11 @@ import { IconQq, IconWeixin, IconZhiwen } from '@/components/iconfont'
 import { Divider } from '@/components/ui/divider'
 import useFormValidation from '@/hooks/useFormValidation'
 import { loginDefaultApi } from '@/request/api/auth'
+import { useUserStore } from '@/store/user'
 import { toast } from '@/utils/toast'
 
 interface LoginForm {
-  username: string
+  account: string
   password: string
   rememberMe: boolean
   socialType?: 'qq' | 'weixin' | 'fingerprint'
@@ -17,10 +18,11 @@ interface LoginForm {
 
 export default function AuthLogin() {
   const router = useRouter()
+  const userStore = useUserStore()
 
   const [loading, setLoading] = useState<boolean>(false)
   const [form, setForm] = useState<LoginForm>({
-    username: '',
+    account: userStore.userInfo?.account || '',
     password: '',
     rememberMe: true,
   })
@@ -30,7 +32,7 @@ export default function AuthLogin() {
   }
 
   const rules = {
-    username: { required: true, message: '账号是必填项' },
+    account: { required: true, message: '账号是必填项' },
     password: { required: true, message: '密码是必填项' },
   }
 
@@ -38,23 +40,38 @@ export default function AuthLogin() {
 
   const loginDefault = () => {
     setLoading(true)
-    // loginDefaultApi({
-    //   account: form.username,
-    //   password: form.password,
-    // }).then((res) => {
-    //   if (res.isSuccess) {
-    //     router.replace('/')
-    //   }
-    //   else {
-    //     toast.show({
-    //       title: res.message || '登录失败',
-    //     })
-    //   }
-    // }).catch((_err) => {
+    loginDefaultApi({
+      account: form.account,
+      password: form.password,
+    }).then((res) => {
+      if (res.isSuccess) {
+        toast.show({
+          title: '登录成功',
+        })
 
-    // }).finally(() => {
-    //   setLoading(false)
-    // })
+        userStore.setUserInfo({
+          account: form.account,
+          id: res.data.userId,
+          seqNo: res.data.seqNo,
+          username: res.data.username,
+          gender: res.data.gender,
+          token: res.data.token,
+          refreshToken: res.data.refreshToken,
+          rememberMe: form.rememberMe,
+        })
+
+        router.replace('/user')
+      }
+      else {
+        toast.show({
+          title: res.message || '登录失败',
+        })
+      }
+    }).catch((_err) => {
+
+    }).finally(() => {
+      setLoading(false)
+    })
   }
 
   const loginQq = () => {
@@ -78,8 +95,8 @@ export default function AuthLogin() {
       <AForm form={form}>
         <AFormItem label="账号">
           <AInput
-            value={form.username}
-            onChange={text => handleInputChange('username', text)}
+            value={form.account}
+            onChange={text => handleInputChange('account', text)}
           />
         </AFormItem>