Explorar el Código

Merge branch 'hhl' of SH-Arbitrate/Arbitrate-Frontend into dev

hhlxayunmei hace 2 años
padre
commit
1efbb25638
Se han modificado 2 ficheros con 6 adiciones y 3 borrados
  1. 4
    2
      src/router/index.js
  2. 2
    1
      src/store/modules/permission.js

+ 4
- 2
src/router/index.js Ver fichero

100
     children: [
100
     children: [
101
       {
101
       {
102
         path: 'role/:userId(\\d+)',
102
         path: 'role/:userId(\\d+)',
103
-        component: () => import('@/views/system/user/authRole'),
103
+        // component: () => import('@/views/system/user/authRole'),
104
+        component: (resolve) => require(['@/views/system/user/authRole'],resolve),
104
         name: 'AuthRole',
105
         name: 'AuthRole',
105
         meta: { title: '分配角色', activeMenu: '/system/user' }
106
         meta: { title: '分配角色', activeMenu: '/system/user' }
106
       }
107
       }
114
     children: [
115
     children: [
115
       {
116
       {
116
         path: 'user/:roleId(\\d+)',
117
         path: 'user/:roleId(\\d+)',
117
-        component: () => import('@/views/system/role/authUser'),
118
+        // component: () => import('@/views/system/role/authUser'),
119
+        component: (resolve) => require(['@/views/system/role/authUser'],resolve),
118
         name: 'AuthUser',
120
         name: 'AuthUser',
119
         meta: { title: '分配用户', activeMenu: '/system/role' }
121
         meta: { title: '分配用户', activeMenu: '/system/role' }
120
       }
122
       }

+ 2
- 1
src/store/modules/permission.js Ver fichero

126
     return (resolve) => require([`@/views/${view}`], resolve)
126
     return (resolve) => require([`@/views/${view}`], resolve)
127
   } else {
127
   } else {
128
     // 使用 import 实现生产环境的路由懒加载
128
     // 使用 import 实现生产环境的路由懒加载
129
-    return () => import(`@/views/${view}`)
129
+    // return () => import(`@/views/${view}`)
130
+    return (resolve) => require([`@/views/${view}`], resolve)
130
   }
131
   }
131
 }
132
 }
132
 
133