Merge branch 'master' into develop

src/models/app.js

@@ -72,11 +72,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}`
         }
       }

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) {