From f38f431125ca00ee1b7723776c578931aa58ac3f Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sun, 17 Jun 2018 07:49:23 +0800 Subject: [PATCH] no message Former-commit-id: 1a2521be64c1c4ac98b1c387bedbafb2cbd10f6c [formerly 1ab36176496695dc01631a9639818540bbe63f53] [formerly 1a2521be64c1c4ac98b1c387bedbafb2cbd10f6c [formerly 1ab36176496695dc01631a9639818540bbe63f53] [formerly 1a2521be64c1c4ac98b1c387bedbafb2cbd10f6c [formerly 1ab36176496695dc01631a9639818540bbe63f53] [formerly 1ab36176496695dc01631a9639818540bbe63f53 [formerly b38bf3dd51b153d3260e3db660486ade1bc942fb [formerly 513fe4c73f47ad84999fe575e537a718df6f13e9]]]]] Former-commit-id: 22144ee9fcc46683d9a55b916a4b6503944dfe88 Former-commit-id: a5c05d129e696ab37d0f12b43c17167f9a8e4b65 Former-commit-id: 27469f75fae640e7d096e468a9f6cd43b8756a1b [formerly a7d12f7a9e903b7a541e2d8305028562852e5b30] Former-commit-id: c6767c0d6ca17324825f7c220e3c65686fd5cfae Former-commit-id: 1fe19d6b85903b6d5ae0087a0b60b824bdd7b329 Former-commit-id: a62807e159f370e564bcc45e614e14ac9fcdc92d Former-commit-id: 26294269fc487b6e0fccf33f55f1eea45ba8456a Former-commit-id: 7ca93e8d4d9ff9abc891987bbe893111653f5724 --- design.sketch.REMOVED.git-id | 2 +- .../image/logo/w500-element.png.REMOVED.git-id | 1 + src/menu/index.js | 11 +++++++++++ src/pages/demo/element/index/index.vue | 9 +++++++++ src/router/index.js | 14 ++++++++++---- 5 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 src/assets/image/logo/w500-element.png.REMOVED.git-id create mode 100644 src/pages/demo/element/index/index.vue diff --git a/design.sketch.REMOVED.git-id b/design.sketch.REMOVED.git-id index 519b415b..136e9924 100644 --- a/design.sketch.REMOVED.git-id +++ b/design.sketch.REMOVED.git-id @@ -1 +1 @@ -5180df7143acd2b32403b34a30d5c86f32288d1c \ No newline at end of file +90e4abc5ac31f491aa6d7e8f1bb912989f2480f3 \ No newline at end of file diff --git a/src/assets/image/logo/w500-element.png.REMOVED.git-id b/src/assets/image/logo/w500-element.png.REMOVED.git-id new file mode 100644 index 00000000..497869c2 --- /dev/null +++ b/src/assets/image/logo/w500-element.png.REMOVED.git-id @@ -0,0 +1 @@ +8953f5c6d828eec1b94f2c721975eb81297220e7 \ No newline at end of file diff --git a/src/menu/index.js b/src/menu/index.js index 4b146d03..a2262910 100644 --- a/src/menu/index.js +++ b/src/menu/index.js @@ -122,6 +122,16 @@ const demoChart = { ])('/demo/chart/') } +// 路由菜单 组件库 +const demoElement = { + path: '/demo/element', + title: '组件库', + icon: 'puzzle-piece', + children: (pre => [ + { path: `${pre}index`, title: '组件库首页' } + ])('/demo/element/') +} + // 菜单 侧边栏 export const side = [ demoPlugins, @@ -141,6 +151,7 @@ export default [ children: [ demoPlugins, demoComponents, + demoElement, demoChart ] }, diff --git a/src/pages/demo/element/index/index.vue b/src/pages/demo/element/index/index.vue new file mode 100644 index 00000000..8d4d1766 --- /dev/null +++ b/src/pages/demo/element/index/index.vue @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index d39a33b3..5efc5b37 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -101,6 +101,16 @@ const routes = [ { path: 'scrollbar', name: `${pre}scrollbar`, component: () => import('@/pages/demo/components/scrollbar/index.vue'), meta } ])('demo-components-') }, + { + path: '/demo/element', + name: 'demo-element', + meta, + redirect: { name: 'demo-element-index' }, + component: () => import('@/components/core/d2-layout-main/index.vue'), + children: (pre => [ + { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/element/index/index.vue'), meta } + ])('demo-element-') + }, // 登陆 { path: '/login', @@ -109,10 +119,6 @@ const routes = [ } ] -// routes[3].children.forEach(e => { -// console.log(`{ path: \`\${pre}${e.path}\`, title: 'title' }`) -// }) - let router = new VueRouter({ routes }) router.beforeEach((to, from, next) => {