From de61b0f2e235e0ec0c8165392e38dd06a0896a96 Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Tue, 1 Dec 2020 20:43:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=AB=98=E9=98=B6=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E5=BC=8F=E7=BB=84=E4=BB=B6=E7=9A=84slot=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复了根据后台数据构建路有菜单时因引用传递导致的一些问题

修复用户导航的一些问题

增加了一些示例页面

部分文件位置调整

代码优化
---
 .../component/Message/main.vue                | 17 ++--
 vue/src/asset/style/element-ui.scss           |  2 +-
 vue/src/asset/style/index.scss                |  2 +-
 .../{form => }/CollapseCard/index.vue         |  8 +-
 vue/src/component/OrgTree/index.vue           |  4 +-
 .../OrgTree/{OrgTreeNode.vue => node.vue}     |  0
 .../OrgTree/{tree.scss => style.scss}         |  0
 .../RegionSelector/Tree/TreeDialog.vue        |  2 -
 vue/src/component/abstract/Dialog/index.vue   |  9 +-
 vue/src/component/abstract/Table/index.vue    | 16 ++--
 vue/src/component/form/Anchor/index.vue       | 34 +++++--
 vue/src/component/form/Search/index.vue       |  7 +-
 vue/src/component/form/ValidateInfo/index.vue | 96 +++++--------------
 .../component/form/ValidateInfo/style.scss    | 50 ++++++++++
 vue/src/globalMethod/BottomTip/main.vue       |  2 +-
 vue/src/globalMethod/Guide/index.js           |  8 +-
 vue/src/globalMethod/Guide/main.vue           | 82 ++++++++--------
 vue/src/globalMethod/Guide/style.scss         | 31 +++---
 vue/src/globalMethod/Guide/utils.js           | 28 ------
 vue/src/globalMethod/Verify/index.js          |  4 +-
 .../component/Navbar/component/HeadMenu.vue   |  7 +-
 vue/src/layout/component/Navbar/index.vue     | 27 +++++-
 vue/src/mixin/docDetailMixin.js               |  6 +-
 vue/src/mixin/docTableMixin.js                |  2 +-
 vue/src/mixin/guide/base.js                   | 60 ------------
 vue/src/mixin/guide/data/navbar.js            | 23 -----
 vue/src/mixin/guide/index.js                  | 18 ----
 vue/src/router/define.js                      | 10 +-
 .../child/app.js => admin/child/default.js}   |  6 +-
 .../{defaultRoot => admin}/child/message.js   |  4 +-
 .../{defaultRoot => admin}/child/purchase.js  | 12 +--
 .../{defaultRoot => admin}/child/sell.js      | 12 +--
 .../{defaultRoot => admin}/child/stock.js     |  2 +-
 .../{defaultRoot => admin}/child/system.js    | 14 +--
 .../module/{defaultRoot => admin}/index.js    |  2 +-
 .../{devRoot => dev}/child/uploadFileDev.js   |  0
 .../router/module/{devRoot => dev}/index.js   |  0
 .../router/module/{docRoot => doc}/index.js   |  0
 .../child/component.js}                       | 18 +---
 .../{exampleRoot => example}/child/cool.js    |  0
 .../router/module/example/child/directive.js  | 16 ++++
 .../module/example/child/globalMethod.js      | 36 +++++++
 .../{exampleRoot => example}/child/icon.js    |  0
 .../{exampleRoot => example}/child/iframe.js  |  0
 .../{exampleRoot => example}/child/test.js    |  0
 .../module/{exampleRoot => example}/index.js  |  2 +-
 vue/src/router/module/index.js                | 10 +-
 vue/src/router/util.js                        |  4 +-
 vue/src/store/module/resource.js              |  5 +-
 vue/src/util/browser.js                       |  4 +-
 vue/src/util/tree.js                          | 31 ++++--
 vue/src/view/{app => _app}/403.vue            |  2 +-
 vue/src/view/{app => _app}/404.vue            |  2 +-
 vue/src/view/{app => _app}/500.vue            |  2 +-
 .../view/{app => _app}/login/LoginForm.vue    |  0
 .../view/{app => _app}/login/RegisterForm.vue |  0
 .../view/{app => _app}/login/SetAnimation.vue |  0
 vue/src/view/{app => _app}/login/index.vue    |  0
 vue/src/view/{app => _app}/login/style.scss   |  4 +-
 vue/src/view/{app => _app}/redirect.vue       |  0
 .../common => _common}/DetailPage/index.vue   |  0
 .../common => _common}/DetailPage/style.scss  |  2 +-
 .../ExceptionPage/index.vue                   |  0
 .../ExceptionPage/style.scss                  |  0
 .../ListPage/autoAdaptHeightMixin.js          |  2 +-
 .../common => _common}/ListPage/index.vue     |  0
 .../common => _common}/SkeletonPage/index.vue |  0
 .../SkeletonPage/style.scss                   |  0
 .../index/component/DailyFinishOrderStat.vue  |  0
 .../index/component/DailyProfitStat.vue       |  0
 .../component/PanelGroup/PanelGroupItem.vue   |  2 +-
 .../index/component/PanelGroup/index.vue      |  0
 .../index/component/TotalProfitGoods.vue      |  0
 vue/src/view/{ => admin}/index/indexPage.vue  |  0
 .../{ => admin}/message/manage/EditDialog.vue |  0
 .../{ => admin}/message/manage/indexPage.vue  |  2 +-
 .../{ => admin}/message/user/AutoHidden.vue   |  0
 .../message/user/MessageStream.vue            |  0
 .../{ => admin}/message/user/indexPage.vue    |  0
 .../inbound/component/OrderSelector.vue       |  0
 .../purchase/inbound/detailPage.vue           | 24 ++---
 .../purchase/inbound/indexPage.vue            |  0
 .../order/component/CategorySelector.vue      |  0
 .../order/component/SupplierSelector.vue      |  0
 .../{ => admin}/purchase/order/detailPage.vue | 24 ++---
 .../{ => admin}/purchase/order/indexPage.vue  |  0
 .../sell/order/component/CustomerSelector.vue |  0
 .../sell/order/component/StockSelector.vue    |  0
 .../{ => admin}/sell/order/detailPage.vue     | 24 ++---
 .../view/{ => admin}/sell/order/indexPage.vue |  0
 .../sell/outbound/component/OrderSelector.vue |  0
 .../sell/outbound/component/StockSelector.vue |  0
 .../{ => admin}/sell/outbound/detailPage.vue  | 24 ++---
 .../{ => admin}/sell/outbound/indexPage.vue   |  0
 .../stock/current/DetailDialog.vue            |  0
 .../{ => admin}/stock/current/indexPage.vue   |  0
 .../system/category/component/Form.vue        |  0
 .../system/category/component/List.vue        |  0
 .../{ => admin}/system/category/indexPage.vue |  0
 .../system/customer/EditDialog.vue            |  0
 .../{ => admin}/system/customer/indexPage.vue |  2 +-
 .../department/component/EditDialog.vue       |  0
 .../department/component/OrgTreeView.vue      |  0
 .../department/component/ZoomControl.vue      |  0
 .../system/department/indexPage.vue           |  0
 .../view/{ => admin}/system/menu/common.js    |  0
 .../{ => admin}/system/menu/indexPage.vue     |  4 +-
 .../{ => admin}/system/role/EditDialog.vue    |  2 +-
 .../{ => admin}/system/role/indexPage.vue     |  2 +-
 .../system/supplier/EditDialog.vue            |  0
 .../{ => admin}/system/supplier/indexPage.vue |  2 +-
 .../user/component/DepartmentSelector.vue     |  0
 .../system/user/component/EditDialog.vue      |  0
 .../system/user/component/RoleSelector.vue    |  0
 .../{ => admin}/system/user/indexPage.vue     |  2 +-
 .../userCenter/component/Account.vue          |  0
 .../userCenter/component/Avatar.vue           |  0
 .../userCenter/component/LoginHistory.vue     |  0
 .../userCenter/component/UserAction.vue       |  0
 .../userCenter/component/UserCard.vue         |  0
 .../view/{ => admin}/userCenter/indexPage.vue |  0
 vue/src/view/example/component/ripplePage.vue | 11 ---
 .../view/example/directive/dragDialogPage.vue | 25 +++++
 vue/src/view/example/directive/ripplePage.vue | 57 +++++++++++
 .../example/globalMethod/bottomTipPage.vue    | 18 ++++
 .../view/example/globalMethod/guidePage.vue   | 64 +++++++++++++
 .../example/globalMethod/imageViewerPage.vue  | 33 +++++++
 .../view/example/globalMethod/messagePage.vue | 26 +++++
 .../signaturePage.vue                         |  4 +-
 .../view/example/globalMethod/verifyPage.vue  | 25 +++++
 130 files changed, 665 insertions(+), 459 deletions(-)
 rename vue/src/component/{form => }/CollapseCard/index.vue (84%)
 rename vue/src/component/OrgTree/{OrgTreeNode.vue => node.vue} (100%)
 rename vue/src/component/OrgTree/{tree.scss => style.scss} (100%)
 create mode 100644 vue/src/component/form/ValidateInfo/style.scss
 delete mode 100644 vue/src/mixin/guide/base.js
 delete mode 100644 vue/src/mixin/guide/data/navbar.js
 delete mode 100644 vue/src/mixin/guide/index.js
 rename vue/src/router/module/{defaultRoot/child/app.js => admin/child/default.js} (79%)
 rename vue/src/router/module/{defaultRoot => admin}/child/message.js (83%)
 rename vue/src/router/module/{defaultRoot => admin}/child/purchase.js (85%)
 rename vue/src/router/module/{defaultRoot => admin}/child/sell.js (85%)
 rename vue/src/router/module/{defaultRoot => admin}/child/stock.js (86%)
 rename vue/src/router/module/{defaultRoot => admin}/child/system.js (76%)
 rename vue/src/router/module/{defaultRoot => admin}/index.js (89%)
 rename vue/src/router/module/{devRoot => dev}/child/uploadFileDev.js (100%)
 rename vue/src/router/module/{devRoot => dev}/index.js (100%)
 rename vue/src/router/module/{docRoot => doc}/index.js (100%)
 rename vue/src/router/module/{exampleRoot/child/components.js => example/child/component.js} (56%)
 rename vue/src/router/module/{exampleRoot => example}/child/cool.js (100%)
 create mode 100644 vue/src/router/module/example/child/directive.js
 create mode 100644 vue/src/router/module/example/child/globalMethod.js
 rename vue/src/router/module/{exampleRoot => example}/child/icon.js (100%)
 rename vue/src/router/module/{exampleRoot => example}/child/iframe.js (100%)
 rename vue/src/router/module/{exampleRoot => example}/child/test.js (100%)
 rename vue/src/router/module/{exampleRoot => example}/index.js (91%)
 rename vue/src/view/{app => _app}/403.vue (73%)
 rename vue/src/view/{app => _app}/404.vue (73%)
 rename vue/src/view/{app => _app}/500.vue (73%)
 rename vue/src/view/{app => _app}/login/LoginForm.vue (100%)
 rename vue/src/view/{app => _app}/login/RegisterForm.vue (100%)
 rename vue/src/view/{app => _app}/login/SetAnimation.vue (100%)
 rename vue/src/view/{app => _app}/login/index.vue (100%)
 rename vue/src/view/{app => _app}/login/style.scss (98%)
 rename vue/src/view/{app => _app}/redirect.vue (100%)
 rename vue/src/view/{app/common => _common}/DetailPage/index.vue (100%)
 rename vue/src/view/{app/common => _common}/DetailPage/style.scss (98%)
 rename vue/src/view/{app/common => _common}/ExceptionPage/index.vue (100%)
 rename vue/src/view/{app/common => _common}/ExceptionPage/style.scss (100%)
 rename vue/src/view/{app/common => _common}/ListPage/autoAdaptHeightMixin.js (95%)
 rename vue/src/view/{app/common => _common}/ListPage/index.vue (100%)
 rename vue/src/view/{app/common => _common}/SkeletonPage/index.vue (100%)
 rename vue/src/view/{app/common => _common}/SkeletonPage/style.scss (100%)
 rename vue/src/view/{ => admin}/index/component/DailyFinishOrderStat.vue (100%)
 rename vue/src/view/{ => admin}/index/component/DailyProfitStat.vue (100%)
 rename vue/src/view/{ => admin}/index/component/PanelGroup/PanelGroupItem.vue (98%)
 rename vue/src/view/{ => admin}/index/component/PanelGroup/index.vue (100%)
 rename vue/src/view/{ => admin}/index/component/TotalProfitGoods.vue (100%)
 rename vue/src/view/{ => admin}/index/indexPage.vue (100%)
 rename vue/src/view/{ => admin}/message/manage/EditDialog.vue (100%)
 rename vue/src/view/{ => admin}/message/manage/indexPage.vue (99%)
 rename vue/src/view/{ => admin}/message/user/AutoHidden.vue (100%)
 rename vue/src/view/{ => admin}/message/user/MessageStream.vue (100%)
 rename vue/src/view/{ => admin}/message/user/indexPage.vue (100%)
 rename vue/src/view/{ => admin}/purchase/inbound/component/OrderSelector.vue (100%)
 rename vue/src/view/{ => admin}/purchase/inbound/detailPage.vue (91%)
 rename vue/src/view/{ => admin}/purchase/inbound/indexPage.vue (100%)
 rename vue/src/view/{ => admin}/purchase/order/component/CategorySelector.vue (100%)
 rename vue/src/view/{ => admin}/purchase/order/component/SupplierSelector.vue (100%)
 rename vue/src/view/{ => admin}/purchase/order/detailPage.vue (93%)
 rename vue/src/view/{ => admin}/purchase/order/indexPage.vue (100%)
 rename vue/src/view/{ => admin}/sell/order/component/CustomerSelector.vue (100%)
 rename vue/src/view/{ => admin}/sell/order/component/StockSelector.vue (100%)
 rename vue/src/view/{ => admin}/sell/order/detailPage.vue (92%)
 rename vue/src/view/{ => admin}/sell/order/indexPage.vue (100%)
 rename vue/src/view/{ => admin}/sell/outbound/component/OrderSelector.vue (100%)
 rename vue/src/view/{ => admin}/sell/outbound/component/StockSelector.vue (100%)
 rename vue/src/view/{ => admin}/sell/outbound/detailPage.vue (94%)
 rename vue/src/view/{ => admin}/sell/outbound/indexPage.vue (100%)
 rename vue/src/view/{ => admin}/stock/current/DetailDialog.vue (100%)
 rename vue/src/view/{ => admin}/stock/current/indexPage.vue (100%)
 rename vue/src/view/{ => admin}/system/category/component/Form.vue (100%)
 rename vue/src/view/{ => admin}/system/category/component/List.vue (100%)
 rename vue/src/view/{ => admin}/system/category/indexPage.vue (100%)
 rename vue/src/view/{ => admin}/system/customer/EditDialog.vue (100%)
 rename vue/src/view/{ => admin}/system/customer/indexPage.vue (99%)
 rename vue/src/view/{ => admin}/system/department/component/EditDialog.vue (100%)
 rename vue/src/view/{ => admin}/system/department/component/OrgTreeView.vue (100%)
 rename vue/src/view/{ => admin}/system/department/component/ZoomControl.vue (100%)
 rename vue/src/view/{ => admin}/system/department/indexPage.vue (100%)
 rename vue/src/view/{ => admin}/system/menu/common.js (100%)
 rename vue/src/view/{ => admin}/system/menu/indexPage.vue (98%)
 rename vue/src/view/{ => admin}/system/role/EditDialog.vue (98%)
 rename vue/src/view/{ => admin}/system/role/indexPage.vue (99%)
 rename vue/src/view/{ => admin}/system/supplier/EditDialog.vue (100%)
 rename vue/src/view/{ => admin}/system/supplier/indexPage.vue (99%)
 rename vue/src/view/{ => admin}/system/user/component/DepartmentSelector.vue (100%)
 rename vue/src/view/{ => admin}/system/user/component/EditDialog.vue (100%)
 rename vue/src/view/{ => admin}/system/user/component/RoleSelector.vue (100%)
 rename vue/src/view/{ => admin}/system/user/indexPage.vue (99%)
 rename vue/src/view/{ => admin}/userCenter/component/Account.vue (100%)
 rename vue/src/view/{ => admin}/userCenter/component/Avatar.vue (100%)
 rename vue/src/view/{ => admin}/userCenter/component/LoginHistory.vue (100%)
 rename vue/src/view/{ => admin}/userCenter/component/UserAction.vue (100%)
 rename vue/src/view/{ => admin}/userCenter/component/UserCard.vue (100%)
 rename vue/src/view/{ => admin}/userCenter/indexPage.vue (100%)
 delete mode 100644 vue/src/view/example/component/ripplePage.vue
 create mode 100644 vue/src/view/example/directive/dragDialogPage.vue
 create mode 100644 vue/src/view/example/directive/ripplePage.vue
 create mode 100644 vue/src/view/example/globalMethod/bottomTipPage.vue
 create mode 100644 vue/src/view/example/globalMethod/guidePage.vue
 create mode 100644 vue/src/view/example/globalMethod/imageViewerPage.vue
 create mode 100644 vue/src/view/example/globalMethod/messagePage.vue
 rename vue/src/view/example/{component => globalMethod}/signaturePage.vue (95%)
 create mode 100644 vue/src/view/example/globalMethod/verifyPage.vue

