Merge branch 'xiaowang' into dev

src/router/index.js

@@ -108,7 +108,7 @@ router.beforeEach((to, from, next) => {
             .replace(/}}/g, '"}}')
             .replace(/"{/g, '{')
             .replace(/:{"}/g, ':{}')
-          console.log(state)
+            state = JSON.stringify({ path: '/', query: {} });
           let path = `${location.origin}${location.pathname === '/' ? '' : location.pathname}`
           if (state && state != 'undefined') {
             state = JSON.parse(state)