🍊

src/main.js

@@ -4,31 +4,32 @@ import Vue from 'vue'
 import App from './App'
 import router from './router'
 import store from './store'
-import ElementUI from 'element-ui';
+import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-default/index.css'
 import NProgress from 'nprogress'
-import 'normalize.css/normalize.css';// normalize.css 样式格式化
-import '@/styles/index.scss'; // 全局自定义的css样式
-import '@/components/Icon-svg/index'; // 封装的svg组件
+import 'normalize.css/normalize.css'
+import '@/styles/index.scss' // 全局自定义的css样式
+import '@/assets/iconfont/iconfont'
+import IconSvg from '@/components/Icon-svg/index.vue'
 
 Vue.config.productionTip = false
 
 Vue.use(ElementUI);
+Vue.component('icon-svg', IconSvg)
 
-
-const whiteList = ['/login'];// 不重定向白名单
+const whiteList = ['/login'];
 router.beforeEach((to, from, next) => {
-  NProgress.start(); // 开启Progress
-  if (store.getters.token) { // 判断是否有token
+  NProgress.start();
+  if (store.getters.token) {
     if (to.path === '/login') {
       next({ path: '/' });
     } else {
-      if (store.getters.roles.length === 0) { // 判断当前用户是否已拉取完user_info信息
-        store.dispatch('GetInfo').then(res => { // 拉取user_info
+      if (store.getters.roles.length === 0) {
+        store.dispatch('GetInfo').then(res => {
           const roles = res.data.role;
-          store.dispatch('GenerateRoutes', { roles }).then(() => { // 生成可访问的路由表
-            router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
-            next(to.path); // hack方法 确保addRoutes已完成
+          store.dispatch('GenerateRoutes', { roles }).then(() => {
+            router.addRoutes(store.getters.addRouters)
+            next(to.path);
           })
         }).catch(err => {
           console.log(err);
@@ -38,10 +39,10 @@ router.beforeEach((to, from, next) => {
       }
     }
   } else {
-    if (whiteList.indexOf(to.path) !== -1) { // 在免登录白名单，直接进入
+    if (whiteList.indexOf(to.path) !== -1) {
       next()
     } else {
-      next('/login'); // 否则全部重定向到登录页
+      next('/login');
       NProgress.done();
     }
   }