diff --git a/src/assets/images/login/bg.png b/src/assets/images/login/bg.png
index 29ddb13..55af414 100644
Binary files a/src/assets/images/login/bg.png and b/src/assets/images/login/bg.png differ
diff --git a/src/components/bar-footer/index.tsx b/src/components/bar-footer/index.tsx
index 6a48dd1..fae68ee 100644
--- a/src/components/bar-footer/index.tsx
+++ b/src/components/bar-footer/index.tsx
@@ -61,7 +61,10 @@ export const TabBarFooter: React.FC = () => {
return (
- navigate(value)}>
+ navigate(value, { replace: true })}
+ >
{tabs.map((item) => (
))}
diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
index 2fefd5a..075ab8c 100644
--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@@ -191,12 +191,6 @@ const LoginPage = () => {
-
-
-
);
};
diff --git a/src/pages/member/index.tsx b/src/pages/member/index.tsx
index ee511c0..c7d04e0 100644
--- a/src/pages/member/index.tsx
+++ b/src/pages/member/index.tsx
@@ -32,6 +32,7 @@ const MemberPage = () => {
useEffect(() => {
document.title = "我的";
+ getUser();
}, []);
useEffect(() => {
@@ -87,7 +88,7 @@ const MemberPage = () => {
let res = await member.avatar(data);
if (res) {
Toast.show("头像更换成功");
- getUser();
+ await getUser(); //获取登录用户的信息并写入store
}
} catch (e) {
console.error("上传失败", e);
@@ -97,12 +98,12 @@ const MemberPage = () => {
};
};
- const getUser = () => {
- member.detail().then((res: any) => {
- const data = res.data;
- dispatch(loginAction(data));
+ const getUser = async () => {
+ let res: any = await member.detail();
+ if (res) {
+ dispatch(loginAction(res.data));
setFileList([]);
- });
+ }
};
return (
@@ -110,7 +111,7 @@ const MemberPage = () => {
- {user && user.name && (
+ {user.name && (
<>
{
-
-
-
{