From 4e0aab11c62465171c3cd7cdaba9dc3926ea2b72 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 6 Jun 2018 23:00:11 +0800 Subject: [PATCH] no message Former-commit-id: 55ad03d532809432bd6050a8ccd5d9d6263b86a1 Former-commit-id: 16d572604a68ec53fef6463ac90daabfe2e47dcd Former-commit-id: 1e85541e8b96a001a4713bb92a16a434e739e6dc --- src/pages/demo/plugins/export/table.vue | 2 +- .../components/DemoI18n.vue | 0 .../components/DemoI18nControl.vue | 0 .../{vue-i18n => i18n}/components/lang.json | 0 .../demo/plugins/{vue-i18n => i18n}/demo1.vue | 4 +-- .../demo/plugins/{vue-i18n => i18n}/demo2.vue | 4 +-- .../demo/plugins/{vue-i18n => i18n}/doc.vue | 0 src/pages/demo/plugins/mock/dpd.vue | 4 +-- src/pages/demo/plugins/mock/dtd.vue | 8 ++--- src/router/index.js | 30 ++++++++++++++----- 10 files changed, 34 insertions(+), 18 deletions(-) rename src/pages/demo/plugins/{vue-i18n => i18n}/components/DemoI18n.vue (100%) rename src/pages/demo/plugins/{vue-i18n => i18n}/components/DemoI18nControl.vue (100%) rename src/pages/demo/plugins/{vue-i18n => i18n}/components/lang.json (100%) rename src/pages/demo/plugins/{vue-i18n => i18n}/demo1.vue (72%) rename src/pages/demo/plugins/{vue-i18n => i18n}/demo2.vue (72%) rename src/pages/demo/plugins/{vue-i18n => i18n}/doc.vue (100%) diff --git a/src/pages/demo/plugins/export/table.vue b/src/pages/demo/plugins/export/table.vue index f92b9050..1400cb68 100644 --- a/src/pages/demo/plugins/export/table.vue +++ b/src/pages/demo/plugins/export/table.vue @@ -28,7 +28,7 @@ diff --git a/src/pages/demo/plugins/vue-i18n/demo2.vue b/src/pages/demo/plugins/i18n/demo2.vue similarity index 72% rename from src/pages/demo/plugins/vue-i18n/demo2.vue rename to src/pages/demo/plugins/i18n/demo2.vue index 433d7a26..26f8e8a3 100644 --- a/src/pages/demo/plugins/vue-i18n/demo2.vue +++ b/src/pages/demo/plugins/i18n/demo2.vue @@ -13,8 +13,8 @@ diff --git a/src/pages/demo/plugins/vue-i18n/doc.vue b/src/pages/demo/plugins/i18n/doc.vue similarity index 100% rename from src/pages/demo/plugins/vue-i18n/doc.vue rename to src/pages/demo/plugins/i18n/doc.vue diff --git a/src/pages/demo/plugins/mock/dpd.vue b/src/pages/demo/plugins/mock/dpd.vue index bc497f68..13625bbc 100644 --- a/src/pages/demo/plugins/mock/dpd.vue +++ b/src/pages/demo/plugins/mock/dpd.vue @@ -23,10 +23,10 @@ import Vue from 'vue' import clone from '@/utils/clone.js' import Mock from 'mockjs' -import settingDPD from '../../data/settingDPD' +import settingDPD from './data/settingDPD' export default { components: { - MockDemoCard: () => import('../../components/MockDemoCard') + MockDemoCard: () => import('./components/MockDemoCard') }, data () { return { diff --git a/src/pages/demo/plugins/mock/dtd.vue b/src/pages/demo/plugins/mock/dtd.vue index cfcaaab6..e12b1598 100644 --- a/src/pages/demo/plugins/mock/dtd.vue +++ b/src/pages/demo/plugins/mock/dtd.vue @@ -35,16 +35,16 @@ import Vue from 'vue' import clone from '@/utils/clone.js' import Mock from 'mockjs' -import settingDTD from '../../data/settingDTD' -import regexp from '../../mixins/regexp' -import fn from '../../mixins/function' +import settingDTD from './data/settingDTD' +import regexp from './mixins/regexp' +import fn from './mixins/function' export default { mixins: [ regexp, fn ], components: { - MockDemoCard: () => import('../../components/MockDemoCard') + MockDemoCard: () => import('./components/MockDemoCard') }, data () { return { diff --git a/src/router/index.js b/src/router/index.js index e0807f7f..24b79f44 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,13 +9,13 @@ const routes = [ { path: '/', redirect: { name: 'index' }, - component: resolve => { require(['@/components/core/MainLayout/index.vue'], resolve) }, + component: () => import('@/components/core/MainLayout/index.vue'), children: [ { path: 'index', name: 'index', meta: { requiresAuth: true }, - component: resolve => { require(['@/pages/core/index/index.vue'], resolve) } + component: () => import('@/pages/core/index/index.vue') } ] }, @@ -24,16 +24,32 @@ const routes = [ name: 'demo-plugins', meta: { requiresAuth: true }, redirect: { name: 'demo-plugins-index' }, - component: resolve => { require(['@/components/core/MainLayout/index.vue'], resolve) }, - children: [ - - ] + component: () => import('@/components/core/MainLayout/index.vue'), + children: ((pub) => [ + { path: 'build', name: `${pub}build`, component: () => import('@/pages/demo/plugins/build/index.vue') }, + { path: 'clipboard-polyfill', name: `${pub}clipboard-polyfill`, component: () => import('@/pages/demo/plugins/clipboard-polyfill/index.vue') }, + { path: 'export/table', name: `${pub}export-table`, component: () => import('@/pages/demo/plugins/export/table.vue') }, + { path: 'export/txt', name: `${pub}export-txt`, component: () => import('@/pages/demo/plugins/export/txt.vue') }, + { path: 'i18n/demo1', name: `${pub}i18n-demo1`, component: () => import('@/pages/demo/plugins/i18n/demo1.vue') }, + { path: 'i18n/demo2', name: `${pub}i18n-demo2`, component: () => import('@/pages/demo/plugins/i18n/demo2.vue') }, + { path: 'i18n/doc', name: `${pub}i18n-doc`, component: () => import('@/pages/demo/plugins/i18n/doc.vue') }, + { path: 'import/csv', name: `${pub}import-csv`, component: () => import('@/pages/demo/plugins/import/csv.vue') }, + { path: 'import/xlsx', name: `${pub}import-xlsx`, component: () => import('@/pages/demo/plugins/import/xlsx.vue') }, + { path: 'index', name: `${pub}index`, component: () => import('@/pages/demo/plugins/index/index.vue') }, + { path: 'js-cookie', name: `${pub}js-cookie`, component: () => import('@/pages/demo/plugins/js-cookie/index.vue') }, + { path: 'layout/grid', name: `${pub}layout-grid`, component: () => import('@/pages/demo/plugins/layout/grid.vue') }, + { path: 'layout/splitpane', name: `${pub}layout-splitpane`, component: () => import('@/pages/demo/plugins/layout/splitpane.vue') }, + { path: 'mock/ajax', name: `${pub}mock-ajax`, component: () => import('@/pages/demo/plugins/mock/ajax.vue') }, + { path: 'mock/dpd', name: `${pub}mock-dpd`, component: () => import('@/pages/demo/plugins/mock/dpd.vue') }, + { path: 'mock/dtd', name: `${pub}mock-dtd`, component: () => import('@/pages/demo/plugins/mock/dtd.vue') }, + { path: 'timeago', name: `${pub}timeago`, component: () => import('@/pages/demo/plugins/timeago/index.vue') } + ])('demo-plugins-') }, // 登陆 { path: '/login', name: 'login', - component: resolve => { require(['@/pages/core/login/index.vue'], resolve) } + component: () => import('@/pages/core/login/index.vue') } ]