Merge branch 'master' into houxq

src/router/routes/manage/jcxxgl.ts

@@ -25,71 +25,83 @@ export default <RouteRecordRawWithMeta>{
       },
       redirect: null,
       component: () => import('~/pages/manage/jcxxgl/zyflgl/index.vue'),
-
     },
     {
-      path:'xxgl_all',
-      name:'xxgl_all',
-      props: false,
+      path: 'xxgl_parent',
+      name: 'xxgl_parent',
       meta: {
         hidden: false,
-        breadcrumb: true,
-        sort: 1,
+        sort: 2,
         title: '学校管理',
-      },
-      component: () => import('~/pages/manage/jcxxgl/xxgl/xxgl.vue')
-    },
-    {
-      path: 'xxgl',
-      name: 'xxgl',
-      props: false,
-      meta: {
-        hidden: true,
         breadcrumb: true,
-        sort: 1,
-        title: '学校管理(局)',
       },
-      redirect: null,
-      component: () => import('~/pages/manage/jcxxgl/xxgl/index.vue'),
-    },
-    {
-      path: 'xxgl_xj',
-      name: 'xxgl_xj',
-      props: false,
-      meta: {
-        hidden: true,
-        breadcrumb: true,
-        sort: 1,
-        title: '学校管理(校)',
-      },
-      component: () => import('~/layout/main/default/index.vue'),
-      redirect: { name: 'xj_index' },
+      redirect: { name: 'xxgl_all' },
       children: [
         {
-          path: '',
-          name: 'xj_index',
+          path: 'xxgl_all',
+          name: 'xxgl_all',
           props: false,
           meta: {
             hidden: true,
+            breadcrumb: true,
             sort: 1,
-            title: '学校管理(校)',
+            title: '学校管理',
           },
-          redirect: null,
-          component: () => import('~/pages/manage/jcxxgl/xxgl/index_xj.vue'),
+          component: () => import('~/pages/manage/jcxxgl/xxgl/xxgl.vue')
         },
         {
-          path: 'xj_detail',
-          name: 'xj_detail',
+          path: 'xxgl',
+          name: 'xxgl',
           props: false,
           meta: {
             hidden: true,
             breadcrumb: true,
             sort: 1,
-            title: '详情',
+            title: '学校管理(局)',
           },
           redirect: null,
-          component: () => import('~/pages/manage/jcxxgl/xxgl/xj_detail.vue'),
+          component: () => import('~/pages/manage/jcxxgl/xxgl/index.vue'),
         },
+        {
+          path: 'xxgl_xj',
+          name: 'xxgl_xj',
+          props: false,
+          meta: {
+            hidden: true,
+            breadcrumb: true,
+            sort: 1,
+            title: '学校管理(校)',
+          },
+          component: () => import('~/layout/main/default/index.vue'),
+          redirect: { name: 'xj_index' },
+          children: [
+            {
+              path: '',
+              name: 'xj_index',
+              props: false,
+              meta: {
+                hidden: true,
+                sort: 1,
+                title: '学校管理(校)',
+              },
+              redirect: null,
+              component: () => import('~/pages/manage/jcxxgl/xxgl/index_xj.vue'),
+            },
+            {
+              path: 'xj_detail',
+              name: 'xj_detail',
+              props: false,
+              meta: {
+                hidden: true,
+                breadcrumb: true,
+                sort: 1,
+                title: '详情',
+              },
+              redirect: null,
+              component: () => import('~/pages/manage/jcxxgl/xxgl/xj_detail.vue'),
+            },
+          ]
+        }
       ]
     }
   ],