From 14c921e6b1df28718d3e76e6d824549966be4159 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 17 Jul 2018 21:54:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 5d75986f02de2f4515121e9f797b835dba132732 [formerly 5d75986f02de2f4515121e9f797b835dba132732 [formerly 5d75986f02de2f4515121e9f797b835dba132732 [formerly 5d75986f02de2f4515121e9f797b835dba132732 [formerly 8c4098bcffd50089b041edcf9d539c64c3c92b16 [formerly 1bf5ee08c5424c0a4cedac421d52cf8c8393ae7f]]]]]
Former-commit-id: 3aa6fad9f9c31f62376dfb27f62fa937d0735e55
Former-commit-id: d293c0b275dc8c4d439fa04a45d9d4efa1dd8f4c
Former-commit-id: a737d8ff3f0c9d829e66a1cd305257961c551eda [formerly 4d2360f8b865bfab066291680106dc95df97ce2a]
Former-commit-id: b64f59d9203d16e71bcd21065aba7ead88566938
Former-commit-id: 4350c691cdff708266be623edf8f1b9d61faeb02
Former-commit-id: 1dba1637790b1f2c87733adfdfcc8491a97bfd1d
Former-commit-id: e17d989004ecb5fb7ce620103b997998da42b8d9
Former-commit-id: 3b781b9b28f6ed584b9c6dbfa5fafe3f8c1475b5
---
 src/assets/style/theme/theme-base.scss        | 14 +++---
 src/assets/style/theme/theme.scss             |  6 +--
 src/assets/style/theme/violet/index.scss      |  2 +-
 .../components/-menu-header/index.vue         | 32 -------------
 src/components/core/index.js                  |  3 --
 .../components/menu-item}/index.vue           |  2 +-
 .../components/components/menu-sub}/index.vue | 10 ++--
 .../components/header-fullscreen}/index.vue   |  0
 .../components/header-github}/index.vue       |  0
 .../header-help}/image/qq.jpg.REMOVED.git-id  |  0
 .../header-help}/image/we.jpg.REMOVED.git-id  |  0
 .../components/header-help}/index.vue         |  0
 .../components}/d2-theme-list/index.vue       |  0
 .../components/header-theme}/index.vue        |  4 ++
 .../components/header-user}/index.vue         |  0
 .../components/menu-header/index.vue          | 32 +++++++++++++
 .../components/menu-side}/index.vue           | 18 +++----
 .../header-aside}/components/mixin/menu.js    |  0
 .../multiple-page-control}/index.vue          |  0
 src/layout/header-aside/index.js              |  3 ++
 .../header-aside/layout.vue}                  | 47 ++++++++++++-------
 src/libs/db.js                                |  1 -
 src/libs/util.js                              |  3 +-
 src/main.js                                   |  2 -
 .../dashboard/dashboard.vue}                  |  0
 .../dashboard}/image/icon.png.REMOVED.git-id  |  0
 src/pages/dashboard/index.js                  |  3 ++
 .../index/image/icon.png.REMOVED.git-id       |  0
 .../demo/charts/index/index.vue               |  0
 .../demo/charts/list/_mixin/list.js           |  0
 .../demo/charts/list/bar/demo1/index.vue      |  2 +-
 .../demo/charts/list/bar/demo2/index.vue      |  2 +-
 .../demo/charts/list/bar/demo3/index.vue      |  2 +-
 .../demo/charts/list/bar/demo4/index.vue      |  2 +-
 .../demo/charts/list/bar/demo5/index.vue      |  2 +-
 .../demo/charts/list/candle/demo1/index.vue   |  2 +-
 .../demo/charts/list/candle/demo2/index.vue   |  2 +-
 .../demo/charts/list/candle/demo3/index.vue   |  2 +-
 .../demo/charts/list/funnel/demo1/index.vue   |  2 +-
 .../demo/charts/list/funnel/demo2/index.vue   |  2 +-
 .../demo/charts/list/gauge/demo1/index.vue    |  2 +-
 .../demo/charts/list/heatmap/demo1/index.vue  |  2 +-
 .../demo/charts/list/heatmap/demo2/index.vue  |  2 +-
 .../charts/list/histogram/demo1/index.vue     |  2 +-
 .../charts/list/histogram/demo2/index.vue     |  2 +-
 .../charts/list/histogram/demo3/index.vue     |  2 +-
 .../charts/list/histogram/demo4/index.vue     |  2 +-
 .../charts/list/histogram/demo5/index.vue     |  2 +-
 .../charts/list/histogram/demo6/index.vue     |  2 +-
 .../demo/charts/list/line/demo1/index.vue     |  2 +-
 .../demo/charts/list/line/demo2/index.vue     |  2 +-
 .../demo/charts/list/line/demo3/index.vue     |  2 +-
 .../demo/charts/list/line/demo4/index.vue     |  2 +-
 .../demo/charts/list/line/demo5/index.vue     |  2 +-
 .../demo/charts/list/map/demo1/index.vue      |  2 +-
 .../demo/charts/list/map/demo2/index.vue      |  2 +-
 .../demo/charts/list/map/demo3/index.vue      |  2 +-
 .../demo/charts/list/pie/demo1/index.vue      |  2 +-
 .../demo/charts/list/pie/demo2/index.vue      |  2 +-
 .../demo/charts/list/pie/demo3/index.vue      |  2 +-
 .../demo/charts/list/pie/demo4/index.vue      |  2 +-
 .../demo/charts/list/pie/demo5/index.vue      |  2 +-
 .../demo/charts/list/pie/demo6/index.vue      |  2 +-
 .../demo/charts/list/radar/demo1/index.vue    |  2 +-
 .../demo/charts/list/ring/demo1/index.vue     |  2 +-
 .../demo/charts/list/ring/demo2/index.vue     |  2 +-
 .../demo/charts/list/ring/demo3/index.vue     |  2 +-
 .../demo/charts/list/ring/demo4/index.vue     |  2 +-
 .../demo/charts/list/ring/demo5/index.vue     |  2 +-
 .../demo/charts/list/sankey/demo1/index.vue   |  2 +-
 .../demo/charts/list/scatter/demo1/index.vue  |  2 +-
 .../demo/charts/list/scatter/demo2/index.vue  |  2 +-
 .../demo/charts/list/tree/demo1/index.vue     |  2 +-
 .../charts/list/waterfall/demo1/index.vue     |  2 +-
 .../demo/components/container/card.vue        |  0
 .../demo/components/container/full-bs.vue     |  0
 .../demo/components/container/full.vue        |  0
 .../components/container/ghost-header.vue     |  0
 .../demo/components/container/ghost.vue       |  0
 .../demo/components/container/md/doc-card.md  |  0
 .../components/container/md/doc-full-bs.md    |  0
 .../demo/components/container/md/doc-full.md  |  0
 .../container/md/doc-ghost-header.md          |  0
 .../demo/components/container/md/doc-ghost.md |  0
 .../components/contextmenu/custom-trigger.vue |  0
 .../demo/components/contextmenu/disabled.vue  |  0
 .../demo/components/contextmenu/divier.vue    |  0
 .../demo/components/contextmenu/group.vue     |  0
 .../demo/components/contextmenu/simple.vue    |  0
 .../components/contextmenu/style/pub.scss     |  0
 .../demo/components/contextmenu/submenu.vue   |  0
 .../demo/components/countup/index.vue         |  0
 .../demo/components/editor-quill/index.vue    |  0
 .../demo/components/editor-quill/value.js     |  0
 .../components/editor-simpleMDE/index.vue     |  0
 .../demo/components/editor-simpleMDE/text.js  |  0
 .../demo/components/highlight/code/css.js     |  0
 .../demo/components/highlight/code/html.js    |  0
 .../components/highlight/code/javascript.js   |  0
 .../demo/components/highlight/code/scss.js    |  0
 .../demo/components/highlight/index.vue       |  0
 .../icon/components/d2-icon-cell.vue          |  0
 .../icon/data/index.js.REMOVED.git-id         |  0
 .../demo/components/icon/icon.vue             |  0
 .../demo/components/icon/list.vue             |  0
 .../demo/components/icon/select.vue           |  0
 .../demo/components/icon/svg.vue              |  0
 .../index/image/icon.png.REMOVED.git-id       |  0
 .../demo/components/index/index.vue           |  0
 .../demo/components/json-tree/index.vue       |  0
 .../demo/components/layout/grid.vue           |  0
 .../demo/components/layout/splitpane.vue      |  0
 .../demo/components/markdown/md/doc.md        |  0
 .../demo/components/markdown/source.vue       |  0
 .../demo/components/markdown/url.vue          |  0
 .../demo/element/basic-button/index.vue       |  0
 .../element/basic-color/components/info.vue   |  0
 .../demo/element/basic-color/index.vue        |  0
 .../demo/element/basic-container/index.vue    |  0
 .../demo/element/basic-icon/index.vue         |  0
 .../demo/element/basic-layout/index.vue       |  0
 .../demo/element/basic-typography/index.vue   |  0
 .../demo/element/data-badge/index.vue         |  0
 .../demo/element/data-pagination/index.vue    |  0
 .../demo/element/data-progress/index.vue      |  0
 .../demo/element/data-table/index.vue         |  0
 .../demo/element/data-tag/index.vue           |  0
 .../demo/element/data-tree/index.vue          |  0
 .../demo/element/form-cascader/index.vue      |  0
 .../demo/element/form-checkbox/index.vue      |  0
 .../demo/element/form-color-picker/index.vue  |  0
 .../demo/element/form-date-picker/index.vue   |  0
 .../element/form-datetime-picker/index.vue    |  0
 .../demo/element/form-form/index.vue          |  0
 .../demo/element/form-input-number/index.vue  |  0
 .../form-input/index.vue.REMOVED.git-id       |  0
 .../demo/element/form-radio/index.vue         |  0
 .../demo/element/form-rate/index.vue          |  0
 .../demo/element/form-select/index.vue        |  0
 .../demo/element/form-slider/index.vue        |  0
 .../demo/element/form-switch/index.vue        |  0
 .../demo/element/form-time-picker/index.vue   |  0
 .../demo/element/form-transfer/index.vue      |  0
 .../demo/element/form-upload/index.vue        |  0
 .../index/image/icon.png.REMOVED.git-id       |  0
 .../demo/element/index/index.vue              |  0
 .../element/navigation-breadcrumb/index.vue   |  0
 .../element/navigation-dropdown/index.vue     |  0
 .../demo/element/navigation-menu/index.vue    |  0
 .../demo/element/navigation-steps/index.vue   |  0
 .../demo/element/navigation-tabs/index.vue    |  0
 .../demo/element/notice-alert/index.vue       |  0
 .../demo/element/notice-loading/index.vue     |  0
 .../demo/element/notice-message-box/index.vue |  0
 .../demo/element/notice-message/index.vue     |  0
 .../element/notice-notification/index.vue     |  0
 .../demo/element/others-card/index.vue        |  0
 .../demo/element/others-carousel/index.vue    |  0
 .../demo/element/others-collapse/index.vue    |  0
 .../demo/element/others-dialog/index.vue      |  0
 .../demo/element/others-popover/index.vue     |  0
 .../demo/element/others-tooltip/index.vue     |  0
 .../demo/playground/db/index.vue              |  0
 .../demo/playground/fullscreen/index.vue      |  0
 .../demo/playground/gray/index.vue            |  0
 .../index/image/icon.png.REMOVED.git-id       |  0
 .../demo/playground/index/index.vue           |  0
 .../demo/playground/page-argu/get.vue         |  0
 .../demo/playground/page-argu/send.vue        |  0
 .../demo/playground/page-cache/off.vue        |  0
 .../demo/playground/page-cache/on.vue         |  0
 .../demo/playground/theme/index.vue           |  0
 .../demo/plugins/better-scroll/base.vue       |  0
 .../demo/plugins/better-scroll/to.vue         |  0
 .../demo/plugins/build/index.vue              |  0
 .../demo/plugins/clipboard-polyfill/index.vue |  0
 .../demo/plugins/day/index.vue                |  0
 .../demo/plugins/export/data/index.js         |  0
 .../demo/plugins/export/table.vue             |  0
 .../demo/plugins/export/txt.vue               |  0
 .../demo/plugins/i18n/components/DemoI18n.vue |  0
 .../i18n/components/DemoI18nControl.vue       |  0
 .../demo/plugins/i18n/demo1.vue               |  0
 .../demo/plugins/i18n/demo2.vue               |  0
 .../demo/plugins/import/csv.vue               |  0
 .../demo/plugins/import/xlsx.vue              |  0
 .../index/image/icon.png.REMOVED.git-id       |  0
 .../demo/plugins/index/index.vue              |  0
 .../demo/plugins/js-cookie/index.vue          |  0
 .../demo/plugins/mock/ajax.vue                |  0
 .../mock/components/d2-demo-mock-card.vue     |  0
 .../demo/plugins/mock/data/settingDPD.js      |  0
 .../demo/plugins/mock/data/settingDTD.js      |  0
 .../demo/plugins/mock/dpd.vue                 |  0
 .../demo/plugins/mock/dtd.vue                 |  0
 .../demo/plugins/mock/md/doc.md               |  0
 .../demo/plugins/mock/mixins/function.js      |  0
 .../demo/plugins/mock/mixins/regexp.js        |  0
 .../error-page-404/error-page-404.vue}        |  0
 .../image/cover@2x.png.REMOVED.git-id         |  0
 src/pages/error-page-404/index.js             |  3 ++
 .../core => pages}/login/config/bubble.js     |  0
 .../core => pages}/login/config/default.js    |  0
 .../core => pages}/login/config/nasa.js       |  0
 .../core => pages}/login/config/snow.js       |  0
 .../login/image/logo.png.REMOVED.git-id       |  0
 src/pages/login/index.js                      |  3 ++
 .../login/index.vue => pages/login/login.vue} |  0
 src/{views/core => pages}/login/style.scss    |  0
 src/plugin/axios/index.js                     | 10 +---
 src/router/routes.js.REMOVED.git-id           |  2 +-
 src/store/modules/d2admin.js.REMOVED.git-id   |  2 +-
 tests/unit/HelloWorld.spec.js                 |  2 +
 vue.config.js                                 |  4 ++
 214 files changed, 157 insertions(+), 139 deletions(-)
 delete mode 100644 src/components/core/d2-layout-main/components/-menu-header/index.vue
 rename src/{components/core/d2-layout-main/components/-menu-item => layout/header-aside/components/components/menu-item}/index.vue (91%)
 rename src/{components/core/d2-layout-main/components/-menu-sub => layout/header-aside/components/components/menu-sub}/index.vue (63%)
 rename src/{components/core/d2-layout-main/components/-full-screen => layout/header-aside/components/header-fullscreen}/index.vue (100%)
 rename src/{components/core/d2-layout-main/components/-github => layout/header-aside/components/header-github}/index.vue (100%)
 rename src/{components/core/d2-layout-main/components/-help => layout/header-aside/components/header-help}/image/qq.jpg.REMOVED.git-id (100%)
 rename src/{components/core/d2-layout-main/components/-help => layout/header-aside/components/header-help}/image/we.jpg.REMOVED.git-id (100%)
 rename src/{components/core/d2-layout-main/components/-help => layout/header-aside/components/header-help}/index.vue (100%)
 rename src/{components/core => layout/header-aside/components/header-theme/components}/d2-theme-list/index.vue (100%)
 rename src/{components/core/d2-layout-main/components/-theme => layout/header-aside/components/header-theme}/index.vue (84%)
 rename src/{components/core/d2-layout-main/components/-user => layout/header-aside/components/header-user}/index.vue (100%)
 create mode 100644 src/layout/header-aside/components/menu-header/index.vue
 rename src/{components/core/d2-layout-main/components/-menu-side => layout/header-aside/components/menu-side}/index.vue (76%)
 rename src/{components/core/d2-layout-main => layout/header-aside}/components/mixin/menu.js (100%)
 rename src/{components/core/d2-multiple-page-control => layout/header-aside/components/multiple-page-control}/index.vue (100%)
 create mode 100644 src/layout/header-aside/index.js
 rename src/{components/core/d2-layout-main/index.vue => layout/header-aside/layout.vue} (69%)
 rename src/{views/core/index/index.vue => pages/dashboard/dashboard.vue} (100%)
 rename src/{views/core/index => pages/dashboard}/image/icon.png.REMOVED.git-id (100%)
 create mode 100644 src/pages/dashboard/index.js
 rename src/{views => pages}/demo/charts/index/image/icon.png.REMOVED.git-id (100%)
 rename src/{views => pages}/demo/charts/index/index.vue (100%)
 rename src/{views => pages}/demo/charts/list/_mixin/list.js (100%)
 rename src/{views => pages}/demo/charts/list/bar/demo1/index.vue (95%)
 rename src/{views => pages}/demo/charts/list/bar/demo2/index.vue (95%)
 rename src/{views => pages}/demo/charts/list/bar/demo3/index.vue (96%)
 rename src/{views => pages}/demo/charts/list/bar/demo4/index.vue (95%)
 rename src/{views => pages}/demo/charts/list/bar/demo5/index.vue (94%)
 rename src/{views => pages}/demo/charts/list/candle/demo1/index.vue (98%)
 rename src/{views => pages}/demo/charts/list/candle/demo2/index.vue (98%)
 rename src/{views => pages}/demo/charts/list/candle/demo3/index.vue (98%)
 rename src/{views => pages}/demo/charts/list/funnel/demo1/index.vue (93%)
 rename src/{views => pages}/demo/charts/list/funnel/demo2/index.vue (94%)
 rename src/{views => pages}/demo/charts/list/gauge/demo1/index.vue (92%)
 rename src/{views => pages}/demo/charts/list/heatmap/demo1/index.vue (95%)
 rename src/{views => pages}/demo/charts/list/heatmap/demo2/index.vue (96%)
 rename src/{views => pages}/demo/charts/list/histogram/demo1/index.vue (95%)
 rename src/{views => pages}/demo/charts/list/histogram/demo2/index.vue (96%)
 rename src/{views => pages}/demo/charts/list/histogram/demo3/index.vue (95%)
 rename src/{views => pages}/demo/charts/list/histogram/demo4/index.vue (95%)
 rename src/{views => pages}/demo/charts/list/histogram/demo5/index.vue (95%)
 rename src/{views => pages}/demo/charts/list/histogram/demo6/index.vue (95%)
 rename src/{views => pages}/demo/charts/list/line/demo1/index.vue (95%)
 rename src/{views => pages}/demo/charts/list/line/demo2/index.vue (97%)
 rename src/{views => pages}/demo/charts/list/line/demo3/index.vue (95%)
 rename src/{views => pages}/demo/charts/list/line/demo4/index.vue (96%)
 rename src/{views => pages}/demo/charts/list/line/demo5/index.vue (95%)
 rename src/{views => pages}/demo/charts/list/map/demo1/index.vue (94%)
 rename src/{views => pages}/demo/charts/list/map/demo2/index.vue (94%)
 rename src/{views => pages}/demo/charts/list/map/demo3/index.vue (95%)
 rename src/{views => pages}/demo/charts/list/pie/demo1/index.vue (94%)
 rename src/{views => pages}/demo/charts/list/pie/demo2/index.vue (94%)
 rename src/{views => pages}/demo/charts/list/pie/demo3/index.vue (94%)
 rename src/{views => pages}/demo/charts/list/pie/demo4/index.vue (94%)
 rename src/{views => pages}/demo/charts/list/pie/demo5/index.vue (95%)
 rename src/{views => pages}/demo/charts/list/pie/demo6/index.vue (94%)
 rename src/{views => pages}/demo/charts/list/radar/demo1/index.vue (95%)
 rename src/{views => pages}/demo/charts/list/ring/demo1/index.vue (94%)
 rename src/{views => pages}/demo/charts/list/ring/demo2/index.vue (94%)
 rename src/{views => pages}/demo/charts/list/ring/demo3/index.vue (94%)
 rename src/{views => pages}/demo/charts/list/ring/demo4/index.vue (94%)
 rename src/{views => pages}/demo/charts/list/ring/demo5/index.vue (94%)
 rename src/{views => pages}/demo/charts/list/sankey/demo1/index.vue (96%)
 rename src/{views => pages}/demo/charts/list/scatter/demo1/index.vue (95%)
 rename src/{views => pages}/demo/charts/list/scatter/demo2/index.vue (97%)
 rename src/{views => pages}/demo/charts/list/tree/demo1/index.vue (98%)
 rename src/{views => pages}/demo/charts/list/waterfall/demo1/index.vue (93%)
 rename src/{views => pages}/demo/components/container/card.vue (100%)
 rename src/{views => pages}/demo/components/container/full-bs.vue (100%)
 rename src/{views => pages}/demo/components/container/full.vue (100%)
 rename src/{views => pages}/demo/components/container/ghost-header.vue (100%)
 rename src/{views => pages}/demo/components/container/ghost.vue (100%)
 rename src/{views => pages}/demo/components/container/md/doc-card.md (100%)
 rename src/{views => pages}/demo/components/container/md/doc-full-bs.md (100%)
 rename src/{views => pages}/demo/components/container/md/doc-full.md (100%)
 rename src/{views => pages}/demo/components/container/md/doc-ghost-header.md (100%)
 rename src/{views => pages}/demo/components/container/md/doc-ghost.md (100%)
 rename src/{views => pages}/demo/components/contextmenu/custom-trigger.vue (100%)
 rename src/{views => pages}/demo/components/contextmenu/disabled.vue (100%)
 rename src/{views => pages}/demo/components/contextmenu/divier.vue (100%)
 rename src/{views => pages}/demo/components/contextmenu/group.vue (100%)
 rename src/{views => pages}/demo/components/contextmenu/simple.vue (100%)
 rename src/{views => pages}/demo/components/contextmenu/style/pub.scss (100%)
 rename src/{views => pages}/demo/components/contextmenu/submenu.vue (100%)
 rename src/{views => pages}/demo/components/countup/index.vue (100%)
 rename src/{views => pages}/demo/components/editor-quill/index.vue (100%)
 rename src/{views => pages}/demo/components/editor-quill/value.js (100%)
 rename src/{views => pages}/demo/components/editor-simpleMDE/index.vue (100%)
 rename src/{views => pages}/demo/components/editor-simpleMDE/text.js (100%)
 rename src/{views => pages}/demo/components/highlight/code/css.js (100%)
 rename src/{views => pages}/demo/components/highlight/code/html.js (100%)
 rename src/{views => pages}/demo/components/highlight/code/javascript.js (100%)
 rename src/{views => pages}/demo/components/highlight/code/scss.js (100%)
 rename src/{views => pages}/demo/components/highlight/index.vue (100%)
 rename src/{views => pages}/demo/components/icon/components/d2-icon-cell.vue (100%)
 rename src/{views => pages}/demo/components/icon/data/index.js.REMOVED.git-id (100%)
 rename src/{views => pages}/demo/components/icon/icon.vue (100%)
 rename src/{views => pages}/demo/components/icon/list.vue (100%)
 rename src/{views => pages}/demo/components/icon/select.vue (100%)
 rename src/{views => pages}/demo/components/icon/svg.vue (100%)
 rename src/{views => pages}/demo/components/index/image/icon.png.REMOVED.git-id (100%)
 rename src/{views => pages}/demo/components/index/index.vue (100%)
 rename src/{views => pages}/demo/components/json-tree/index.vue (100%)
 rename src/{views => pages}/demo/components/layout/grid.vue (100%)
 rename src/{views => pages}/demo/components/layout/splitpane.vue (100%)
 rename src/{views => pages}/demo/components/markdown/md/doc.md (100%)
 rename src/{views => pages}/demo/components/markdown/source.vue (100%)
 rename src/{views => pages}/demo/components/markdown/url.vue (100%)
 rename src/{views => pages}/demo/element/basic-button/index.vue (100%)
 rename src/{views => pages}/demo/element/basic-color/components/info.vue (100%)
 rename src/{views => pages}/demo/element/basic-color/index.vue (100%)
 rename src/{views => pages}/demo/element/basic-container/index.vue (100%)
 rename src/{views => pages}/demo/element/basic-icon/index.vue (100%)
 rename src/{views => pages}/demo/element/basic-layout/index.vue (100%)
 rename src/{views => pages}/demo/element/basic-typography/index.vue (100%)
 rename src/{views => pages}/demo/element/data-badge/index.vue (100%)
 rename src/{views => pages}/demo/element/data-pagination/index.vue (100%)
 rename src/{views => pages}/demo/element/data-progress/index.vue (100%)
 rename src/{views => pages}/demo/element/data-table/index.vue (100%)
 rename src/{views => pages}/demo/element/data-tag/index.vue (100%)
 rename src/{views => pages}/demo/element/data-tree/index.vue (100%)
 rename src/{views => pages}/demo/element/form-cascader/index.vue (100%)
 rename src/{views => pages}/demo/element/form-checkbox/index.vue (100%)
 rename src/{views => pages}/demo/element/form-color-picker/index.vue (100%)
 rename src/{views => pages}/demo/element/form-date-picker/index.vue (100%)
 rename src/{views => pages}/demo/element/form-datetime-picker/index.vue (100%)
 rename src/{views => pages}/demo/element/form-form/index.vue (100%)
 rename src/{views => pages}/demo/element/form-input-number/index.vue (100%)
 rename src/{views => pages}/demo/element/form-input/index.vue.REMOVED.git-id (100%)
 rename src/{views => pages}/demo/element/form-radio/index.vue (100%)
 rename src/{views => pages}/demo/element/form-rate/index.vue (100%)
 rename src/{views => pages}/demo/element/form-select/index.vue (100%)
 rename src/{views => pages}/demo/element/form-slider/index.vue (100%)
 rename src/{views => pages}/demo/element/form-switch/index.vue (100%)
 rename src/{views => pages}/demo/element/form-time-picker/index.vue (100%)
 rename src/{views => pages}/demo/element/form-transfer/index.vue (100%)
 rename src/{views => pages}/demo/element/form-upload/index.vue (100%)
 rename src/{views => pages}/demo/element/index/image/icon.png.REMOVED.git-id (100%)
 rename src/{views => pages}/demo/element/index/index.vue (100%)
 rename src/{views => pages}/demo/element/navigation-breadcrumb/index.vue (100%)
 rename src/{views => pages}/demo/element/navigation-dropdown/index.vue (100%)
 rename src/{views => pages}/demo/element/navigation-menu/index.vue (100%)
 rename src/{views => pages}/demo/element/navigation-steps/index.vue (100%)
 rename src/{views => pages}/demo/element/navigation-tabs/index.vue (100%)
 rename src/{views => pages}/demo/element/notice-alert/index.vue (100%)
 rename src/{views => pages}/demo/element/notice-loading/index.vue (100%)
 rename src/{views => pages}/demo/element/notice-message-box/index.vue (100%)
 rename src/{views => pages}/demo/element/notice-message/index.vue (100%)
 rename src/{views => pages}/demo/element/notice-notification/index.vue (100%)
 rename src/{views => pages}/demo/element/others-card/index.vue (100%)
 rename src/{views => pages}/demo/element/others-carousel/index.vue (100%)
 rename src/{views => pages}/demo/element/others-collapse/index.vue (100%)
 rename src/{views => pages}/demo/element/others-dialog/index.vue (100%)
 rename src/{views => pages}/demo/element/others-popover/index.vue (100%)
 rename src/{views => pages}/demo/element/others-tooltip/index.vue (100%)
 rename src/{views => pages}/demo/playground/db/index.vue (100%)
 rename src/{views => pages}/demo/playground/fullscreen/index.vue (100%)
 rename src/{views => pages}/demo/playground/gray/index.vue (100%)
 rename src/{views => pages}/demo/playground/index/image/icon.png.REMOVED.git-id (100%)
 rename src/{views => pages}/demo/playground/index/index.vue (100%)
 rename src/{views => pages}/demo/playground/page-argu/get.vue (100%)
 rename src/{views => pages}/demo/playground/page-argu/send.vue (100%)
 rename src/{views => pages}/demo/playground/page-cache/off.vue (100%)
 rename src/{views => pages}/demo/playground/page-cache/on.vue (100%)
 rename src/{views => pages}/demo/playground/theme/index.vue (100%)
 rename src/{views => pages}/demo/plugins/better-scroll/base.vue (100%)
 rename src/{views => pages}/demo/plugins/better-scroll/to.vue (100%)
 rename src/{views => pages}/demo/plugins/build/index.vue (100%)
 rename src/{views => pages}/demo/plugins/clipboard-polyfill/index.vue (100%)
 rename src/{views => pages}/demo/plugins/day/index.vue (100%)
 rename src/{views => pages}/demo/plugins/export/data/index.js (100%)
 rename src/{views => pages}/demo/plugins/export/table.vue (100%)
 rename src/{views => pages}/demo/plugins/export/txt.vue (100%)
 rename src/{views => pages}/demo/plugins/i18n/components/DemoI18n.vue (100%)
 rename src/{views => pages}/demo/plugins/i18n/components/DemoI18nControl.vue (100%)
 rename src/{views => pages}/demo/plugins/i18n/demo1.vue (100%)
 rename src/{views => pages}/demo/plugins/i18n/demo2.vue (100%)
 rename src/{views => pages}/demo/plugins/import/csv.vue (100%)
 rename src/{views => pages}/demo/plugins/import/xlsx.vue (100%)
 rename src/{views => pages}/demo/plugins/index/image/icon.png.REMOVED.git-id (100%)
 rename src/{views => pages}/demo/plugins/index/index.vue (100%)
 rename src/{views => pages}/demo/plugins/js-cookie/index.vue (100%)
 rename src/{views => pages}/demo/plugins/mock/ajax.vue (100%)
 rename src/{views => pages}/demo/plugins/mock/components/d2-demo-mock-card.vue (100%)
 rename src/{views => pages}/demo/plugins/mock/data/settingDPD.js (100%)
 rename src/{views => pages}/demo/plugins/mock/data/settingDTD.js (100%)
 rename src/{views => pages}/demo/plugins/mock/dpd.vue (100%)
 rename src/{views => pages}/demo/plugins/mock/dtd.vue (100%)
 rename src/{views => pages}/demo/plugins/mock/md/doc.md (100%)
 rename src/{views => pages}/demo/plugins/mock/mixins/function.js (100%)
 rename src/{views => pages}/demo/plugins/mock/mixins/regexp.js (100%)
 rename src/{views/core/404/index.vue => pages/error-page-404/error-page-404.vue} (100%)
 rename src/{views/core/404 => pages/error-page-404}/image/cover@2x.png.REMOVED.git-id (100%)
 create mode 100644 src/pages/error-page-404/index.js
 rename src/{views/core => pages}/login/config/bubble.js (100%)
 rename src/{views/core => pages}/login/config/default.js (100%)
 rename src/{views/core => pages}/login/config/nasa.js (100%)
 rename src/{views/core => pages}/login/config/snow.js (100%)
 rename src/{views/core => pages}/login/image/logo.png.REMOVED.git-id (100%)
 create mode 100644 src/pages/login/index.js
 rename src/{views/core/login/index.vue => pages/login/login.vue} (100%)
 rename src/{views/core => pages}/login/style.scss (100%)

diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index 668b6892..ce56def0 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -1,5 +1,5 @@
 // 整体框架结构
-.d2-layout-main-group {
+.d2-layout-header-aside-group {
   height: 100%;
   width: 100%;
   background-size: cover;
@@ -7,11 +7,11 @@
   overflow: hidden;
   position: relative;
   // 背景上面的半透明遮罩
-  .d2-layout-main-mask {
+  .d2-layout-header-aside-mask {
     @extend %full;
   }
   // 内容层
-  .d2-layout-main-content {
+  .d2-layout-header-aside-content {
     @extend %full;
     $d2-theme-header-height: 60px;
     .d2-theme-header {
@@ -33,7 +33,7 @@
         transition: width .3s;
         flex-grow: 0;
         position: relative;
-        .d2-layout-main-menu-side {
+        .d2-layout-header-aside-menu-side {
           @extend %full;
           overflow: hidden;
         }
@@ -66,7 +66,7 @@
 
 
 // 主题公用
-.d2-layout-main-group {
+.d2-layout-header-aside-group {
   &.grayMode {
     -webkit-filter: grayscale(100%);
     -moz-filter: grayscale(100%);
@@ -76,7 +76,7 @@
     filter: gray;
   }
   // 主体
-  .d2-layout-main-content {
+  .d2-layout-header-aside-content {
     // [布局] 顶栏
     .d2-theme-header {
       // logo区域
@@ -174,7 +174,7 @@
           }
         }
         // 菜单为空的时候显示的信息
-        .d2-layout-main-menu-empty {
+        .d2-layout-header-aside-menu-empty {
           height: 160px;
           margin: 10px;
           margin-top: 0px;
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index ffda8197..edf3d6d2 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -2,9 +2,9 @@
 .theme-#{$theme-name} {
 
   // 背景图片和遮罩
-  .d2-layout-main-group {
+  .d2-layout-header-aside-group {
     background-color: $theme-bg-color;
-    .d2-layout-main-mask {
+    .d2-layout-header-aside-mask {
       background: $theme-bg-mask;
     }
   }
@@ -127,7 +127,7 @@
     // 侧边栏
     .d2-theme-container-aside {
       // 菜单为空的时候显示的信息
-      .d2-layout-main-menu-empty {
+      .d2-layout-header-aside-menu-empty {
         background: $theme-aside-menu-empty-background-color;
         i {
           color: $theme-aside-menu-empty-icon-color;
diff --git a/src/assets/style/theme/violet/index.scss b/src/assets/style/theme/violet/index.scss
index 66943b90..753f0264 100644
--- a/src/assets/style/theme/violet/index.scss
+++ b/src/assets/style/theme/violet/index.scss
@@ -2,7 +2,7 @@
 @import '../theme.scss';
 
 .theme-#{$theme-name} {
-  .d2-layout-main-group {
+  .d2-layout-header-aside-group {
     background: #bc00e3;
     background: linear-gradient(120deg, #bc00e3 0%, #4EFFFB 100%);
   }
diff --git a/src/components/core/d2-layout-main/components/-menu-header/index.vue b/src/components/core/d2-layout-main/components/-menu-header/index.vue
deleted file mode 100644
index 6edaecd1..00000000
--- a/src/components/core/d2-layout-main/components/-menu-header/index.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<template>
-  <el-menu mode="horizontal" @select="handleMenuSelect">
-    <template v-for="(menu, menuIndex) in menus">
-      <d2-layout-main-menu-item v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
-      <d2-layout-main-menu-sub v-else :menu="menu" :key="menuIndex"/>
-    </template>
-  </el-menu>
-</template>
-
-<script>
-import menus from '@/menu/index.js'
-import menuMixin from '../mixin/menu'
-// 组件
-import d2LayoutMainMenuItem from '../-menu-item/index.vue'
-import d2LayoutMainMenuSub from '../-menu-sub/index.vue'
-
-export default {
-  name: 'd2-layout-main-menu-header',
-  mixins: [
-    menuMixin
-  ],
-  components: {
-    'd2-layout-main-menu-item': d2LayoutMainMenuItem,
-    'd2-layout-main-menu-sub': d2LayoutMainMenuSub
-  },
-  data () {
-    return {
-      menus
-    }
-  }
-}
-</script>
diff --git a/src/components/core/index.js b/src/components/core/index.js
index 38a2cbc4..83445b9e 100644
--- a/src/components/core/index.js
+++ b/src/components/core/index.js
@@ -4,14 +4,12 @@ import { GridLayout, GridItem } from 'vue-grid-layout'
 import SplitPane from 'vue-splitpane'
 
 import d2Container from '@/components/core/d2-container'
-import d2MultiplePageControl from '@/components/core/d2-multiple-page-control'
 
 Vue.component('d2-grid-layout', GridLayout)
 Vue.component('d2-grid-item', GridItem)
 Vue.component('SplitPane', SplitPane)
 
 Vue.component('d2-container', d2Container)
-Vue.component('d2-multiple-page-control', d2MultiplePageControl)
 Vue.component('d2-count-up', () => import('@/components/core/d2-count-up'))
 Vue.component('d2-highlight', () => import('@/components/core/d2-highlight'))
 Vue.component('d2-icon', () => import('@/components/core/d2-icon'))
@@ -20,4 +18,3 @@ Vue.component('d2-icon-svg', () => import('@/components/core/d2-icon-svg/index.v
 Vue.component('d2-markdown', () => import('@/components/core/d2-markdown'))
 Vue.component('d2-mde', () => import('@/components/core/d2-mde'))
 Vue.component('d2-quill', () => import('@/components/core/d2-quill'))
-Vue.component('d2-theme-list', () => import('@/components/core/d2-theme-list'))
diff --git a/src/components/core/d2-layout-main/components/-menu-item/index.vue b/src/layout/header-aside/components/components/menu-item/index.vue
similarity index 91%
rename from src/components/core/d2-layout-main/components/-menu-item/index.vue
rename to src/layout/header-aside/components/components/menu-item/index.vue
index caafa43f..b6cbb09f 100644
--- a/src/components/core/d2-layout-main/components/-menu-item/index.vue
+++ b/src/layout/header-aside/components/components/menu-item/index.vue
@@ -8,7 +8,7 @@
 <script>
 import _uniqueid from 'lodash.uniqueid'
 export default {
-  name: 'd2-layout-main-menu-item',
+  name: 'd2-layout-header-aside-menu-item',
   props: {
     menu: {
       type: Object,
diff --git a/src/components/core/d2-layout-main/components/-menu-sub/index.vue b/src/layout/header-aside/components/components/menu-sub/index.vue
similarity index 63%
rename from src/components/core/d2-layout-main/components/-menu-sub/index.vue
rename to src/layout/header-aside/components/components/menu-sub/index.vue
index 88dd903b..e488cc29 100644
--- a/src/components/core/d2-layout-main/components/-menu-sub/index.vue
+++ b/src/layout/header-aside/components/components/menu-sub/index.vue
@@ -5,8 +5,8 @@
       <span slot="title">{{menu.title}}</span>
     </template>
     <template v-for="(child, childIndex) in menu.children">
-      <d2-layout-main-menu-item v-if="child.children === undefined" :menu="child" :key="childIndex"/>
-      <d2-layout-main-menu-sub v-else :menu="child" :key="childIndex"/>
+      <d2-layout-header-aside-menu-item v-if="child.children === undefined" :menu="child" :key="childIndex"/>
+      <d2-layout-header-aside-menu-sub v-else :menu="child" :key="childIndex"/>
     </template>
   </el-submenu>
 </template>
@@ -14,12 +14,12 @@
 <script>
 import _uniqueid from 'lodash.uniqueid'
 // 组件
-import d2LayoutMainMenuItem from '../-menu-item/index.vue'
+import d2LayoutMainMenuItem from '../menu-item'
 
 export default {
-  name: 'd2-layout-main-menu-sub',
+  name: 'd2-layout-header-aside-menu-sub',
   components: {
-    'd2-layout-main-menu-item': d2LayoutMainMenuItem
+    'd2-layout-header-aside-menu-item': d2LayoutMainMenuItem
   },
   props: {
     menu: {
diff --git a/src/components/core/d2-layout-main/components/-full-screen/index.vue b/src/layout/header-aside/components/header-fullscreen/index.vue
similarity index 100%
rename from src/components/core/d2-layout-main/components/-full-screen/index.vue
rename to src/layout/header-aside/components/header-fullscreen/index.vue
diff --git a/src/components/core/d2-layout-main/components/-github/index.vue b/src/layout/header-aside/components/header-github/index.vue
similarity index 100%
rename from src/components/core/d2-layout-main/components/-github/index.vue
rename to src/layout/header-aside/components/header-github/index.vue
diff --git a/src/components/core/d2-layout-main/components/-help/image/qq.jpg.REMOVED.git-id b/src/layout/header-aside/components/header-help/image/qq.jpg.REMOVED.git-id
similarity index 100%
rename from src/components/core/d2-layout-main/components/-help/image/qq.jpg.REMOVED.git-id
rename to src/layout/header-aside/components/header-help/image/qq.jpg.REMOVED.git-id
diff --git a/src/components/core/d2-layout-main/components/-help/image/we.jpg.REMOVED.git-id b/src/layout/header-aside/components/header-help/image/we.jpg.REMOVED.git-id
similarity index 100%
rename from src/components/core/d2-layout-main/components/-help/image/we.jpg.REMOVED.git-id
rename to src/layout/header-aside/components/header-help/image/we.jpg.REMOVED.git-id
diff --git a/src/components/core/d2-layout-main/components/-help/index.vue b/src/layout/header-aside/components/header-help/index.vue
similarity index 100%
rename from src/components/core/d2-layout-main/components/-help/index.vue
rename to src/layout/header-aside/components/header-help/index.vue
diff --git a/src/components/core/d2-theme-list/index.vue b/src/layout/header-aside/components/header-theme/components/d2-theme-list/index.vue
similarity index 100%
rename from src/components/core/d2-theme-list/index.vue
rename to src/layout/header-aside/components/header-theme/components/d2-theme-list/index.vue
diff --git a/src/components/core/d2-layout-main/components/-theme/index.vue b/src/layout/header-aside/components/header-theme/index.vue
similarity index 84%
rename from src/components/core/d2-layout-main/components/-theme/index.vue
rename to src/layout/header-aside/components/header-theme/index.vue
index 9b24bfda..d8c1d23c 100644
--- a/src/components/core/d2-layout-main/components/-theme/index.vue
+++ b/src/layout/header-aside/components/header-theme/index.vue
@@ -12,7 +12,11 @@
 </template>
 
 <script>
+import themeList from './components/d2-theme-list'
 export default {
+  components: {
+    'd2-theme-list': themeList
+  },
   data () {
     return {
       dialogVisible: false
diff --git a/src/components/core/d2-layout-main/components/-user/index.vue b/src/layout/header-aside/components/header-user/index.vue
similarity index 100%
rename from src/components/core/d2-layout-main/components/-user/index.vue
rename to src/layout/header-aside/components/header-user/index.vue
diff --git a/src/layout/header-aside/components/menu-header/index.vue b/src/layout/header-aside/components/menu-header/index.vue
new file mode 100644
index 00000000..81a44d9c
--- /dev/null
+++ b/src/layout/header-aside/components/menu-header/index.vue
@@ -0,0 +1,32 @@
+<template>
+  <el-menu mode="horizontal" @select="handleMenuSelect">
+    <template v-for="(menu, menuIndex) in menus">
+      <d2-layout-header-aside-menu-item v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
+      <d2-layout-header-aside-menu-sub v-else :menu="menu" :key="menuIndex"/>
+    </template>
+  </el-menu>
+</template>
+
+<script>
+import menus from '@/menu/index.js'
+import menuMixin from '../mixin/menu'
+// 组件
+import d2LayoutMainMenuItem from '../components/menu-item/index.vue'
+import d2LayoutMainMenuSub from '../components/menu-sub/index.vue'
+
+export default {
+  name: 'd2-layout-header-aside-menu-header',
+  mixins: [
+    menuMixin
+  ],
+  components: {
+    'd2-layout-header-aside-menu-item': d2LayoutMainMenuItem,
+    'd2-layout-header-aside-menu-sub': d2LayoutMainMenuSub
+  },
+  data () {
+    return {
+      menus
+    }
+  }
+}
+</script>
diff --git a/src/components/core/d2-layout-main/components/-menu-side/index.vue b/src/layout/header-aside/components/menu-side/index.vue
similarity index 76%
rename from src/components/core/d2-layout-main/components/-menu-side/index.vue
rename to src/layout/header-aside/components/menu-side/index.vue
index b5f233bb..be9f3fd5 100644
--- a/src/components/core/d2-layout-main/components/-menu-side/index.vue
+++ b/src/layout/header-aside/components/menu-side/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="d2-layout-main-menu-side">
+  <div class="d2-layout-header-aside-menu-side">
     <el-menu
       :collapse="collapse"
       :unique-opened="true"
@@ -7,11 +7,11 @@
       ref="menu"
       @select="handleMenuSelect">
       <template v-for="(menu, menuIndex) in menus">
-        <d2-layout-main-menu-item v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
-        <d2-layout-main-menu-sub v-else :menu="menu" :key="menuIndex"/>
+        <d2-layout-header-aside-menu-item v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
+        <d2-layout-header-aside-menu-sub v-else :menu="menu" :key="menuIndex"/>
       </template>
     </el-menu>
-    <div v-if="menus.length === 0 && !collapse" class="d2-layout-main-menu-empty">
+    <div v-if="menus.length === 0 && !collapse" class="d2-layout-header-aside-menu-empty">
       <d2-icon name="hdd-o"/>
       <span>当前目录没有菜单</span>
     </div>
@@ -22,19 +22,19 @@
 import { side } from '@/menu/index.js'
 import menuMixin from '../mixin/menu'
 // 组件
-import d2LayoutMainMenuItem from '../-menu-item/index.vue'
-import d2LayoutMainMenuSub from '../-menu-sub/index.vue'
+import d2LayoutMainMenuItem from '../components/menu-item/index.vue'
+import d2LayoutMainMenuSub from '../components/menu-sub/index.vue'
 // 插件
 import BScroll from 'better-scroll'
 
 export default {
-  name: 'd2-layout-main-menu-side',
+  name: 'd2-layout-header-aside-menu-side',
   mixins: [
     menuMixin
   ],
   components: {
-    'd2-layout-main-menu-item': d2LayoutMainMenuItem,
-    'd2-layout-main-menu-sub': d2LayoutMainMenuSub
+    'd2-layout-header-aside-menu-item': d2LayoutMainMenuItem,
+    'd2-layout-header-aside-menu-sub': d2LayoutMainMenuSub
   },
   props: {
     collapse: {
diff --git a/src/components/core/d2-layout-main/components/mixin/menu.js b/src/layout/header-aside/components/mixin/menu.js
similarity index 100%
rename from src/components/core/d2-layout-main/components/mixin/menu.js
rename to src/layout/header-aside/components/mixin/menu.js
diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/layout/header-aside/components/multiple-page-control/index.vue
similarity index 100%
rename from src/components/core/d2-multiple-page-control/index.vue
rename to src/layout/header-aside/components/multiple-page-control/index.vue
diff --git a/src/layout/header-aside/index.js b/src/layout/header-aside/index.js
new file mode 100644
index 00000000..2977bf95
--- /dev/null
+++ b/src/layout/header-aside/index.js
@@ -0,0 +1,3 @@
+import layout from './layout'
+
+export default layout
diff --git a/src/components/core/d2-layout-main/index.vue b/src/layout/header-aside/layout.vue
similarity index 69%
rename from src/components/core/d2-layout-main/index.vue
rename to src/layout/header-aside/layout.vue
index 080e58cc..5cab316c 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/layout/header-aside/layout.vue
@@ -1,12 +1,12 @@
 <template>
   <div
-    class="d2-layout-main-group"
+    class="d2-layout-header-aside-group"
     :style="styleLayoutMainGroup"
     :class="{grayMode: isGrayMode}">
     <!-- 半透明遮罩 -->
-    <div class="d2-layout-main-mask"></div>
+    <div class="d2-layout-header-aside-mask"></div>
     <!-- 主体内容 -->
-    <div class="d2-layout-main-content">
+    <div class="d2-layout-header-aside-content">
       <!-- 顶栏 -->
       <div class="d2-theme-header">
         <div class="logo-group" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
@@ -16,21 +16,21 @@
         <div class="toggle-aside-btn" @click="collapse = !collapse">
           <d2-icon name="bars"/>
         </div>
-        <d2-layout-main-menu-header/>
+        <d2-menu-header/>
         <!-- 顶栏右侧 -->
         <div class="d2-header-right">
-          <d2-layout-main-header-github/>
-          <d2-layout-main-header-help/>
-          <d2-layout-main-header-full-screen/>
-          <d2-layout-main-header-theme/>
-          <d2-layout-main-header-user/>
+          <d2-header-github/>
+          <d2-header-help/>
+          <d2-header-fullscreen/>
+          <d2-header-theme/>
+          <d2-header-user/>
         </div>
       </div>
       <!-- 下面 主体 -->
       <div class="d2-theme-container">
         <!-- 主体 侧边栏 -->
         <div ref="aside" class="d2-theme-container-aside" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
-          <d2-layout-main-menu-side :collapse="collapse"/>
+          <d2-menu-side :collapse="collapse"/>
         </div>
         <!-- 主体 -->
         <div class="d2-theme-container-main">
@@ -52,16 +52,27 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
+
+import menuSide from './components/menu-side'
+import menuHeader from './components/menu-header'
+import multiplePageControl from './components/multiple-page-control'
+import headerFullscreen from './components/header-fullscreen'
+import headerTheme from './components/header-theme'
+import headerUser from './components/header-user'
+import headerHelp from './components/header-help'
+import headerGithub from './components/header-github'
+
 export default {
-  name: 'd2-layout-main',
+  name: 'd2-layout-header-aside',
   components: {
-    'd2-layout-main-menu-side': () => import('./components/-menu-side'),
-    'd2-layout-main-menu-header': () => import('./components/-menu-header'),
-    'd2-layout-main-header-full-screen': () => import('./components/-full-screen'),
-    'd2-layout-main-header-theme': () => import('./components/-theme'),
-    'd2-layout-main-header-user': () => import('./components/-user'),
-    'd2-layout-main-header-help': () => import('./components/-help'),
-    'd2-layout-main-header-github': () => import('./components/-github')
+    'd2-menu-side': menuSide,
+    'd2-menu-header': menuHeader,
+    'd2-multiple-page-control': multiplePageControl,
+    'd2-header-fullscreen': headerFullscreen,
+    'd2-header-theme': headerTheme,
+    'd2-header-user': headerUser,
+    'd2-header-help': headerHelp,
+    'd2-header-github': headerGithub
   },
   data () {
     return {
diff --git a/src/libs/db.js b/src/libs/db.js
index 5f007739..3dd23ca2 100644
--- a/src/libs/db.js
+++ b/src/libs/db.js
@@ -7,7 +7,6 @@ const db = low(adapter)
 db.defaults({
   themeActiveName: [],
   pageOpenedList: [],
-  updateNotify: [],
   username: []
 })
   .write()
diff --git a/src/libs/util.js b/src/libs/util.js
index 5559e97f..6ee741ea 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -64,8 +64,7 @@ util.checkUpdate = function (vm) {
         util.logCapsule('D2Admin', `New version ${res.name}`)
         console.log(`${dayjs(res.created_at).format('YYYY年M月D日')}更新 版本号: ${res.tag_name} | 详情${res.html_url}`)
       }
-      vm.$store.commit('d2adminUpdateSet', update)
-      vm.$store.commit('d2adminReleasesSet', res)
+      vm.$store.commit('d2adminUpdateSet', res)
     })
     .catch(err => {
       console.log('checkUpdate error', err)
diff --git a/src/main.js b/src/main.js
index 9d6011c9..f49c4996 100644
--- a/src/main.js
+++ b/src/main.js
@@ -51,8 +51,6 @@ new Vue({
     util.showInfo()
     // DB -> store 加载用户名
     this.$store.commit('d2adminUsernameLoad')
-    // DB -> store 加载版本更新弹窗的设置
-    this.$store.commit('d2adminUpdateNotifyLoad')
     // DB -> store 加载主题
     this.$store.commit('d2adminThemeLoad')
     // DB -> store 数据库加载上次退出时的多页列表
diff --git a/src/views/core/index/index.vue b/src/pages/dashboard/dashboard.vue
similarity index 100%
rename from src/views/core/index/index.vue
rename to src/pages/dashboard/dashboard.vue
diff --git a/src/views/core/index/image/icon.png.REMOVED.git-id b/src/pages/dashboard/image/icon.png.REMOVED.git-id
similarity index 100%
rename from src/views/core/index/image/icon.png.REMOVED.git-id
rename to src/pages/dashboard/image/icon.png.REMOVED.git-id
diff --git a/src/pages/dashboard/index.js b/src/pages/dashboard/index.js
new file mode 100644
index 00000000..c8a254df
--- /dev/null
+++ b/src/pages/dashboard/index.js
@@ -0,0 +1,3 @@
+import page from './dashboard'
+
+export default page
diff --git a/src/views/demo/charts/index/image/icon.png.REMOVED.git-id b/src/pages/demo/charts/index/image/icon.png.REMOVED.git-id
similarity index 100%
rename from src/views/demo/charts/index/image/icon.png.REMOVED.git-id
rename to src/pages/demo/charts/index/image/icon.png.REMOVED.git-id
diff --git a/src/views/demo/charts/index/index.vue b/src/pages/demo/charts/index/index.vue
similarity index 100%
rename from src/views/demo/charts/index/index.vue
rename to src/pages/demo/charts/index/index.vue
diff --git a/src/views/demo/charts/list/_mixin/list.js b/src/pages/demo/charts/list/_mixin/list.js
similarity index 100%
rename from src/views/demo/charts/list/_mixin/list.js
rename to src/pages/demo/charts/list/_mixin/list.js
diff --git a/src/views/demo/charts/list/bar/demo1/index.vue b/src/pages/demo/charts/list/bar/demo1/index.vue
similarity index 95%
rename from src/views/demo/charts/list/bar/demo1/index.vue
rename to src/pages/demo/charts/list/bar/demo1/index.vue
index 22aef17a..fa5cfcf0 100644
--- a/src/views/demo/charts/list/bar/demo1/index.vue
+++ b/src/pages/demo/charts/list/bar/demo1/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/bar/demo2/index.vue b/src/pages/demo/charts/list/bar/demo2/index.vue
similarity index 95%
rename from src/views/demo/charts/list/bar/demo2/index.vue
rename to src/pages/demo/charts/list/bar/demo2/index.vue
index 57798880..79cc7cff 100644
--- a/src/views/demo/charts/list/bar/demo2/index.vue
+++ b/src/pages/demo/charts/list/bar/demo2/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/bar/demo3/index.vue b/src/pages/demo/charts/list/bar/demo3/index.vue
similarity index 96%
rename from src/views/demo/charts/list/bar/demo3/index.vue
rename to src/pages/demo/charts/list/bar/demo3/index.vue
index 24e34c13..861c1e89 100644
--- a/src/views/demo/charts/list/bar/demo3/index.vue
+++ b/src/pages/demo/charts/list/bar/demo3/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/bar/demo4/index.vue b/src/pages/demo/charts/list/bar/demo4/index.vue
similarity index 95%
rename from src/views/demo/charts/list/bar/demo4/index.vue
rename to src/pages/demo/charts/list/bar/demo4/index.vue
index 0e5d9642..d6ae0798 100644
--- a/src/views/demo/charts/list/bar/demo4/index.vue
+++ b/src/pages/demo/charts/list/bar/demo4/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/bar/demo5/index.vue b/src/pages/demo/charts/list/bar/demo5/index.vue
similarity index 94%
rename from src/views/demo/charts/list/bar/demo5/index.vue
rename to src/pages/demo/charts/list/bar/demo5/index.vue
index 8d11c1c4..275de283 100644
--- a/src/views/demo/charts/list/bar/demo5/index.vue
+++ b/src/pages/demo/charts/list/bar/demo5/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/candle/demo1/index.vue b/src/pages/demo/charts/list/candle/demo1/index.vue
similarity index 98%
rename from src/views/demo/charts/list/candle/demo1/index.vue
rename to src/pages/demo/charts/list/candle/demo1/index.vue
index 8ecbc23e..9e0cb613 100644
--- a/src/views/demo/charts/list/candle/demo1/index.vue
+++ b/src/pages/demo/charts/list/candle/demo1/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/candle/demo2/index.vue b/src/pages/demo/charts/list/candle/demo2/index.vue
similarity index 98%
rename from src/views/demo/charts/list/candle/demo2/index.vue
rename to src/pages/demo/charts/list/candle/demo2/index.vue
index 7221c193..436938e0 100644
--- a/src/views/demo/charts/list/candle/demo2/index.vue
+++ b/src/pages/demo/charts/list/candle/demo2/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/candle/demo3/index.vue b/src/pages/demo/charts/list/candle/demo3/index.vue
similarity index 98%
rename from src/views/demo/charts/list/candle/demo3/index.vue
rename to src/pages/demo/charts/list/candle/demo3/index.vue
index 83daf200..b93aa503 100644
--- a/src/views/demo/charts/list/candle/demo3/index.vue
+++ b/src/pages/demo/charts/list/candle/demo3/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/funnel/demo1/index.vue b/src/pages/demo/charts/list/funnel/demo1/index.vue
similarity index 93%
rename from src/views/demo/charts/list/funnel/demo1/index.vue
rename to src/pages/demo/charts/list/funnel/demo1/index.vue
index a4d103dd..aba329a3 100644
--- a/src/views/demo/charts/list/funnel/demo1/index.vue
+++ b/src/pages/demo/charts/list/funnel/demo1/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/funnel/demo2/index.vue b/src/pages/demo/charts/list/funnel/demo2/index.vue
similarity index 94%
rename from src/views/demo/charts/list/funnel/demo2/index.vue
rename to src/pages/demo/charts/list/funnel/demo2/index.vue
index 4fb34c79..84d650c8 100644
--- a/src/views/demo/charts/list/funnel/demo2/index.vue
+++ b/src/pages/demo/charts/list/funnel/demo2/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/gauge/demo1/index.vue b/src/pages/demo/charts/list/gauge/demo1/index.vue
similarity index 92%
rename from src/views/demo/charts/list/gauge/demo1/index.vue
rename to src/pages/demo/charts/list/gauge/demo1/index.vue
index 193e282f..befe7ea5 100644
--- a/src/views/demo/charts/list/gauge/demo1/index.vue
+++ b/src/pages/demo/charts/list/gauge/demo1/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/heatmap/demo1/index.vue b/src/pages/demo/charts/list/heatmap/demo1/index.vue
similarity index 95%
rename from src/views/demo/charts/list/heatmap/demo1/index.vue
rename to src/pages/demo/charts/list/heatmap/demo1/index.vue
index 550adc5c..c6d8965a 100644
--- a/src/views/demo/charts/list/heatmap/demo1/index.vue
+++ b/src/pages/demo/charts/list/heatmap/demo1/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/heatmap/demo2/index.vue b/src/pages/demo/charts/list/heatmap/demo2/index.vue
similarity index 96%
rename from src/views/demo/charts/list/heatmap/demo2/index.vue
rename to src/pages/demo/charts/list/heatmap/demo2/index.vue
index be277b85..3d963c5d 100644
--- a/src/views/demo/charts/list/heatmap/demo2/index.vue
+++ b/src/pages/demo/charts/list/heatmap/demo2/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/histogram/demo1/index.vue b/src/pages/demo/charts/list/histogram/demo1/index.vue
similarity index 95%
rename from src/views/demo/charts/list/histogram/demo1/index.vue
rename to src/pages/demo/charts/list/histogram/demo1/index.vue
index 4a6c2bb6..b2b7215e 100644
--- a/src/views/demo/charts/list/histogram/demo1/index.vue
+++ b/src/pages/demo/charts/list/histogram/demo1/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/histogram/demo2/index.vue b/src/pages/demo/charts/list/histogram/demo2/index.vue
similarity index 96%
rename from src/views/demo/charts/list/histogram/demo2/index.vue
rename to src/pages/demo/charts/list/histogram/demo2/index.vue
index 8dd71fa6..b4cea437 100644
--- a/src/views/demo/charts/list/histogram/demo2/index.vue
+++ b/src/pages/demo/charts/list/histogram/demo2/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/histogram/demo3/index.vue b/src/pages/demo/charts/list/histogram/demo3/index.vue
similarity index 95%
rename from src/views/demo/charts/list/histogram/demo3/index.vue
rename to src/pages/demo/charts/list/histogram/demo3/index.vue
index 42f38457..1d46c86a 100644
--- a/src/views/demo/charts/list/histogram/demo3/index.vue
+++ b/src/pages/demo/charts/list/histogram/demo3/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/histogram/demo4/index.vue b/src/pages/demo/charts/list/histogram/demo4/index.vue
similarity index 95%
rename from src/views/demo/charts/list/histogram/demo4/index.vue
rename to src/pages/demo/charts/list/histogram/demo4/index.vue
index 6f4730d7..944e7dfb 100644
--- a/src/views/demo/charts/list/histogram/demo4/index.vue
+++ b/src/pages/demo/charts/list/histogram/demo4/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/histogram/demo5/index.vue b/src/pages/demo/charts/list/histogram/demo5/index.vue
similarity index 95%
rename from src/views/demo/charts/list/histogram/demo5/index.vue
rename to src/pages/demo/charts/list/histogram/demo5/index.vue
index 516d344c..37cc00f8 100644
--- a/src/views/demo/charts/list/histogram/demo5/index.vue
+++ b/src/pages/demo/charts/list/histogram/demo5/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/histogram/demo6/index.vue b/src/pages/demo/charts/list/histogram/demo6/index.vue
similarity index 95%
rename from src/views/demo/charts/list/histogram/demo6/index.vue
rename to src/pages/demo/charts/list/histogram/demo6/index.vue
index 83cd13d8..92a6cd07 100644
--- a/src/views/demo/charts/list/histogram/demo6/index.vue
+++ b/src/pages/demo/charts/list/histogram/demo6/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/line/demo1/index.vue b/src/pages/demo/charts/list/line/demo1/index.vue
similarity index 95%
rename from src/views/demo/charts/list/line/demo1/index.vue
rename to src/pages/demo/charts/list/line/demo1/index.vue
index a96cab48..0c3b282a 100644
--- a/src/views/demo/charts/list/line/demo1/index.vue
+++ b/src/pages/demo/charts/list/line/demo1/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/line/demo2/index.vue b/src/pages/demo/charts/list/line/demo2/index.vue
similarity index 97%
rename from src/views/demo/charts/list/line/demo2/index.vue
rename to src/pages/demo/charts/list/line/demo2/index.vue
index 623012bd..882651cf 100644
--- a/src/views/demo/charts/list/line/demo2/index.vue
+++ b/src/pages/demo/charts/list/line/demo2/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/line/demo3/index.vue b/src/pages/demo/charts/list/line/demo3/index.vue
similarity index 95%
rename from src/views/demo/charts/list/line/demo3/index.vue
rename to src/pages/demo/charts/list/line/demo3/index.vue
index 93fb6ddb..12bca441 100644
--- a/src/views/demo/charts/list/line/demo3/index.vue
+++ b/src/pages/demo/charts/list/line/demo3/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/line/demo4/index.vue b/src/pages/demo/charts/list/line/demo4/index.vue
similarity index 96%
rename from src/views/demo/charts/list/line/demo4/index.vue
rename to src/pages/demo/charts/list/line/demo4/index.vue
index 106b539c..1eb4dcf2 100644
--- a/src/views/demo/charts/list/line/demo4/index.vue
+++ b/src/pages/demo/charts/list/line/demo4/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/line/demo5/index.vue b/src/pages/demo/charts/list/line/demo5/index.vue
similarity index 95%
rename from src/views/demo/charts/list/line/demo5/index.vue
rename to src/pages/demo/charts/list/line/demo5/index.vue
index f3daa02f..6fb34189 100644
--- a/src/views/demo/charts/list/line/demo5/index.vue
+++ b/src/pages/demo/charts/list/line/demo5/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/map/demo1/index.vue b/src/pages/demo/charts/list/map/demo1/index.vue
similarity index 94%
rename from src/views/demo/charts/list/map/demo1/index.vue
rename to src/pages/demo/charts/list/map/demo1/index.vue
index 0428b7d7..dcf13147 100644
--- a/src/views/demo/charts/list/map/demo1/index.vue
+++ b/src/pages/demo/charts/list/map/demo1/index.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/map/demo2/index.vue b/src/pages/demo/charts/list/map/demo2/index.vue
similarity index 94%
rename from src/views/demo/charts/list/map/demo2/index.vue
rename to src/pages/demo/charts/list/map/demo2/index.vue
index de0b5c2c..efba9f19 100644
--- a/src/views/demo/charts/list/map/demo2/index.vue
+++ b/src/pages/demo/charts/list/map/demo2/index.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/map/demo3/index.vue b/src/pages/demo/charts/list/map/demo3/index.vue
similarity index 95%
rename from src/views/demo/charts/list/map/demo3/index.vue
rename to src/pages/demo/charts/list/map/demo3/index.vue
index 81e8b14c..f62a6864 100644
--- a/src/views/demo/charts/list/map/demo3/index.vue
+++ b/src/pages/demo/charts/list/map/demo3/index.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/pie/demo1/index.vue b/src/pages/demo/charts/list/pie/demo1/index.vue
similarity index 94%
rename from src/views/demo/charts/list/pie/demo1/index.vue
rename to src/pages/demo/charts/list/pie/demo1/index.vue
index 04c303d6..59cbf4ef 100644
--- a/src/views/demo/charts/list/pie/demo1/index.vue
+++ b/src/pages/demo/charts/list/pie/demo1/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/pie/demo2/index.vue b/src/pages/demo/charts/list/pie/demo2/index.vue
similarity index 94%
rename from src/views/demo/charts/list/pie/demo2/index.vue
rename to src/pages/demo/charts/list/pie/demo2/index.vue
index 451ca85d..4cbc2a77 100644
--- a/src/views/demo/charts/list/pie/demo2/index.vue
+++ b/src/pages/demo/charts/list/pie/demo2/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/pie/demo3/index.vue b/src/pages/demo/charts/list/pie/demo3/index.vue
similarity index 94%
rename from src/views/demo/charts/list/pie/demo3/index.vue
rename to src/pages/demo/charts/list/pie/demo3/index.vue
index 08c4b444..998692b6 100644
--- a/src/views/demo/charts/list/pie/demo3/index.vue
+++ b/src/pages/demo/charts/list/pie/demo3/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/pie/demo4/index.vue b/src/pages/demo/charts/list/pie/demo4/index.vue
similarity index 94%
rename from src/views/demo/charts/list/pie/demo4/index.vue
rename to src/pages/demo/charts/list/pie/demo4/index.vue
index 5fafef01..faddfc51 100644
--- a/src/views/demo/charts/list/pie/demo4/index.vue
+++ b/src/pages/demo/charts/list/pie/demo4/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/pie/demo5/index.vue b/src/pages/demo/charts/list/pie/demo5/index.vue
similarity index 95%
rename from src/views/demo/charts/list/pie/demo5/index.vue
rename to src/pages/demo/charts/list/pie/demo5/index.vue
index a6045c3b..70318781 100644
--- a/src/views/demo/charts/list/pie/demo5/index.vue
+++ b/src/pages/demo/charts/list/pie/demo5/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/pie/demo6/index.vue b/src/pages/demo/charts/list/pie/demo6/index.vue
similarity index 94%
rename from src/views/demo/charts/list/pie/demo6/index.vue
rename to src/pages/demo/charts/list/pie/demo6/index.vue
index 466e4f73..a670c8c5 100644
--- a/src/views/demo/charts/list/pie/demo6/index.vue
+++ b/src/pages/demo/charts/list/pie/demo6/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/radar/demo1/index.vue b/src/pages/demo/charts/list/radar/demo1/index.vue
similarity index 95%
rename from src/views/demo/charts/list/radar/demo1/index.vue
rename to src/pages/demo/charts/list/radar/demo1/index.vue
index fc8d4e95..c014c41a 100644
--- a/src/views/demo/charts/list/radar/demo1/index.vue
+++ b/src/pages/demo/charts/list/radar/demo1/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/ring/demo1/index.vue b/src/pages/demo/charts/list/ring/demo1/index.vue
similarity index 94%
rename from src/views/demo/charts/list/ring/demo1/index.vue
rename to src/pages/demo/charts/list/ring/demo1/index.vue
index bb79c20a..5186c954 100644
--- a/src/views/demo/charts/list/ring/demo1/index.vue
+++ b/src/pages/demo/charts/list/ring/demo1/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/ring/demo2/index.vue b/src/pages/demo/charts/list/ring/demo2/index.vue
similarity index 94%
rename from src/views/demo/charts/list/ring/demo2/index.vue
rename to src/pages/demo/charts/list/ring/demo2/index.vue
index 12a5a790..6a39ca05 100644
--- a/src/views/demo/charts/list/ring/demo2/index.vue
+++ b/src/pages/demo/charts/list/ring/demo2/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/ring/demo3/index.vue b/src/pages/demo/charts/list/ring/demo3/index.vue
similarity index 94%
rename from src/views/demo/charts/list/ring/demo3/index.vue
rename to src/pages/demo/charts/list/ring/demo3/index.vue
index e077ee56..b715eef8 100644
--- a/src/views/demo/charts/list/ring/demo3/index.vue
+++ b/src/pages/demo/charts/list/ring/demo3/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/ring/demo4/index.vue b/src/pages/demo/charts/list/ring/demo4/index.vue
similarity index 94%
rename from src/views/demo/charts/list/ring/demo4/index.vue
rename to src/pages/demo/charts/list/ring/demo4/index.vue
index 64381be6..ee253dc0 100644
--- a/src/views/demo/charts/list/ring/demo4/index.vue
+++ b/src/pages/demo/charts/list/ring/demo4/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/ring/demo5/index.vue b/src/pages/demo/charts/list/ring/demo5/index.vue
similarity index 94%
rename from src/views/demo/charts/list/ring/demo5/index.vue
rename to src/pages/demo/charts/list/ring/demo5/index.vue
index dbd3bf46..cbcf7c70 100644
--- a/src/views/demo/charts/list/ring/demo5/index.vue
+++ b/src/pages/demo/charts/list/ring/demo5/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/sankey/demo1/index.vue b/src/pages/demo/charts/list/sankey/demo1/index.vue
similarity index 96%
rename from src/views/demo/charts/list/sankey/demo1/index.vue
rename to src/pages/demo/charts/list/sankey/demo1/index.vue
index e0426923..cce4bcd2 100644
--- a/src/views/demo/charts/list/sankey/demo1/index.vue
+++ b/src/pages/demo/charts/list/sankey/demo1/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/scatter/demo1/index.vue b/src/pages/demo/charts/list/scatter/demo1/index.vue
similarity index 95%
rename from src/views/demo/charts/list/scatter/demo1/index.vue
rename to src/pages/demo/charts/list/scatter/demo1/index.vue
index 602bef17..2d0d56a0 100644
--- a/src/views/demo/charts/list/scatter/demo1/index.vue
+++ b/src/pages/demo/charts/list/scatter/demo1/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/scatter/demo2/index.vue b/src/pages/demo/charts/list/scatter/demo2/index.vue
similarity index 97%
rename from src/views/demo/charts/list/scatter/demo2/index.vue
rename to src/pages/demo/charts/list/scatter/demo2/index.vue
index 3755fd26..043fb646 100644
--- a/src/views/demo/charts/list/scatter/demo2/index.vue
+++ b/src/pages/demo/charts/list/scatter/demo2/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/tree/demo1/index.vue b/src/pages/demo/charts/list/tree/demo1/index.vue
similarity index 98%
rename from src/views/demo/charts/list/tree/demo1/index.vue
rename to src/pages/demo/charts/list/tree/demo1/index.vue
index f9c5e911..6da59bcb 100644
--- a/src/views/demo/charts/list/tree/demo1/index.vue
+++ b/src/pages/demo/charts/list/tree/demo1/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/charts/list/waterfall/demo1/index.vue b/src/pages/demo/charts/list/waterfall/demo1/index.vue
similarity index 93%
rename from src/views/demo/charts/list/waterfall/demo1/index.vue
rename to src/pages/demo/charts/list/waterfall/demo1/index.vue
index 114d3a9a..51ed42e0 100644
--- a/src/views/demo/charts/list/waterfall/demo1/index.vue
+++ b/src/pages/demo/charts/list/waterfall/demo1/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list
diff --git a/src/views/demo/components/container/card.vue b/src/pages/demo/components/container/card.vue
similarity index 100%
rename from src/views/demo/components/container/card.vue
rename to src/pages/demo/components/container/card.vue
diff --git a/src/views/demo/components/container/full-bs.vue b/src/pages/demo/components/container/full-bs.vue
similarity index 100%
rename from src/views/demo/components/container/full-bs.vue
rename to src/pages/demo/components/container/full-bs.vue
diff --git a/src/views/demo/components/container/full.vue b/src/pages/demo/components/container/full.vue
similarity index 100%
rename from src/views/demo/components/container/full.vue
rename to src/pages/demo/components/container/full.vue
diff --git a/src/views/demo/components/container/ghost-header.vue b/src/pages/demo/components/container/ghost-header.vue
similarity index 100%
rename from src/views/demo/components/container/ghost-header.vue
rename to src/pages/demo/components/container/ghost-header.vue
diff --git a/src/views/demo/components/container/ghost.vue b/src/pages/demo/components/container/ghost.vue
similarity index 100%
rename from src/views/demo/components/container/ghost.vue
rename to src/pages/demo/components/container/ghost.vue
diff --git a/src/views/demo/components/container/md/doc-card.md b/src/pages/demo/components/container/md/doc-card.md
similarity index 100%
rename from src/views/demo/components/container/md/doc-card.md
rename to src/pages/demo/components/container/md/doc-card.md
diff --git a/src/views/demo/components/container/md/doc-full-bs.md b/src/pages/demo/components/container/md/doc-full-bs.md
similarity index 100%
rename from src/views/demo/components/container/md/doc-full-bs.md
rename to src/pages/demo/components/container/md/doc-full-bs.md
diff --git a/src/views/demo/components/container/md/doc-full.md b/src/pages/demo/components/container/md/doc-full.md
similarity index 100%
rename from src/views/demo/components/container/md/doc-full.md
rename to src/pages/demo/components/container/md/doc-full.md
diff --git a/src/views/demo/components/container/md/doc-ghost-header.md b/src/pages/demo/components/container/md/doc-ghost-header.md
similarity index 100%
rename from src/views/demo/components/container/md/doc-ghost-header.md
rename to src/pages/demo/components/container/md/doc-ghost-header.md
diff --git a/src/views/demo/components/container/md/doc-ghost.md b/src/pages/demo/components/container/md/doc-ghost.md
similarity index 100%
rename from src/views/demo/components/container/md/doc-ghost.md
rename to src/pages/demo/components/container/md/doc-ghost.md
diff --git a/src/views/demo/components/contextmenu/custom-trigger.vue b/src/pages/demo/components/contextmenu/custom-trigger.vue
similarity index 100%
rename from src/views/demo/components/contextmenu/custom-trigger.vue
rename to src/pages/demo/components/contextmenu/custom-trigger.vue
diff --git a/src/views/demo/components/contextmenu/disabled.vue b/src/pages/demo/components/contextmenu/disabled.vue
similarity index 100%
rename from src/views/demo/components/contextmenu/disabled.vue
rename to src/pages/demo/components/contextmenu/disabled.vue
diff --git a/src/views/demo/components/contextmenu/divier.vue b/src/pages/demo/components/contextmenu/divier.vue
similarity index 100%
rename from src/views/demo/components/contextmenu/divier.vue
rename to src/pages/demo/components/contextmenu/divier.vue
diff --git a/src/views/demo/components/contextmenu/group.vue b/src/pages/demo/components/contextmenu/group.vue
similarity index 100%
rename from src/views/demo/components/contextmenu/group.vue
rename to src/pages/demo/components/contextmenu/group.vue
diff --git a/src/views/demo/components/contextmenu/simple.vue b/src/pages/demo/components/contextmenu/simple.vue
similarity index 100%
rename from src/views/demo/components/contextmenu/simple.vue
rename to src/pages/demo/components/contextmenu/simple.vue
diff --git a/src/views/demo/components/contextmenu/style/pub.scss b/src/pages/demo/components/contextmenu/style/pub.scss
similarity index 100%
rename from src/views/demo/components/contextmenu/style/pub.scss
rename to src/pages/demo/components/contextmenu/style/pub.scss
diff --git a/src/views/demo/components/contextmenu/submenu.vue b/src/pages/demo/components/contextmenu/submenu.vue
similarity index 100%
rename from src/views/demo/components/contextmenu/submenu.vue
rename to src/pages/demo/components/contextmenu/submenu.vue
diff --git a/src/views/demo/components/countup/index.vue b/src/pages/demo/components/countup/index.vue
similarity index 100%
rename from src/views/demo/components/countup/index.vue
rename to src/pages/demo/components/countup/index.vue
diff --git a/src/views/demo/components/editor-quill/index.vue b/src/pages/demo/components/editor-quill/index.vue
similarity index 100%
rename from src/views/demo/components/editor-quill/index.vue
rename to src/pages/demo/components/editor-quill/index.vue
diff --git a/src/views/demo/components/editor-quill/value.js b/src/pages/demo/components/editor-quill/value.js
similarity index 100%
rename from src/views/demo/components/editor-quill/value.js
rename to src/pages/demo/components/editor-quill/value.js
diff --git a/src/views/demo/components/editor-simpleMDE/index.vue b/src/pages/demo/components/editor-simpleMDE/index.vue
similarity index 100%
rename from src/views/demo/components/editor-simpleMDE/index.vue
rename to src/pages/demo/components/editor-simpleMDE/index.vue
diff --git a/src/views/demo/components/editor-simpleMDE/text.js b/src/pages/demo/components/editor-simpleMDE/text.js
similarity index 100%
rename from src/views/demo/components/editor-simpleMDE/text.js
rename to src/pages/demo/components/editor-simpleMDE/text.js
diff --git a/src/views/demo/components/highlight/code/css.js b/src/pages/demo/components/highlight/code/css.js
similarity index 100%
rename from src/views/demo/components/highlight/code/css.js
rename to src/pages/demo/components/highlight/code/css.js
diff --git a/src/views/demo/components/highlight/code/html.js b/src/pages/demo/components/highlight/code/html.js
similarity index 100%
rename from src/views/demo/components/highlight/code/html.js
rename to src/pages/demo/components/highlight/code/html.js
diff --git a/src/views/demo/components/highlight/code/javascript.js b/src/pages/demo/components/highlight/code/javascript.js
similarity index 100%
rename from src/views/demo/components/highlight/code/javascript.js
rename to src/pages/demo/components/highlight/code/javascript.js
diff --git a/src/views/demo/components/highlight/code/scss.js b/src/pages/demo/components/highlight/code/scss.js
similarity index 100%
rename from src/views/demo/components/highlight/code/scss.js
rename to src/pages/demo/components/highlight/code/scss.js
diff --git a/src/views/demo/components/highlight/index.vue b/src/pages/demo/components/highlight/index.vue
similarity index 100%
rename from src/views/demo/components/highlight/index.vue
rename to src/pages/demo/components/highlight/index.vue
diff --git a/src/views/demo/components/icon/components/d2-icon-cell.vue b/src/pages/demo/components/icon/components/d2-icon-cell.vue
similarity index 100%
rename from src/views/demo/components/icon/components/d2-icon-cell.vue
rename to src/pages/demo/components/icon/components/d2-icon-cell.vue
diff --git a/src/views/demo/components/icon/data/index.js.REMOVED.git-id b/src/pages/demo/components/icon/data/index.js.REMOVED.git-id
similarity index 100%
rename from src/views/demo/components/icon/data/index.js.REMOVED.git-id
rename to src/pages/demo/components/icon/data/index.js.REMOVED.git-id
diff --git a/src/views/demo/components/icon/icon.vue b/src/pages/demo/components/icon/icon.vue
similarity index 100%
rename from src/views/demo/components/icon/icon.vue
rename to src/pages/demo/components/icon/icon.vue
diff --git a/src/views/demo/components/icon/list.vue b/src/pages/demo/components/icon/list.vue
similarity index 100%
rename from src/views/demo/components/icon/list.vue
rename to src/pages/demo/components/icon/list.vue
diff --git a/src/views/demo/components/icon/select.vue b/src/pages/demo/components/icon/select.vue
similarity index 100%
rename from src/views/demo/components/icon/select.vue
rename to src/pages/demo/components/icon/select.vue
diff --git a/src/views/demo/components/icon/svg.vue b/src/pages/demo/components/icon/svg.vue
similarity index 100%
rename from src/views/demo/components/icon/svg.vue
rename to src/pages/demo/components/icon/svg.vue
diff --git a/src/views/demo/components/index/image/icon.png.REMOVED.git-id b/src/pages/demo/components/index/image/icon.png.REMOVED.git-id
similarity index 100%
rename from src/views/demo/components/index/image/icon.png.REMOVED.git-id
rename to src/pages/demo/components/index/image/icon.png.REMOVED.git-id
diff --git a/src/views/demo/components/index/index.vue b/src/pages/demo/components/index/index.vue
similarity index 100%
rename from src/views/demo/components/index/index.vue
rename to src/pages/demo/components/index/index.vue
diff --git a/src/views/demo/components/json-tree/index.vue b/src/pages/demo/components/json-tree/index.vue
similarity index 100%
rename from src/views/demo/components/json-tree/index.vue
rename to src/pages/demo/components/json-tree/index.vue
diff --git a/src/views/demo/components/layout/grid.vue b/src/pages/demo/components/layout/grid.vue
similarity index 100%
rename from src/views/demo/components/layout/grid.vue
rename to src/pages/demo/components/layout/grid.vue
diff --git a/src/views/demo/components/layout/splitpane.vue b/src/pages/demo/components/layout/splitpane.vue
similarity index 100%
rename from src/views/demo/components/layout/splitpane.vue
rename to src/pages/demo/components/layout/splitpane.vue
diff --git a/src/views/demo/components/markdown/md/doc.md b/src/pages/demo/components/markdown/md/doc.md
similarity index 100%
rename from src/views/demo/components/markdown/md/doc.md
rename to src/pages/demo/components/markdown/md/doc.md
diff --git a/src/views/demo/components/markdown/source.vue b/src/pages/demo/components/markdown/source.vue
similarity index 100%
rename from src/views/demo/components/markdown/source.vue
rename to src/pages/demo/components/markdown/source.vue
diff --git a/src/views/demo/components/markdown/url.vue b/src/pages/demo/components/markdown/url.vue
similarity index 100%
rename from src/views/demo/components/markdown/url.vue
rename to src/pages/demo/components/markdown/url.vue
diff --git a/src/views/demo/element/basic-button/index.vue b/src/pages/demo/element/basic-button/index.vue
similarity index 100%
rename from src/views/demo/element/basic-button/index.vue
rename to src/pages/demo/element/basic-button/index.vue
diff --git a/src/views/demo/element/basic-color/components/info.vue b/src/pages/demo/element/basic-color/components/info.vue
similarity index 100%
rename from src/views/demo/element/basic-color/components/info.vue
rename to src/pages/demo/element/basic-color/components/info.vue
diff --git a/src/views/demo/element/basic-color/index.vue b/src/pages/demo/element/basic-color/index.vue
similarity index 100%
rename from src/views/demo/element/basic-color/index.vue
rename to src/pages/demo/element/basic-color/index.vue
diff --git a/src/views/demo/element/basic-container/index.vue b/src/pages/demo/element/basic-container/index.vue
similarity index 100%
rename from src/views/demo/element/basic-container/index.vue
rename to src/pages/demo/element/basic-container/index.vue
diff --git a/src/views/demo/element/basic-icon/index.vue b/src/pages/demo/element/basic-icon/index.vue
similarity index 100%
rename from src/views/demo/element/basic-icon/index.vue
rename to src/pages/demo/element/basic-icon/index.vue
diff --git a/src/views/demo/element/basic-layout/index.vue b/src/pages/demo/element/basic-layout/index.vue
similarity index 100%
rename from src/views/demo/element/basic-layout/index.vue
rename to src/pages/demo/element/basic-layout/index.vue
diff --git a/src/views/demo/element/basic-typography/index.vue b/src/pages/demo/element/basic-typography/index.vue
similarity index 100%
rename from src/views/demo/element/basic-typography/index.vue
rename to src/pages/demo/element/basic-typography/index.vue
diff --git a/src/views/demo/element/data-badge/index.vue b/src/pages/demo/element/data-badge/index.vue
similarity index 100%
rename from src/views/demo/element/data-badge/index.vue
rename to src/pages/demo/element/data-badge/index.vue
diff --git a/src/views/demo/element/data-pagination/index.vue b/src/pages/demo/element/data-pagination/index.vue
similarity index 100%
rename from src/views/demo/element/data-pagination/index.vue
rename to src/pages/demo/element/data-pagination/index.vue
diff --git a/src/views/demo/element/data-progress/index.vue b/src/pages/demo/element/data-progress/index.vue
similarity index 100%
rename from src/views/demo/element/data-progress/index.vue
rename to src/pages/demo/element/data-progress/index.vue
diff --git a/src/views/demo/element/data-table/index.vue b/src/pages/demo/element/data-table/index.vue
similarity index 100%
rename from src/views/demo/element/data-table/index.vue
rename to src/pages/demo/element/data-table/index.vue
diff --git a/src/views/demo/element/data-tag/index.vue b/src/pages/demo/element/data-tag/index.vue
similarity index 100%
rename from src/views/demo/element/data-tag/index.vue
rename to src/pages/demo/element/data-tag/index.vue
diff --git a/src/views/demo/element/data-tree/index.vue b/src/pages/demo/element/data-tree/index.vue
similarity index 100%
rename from src/views/demo/element/data-tree/index.vue
rename to src/pages/demo/element/data-tree/index.vue
diff --git a/src/views/demo/element/form-cascader/index.vue b/src/pages/demo/element/form-cascader/index.vue
similarity index 100%
rename from src/views/demo/element/form-cascader/index.vue
rename to src/pages/demo/element/form-cascader/index.vue
diff --git a/src/views/demo/element/form-checkbox/index.vue b/src/pages/demo/element/form-checkbox/index.vue
similarity index 100%
rename from src/views/demo/element/form-checkbox/index.vue
rename to src/pages/demo/element/form-checkbox/index.vue
diff --git a/src/views/demo/element/form-color-picker/index.vue b/src/pages/demo/element/form-color-picker/index.vue
similarity index 100%
rename from src/views/demo/element/form-color-picker/index.vue
rename to src/pages/demo/element/form-color-picker/index.vue
diff --git a/src/views/demo/element/form-date-picker/index.vue b/src/pages/demo/element/form-date-picker/index.vue
similarity index 100%
rename from src/views/demo/element/form-date-picker/index.vue
rename to src/pages/demo/element/form-date-picker/index.vue
diff --git a/src/views/demo/element/form-datetime-picker/index.vue b/src/pages/demo/element/form-datetime-picker/index.vue
similarity index 100%
rename from src/views/demo/element/form-datetime-picker/index.vue
rename to src/pages/demo/element/form-datetime-picker/index.vue
diff --git a/src/views/demo/element/form-form/index.vue b/src/pages/demo/element/form-form/index.vue
similarity index 100%
rename from src/views/demo/element/form-form/index.vue
rename to src/pages/demo/element/form-form/index.vue
diff --git a/src/views/demo/element/form-input-number/index.vue b/src/pages/demo/element/form-input-number/index.vue
similarity index 100%
rename from src/views/demo/element/form-input-number/index.vue
rename to src/pages/demo/element/form-input-number/index.vue
diff --git a/src/views/demo/element/form-input/index.vue.REMOVED.git-id b/src/pages/demo/element/form-input/index.vue.REMOVED.git-id
similarity index 100%
rename from src/views/demo/element/form-input/index.vue.REMOVED.git-id
rename to src/pages/demo/element/form-input/index.vue.REMOVED.git-id
diff --git a/src/views/demo/element/form-radio/index.vue b/src/pages/demo/element/form-radio/index.vue
similarity index 100%
rename from src/views/demo/element/form-radio/index.vue
rename to src/pages/demo/element/form-radio/index.vue
diff --git a/src/views/demo/element/form-rate/index.vue b/src/pages/demo/element/form-rate/index.vue
similarity index 100%
rename from src/views/demo/element/form-rate/index.vue
rename to src/pages/demo/element/form-rate/index.vue
diff --git a/src/views/demo/element/form-select/index.vue b/src/pages/demo/element/form-select/index.vue
similarity index 100%
rename from src/views/demo/element/form-select/index.vue
rename to src/pages/demo/element/form-select/index.vue
diff --git a/src/views/demo/element/form-slider/index.vue b/src/pages/demo/element/form-slider/index.vue
similarity index 100%
rename from src/views/demo/element/form-slider/index.vue
rename to src/pages/demo/element/form-slider/index.vue
diff --git a/src/views/demo/element/form-switch/index.vue b/src/pages/demo/element/form-switch/index.vue
similarity index 100%
rename from src/views/demo/element/form-switch/index.vue
rename to src/pages/demo/element/form-switch/index.vue
diff --git a/src/views/demo/element/form-time-picker/index.vue b/src/pages/demo/element/form-time-picker/index.vue
similarity index 100%
rename from src/views/demo/element/form-time-picker/index.vue
rename to src/pages/demo/element/form-time-picker/index.vue
diff --git a/src/views/demo/element/form-transfer/index.vue b/src/pages/demo/element/form-transfer/index.vue
similarity index 100%
rename from src/views/demo/element/form-transfer/index.vue
rename to src/pages/demo/element/form-transfer/index.vue
diff --git a/src/views/demo/element/form-upload/index.vue b/src/pages/demo/element/form-upload/index.vue
similarity index 100%
rename from src/views/demo/element/form-upload/index.vue
rename to src/pages/demo/element/form-upload/index.vue
diff --git a/src/views/demo/element/index/image/icon.png.REMOVED.git-id b/src/pages/demo/element/index/image/icon.png.REMOVED.git-id
similarity index 100%
rename from src/views/demo/element/index/image/icon.png.REMOVED.git-id
rename to src/pages/demo/element/index/image/icon.png.REMOVED.git-id
diff --git a/src/views/demo/element/index/index.vue b/src/pages/demo/element/index/index.vue
similarity index 100%
rename from src/views/demo/element/index/index.vue
rename to src/pages/demo/element/index/index.vue
diff --git a/src/views/demo/element/navigation-breadcrumb/index.vue b/src/pages/demo/element/navigation-breadcrumb/index.vue
similarity index 100%
rename from src/views/demo/element/navigation-breadcrumb/index.vue
rename to src/pages/demo/element/navigation-breadcrumb/index.vue
diff --git a/src/views/demo/element/navigation-dropdown/index.vue b/src/pages/demo/element/navigation-dropdown/index.vue
similarity index 100%
rename from src/views/demo/element/navigation-dropdown/index.vue
rename to src/pages/demo/element/navigation-dropdown/index.vue
diff --git a/src/views/demo/element/navigation-menu/index.vue b/src/pages/demo/element/navigation-menu/index.vue
similarity index 100%
rename from src/views/demo/element/navigation-menu/index.vue
rename to src/pages/demo/element/navigation-menu/index.vue
diff --git a/src/views/demo/element/navigation-steps/index.vue b/src/pages/demo/element/navigation-steps/index.vue
similarity index 100%
rename from src/views/demo/element/navigation-steps/index.vue
rename to src/pages/demo/element/navigation-steps/index.vue
diff --git a/src/views/demo/element/navigation-tabs/index.vue b/src/pages/demo/element/navigation-tabs/index.vue
similarity index 100%
rename from src/views/demo/element/navigation-tabs/index.vue
rename to src/pages/demo/element/navigation-tabs/index.vue
diff --git a/src/views/demo/element/notice-alert/index.vue b/src/pages/demo/element/notice-alert/index.vue
similarity index 100%
rename from src/views/demo/element/notice-alert/index.vue
rename to src/pages/demo/element/notice-alert/index.vue
diff --git a/src/views/demo/element/notice-loading/index.vue b/src/pages/demo/element/notice-loading/index.vue
similarity index 100%
rename from src/views/demo/element/notice-loading/index.vue
rename to src/pages/demo/element/notice-loading/index.vue
diff --git a/src/views/demo/element/notice-message-box/index.vue b/src/pages/demo/element/notice-message-box/index.vue
similarity index 100%
rename from src/views/demo/element/notice-message-box/index.vue
rename to src/pages/demo/element/notice-message-box/index.vue
diff --git a/src/views/demo/element/notice-message/index.vue b/src/pages/demo/element/notice-message/index.vue
similarity index 100%
rename from src/views/demo/element/notice-message/index.vue
rename to src/pages/demo/element/notice-message/index.vue
diff --git a/src/views/demo/element/notice-notification/index.vue b/src/pages/demo/element/notice-notification/index.vue
similarity index 100%
rename from src/views/demo/element/notice-notification/index.vue
rename to src/pages/demo/element/notice-notification/index.vue
diff --git a/src/views/demo/element/others-card/index.vue b/src/pages/demo/element/others-card/index.vue
similarity index 100%
rename from src/views/demo/element/others-card/index.vue
rename to src/pages/demo/element/others-card/index.vue
diff --git a/src/views/demo/element/others-carousel/index.vue b/src/pages/demo/element/others-carousel/index.vue
similarity index 100%
rename from src/views/demo/element/others-carousel/index.vue
rename to src/pages/demo/element/others-carousel/index.vue
diff --git a/src/views/demo/element/others-collapse/index.vue b/src/pages/demo/element/others-collapse/index.vue
similarity index 100%
rename from src/views/demo/element/others-collapse/index.vue
rename to src/pages/demo/element/others-collapse/index.vue
diff --git a/src/views/demo/element/others-dialog/index.vue b/src/pages/demo/element/others-dialog/index.vue
similarity index 100%
rename from src/views/demo/element/others-dialog/index.vue
rename to src/pages/demo/element/others-dialog/index.vue
diff --git a/src/views/demo/element/others-popover/index.vue b/src/pages/demo/element/others-popover/index.vue
similarity index 100%
rename from src/views/demo/element/others-popover/index.vue
rename to src/pages/demo/element/others-popover/index.vue
diff --git a/src/views/demo/element/others-tooltip/index.vue b/src/pages/demo/element/others-tooltip/index.vue
similarity index 100%
rename from src/views/demo/element/others-tooltip/index.vue
rename to src/pages/demo/element/others-tooltip/index.vue
diff --git a/src/views/demo/playground/db/index.vue b/src/pages/demo/playground/db/index.vue
similarity index 100%
rename from src/views/demo/playground/db/index.vue
rename to src/pages/demo/playground/db/index.vue
diff --git a/src/views/demo/playground/fullscreen/index.vue b/src/pages/demo/playground/fullscreen/index.vue
similarity index 100%
rename from src/views/demo/playground/fullscreen/index.vue
rename to src/pages/demo/playground/fullscreen/index.vue
diff --git a/src/views/demo/playground/gray/index.vue b/src/pages/demo/playground/gray/index.vue
similarity index 100%
rename from src/views/demo/playground/gray/index.vue
rename to src/pages/demo/playground/gray/index.vue
diff --git a/src/views/demo/playground/index/image/icon.png.REMOVED.git-id b/src/pages/demo/playground/index/image/icon.png.REMOVED.git-id
similarity index 100%
rename from src/views/demo/playground/index/image/icon.png.REMOVED.git-id
rename to src/pages/demo/playground/index/image/icon.png.REMOVED.git-id
diff --git a/src/views/demo/playground/index/index.vue b/src/pages/demo/playground/index/index.vue
similarity index 100%
rename from src/views/demo/playground/index/index.vue
rename to src/pages/demo/playground/index/index.vue
diff --git a/src/views/demo/playground/page-argu/get.vue b/src/pages/demo/playground/page-argu/get.vue
similarity index 100%
rename from src/views/demo/playground/page-argu/get.vue
rename to src/pages/demo/playground/page-argu/get.vue
diff --git a/src/views/demo/playground/page-argu/send.vue b/src/pages/demo/playground/page-argu/send.vue
similarity index 100%
rename from src/views/demo/playground/page-argu/send.vue
rename to src/pages/demo/playground/page-argu/send.vue
diff --git a/src/views/demo/playground/page-cache/off.vue b/src/pages/demo/playground/page-cache/off.vue
similarity index 100%
rename from src/views/demo/playground/page-cache/off.vue
rename to src/pages/demo/playground/page-cache/off.vue
diff --git a/src/views/demo/playground/page-cache/on.vue b/src/pages/demo/playground/page-cache/on.vue
similarity index 100%
rename from src/views/demo/playground/page-cache/on.vue
rename to src/pages/demo/playground/page-cache/on.vue
diff --git a/src/views/demo/playground/theme/index.vue b/src/pages/demo/playground/theme/index.vue
similarity index 100%
rename from src/views/demo/playground/theme/index.vue
rename to src/pages/demo/playground/theme/index.vue
diff --git a/src/views/demo/plugins/better-scroll/base.vue b/src/pages/demo/plugins/better-scroll/base.vue
similarity index 100%
rename from src/views/demo/plugins/better-scroll/base.vue
rename to src/pages/demo/plugins/better-scroll/base.vue
diff --git a/src/views/demo/plugins/better-scroll/to.vue b/src/pages/demo/plugins/better-scroll/to.vue
similarity index 100%
rename from src/views/demo/plugins/better-scroll/to.vue
rename to src/pages/demo/plugins/better-scroll/to.vue
diff --git a/src/views/demo/plugins/build/index.vue b/src/pages/demo/plugins/build/index.vue
similarity index 100%
rename from src/views/demo/plugins/build/index.vue
rename to src/pages/demo/plugins/build/index.vue
diff --git a/src/views/demo/plugins/clipboard-polyfill/index.vue b/src/pages/demo/plugins/clipboard-polyfill/index.vue
similarity index 100%
rename from src/views/demo/plugins/clipboard-polyfill/index.vue
rename to src/pages/demo/plugins/clipboard-polyfill/index.vue
diff --git a/src/views/demo/plugins/day/index.vue b/src/pages/demo/plugins/day/index.vue
similarity index 100%
rename from src/views/demo/plugins/day/index.vue
rename to src/pages/demo/plugins/day/index.vue
diff --git a/src/views/demo/plugins/export/data/index.js b/src/pages/demo/plugins/export/data/index.js
similarity index 100%
rename from src/views/demo/plugins/export/data/index.js
rename to src/pages/demo/plugins/export/data/index.js
diff --git a/src/views/demo/plugins/export/table.vue b/src/pages/demo/plugins/export/table.vue
similarity index 100%
rename from src/views/demo/plugins/export/table.vue
rename to src/pages/demo/plugins/export/table.vue
diff --git a/src/views/demo/plugins/export/txt.vue b/src/pages/demo/plugins/export/txt.vue
similarity index 100%
rename from src/views/demo/plugins/export/txt.vue
rename to src/pages/demo/plugins/export/txt.vue
diff --git a/src/views/demo/plugins/i18n/components/DemoI18n.vue b/src/pages/demo/plugins/i18n/components/DemoI18n.vue
similarity index 100%
rename from src/views/demo/plugins/i18n/components/DemoI18n.vue
rename to src/pages/demo/plugins/i18n/components/DemoI18n.vue
diff --git a/src/views/demo/plugins/i18n/components/DemoI18nControl.vue b/src/pages/demo/plugins/i18n/components/DemoI18nControl.vue
similarity index 100%
rename from src/views/demo/plugins/i18n/components/DemoI18nControl.vue
rename to src/pages/demo/plugins/i18n/components/DemoI18nControl.vue
diff --git a/src/views/demo/plugins/i18n/demo1.vue b/src/pages/demo/plugins/i18n/demo1.vue
similarity index 100%
rename from src/views/demo/plugins/i18n/demo1.vue
rename to src/pages/demo/plugins/i18n/demo1.vue
diff --git a/src/views/demo/plugins/i18n/demo2.vue b/src/pages/demo/plugins/i18n/demo2.vue
similarity index 100%
rename from src/views/demo/plugins/i18n/demo2.vue
rename to src/pages/demo/plugins/i18n/demo2.vue
diff --git a/src/views/demo/plugins/import/csv.vue b/src/pages/demo/plugins/import/csv.vue
similarity index 100%
rename from src/views/demo/plugins/import/csv.vue
rename to src/pages/demo/plugins/import/csv.vue
diff --git a/src/views/demo/plugins/import/xlsx.vue b/src/pages/demo/plugins/import/xlsx.vue
similarity index 100%
rename from src/views/demo/plugins/import/xlsx.vue
rename to src/pages/demo/plugins/import/xlsx.vue
diff --git a/src/views/demo/plugins/index/image/icon.png.REMOVED.git-id b/src/pages/demo/plugins/index/image/icon.png.REMOVED.git-id
similarity index 100%
rename from src/views/demo/plugins/index/image/icon.png.REMOVED.git-id
rename to src/pages/demo/plugins/index/image/icon.png.REMOVED.git-id
diff --git a/src/views/demo/plugins/index/index.vue b/src/pages/demo/plugins/index/index.vue
similarity index 100%
rename from src/views/demo/plugins/index/index.vue
rename to src/pages/demo/plugins/index/index.vue
diff --git a/src/views/demo/plugins/js-cookie/index.vue b/src/pages/demo/plugins/js-cookie/index.vue
similarity index 100%
rename from src/views/demo/plugins/js-cookie/index.vue
rename to src/pages/demo/plugins/js-cookie/index.vue
diff --git a/src/views/demo/plugins/mock/ajax.vue b/src/pages/demo/plugins/mock/ajax.vue
similarity index 100%
rename from src/views/demo/plugins/mock/ajax.vue
rename to src/pages/demo/plugins/mock/ajax.vue
diff --git a/src/views/demo/plugins/mock/components/d2-demo-mock-card.vue b/src/pages/demo/plugins/mock/components/d2-demo-mock-card.vue
similarity index 100%
rename from src/views/demo/plugins/mock/components/d2-demo-mock-card.vue
rename to src/pages/demo/plugins/mock/components/d2-demo-mock-card.vue
diff --git a/src/views/demo/plugins/mock/data/settingDPD.js b/src/pages/demo/plugins/mock/data/settingDPD.js
similarity index 100%
rename from src/views/demo/plugins/mock/data/settingDPD.js
rename to src/pages/demo/plugins/mock/data/settingDPD.js
diff --git a/src/views/demo/plugins/mock/data/settingDTD.js b/src/pages/demo/plugins/mock/data/settingDTD.js
similarity index 100%
rename from src/views/demo/plugins/mock/data/settingDTD.js
rename to src/pages/demo/plugins/mock/data/settingDTD.js
diff --git a/src/views/demo/plugins/mock/dpd.vue b/src/pages/demo/plugins/mock/dpd.vue
similarity index 100%
rename from src/views/demo/plugins/mock/dpd.vue
rename to src/pages/demo/plugins/mock/dpd.vue
diff --git a/src/views/demo/plugins/mock/dtd.vue b/src/pages/demo/plugins/mock/dtd.vue
similarity index 100%
rename from src/views/demo/plugins/mock/dtd.vue
rename to src/pages/demo/plugins/mock/dtd.vue
diff --git a/src/views/demo/plugins/mock/md/doc.md b/src/pages/demo/plugins/mock/md/doc.md
similarity index 100%
rename from src/views/demo/plugins/mock/md/doc.md
rename to src/pages/demo/plugins/mock/md/doc.md
diff --git a/src/views/demo/plugins/mock/mixins/function.js b/src/pages/demo/plugins/mock/mixins/function.js
similarity index 100%
rename from src/views/demo/plugins/mock/mixins/function.js
rename to src/pages/demo/plugins/mock/mixins/function.js
diff --git a/src/views/demo/plugins/mock/mixins/regexp.js b/src/pages/demo/plugins/mock/mixins/regexp.js
similarity index 100%
rename from src/views/demo/plugins/mock/mixins/regexp.js
rename to src/pages/demo/plugins/mock/mixins/regexp.js
diff --git a/src/views/core/404/index.vue b/src/pages/error-page-404/error-page-404.vue
similarity index 100%
rename from src/views/core/404/index.vue
rename to src/pages/error-page-404/error-page-404.vue
diff --git a/src/views/core/404/image/cover@2x.png.REMOVED.git-id b/src/pages/error-page-404/image/cover@2x.png.REMOVED.git-id
similarity index 100%
rename from src/views/core/404/image/cover@2x.png.REMOVED.git-id
rename to src/pages/error-page-404/image/cover@2x.png.REMOVED.git-id
diff --git a/src/pages/error-page-404/index.js b/src/pages/error-page-404/index.js
new file mode 100644
index 00000000..1d0ae533
--- /dev/null
+++ b/src/pages/error-page-404/index.js
@@ -0,0 +1,3 @@
+import page from './error-page-404'
+
+export default page
diff --git a/src/views/core/login/config/bubble.js b/src/pages/login/config/bubble.js
similarity index 100%
rename from src/views/core/login/config/bubble.js
rename to src/pages/login/config/bubble.js
diff --git a/src/views/core/login/config/default.js b/src/pages/login/config/default.js
similarity index 100%
rename from src/views/core/login/config/default.js
rename to src/pages/login/config/default.js
diff --git a/src/views/core/login/config/nasa.js b/src/pages/login/config/nasa.js
similarity index 100%
rename from src/views/core/login/config/nasa.js
rename to src/pages/login/config/nasa.js
diff --git a/src/views/core/login/config/snow.js b/src/pages/login/config/snow.js
similarity index 100%
rename from src/views/core/login/config/snow.js
rename to src/pages/login/config/snow.js
diff --git a/src/views/core/login/image/logo.png.REMOVED.git-id b/src/pages/login/image/logo.png.REMOVED.git-id
similarity index 100%
rename from src/views/core/login/image/logo.png.REMOVED.git-id
rename to src/pages/login/image/logo.png.REMOVED.git-id
diff --git a/src/pages/login/index.js b/src/pages/login/index.js
new file mode 100644
index 00000000..3bbfb488
--- /dev/null
+++ b/src/pages/login/index.js
@@ -0,0 +1,3 @@
+import page from './login'
+
+export default page
diff --git a/src/views/core/login/index.vue b/src/pages/login/login.vue
similarity index 100%
rename from src/views/core/login/index.vue
rename to src/pages/login/login.vue
diff --git a/src/views/core/login/style.scss b/src/pages/login/style.scss
similarity index 100%
rename from src/views/core/login/style.scss
rename to src/pages/login/style.scss
diff --git a/src/plugin/axios/index.js b/src/plugin/axios/index.js
index 610ec6f5..d2e137db 100644
--- a/src/plugin/axios/index.js
+++ b/src/plugin/axios/index.js
@@ -2,15 +2,7 @@ import Vue from 'vue'
 import axios from 'axios'
 
 axios.interceptors.response.use(res => {
-  if (res.data.code !== undefined) {
-    if (res.data.code !== 0) {
-      return Promise.reject(res.data.msg)
-    } else {
-      return res.data.data
-    }
-  } else {
-    return res.data
-  }
+  return res.data
 }, err => {
   return Promise.reject(err)
 })
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 1c1286f8..f415a66f 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-11e95dd3434ee0702bc7b391adc3b9587aa86452
\ No newline at end of file
+b48413cb8c217f7ecaf10be1313caa442cffe91b
\ No newline at end of file
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 6c69df56..4b4b1f1d 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-a77ef2a929f3e850d71b14a5d2c8570053a5c44c
\ No newline at end of file
+faad65522dbc840ccfc41ba4d1a0060993aea1f3
\ No newline at end of file
diff --git a/tests/unit/HelloWorld.spec.js b/tests/unit/HelloWorld.spec.js
index f84fb39d..965f36fa 100644
--- a/tests/unit/HelloWorld.spec.js
+++ b/tests/unit/HelloWorld.spec.js
@@ -1,3 +1,5 @@
+// 暂时没有单元测试代码 此文件为自动生成
+
 import { shallowMount } from '@vue/test-utils'
 import HelloWorld from '@/components/HelloWorld.vue'
 
diff --git a/vue.config.js b/vue.config.js
index 9a2b262d..97081e1c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -47,5 +47,9 @@ module.exports = {
       .exclude
       .add(resolve('src/assets/svg-icons/icons'))
       .end()
+    // 重新设置 alias
+    config.resolve
+      .alias
+      .set('@', resolve('src'))
   }
 }