diff --git a/vue/element-ui-personal/component/Message/main.vue b/vue/element-ui-personal/component/Message/main.vue
index 63298ab..305fe91 100644
--- a/vue/element-ui-personal/component/Message/main.vue
+++ b/vue/element-ui-personal/component/Message/main.vue
@@ -1,11 +1,12 @@
 <template>
     <transition name="el-message-fade" @after-leave="handleAfterLeave">
-        <div v-show="visible"
-             :class="messageClass"
-             :style="positionStyle"
-             role="alert"
-             @mouseenter="clearTimer"
-             @mouseleave="startTimer"
+        <div
+            v-show="visible"
+            :class="messageClass"
+            :style="positionStyle"
+            role="alert"
+            @mouseenter="clearTimer"
+            @mouseleave="startTimer"
         >
             <i v-if="iconClass" :class="iconClass"/>
             <i v-else :class="typeClass"/>
@@ -44,6 +45,7 @@ export default {
             center: false
         }
     },
+
     computed: {
         messageClass() {
             return [
@@ -70,11 +72,13 @@ export default {
             return `animation-duration: ${this.duration}ms;animation-play-state:running`
         }
     },
+
     watch: {
         closed(newVal) {
             if (newVal) this.visible = false
         }
     },
+
     methods: {
         handleAfterLeave() {
             this.$destroy(true)
@@ -98,6 +102,7 @@ export default {
             }
         }
     },
+
     mounted() {
         this.startTimer()
     }
diff --git a/vue/src/asset/style/element-ui.scss b/vue/src/asset/style/element-ui.scss
index 54aa635..8e09820 100644
--- a/vue/src/asset/style/element-ui.scss
+++ b/vue/src/asset/style/element-ui.scss
@@ -89,7 +89,7 @@
 }
 
 .el-loading-mask {
-    background: #fff;
+    background: #ffffff;
     color: $--color-primary;
 }
 
diff --git a/vue/src/asset/style/index.scss b/vue/src/asset/style/index.scss
index 795875b..647415f 100644
--- a/vue/src/asset/style/index.scss
+++ b/vue/src/asset/style/index.scss
@@ -165,7 +165,7 @@ $page-header-offsetHeight: $page-header-line-height + #{$page-view-margin * 2};
     a {
         color: #337ab7;
         cursor: pointer;
-        text-decoration: none;
+        text-decoration: underline;
     }
 }
 
diff --git a/vue/src/component/form/CollapseCard/index.vue b/vue/src/component/CollapseCard/index.vue
similarity index 84%
rename from vue/src/component/form/CollapseCard/index.vue
rename to vue/src/component/CollapseCard/index.vue
index c666b85..2006dae 100644
--- a/vue/src/component/form/CollapseCard/index.vue
+++ b/vue/src/component/CollapseCard/index.vue
@@ -2,7 +2,7 @@
     <el-card :class="{collapsed}">
         <div slot="header" class="clearfix">
             <slot name="header">{{ header }}</slot>
-            <i class="el-icon-arrow-up form-collapse-card-icon"/>
+            <i class="el-icon-arrow-up collapse-card-icon"/>
         </div>
         <slot/>
     </el-card>
