From 21fa97645e0943ade535d48902eeb62943138221 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 25 Jul 2018 22:17:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: f3c69ec1153e8c26f81f194f0a44d1d53569a605 [formerly f3c69ec1153e8c26f81f194f0a44d1d53569a605 [formerly f3c69ec1153e8c26f81f194f0a44d1d53569a605 [formerly f3c69ec1153e8c26f81f194f0a44d1d53569a605 [formerly 1633a45ac4736d6dbcbd3a6459aa5ad4102ba47a [formerly b5f4aaf0fc0ead8e4dc39218c32710ecbb31b373]]]]]
Former-commit-id: 9ba8d11a01326ec8dd61f1f49a7d13cb6c8e0512
Former-commit-id: a8b1430f4d9a550d93bbfadcd4e33efefb3c90c3
Former-commit-id: 02fe5a6339ad7acd07d6d0cd9f308feaf145be54 [formerly eba172c571f3f8ef60a8e2fac24a0cc8cba85839]
Former-commit-id: 20a2e543fb8668b0072052e2bafb435f496949e4
Former-commit-id: 3a43f59161f10486eba82c03302c206ea173713b
Former-commit-id: 2e550853ec7e75947902d5da59e698f52cc81b6c
Former-commit-id: f945ce07dff175600e3a15acdaf9958cc6efaa3e
Former-commit-id: a37786da687091d187d4a7f90d9d6b0a6bfbef53
---
 src/libs/util.js    | 1 -
 src/main.js         | 6 ++++--
 src/router/index.js | 5 ++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/libs/util.js b/src/libs/util.js
index d68f8374..1e821fed 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -1,7 +1,6 @@
 import Cookies from 'js-cookie'
 import axios from 'axios'
 import semver from 'semver'
-import dayjs from 'dayjs'
 import UaParser from 'ua-parser-js'
 import { version } from '../../package.json'
 
diff --git a/src/main.js b/src/main.js
index 37870c37..3445e48e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,8 +11,6 @@ import vueJsonTreeView from 'vue-json-tree-view'
 import i18n from './i18n'
 import util from '@/libs/util.js'
 import store from '@/store/index'
-import { frameInRoutes } from '@/router/routes'
-import { menuAside, menuHeader } from '@/menu'
 import '@/assets/svg-icons'
 import '@/components'
 import '@/plugin/axios'
@@ -20,7 +18,11 @@ import '@/mock/register'
 import pluginImport from '@/plugin/import'
 import pluginExport from '@/plugin/export'
 import pluginOpen from '@/plugin/open'
+
+// 菜单和路由设置
 import router from './router'
+import { menuHeader, menuAside } from '@/menu'
+import { frameInRoutes } from '@/router/routes'
 
 Vue.use(ElementUI)
 Vue.use(VCharts)
diff --git a/src/router/index.js b/src/router/index.js
index 72b93247..92927ba2 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,7 +8,10 @@ import routes from './routes'
 
 Vue.use(VueRouter)
 
-let router = new VueRouter({ routes })
+// 导出路由 在 main.js 里使用
+const router = new VueRouter({
+  routes
+})
 
 /**
  * 路由拦截