From b851789171a2b43cc69ee08a725145f57b78fd8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com> Date: Tue, 4 Jul 2023 15:50:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/member/index.tsx | 10 +++++----- src/playedu.d.ts | 19 +++++++++++++++++++ src/store/user/loginUserSlice.ts | 2 +- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/pages/member/index.tsx b/src/pages/member/index.tsx index c80bce9..d2e8441 100644 --- a/src/pages/member/index.tsx +++ b/src/pages/member/index.tsx @@ -15,8 +15,8 @@ const MemberPage = () => { const navigate = useNavigate(); const [loading, setLoading] = useState(false); const [currentDepartment, setCurrentDepartment] = useState(""); - const [visible, setVisible] = useState(false); - const [init, setInit] = useState(false); + const [visible, setVisible] = useState(false); + const [init, setInit] = useState(false); const [stats, setStats] = useState({}); const [fileList, setFileList] = useState([ { @@ -136,7 +136,7 @@ const MemberPage = () => { )} - {init && user.name && ( + {init && ( <> { marginRight: 20, }} fit="cover" - src={user.avatar} + src={user?.avatar} />
-
{user.name}
+
{user?.name}
{currentDepartment} diff --git a/src/playedu.d.ts b/src/playedu.d.ts index d78058e..c96d045 100644 --- a/src/playedu.d.ts +++ b/src/playedu.d.ts @@ -53,6 +53,25 @@ declare global { created_at: string; updated_at: string; } + + interface UserModel { + id: number; + name: string; + avatar: string; + credit1: number; + email: string; + create_city: string; + create_ip: string; + id_card: string; + is_active: number; + is_lock: number; + is_set_password: number; + is_verify: number; + created_at: string; + updated_at: string; + login_at: string | null; + verify_at: string | null; + } } export {}; diff --git a/src/store/user/loginUserSlice.ts b/src/store/user/loginUserSlice.ts index d75f83e..9852419 100644 --- a/src/store/user/loginUserSlice.ts +++ b/src/store/user/loginUserSlice.ts @@ -8,7 +8,7 @@ import { } from "../../utils/index"; type UserStoreInterface = { - user: null; + user: UserModel | null; departments: string[]; currentDepId: number; isLogin: boolean;