Merge branch 'master' into deploy

2019-01-30 14:09:51 +08:00
parent 11264d163b 3b9abde89a
commit 10d9007f81
9 changed files with 84 additions and 34 deletions
--- a/src/main.js
+++ b/src/main.js
@@ -10,8 +10,8 @@ import 'element-ui/lib/theme-chalk/index.css'
 import '@/styles/index.scss' // global css

 import App from './App'
-import router from './router'
 import store from './store'
+import router from './router'

 import i18n from './lang' // Internationalization
 import './icons' // icon