From 26793615595f5a439981521264d69bcce8477a27 Mon Sep 17 00:00:00 2001
From: blackboyhc <blackboyhc@sina.com>
Date: Thu, 15 Jun 2017 17:31:24 +0800
Subject: [PATCH 1/2] Update app.js
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

如果在config.js中添加了openPages，比如openPages: ['/login', '/home']，但是进入/home页面仍然要先登录，所以在app model中如果query不成功需要判断当前页面是否被设置成openPages，再决定是否跳转到/login
---
 src/models/app.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/models/app.js b/src/models/app.js
index 2ed12b8..57cf51a 100644
--- a/src/models/app.js
+++ b/src/models/app.js
@@ -43,11 +43,8 @@ export default {
           yield put(routerRedux.push('/dashboard'))
         }
       } else {
-        if (location.pathname !== '/login') {
+        if (config.openPages && config.openPages.indexOf(location.pathname) < 0) {
           let from = location.pathname
-          if (location.pathname === '/dashboard') {
-            from = '/dashboard'
-          }
           window.location = `${location.origin}/login?from=${from}`
         }
       }

From 4b9e142aa8f0344163c38f04bcab90bbfe615694 Mon Sep 17 00:00:00 2001
From: elviswu <elviswu@aaxischina.com>
Date: Fri, 16 Jun 2017 16:09:22 +0800
Subject: [PATCH 2/2] showModal return bug

---
 src/models/user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/models/user.js b/src/models/user.js
index 7db44c5..ef00f70 100644
--- a/src/models/user.js
+++ b/src/models/user.js
@@ -98,7 +98,7 @@ export default modelExtend(pageModel, {
   reducers: {
 
     showModal (state, { payload }) {
-      return { ...state, ...{ payload }, modalVisible: true }
+      return { ...state, ...payload, modalVisible: true }
     },
 
     hideModal (state) {