diff --git a/package.json b/package.json index 56b6bf4..dcc1a8e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "d2-admin", - "version": "1.5.1", + "version": "1.5.2", "scripts": { "serve": "vue-cli-service serve --open", "start": "vue-cli-service serve --open", diff --git a/src/menu/aside.js b/src/menu/aside.js index 3e38cce..491f5b0 100644 --- a/src/menu/aside.js +++ b/src/menu/aside.js @@ -2,12 +2,12 @@ export default [ { path: '/index', title: '首页', icon: 'home' }, { - title: '页面', + title: '演示页面', icon: 'folder-o', children: [ - { path: '/page1', title: '页面 1' }, - { path: '/page2', title: '页面 2' }, - { path: '/page3', title: '页面 3' } + { path: '/demo/page1', title: '页面 1' }, + { path: '/demo/page2', title: '页面 2' }, + { path: '/demo/page3', title: '页面 3' } ] } ] diff --git a/src/menu/header.js b/src/menu/header.js index eba62c4..e217566 100644 --- a/src/menu/header.js +++ b/src/menu/header.js @@ -2,12 +2,12 @@ export default [ { path: '/index', title: '首页', icon: 'home' }, { - title: '页面', + title: '演示页面', icon: 'folder-o', children: [ - { path: '/page1', title: '页面 1' }, - { path: '/page2', title: '页面 2' }, - { path: '/page3', title: '页面 3' } + { path: '/demo/page1', title: '页面 1' }, + { path: '/demo/page2', title: '页面 2' }, + { path: '/demo/page3', title: '页面 3' } ] } ] diff --git a/src/pages/page1/index.vue b/src/pages/demo/page1/index.vue similarity index 100% rename from src/pages/page1/index.vue rename to src/pages/demo/page1/index.vue diff --git a/src/pages/page2/index.vue b/src/pages/demo/page2/index.vue similarity index 100% rename from src/pages/page2/index.vue rename to src/pages/demo/page2/index.vue diff --git a/src/pages/page3/index.vue b/src/pages/demo/page3/index.vue similarity index 100% rename from src/pages/page3/index.vue rename to src/pages/demo/page3/index.vue diff --git a/src/router/modules/demo.js b/src/router/modules/demo.js new file mode 100644 index 0000000..40c70c6 --- /dev/null +++ b/src/router/modules/demo.js @@ -0,0 +1,16 @@ +import layoutHeaderAside from '@/layout/header-aside' + +const meta = { requiresAuth: true } + +export default { + path: '/demo', + name: 'demo', + meta, + redirect: { name: 'demo-page1' }, + component: layoutHeaderAside, + children: (pre => [ + { path: 'page1', name: `${pre}page1`, component: () => import('@/pages/demo/page1'), meta: { meta, title: '页面 1' } }, + { path: 'page2', name: `${pre}page2`, component: () => import('@/pages/demo/page2'), meta: { meta, title: '页面 2' } }, + { path: 'page3', name: `${pre}page3`, component: () => import('@/pages/demo/page3'), meta: { meta, title: '页面 3' } } + ])('demo-') +} diff --git a/src/router/routes.js b/src/router/routes.js index c472c5e..76cea7b 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -1,4 +1,5 @@ -// layout +import demo from './modules/demo' + import layoutHeaderAside from '@/layout/header-aside' const meta = { requiresAuth: true } @@ -17,27 +18,10 @@ const frameIn = [ name: 'index', meta, component: () => import('@/pages/index') - }, - { - path: '/page1', - name: 'page1', - component: () => import('@/pages/page1'), - meta: { meta, title: '页面 1' } - }, - { - path: '/page2', - name: 'page2', - component: () => import('@/pages/page2'), - meta: { meta, title: '页面 2' } - }, - { - path: '/page3', - name: 'page3', - component: () => import('@/pages/page3'), - meta: { meta, title: '页面 3' } } ] - } + }, + demo ] /** @@ -48,13 +32,8 @@ const frameOut = [ { path: '/redirect/:path*', component: { - beforeCreate () { - const path = this.$route.params.path - this.$router.replace(JSON.parse(path)) - }, - render: function (h) { - return h() - } + beforeCreate () { this.$router.replace(JSON.parse(this.$route.params.path)) }, + render: h => h() } }, // 登录