finish

Author: yongyue.huang

src/actions/search.js

@@ -5,15 +5,15 @@ import { Layout, Menu, Icon, Row, Col, Avatar } from 'antd'
 import './index.less'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
-import {setGlobalLoading} from 'actions/global'
+import {setGlobalLoading, checkIsLogin} from 'actions/global'
 
 const SubMenu = Menu.SubMenu
 const { Header, Sider, Content } = Layout
 
 
 @connect(
   state => state.getIn(['global']),
-  dispatch => bindActionCreators({ setGlobalLoading }, dispatch)
+  dispatch => bindActionCreators({ setGlobalLoading, checkIsLogin }, dispatch)
 )
 class BaseLayout extends React.Component {
   state = {
@@ -379,8 +379,11 @@ class BaseLayout extends React.Component {
       this.props.history.push('/login')
     }
   }
+  onLogout = () => {
+    this.props.checkIsLogin(false)
+  }
   componentDidMount () {
-    this.redirectRoute()    
+    this.redirectRoute()
     this.props.setGlobalLoading(true)
   }
   render () {
@@ -391,7 +394,7 @@ class BaseLayout extends React.Component {
     return (
       <Layout className="base-layout">
         <Sider>
-          <Menu 
+          <Menu
             theme={menuData.theme}
             mode={menuData.mode}
             defaultOpenKeys={[menuData.defaultOpenKeys]}
@@ -404,8 +407,8 @@ class BaseLayout extends React.Component {
                   {
                     item.subtitle.map(second => {
                       return (
-                        <Menu.Item 
-                          key={second.link} 
+                        <Menu.Item
+                          key={second.link}
                           onClick={this.getCurrentMenu}
                           >
                           <NavLink to={second.link}>
@@ -428,7 +431,7 @@ class BaseLayout extends React.Component {
               <Layout>
                 <Header className="base-header">
                   <span className="header-tag">{currentMenu && `算法 /`} {currentMenu}</span>
-                  <NavLink to="/login"><Avatar size="large" icon="user" /></NavLink>
+                  <NavLink to="/login" onClick={this.onLogout}><Avatar size="large" icon="user" /></NavLink>
                 </Header>
                 <Content className="base-content">
                   {

src/components/BaseLayout/index.js

@@ -5,7 +5,6 @@ import { createStore, applyMiddleware, compose } from 'redux'
 import { Provider } from 'react-redux'
 import { connectRouter, routerMiddleware, ConnectedRouter } from 'connected-react-router/immutable'
 import Immutable from 'immutable'
-// import persistState from 'redux-localstorage'
 import thunk from 'redux-thunk'
 import App from './App'
 import rootReducer from './reducers/index'
@@ -25,7 +24,6 @@ const store = createStore(
   connectRouter(history)(rootReducer),
   initialState,
   composeEnhancer(
-    //persistState(/*paths, config*/), //数据持久化，暂时没有调通，备用状态
     applyMiddleware(
       routerMiddleware(history),
       thunk

src/index.js

@@ -1,6 +1,7 @@
+let isLogin = sessionStorage.getItem('isLogin')
 const initState = {
   globalLoading: false, // 全局loading
-  isLogin: !!sessionStorage.getItem('isLogin') // 登录状态
+  isLogin: !!isLogin ? (isLogin === 'true' ? true : false) : false // 登录状态
 }
 
 export const global = (state = initState, action) => {
@@ -11,6 +12,7 @@ export const global = (state = initState, action) => {
         globalLoading: action.globalLoading
       }
     case "CHECK_IS_LOGIN":
+      console.log(11111)
       sessionStorage.setItem('isLogin', action.isLogin)
       return {
         ...state,