From 720c249b8a4dc9ecef2b162308c2b15347868962 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Mon, 11 Mar 2019 14:09:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=86=85=E7=BD=AE=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=94=BE=E7=BD=AE=E5=88=B0=20system=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 9b6f1fc48ff0a4b7158522a9493476106efdc04c [formerly 9b6f1fc48ff0a4b7158522a9493476106efdc04c [formerly 9b6f1fc48ff0a4b7158522a9493476106efdc04c [formerly 9b6f1fc48ff0a4b7158522a9493476106efdc04c [formerly d81996a3796e2c63911966f0cb6ea18bec5e7906 [formerly df8f59f86f2e28a8e8be1e6eb72ce4ade91af154]]]]] Former-commit-id: db47b459b73606a01e067ae92f28b500d405a609 Former-commit-id: 1dd52f3c4a1c48fc7c6cd6ad6f336c40d5e8c1d5 Former-commit-id: 3e24140718abe0ecb090121d1c695769e1b677c6 [formerly f58557f2407c0f8f445770865430beee4a3409f1] Former-commit-id: 208210f8433f8ae4c42c663456c0c26eb0ea8b45 Former-commit-id: 08a2d89053625b33cd5e2922eae17b457ec38113 Former-commit-id: 859353ae3db7ae5bece84f07c912400df9ef8c36 Former-commit-id: 53ed8961afd584901342191f1c1576d18aedfe4e Former-commit-id: 3d03936adbb9d467255220aa178f684fb80d00d2 --- src/pages/login/index.js | 3 --- .../page.vue => system/error/404/index.vue} | 0 src/pages/system/function/redirect/index.js | 6 +++++ src/pages/system/function/refresh/index.js | 6 +++++ .../index/components/d2-badge/index.vue | 0 .../d2-help-btn/image/qq.jpg.REMOVED.git-id | 0 .../d2-help-btn/image/we.jpg.REMOVED.git-id | 0 .../index/components/d2-help-btn/index.vue | 0 .../index/image/qr@2x.png.REMOVED.git-id | 0 .../{error-page-404 => system/index}/index.js | 0 src/pages/{ => system}/index/page.vue | 0 .../login/image/logo@2x.png.REMOVED.git-id | 0 src/pages/{index => system/login}/index.js | 0 .../login/page.vue.REMOVED.git-id | 0 src/router/routes.js | 23 +++++-------------- 15 files changed, 18 insertions(+), 20 deletions(-) delete mode 100644 src/pages/login/index.js rename src/pages/{error-page-404/page.vue => system/error/404/index.vue} (100%) create mode 100644 src/pages/system/function/redirect/index.js create mode 100644 src/pages/system/function/refresh/index.js rename src/pages/{ => system}/index/components/d2-badge/index.vue (100%) rename src/pages/{ => system}/index/components/d2-help-btn/image/qq.jpg.REMOVED.git-id (100%) rename src/pages/{ => system}/index/components/d2-help-btn/image/we.jpg.REMOVED.git-id (100%) rename src/pages/{ => system}/index/components/d2-help-btn/index.vue (100%) rename src/pages/{ => system}/index/image/qr@2x.png.REMOVED.git-id (100%) rename src/pages/{error-page-404 => system/index}/index.js (100%) rename src/pages/{ => system}/index/page.vue (100%) rename src/pages/{ => system}/login/image/logo@2x.png.REMOVED.git-id (100%) rename src/pages/{index => system/login}/index.js (100%) rename src/pages/{ => system}/login/page.vue.REMOVED.git-id (100%) diff --git a/src/pages/login/index.js b/src/pages/login/index.js deleted file mode 100644 index ddb7de83..00000000 --- a/src/pages/login/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import page from './page' - -export default page diff --git a/src/pages/error-page-404/page.vue b/src/pages/system/error/404/index.vue similarity index 100% rename from src/pages/error-page-404/page.vue rename to src/pages/system/error/404/index.vue diff --git a/src/pages/system/function/redirect/index.js b/src/pages/system/function/redirect/index.js new file mode 100644 index 00000000..987e4528 --- /dev/null +++ b/src/pages/system/function/redirect/index.js @@ -0,0 +1,6 @@ +export default { + beforeRouteEnter (to, from, next) { + next(instance => instance.$router.replace(JSON.parse(from.params.route))) + }, + render: h => h() +} diff --git a/src/pages/system/function/refresh/index.js b/src/pages/system/function/refresh/index.js new file mode 100644 index 00000000..e8b35034 --- /dev/null +++ b/src/pages/system/function/refresh/index.js @@ -0,0 +1,6 @@ +export default { + beforeRouteEnter (to, from, next) { + next(instance => instance.$router.replace(from.fullPath)) + }, + render: h => h() +} diff --git a/src/pages/index/components/d2-badge/index.vue b/src/pages/system/index/components/d2-badge/index.vue similarity index 100% rename from src/pages/index/components/d2-badge/index.vue rename to src/pages/system/index/components/d2-badge/index.vue diff --git a/src/pages/index/components/d2-help-btn/image/qq.jpg.REMOVED.git-id b/src/pages/system/index/components/d2-help-btn/image/qq.jpg.REMOVED.git-id similarity index 100% rename from src/pages/index/components/d2-help-btn/image/qq.jpg.REMOVED.git-id rename to src/pages/system/index/components/d2-help-btn/image/qq.jpg.REMOVED.git-id diff --git a/src/pages/index/components/d2-help-btn/image/we.jpg.REMOVED.git-id b/src/pages/system/index/components/d2-help-btn/image/we.jpg.REMOVED.git-id similarity index 100% rename from src/pages/index/components/d2-help-btn/image/we.jpg.REMOVED.git-id rename to src/pages/system/index/components/d2-help-btn/image/we.jpg.REMOVED.git-id diff --git a/src/pages/index/components/d2-help-btn/index.vue b/src/pages/system/index/components/d2-help-btn/index.vue similarity index 100% rename from src/pages/index/components/d2-help-btn/index.vue rename to src/pages/system/index/components/d2-help-btn/index.vue diff --git a/src/pages/index/image/qr@2x.png.REMOVED.git-id b/src/pages/system/index/image/qr@2x.png.REMOVED.git-id similarity index 100% rename from src/pages/index/image/qr@2x.png.REMOVED.git-id rename to src/pages/system/index/image/qr@2x.png.REMOVED.git-id diff --git a/src/pages/error-page-404/index.js b/src/pages/system/index/index.js similarity index 100% rename from src/pages/error-page-404/index.js rename to src/pages/system/index/index.js diff --git a/src/pages/index/page.vue b/src/pages/system/index/page.vue similarity index 100% rename from src/pages/index/page.vue rename to src/pages/system/index/page.vue diff --git a/src/pages/login/image/logo@2x.png.REMOVED.git-id b/src/pages/system/login/image/logo@2x.png.REMOVED.git-id similarity index 100% rename from src/pages/login/image/logo@2x.png.REMOVED.git-id rename to src/pages/system/login/image/logo@2x.png.REMOVED.git-id diff --git a/src/pages/index/index.js b/src/pages/system/login/index.js similarity index 100% rename from src/pages/index/index.js rename to src/pages/system/login/index.js diff --git a/src/pages/login/page.vue.REMOVED.git-id b/src/pages/system/login/page.vue.REMOVED.git-id similarity index 100% rename from src/pages/login/page.vue.REMOVED.git-id rename to src/pages/system/login/page.vue.REMOVED.git-id diff --git a/src/router/routes.js b/src/router/routes.js index e9c54be7..d772ff2a 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -22,38 +22,28 @@ const frameIn = [ redirect: { name: 'index' }, component: layoutHeaderAside, children: [ - // 首页 必须 name:index + // 首页 { path: 'index', name: 'index', meta: { auth: true }, - component: _import('index') + component: _import('system/index') }, // 刷新页面 必须保留 { path: 'refresh', name: 'refresh', hidden: true, - component: { - beforeRouteEnter (to, from, next) { - next(instance => instance.$router.replace(from.fullPath)) - }, - render: h => h() - } + component: _import('system/function/refresh') }, // 页面重定向 必须保留 { path: 'redirect/:route*', name: 'redirect', hidden: true, - component: { - beforeRouteEnter (to, from, next) { - next(instance => instance.$router.replace(JSON.parse(from.params.route))) - }, - render: h => h() - } + component: _import('system/function/redirect') } ] }, @@ -76,7 +66,7 @@ const frameOut = [ { path: '/login', name: 'login', - component: _import('login') + component: _import('system/login') } ] @@ -84,11 +74,10 @@ const frameOut = [ * 错误页面 */ const errorPage = [ - // 404 { path: '*', name: '404', - component: _import('error-page-404') + component: _import('system/error/404') } ]