修正登录登出流程

src/components/AppHeader/components/userCenter/UserCenter.tsx

@@ -25,10 +25,14 @@ export default function UserCenter(props: UserCenterProps) {
     setPopVisible(nextVisible);
   }, []);
 
+  const onLogoutBtnClick = useCallback(() => {
+    setPopVisible(false);
+  }, []);
+
   return (
     <Popover
       overlayClassName={styles.popWrapper}
-      content={<PopContent />}
+      content={<PopContent onLogoutBtnClick={onLogoutBtnClick} />}
       trigger="click"
       visible={popVisible}
       onVisibleChange={onVisibleChange}
@@ -45,15 +49,20 @@ export default function UserCenter(props: UserCenterProps) {
   );
 }
 
-function PopContent(props) {
+interface PopContentProps {
+  onLogoutBtnClick: () => void;
+}
+
+function PopContent(props: PopContentProps) {
+  const { onLogoutBtnClick } = props;
   const {
     refresh,
     initialState: { currentUser } = {},
     setInitialState,
   } = useModel('@@initialState');
-  console.log(currentUser);
 
   const tryLogout = useCallback(() => {
+    if (onLogoutBtnClick) onLogoutBtnClick();
     confirm({
       onOk() {
         logout();

src/pages/login/index.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Input, Button } from 'antd';
+import { Input, Button, Form } from 'antd';
 import styles from './login.less';
 import { history, useModel } from 'umi';
 import { MobileFilled, LockFilled } from '@ant-design/icons';
@@ -52,7 +52,7 @@ export default function Login() {
         <div>欢迎使用</div>
         <div>locking</div>
       </div>
-      <div className={styles.form}>
+      <Form className={styles.form}>
         <Input
           size="large"
           prefix={<MobileFilled className={styles.icon} />}
@@ -71,10 +71,16 @@ export default function Login() {
           onChange={(e) => setPassword(e.target.value)}
         />
         <div className={styles.errText}>{errText}</div>
-        <Button loading={loading} type="primary" block onClick={onLogin}>
+        <Button
+          loading={loading}
+          type="primary"
+          block
+          onClick={onLogin}
+          htmlType="submit"
+        >
           登录
         </Button>
-      </div>
+      </Form>
     </div>
   );
 }