From ca929047148f6f1ac6f2a8ed66f4926dc712c515 Mon Sep 17 00:00:00 2001
From: zuiidea <zuiiidea@gmail.com>
Date: Thu, 3 Nov 2016 23:39:27 +0800
Subject: [PATCH] loading

---
 src/components/layout/main.less |  6 ++++++
 src/models/app.js               | 10 +++++++++-
 src/routes/app.js               | 25 ++++++++++---------------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/components/layout/main.less b/src/components/layout/main.less
index d849768..fe05afb 100644
--- a/src/components/layout/main.less
+++ b/src/components/layout/main.less
@@ -116,3 +116,9 @@
     color: @primary-color;
   }
 }
+
+.spin {
+  & ~:global.ant-spin-container {
+    height: 100vh;
+  }
+}
diff --git a/src/models/app.js b/src/models/app.js
index 399f530..7957b07 100644
--- a/src/models/app.js
+++ b/src/models/app.js
@@ -47,7 +47,9 @@ export default {
             }
           }
         })
-      } else {}
+      } else {
+        yield put({type: 'hideLoading'})
+      }
     },
     *logout({
       payload
@@ -93,6 +95,12 @@ export default {
         ...state,
         loading: true
       }
+    },
+    hideLoading(state) {
+      return {
+        ...state,
+        loading: false
+      }
     }
   }
 }
diff --git a/src/routes/app.js b/src/routes/app.js
index e87163b..6acbdd2 100644
--- a/src/routes/app.js
+++ b/src/routes/app.js
@@ -8,28 +8,23 @@ import Footer from '../components/layout/footer'
 import Sider from '../components/layout/sider'
 import styles from '../components/layout/main.less'
 import '../components/layout/common.less'
-
-function App({children, location, dispatch,app}) {
-  const {login, loading,loginButtonLoading,user} = app
+import {Spin,message} from 'antd'
+function App({children, location, dispatch, app}) {
+  const {login, loading, loginButtonLoading, user} = app
   const loginProps = {
     loading,
     loginButtonLoading,
     onOk(data) {
-      dispatch({
-        type: 'app/login',
-        payload: data,
-      })
-    },
+      dispatch({type: 'app/login', payload: data})
+    }
   }
 
   const headerProps = {
     user,
     location,
     logout() {
-      dispatch({
-        type: 'app/logout'
-      })
-    },
+      dispatch({type: 'app/logout'})
+    }
   }
 
   return (
@@ -49,7 +44,7 @@ function App({children, location, dispatch,app}) {
               <Footer/>
             </div>
           </div>
-        : <Login {...loginProps}/>}</div>
+        : <Spin tip="加载用户信息..." className={styles.spin} spinning={loading} size="large"><Login {...loginProps}/></Spin>}</div>
   )
 }
 
@@ -58,9 +53,9 @@ App.propTypes = {
   location: PropTypes.object,
   dispatch: PropTypes.func,
   loading: PropTypes.object,
-  loginButtonLoading:PropTypes.bool,
+  loginButtonLoading: PropTypes.bool,
   login: PropTypes.bool,
-  user:PropTypes.object,
+  user: PropTypes.object
 }
 
 function mapStateToProps({app}) {