diff --git a/src/api/index.js b/src/api/index.js index 8702007b..6794c643 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,5 +1,13 @@ import { request } from '@umijs/max'; +// 获取登陆人 +export function getCurrentUser( data ) { + return request('/api/user/getCurrentUser', { + method: 'get', + data: data + }); +} + // 密码登录 export function passwordLogin( data ) { return request('/api/user/login', { diff --git a/src/components/Guide/Guide.less b/src/components/Guide/Guide.less index 9a6ed160..985ce69b 100644 --- a/src/components/Guide/Guide.less +++ b/src/components/Guide/Guide.less @@ -48,6 +48,7 @@ border-radius: 10px 10px 10px 10px; opacity: 1; z-index: 99; + margin-top: 60px; } .homepageMsgItem { display: flex; diff --git a/src/components/Header/index.js b/src/components/Header/index.js index bd23c1a7..2ab3d7e8 100644 --- a/src/components/Header/index.js +++ b/src/components/Header/index.js @@ -1,7 +1,7 @@ -import { useState } from 'react'; +import { useEffect, useState } from 'react'; import { Tabs } from 'antd'; import { useNavigate } from 'react-router-dom'; -import { passwordLogout } from '../../api'; +import { passwordLogout, getCurrentUser } from '../../api'; import { observer } from 'mobx-react-lite' import loginStore from '../../store/login.store'; import '../../index.less'; @@ -17,7 +17,14 @@ function Header (e) { navigate('/login'); } }) - } + } + useEffect(() =>{ + getCurrentUser().then((e) => { + const d = e.data; + token.username = d.username; + }) + }) + return (