From 395b449d0025c5b450e33202e11fcfef91593d70 Mon Sep 17 00:00:00 2001 From: chenshuai2144 Date: Fri, 13 Dec 2019 20:54:29 +0800 Subject: [PATCH] bugfix: fix login error #5750 --- src/models/connect.d.ts | 2 +- src/pages/user/login/index.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/models/connect.d.ts b/src/models/connect.d.ts index ba79e5f1..d1a4cbc0 100644 --- a/src/models/connect.d.ts +++ b/src/models/connect.d.ts @@ -25,7 +25,7 @@ export interface ConnectState { loading: Loading; settings: SettingModelState; user: UserModelState; - login: LoginModelType; + login: LoginModelType['state']; } export interface Route extends MenuDataItem { diff --git a/src/pages/user/login/index.tsx b/src/pages/user/login/index.tsx index 5cc12d6e..9f5fd6c7 100644 --- a/src/pages/user/login/index.tsx +++ b/src/pages/user/login/index.tsx @@ -89,7 +89,7 @@ class Login extends Component { ); render() { - const { userLogin, submitting } = this.props; + const { userLogin = {}, submitting } = this.props; const { status, type: loginType } = userLogin; const { type, autoLogin } = this.state; return ( @@ -199,6 +199,6 @@ class Login extends Component { } export default connect(({ login, loading }: ConnectState) => ({ - userLogin: login.state, + userLogin: login, submitting: loading.effects['login/login'], }))(Login);