处理冲突

src/router/index.js

@@ -30,15 +30,14 @@ import Layout from '@/layout'
 
 // 公共路由
 export const constantRoutes = [{
-<<<<<<< HEAD
-    path: '/redirect',
-    component: Layout,
-    hidden: true,
-    children: [{
-      path: '/redirect/:path(.*)',
-      component: () => import('@/views/redirect')
-    }]
-  },
+  path: '/redirect',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/redirect/:path(.*)',
+    component: () => import('@/views/redirect')
+  }]
+},
   {
     path: '/login',
     component: () => import('@/views/login'),
@@ -94,9 +93,9 @@ export const constantRoutes = [{
     component: () => import('@/views1/HomeView.vue'),
     hidden: true,
     children: [{
-        path: "/home/page",
-        component: () => import('@/views1/Page/PageView.vue')
-      },
+      path: "/home/page",
+      component: () => import('@/views1/Page/PageView.vue')
+    },
       {
         path: "/home/retrieval",
         component: () => import('@/views1/Retrieval/RetrievalView.vue')
@@ -218,123 +217,6 @@ export const constantRoutes = [{
     hidden: true,
   },
 ]
-=======
-  path: '/redirect',
-  component: Layout,
-  hidden: true,
-  children: [{
-    path: '/redirect/:path(.*)',
-    component: () => import('@/views/redirect')
-  }]
-}, {
-  path: '/login',
-  component: () => import('@/views/login'),
-  hidden: true
-}, {
-  path: '/register',
-  component: () => import('@/views/register'),
-  hidden: true
-}, {
-  path: '/404',
-  component: () => import('@/views/error/404'),
-  hidden: true
-}, {
-  path: '/401',
-  component: () => import('@/views/error/401'),
-  hidden: true
-}, {
-  path: '',
-  component: Layout,
-  redirect: 'index',
-  children: [{
-    path: 'index',
-    component: () => import('@/views/index'),
-    name: 'Index',
-    meta: {
-      title: '首页',
-      icon: 'dashboard',
-      affix: true
-    }
-  }]
-}, {
-  path: '/user',
-  component: Layout,
-  hidden: true,
-  redirect: 'noredirect',
-  children: [{
-    path: 'profile',
-    component: () => import('@/views/system/user/profile/index'),
-    name: 'Profile',
-    meta: {
-      title: '个人中心',
-      icon: 'user'
-    }
-  }]
-}, {
-  path: '/home',
-  component: () => import('@/views1/HomeView.vue'),
-  hidden: true,
-  children: [{
-    path: "/home/page",
-    component: () => import('@/views1/Page/PageView.vue')
-  }, {
-    path: "/home/retrieval",
-    component: () => import('@/views1/Retrieval/RetrievalView.vue')
-  }, {
-    path: "/home/retrieval/list",
-    component: () => import('@/views1/Retrieval/List/ListView.vue')
-  }, {
-    path: "/home/file",
-    component: () => import('@/views1/File/FileView.vue')
-  }, {
-    path: "/home/file/part",
-    component: () => import('@/views1/File/Part/PartView.vue')
-  }, {
-    path: "/home/file/publi",
-    component: () => import('@/views1/File/Publi/PublicView.vue')
-  }, {
-    path: "/home/file/individual",
-    component: () => import('@/views1/File/Individual/IndividualView.vue')
-  }, {
-    path: "/home/file/set",
-    component: () => import('@/views1/File/Set/SetView.vue')
-  }, {
-    path: "/home/personal",
-    component: () => import('@/views1/Personal/PersonalView.vue')
-  }, {
-    path: "/home/personal/classify",
-    component: () => import('@/views1/Personal/Classify/ClassifyView.vue')
-  }, {
-    path: "/home/personal/space",
-    component: () => import('@/views1/Personal/Space/SpaceView.vue')
-  }, {
-    path: "/home/personal/modify",
-    component: () => import('@/views1/Personal/Modify/ModifyView.vue')
-  }, {
-    path: "/home/system",
-    component: () => import('@/views1/System/SystemView.vue')
-  }, {
-    path: "/home/system/organization",
-    component: () => import('@/views1/System/Organization/OrganizationView.vue')
-  }, {
-    path: "/home/system/user",
-    component: () => import('@/views1/System/User/UserView.vue')
-  }, {
-    path: "/home/system/authority",
-    component: () => import('@/views1/System/Authority/AuthorityView.vue')
-  }, {
-    path: "/home/system/notes",
-    component: () => import('@/views1/System/Notes/NotesView.vue')
-  }, {
-    path: "/home/system/space",
-    component: () => import('@/views1/System/Space/SpaceView.vue')
-  }],
-}, {
-  path: '/login1',
-  component: () => import('@/views1/LoginView.vue'),
-  hidden: true,
-}, ]
->>>>>>> 3c521e5fc8e805fdf1ee9d1b439275dd81d08d7c
 
 // 动态路由，基于用户权限动态去加载
 export const dynamicRoutes = [{