|
|
@@ -73,16 +73,6 @@ export const constantRoutes = [ |
|
|
|
path: '/', |
|
|
|
component: Layout, |
|
|
|
// redirect: 'core/base/factory', |
|
|
|
<<<<<<< HEAD |
|
|
|
children: [{ |
|
|
|
path: 'index', |
|
|
|
// redirect: 'core/base/factory', |
|
|
|
component: (resolve) => require(['@/views/index'], resolve), |
|
|
|
name: '首页', |
|
|
|
meta: { title: '首页', icon: 'dashboard', affix: true } |
|
|
|
} |
|
|
|
] |
|
|
|
======= |
|
|
|
// children: [{ |
|
|
|
// path: 'index', |
|
|
|
// redirect: 'core/base/factory', |
|
|
@@ -91,7 +81,6 @@ export const constantRoutes = [ |
|
|
|
// meta: { title: '首页', icon: 'dashboard', affix: true } |
|
|
|
// } |
|
|
|
// ] |
|
|
|
>>>>>>> projects/mes-test |
|
|
|
}, |
|
|
|
{ |
|
|
|
path: '/user', |
|
|
|