登录

src/layouts/SecurityLayout.jsx

@@ -24,13 +24,12 @@ class SecurityLayout extends React.Component {
   render() {
     const { isReady } = this.state;
     const { children, loading, currentUser } = this.props;
-    console.log('------------>', loading, currentUser)
 
-    if ((!currentUser.userid && loading) || !isReady) {
+    if ((!currentUser.userId && loading) || !isReady) {
       return <PageLoading />;
     }
 
-    if (!currentUser.userid) {
+    if (!currentUser.userId) {
       return <Redirect to="/user/login"></Redirect>;
     }
 

src/models/login.js

@@ -15,29 +15,28 @@ const Model = {
         type: 'changeLoginStatus',
         payload: response,
       }); // Login successfully
+            
+      const urlParams = new URL(window.location.href);
+      const params = getPageQuery();
+      let { redirect } = params;
 
-      if (response.status === 'ok') {
-        const urlParams = new URL(window.location.href);
-        const params = getPageQuery();
-        let { redirect } = params;
+      if (redirect) {
+        const redirectUrlParams = new URL(redirect);
 
-        if (redirect) {
-          const redirectUrlParams = new URL(redirect);
+        if (redirectUrlParams.origin === urlParams.origin) {
+          redirect = redirect.substr(urlParams.origin.length);
 
-          if (redirectUrlParams.origin === urlParams.origin) {
-            redirect = redirect.substr(urlParams.origin.length);
-
-            if (redirect.match(/^\/.*#/)) {
-              redirect = redirect.substr(redirect.indexOf('#') + 1);
-            }
-          } else {
-            window.location.href = redirect;
-            return;
+          if (redirect.match(/^\/.*#/)) {
+            redirect = redirect.substr(redirect.indexOf('#') + 1);
           }
+        } else {
+          window.location.href = redirect;
+          return;
         }
-
-        yield put(routerRedux.replace(redirect || '/'));
       }
+
+      yield put(routerRedux.replace(redirect || '/'));
+      
     },
 
     *getCaptcha({ payload }, { call }) {
@@ -61,8 +60,8 @@ const Model = {
   },
   reducers: {
     changeLoginStatus(state, { payload }) {
-      setAuthority(payload.currentAuthority);
-      return { ...state, status: payload.status, type: payload.type };
+      setAuthority('admin');
+      return { ...state, status: 'ok', type: payload.type };
     },
   },
 };

src/models/user.js

@@ -17,6 +17,7 @@ const UserModel = {
 
     *fetchCurrent(_, { call, put }) {
       const response = yield call(request, apis.user.current);
+
       yield put({
         type: 'saveCurrentUser',
         payload: response,

src/pages/user/login/components/Login/LoginSubmit.jsx

@@ -4,12 +4,7 @@ import classNames from 'classnames';
 import styles from './index.less';
 const FormItem = Form.Item;
 import router from 'umi/router';
-// 跳转到编辑商品
-function toIndex() {
-  router.push({
-    pathname: '/welcome',
-  });
-}
+
 const LoginSubmit = ({ className, ...rest }) => {
   const clsString = classNames(styles.submit, className);
   return (

src/pages/user/login/index.jsx

@@ -63,6 +63,7 @@ class Login extends Component {
         }
       });
     });
+    
   renderMessage = content => (
     <Alert
       style={{