@@ -10,7 +10,7 @@
 
 <script>
 export default {
-    name: "FormCollapseCard",
+    name: "CollapseCard",
 
     props: {
         header: String
@@ -35,14 +35,14 @@ export default {
 </script>
 
 <style>
-.form-collapse-card-icon {
+.collapse-card-icon {
     float: right;
     font-weight: bold;
     transition: transform .3s;
     cursor: pointer;
 }
 
-.collapsed .form-collapse-card-icon {
+.collapsed .collapse-card-icon {
     transform: rotate(180deg);
 }
 
diff --git a/vue/src/component/OrgTree/index.vue b/vue/src/component/OrgTree/index.vue
index e765dfc..4264f7c 100644
--- a/vue/src/component/OrgTree/index.vue
+++ b/vue/src/component/OrgTree/index.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import OrgTreeNode from "./OrgTreeNode"
+import OrgTreeNode from "./node"
 
 export default {
     name: 'OrgTree',
@@ -136,4 +136,4 @@ export default {
 }
 </script>
 
-<style lang="scss" src="./tree.scss"></style>
+<style lang="scss" src="./style.scss"></style>
diff --git a/vue/src/component/OrgTree/OrgTreeNode.vue b/vue/src/component/OrgTree/node.vue
similarity index 100%
rename from vue/src/component/OrgTree/OrgTreeNode.vue
rename to vue/src/component/OrgTree/node.vue
diff --git a/vue/src/component/OrgTree/tree.scss b/vue/src/component/OrgTree/style.scss
similarity index 100%
rename from vue/src/component/OrgTree/tree.scss
rename to vue/src/component/OrgTree/style.scss
diff --git a/vue/src/component/RegionSelector/Tree/TreeDialog.vue b/vue/src/component/RegionSelector/Tree/TreeDialog.vue
index addaf7a..5c0542b 100644
--- a/vue/src/component/RegionSelector/Tree/TreeDialog.vue
+++ b/vue/src/component/RegionSelector/Tree/TreeDialog.vue
@@ -58,11 +58,9 @@ export default {
         return (
             <abstract-dialog
                 v-model={this.visible}
-                directives={[{name: 'drag-dialog'}]}
                 class="tree-dialog"
                 title="选择行政区域"
                 loading={this.loading}
-                appendToBody={true}
                 v-on:close={this.closeDialog}
             >
                 <el-tree
diff --git a/vue/src/component/abstract/Dialog/index.vue b/vue/src/component/abstract/Dialog/index.vue
index cdaa0df..e181b6a 100644
--- a/vue/src/component/abstract/Dialog/index.vue
+++ b/vue/src/component/abstract/Dialog/index.vue
@@ -9,13 +9,12 @@ export default {
 
     props: {
         value: Boolean,
-        title: String,
         loading: {type: Boolean, default: true},
         width: {type: String, default: '30%'}
     },
 
     render(h, context) {
-        const {data, children, listeners, props: {value, title, loading, width}} = context
+        const {data, children, listeners, props: {value, loading, width}} = context
 
         const onClose = function () {
             return listeners.close ? () => listeners.close(false) : () => ({})
@@ -26,13 +25,11 @@ export default {
                 v-drag-dialog
                 visible={value}
                 custom-class="abstract-dialog"
-                top={cssVariables['dialogTop']}
+                top={cssVariables.dialogTop}
                 width={width}
                 on-close={onClose}
                 {...data}
             >
-                <slot slot="title" name="title">{title}</slot>
-
                 <div class="abstract-dialog-container">
                     <LoadingMask show={loading}/>
                     <el-scrollbar>
@@ -42,8 +39,6 @@ export default {
                         <div style="margin-bottom: 17px"/>
                     </el-scrollbar>
                 </div>
-
-                <slot slot="footer" name="footer"/>
             </el-dialog>
         )
     }
diff --git a/vue/src/component/abstract/Table/index.vue b/vue/src/component/abstract/Table/index.vue
index bca1fa9..744cd4c 100644
--- a/vue/src/component/abstract/Table/index.vue
+++ b/vue/src/component/abstract/Table/index.vue
@@ -7,10 +7,13 @@ export default {
     functional: true,
 
     render(h, context) {
-        const {data, children, scopedSlots} = context
+        const {data, children} = context
 
-        if (!scopedSlots.empty) {
-            scopedSlots.empty = () => <Empty/>
+        if (!data.scopedSlots) {
+            data.scopedSlots = {}
+        }
+        if (!data.scopedSlots.empty) {
+            data.scopedSlots.empty = () => <Empty/>
         }
 
         return (
@@ -22,13 +25,6 @@ export default {
                 {...data}
             >
                 {children}
-                {
-                    Object
-                        .entries(scopedSlots)
-                        .map(([name, slot]) => (
-                            name !== 'default' && <slot slot={name}>{slot()}</slot>
-                        ))
-                }
             </el-table>
         )
     }
diff --git a/vue/src/component/form/Anchor/index.vue b/vue/src/component/form/Anchor/index.vue
index 93ebf8b..7047f43 100644
--- a/vue/src/component/form/Anchor/index.vue
+++ b/vue/src/component/form/Anchor/index.vue
@@ -21,9 +21,17 @@ export default {
 
     props: {
         reference: Function,
+
+        //锚点链接数组，{ref：链接对应的ref，使用reference()[ref]取得对应的dom, label：链接名称}
         data: {type: Array, default: () => []},
+
+        //距离窗口顶部达到指定偏移量后触发，单位px
         offsetTop: {type: Number, default: 15},
+
+        //锚点区域边界，单位px
         bounds: {type: Number, default: 0},
+
+        //指定滚动的容器
         getContainer: {
             type: Function,
             default: () => document.querySelector('#app .page-main>.scroll-container')
@@ -33,33 +41,44 @@ export default {
     data: () => ({cur: null}),
 
     methods: {
+        //彻底销毁本组件
         close() {
             this.$el.remove()
             this.$destroy()
         },
 
+        //获取当前激活的锚点链接的ref值
         getCur(offsetTop, bounds) {
             const sections = []
             const container = this.getContainer()
             for (const {ref} of this.data) {
                 const target = this.getDomFromRef(ref)
                 if (!target) continue
+
                 const top = getTopDistance(target, container)
                 if (top <= offsetTop + bounds) {
                     sections.push({ref, top})
                 }
             }
+
+            //可能有多个满足条件的dom，取距滚动容器最远的那个
             if (sections.length) {
                 const max = sections.reduce((prev, curr) => (curr.top > prev.top ? curr : prev))
                 return max.ref
             }
+
             return null
         },
 
         getDomFromRef(ref) {
             const refs = this.reference()
+
             if (!refs) return null
-            return refs[ref]['$el'] || refs[ref][0]['$el']
+
+            const target = Array.isArray(refs[ref]) ? refs[ref][0] : refs[ref]
+
+            //可能是vue组件实例，也可能是dom
+            return target.$el || target
         },
 
         click(ref) {
@@ -88,14 +107,15 @@ export default {
     },
 
     mounted() {
+        this.scroll = debounce(this.scroll)
+
         this.scroll()
 
         const container = this.getContainer()
-        this.handleScroll = debounce(this.scroll)
 
-        container.addEventListener('scroll', this.handleScroll)
+        container.addEventListener('scroll', this.scroll)
         this.$once('hook:beforeDestroy', () => {
-            container.removeEventListener('scroll', this.handleScroll)
+            container.removeEventListener('scroll', this.scroll)
         })
     }
 }
@@ -110,7 +130,7 @@ export default {
     top: 200px;
     min-width: 72px;
     border-radius: 4px 0 0 4px;
-    background: #fff;
+    background: #ffffff;
     box-shadow: 0 2px 12px 0 rgba(166, 167, 173, 0.5);
     z-index: 100;
 
@@ -119,7 +139,7 @@ export default {
         height: 28px;
         line-height: 28px;
         text-align: center;
-        color: #7C7E85;
+        color: #909399;
         padding: 0 10px;
         font-size: 12px;
         cursor: pointer;
@@ -130,7 +150,7 @@ export default {
         }
 
         &:not(:last-child) {
-            box-shadow: 0 1px 0 0 rgba(166, 167, 173, 0.1);
+            border-bottom: 1px solid rgba(166, 167, 173, 0.1);
         }
     }
 }
diff --git a/vue/src/component/form/Search/index.vue b/vue/src/component/form/Search/index.vue
index 67acd5c..7d7eee2 100644
--- a/vue/src/component/form/Search/index.vue
+++ b/vue/src/component/form/Search/index.vue
@@ -34,11 +34,9 @@ export default {
         handleCollapse() {
             this.collapse = !this.collapse
         },
-
         handleSearch() {
             this.$emit('search')
         },
-
         handleReset() {
             if (!this.initialModel || !this.model) {
                 return
@@ -51,8 +49,8 @@ export default {
             const vw = getElementInnerWidth(this.$el.parentNode)
 
             if (vw < 768) return this.xs
-            else if (vw < 998) return this.sm
-            else if (vw < 1200) return this.md
+            if (vw < 998) return this.sm
+            if (vw < 1200) return this.md
             return this.lg
         },
 
@@ -63,6 +61,7 @@ export default {
 
             //考虑后面的按钮组的占位
             this.num = num === 1 ? num : num - 1
+
             this.showCollapse = this.num < this.$slots.default.length
         },
 
diff --git a/vue/src/component/form/ValidateInfo/index.vue b/vue/src/component/form/ValidateInfo/index.vue
index 78fae81..d0c37b3 100644
--- a/vue/src/component/form/ValidateInfo/index.vue
+++ b/vue/src/component/form/ValidateInfo/index.vue
@@ -38,6 +38,25 @@ export default {
     },
 
     methods: {
+        //滚动到验证不通过的表单项
+        onClick({prop}) {
+            const formItem = this.getFormItem(prop)
+            formItem && formItem.$el.scrollIntoView({block: 'center'})
+            this.$refs.popover.doClose()
+        },
+
+        //获取el-form实例
+        getForm() {
+            return typeof this.form === 'function' ? this.form() : this.form
+        },
+
+        //根据prop获取el-form-item实例
+        getFormItem(prop) {
+            const form = this.getForm()
+            return form && form.fields.find(i => i.prop === prop)
+        },
+
+        //el-form触发validate事件时调用
         onValidate(prop, success, msg) {
             const alreadyIndex = this.error.findIndex(i => i.prop === prop)
             if (alreadyIndex !== -1) {
@@ -46,31 +65,16 @@ export default {
             }
             else {
                 if (success) return
-                const formItem = this.findFormItem(prop)
+                const formItem = this.getFormItem(prop)
                 this.error.push({prop, msg, label: formItem.label})
             }
-        },
-
-        onClick({prop}) {
-            const formItem = this.findFormItem(prop)
-            formItem && formItem.$el.scrollIntoView({block: 'center'})
-            this.$refs.popover.doClose()
-        },
-
-        getFormRef() {
-            return typeof this.form === 'function' ? this.form() : this.form
-        },
-
-        findFormItem(prop) {
-            const form = this.getFormRef()
-            if (!form) return
-            return form.fields.find(i => i.prop === prop)
         }
     },
 
     mounted() {
-        const form = this.getFormRef()
+        const form = this.getForm()
         if (!form) return
+
         form.$on('validate', this.onValidate)
         this.$once('hook:beforeDestroy', () => {
             form.$off('validate', this.onValidate)
@@ -79,58 +83,4 @@ export default {
 }
 </script>
 
-<style lang="scss">
-@import "~@/asset/style/variables.scss";
-
-.form-validate-info {
-    &.el-popper {
-        padding: 0;
-    }
-
-    &-ref {
-        padding: 0 10px;
-        cursor: pointer;
-    }
-
-    &-title {
-        text-align: center;
-        padding: 5px 16px 4px;
-        border-bottom: 1px solid #f0f0f0;
-    }
-
-    &-content {
-        max-height: 300px;
-        overflow: overlay;
-    }
-
-    &-item {
-        padding: 8px 16px;
-        background-color: #ffffff;
-        border-bottom: 1px solid #f0f0f0;
-        cursor: pointer;
-        transition: background-color .3s;
-
-        &:hover {
-            background-color: #e6f7ff;
-        }
-
-        .el-icon-circle-close {
-            float: left;
-            margin-top: 4px;
-            margin-right: 12px;
-            padding-bottom: 22px;
-        }
-
-        &-label {
-            margin-top: 2px;
-            color: rgba(0, 0, 0, .45);
-            font-size: 12px;
-        }
-    }
-
-    &-ref,
-    &-item .el-icon-circle-close {
-        color: $--color-danger;
-    }
-}
-</style>
+<style lang="scss" src="./style.scss"></style>
diff --git a/vue/src/component/form/ValidateInfo/style.scss b/vue/src/component/form/ValidateInfo/style.scss
new file mode 100644
index 0000000..555d1ff
--- /dev/null
+++ b/vue/src/component/form/ValidateInfo/style.scss
@@ -0,0 +1,50 @@
+@import "~@/asset/style/variables.scss";
+
+.form-validate-info {
+    &.el-popper {
+        padding: 0;
+    }
+
+    &-ref {
+        padding: 0 10px;
+        cursor: pointer;
+    }
+
+    &-ref,
+    &-item .el-icon-circle-close {
+        color: $--color-danger;
+    }
+
+    &-title {
+        text-align: center;
+        padding: 5px 16px 4px;
+    }
+
+    &-content {
+        max-height: 300px;
+        overflow: auto;
+    }
+
+    &-item {
+        padding: 8px 16px;
+        border-top: 1px solid $border-color-light;
+        cursor: pointer;
+
+        &:hover {
+            background-color: rgba($--color-primary, .1);
+        }
+
+        .el-icon-circle-close {
+            float: left;
+            margin-top: 4px;
+            margin-right: 12px;
+            padding-bottom: 22px;
+        }
+
+        &-label {
+            margin-top: 2px;
+            color: #909399;
+            font-size: 12px;
+        }
+    }
+}
diff --git a/vue/src/globalMethod/BottomTip/main.vue b/vue/src/globalMethod/BottomTip/main.vue
index 9860946..c7c07d1 100644
--- a/vue/src/globalMethod/BottomTip/main.vue
+++ b/vue/src/globalMethod/BottomTip/main.vue
@@ -30,7 +30,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .bottom-tip {
     position: absolute;
     width: 100%;
diff --git a/vue/src/globalMethod/Guide/index.js b/vue/src/globalMethod/Guide/index.js
index f15bfe8..10db097 100644
--- a/vue/src/globalMethod/Guide/index.js
+++ b/vue/src/globalMethod/Guide/index.js
@@ -14,7 +14,7 @@ const defaultOptions = {
     prevBtnText: '上一步',
 }
 
-const guide = function (start, steps, beforeExit) {
+const guide = function (steps, index, beforeExit) {
     if (instance) instance.exit()
     else {
         instance = new GuideConstructor({data: {options: defaultOptions}})
@@ -25,15 +25,15 @@ const guide = function (start, steps, beforeExit) {
     instance.steps = steps
     instance.beforeExit = beforeExit
 
-    this.$nextTick(() => instance.start(start))
+    this.$nextTick(() => instance.start(index))
 }
 
 guide.config = function (config) {
     mergeObj(defaultOptions, config)
 }
 
-guide.exit = function () {
-    instance && instance.exit()
+guide.exit = function (force) {
+    instance && instance.exit(force)
 }
 
 export default guide
diff --git a/vue/src/globalMethod/Guide/main.vue b/vue/src/globalMethod/Guide/main.vue
index 25deb3b..2d261dc 100644
--- a/vue/src/globalMethod/Guide/main.vue
+++ b/vue/src/globalMethod/Guide/main.vue
@@ -1,25 +1,24 @@
 <template>
     <div>
-        <el-popover ref="popover" :value="showPopover" trigger="manual" width="300">
-            <div v-html="step.content" style="padding: 10px"/>
-
-            <div class="guide-popover-action">
-                <div class="action-close">
-                    <el-button v-if="hasDone" size="small" @click="exit">
-                        {{ step.doneBtnText }}
-                    </el-button>
-                    <el-button v-else size="small" @click="exit">
-                        {{ step.closeBtnText }}
-                    </el-button>
-                </div>
-
-                <div class="action-step">
-                    <el-button v-if="showPrevBtn" class="prev-btn" size="small" @click="previous">
-                        {{ step.prevBtnText }}
-                    </el-button>
-                    <el-button v-if="showNextBtn" class="next-btn" size="small" @click="next">
-                        {{ step.nextBtnText }}
-                    </el-button>
+        <el-popover ref="popover" :value="showPopover" trigger="manual">
+            <div class="guide-popover-container">
+                <div v-html="step.content"/>
+
+                <div class="guide-popover-action">
+                    <div class="action-close">
+                        <el-button size="mini" type="dashed" plain @click="exit">
+                            {{ hasDone ? step.doneBtnText : step.closeBtnText }}
+                        </el-button>
+                    </div>
+
+                    <div class="action-step">
+                        <el-button v-if="showPrevBtn" class="prev-btn" size="mini" plain @click="previous">
+                            {{ step.prevBtnText }}
+                        </el-button>
+                        <el-button v-if="showNextBtn" class="next-btn" size="mini" plain @click="next">
+                            {{ step.nextBtnText }}
+                        </el-button>
+                    </div>
                 </div>
             </div>
 
@@ -35,10 +34,9 @@
 <script>
 /**
  * 由driver.js改造而来
- * vue里交互型的导航不太行，太多东西做不到，换成引导手册吧
  */
 import {debounce, isEmpty, deepClone} from "@/util"
-import {addHighlightClasses, getCalculatedPosition, inMainPage, jump, removeHighlightClasses} from "./utils"
+import {addHighlightClasses, getCalculatedPosition, removeHighlightClasses} from "./utils"
 
 export default {
     name: "Guide",
@@ -73,9 +71,7 @@ export default {
             return this.currentStep === this.steps.length - 1
         },
         step() {
-            if (!this.isActive
-                || this.steps.length <= 0
-                || !this.steps[this.currentStep]) {
+            if (!this.isActive || this.steps.length <= 0 || !this.steps[this.currentStep]) {
                 return {}
             }
 
@@ -89,7 +85,7 @@ export default {
 
     watch: {
         isActive(v) {
-            v ? document.body.classList.add('overflow-hidden') : document.body.classList.remove('overflow-hidden')
+            document.body.classList[v ? 'add' : 'remove']('overflow-hidden')
         }
     },
 
@@ -115,11 +111,10 @@ export default {
             this.showOverlay = true
             this.showStage = true
         },
-
-        exit() {
+        exit(force) {
             if (!this.isActive) return
 
-            if (this.beforeExit) {
+            if (!force && this.beforeExit) {
                 const result = this.beforeExit(this.hasDone)
                 if (result && result.then) {
                     result.then(this.$_clear)
@@ -138,13 +133,12 @@ export default {
             if (this.step.onPrevious) {
                 const result = this.step.onPrevious()
                 if (result && result.then) {
-                    result.then(this.$_movePrevious)
+                    result.then(this.$_movePrevious, this.$_moveEnd)
                 }
-                else result !== false && this.$_movePrevious()
+                else result ? this.$_movePrevious() : this.$_moveEnd()
             }
             else this.$_movePrevious()
         },
-
         next() {
             if (!this.isActive || this.moving) return
             this.moving = true
@@ -152,9 +146,9 @@ export default {
             if (this.step.onNext) {
                 const result = this.step.onNext()
                 if (result && result.then) {
-                    result.then(this.$_moveNext)
+                    result.then(this.$_moveNext, this.$_moveEnd)
                 }
-                else result !== false && this.$_moveNext()
+                else result ? this.$_moveNext() : this.$_moveEnd()
             }
             else this.$_moveNext()
         },
@@ -170,13 +164,15 @@ export default {
             this.currentStep--
             this.$_highlight()
         },
-
         $_moveNext() {
             if (!this.isActive) return
             this.currentStep++
             this.$_highlight()
         },
-
+        $_moveEnd() {
+            this.$refs.popover.updatePopper()
+            this.moving = false
+        },
         $_clear() {
             if (!this.isActive) return
             this.isActive = false
@@ -185,11 +181,10 @@ export default {
             this.currentStep = 0
             this.steps = []
             this.beforeExit = null
-            if (this.highlightedElement) removeHighlightClasses(this.highlightedElement)
+            this.highlightedElement && removeHighlightClasses(this.highlightedElement)
             this.highlightedElement = null
             this.lastHighlightedElement = null
         },
-
         $_highlight() {
             if (isEmpty(this.step.element)) throw new Error(`step${this.currentStep}中element为空`)
 
@@ -199,23 +194,22 @@ export default {
 
             if (el === this.highlightedElement) return
 
-            if (this.highlightedElement) removeHighlightClasses(this.highlightedElement)
+            this.highlightedElement && removeHighlightClasses(this.highlightedElement)
 
             this.lastHighlightedElement = this.highlightedElement
             this.highlightedElement = el
 
-            if (inMainPage(el)) jump(el)
+            el.scrollIntoView({block: 'center'})
 
             this.$_setStageStyle(getCalculatedPosition(el))
 
             window.setTimeout(() => {
-                this.$refs.popover.updatePopper()
-                this.moving = false
+                this.$_moveEnd()
+                this.step.onHighlighted && this.step.onHighlighted()
             }, 300)
 
             addHighlightClasses(el)
         },
-
         $_setStageStyle({top, left, right, bottom}) {
             const width = right - left
             const height = bottom - top
@@ -224,7 +218,7 @@ export default {
                 `height:${height}px;` +
                 `top:${top}px;` +
                 `left:${left}px;` +
-                `backgroundColor:${this.step.stageBackground}`
+                `background-color:${this.step.stageBackground}`
         }
     },
 
diff --git a/vue/src/globalMethod/Guide/style.scss b/vue/src/globalMethod/Guide/style.scss
index 78e0d53..8d784b5 100644
--- a/vue/src/globalMethod/Guide/style.scss
+++ b/vue/src/globalMethod/Guide/style.scss
@@ -16,23 +16,28 @@
     will-change: unset !important;
 }
 
-.guide-popover-action {
-    position: relative;
-    height: 100%;
-    width: 100%;
+.guide-popover-container {
+    min-width: 300px;
 
-    .action-close {
-        display: inline-block;
-    }
+    .guide-popover-action {
+        position: relative;
+        height: 100%;
+        width: 100%;
+        margin-top: 20px;
 
-    .action-step {
-        display: inline-block;
-        right: 0;
-        position: absolute;
+        .action-close {
+            display: inline-block;
+        }
 
-        .prev-btn {
+        .action-step {
+            display: inline-block;
+            right: 0;
             position: absolute;
-            right: 90px;
+
+            .prev-btn {
+                position: absolute;
+                right: 90px;
+            }
         }
     }
 }
diff --git a/vue/src/globalMethod/Guide/utils.js b/vue/src/globalMethod/Guide/utils.js
index cce267d..4f86e81 100644
--- a/vue/src/globalMethod/Guide/utils.js
+++ b/vue/src/globalMethod/Guide/utils.js
@@ -31,26 +31,6 @@ export function getStyleProperty(element, propertyName, prefixVendor = false) {
     return propertyValue && propertyValue.toLowerCase ? propertyValue.toLowerCase() : propertyValue
 }
 
-export function inMainPage(element) {
-    const appView = document.querySelector('.page-main')
-    if (!appView) throw new Error('路由页面未加载')
-    return appView.contains(element)
-}
-
-export function jump(element) {
-    if (!element.scrollIntoView) {
-        scrollManually(element)
-        return
-    }
-
-    try {
-        element.scrollIntoView({behavior: 'instant', block: 'center'})
-    }
-    catch (e) {
-        scrollManually(element)
-    }
-}
-
 export function removeHighlightClasses(element) {
     element.classList.remove(CLASS_HIGHLIGHTED_ELEMENT)
     element.classList.remove(CLASS_POSITION_RELATIVE)
@@ -124,11 +104,3 @@ function fixStackingContext(element) {
         parentNode = parentNode.parentNode
     }
 }
-
-function scrollManually(element) {
-    const elementRect = element.getBoundingClientRect()
-    const absoluteElementTop = elementRect.top + window.pageYOffset
-    const middle = absoluteElementTop - (window.innerHeight / 2)
-
-    window.scrollTo(0, middle)
-}
diff --git a/vue/src/globalMethod/Verify/index.js b/vue/src/globalMethod/Verify/index.js
index 6902ffc..518ceff 100644
--- a/vue/src/globalMethod/Verify/index.js
+++ b/vue/src/globalMethod/Verify/index.js
@@ -4,7 +4,7 @@ import {isEmpty} from "@/util"
 
 let Constructor = Vue.extend(Main)
 
-const PuzzleVerify = function ({left, top} = {}) {
+export default function ({left, top} = {}) {
     const instance = new Constructor()
     const position = getPosition({height: instance.height + 130, width: instance.width + 20, left, top})
 
@@ -42,5 +42,3 @@ function getPosition({height, width, left, top} = {}) {
 function center(full, part) {
     return Math.round((full - part) / 2)
 }
-
-export default PuzzleVerify
diff --git a/vue/src/layout/component/Navbar/component/HeadMenu.vue b/vue/src/layout/component/Navbar/component/HeadMenu.vue
index b0a5baf..c3e9cb1 100644
--- a/vue/src/layout/component/Navbar/component/HeadMenu.vue
+++ b/vue/src/layout/component/Navbar/component/HeadMenu.vue
@@ -7,6 +7,7 @@ import {getters as appGetters, mutations as appMutations} from "@/layout/store/a
 import NavMenu from "@/component/menu/NavMenu"
 import NavMenuItem from "@/component/menu/NavMenu/item"
 import {getActiveMenuByRoute} from "@/layout/util"
+import {isDom} from "@/util/browser"
 
 export default {
     name: "HeadMenu",
@@ -130,9 +131,11 @@ export default {
         //获取初始菜单的总宽度，只在mounted时调用一次
         setChildrenWidth() {
             const ul = this.getMenuEl()
-            if (!ul) return
+            if (!isDom(ul)) return
+
             const menuItemNodes = ul.children
             if (!menuItemNodes || menuItemNodes.length === 0) return
+
             //'更多'菜单的宽度，由于不考虑自定义，所以直接写死
             this.overflowedIndicatorWidth = 50
             this.menuItemSizes = Array.from(menuItemNodes).map(i => i.getBoundingClientRect().width)
@@ -163,7 +166,7 @@ export default {
         },
         createResizeObserver() {
             //菜单未渲染时，移除之前的observer
-            if (!this.getMenuEl()) {
+            if (!isDom(this.getMenuEl())) {
                 if (this.resizeObserver) {
                     this.resizeObserver.disconnect()
                     this.resizeObserver = null
diff --git a/vue/src/layout/component/Navbar/index.vue b/vue/src/layout/component/Navbar/index.vue
index 5132ebd..0be9479 100644
--- a/vue/src/layout/component/Navbar/index.vue
+++ b/vue/src/layout/component/Navbar/index.vue
@@ -1,6 +1,5 @@
 <script type="jsx">
 import {mapState} from 'vuex'
-import guideMixin from '@/mixin/guide'
 import hamburgerMixin from '@/layout/mixin/hamburger'
 import Bell from "./component/Bell"
 import HeadMenu from "./component/HeadMenu"
@@ -14,10 +13,32 @@ import {refreshPage} from "@/util/route"
 export default {
     name: 'navbar',
 
-    mixins: [guideMixin.navbar, hamburgerMixin],
+    mixins: [hamburgerMixin],
 
     components: {Bell, HeadMenu, Logo},
 
+    data() {
+        return {
+            guideSteps: [
+                {
+                    element: '.setting-btn.navbar-item',
+                    content: '这是个性设置按钮，可以根据自己喜好进行一些设置',
+                },
+                {
+                    element: '.navbar .el-dropdown.navbar-item',
+                    content: '这是用户中心',
+                },
+                {
+                    element: '.tags-view-container',
+                    content: `<p>这是tab栏，可以右键tab页进行相关操作</p>
+                              <p>ctrl + ← → 可以进行tab页的左右切换</p>
+                              <p>当tab过多时通过鼠标滚轮来滚动</p>
+                              <p>双击可以关闭</p>`,
+                },
+            ]
+        }
+    },
+
     computed: {
         ...mapState('user', ['avatar', 'name', 'prepareLogout']),
 
@@ -51,7 +72,7 @@ export default {
                     this.$route.path !== path && this.$router.push(path)
                     break
                 case 'guide':
-                    this.$guide(0, this.guideSteps)
+                    this.$guide(this.guideSteps)
                     break
                 case 'logout':
                     if (!this.prepareLogout) {
diff --git a/vue/src/mixin/docDetailMixin.js b/vue/src/mixin/docDetailMixin.js
index de49bc8..d83deb1 100644
--- a/vue/src/mixin/docDetailMixin.js
+++ b/vue/src/mixin/docDetailMixin.js
@@ -2,10 +2,10 @@ import {commonMethods} from "@/mixin/docTableMixin"
 import AbstractForm from '@/component/abstract/Form'
 import AbstractFormItem from "@/component/abstract/Form/item"
 import AbstractTable from "@/component/abstract/Table"
-import DetailPage from "@/view/app/common/DetailPage"
+import CollapseCard from '@/component/CollapseCard'
+import DetailPage from "@/view/_common/DetailPage"
 import DocHistory from '@/component/biz/doc/DocHistory'
 import DocSteps from '@/component/biz/doc/DocSteps'
-import FormCollapseCard from '@/component/form/CollapseCard'
 import UploadFile from '@/component/UploadFile'
 import {isEmpty, mergeObj} from '@/util'
 import {auth} from "@/util/auth"
@@ -18,10 +18,10 @@ export default {
         AbstractForm,
         AbstractFormItem,
         AbstractTable,
+        CollapseCard,
         DetailPage,
         DocHistory,
         DocSteps,
-        FormCollapseCard,
         UploadFile
     },
 
diff --git a/vue/src/mixin/docTableMixin.js b/vue/src/mixin/docTableMixin.js
index be5d1b1..fc22a66 100644
--- a/vue/src/mixin/docTableMixin.js
+++ b/vue/src/mixin/docTableMixin.js
@@ -1,6 +1,6 @@
 import tableMixin from '@/mixin/tablePageMixin'
 import LinerProgress from '@/component/LinerProgress'
-import ListPage from '@/view/app/common/ListPage'
+import ListPage from '@/view/_common/ListPage'
 import {isEmpty} from "@/util"
 import {elConfirm, elError, elSuccess} from "@/util/message"
 import {auth} from "@/util/auth"
diff --git a/vue/src/mixin/guide/base.js b/vue/src/mixin/guide/base.js
deleted file mode 100644
index c9344cf..0000000
--- a/vue/src/mixin/guide/base.js
+++ /dev/null
@@ -1,60 +0,0 @@
-//删除所有url参数
-function delAllUrlParam() {
-    let paramStartIndex = location.href.indexOf('?')
-    if (paramStartIndex > -1) {
-        const href = location.href.substring(0, paramStartIndex)
-        history.replaceState(null, null, [...href].join(''))
-    }
-}
-
-//将引导步骤中函数的this绑定为组件实例
-function transformGuideSteps(instance, steps) {
-    steps.forEach(step => {
-        Object.keys(step).forEach(key => {
-            if (typeof step[key] === 'function') {
-                step[key] = step[key].bind(instance)
-            }
-        })
-    })
-}
-
-export default {
-    methods: {
-        $_prepareGuide(params) {
-            if (!['navbar', 'sidebar'].includes(this.$options.name)) return
-
-            if ('guide' in params) {
-                delAllUrlParam()
-                for (const key of ['navbar', 'sidebar']) {
-                    if (params[key] && this.$options.name === key) {
-                        return this.$guide(params.guide, this.guideSteps)
-                    }
-                }
-            }
-        }
-    },
-
-    computed: {
-        routeParams() {
-            return this.$route.params
-        }
-    },
-
-    watch: {
-        routeParams(v) {
-            this.$_prepareGuide(v)
-        }
-    },
-
-    created() {
-        transformGuideSteps(this, this.guideSteps)
-    },
-
-    activated() {
-        const params = this.$route.params
-        if (!params.navbar && !params.sidebar && 'guide' in params) {
-            delAllUrlParam()
-            this.$guide(params.guide, this.guideSteps)
-        }
-    }
-}
diff --git a/vue/src/mixin/guide/data/navbar.js b/vue/src/mixin/guide/data/navbar.js
deleted file mode 100644
index 29d6123..0000000
--- a/vue/src/mixin/guide/data/navbar.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-* 导航栏引导步骤
-* */
-
-const steps = [
-    {
-        element: '.setting-btn.navbar-item',
-        content: '这是个性设置按钮，可以根据自己喜好进行一些设置',
-    },
-    {
-        element: '.navbar .el-dropdown.navbar-item',
-        content: '这是用户中心',
-    },
-    {
-        element: '.tags-view-container',
-        content: `<p>这是tab栏，可以右键tab页进行相关操作</p>
-                  <p>ctrl + ← → 可以进行tab页的左右切换</p>
-                  <p>当tab过多时通过鼠标滚轮来滚动</p>
-                  <p>双击可以关闭</p>`,
-    },
-]
-
-export default steps
diff --git a/vue/src/mixin/guide/index.js b/vue/src/mixin/guide/index.js
deleted file mode 100644
index 12806b6..0000000
--- a/vue/src/mixin/guide/index.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const modulesFiles = require.context('./data', false, /\.js$/)
-import baseMixin from './base'
-
-const modules = modulesFiles.keys().reduce((modules, modulePath) => {
-    const moduleName = modulePath.replace(/^\.\/(.*)\.\w+$/, '$1')
-    const value = modulesFiles(modulePath)
-    modules[moduleName] = {
-        data() {
-            return {
-                guideSteps: value.default
-            }
-        },
-        ...baseMixin
-    }
-    return modules
-}, {})
-
-export default modules
diff --git a/vue/src/router/define.js b/vue/src/router/define.js
index b6ea3b8..eeec943 100644
--- a/vue/src/router/define.js
+++ b/vue/src/router/define.js
@@ -1,9 +1,9 @@
 import Layout from "@/layout/index"
-import Redirect from "@/view/app/redirect"
-import Login from "@/view/app/login/index"
-import Page403 from "@/view/app/403"
-import Page404 from "@/view/app/404"
-import Page500 from "@/view/app/500"
+import Redirect from "@/view/_app/redirect"
+import Login from "@/view/_app/login/index"
+import Page403 from "@/view/_app/403"
+import Page404 from "@/view/_app/404"
+import Page500 from "@/view/_app/500"
 import routes from './module'
 import {deepClone} from "@/util"
 
diff --git a/vue/src/router/module/defaultRoot/child/app.js b/vue/src/router/module/admin/child/default.js
similarity index 79%
rename from vue/src/router/module/defaultRoot/child/app.js
rename to vue/src/router/module/admin/child/default.js
index ff5820b..453b0fd 100644
--- a/vue/src/router/module/defaultRoot/child/app.js
+++ b/vue/src/router/module/admin/child/default.js
@@ -1,16 +1,16 @@
-//路由表：系统页面
+//路由表：默认页面
 
 const router = [
     {
         path: 'index',
-        component: 'index/',
+        component: 'admin/index/',
         name: 'index',
         meta: {title: '首页', affix: true, icon: 'svg-home', noAuth: true, pageHeader: false, sort: 0}
     },
     {
         path: 'user',
         name: 'userCenter',
-        component: 'userCenter/',
+        component: 'admin/userCenter/',
         meta: {title: '个人中心', noCache: true, icon: 'svg-user', noAuth: true, pageHeader: false, hidden: true},
     }
 ]
diff --git a/vue/src/router/module/defaultRoot/child/message.js b/vue/src/router/module/admin/child/message.js
similarity index 83%
rename from vue/src/router/module/defaultRoot/child/message.js
rename to vue/src/router/module/admin/child/message.js
index 3769b5c..a10332c 100644
--- a/vue/src/router/module/defaultRoot/child/message.js
+++ b/vue/src/router/module/admin/child/message.js
@@ -7,13 +7,13 @@ const router = {
         {
             path: 'manage',
             name: 'messageManagement',
-            component: 'message/manage/',
+            component: 'admin/message/manage/',
             meta: {title: '消息管理'}
         },
         {
             path: 'user',
             name: 'userMessage',
-            component: 'message/user/',
+            component: 'admin/message/user/',
             meta: {title: '个人消息', noAuth: true, noCache: true}
         }
     ]
diff --git a/vue/src/router/module/defaultRoot/child/purchase.js b/vue/src/router/module/admin/child/purchase.js
similarity index 85%
rename from vue/src/router/module/defaultRoot/child/purchase.js
rename to vue/src/router/module/admin/child/purchase.js
index 257e72c..c7e5926 100644
--- a/vue/src/router/module/defaultRoot/child/purchase.js
+++ b/vue/src/router/module/admin/child/purchase.js
@@ -7,12 +7,12 @@ const router = {
         {
             path: 'order',
             name: 'purchaseOrder',
-            component: 'purchase/order/',
+            component: 'admin/purchase/order/',
             meta: {title: '采购订单'}
         },
         {
             path: 'order/detail/:type(see|add|edit)/:id?',
-            component: 'purchase/order/detail',
+            component: 'admin/purchase/order/detail',
             meta: {
                 title: '采购订单详情页',
                 hidden: true,
@@ -30,18 +30,18 @@ const router = {
                 },
                 activeMenu: '/purchase/order',
                 usePathKey: true,
-                commonModule: '@/view/purchase/order/detail'
+                commonModule: '@/view/admin/purchase/order/detail'
             }
         },
         {
             path: 'inbound',
             name: 'purchaseInbound',
-            component: 'purchase/inbound/',
+            component: 'admin/purchase/inbound/',
             meta: {title: '采购入库'}
         },
         {
             path: 'inbound/detail/:type(see|add|edit)/:id?',
-            component: 'purchase/inbound/detail',
+            component: 'admin/purchase/inbound/detail',
             meta: {
                 title: '采购入库详情页',
                 hidden: true,
@@ -59,7 +59,7 @@ const router = {
                 },
                 activeMenu: '/purchase/inbound',
                 usePathKey: true,
-                commonModule: '@/view/purchase/inbound/detail'
+                commonModule: '@/view/admin/purchase/inbound/detail'
             }
         }
     ]
diff --git a/vue/src/router/module/defaultRoot/child/sell.js b/vue/src/router/module/admin/child/sell.js
similarity index 85%
rename from vue/src/router/module/defaultRoot/child/sell.js
rename to vue/src/router/module/admin/child/sell.js
index 6b9a28d..ee4a481 100644
--- a/vue/src/router/module/defaultRoot/child/sell.js
+++ b/vue/src/router/module/admin/child/sell.js
@@ -7,12 +7,12 @@ const router = {
         {
             path: 'order',
             name: 'sellOrder',
-            component: 'sell/order/',
+            component: 'admin/sell/order/',
             meta: {title: '销售订单'}
         },
         {
             path: 'order/detail/:type(see|add|edit)/:id?',
-            component: 'sell/order/detail',
+            component: 'admin/sell/order/detail',
             meta: {
                 title: '销售订单详情页',
                 hidden: true,
@@ -30,18 +30,18 @@ const router = {
                 },
                 activeMenu: '/sell/order',
                 usePathKey: true,
-                commonModule: '@/view/sell/order/detail'
+                commonModule: '@/view/admin/sell/order/detail'
             }
         },
         {
             path: 'outbound',
             name: 'sellOutbound',
-            component: 'sell/outbound/',
+            component: 'admin/sell/outbound/',
             meta: {title: '销售出库'}
         },
         {
             path: 'outbound/detail/:type(see|add|edit)/:id?',
-            component: 'sell/outbound/detail',
+            component: 'admin/sell/outbound/detail',
             meta: {
                 title: '销售出库详情页',
                 hidden: true,
@@ -59,7 +59,7 @@ const router = {
                 },
                 activeMenu: '/sell/outbound',
                 usePathKey: true,
-                commonModule: '@/view/sell/outbound/detail'
+                commonModule: '@/view/admin/sell/outbound/detail'
             }
         }
     ]
diff --git a/vue/src/router/module/defaultRoot/child/stock.js b/vue/src/router/module/admin/child/stock.js
similarity index 86%
rename from vue/src/router/module/defaultRoot/child/stock.js
rename to vue/src/router/module/admin/child/stock.js
index d33b8e3..75d68d7 100644
--- a/vue/src/router/module/defaultRoot/child/stock.js
+++ b/vue/src/router/module/admin/child/stock.js
@@ -7,7 +7,7 @@ const router = {
         {
             path: 'current',
             name: 'currentStock',
-            component: 'stock/current/',
+            component: 'admin/stock/current/',
             meta: {title: '当前库存'}
         }
     ]
diff --git a/vue/src/router/module/defaultRoot/child/system.js b/vue/src/router/module/admin/child/system.js
similarity index 76%
rename from vue/src/router/module/defaultRoot/child/system.js
rename to vue/src/router/module/admin/child/system.js
index 3b0effc..1cdf5be 100644
--- a/vue/src/router/module/defaultRoot/child/system.js
+++ b/vue/src/router/module/admin/child/system.js
@@ -7,43 +7,43 @@ const router = {
         {
             path: 'department',
             name: 'departmentManagement',
-            component: 'system/department/',
+            component: 'admin/system/department/',
             meta: {title: '部门管理'}
         },
         {
             path: 'menu',
             name: 'menuManagement',
-            component: 'system/menu/',
+            component: 'admin/system/menu/',
             meta: {title: '菜单管理', noCache: true}
         },
         {
             path: 'role',
             name: 'roleManagement',
-            component: 'system/role/',
+            component: 'admin/system/role/',
             meta: {title: '角色管理'}
         },
         {
             path: 'user',
             name: 'userManagement',
-            component: 'system/user/',
+            component: 'admin/system/user/',
             meta: {title: '用户管理'}
         },
         {
             path: 'category',
             name: 'categorySetting',
-            component: 'system/category/',
+            component: 'admin/system/category/',
             meta: {title: '商品分类'}
         },
         {
             path: 'customer',
             name: 'customerManagement',
-            component: 'system/customer/',
+            component: 'admin/system/customer/',
             meta: {title: '客户管理'}
         },
         {
             path: 'supplier',
             name: 'supplierManagement',
-            component: 'system/supplier/',
+            component: 'admin/system/supplier/',
             meta: {title: '供应商管理'}
         }
     ]
diff --git a/vue/src/router/module/defaultRoot/index.js b/vue/src/router/module/admin/index.js
similarity index 89%
rename from vue/src/router/module/defaultRoot/index.js
rename to vue/src/router/module/admin/index.js
index 98ef8bb..7384ebc 100644
--- a/vue/src/router/module/defaultRoot/index.js
+++ b/vue/src/router/module/admin/index.js
@@ -1,4 +1,4 @@
-/*顶级菜单：默认*/
+/*顶级菜单：后台管理*/
 
 import {context2array} from '@/router/util'
 
diff --git a/vue/src/router/module/devRoot/child/uploadFileDev.js b/vue/src/router/module/dev/child/uploadFileDev.js
similarity index 100%
rename from vue/src/router/module/devRoot/child/uploadFileDev.js
rename to vue/src/router/module/dev/child/uploadFileDev.js
diff --git a/vue/src/router/module/devRoot/index.js b/vue/src/router/module/dev/index.js
similarity index 100%
rename from vue/src/router/module/devRoot/index.js
rename to vue/src/router/module/dev/index.js
diff --git a/vue/src/router/module/docRoot/index.js b/vue/src/router/module/doc/index.js
similarity index 100%
rename from vue/src/router/module/docRoot/index.js
rename to vue/src/router/module/doc/index.js
diff --git a/vue/src/router/module/exampleRoot/child/components.js b/vue/src/router/module/example/child/component.js
similarity index 56%
rename from vue/src/router/module/exampleRoot/child/components.js
rename to vue/src/router/module/example/child/component.js
index 3ed692b..c24a447 100644
--- a/vue/src/router/module/exampleRoot/child/components.js
+++ b/vue/src/router/module/example/child/component.js
@@ -3,32 +3,22 @@ export default {
     meta: {title: '组件', icon: 'el-icon-s-grid'},
     children: [
         {
-            path: 'uploadExample',
+            path: 'upload',
             component: 'example/component/upload',
             meta: {title: '上传文件'}
         },
         {
-            path: 'skeletonExample',
+            path: 'skeleton',
             component: 'example/component/skeleton',
             meta: {title: '骨架屏'}
         },
         {
-            path: 'rippleExample',
-            component: 'example/component/ripple',
-            meta: {title: '波纹'}
-        },
-        {
-            path: 'signatureExample',
-            component: 'example/component/signature',
-            meta: {title: '手写签名'}
-        },
-        {
-            path: 'regionSelectorExample',
+            path: 'regionSelector',
             component: 'example/component/regionSelector',
             meta: {title: '行政区划选择'}
         },
         {
-            path: 'treeSelectExample',
+            path: 'treeSelect',
             component: 'example/component/treeSelect',
             meta: {title: '树选择'}
         }
diff --git a/vue/src/router/module/exampleRoot/child/cool.js b/vue/src/router/module/example/child/cool.js
similarity index 100%
rename from vue/src/router/module/exampleRoot/child/cool.js
rename to vue/src/router/module/example/child/cool.js
diff --git a/vue/src/router/module/example/child/directive.js b/vue/src/router/module/example/child/directive.js
new file mode 100644
index 0000000..6231562
--- /dev/null
+++ b/vue/src/router/module/example/child/directive.js
@@ -0,0 +1,16 @@
+export default {
+    path: 'directive',
+    meta: {title: '全局指令', icon: 'el-icon-s-grid'},
+    children: [
+        {
+            path: 'dragDialog',
+            component: 'example/directive/dragDialog',
+            meta: {title: '可拖拽dialog'}
+        },
+        {
+            path: 'ripple',
+            component: 'example/directive/ripple',
+            meta: {title: '波纹'}
+        }
+    ]
+}
diff --git a/vue/src/router/module/example/child/globalMethod.js b/vue/src/router/module/example/child/globalMethod.js
new file mode 100644
index 0000000..788bb14
--- /dev/null
+++ b/vue/src/router/module/example/child/globalMethod.js
@@ -0,0 +1,36 @@
+export default {
+    path: 'global',
+    meta: {title: '全局方法', icon: 'el-icon-s-opportunity'},
+    children: [
+        {
+            path: 'message',
+            component: 'example/globalMethod/message',
+            meta: {title: '消息提示'}
+        },
+        {
+            path: 'bottomTip',
+            component: 'example/globalMethod/bottomTip',
+            meta: {title: '底部消息提示'}
+        },
+        {
+            path: 'guide',
+            component: 'example/globalMethod/guide',
+            meta: {title: '导航'}
+        },
+        {
+            path: 'imageViewer',
+            component: 'example/globalMethod/imageViewer',
+            meta: {title: '图片预览'}
+        },
+        {
+            path: 'signature',
+            component: 'example/globalMethod/signature',
+            meta: {title: '手写签名'}
+        },
+        {
+            path: 'verify',
+            component: 'example/globalMethod/verify',
+            meta: {title: '拼图验证'}
+        }
+    ]
+}
diff --git a/vue/src/router/module/exampleRoot/child/icon.js b/vue/src/router/module/example/child/icon.js
similarity index 100%
rename from vue/src/router/module/exampleRoot/child/icon.js
rename to vue/src/router/module/example/child/icon.js
diff --git a/vue/src/router/module/exampleRoot/child/iframe.js b/vue/src/router/module/example/child/iframe.js
similarity index 100%
rename from vue/src/router/module/exampleRoot/child/iframe.js
rename to vue/src/router/module/example/child/iframe.js
diff --git a/vue/src/router/module/exampleRoot/child/test.js b/vue/src/router/module/example/child/test.js
similarity index 100%
rename from vue/src/router/module/exampleRoot/child/test.js
rename to vue/src/router/module/example/child/test.js
diff --git a/vue/src/router/module/exampleRoot/index.js b/vue/src/router/module/example/index.js
similarity index 91%
rename from vue/src/router/module/exampleRoot/index.js
rename to vue/src/router/module/example/index.js
index f33088b..f655b24 100644
--- a/vue/src/router/module/exampleRoot/index.js
+++ b/vue/src/router/module/example/index.js
@@ -7,6 +7,6 @@ const files = require.context('./child', false, /\.js$/)
 export default {
     path: '/example',
     component: 'Layout',
-    meta: {title: '演示用例', icon: 'svg-show', noAuth: true, noCache: true},
+    meta: {title: '演示用例', icon: 'svg-show', noAuth: true, noCache: true, sort: 1},
     children: context2array(files)
 }
diff --git a/vue/src/router/module/index.js b/vue/src/router/module/index.js
index 8f3f559..07f877f 100644
--- a/vue/src/router/module/index.js
+++ b/vue/src/router/module/index.js
@@ -1,6 +1,6 @@
-import defaultRoot from './defaultRoot'
-import exampleRoot from './exampleRoot'
-import devRoot from './devRoot'
-import docRoot from './docRoot'
+import admin from './admin'
+import example from './example'
+import dev from './dev'
+import doc from './doc'
 
-export default [defaultRoot, exampleRoot, devRoot, docRoot]
+export default [admin, example, dev, doc]
diff --git a/vue/src/router/util.js b/vue/src/router/util.js
index 255e7de..d81b344 100644
--- a/vue/src/router/util.js
+++ b/vue/src/router/util.js
@@ -1,6 +1,6 @@
 import Layout from '@/layout'
-import SkeletonPage from '@/view/app/common/SkeletonPage'
-import Page500 from '@/view/app/500'
+import SkeletonPage from '@/view/_common/SkeletonPage'
+import Page500 from '@/view/_app/500'
 import {isEmpty} from "@/util"
 import {isExternal, isString} from "@/util/validate"
 
diff --git a/vue/src/store/module/resource.js b/vue/src/store/module/resource.js
index f77a54a..411f95c 100644
--- a/vue/src/store/module/resource.js
+++ b/vue/src/store/module/resource.js
@@ -22,6 +22,8 @@ const state = {
 
 const mutations = {
     resource(state, {data, admin}) {
+        data = deepClone(data)
+
         state.resourceMap = generateResourceMap(data)
 
         //如果不是admin用户，那么过滤admin类型的权限
@@ -48,9 +50,10 @@ const actions = {
             .then(({data}) => {
                 commit('resource', {data: data || [], admin})
 
-                //动态添加路由，这里不需要进行权限过滤
                 const routes = transformOriginRouteData(data)
                 metaExtend(routes)
+
+                //动态添加路由，这里不需要进行权限过滤
                 //可能存在多次调用的情况，所以仅在第一次调用时添加进vue-router
                 !state.init && addDynamicRoutes(routes)
 
diff --git a/vue/src/util/browser.js b/vue/src/util/browser.js
index 99e6d8c..1bbcdd4 100644
--- a/vue/src/util/browser.js
+++ b/vue/src/util/browser.js
@@ -13,13 +13,13 @@ export function isMobile() {
 }
 
 /**
- * 判断是否为dom元素
+ * 判断是否为dom元素，是则返回true
  *
  * @param obj
  * @return {boolean}
  */
 export function isDom(obj) {
-    return !!obj && typeof obj === 'object' && obj.nodeType === 1 && typeof obj.nodeName === 'string'
+    return obj && typeof obj === 'object' && obj.nodeType === 1 && typeof obj.nodeName === 'string'
 }
 
 /**
diff --git a/vue/src/util/tree.js b/vue/src/util/tree.js
index 57be5d7..617aabc 100644
--- a/vue/src/util/tree.js
+++ b/vue/src/util/tree.js
@@ -1,23 +1,38 @@
 import {deepClone} from "@/util"
 import {createWorker} from '@/util/worker'
 
-const DEFAULT_PROPS = {id: 'id', pid: 'pid', children: 'children', leafHasChildren: true}
+const DEFAULT_PROPS = {
+    //节点的id属性名称
+    id: 'id',
+
+    //节点的父级id属性名称
+    pid: 'pid',
+
+    //节点的子级节点属性名称
+    children: 'children',
+
+    //根节点的判定方法，传入函数时参数为节点对象
+    rootPredicate: 0,
+
+    //叶子节点是否能有children属性
+    leafHasChildren: false
+}
 
 /**
  * 列表转树形结构
  *
  * @param list {array}
- * @param rootSign {number|String|Function} 根节点的判定方法
- * @param props 树的配置项，{id, pid, children, leafHasChildren}
+ * @param props 树的配置项，{id, pid, children, rootPredicate, leafHasChildren}
  * @return {array}
  */
-export function createTree(list, rootSign = 0, props = {}) {
+export function createTree(list, props = {}) {
     if (!list || list.length <= 0) return []
 
     const {
         id = DEFAULT_PROPS.id,
         pid = DEFAULT_PROPS.pid,
         children = DEFAULT_PROPS.children,
+        rootPredicate = DEFAULT_PROPS.rootPredicate,
         leafHasChildren = DEFAULT_PROPS.leafHasChildren
     } = props
 
@@ -29,9 +44,9 @@ export function createTree(list, rootSign = 0, props = {}) {
     })
 
     const predicate = (() => {
-        return typeof rootSign === 'function'
-            ? rootSign
-            : key => key === rootSign
+        return typeof rootPredicate === 'function'
+            ? rootPredicate
+            : key => key === rootPredicate
     })()
 
     return list.filter(node => {
@@ -105,7 +120,7 @@ export function createLimitTreeByMap(fullMap, limit) {
         findParent(node)
     }
 
-    const result = createTree(Object.values(resultNodes), '0')
+    const result = createTree(Object.values(resultNodes), {rootPredicate: '0'})
 
     result.forEach(i => calc(i))
 
diff --git a/vue/src/view/app/403.vue b/vue/src/view/_app/403.vue
similarity index 73%
rename from vue/src/view/app/403.vue
rename to vue/src/view/_app/403.vue
index 4534108..32f5238 100644
--- a/vue/src/view/app/403.vue
+++ b/vue/src/view/_app/403.vue
@@ -1,5 +1,5 @@
 <script type="text/jsx">
-import ExceptionPage from '@/view/app/common/ExceptionPage'
+import ExceptionPage from '@/view/_common/ExceptionPage'
 
 export default {
     name: 'Page403',
diff --git a/vue/src/view/app/404.vue b/vue/src/view/_app/404.vue
similarity index 73%
rename from vue/src/view/app/404.vue
rename to vue/src/view/_app/404.vue
index cbaa235..36052fd 100644
--- a/vue/src/view/app/404.vue
+++ b/vue/src/view/_app/404.vue
@@ -1,5 +1,5 @@
 <script type="text/jsx">
-import ExceptionPage from '@/view/app/common/ExceptionPage'
+import ExceptionPage from '@/view/_common/ExceptionPage'
 
 export default {
     name: 'Page404',
diff --git a/vue/src/view/app/500.vue b/vue/src/view/_app/500.vue
similarity index 73%
rename from vue/src/view/app/500.vue
rename to vue/src/view/_app/500.vue
index 341e075..4c26f02 100644
--- a/vue/src/view/app/500.vue
+++ b/vue/src/view/_app/500.vue
@@ -1,5 +1,5 @@
 <script type="text/jsx">
-import ExceptionPage from '@/view/app/common/ExceptionPage'
+import ExceptionPage from '@/view/_common/ExceptionPage'
 
 export default {
     name: 'Page500',
diff --git a/vue/src/view/app/login/LoginForm.vue b/vue/src/view/_app/login/LoginForm.vue
similarity index 100%
rename from vue/src/view/app/login/LoginForm.vue
rename to vue/src/view/_app/login/LoginForm.vue
diff --git a/vue/src/view/app/login/RegisterForm.vue b/vue/src/view/_app/login/RegisterForm.vue
similarity index 100%
rename from vue/src/view/app/login/RegisterForm.vue
rename to vue/src/view/_app/login/RegisterForm.vue
diff --git a/vue/src/view/app/login/SetAnimation.vue b/vue/src/view/_app/login/SetAnimation.vue
similarity index 100%
rename from vue/src/view/app/login/SetAnimation.vue
rename to vue/src/view/_app/login/SetAnimation.vue
diff --git a/vue/src/view/app/login/index.vue b/vue/src/view/_app/login/index.vue
similarity index 100%
rename from vue/src/view/app/login/index.vue
rename to vue/src/view/_app/login/index.vue
diff --git a/vue/src/view/app/login/style.scss b/vue/src/view/_app/login/style.scss
similarity index 98%
rename from vue/src/view/app/login/style.scss
rename to vue/src/view/_app/login/style.scss
index 8c92f0c..424551c 100644
--- a/vue/src/view/app/login/style.scss
+++ b/vue/src/view/_app/login/style.scss
@@ -1,9 +1,9 @@
 @import "~@/asset/style/variables.scss";
 
 $bg: #283443;
-$light_gray: #fff;
+$light_gray: #ffffff;
 $dark_gray: #889aa4;
-$cursor: #fff;
+$cursor: #ffffff;
 
 @supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
     .login-container .el-input input {
diff --git a/vue/src/view/app/redirect.vue b/vue/src/view/_app/redirect.vue
similarity index 100%
rename from vue/src/view/app/redirect.vue
rename to vue/src/view/_app/redirect.vue
diff --git a/vue/src/view/app/common/DetailPage/index.vue b/vue/src/view/_common/DetailPage/index.vue
similarity index 100%
rename from vue/src/view/app/common/DetailPage/index.vue
rename to vue/src/view/_common/DetailPage/index.vue
diff --git a/vue/src/view/app/common/DetailPage/style.scss b/vue/src/view/_common/DetailPage/style.scss
similarity index 98%
rename from vue/src/view/app/common/DetailPage/style.scss
rename to vue/src/view/_common/DetailPage/style.scss
index 6b79cf7..33fa5b9 100644
--- a/vue/src/view/app/common/DetailPage/style.scss
+++ b/vue/src/view/_common/DetailPage/style.scss
@@ -8,7 +8,7 @@
     &-header {
         margin: -#{$page-view-margin} -#{$page-view-margin} 0 -#{$page-view-margin};
         padding: 16px 32px 0 32px;
-        background: #fff;
+        background: #ffffff;
         border-bottom: 1px solid $border-color-light;
 
         > .el-page-header {
diff --git a/vue/src/view/app/common/ExceptionPage/index.vue b/vue/src/view/_common/ExceptionPage/index.vue
similarity index 100%
rename from vue/src/view/app/common/ExceptionPage/index.vue
rename to vue/src/view/_common/ExceptionPage/index.vue
diff --git a/vue/src/view/app/common/ExceptionPage/style.scss b/vue/src/view/_common/ExceptionPage/style.scss
similarity index 100%
rename from vue/src/view/app/common/ExceptionPage/style.scss
rename to vue/src/view/_common/ExceptionPage/style.scss
diff --git a/vue/src/view/app/common/ListPage/autoAdaptHeightMixin.js b/vue/src/view/_common/ListPage/autoAdaptHeightMixin.js
similarity index 95%
rename from vue/src/view/app/common/ListPage/autoAdaptHeightMixin.js
rename to vue/src/view/_common/ListPage/autoAdaptHeightMixin.js
index c727dfb..db040c9 100644
--- a/vue/src/view/app/common/ListPage/autoAdaptHeightMixin.js
+++ b/vue/src/view/_common/ListPage/autoAdaptHeightMixin.js
@@ -17,7 +17,7 @@ export default {
     methods: {
         //设置表格距离视窗底部的理想距离（分页高度 + el-card的1px边距 + el-card padding + 页面margin）
         calcDesiredDistance() {
-            const pageViewMargin = parseFloat(cssVariables['pageViewMargin'])
+            const pageViewMargin = parseFloat(cssVariables.pageViewMargin)
             const paginationHeight = this.$el.querySelector('.table-container > .el-pagination') ? 50 : 0
             this.desiredDistance = paginationHeight + 1 + 20 + pageViewMargin
         },
diff --git a/vue/src/view/app/common/ListPage/index.vue b/vue/src/view/_common/ListPage/index.vue
similarity index 100%
rename from vue/src/view/app/common/ListPage/index.vue
rename to vue/src/view/_common/ListPage/index.vue
diff --git a/vue/src/view/app/common/SkeletonPage/index.vue b/vue/src/view/_common/SkeletonPage/index.vue
similarity index 100%
rename from vue/src/view/app/common/SkeletonPage/index.vue
rename to vue/src/view/_common/SkeletonPage/index.vue
diff --git a/vue/src/view/app/common/SkeletonPage/style.scss b/vue/src/view/_common/SkeletonPage/style.scss
similarity index 100%
rename from vue/src/view/app/common/SkeletonPage/style.scss
rename to vue/src/view/_common/SkeletonPage/style.scss
diff --git a/vue/src/view/index/component/DailyFinishOrderStat.vue b/vue/src/view/admin/index/component/DailyFinishOrderStat.vue
similarity index 100%
rename from vue/src/view/index/component/DailyFinishOrderStat.vue
rename to vue/src/view/admin/index/component/DailyFinishOrderStat.vue
diff --git a/vue/src/view/index/component/DailyProfitStat.vue b/vue/src/view/admin/index/component/DailyProfitStat.vue
similarity index 100%
rename from vue/src/view/index/component/DailyProfitStat.vue
rename to vue/src/view/admin/index/component/DailyProfitStat.vue
diff --git a/vue/src/view/index/component/PanelGroup/PanelGroupItem.vue b/vue/src/view/admin/index/component/PanelGroup/PanelGroupItem.vue
similarity index 98%
rename from vue/src/view/index/component/PanelGroup/PanelGroupItem.vue
rename to vue/src/view/admin/index/component/PanelGroup/PanelGroupItem.vue
index 2969723..0e1adde 100644
--- a/vue/src/view/index/component/PanelGroup/PanelGroupItem.vue
+++ b/vue/src/view/admin/index/component/PanelGroup/PanelGroupItem.vue
@@ -40,7 +40,7 @@ export default {
     position: relative;
     overflow: hidden;
     color: #666;
-    background: #fff;
+    background: #ffffff;
     border-radius: 4px;
     box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
     border-color: rgba(0, 0, 0, .05);
diff --git a/vue/src/view/index/component/PanelGroup/index.vue b/vue/src/view/admin/index/component/PanelGroup/index.vue
similarity index 100%
rename from vue/src/view/index/component/PanelGroup/index.vue
rename to vue/src/view/admin/index/component/PanelGroup/index.vue
diff --git a/vue/src/view/index/component/TotalProfitGoods.vue b/vue/src/view/admin/index/component/TotalProfitGoods.vue
similarity index 100%
rename from vue/src/view/index/component/TotalProfitGoods.vue
rename to vue/src/view/admin/index/component/TotalProfitGoods.vue
diff --git a/vue/src/view/index/indexPage.vue b/vue/src/view/admin/index/indexPage.vue
similarity index 100%
rename from vue/src/view/index/indexPage.vue
rename to vue/src/view/admin/index/indexPage.vue
diff --git a/vue/src/view/message/manage/EditDialog.vue b/vue/src/view/admin/message/manage/EditDialog.vue
similarity index 100%
rename from vue/src/view/message/manage/EditDialog.vue
rename to vue/src/view/admin/message/manage/EditDialog.vue
diff --git a/vue/src/view/message/manage/indexPage.vue b/vue/src/view/admin/message/manage/indexPage.vue
similarity index 99%
rename from vue/src/view/message/manage/indexPage.vue
rename to vue/src/view/admin/message/manage/indexPage.vue
index 743116d..e2ceba1 100644
--- a/vue/src/view/message/manage/indexPage.vue
+++ b/vue/src/view/admin/message/manage/indexPage.vue
@@ -44,7 +44,7 @@
 <script>
 import tableMixin from '@/mixin/tablePageMixin'
 import EditDialog from './EditDialog'
-import ListPage from '@/view/app/common/ListPage'
+import ListPage from '@/view/_common/ListPage'
 import {search, add, update, del} from "@/api/message/manage"
 import {isEmpty} from '@/util'
 import {wic} from "@/util/auth"
diff --git a/vue/src/view/message/user/AutoHidden.vue b/vue/src/view/admin/message/user/AutoHidden.vue
similarity index 100%
rename from vue/src/view/message/user/AutoHidden.vue
rename to vue/src/view/admin/message/user/AutoHidden.vue
diff --git a/vue/src/view/message/user/MessageStream.vue b/vue/src/view/admin/message/user/MessageStream.vue
similarity index 100%
rename from vue/src/view/message/user/MessageStream.vue
rename to vue/src/view/admin/message/user/MessageStream.vue
diff --git a/vue/src/view/message/user/indexPage.vue b/vue/src/view/admin/message/user/indexPage.vue
similarity index 100%
rename from vue/src/view/message/user/indexPage.vue
rename to vue/src/view/admin/message/user/indexPage.vue
diff --git a/vue/src/view/purchase/inbound/component/OrderSelector.vue b/vue/src/view/admin/purchase/inbound/component/OrderSelector.vue
similarity index 100%
rename from vue/src/view/purchase/inbound/component/OrderSelector.vue
rename to vue/src/view/admin/purchase/inbound/component/OrderSelector.vue
diff --git a/vue/src/view/purchase/inbound/detailPage.vue b/vue/src/view/admin/purchase/inbound/detailPage.vue
similarity index 91%
rename from vue/src/view/purchase/inbound/detailPage.vue
rename to vue/src/view/admin/purchase/inbound/detailPage.vue
index 8dd18c3..df39e3a 100644
--- a/vue/src/view/purchase/inbound/detailPage.vue
+++ b/vue/src/view/admin/purchase/inbound/detailPage.vue
@@ -10,20 +10,20 @@
         @close="close"
     >
         <abstract-form :model="form" :rules="rules">
-            <form-collapse-card ref="progress" header="流程进度">
+            <collapse-card ref="progress" header="流程进度">
                 <doc-steps :status="form.status" :type="type"/>
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="base" header="基础信息">
+            <collapse-card ref="base" header="基础信息">
                 <abstract-form-item label="采购订单" prop="pid">
                     <el-input v-if="canSave" :value="form.pid" readonly>
                         <el-button slot="append" @click="parentDialog=true">选择</el-button>
                     </el-input>
                     <template v-else>{{ form.pid }}</template>
                 </abstract-form-item>
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="goods" header="入库商品">
+            <collapse-card ref="goods" header="入库商品">
                 <abstract-table :data="form.data" :highlight-current-row="false">
                     <el-table-column align="center" label="#" type="index" width="80"/>
                     <el-table-column align="center" label="商 品" prop="cname"/>
@@ -41,18 +41,18 @@
                         </template>
                     </el-table-column>
                 </abstract-table>
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="attachment" header="附件">
+            <collapse-card ref="attachment" header="附件">
                 <upload-file
                     :file-list="form.imageList"
                     :disabled="!canSave"
                     @remove="removeUpload"
                     @success="uploadSuccess"
                 />
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="remark" header="备注">
+            <collapse-card ref="remark" header="备注">
                 <el-input
                     v-model="form.remark"
                     :rows="4"
@@ -61,11 +61,11 @@
                     show-word-limit
                     type="textarea"
                 />
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="history" header="单据历史">
+            <collapse-card ref="history" header="单据历史">
                 <doc-history :id="form.id"/>
-            </form-collapse-card>
+            </collapse-card>
         </abstract-form>
 
         <order-selector v-model="parentDialog" @select="selectParent"/>
diff --git a/vue/src/view/purchase/inbound/indexPage.vue b/vue/src/view/admin/purchase/inbound/indexPage.vue
similarity index 100%
rename from vue/src/view/purchase/inbound/indexPage.vue
rename to vue/src/view/admin/purchase/inbound/indexPage.vue
diff --git a/vue/src/view/purchase/order/component/CategorySelector.vue b/vue/src/view/admin/purchase/order/component/CategorySelector.vue
similarity index 100%
rename from vue/src/view/purchase/order/component/CategorySelector.vue
rename to vue/src/view/admin/purchase/order/component/CategorySelector.vue
diff --git a/vue/src/view/purchase/order/component/SupplierSelector.vue b/vue/src/view/admin/purchase/order/component/SupplierSelector.vue
similarity index 100%
rename from vue/src/view/purchase/order/component/SupplierSelector.vue
rename to vue/src/view/admin/purchase/order/component/SupplierSelector.vue
diff --git a/vue/src/view/purchase/order/detailPage.vue b/vue/src/view/admin/purchase/order/detailPage.vue
similarity index 93%
rename from vue/src/view/purchase/order/detailPage.vue
rename to vue/src/view/admin/purchase/order/detailPage.vue
index 0535d72..cd9e52e 100644
--- a/vue/src/view/purchase/order/detailPage.vue
+++ b/vue/src/view/admin/purchase/order/detailPage.vue
@@ -10,20 +10,20 @@
         @close="close"
     >
         <abstract-form :model="form" :rules="rules">
-            <form-collapse-card ref="progress" header="流程进度">
+            <collapse-card ref="progress" header="流程进度">
                 <doc-steps :status="form.status" :finish="form.finish" :type="type"/>
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="base" header="基础信息">
+            <collapse-card ref="base" header="基础信息">
                 <abstract-form-item label="供应商" prop="sname">
                     <el-input v-if="canSave" :value="form.sname" readonly>
                         <el-button slot="append" @click="supplierDialog=true">选择</el-button>
                     </el-input>
                     <template v-else>{{ form.sname }}</template>
                 </abstract-form-item>
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="goods" header="采购商品">
+            <collapse-card ref="goods" header="采购商品">
                 <abstract-table :data="form.data" :highlight-current-row="false">
                     <el-table-column align="center" label="#" type="index" width="80"/>
                     <el-table-column align="center" label="商 品">
@@ -87,18 +87,18 @@
                         </el-button>
                     </div>
                 </abstract-table>
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="attachment" header="附件">
+            <collapse-card ref="attachment" header="附件">
                 <upload-file
                     :file-list="form.imageList"
                     :disabled="!canSave"
                     @remove="removeUpload"
                     @success="uploadSuccess"
                 />
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="remark" header="备注">
+            <collapse-card ref="remark" header="备注">
                 <el-input
                     v-model="form.remark"
                     :rows="4"
@@ -107,11 +107,11 @@
                     show-word-limit
                     type="textarea"
                 />
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="history" header="单据历史">
+            <collapse-card ref="history" header="单据历史">
                 <doc-history :id="form.id"/>
-            </form-collapse-card>
+            </collapse-card>
         </abstract-form>
 
         <supplier-selector v-model="supplierDialog" @select="selectSupplier"/>
diff --git a/vue/src/view/purchase/order/indexPage.vue b/vue/src/view/admin/purchase/order/indexPage.vue
similarity index 100%
rename from vue/src/view/purchase/order/indexPage.vue
rename to vue/src/view/admin/purchase/order/indexPage.vue
diff --git a/vue/src/view/sell/order/component/CustomerSelector.vue b/vue/src/view/admin/sell/order/component/CustomerSelector.vue
similarity index 100%
rename from vue/src/view/sell/order/component/CustomerSelector.vue
rename to vue/src/view/admin/sell/order/component/CustomerSelector.vue
diff --git a/vue/src/view/sell/order/component/StockSelector.vue b/vue/src/view/admin/sell/order/component/StockSelector.vue
similarity index 100%
rename from vue/src/view/sell/order/component/StockSelector.vue
rename to vue/src/view/admin/sell/order/component/StockSelector.vue
diff --git a/vue/src/view/sell/order/detailPage.vue b/vue/src/view/admin/sell/order/detailPage.vue
similarity index 92%
rename from vue/src/view/sell/order/detailPage.vue
rename to vue/src/view/admin/sell/order/detailPage.vue
index f81ba9a..8033bd7 100644
--- a/vue/src/view/sell/order/detailPage.vue
+++ b/vue/src/view/admin/sell/order/detailPage.vue
@@ -10,20 +10,20 @@
         @close="close"
     >
         <abstract-form :model="form" :rules="rules">
-            <form-collapse-card ref="progress" header="流程进度">
+            <collapse-card ref="progress" header="流程进度">
                 <doc-steps :status="form.status" :finish="form.finish" :type="type"/>
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="base" header="基础信息">
+            <collapse-card ref="base" header="基础信息">
                 <abstract-form-item label="客 户" prop="customerName">
                     <el-input v-if="canSave" :value="form.customerName" readonly>
                         <el-button slot="append" @click="customerDialog=true">选择</el-button>
                     </el-input>
                     <template v-else>{{ form.customerName }}</template>
                 </abstract-form-item>
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="goods" header="销售商品">
+            <collapse-card ref="goods" header="销售商品">
                 <abstract-table :data="form.data" :highlight-current-row="false">
                     <el-table-column align="center" label="#" type="index" width="80"/>
                     <el-table-column align="center" label="商品" prop="cname"/>
@@ -70,18 +70,18 @@
                         </el-button>
                     </div>
                 </abstract-table>
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="attachment" header="附件">
+            <collapse-card ref="attachment" header="附件">
                 <upload-file
                     :file-list="form.imageList"
                     :disabled="!canSave"
                     @remove="removeUpload"
                     @success="uploadSuccess"
                 />
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="remark" header="备注">
+            <collapse-card ref="remark" header="备注">
                 <el-input
                     v-model="form.remark"
                     :rows="4"
@@ -90,11 +90,11 @@
                     show-word-limit
                     type="textarea"
                 />
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="history" header="单据历史">
+            <collapse-card ref="history" header="单据历史">
                 <doc-history :id="form.id"/>
-            </form-collapse-card>
+            </collapse-card>
         </abstract-form>
 
         <stock-selector v-model="stockDialog" @select="selectStock"/>
diff --git a/vue/src/view/sell/order/indexPage.vue b/vue/src/view/admin/sell/order/indexPage.vue
similarity index 100%
rename from vue/src/view/sell/order/indexPage.vue
rename to vue/src/view/admin/sell/order/indexPage.vue
diff --git a/vue/src/view/sell/outbound/component/OrderSelector.vue b/vue/src/view/admin/sell/outbound/component/OrderSelector.vue
similarity index 100%
rename from vue/src/view/sell/outbound/component/OrderSelector.vue
rename to vue/src/view/admin/sell/outbound/component/OrderSelector.vue
diff --git a/vue/src/view/sell/outbound/component/StockSelector.vue b/vue/src/view/admin/sell/outbound/component/StockSelector.vue
similarity index 100%
rename from vue/src/view/sell/outbound/component/StockSelector.vue
rename to vue/src/view/admin/sell/outbound/component/StockSelector.vue
diff --git a/vue/src/view/sell/outbound/detailPage.vue b/vue/src/view/admin/sell/outbound/detailPage.vue
similarity index 94%
rename from vue/src/view/sell/outbound/detailPage.vue
rename to vue/src/view/admin/sell/outbound/detailPage.vue
index adaf90c..c1c12c4 100644
--- a/vue/src/view/sell/outbound/detailPage.vue
+++ b/vue/src/view/admin/sell/outbound/detailPage.vue
@@ -10,20 +10,20 @@
         @close="close"
     >
         <abstract-form :model="form" :rules="rules">
-            <form-collapse-card ref="progress" header="流程进度">
+            <collapse-card ref="progress" header="流程进度">
                 <doc-steps :status="form.status" :type="type"/>
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="base" header="基础信息">
+            <collapse-card ref="base" header="基础信息">
                 <abstract-form-item label="销售订单" prop="pid">
                     <el-input v-if="canSave" :value="form.pid" readonly>
                         <el-button slot="append" @click="parentDialog=true">选择</el-button>
                     </el-input>
                     <template v-else>{{ form.pid }}</template>
                 </abstract-form-item>
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="goods" header="出库商品">
+            <collapse-card ref="goods" header="出库商品">
                 <abstract-table :data="displayTableData" :highlight-current-row="false">
                     <el-table-column align="center" type="expand">
                         <el-table slot-scope="{row}" :data="row.data" border show-summary
@@ -56,18 +56,18 @@
                     <el-table-column align="center" label="出库数量" prop="num" width="150"/>
                     <el-table-column align="center" label="订单剩余未出库数量" prop="remainNum" width="250"/>
                 </abstract-table>
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="attachment" header="附件">
+            <collapse-card ref="attachment" header="附件">
                 <upload-file
                     :file-list="form.imageList"
                     :disabled="!canSave"
                     @remove="removeUpload"
                     @success="uploadSuccess"
                 />
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="remark" header="备注">
+            <collapse-card ref="remark" header="备注">
                 <el-input
                     v-model="form.remark"
                     :rows="4"
@@ -76,11 +76,11 @@
                     show-word-limit
                     type="textarea"
                 />
-            </form-collapse-card>
+            </collapse-card>
 
-            <form-collapse-card ref="history" header="单据历史">
+            <collapse-card ref="history" header="单据历史">
                 <doc-history :id="form.id"/>
-            </form-collapse-card>
+            </collapse-card>
         </abstract-form>
 
         <order-selector v-model="parentDialog" @select="selectParent"/>
diff --git a/vue/src/view/sell/outbound/indexPage.vue b/vue/src/view/admin/sell/outbound/indexPage.vue
similarity index 100%
rename from vue/src/view/sell/outbound/indexPage.vue
rename to vue/src/view/admin/sell/outbound/indexPage.vue
diff --git a/vue/src/view/stock/current/DetailDialog.vue b/vue/src/view/admin/stock/current/DetailDialog.vue
similarity index 100%
rename from vue/src/view/stock/current/DetailDialog.vue
rename to vue/src/view/admin/stock/current/DetailDialog.vue
diff --git a/vue/src/view/stock/current/indexPage.vue b/vue/src/view/admin/stock/current/indexPage.vue
similarity index 100%
rename from vue/src/view/stock/current/indexPage.vue
rename to vue/src/view/admin/stock/current/indexPage.vue
diff --git a/vue/src/view/system/category/component/Form.vue b/vue/src/view/admin/system/category/component/Form.vue
similarity index 100%
rename from vue/src/view/system/category/component/Form.vue
rename to vue/src/view/admin/system/category/component/Form.vue
diff --git a/vue/src/view/system/category/component/List.vue b/vue/src/view/admin/system/category/component/List.vue
similarity index 100%
rename from vue/src/view/system/category/component/List.vue
rename to vue/src/view/admin/system/category/component/List.vue
diff --git a/vue/src/view/system/category/indexPage.vue b/vue/src/view/admin/system/category/indexPage.vue
similarity index 100%
rename from vue/src/view/system/category/indexPage.vue
rename to vue/src/view/admin/system/category/indexPage.vue
diff --git a/vue/src/view/system/customer/EditDialog.vue b/vue/src/view/admin/system/customer/EditDialog.vue
similarity index 100%
rename from vue/src/view/system/customer/EditDialog.vue
rename to vue/src/view/admin/system/customer/EditDialog.vue
diff --git a/vue/src/view/system/customer/indexPage.vue b/vue/src/view/admin/system/customer/indexPage.vue
similarity index 99%
rename from vue/src/view/system/customer/indexPage.vue
rename to vue/src/view/admin/system/customer/indexPage.vue
index 19e54f9..3e246ef 100644
--- a/vue/src/view/system/customer/indexPage.vue
+++ b/vue/src/view/admin/system/customer/indexPage.vue
@@ -64,7 +64,7 @@
 
 <script>
 import tableMixin from '@/mixin/tablePageMixin'
-import ListPage from '@/view/app/common/ListPage'
+import ListPage from '@/view/_common/ListPage'
 import EditDialog from './EditDialog'
 import RegionSelector from "@/component/RegionSelector"
 import {add, update, del, search, getLimitRegion} from "@/api/system/customer"
diff --git a/vue/src/view/system/department/component/EditDialog.vue b/vue/src/view/admin/system/department/component/EditDialog.vue
similarity index 100%
rename from vue/src/view/system/department/component/EditDialog.vue
rename to vue/src/view/admin/system/department/component/EditDialog.vue
diff --git a/vue/src/view/system/department/component/OrgTreeView.vue b/vue/src/view/admin/system/department/component/OrgTreeView.vue
similarity index 100%
rename from vue/src/view/system/department/component/OrgTreeView.vue
rename to vue/src/view/admin/system/department/component/OrgTreeView.vue
diff --git a/vue/src/view/system/department/component/ZoomControl.vue b/vue/src/view/admin/system/department/component/ZoomControl.vue
similarity index 100%
rename from vue/src/view/system/department/component/ZoomControl.vue
rename to vue/src/view/admin/system/department/component/ZoomControl.vue
diff --git a/vue/src/view/system/department/indexPage.vue b/vue/src/view/admin/system/department/indexPage.vue
similarity index 100%
rename from vue/src/view/system/department/indexPage.vue
rename to vue/src/view/admin/system/department/indexPage.vue
diff --git a/vue/src/view/system/menu/common.js b/vue/src/view/admin/system/menu/common.js
similarity index 100%
rename from vue/src/view/system/menu/common.js
rename to vue/src/view/admin/system/menu/common.js
diff --git a/vue/src/view/system/menu/indexPage.vue b/vue/src/view/admin/system/menu/indexPage.vue
similarity index 98%
rename from vue/src/view/system/menu/indexPage.vue
rename to vue/src/view/admin/system/menu/indexPage.vue
index 48c2342..71fd378 100644
--- a/vue/src/view/system/menu/indexPage.vue
+++ b/vue/src/view/admin/system/menu/indexPage.vue
@@ -1,6 +1,6 @@
 <template>
     <el-card>
-        <div class="tip-row">线上版本没有开放动态路由功能</div>
+        <div v-if="showTip" class="tip-row">线上版本没有开放动态路由功能</div>
 
         <el-row class="button-group">
             <template v-if="canAdd">
@@ -168,6 +168,8 @@ export default {
             c(isEmpty(value) ? '名称不能为空' : undefined)
         }
         return {
+            showTip: process.env.NODE_ENV !== 'development',
+
             loading: false,
             search: null,
             type: 'add',// add or edit
diff --git a/vue/src/view/system/role/EditDialog.vue b/vue/src/view/admin/system/role/EditDialog.vue
similarity index 98%
rename from vue/src/view/system/role/EditDialog.vue
rename to vue/src/view/admin/system/role/EditDialog.vue
index af4ce42..6c2e0aa 100644
--- a/vue/src/view/system/role/EditDialog.vue
+++ b/vue/src/view/admin/system/role/EditDialog.vue
@@ -70,7 +70,7 @@ import {add, update} from "@/api/system/role"
 import {isEmpty, mergeObj} from '@/util'
 import {expandControl} from "@/util/element-ui/elTree"
 import {createTreeByWorker} from '@/util/tree'
-import {getNodeTitle, getNodeInfo} from "@/view/system/menu/common"
+import {getNodeTitle, getNodeInfo} from "@/view/admin/system/menu/common"
 
 export default {
     name: "EditDialog",
diff --git a/vue/src/view/system/role/indexPage.vue b/vue/src/view/admin/system/role/indexPage.vue
similarity index 99%
rename from vue/src/view/system/role/indexPage.vue
rename to vue/src/view/admin/system/role/indexPage.vue
index 0c03ba0..89f75b4 100644
--- a/vue/src/view/system/role/indexPage.vue
+++ b/vue/src/view/admin/system/role/indexPage.vue
@@ -45,7 +45,7 @@
 
 <script>
 import tableMixin from '@/mixin/tablePageMixin'
-import ListPage from '@/view/app/common/ListPage'
+import ListPage from '@/view/_common/ListPage'
 import EditDialog from './EditDialog'
 import {add, update, del, search} from "@/api/system/role"
 import {isEmpty} from '@/util'
diff --git a/vue/src/view/system/supplier/EditDialog.vue b/vue/src/view/admin/system/supplier/EditDialog.vue
similarity index 100%
rename from vue/src/view/system/supplier/EditDialog.vue
rename to vue/src/view/admin/system/supplier/EditDialog.vue
diff --git a/vue/src/view/system/supplier/indexPage.vue b/vue/src/view/admin/system/supplier/indexPage.vue
similarity index 99%
rename from vue/src/view/system/supplier/indexPage.vue
rename to vue/src/view/admin/system/supplier/indexPage.vue
index 4623230..256968f 100644
--- a/vue/src/view/system/supplier/indexPage.vue
+++ b/vue/src/view/admin/system/supplier/indexPage.vue
@@ -64,7 +64,7 @@
 
 <script>
 import tableMixin from '@/mixin/tablePageMixin'
-import ListPage from '@/view/app/common/ListPage'
+import ListPage from '@/view/_common/ListPage'
 import EditDialog from './EditDialog'
 import RegionSelector from "@/component/RegionSelector"
 import {add, update, del, getLimitRegion, search} from "@/api/system/supplier"
diff --git a/vue/src/view/system/user/component/DepartmentSelector.vue b/vue/src/view/admin/system/user/component/DepartmentSelector.vue
similarity index 100%
rename from vue/src/view/system/user/component/DepartmentSelector.vue
rename to vue/src/view/admin/system/user/component/DepartmentSelector.vue
diff --git a/vue/src/view/system/user/component/EditDialog.vue b/vue/src/view/admin/system/user/component/EditDialog.vue
similarity index 100%
rename from vue/src/view/system/user/component/EditDialog.vue
rename to vue/src/view/admin/system/user/component/EditDialog.vue
diff --git a/vue/src/view/system/user/component/RoleSelector.vue b/vue/src/view/admin/system/user/component/RoleSelector.vue
similarity index 100%
rename from vue/src/view/system/user/component/RoleSelector.vue
rename to vue/src/view/admin/system/user/component/RoleSelector.vue
diff --git a/vue/src/view/system/user/indexPage.vue b/vue/src/view/admin/system/user/indexPage.vue
similarity index 99%
rename from vue/src/view/system/user/indexPage.vue
rename to vue/src/view/admin/system/user/indexPage.vue
index 3511435..cf441a2 100644
--- a/vue/src/view/system/user/indexPage.vue
+++ b/vue/src/view/admin/system/user/indexPage.vue
@@ -69,7 +69,7 @@
 
 <script>
 import tableMixin from '@/mixin/tablePageMixin'
-import ListPage from '@/view/app/common/ListPage'
+import ListPage from '@/view/_common/ListPage'
 import EditDialog from './component/EditDialog'
 import RoleSelector from './component/RoleSelector'
 import {search, add, update, del, kick, resetPwd} from "@/api/system/user"
diff --git a/vue/src/view/userCenter/component/Account.vue b/vue/src/view/admin/userCenter/component/Account.vue
similarity index 100%
rename from vue/src/view/userCenter/component/Account.vue
rename to vue/src/view/admin/userCenter/component/Account.vue
diff --git a/vue/src/view/userCenter/component/Avatar.vue b/vue/src/view/admin/userCenter/component/Avatar.vue
similarity index 100%
rename from vue/src/view/userCenter/component/Avatar.vue
rename to vue/src/view/admin/userCenter/component/Avatar.vue
diff --git a/vue/src/view/userCenter/component/LoginHistory.vue b/vue/src/view/admin/userCenter/component/LoginHistory.vue
similarity index 100%
rename from vue/src/view/userCenter/component/LoginHistory.vue
rename to vue/src/view/admin/userCenter/component/LoginHistory.vue
diff --git a/vue/src/view/userCenter/component/UserAction.vue b/vue/src/view/admin/userCenter/component/UserAction.vue
similarity index 100%
rename from vue/src/view/userCenter/component/UserAction.vue
rename to vue/src/view/admin/userCenter/component/UserAction.vue
diff --git a/vue/src/view/userCenter/component/UserCard.vue b/vue/src/view/admin/userCenter/component/UserCard.vue
similarity index 100%
rename from vue/src/view/userCenter/component/UserCard.vue
rename to vue/src/view/admin/userCenter/component/UserCard.vue
diff --git a/vue/src/view/userCenter/indexPage.vue b/vue/src/view/admin/userCenter/indexPage.vue
similarity index 100%
rename from vue/src/view/userCenter/indexPage.vue
rename to vue/src/view/admin/userCenter/indexPage.vue
diff --git a/vue/src/view/example/component/ripplePage.vue b/vue/src/view/example/component/ripplePage.vue
deleted file mode 100644
index 16a48ce..0000000
--- a/vue/src/view/example/component/ripplePage.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-    <div v-ripple class="tip-row">
-        点击触发波纹，详情请见<a href="https://quasar.dev/vue-directives/material-ripple" target="_blank">quasar</a>
-    </div>
-</template>
-
-<script>
-export default {
-    name: "rippleExample"
-}
-</script>
diff --git a/vue/src/view/example/directive/dragDialogPage.vue b/vue/src/view/example/directive/dragDialogPage.vue
new file mode 100644
index 0000000..303f37b
--- /dev/null
+++ b/vue/src/view/example/directive/dragDialogPage.vue
@@ -0,0 +1,25 @@
+<template>
+    <div>
+        <div class="tip-row">
+            可拖拽的dialog
+        </div>
+
+        <el-button @click="value = true">打开dialog</el-button>
+
+        <el-dialog v-drag-dialog :visible.sync="value" title="我可以拖动">
+            <div>蛤蛤</div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "dragDialogPage",
+
+    data() {
+        return {
+            value: false
+        }
+    }
+}
+</script>
diff --git a/vue/src/view/example/directive/ripplePage.vue b/vue/src/view/example/directive/ripplePage.vue
new file mode 100644
index 0000000..5e040ec
--- /dev/null
+++ b/vue/src/view/example/directive/ripplePage.vue
@@ -0,0 +1,57 @@
+<template>
+    <div>
+        <div class="tip-row">
+            波纹，详情请见<a href="https://quasar.dev/vue-directives/material-ripple" target="_blank">quasar</a>
+        </div>
+
+        <div v-ripple.early class="ripple-example" :style="style">点我触发</div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "ripplePage",
+
+    data() {
+        return {
+            index: 0,
+            colors: ['amber', 'orange', 'accent', 'lime', 'cyan', 'purple', 'brown', 'blue']
+        }
+    },
+
+    computed: {
+        style() {
+            return {'background-color': this.colors[this.index]}
+        }
+    },
+
+    mounted() {
+        this.timer = window.setInterval(() => {
+            this.index = (this.index + 1) % this.colors.length
+            this.color = this.colors[this.index]
+        }, 3000)
+
+        this.$once('hook:beforeDestroy', () => {
+            window.clearInterval(this.timer)
+        })
+    }
+}
+</script>
+
+<style scoped>
+.ripple-example {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    align-items: center;
+    margin-top: 50px;
+    height: 150px;
+    width: 80%;
+    max-width: 500px;
+    border-radius: 3px;
+    cursor: pointer;
+    transition: background 1.5s;
+    color: #ffffff;
+    user-select: none;
+}
+</style>
diff --git a/vue/src/view/example/globalMethod/bottomTipPage.vue b/vue/src/view/example/globalMethod/bottomTipPage.vue
new file mode 100644
index 0000000..f422d77
--- /dev/null
+++ b/vue/src/view/example/globalMethod/bottomTipPage.vue
@@ -0,0 +1,18 @@
+<template>
+    <div>
+        <div class="tip-row">
+            底部消息提示
+        </div>
+
+        <div>
+            <el-button plain @click="$bottomTip('底部消息提示')">触发底部消息提示</el-button>
+            <el-button plain @click="$bottomTip.close()">关闭底部消息提示</el-button>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "bottomTipPage"
+}
+</script>
diff --git a/vue/src/view/example/globalMethod/guidePage.vue b/vue/src/view/example/globalMethod/guidePage.vue
new file mode 100644
index 0000000..c741f30
--- /dev/null
+++ b/vue/src/view/example/globalMethod/guidePage.vue
@@ -0,0 +1,64 @@
+<template>
+    <div>
+        <div class="tip-row">
+            基于driver.js改造的用户导航
+        </div>
+
+        <div>
+            <el-button plain @click="onClick">开始导航</el-button>
+        </div>
+
+        <div id="example-guide-step1" class="example-guide-step">我是步骤1</div>
+        <div id="example-guide-step2" class="example-guide-step">我是步骤2</div>
+        <div id="example-guide-step3" class="example-guide-step">我是步骤3</div>
+        <div id="example-guide-step4" class="example-guide-step">我是步骤4</div>
+        <div id="example-guide-step5" class="example-guide-step">我是步骤5</div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "guidePage",
+
+    methods: {
+        onClick() {
+            this.$guide([
+                {
+                    element: '#example-guide-step1',
+                    content: 'onNext钩子示例',
+                    onNext: () => this.$confirm('确认进行下一步吗？')
+                },
+                {
+                    element: '#example-guide-step2',
+                    content: 'onPrevious钩子展示',
+                    onPrevious: () => this.$confirm('确认回到上一步吗？')
+                },
+                {
+                    element: '#example-guide-step3',
+                    content: 'onHighlighted钩子示例',
+                    onHighlighted() {
+                        this.$message.info('到达第三步！')
+                    }
+                },
+                {
+                    element: '#example-guide-step4',
+                    content: `<h1>内容可以是html字符串</h1><img src="https://dss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=4018557288,1217151095&fm=26&gp=0.jpg">`,
+                },
+                {
+                    element: '#example-guide-step5',
+                    content: '最后一步',
+                },
+            ])
+        }
+    }
+}
+</script>
+
+<style scoped>
+.example-guide-step {
+    margin-top: 50px;
+    height: 200px;
+    width: 300px;
+    background-color: blueviolet;
+}
+</style>
diff --git a/vue/src/view/example/globalMethod/imageViewerPage.vue b/vue/src/view/example/globalMethod/imageViewerPage.vue
new file mode 100644
index 0000000..d13a878
--- /dev/null
+++ b/vue/src/view/example/globalMethod/imageViewerPage.vue
@@ -0,0 +1,33 @@
+<template>
+    <div>
+        <div class="tip-row">
+            这是对<a href="https://github.com/sachinchoolur/lightgallery.js" target="_blank">lightgallary</a>的简单封装
+        </div>
+
+        <div>
+            <img v-for="(i,index) in images" :key="i" :src="i" @click="preview(index)">
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "imageViewerPage",
+
+    data() {
+        return {
+            images: [
+                'https://dss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=4018557288,1217151095&fm=26&gp=0.jpg',
+                'https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3252521864,872614242&fm=26&gp=0.jpg',
+                'https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=2534506313,1688529724&fm=26&gp=0.jpg'
+            ]
+        }
+    },
+
+    methods: {
+        preview(index) {
+            this.$image({index, urlList: this.images})
+        }
+    }
+}
+</script>
diff --git a/vue/src/view/example/globalMethod/messagePage.vue b/vue/src/view/example/globalMethod/messagePage.vue
new file mode 100644
index 0000000..b57d91a
--- /dev/null
+++ b/vue/src/view/example/globalMethod/messagePage.vue
@@ -0,0 +1,26 @@
+<template>
+    <div>
+        <div class="tip-row">
+            对element-ui的Message添加了仿<a href="https://quasar.dev/quasar-plugins/notify" target="_blank">Quasar</a>的进度条
+        </div>
+
+        <div>
+            <el-button plain @click="message('success')">成功</el-button>
+            <el-button plain @click="message('warning')">警告</el-button>
+            <el-button plain @click="message('info')">消息</el-button>
+            <el-button plain @click="message('error')">错误</el-button>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "messagePage",
+
+    methods: {
+        message(type) {
+            this.$message({message: '消息提示', type})
+        }
+    }
+}
+</script>
diff --git a/vue/src/view/example/component/signaturePage.vue b/vue/src/view/example/globalMethod/signaturePage.vue
similarity index 95%
rename from vue/src/view/example/component/signaturePage.vue
rename to vue/src/view/example/globalMethod/signaturePage.vue
index 4521821..1c74e3d 100644
--- a/vue/src/view/example/component/signaturePage.vue
+++ b/vue/src/view/example/globalMethod/signaturePage.vue
@@ -12,12 +12,14 @@
 
 <script>
 export default {
-    name: 'signatureExample',
+    name: 'signaturePage',
+
     data() {
         return {
             src: null
         }
     },
+
     methods: {
         signature() {
             this.$signature({
diff --git a/vue/src/view/example/globalMethod/verifyPage.vue b/vue/src/view/example/globalMethod/verifyPage.vue
new file mode 100644
index 0000000..e06228e
--- /dev/null
+++ b/vue/src/view/example/globalMethod/verifyPage.vue
@@ -0,0 +1,25 @@
+<template>
+    <div>
+        <div class="tip-row">
+            拼图验证，
+            在<a href="https://github.com/Kevin-269581661/vue-puzzle-verification" target="_blank"></a>的基础上做了样式修改
+        </div>
+        <el-button type="primary" @click="onClick">触发验证</el-button>
+    </div>
+</template>
+
+<script>
+import {elSuccess, elError} from "@/util/message"
+
+export default {
+    name: "verifyPage",
+
+    methods: {
+        onClick() {
+            this.$verify()
+                .then(() => elSuccess('验证通过！'))
+                .catch(() => elError('验证失败！'))
+        }
+    }
+}
+</script>