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') } ]