Merge branch 'yangbin1994-bug575' into develop

README.md

@@ -46,7 +46,7 @@
 -     更新`eslint`，并适当修改了`.eslintrc`。
 
 
-        [More Change Log](https://github.com/zuiidea/antd-admin/wiki/Change-Log)
+[More Change Log](https://github.com/zuiidea/antd-admin/wiki/Change-Log)
 
 ## 开发构建
 

src/models/app.js

@@ -99,9 +99,9 @@ export default {
       } else if (config.openPages && config.openPages.indexOf(locationPathname) < 0) {
         yield put(routerRedux.push({
           pathname: '/login',
-          query: {
+          search: queryString.stringify({
             from: locationPathname,
-          },
+          }),
         }))
       }
     },

src/routes/app.js

@@ -37,6 +37,7 @@ const App = ({ children, dispatch, app, loading, location }) => {
   const headerProps = {
     menu,
     user,
+    location,
     siderFold,
     isNavbar,
     menuPopoverVisible,

src/routes/post/index.js

@@ -4,6 +4,7 @@ import { connect } from 'dva'
 import { Tabs } from 'antd'
 import { routerRedux } from 'dva/router'
 import List from './List'
+import queryString from 'query-string'
 
 const TabPane = Tabs.TabPane
 
@@ -24,21 +25,21 @@ const Index = ({ post, dispatch, loading, location }) => {
     onChange (page) {
       dispatch(routerRedux.push({
         pathname,
-        query: {
+        search: queryString.stringify({
           ...query,
           page: page.current,
           pageSize: page.pageSize,
-        },
+        }),
       }))
     },
   }
 
   const handleTabClick = (key) => {
     dispatch(routerRedux.push({
       pathname,
-      query: {
+      search: queryString.stringify({
         status: key,
-      },
+      }),
     }))
   }
 

src/routes/user/index.js

@@ -45,11 +45,11 @@ const User = ({ location, dispatch, user, loading }) => {
       const { query, pathname } = location
       dispatch(routerRedux.push({
         pathname,
-        query: {
+        search: queryString.stringify({
           ...query,
           page: page.current,
           pageSize: page.pageSize,
-        },
+        }),
       }))
     },
     onDeleteItem (id) {
@@ -88,20 +88,20 @@ const User = ({ location, dispatch, user, loading }) => {
     onFilterChange (value) {
       dispatch(routerRedux.push({
         pathname: location.pathname,
-        query: {
+        search: queryString.stringify({
           ...value,
           page: 1,
           pageSize,
-        },
+        }),
       }))
     },
     onSearch (fieldsValue) {
       fieldsValue.keyword.length ? dispatch(routerRedux.push({
         pathname: '/user',
-        query: {
+        search: queryString.stringify({
           field: fieldsValue.field,
           keyword: fieldsValue.keyword,
-        },
+        }),
       })) : dispatch(routerRedux.push({
         pathname: '/user',
       }))