From 4636f1128c5ef718366d41f236da5da843897331 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 14:29:11 +0800
Subject: [PATCH] no message

Former-commit-id: 40496ceaf1489dcc382f41c6e62fa91a1a300a44 [formerly 6ddfd235e7040886302c149d3c52164ecfcbcb81] [formerly 40496ceaf1489dcc382f41c6e62fa91a1a300a44 [formerly 6ddfd235e7040886302c149d3c52164ecfcbcb81] [formerly 40496ceaf1489dcc382f41c6e62fa91a1a300a44 [formerly 6ddfd235e7040886302c149d3c52164ecfcbcb81] [formerly 6ddfd235e7040886302c149d3c52164ecfcbcb81 [formerly ca7166204cdc0b4981386253fcb1c91df5897f50 [formerly 532b8ccca65817759686fc4445e3057ca6f38a51]]]]]
Former-commit-id: a0e9da94e1a9c1d05cafbb2738393349f1cef5bf
Former-commit-id: 3c8899a38ae8f560ded9ce8896abcaa5fa14b58f
Former-commit-id: 79f47d61913a660041ec81b911740a223d383621 [formerly 90c37d4093027b78e6b17f5dd580fc83db4cf8af]
Former-commit-id: 85a6e59e46dcc696406663ab1a669495da39975a
Former-commit-id: 304894163377cf8ad053052f1957c8787925aa96
Former-commit-id: 2de3894486eb764120833d39c05965c3fdbd26ab
Former-commit-id: 7b1469b3c0189f67f83664cb0068b35c2f3ec0ee
Former-commit-id: 42a48a1a70d2ea650b8df2255a2c8de1b31a3df4
---
 src/components/core/d2-multiple-page-control/index.vue | 2 +-
 src/main.js                                            | 9 +++++----
 src/router/index.js                                    | 6 ++++--
 src/router/routers.js.REMOVED.git-id                   | 1 -
 src/router/routes.js.REMOVED.git-id                    | 1 +
 5 files changed, 11 insertions(+), 8 deletions(-)
 delete mode 100644 src/router/routers.js.REMOVED.git-id
 create mode 100644 src/router/routes.js.REMOVED.git-id

diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index d6f1e5aa..b7d4cc11 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex'
+import { mapState } from 'vuex'
 export default {
   data () {
     return {
diff --git a/src/main.js b/src/main.js
index 0777cec0..de5fee98 100755
--- a/src/main.js
+++ b/src/main.js
@@ -2,9 +2,13 @@ import 'babel-polyfill'
 
 import Vue from 'vue'
 import App from './App'
-import router from './router'
 import i18n from './i18n'
 
+// vuex
+import store from '@/store/index.js'
+
+import router from './router'
+
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 
@@ -35,9 +39,6 @@ import '@/plugin/axios'
 // mock接口设置
 import '@/mock/register'
 
-// vuex
-import store from '@/store/index.js'
-
 // 右键菜单
 import contentmenu from 'v-contextmenu'
 import 'v-contextmenu/dist/index.css'
diff --git a/src/router/index.js b/src/router/index.js
index 20007feb..209c9ba6 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3,13 +3,13 @@ import VueRouter from 'vue-router'
 import Cookies from 'js-cookie'
 
 // 路由数据
-import routers from './routers'
+import routes from './routes'
 
 import util from '@/libs/util.js'
 
 Vue.use(VueRouter)
 
-let router = new VueRouter({ routers })
+let router = new VueRouter({ routes })
 
 /**
  * 路由拦截
@@ -36,6 +36,7 @@ router.beforeEach((to, from, next) => {
 
 // TODO: 路由跳转后自动滚动到顶部
 router.afterEach(to => {
+  console.log('to', to)
   // 需要的信息
   const app = router.app
   const { name, params, query } = to
@@ -47,6 +48,7 @@ router.afterEach(to => {
   console.log('query: ', query)
   console.groupEnd()
   // 多页控制 打开新的页面
+  console.log('app', app)
   util.openNewPage(app, name, params, query)
 })
 
diff --git a/src/router/routers.js.REMOVED.git-id b/src/router/routers.js.REMOVED.git-id
deleted file mode 100644
index 37308904..00000000
--- a/src/router/routers.js.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-13063df4cba8c554e147adf0a2aa576871880a84
\ No newline at end of file
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
new file mode 100644
index 00000000..44a18954
--- /dev/null
+++ b/src/router/routes.js.REMOVED.git-id
@@ -0,0 +1 @@
+a7db0247e157a65ee28ba9fc302b042b5ee0c289
\ No newline at end of file