From aa966a3c2561133e340550c22d8c9fc2908d6aa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Wed, 6 Jan 2021 10:45:05 +0800
Subject: [PATCH 1/3] =?UTF-8?q?1.=E8=A1=A8=E5=8D=95=E5=86=85=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=EF=BC=8C=E9=BB=98=E8=AE=A4100%?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E5=8D=A0=E6=AF=94=EF=BC=9B=202.=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E6=8E=92=E7=89=88label=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=90=8C=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9B=203.=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AF=B9=E5=BA=94=E5=9B=BE=E6=A0=87=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E6=95=88=E6=9E=9C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vue-element-admin/api/admin_menus.js      |  8 +++
 .../components/ErrorLog/index.vue             |  4 +-
 .../vue-element-admin/styles/common.scss      |  4 ++
 .../views/admin_menus/components/detail.vue   |  4 +-
 .../views/admin_menus/index.vue               | 68 ++++++++++++++++---
 .../views/admin_roles/index.vue               | 19 +++---
 .../views/adminloginlogs/index.vue            | 18 +++--
 .../views/adminlogs/index.vue                 |  8 +--
 .../views/admins/components/detail.vue        |  2 +-
 .../vue-element-admin/views/admins/index.vue  |  2 -
 .../article_categories/components/detail.vue  |  4 +-
 .../views/article_categories/index.vue        | 15 ++--
 .../articles/components/ArticleDetail.vue     |  8 +--
 .../views/articles/index.vue                  | 34 +++++-----
 .../vue-element-admin/views/banners/index.vue | 15 ++--
 .../vue-element-admin/views/configs/index.vue |  9 ++-
 .../views/friendlinks/index.vue               | 15 ++--
 17 files changed, 155 insertions(+), 82 deletions(-)

diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/admin_menus.js b/app/Modules/Admin/Resources/vue-element-admin/api/admin_menus.js
index 4d5aef9..05c2fd5 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/api/admin_menus.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/admin_menus.js
@@ -38,3 +38,11 @@ export function setDel(data) {
         data
     })
 }
+
+export function changeFiledStatus(data) {
+    return request({
+        url: `/admin_menus/changeFiledStatus`,
+        method: 'put',
+        data
+    })
+}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/components/ErrorLog/index.vue b/app/Modules/Admin/Resources/vue-element-admin/components/ErrorLog/index.vue
index 6119c03..9ad758d 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/components/ErrorLog/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/components/ErrorLog/index.vue
@@ -37,8 +37,8 @@
           </template>
         </el-table-column>
         <el-table-column label="Stack">
-          <template slot-scope="scope">
-            {{ scope.row.err.stack }}
+          <template slot-scope="{row}">
+            {{ row.err.stack }}
           </template>
         </el-table-column>
       </el-table>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/styles/common.scss b/app/Modules/Admin/Resources/vue-element-admin/styles/common.scss
index b9ca442..4b3d285 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/styles/common.scss
+++ b/app/Modules/Admin/Resources/vue-element-admin/styles/common.scss
@@ -18,3 +18,7 @@
     width:auto!important;
     min-width: 500px;
 }
+// 表单 下拉框 100%宽度占比
+.el-form .el-select{
+    width: 100%;
+}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue
index 8fd2f42..da8ef19 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue
@@ -4,12 +4,12 @@
         :visible.sync="dialogFormVisible"
         @close="close"
     >
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="105px">
             <el-form-item label="父级菜单" prop="parent_id">
                 <el-select v-model="form.parent_id" placeholder="请选择父级" autocomplete="off">
                     <el-option
                         key="0"
-                        :checked="0 == form.parent_id"
+                        :checked="0 == form.parent_id || undefined == form.parent_id"
                         label="默认顶级"
                         value="0"
                     />
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue
index c6d8bd4..645898b 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue
@@ -24,56 +24,80 @@
                 prop="menu_name"
                 label="菜单名称"
             ></el-table-column>
+
             <el-table-column
                 show-overflow-tooltip
                 prop="vue_path"
                 label="Vue路由"
             ></el-table-column>
+
             <el-table-column
                 show-overflow-tooltip
                 prop="vue_component"
                 label="vue文件路径"
             ></el-table-column>
+
             <el-table-column
                 show-overflow-tooltip
                 prop="api_url"
                 label="API路由"
                 align="center"
             ></el-table-column>
+
             <el-table-column show-overflow-tooltip label="是否隐藏" align="center">
-                <template slot-scope="scope">
-                          <span>
-                            {{ scope.row.is_hidden == 1 ? "是" : "否" }}
-                          </span>
+                <template slot-scope="{row}">
+                    <el-tag :type="row.is_hidden | statusFilter">
+                        <svg-icon :icon-class="row.is_hidden == 0 ? 'eye' : 'eye-open'" />
+                        {{ row.is_hidden == 1 ? "是" : "否" }}
+                    </el-tag>
                 </template>
             </el-table-column>
+
             <el-table-column
                 show-overflow-tooltip
                 prop="external_links"
                 label="重定向（外链）"
             ></el-table-column>
+
             <el-table-column
                 show-overflow-tooltip
                 prop="menu_sort"
                 label="排序"
                 align="center"
             ></el-table-column>
+
             <el-table-column
                 show-overflow-tooltip
                 label="图标"
                 align="center"
             >
-                <template slot-scope="scope">
-                    <i :class="scope.row.vue_icon"></i>
+                <template slot-scope="{row}">
+                    <i :class="row.vue_icon"></i>
                 </template>
             </el-table-column>
+
             <el-table-column
-                show-overflow-tooltip
                 align="center"
                 label="操作"
-                width="200"
             >
+                show-overflow-tooltip
                 <template v-slot="scope">
+                    <!-- 状态变更 -->
+                    <el-button v-if="scope.row.is_hidden == 0" type="text"
+                               @click="changeStatus(scope.row, 1, 'is_hidden')">
+                        <el-tag :type="1 | statusFilter">
+                            <i class="el-icon-unlock" />
+                            展示
+                        </el-tag>
+                    </el-button>
+                    <el-button v-else-if="scope.row.is_hidden == 1" type="text"
+                               @click="changeStatus(scope.row, 0, 'is_hidden')">
+                        <el-tag :type="0 | statusFilter">
+                            <i class="el-icon-lock" />
+                            隐藏
+                        </el-tag>
+                    </el-button>
+                    <!-- 编辑与删除 -->
                     <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
                     <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
                 </template>
@@ -85,12 +109,21 @@
 </template>
 
 <script>
-    import {getList as getMenus, setDel} from "@/api/admin_menus";
+    import {getList as getMenus, setDel, changeFiledStatus} from "@/api/admin_menus";
     import Edit from "./components/detail";
 
     export default {
         name: "MenuManagement",
         components: {Edit},
+        filters: {
+            statusFilter(status) {
+                const statusMap = {
+                    1: 'success',
+                    0: 'danger'
+                };
+                return statusMap[status];
+            },
+        },
         data() {
             return {
                 defaultProps: {
@@ -146,6 +179,23 @@
                     this.listLoading = false;
                 }, 300);
             },
+            // 状态变更
+            async changeStatus(row, value, filed) {
+                const {data, msg, status} = await changeFiledStatus({
+                    'menu_id': row.menu_id,
+                    'change_field': filed,
+                    'change_value': value
+                });
+
+                // 设置成功之后，同步到当前列表数据
+                if (status == 1){
+                    row[filed] = value;
+                }
+                this.$message({
+                    message: msg,
+                    type: status == 1 ? 'success' : 'error',
+                });
+            },
         },
     };
 </script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
index 29610c9..2d5b15f 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
@@ -71,30 +71,31 @@
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="is_check" label="启用状态">
-                <template slot-scope="scope">
-                    <el-tag :type="scope.row.is_check | statusFilter">
-                        {{ scope.row.is_check | checkFilter }}
+                <template slot-scope="{row}">
+                    <el-tag :type="row.is_check | statusFilter">
+                        <i :class="row.is_check == 1 ? 'el-icon-unlock' : 'el-icon-lock'" />
+                        {{ row.is_check | checkFilter }}
                     </el-tag>
                 </template>
             </el-table-column>
             <el-table-column
-                show-overflow-tooltip
                 fixed="right"
                 label="操作"
-                width="230"
                 align="center"
             >
                 <template v-slot="scope">
                     <!-- 状态变更 -->
-                    <el-button v-if="scope.row.role_id > 1 && scope.row.is_check == 0" type="text" icon="el-icon-unlock"
+                    <el-button v-if="scope.row.role_id > 1 && scope.row.is_check == 0" type="text"
                                @click="changeStatus(scope.row, 1)">
                         <el-tag :type="1 | statusFilter">
+                            <i class="el-icon-unlock" />
                             启用
                         </el-tag>
                     </el-button>
-                    <el-button v-else-if="scope.row.role_id > 1 && scope.row.is_check == 1" type="text" icon="el-icon-lock"
+                    <el-button v-else-if="scope.row.role_id > 1 && scope.row.is_check == 1" type="text"
                                @click="changeStatus(scope.row, 0)">
                         <el-tag :type="0 | statusFilter">
+                            <i class="el-icon-lock" />
                             禁用
                         </el-tag>
                     </el-button>
@@ -118,7 +119,7 @@
 
         <!-- 详情 -->
         <el-dialog :visible.sync="dialogVisible" :title="dialogType === 'edit' ? '编辑角色' : '新增角色'">
-            <el-form ref="role" :model="role" label-width="80px" label-position="left">
+            <el-form ref="role" :model="role" label-width="80px">
                 <el-form-item label="角色名称">
                     <el-input v-model="role.role_name"
                               :autosize="{ minRows: 2, maxRows: 20}"
@@ -137,7 +138,7 @@
                         <el-radio :label="1" :checked="role.is_check == 1 ? 'checked' : ''">启用</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="Menus">
+                <el-form-item label="菜单权限">
                     <el-tree ref="tree" :check-strictly="checkStrictly" :data="menusData" :props="defaultProps"
                              show-checkbox node-key="menu_id"
                              class="permission-tree"/>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue
index 6253164..c60147b 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue
@@ -45,12 +45,14 @@
             class="margin-buttom-10"
         >
             <el-table-column show-overflow-tooltip type="selection"/>
+
             <el-table-column
                 show-overflow-tooltip
                 prop="log_id"
                 label="Id"
                 align="center"
             />
+
             <el-table-column align="center" prop="admin" label="管理员">
                 <template slot-scope="{ row }">
                     <span v-if="row.admin">
@@ -60,18 +62,21 @@
                     </span>
                 </template>
             </el-table-column>
+
             <el-table-column
                 show-overflow-tooltip
                 prop="log_method"
                 label="请求方式"
                 align="center"
             />
+
             <el-table-column
                 show-overflow-tooltip
                 prop="log_action"
                 label="请求地址"
                 align="center"
             />
+
             <el-table-column
                 show-overflow-tooltip
                 prop="log_duration"
@@ -82,32 +87,37 @@
                     {{ row.log_duration }} s
                 </template>
             </el-table-column>
+
             <el-table-column
                 show-overflow-tooltip
                 prop="created_ip"
                 label="IP"
                 align="center"
             />
+
             <el-table-column align="center" prop="log_status" label="登录状态">
-                <template slot-scope="scope">
-                    <el-tag :type="scope.row.log_status | statusFilter">
-                        {{ scope.row.log_status | checkFilter }}
+                <template slot-scope="{row}">
+                    <el-tag :type="row.log_status | statusFilter">
+                        <i :class="row.log_status == 1 ? 'el-icon-success' : 'el-icon-error'" />
+                        {{ row.log_status | checkFilter }}
                     </el-tag>
                 </template>
             </el-table-column>
+
             <el-table-column
                 show-overflow-tooltip
                 prop="description"
                 label="描述"
                 align="center"
             />
+
             <el-table-column label="登录时间" show-overflow-tooltip align="center">
                 <template slot-scope="{ row }">
                     {{ row.created_time | parseTime("{y}-{m}-{d} {h}:{i}") }}
                 </template>
             </el-table-column>
+
             <el-table-column
-                show-overflow-tooltip
                 label="操作"
                 align="center"
             >
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/adminlogs/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/adminlogs/index.vue
index 91389b3..a12fa97 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/adminlogs/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/adminlogs/index.vue
@@ -89,9 +89,10 @@
                 align="center"
             />
             <el-table-column align="center" prop="log_status" label="请求状态">
-                <template slot-scope="scope">
-                    <el-tag :type="scope.row.log_status | statusFilter">
-                        {{ scope.row.log_status | checkFilter }}
+                <template slot-scope="{row}">
+                    <el-tag :type="row.log_status | statusFilter">
+                        <i :class="row.log_status == 1 ? 'el-icon-success' : 'el-icon-error'" />
+                        {{ row.log_status | checkFilter }}
                     </el-tag>
                 </template>
             </el-table-column>
@@ -101,7 +102,6 @@
                 </template>
             </el-table-column>
             <el-table-column
-                    show-overflow-tooltip
                     label="操作"
                     align="center"
             >
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue
index 1708698..1446b22 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue
@@ -4,7 +4,7 @@
             :visible.sync="dialogFormVisible"
             @close="close"
     >
-        <el-form ref="form" :model="form" :rules="rules">
+        <el-form ref="form" :model="form" :rules="rules" label-width="90px">
             <el-form-item label="账户：">
                 <el-input
                         v-model.trim="form.admin_name"
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
index 9fdc2d9..0a4a505 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
@@ -90,10 +90,8 @@
                 </template>
             </el-table-column>
             <el-table-column
-                show-overflow-tooltip
                 fixed="right"
                 label="操作"
-                width="230"
                 align="center"
             >
                 <template v-slot="scope">
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue
index e9df2f6..6ff515b 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue
@@ -4,7 +4,7 @@
         :visible.sync="dialogFormVisible"
         @close="close"
     >
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="90px">
             <el-form-item label="父级菜单" prop="parent_id">
                 <el-select v-model="form.parent_id" placeholder="请选择父级" autocomplete="off">
                     <el-option
@@ -28,7 +28,7 @@
             <el-form-item label="排序" prop="category_sort">
                 <el-input v-model="form.category_sort" autocomplete="off" value="99"></el-input>
             </el-form-item>
-            <el-form-item label="是否启用：" prop="is_check">
+            <el-form-item label="是否启用" prop="is_check">
                 <el-radio-group v-model="form.is_check">
                     <el-radio :label="0" :checked="form.is_check == 0 ? 'checked' : ''">禁用</el-radio>
                     <el-radio :label="1" :checked="form.is_check == 1 ? 'checked' : ''">启用</el-radio>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
index 7734da6..3df78d5 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
@@ -31,9 +31,10 @@
                 align="center"
             ></el-table-column>
             <el-table-column align="center" prop="is_check" label="启用状态">
-                <template slot-scope="scope">
-                    <el-tag :type="scope.row.is_check | statusFilter">
-                        {{ scope.row.is_check | checkFilter }}
+                <template slot-scope="{row}">
+                    <el-tag :type="row.is_check | statusFilter">
+                        <i :class="row.is_check == 1 ? 'el-icon-unlock' : 'el-icon-lock'" />
+                        {{ row.is_check | checkFilter }}
                     </el-tag>
                 </template>
             </el-table-column>
@@ -43,22 +44,22 @@
                 </template>
             </el-table-column>
             <el-table-column
-                show-overflow-tooltip
                 align="center"
                 label="操作"
-                width="230"
             >
                 <template v-slot="scope">
                     <!-- 状态变更 -->
-                    <el-button v-if="scope.row.is_check == 0" type="text" icon="el-icon-unlock"
+                    <el-button v-if="scope.row.is_check == 0" type="text"
                                @click="changeStatus(scope.row, 1)">
                         <el-tag :type="1 | statusFilter">
+                            <i class="el-icon-unlock" />
                             启用
                         </el-tag>
                     </el-button>
-                    <el-button v-else-if="scope.row.is_check == 1" type="text" icon="el-icon-lock"
+                    <el-button v-else-if="scope.row.is_check == 1" type="text"
                                @click="changeStatus(scope.row, 0)">
                         <el-tag :type="0 | statusFilter">
+                            <i class="el-icon-lock" />
                             禁用
                         </el-tag>
                     </el-button>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue
index fe96d3f..a0f5918 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="createPost-container">
-        <el-form ref="postForm" :model="postForm" :rules="rules" class="form-container">
+        <el-form ref="postForm" :model="postForm" :rules="rules" class="form-container" label-width="90px">
             <sticky :z-index="10" :class-name="'sub-navbar publish'">
                 <SourceUrlDropdown v-model="postForm.article_link"/>
                 <el-button v-loading="loading" style="margin-left: 10px;" type="success" @click="submitForm">
@@ -9,7 +9,7 @@
             </sticky>
 
             <div class="createPost-main-container">
-                <el-form-item prop="article_title" label-width="70px" label="文章标题:">
+                <el-form-item prop="article_title" label="文章标题">
                     <MDinput v-model="postForm.article_title" :maxlength="100" name="name" required>
                         Title
                     </MDinput>
@@ -158,10 +158,10 @@
             const validateRequire = (rule, value, callback) => {
                 if (value === '') {
                     this.$message({
-                        message: rule.field + '为必传项',
+                        message: rule.field + '为必填项',
                         type: 'error'
                     })
-                    callback(new Error(rule.field + '为必传项'))
+                    callback(new Error(rule.field + '为必填项'))
                 } else {
                     callback();
                 }
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue
index 7d45fd0..1f7c561 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue
@@ -46,8 +46,8 @@
 
         <el-table v-loading="listLoading" :data="list" border fit highlight-current-row style="width: 100%">
             <el-table-column align="center" label="Id">
-                <template slot-scope="scope">
-                    <span>{{ scope.row.article_id }}</span>
+                <template slot-scope="{row}">
+                    <span>{{ row.article_id }}</span>
                 </template>
             </el-table-column>
 
@@ -112,55 +112,55 @@
 
             <el-table-column align="center"
                              label="操作">
-                <template slot-scope="scope">
+                <template slot-scope="{row}">
                     <!-- 是否置顶 -->
-                    <el-button v-if="scope.row.set_top == 0" type="text"
-                               @click="changeStatus(scope.row, 1, 'set_top')">
+                    <el-button v-if="row.set_top == 0" type="text"
+                               @click="changeStatus(row, 1, 'set_top')">
                         <el-tag :type="1 | statusFilter">
                             <i class="el-icon-top" />
                             置顶
                         </el-tag>
                     </el-button>
-                    <el-button v-else-if="scope.row.set_top == 1" type="text"
-                               @click="changeStatus(scope.row, 0, 'set_top')">
+                    <el-button v-else-if="row.set_top == 1" type="text"
+                               @click="changeStatus(row, 0, 'set_top')">
                         <el-tag :type="0 | statusFilter">
                             <i class="el-icon-bottom" />
                             取消’置顶‘
                         </el-tag>
                     </el-button>
                     <!-- 是否推荐 -->
-                    <el-button v-if="scope.row.is_recommend == 0" type="text"
-                               @click="changeStatus(scope.row, 1, 'is_recommend')">
+                    <el-button v-if="row.is_recommend == 0" type="text"
+                               @click="changeStatus(row, 1, 'is_recommend')">
                         <el-tag :type="1 | statusFilter">
                             <i class="el-icon-info" />
                             推荐
                         </el-tag>
                     </el-button>
-                    <el-button v-else-if="scope.row.is_recommend == 1" type="text"
-                               @click="changeStatus(scope.row, 0, 'is_recommend')">
+                    <el-button v-else-if="row.is_recommend == 1" type="text"
+                               @click="changeStatus(row, 0, 'is_recommend')">
                         <el-tag :type="0 | statusFilter">
                             <i class="el-icon-remove" />
                             取消’推荐‘
                         </el-tag>
                     </el-button>
                     <!-- 状态变更 -->
-                    <el-button v-if="scope.row.is_public == 0" type="text"
-                               @click="changeStatus(scope.row, 1, 'is_public')">
+                    <el-button v-if="row.is_public == 0" type="text"
+                               @click="changeStatus(row, 1, 'is_public')">
                         <el-tag :type="1 | statusFilter">
                             <i class="el-icon-unlock" />
                             公开
                         </el-tag>
                     </el-button>
-                    <el-button v-else-if="scope.row.is_public == 1" type="text"
-                               @click="changeStatus(scope.row, 0, 'is_public')">
+                    <el-button v-else-if="row.is_public == 1" type="text"
+                               @click="changeStatus(row, 0, 'is_public')">
                         <el-tag :type="0 | statusFilter">
                             <i class="el-icon-lock" />
                             私密
                         </el-tag>
                     </el-button>
                     <!-- 编辑与删除 -->
-                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)"> 编辑 </el-button>
-                    <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"> 删除 </el-button>
+                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(row)"> 编辑 </el-button>
+                    <el-button type="text" icon="el-icon-delete" @click="handleDelete(row)"> 删除 </el-button>
                 </template>
             </el-table-column>
         </el-table>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue
index 036a9f2..75ac418 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue
@@ -86,30 +86,31 @@
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="is_check" label="启用状态">
-                <template slot-scope="scope">
-                    <el-tag :type="scope.row.is_check | statusFilter">
-                        {{ scope.row.is_check | checkFilter }}
+                <template slot-scope="{row}">
+                    <el-tag :type="row.is_check | statusFilter">
+                        <i :class="row.is_check == 1 ? 'el-icon-unlock' : 'el-icon-lock'" />
+                        {{ row.is_check | checkFilter }}
                     </el-tag>
                 </template>
             </el-table-column>
             <el-table-column
-                    show-overflow-tooltip
                     fixed="right"
                     label="操作"
-                    width="230"
                     align="center"
             >
                 <template v-slot="scope">
                     <!-- 状态变更 -->
-                    <el-button v-if="scope.row.is_check == 0" type="text" icon="el-icon-unlock"
+                    <el-button v-if="scope.row.is_check == 0" type="text"
                                @click="changeStatus(scope.row, 1)">
                         <el-tag :type="1 | statusFilter">
+                            <i class="el-icon-unlock" />
                             启用
                         </el-tag>
                     </el-button>
-                    <el-button v-else-if="scope.row.is_check == 1" type="text" icon="el-icon-lock"
+                    <el-button v-else-if="scope.row.is_check == 1" type="text"
                                @click="changeStatus(scope.row, 0)">
                         <el-tag :type="0 | statusFilter">
+                            <i class="el-icon-lock" />
                             禁用
                         </el-tag>
                     </el-button>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
index 7b60e84..64a21d9 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
@@ -107,18 +107,17 @@
             </el-table-column>
 
             <el-table-column align="center" prop="is_check" label="启用状态">
-                <template slot-scope="scope">
-                    <el-tag :type="scope.row.is_check | statusFilter">
-                        {{ scope.row.is_check | checkFilter }}
+                <template slot-scope="{row}">
+                    <el-tag :type="row.is_check | statusFilter">
+                        <i :class="row.is_check == 1 ? 'el-icon-unlock' : 'el-icon-lock'" />
+                        {{ row.is_check | checkFilter }}
                     </el-tag>
                 </template>
             </el-table-column>
 
             <el-table-column
-                show-overflow-tooltip
                 fixed="right"
                 label="操作"
-                width="230"
                 align="center"
             >
                 <template v-slot="scope">
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue
index c161d69..c2a9ddc 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue
@@ -86,30 +86,31 @@
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="is_check" label="启用状态">
-                <template slot-scope="scope">
-                    <el-tag :type="scope.row.is_check | statusFilter">
-                        {{ scope.row.is_check | checkFilter }}
+                <template slot-scope="{row}">
+                    <el-tag :type="row.is_check | statusFilter">
+                        <i :class="row.is_check == 1 ? 'el-icon-unlock' : 'el-icon-lock'" />
+                        {{ row.is_check | checkFilter }}
                     </el-tag>
                 </template>
             </el-table-column>
             <el-table-column
-                    show-overflow-tooltip
                     fixed="right"
                     label="操作"
-                    width="230"
                     align="center"
             >
                 <template v-slot="scope">
                     <!-- 状态变更 -->
-                    <el-button v-if="scope.row.is_check == 0" type="text" icon="el-icon-unlock"
+                    <el-button v-if="scope.row.is_check == 0" type="text"
                                @click="changeStatus(scope.row, 1)">
                         <el-tag :type="1 | statusFilter">
+                            <i class="el-icon-unlock" />
                             启用
                         </el-tag>
                     </el-button>
-                    <el-button v-else-if="scope.row.is_check == 1" type="text" icon="el-icon-lock"
+                    <el-button v-else-if="scope.row.is_check == 1" type="text"
                                @click="changeStatus(scope.row, 0)">
                         <el-tag :type="0 | statusFilter">
+                            <i class="el-icon-lock" />
                             禁用
                         </el-tag>
                     </el-button>
-- 
Gitee


From 9e0b26b1572c6b0f85a551567406724046173d29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Wed, 6 Jan 2021 10:55:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?1.scope.row=E6=9B=BF=E6=8D=A2=E4=B8=BArow?=
 =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81=E5=86=99=E6=B3=95=EF=BC=9B?=
 =?UTF-8?q?=202.=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=EF=BC=9A=E9=9A=90=E8=97=8F=E4=B8=8E=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=AF=B9=E5=BA=94=E6=95=88=E6=9E=9C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/admin_menus/index.vue               | 33 +++++++++----------
 .../views/admin_roles/index.vue               | 14 ++++----
 .../views/adminloginlogs/index.vue            |  4 +--
 .../views/adminlogs/index.vue                 |  4 +--
 .../vue-element-admin/views/admins/index.vue  | 16 ++++-----
 .../views/article_categories/index.vue        | 14 ++++----
 .../vue-element-admin/views/banners/index.vue | 14 ++++----
 .../vue-element-admin/views/configs/index.vue | 14 ++++----
 .../views/friendlinks/index.vue               | 14 ++++----
 9 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue
index 645898b..c4391c6 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue
@@ -46,9 +46,9 @@
 
             <el-table-column show-overflow-tooltip label="是否隐藏" align="center">
                 <template slot-scope="{row}">
-                    <el-tag :type="row.is_hidden | statusFilter">
-                        <svg-icon :icon-class="row.is_hidden == 0 ? 'eye' : 'eye-open'" />
-                        {{ row.is_hidden == 1 ? "是" : "否" }}
+                    <el-tag :type="row.is_hidden == 1 ? 'danger' : 'success'">
+                        <svg-icon :icon-class="row.is_hidden == 1 ? 'eye' : 'eye-open'" />
+                        {{ row.is_hidden == 1 ? "隐藏" : "展示" }}
                     </el-tag>
                 </template>
             </el-table-column>
@@ -80,26 +80,25 @@
                 align="center"
                 label="操作"
             >
-                show-overflow-tooltip
-                <template v-slot="scope">
+                <template v-slot="{row}">
                     <!-- 状态变更 -->
-                    <el-button v-if="scope.row.is_hidden == 0" type="text"
-                               @click="changeStatus(scope.row, 1, 'is_hidden')">
-                        <el-tag :type="1 | statusFilter">
-                            <i class="el-icon-unlock" />
-                            展示
-                        </el-tag>
-                    </el-button>
-                    <el-button v-else-if="scope.row.is_hidden == 1" type="text"
-                               @click="changeStatus(scope.row, 0, 'is_hidden')">
+                    <el-button v-if="row.is_hidden == 0" type="text"
+                               @click="changeStatus(row, 1, 'is_hidden')">
                         <el-tag :type="0 | statusFilter">
-                            <i class="el-icon-lock" />
+                            <svg-icon icon-class="eye" />
                             隐藏
                         </el-tag>
                     </el-button>
+                    <el-button v-else-if="row.is_hidden == 1" type="text"
+                               @click="changeStatus(row, 0, 'is_hidden')">
+                        <el-tag :type="1 | statusFilter">
+                            <svg-icon icon-class="eye-open" />
+                            展示
+                        </el-tag>
+                    </el-button>
                     <!-- 编辑与删除 -->
-                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
-                    <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
+                    <el-button type="text" icon="el-icon-delete" @click="handleDelete(row)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
index 2d5b15f..826f06d 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
@@ -83,25 +83,25 @@
                 label="操作"
                 align="center"
             >
-                <template v-slot="scope">
+                <template v-slot="{row}">
                     <!-- 状态变更 -->
-                    <el-button v-if="scope.row.role_id > 1 && scope.row.is_check == 0" type="text"
-                               @click="changeStatus(scope.row, 1)">
+                    <el-button v-if="row.role_id > 1 && row.is_check == 0" type="text"
+                               @click="changeStatus(row, 1)">
                         <el-tag :type="1 | statusFilter">
                             <i class="el-icon-unlock" />
                             启用
                         </el-tag>
                     </el-button>
-                    <el-button v-else-if="scope.row.role_id > 1 && scope.row.is_check == 1" type="text"
-                               @click="changeStatus(scope.row, 0)">
+                    <el-button v-else-if="row.role_id > 1 && row.is_check == 1" type="text"
+                               @click="changeStatus(row, 0)">
                         <el-tag :type="0 | statusFilter">
                             <i class="el-icon-lock" />
                             禁用
                         </el-tag>
                     </el-button>
                     <!-- 编辑与删除 -->
-                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
-                    <el-button type="text" icon="el-icon-delete" v-if="scope.row.role_id > 1" @click="handleDelete(scope.row)">删除</el-button>
+                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
+                    <el-button type="text" icon="el-icon-delete" v-if="row.role_id > 1" @click="handleDelete(row)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue
index c60147b..f243044 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue
@@ -121,8 +121,8 @@
                 label="操作"
                 align="center"
             >
-                <template v-slot="scope">
-                    <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+                <template v-slot="{row}">
+                    <el-button type="text" icon="el-icon-delete" @click="handleDelete(row)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/adminlogs/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/adminlogs/index.vue
index a12fa97..62daa96 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/adminlogs/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/adminlogs/index.vue
@@ -105,8 +105,8 @@
                     label="操作"
                     align="center"
             >
-                <template v-slot="scope">
-                    <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+                <template v-slot="{row}">
+                    <el-button type="text" icon="el-icon-delete" @click="handleDelete(row)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
index 0a4a505..35a251b 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
@@ -94,26 +94,26 @@
                 label="操作"
                 align="center"
             >
-                <template v-slot="scope">
+                <template v-slot="{row}">
                     <!-- 状态变更 -->
-                    <el-button v-if="scope.row.admin_id > 1 && scope.row.is_check == 0" type="text"
-                               @click="changeStatus(scope.row, 1)">
+                    <el-button v-if="row.admin_id > 1 && row.is_check == 0" type="text"
+                               @click="changeStatus(row, 1)">
                         <el-tag :type="1 | statusFilter">
                             <i class="el-icon-unlock" />
                             启用
                         </el-tag>
                     </el-button>
-                    <el-button v-else-if="scope.row.admin_id > 1 && scope.row.is_check == 1" type="text"
-                               @click="changeStatus(scope.row, 0)">
+                    <el-button v-else-if="row.admin_id > 1 && row.is_check == 1" type="text"
+                               @click="changeStatus(row, 0)">
                         <el-tag :type="0 | statusFilter">
                             <i class="el-icon-lock" />
                             禁用
                         </el-tag>
                     </el-button>
                     <!-- 编辑与删除 -->
-                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
-                    <el-button type="text" icon="el-icon-delete" v-if="scope.row.admin_id != 1"
-                               @click="handleDelete(scope.row)">删除
+                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
+                    <el-button type="text" icon="el-icon-delete" v-if="row.admin_id != 1"
+                               @click="handleDelete(row)">删除
                     </el-button>
                 </template>
             </el-table-column>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
index 3df78d5..beffdbe 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
@@ -47,25 +47,25 @@
                 align="center"
                 label="操作"
             >
-                <template v-slot="scope">
+                <template v-slot="{row}">
                     <!-- 状态变更 -->
-                    <el-button v-if="scope.row.is_check == 0" type="text"
-                               @click="changeStatus(scope.row, 1)">
+                    <el-button v-if="row.is_check == 0" type="text"
+                               @click="changeStatus(row, 1)">
                         <el-tag :type="1 | statusFilter">
                             <i class="el-icon-unlock" />
                             启用
                         </el-tag>
                     </el-button>
-                    <el-button v-else-if="scope.row.is_check == 1" type="text"
-                               @click="changeStatus(scope.row, 0)">
+                    <el-button v-else-if="row.is_check == 1" type="text"
+                               @click="changeStatus(row, 0)">
                         <el-tag :type="0 | statusFilter">
                             <i class="el-icon-lock" />
                             禁用
                         </el-tag>
                     </el-button>
                     <!-- 编辑与删除 -->
-                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
-                    <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
+                    <el-button type="text" icon="el-icon-delete" @click="handleDelete(row)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue
index 75ac418..37ec680 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue
@@ -98,25 +98,25 @@
                     label="操作"
                     align="center"
             >
-                <template v-slot="scope">
+                <template v-slot="{row}">
                     <!-- 状态变更 -->
-                    <el-button v-if="scope.row.is_check == 0" type="text"
-                               @click="changeStatus(scope.row, 1)">
+                    <el-button v-if="row.is_check == 0" type="text"
+                               @click="changeStatus(row, 1)">
                         <el-tag :type="1 | statusFilter">
                             <i class="el-icon-unlock" />
                             启用
                         </el-tag>
                     </el-button>
-                    <el-button v-else-if="scope.row.is_check == 1" type="text"
-                               @click="changeStatus(scope.row, 0)">
+                    <el-button v-else-if="row.is_check == 1" type="text"
+                               @click="changeStatus(row, 0)">
                         <el-tag :type="0 | statusFilter">
                             <i class="el-icon-lock" />
                             禁用
                         </el-tag>
                     </el-button>
                     <!-- 编辑与删除 -->
-                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
-                    <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
+                    <el-button type="text" icon="el-icon-delete" @click="handleDelete(row)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
index 64a21d9..0134286 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
@@ -120,23 +120,23 @@
                 label="操作"
                 align="center"
             >
-                <template v-slot="scope">
+                <template v-slot="{row}">
                     <!-- 状态变更 -->
-                    <el-button v-if="scope.row.is_check == 0" type="text" icon="el-icon-unlock"
-                               @click="changeStatus(scope.row, 1)">
+                    <el-button v-if="row.is_check == 0" type="text" icon="el-icon-unlock"
+                               @click="changeStatus(row, 1)">
                         <el-tag :type="1 | statusFilter">
                             启用
                         </el-tag>
                     </el-button>
-                    <el-button v-else-if="scope.row.is_check == 1" type="text" icon="el-icon-lock"
-                               @click="changeStatus(scope.row, 0)">
+                    <el-button v-else-if="row.is_check == 1" type="text" icon="el-icon-lock"
+                               @click="changeStatus(row, 0)">
                         <el-tag :type="0 | statusFilter">
                             禁用
                         </el-tag>
                     </el-button>
                     <!-- 编辑与删除 -->
-                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
-                    <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
+                    <el-button type="text" icon="el-icon-delete" @click="handleDelete(row)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue
index c2a9ddc..ede0a59 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue
@@ -98,25 +98,25 @@
                     label="操作"
                     align="center"
             >
-                <template v-slot="scope">
+                <template v-slot="{row}">
                     <!-- 状态变更 -->
-                    <el-button v-if="scope.row.is_check == 0" type="text"
-                               @click="changeStatus(scope.row, 1)">
+                    <el-button v-if="row.is_check == 0" type="text"
+                               @click="changeStatus(row, 1)">
                         <el-tag :type="1 | statusFilter">
                             <i class="el-icon-unlock" />
                             启用
                         </el-tag>
                     </el-button>
-                    <el-button v-else-if="scope.row.is_check == 1" type="text"
-                               @click="changeStatus(scope.row, 0)">
+                    <el-button v-else-if="row.is_check == 1" type="text"
+                               @click="changeStatus(row, 0)">
                         <el-tag :type="0 | statusFilter">
                             <i class="el-icon-lock" />
                             禁用
                         </el-tag>
                     </el-button>
                     <!-- 编辑与删除 -->
-                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
-                    <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
+                    <el-button type="text" icon="el-icon-delete" @click="handleDelete(row)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
-- 
Gitee


From 61fd1c6d7138c34de10a7e0a3a35415de11c665a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Wed, 6 Jan 2021 11:13:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1.=E7=A7=BB=E9=99=A4mock=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=9B=202.demo=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E5=BD=92=E6=A1=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Resources/vue-element-admin/main.js |  21 +-
 .../vue-element-admin/mock/article.js         | 116 ----
 .../Resources/vue-element-admin/mock/index.js |  60 --
 .../vue-element-admin/mock/mock-server.js     |  81 ---
 .../vue-element-admin/mock/remote-search.js   |  51 --
 .../vue-element-admin/mock/role/index.js      |  98 ----
 .../vue-element-admin/mock/role/routes.js     | 530 ------------------
 .../Resources/vue-element-admin/mock/user.js  |  84 ---
 .../Resources/vue-element-admin/mock/utils.js |  48 --
 .../vue-element-admin/router/index.js         |   4 +-
 .../router/modules/charts.js                  |   6 +-
 .../router/modules/components.js              |  20 +-
 .../views/{ => demo}/charts/keyboard.vue      |   0
 .../views/{ => demo}/charts/line.vue          |   0
 .../views/{ => demo}/charts/mix-chart.vue     |   0
 .../components-demo/avatar-upload.vue         |   0
 .../components-demo/back-to-top.vue           |   0
 .../{ => demo}/components-demo/count-to.vue   |   0
 .../components-demo/drag-kanban.vue           |   0
 .../components-demo/drag-select.vue           |   0
 .../{ => demo}/components-demo/dropzone.vue   |   0
 .../components-demo/json-editor.vue           |   0
 .../{ => demo}/components-demo/markdown.vue   |   0
 .../{ => demo}/components-demo/mixin.vue      |   0
 .../{ => demo}/components-demo/tinymce.vue    |   0
 .../{sundry => demo}/icons/element-icons.js   |   0
 .../views/{sundry => demo}/icons/index.vue    |   0
 .../views/{sundry => demo}/icons/svg-icons.js |   0
 .../views/{sundry => demo}/redirect/index.vue |   0
 29 files changed, 23 insertions(+), 1096 deletions(-)
 delete mode 100644 app/Modules/Admin/Resources/vue-element-admin/mock/article.js
 delete mode 100644 app/Modules/Admin/Resources/vue-element-admin/mock/index.js
 delete mode 100644 app/Modules/Admin/Resources/vue-element-admin/mock/mock-server.js
 delete mode 100644 app/Modules/Admin/Resources/vue-element-admin/mock/remote-search.js
 delete mode 100644 app/Modules/Admin/Resources/vue-element-admin/mock/role/index.js
 delete mode 100644 app/Modules/Admin/Resources/vue-element-admin/mock/role/routes.js
 delete mode 100644 app/Modules/Admin/Resources/vue-element-admin/mock/user.js
 delete mode 100644 app/Modules/Admin/Resources/vue-element-admin/mock/utils.js
 rename app/Modules/Admin/Resources/vue-element-admin/views/{ => demo}/charts/keyboard.vue (100%)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{ => demo}/charts/line.vue (100%)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{ => demo}/charts/mix-chart.vue (100%)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{ => demo}/components-demo/avatar-upload.vue (100%)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{ => demo}/components-demo/back-to-top.vue (100%)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{ => demo}/components-demo/count-to.vue (100%)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{ => demo}/components-demo/drag-kanban.vue (100%)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{ => demo}/components-demo/drag-select.vue (100%)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{ => demo}/components-demo/dropzone.vue (100%)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{ => demo}/components-demo/json-editor.vue (100%)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{ => demo}/components-demo/markdown.vue (100%)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{ => demo}/components-demo/mixin.vue (100%)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{ => demo}/components-demo/tinymce.vue (100%)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{sundry => demo}/icons/element-icons.js (100%)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{sundry => demo}/icons/index.vue (100%)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{sundry => demo}/icons/svg-icons.js (100%)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{sundry => demo}/redirect/index.vue (100%)

diff --git a/app/Modules/Admin/Resources/vue-element-admin/main.js b/app/Modules/Admin/Resources/vue-element-admin/main.js
index ddf47a2..0a85d07 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/main.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/main.js
@@ -31,27 +31,22 @@ import * as filters from './filters' // global filters
  * please remove it before going online ! ! !
  */
 
-if (process.env.NODE_ENV === 'production') {
-  const { mockXHR } = require('./mock')
-  mockXHR()
-}
-
 Vue.use(Element, {
-  size: Cookies.get('size') || 'medium', // set element-ui default size
-  i18n: (key, value) => i18n.t(key, value)
+    size: Cookies.get('size') || 'medium', // set element-ui default size
+    i18n: (key, value) => i18n.t(key, value)
 })
 
 // register global utility filters
 Object.keys(filters).forEach(key => {
-  Vue.filter(key, filters[key])
+    Vue.filter(key, filters[key])
 })
 
 Vue.config.productionTip = false
 
 new Vue({
-  el: '#app',
-  router,
-  store,
-  i18n,
-  render: h => h(App)
+    el: '#app',
+    router,
+    store,
+    i18n,
+    render: h => h(App)
 })
diff --git a/app/Modules/Admin/Resources/vue-element-admin/mock/article.js b/app/Modules/Admin/Resources/vue-element-admin/mock/article.js
deleted file mode 100644
index 23d8ba5..0000000
--- a/app/Modules/Admin/Resources/vue-element-admin/mock/article.js
+++ /dev/null
@@ -1,116 +0,0 @@
-const Mock = require('mockjs')
-
-const List = []
-const count = 100
-
-const baseContent = '<p>I am testing data, I am testing data.</p><p><img src="https://wpimg.wallstcn.com/4c69009c-0fd4-4153-b112-6cb53d1cf943"></p>'
-const image_uri = 'https://wpimg.wallstcn.com/e4558086-631c-425c-9430-56ffb46e70b3'
-
-for (let i = 0; i < count; i++) {
-  List.push(Mock.mock({
-    id: '@increment',
-    timestamp: +Mock.Random.date('T'),
-    author: '@first',
-    reviewer: '@first',
-    title: '@title(5, 10)',
-    content_short: 'mock data',
-    content: baseContent,
-    forecast: '@float(0, 100, 2, 2)',
-    importance: '@integer(1, 3)',
-    'type|1': ['CN', 'US', 'JP', 'EU'],
-    'status|1': ['published', 'draft'],
-    display_time: '@datetime',
-    comment_disabled: true,
-    pageviews: '@integer(300, 5000)',
-    image_uri,
-    platforms: ['a-platform']
-  }))
-}
-
-module.exports = [
-  {
-    url: '/vue-element-admin/article/list',
-    type: 'get',
-    response: config => {
-      const { importance, type, title, page = 1, limit = 20, sort } = config.query
-
-      let mockList = List.filter(item => {
-        if (importance && item.importance !== +importance) return false
-        if (type && item.type !== type) return false
-        if (title && item.title.indexOf(title) < 0) return false
-        return true
-      })
-
-      if (sort === '-id') {
-        mockList = mockList.reverse()
-      }
-
-      const pageList = mockList.filter((item, index) => index < limit * page && index >= limit * (page - 1))
-
-      return {
-        code: 20000,
-        data: {
-          total: mockList.length,
-          items: pageList
-        }
-      }
-    }
-  },
-
-  {
-    url: '/vue-element-admin/article/detail',
-    type: 'get',
-    response: config => {
-      const { id } = config.query
-      for (const article of List) {
-        if (article.id === +id) {
-          return {
-            code: 20000,
-            data: article
-          }
-        }
-      }
-    }
-  },
-
-  {
-    url: '/vue-element-admin/article/pv',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 20000,
-        data: {
-          pvData: [
-            { key: 'PC', pv: 1024 },
-            { key: 'mobile', pv: 1024 },
-            { key: 'ios', pv: 1024 },
-            { key: 'android', pv: 1024 }
-          ]
-        }
-      }
-    }
-  },
-
-  {
-    url: '/vue-element-admin/article/create',
-    type: 'post',
-    response: _ => {
-      return {
-        code: 20000,
-        data: 'success'
-      }
-    }
-  },
-
-  {
-    url: '/vue-element-admin/article/update',
-    type: 'post',
-    response: _ => {
-      return {
-        code: 20000,
-        data: 'success'
-      }
-    }
-  }
-]
-
diff --git a/app/Modules/Admin/Resources/vue-element-admin/mock/index.js b/app/Modules/Admin/Resources/vue-element-admin/mock/index.js
deleted file mode 100644
index 2eed65d..0000000
--- a/app/Modules/Admin/Resources/vue-element-admin/mock/index.js
+++ /dev/null
@@ -1,60 +0,0 @@
-const Mock = require('mockjs')
-const { param2Obj } = require('./utils')
-
-const user = require('./user')
-const role = require('./role')
-const article = require('./article')
-const search = require('./remote-search')
-
-const mocks = [
-  ...user,
-  ...role,
-  ...article,
-  ...search
-]
-
-// for front mock
-// please use it cautiously, it will redefine XMLHttpRequest,
-// which will cause many of your third-party libraries to be invalidated(like progress event).
-function mockXHR() {
-  // mock patch
-  // https://github.com/nuysoft/Mock/issues/300
-  Mock.XHR.prototype.proxy_send = Mock.XHR.prototype.send
-  Mock.XHR.prototype.send = function() {
-    if (this.custom.xhr) {
-      this.custom.xhr.withCredentials = this.withCredentials || false
-
-      if (this.responseType) {
-        this.custom.xhr.responseType = this.responseType
-      }
-    }
-    this.proxy_send(...arguments)
-  }
-
-  function XHR2ExpressReqWrap(respond) {
-    return function(options) {
-      let result = null
-      if (respond instanceof Function) {
-        const { body, type, url } = options
-        // https://expressjs.com/en/4x/api.html#req
-        result = respond({
-          method: type,
-          body: JSON.parse(body),
-          query: param2Obj(url)
-        })
-      } else {
-        result = respond
-      }
-      return Mock.mock(result)
-    }
-  }
-
-  for (const i of mocks) {
-    Mock.mock(new RegExp(i.url), i.type || 'get', XHR2ExpressReqWrap(i.response))
-  }
-}
-
-module.exports = {
-  mocks,
-  mockXHR
-}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/mock/mock-server.js b/app/Modules/Admin/Resources/vue-element-admin/mock/mock-server.js
deleted file mode 100644
index 8941ec0..0000000
--- a/app/Modules/Admin/Resources/vue-element-admin/mock/mock-server.js
+++ /dev/null
@@ -1,81 +0,0 @@
-const chokidar = require('chokidar')
-const bodyParser = require('body-parser')
-const chalk = require('chalk')
-const path = require('path')
-const Mock = require('mockjs')
-
-const mockDir = path.join(process.cwd(), 'mock')
-
-function registerRoutes(app) {
-  let mockLastIndex
-  const { mocks } = require('./index.js')
-  const mocksForServer = mocks.map(route => {
-    return responseFake(route.url, route.type, route.response)
-  })
-  for (const mock of mocksForServer) {
-    app[mock.type](mock.url, mock.response)
-    mockLastIndex = app._router.stack.length
-  }
-  const mockRoutesLength = Object.keys(mocksForServer).length
-  return {
-    mockRoutesLength: mockRoutesLength,
-    mockStartIndex: mockLastIndex - mockRoutesLength
-  }
-}
-
-function unregisterRoutes() {
-  Object.keys(require.cache).forEach(i => {
-    if (i.includes(mockDir)) {
-      delete require.cache[require.resolve(i)]
-    }
-  })
-}
-
-// for mock server
-const responseFake = (url, type, respond) => {
-  return {
-    url: new RegExp(`${process.env.VUE_APP_BASE_API}${url}`),
-    type: type || 'get',
-    response(req, res) {
-      console.log('request invoke:' + req.path)
-      res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond))
-    }
-  }
-}
-
-module.exports = app => {
-  // parse app.body
-  // https://expressjs.com/en/4x/api.html#req.body
-  app.use(bodyParser.json())
-  app.use(bodyParser.urlencoded({
-    extended: true
-  }))
-
-  const mockRoutes = registerRoutes(app)
-  var mockRoutesLength = mockRoutes.mockRoutesLength
-  var mockStartIndex = mockRoutes.mockStartIndex
-
-  // watch files, hot reload mock server
-  chokidar.watch(mockDir, {
-    ignored: /mock-server/,
-    ignoreInitial: true
-  }).on('all', (event, path) => {
-    if (event === 'change' || event === 'add') {
-      try {
-        // remove mock routes stack
-        app._router.stack.splice(mockStartIndex, mockRoutesLength)
-
-        // clear routes cache
-        unregisterRoutes()
-
-        const mockRoutes = registerRoutes(app)
-        mockRoutesLength = mockRoutes.mockRoutesLength
-        mockStartIndex = mockRoutes.mockStartIndex
-
-        console.log(chalk.magentaBright(`\n > Mock Server hot reload success! changed  ${path}`))
-      } catch (error) {
-        console.log(chalk.redBright(error))
-      }
-    }
-  })
-}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/mock/remote-search.js b/app/Modules/Admin/Resources/vue-element-admin/mock/remote-search.js
deleted file mode 100644
index 8fc4926..0000000
--- a/app/Modules/Admin/Resources/vue-element-admin/mock/remote-search.js
+++ /dev/null
@@ -1,51 +0,0 @@
-const Mock = require('mockjs')
-
-const NameList = []
-const count = 100
-
-for (let i = 0; i < count; i++) {
-  NameList.push(Mock.mock({
-    name: '@first'
-  }))
-}
-NameList.push({ name: 'mock-Pan' })
-
-module.exports = [
-  // username search
-  {
-    url: '/vue-element-admin/search/user',
-    type: 'get',
-    response: config => {
-      const { name } = config.query
-      const mockNameList = NameList.filter(item => {
-        const lowerCaseName = item.name.toLowerCase()
-        return !(name && lowerCaseName.indexOf(name.toLowerCase()) < 0)
-      })
-      return {
-        code: 20000,
-        data: { items: mockNameList }
-      }
-    }
-  },
-
-  // transaction list
-  {
-    url: '/vue-element-admin/transaction/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 20000,
-        data: {
-          total: 20,
-          'items|20': [{
-            order_no: '@guid()',
-            timestamp: +Mock.Random.date('T'),
-            username: '@name()',
-            price: '@float(1000, 15000, 0, 2)',
-            'status|1': ['success', 'pending']
-          }]
-        }
-      }
-    }
-  }
-]
diff --git a/app/Modules/Admin/Resources/vue-element-admin/mock/role/index.js b/app/Modules/Admin/Resources/vue-element-admin/mock/role/index.js
deleted file mode 100644
index 4643f00..0000000
--- a/app/Modules/Admin/Resources/vue-element-admin/mock/role/index.js
+++ /dev/null
@@ -1,98 +0,0 @@
-const Mock = require('mockjs')
-const { deepClone } = require('../utils')
-const { asyncRoutes, constantRoutes } = require('./routes.js')
-
-const routes = deepClone([...constantRoutes, ...asyncRoutes])
-
-const roles = [
-  {
-    key: 'admin',
-    name: 'admin',
-    description: 'Super Administrator. Have access to view all pages.',
-    routes: routes
-  },
-  {
-    key: 'editor',
-    name: 'editor',
-    description: 'Normal Editor. Can see all pages except permission page',
-    routes: routes.filter(i => i.path !== '/permission')// just a mock
-  },
-  {
-    key: 'visitor',
-    name: 'visitor',
-    description: 'Just a visitor. Can only see the home page and the document page',
-    routes: [{
-      path: '',
-      redirect: 'dashboard',
-      children: [
-        {
-          path: 'dashboard',
-          name: 'Dashboard',
-          meta: { title: 'dashboard', icon: 'dashboard' }
-        }
-      ]
-    }]
-  }
-]
-
-module.exports = [
-  // mock get all routes form server
-  {
-    url: '/vue-element-admin/routes',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 20000,
-        data: routes
-      }
-    }
-  },
-
-  // mock get all roles form server
-  {
-    url: '/vue-element-admin/roles',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 20000,
-        data: roles
-      }
-    }
-  },
-
-  // add role
-  {
-    url: '/vue-element-admin/role',
-    type: 'post',
-    response: {
-      code: 20000,
-      data: {
-        key: Mock.mock('@integer(300, 5000)')
-      }
-    }
-  },
-
-  // update role
-  {
-    url: '/vue-element-admin/role/[A-Za-z0-9]',
-    type: 'put',
-    response: {
-      code: 20000,
-      data: {
-        status: 'success'
-      }
-    }
-  },
-
-  // delete role
-  {
-    url: '/vue-element-admin/role/[A-Za-z0-9]',
-    type: 'delete',
-    response: {
-      code: 20000,
-      data: {
-        status: 'success'
-      }
-    }
-  }
-]
diff --git a/app/Modules/Admin/Resources/vue-element-admin/mock/role/routes.js b/app/Modules/Admin/Resources/vue-element-admin/mock/role/routes.js
deleted file mode 100644
index 757aa38..0000000
--- a/app/Modules/Admin/Resources/vue-element-admin/mock/role/routes.js
+++ /dev/null
@@ -1,530 +0,0 @@
-// Just a mock data
-
-const constantRoutes = [
-  {
-    path: '/redirect',
-    component: 'layout/Layout',
-    hidden: true,
-    children: [
-      {
-        path: '/redirect/:path*',
-        component: 'views/redirect/index'
-      }
-    ]
-  },
-  {
-    path: '/login',
-    component: 'views/login/index',
-    hidden: true
-  },
-  {
-    path: '/auth-redirect',
-    component: 'views/login/auth-redirect',
-    hidden: true
-  },
-  {
-    path: '/404',
-    component: 'views/error-page/404',
-    hidden: true
-  },
-  {
-    path: '/401',
-    component: 'views/error-page/401',
-    hidden: true
-  },
-  {
-    path: '',
-    component: 'layout/Layout',
-    redirect: 'dashboard',
-    children: [
-      {
-        path: 'dashboard',
-        component: 'views/dashboard/index',
-        name: 'Dashboard',
-        meta: { title: 'dashboard', icon: 'dashboard', affix: true }
-      }
-    ]
-  },
-  {
-    path: '/documentation',
-    component: 'layout/Layout',
-    children: [
-      {
-        path: 'index',
-        component: 'views/documentation/index',
-        name: 'Documentation',
-        meta: { title: 'documentation', icon: 'documentation', affix: true }
-      }
-    ]
-  },
-  {
-    path: '/guide',
-    component: 'layout/Layout',
-    redirect: '/guide/index',
-    children: [
-      {
-        path: 'index',
-        component: 'views/guide/index',
-        name: 'Guide',
-        meta: { title: 'guide', icon: 'guide', noCache: true }
-      }
-    ]
-  }
-]
-
-const asyncRoutes = [
-  {
-    path: '/permission',
-    component: 'layout/Layout',
-    redirect: '/permission/index',
-    alwaysShow: true,
-    meta: {
-      title: 'permission',
-      icon: 'lock',
-      roles: ['admin', 'editor']
-    },
-    children: [
-      {
-        path: 'page',
-        component: 'views/permission/page',
-        name: 'PagePermission',
-        meta: {
-          title: 'pagePermission',
-          roles: ['admin']
-        }
-      },
-      {
-        path: 'directive',
-        component: 'views/permission/directive',
-        name: 'DirectivePermission',
-        meta: {
-          title: 'directivePermission'
-        }
-      },
-      {
-        path: 'role',
-        component: 'views/permission/role',
-        name: 'RolePermission',
-        meta: {
-          title: 'rolePermission',
-          roles: ['admin']
-        }
-      }
-    ]
-  },
-
-  {
-    path: '/icon',
-    component: 'layout/Layout',
-    children: [
-      {
-        path: 'index',
-        component: 'views/icons/index',
-        name: 'Icons',
-        meta: { title: 'icons', icon: 'icon', noCache: true }
-      }
-    ]
-  },
-
-  {
-    path: '/components',
-    component: 'layout/Layout',
-    redirect: 'noRedirect',
-    name: 'ComponentDemo',
-    meta: {
-      title: 'components',
-      icon: 'component'
-    },
-    children: [
-      {
-        path: 'tinymce',
-        component: 'views/components-demo/tinymce',
-        name: 'TinymceDemo',
-        meta: { title: 'tinymce' }
-      },
-      {
-        path: 'markdown',
-        component: 'views/components-demo/markdown',
-        name: 'MarkdownDemo',
-        meta: { title: 'markdown' }
-      },
-      {
-        path: 'json-editor',
-        component: 'views/components-demo/json-editor',
-        name: 'JsonEditorDemo',
-        meta: { title: 'jsonEditor' }
-      },
-      {
-        path: 'split-pane',
-        component: 'views/components-demo/split-pane',
-        name: 'SplitpaneDemo',
-        meta: { title: 'splitPane' }
-      },
-      {
-        path: 'avatar-upload',
-        component: 'views/components-demo/avatar-upload',
-        name: 'AvatarUploadDemo',
-        meta: { title: 'avatarUpload' }
-      },
-      {
-        path: 'dropzone',
-        component: 'views/components-demo/dropzone',
-        name: 'DropzoneDemo',
-        meta: { title: 'dropzone' }
-      },
-      {
-        path: 'sticky',
-        component: 'views/components-demo/sticky',
-        name: 'StickyDemo',
-        meta: { title: 'sticky' }
-      },
-      {
-        path: 'count-to',
-        component: 'views/components-demo/count-to',
-        name: 'CountToDemo',
-        meta: { title: 'countTo' }
-      },
-      {
-        path: 'mixin',
-        component: 'views/components-demo/mixin',
-        name: 'ComponentMixinDemo',
-        meta: { title: 'componentMixin' }
-      },
-      {
-        path: 'back-to-top',
-        component: 'views/components-demo/back-to-top',
-        name: 'BackToTopDemo',
-        meta: { title: 'backToTop' }
-      },
-      {
-        path: 'drag-dialog',
-        component: 'views/components-demo/drag-dialog',
-        name: 'DragDialogDemo',
-        meta: { title: 'dragDialog' }
-      },
-      {
-        path: 'drag-select',
-        component: 'views/components-demo/drag-select',
-        name: 'DragSelectDemo',
-        meta: { title: 'dragSelect' }
-      },
-      {
-        path: 'dnd-list',
-        component: 'views/components-demo/dnd-list',
-        name: 'DndListDemo',
-        meta: { title: 'dndList' }
-      },
-      {
-        path: 'drag-kanban',
-        component: 'views/components-demo/drag-kanban',
-        name: 'DragKanbanDemo',
-        meta: { title: 'dragKanban' }
-      }
-    ]
-  },
-  {
-    path: '/charts',
-    component: 'layout/Layout',
-    redirect: 'noRedirect',
-    name: 'Charts',
-    meta: {
-      title: 'charts',
-      icon: 'chart'
-    },
-    children: [
-      {
-        path: 'keyboard',
-        component: 'views/charts/keyboard',
-        name: 'KeyboardChart',
-        meta: { title: 'keyboardChart', noCache: true }
-      },
-      {
-        path: 'line',
-        component: 'views/charts/line',
-        name: 'LineChart',
-        meta: { title: 'lineChart', noCache: true }
-      },
-      {
-        path: 'mixchart',
-        component: 'views/charts/mixChart',
-        name: 'MixChart',
-        meta: { title: 'mixChart', noCache: true }
-      }
-    ]
-  },
-  {
-    path: '/nested',
-    component: 'layout/Layout',
-    redirect: '/nested/menu1/menu1-1',
-    name: 'Nested',
-    meta: {
-      title: 'nested',
-      icon: 'nested'
-    },
-    children: [
-      {
-        path: 'menu1',
-        component: 'views/nested/menu1/index',
-        name: 'Menu1',
-        meta: { title: 'menu1' },
-        redirect: '/nested/menu1/menu1-1',
-        children: [
-          {
-            path: 'menu1-1',
-            component: 'views/nested/menu1/menu1-1',
-            name: 'Menu1-1',
-            meta: { title: 'menu1-1' }
-          },
-          {
-            path: 'menu1-2',
-            component: 'views/nested/menu1/menu1-2',
-            name: 'Menu1-2',
-            redirect: '/nested/menu1/menu1-2/menu1-2-1',
-            meta: { title: 'menu1-2' },
-            children: [
-              {
-                path: 'menu1-2-1',
-                component: 'views/nested/menu1/menu1-2/menu1-2-1',
-                name: 'Menu1-2-1',
-                meta: { title: 'menu1-2-1' }
-              },
-              {
-                path: 'menu1-2-2',
-                component: 'views/nested/menu1/menu1-2/menu1-2-2',
-                name: 'Menu1-2-2',
-                meta: { title: 'menu1-2-2' }
-              }
-            ]
-          },
-          {
-            path: 'menu1-3',
-            component: 'views/nested/menu1/menu1-3',
-            name: 'Menu1-3',
-            meta: { title: 'menu1-3' }
-          }
-        ]
-      },
-      {
-        path: 'menu2',
-        name: 'Menu2',
-        component: 'views/nested/menu2/index',
-        meta: { title: 'menu2' }
-      }
-    ]
-  },
-
-  {
-    path: '/example',
-    component: 'layout/Layout',
-    redirect: '/example/list',
-    name: 'Example',
-    meta: {
-      title: 'example',
-      icon: 'example'
-    },
-    children: [
-      {
-        path: 'create',
-        component: 'views/example/create',
-        name: 'CreateArticle',
-        meta: { title: 'createArticle', icon: 'edit' }
-      },
-      {
-        path: 'edit/:id(\\d+)',
-        component: 'views/example/edit',
-        name: 'EditArticle',
-        meta: { title: 'editArticle', noCache: true },
-        hidden: true
-      },
-      {
-        path: 'list',
-        component: 'views/example/list',
-        name: 'ArticleList',
-        meta: { title: 'articleList', icon: 'list' }
-      }
-    ]
-  },
-
-  {
-    path: '/tab',
-    component: 'layout/Layout',
-    children: [
-      {
-        path: 'index',
-        component: 'views/tab/index',
-        name: 'Tab',
-        meta: { title: 'tab', icon: 'tab' }
-      }
-    ]
-  },
-
-  {
-    path: '/error',
-    component: 'layout/Layout',
-    redirect: 'noRedirect',
-    name: 'ErrorPages',
-    meta: {
-      title: 'errorPages',
-      icon: '404'
-    },
-    children: [
-      {
-        path: '401',
-        component: 'views/error-page/401',
-        name: 'Page401',
-        meta: { title: 'page401', noCache: true }
-      },
-      {
-        path: '404',
-        component: 'views/error-page/404',
-        name: 'Page404',
-        meta: { title: 'page404', noCache: true }
-      }
-    ]
-  },
-
-  {
-    path: '/error-log',
-    component: 'layout/Layout',
-    redirect: 'noRedirect',
-    children: [
-      {
-        path: 'log',
-        component: 'views/error-log/index',
-        name: 'ErrorLog',
-        meta: { title: 'errorLog', icon: 'bug' }
-      }
-    ]
-  },
-
-  {
-    path: '/excel',
-    component: 'layout/Layout',
-    redirect: '/excel/export-excel',
-    name: 'Excel',
-    meta: {
-      title: 'excel',
-      icon: 'excel'
-    },
-    children: [
-      {
-        path: 'export-excel',
-        component: 'views/excel/export-excel',
-        name: 'ExportExcel',
-        meta: { title: 'exportExcel' }
-      },
-      {
-        path: 'export-selected-excel',
-        component: 'views/excel/select-excel',
-        name: 'SelectExcel',
-        meta: { title: 'selectExcel' }
-      },
-      {
-        path: 'export-merge-header',
-        component: 'views/excel/merge-header',
-        name: 'MergeHeader',
-        meta: { title: 'mergeHeader' }
-      },
-      {
-        path: 'upload-excel',
-        component: 'views/excel/upload-excel',
-        name: 'UploadExcel',
-        meta: { title: 'uploadExcel' }
-      }
-    ]
-  },
-
-  {
-    path: '/zip',
-    component: 'layout/Layout',
-    redirect: '/zip/download',
-    alwaysShow: true,
-    meta: { title: 'zip', icon: 'zip' },
-    children: [
-      {
-        path: 'download',
-        component: 'views/zip/index',
-        name: 'ExportZip',
-        meta: { title: 'exportZip' }
-      }
-    ]
-  },
-
-  {
-    path: '/pdf',
-    component: 'layout/Layout',
-    redirect: '/pdf/index',
-    children: [
-      {
-        path: 'index',
-        component: 'views/pdf/index',
-        name: 'PDF',
-        meta: { title: 'pdf', icon: 'pdf' }
-      }
-    ]
-  },
-  {
-    path: '/pdf/download',
-    component: 'views/pdf/download',
-    hidden: true
-  },
-
-  {
-    path: '/theme',
-    component: 'layout/Layout',
-    redirect: 'noRedirect',
-    children: [
-      {
-        path: 'index',
-        component: 'views/theme/index',
-        name: 'Theme',
-        meta: { title: 'theme', icon: 'theme' }
-      }
-    ]
-  },
-
-  {
-    path: '/clipboard',
-    component: 'layout/Layout',
-    redirect: 'noRedirect',
-    children: [
-      {
-        path: 'index',
-        component: 'views/clipboard/index',
-        name: 'ClipboardDemo',
-        meta: { title: 'clipboardDemo', icon: 'clipboard' }
-      }
-    ]
-  },
-
-  {
-    path: '/i18n',
-    component: 'layout/Layout',
-    children: [
-      {
-        path: 'index',
-        component: 'views/i18n-demo/index',
-        name: 'I18n',
-        meta: { title: 'i18n', icon: 'international' }
-      }
-    ]
-  },
-
-  {
-    path: 'external-link',
-    component: 'layout/Layout',
-    children: [
-      {
-        path: 'https://github.com/PanJiaChen/vue-element-admin',
-        meta: { title: 'externalLink', icon: 'link' }
-      }
-    ]
-  },
-
-  { path: '*', redirect: '/404', hidden: true }
-]
-
-module.exports = {
-  constantRoutes,
-  asyncRoutes
-}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/mock/user.js b/app/Modules/Admin/Resources/vue-element-admin/mock/user.js
deleted file mode 100644
index d82e079..0000000
--- a/app/Modules/Admin/Resources/vue-element-admin/mock/user.js
+++ /dev/null
@@ -1,84 +0,0 @@
-
-const tokens = {
-  admin: {
-    token: 'admin-token'
-  },
-  editor: {
-    token: 'editor-token'
-  }
-}
-
-const users = {
-  'admin-token': {
-    roles: ['admin'],
-    introduction: 'I am a super administrator',
-    avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif',
-    name: 'Super Admin'
-  },
-  'editor-token': {
-    roles: ['editor'],
-    introduction: 'I am an editor',
-    avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif',
-    name: 'Normal Editor'
-  }
-}
-
-module.exports = [
-  // user login
-  {
-    url: '/vue-element-admin/user/login',
-    type: 'post',
-    response: config => {
-      const { username } = config.body
-      const token = tokens[username]
-
-      // mock error
-      if (!token) {
-        return {
-          code: 60204,
-          message: 'Account and password are incorrect.'
-        }
-      }
-
-      return {
-        code: 20000,
-        data: token
-      }
-    }
-  },
-
-  // get user info
-  {
-    url: '/vue-element-admin/user/info\.*',
-    type: 'get',
-    response: config => {
-      const { token } = config.query
-      const info = users[token]
-
-      // mock error
-      if (!info) {
-        return {
-          code: 50008,
-          message: 'Login failed, unable to get user details.'
-        }
-      }
-
-      return {
-        code: 20000,
-        data: info
-      }
-    }
-  },
-
-  // user logout
-  {
-    url: '/vue-element-admin/user/logout',
-    type: 'post',
-    response: _ => {
-      return {
-        code: 20000,
-        data: 'success'
-      }
-    }
-  }
-]
diff --git a/app/Modules/Admin/Resources/vue-element-admin/mock/utils.js b/app/Modules/Admin/Resources/vue-element-admin/mock/utils.js
deleted file mode 100644
index f909a29..0000000
--- a/app/Modules/Admin/Resources/vue-element-admin/mock/utils.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * @param {string} url
- * @returns {Object}
- */
-function param2Obj(url) {
-  const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ')
-  if (!search) {
-    return {}
-  }
-  const obj = {}
-  const searchArr = search.split('&')
-  searchArr.forEach(v => {
-    const index = v.indexOf('=')
-    if (index !== -1) {
-      const name = v.substring(0, index)
-      const val = v.substring(index + 1, v.length)
-      obj[name] = val
-    }
-  })
-  return obj
-}
-
-/**
- * This is just a simple version of deep copy
- * Has a lot of edge cases bug
- * If you want to use a perfect deep copy, use lodash's _.cloneDeep
- * @param {Object} source
- * @returns {Object}
- */
-function deepClone(source) {
-  if (!source && typeof source !== 'object') {
-    throw new Error('error arguments', 'deepClone')
-  }
-  const targetObj = source.constructor === Array ? [] : {}
-  Object.keys(source).forEach(keys => {
-    if (source[keys] && typeof source[keys] === 'object') {
-      targetObj[keys] = deepClone(source[keys])
-    } else {
-      targetObj[keys] = source[keys]
-    }
-  })
-  return targetObj
-}
-
-module.exports = {
-  param2Obj,
-  deepClone
-}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/router/index.js b/app/Modules/Admin/Resources/vue-element-admin/router/index.js
index 235ab8d..3ffbeb3 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/router/index.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/router/index.js
@@ -44,7 +44,7 @@ export const constantRoutes = [
         children: [
             {
                 path: '/redirect/:path(.*)',
-                component: () => import('@/views/sundry/redirect/index')
+                component: () => import('@/views/demo/redirect/index')
             }
         ]
     },
@@ -101,7 +101,7 @@ export const constantRoutes = [
         children: [
             {
                 path: 'index',
-                component: () => import('@/views/sundry/icons/index'),
+                component: () => import('@/views/demo/icons/index'),
                 name: 'Icons',
                 meta: {title: 'icons', icon: 'icon', noCache: true}
             }
diff --git a/app/Modules/Admin/Resources/vue-element-admin/router/modules/charts.js b/app/Modules/Admin/Resources/vue-element-admin/router/modules/charts.js
index 42d7d20..1d3c944 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/router/modules/charts.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/router/modules/charts.js
@@ -14,19 +14,19 @@ const chartsRouter = {
     children: [
         {
             path: 'keyboard',
-            component: () => import('@/views/charts/keyboard'),
+            component: () => import('@/views/demo/charts/keyboard'),
             name: 'KeyboardChart',
             meta: {title: 'keyboardChart', noCache: true}
         },
         {
             path: 'line',
-            component: () => import('@/views/charts/line'),
+            component: () => import('@/views/demo/charts/line'),
             name: 'LineChart',
             meta: {title: 'lineChart', noCache: true}
         },
         {
             path: 'mix-chart',
-            component: () => import('@/views/charts/mix-chart'),
+            component: () => import('@/views/demo/charts/mix-chart'),
             name: 'MixChart',
             meta: {title: 'mixChart', noCache: true}
         }
diff --git a/app/Modules/Admin/Resources/vue-element-admin/router/modules/components.js b/app/Modules/Admin/Resources/vue-element-admin/router/modules/components.js
index 5447699..16da791 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/router/modules/components.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/router/modules/components.js
@@ -14,61 +14,61 @@ const componentsRouter = {
     children: [
         {
             path: 'tinymce',
-            component: () => import('@/views/components-demo/tinymce'),
+            component: () => import('@/views/demo/components-demo/tinymce'),
             name: 'TinymceDemo',
             meta: {title: 'tinymce'}
         },
         {
             path: 'markdown',
-            component: () => import('@/views/components-demo/markdown'),
+            component: () => import('@/views/demo/components-demo/markdown'),
             name: 'MarkdownDemo',
             meta: {title: 'markdown'}
         },
         {
             path: 'json-editor',
-            component: () => import('@/views/components-demo/json-editor'),
+            component: () => import('@/views/demo/components-demo/json-editor'),
             name: 'JsonEditorDemo',
             meta: {title: 'jsonEditor'}
         },
         {
             path: 'avatar-upload',
-            component: () => import('@/views/components-demo/avatar-upload'),
+            component: () => import('@/views/demo/components-demo/avatar-upload'),
             name: 'AvatarUploadDemo',
             meta: {title: 'avatarUpload'}
         },
         {
             path: 'dropzone',
-            component: () => import('@/views/components-demo/dropzone'),
+            component: () => import('@/views/demo/components-demo/dropzone'),
             name: 'DropzoneDemo',
             meta: {title: 'dropzone'}
         },
         {
             path: 'count-to',
-            component: () => import('@/views/components-demo/count-to'),
+            component: () => import('@/views/demo/components-demo/count-to'),
             name: 'CountToDemo',
             meta: {title: 'countTo'}
         },
         {
             path: 'mixin',
-            component: () => import('@/views/components-demo/mixin'),
+            component: () => import('@/views/demo/components-demo/mixin'),
             name: 'ComponentMixinDemo',
             meta: {title: 'componentMixin'}
         },
         {
             path: 'back-to-top',
-            component: () => import('@/views/components-demo/back-to-top'),
+            component: () => import('@/views/demo/components-demo/back-to-top'),
             name: 'BackToTopDemo',
             meta: {title: 'backToTop'}
         },
         {
             path: 'drag-select',
-            component: () => import('@/views/components-demo/drag-select'),
+            component: () => import('@/views/demo/components-demo/drag-select'),
             name: 'DragSelectDemo',
             meta: {title: 'dragSelect'}
         },
         {
             path: 'drag-kanban',
-            component: () => import('@/views/components-demo/drag-kanban'),
+            component: () => import('@/views/demo/components-demo/drag-kanban'),
             name: 'DragKanbanDemo',
             meta: {title: 'dragKanban'}
         }
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/charts/keyboard.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/charts/keyboard.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/charts/keyboard.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/charts/keyboard.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/charts/line.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/charts/line.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/charts/line.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/charts/line.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/charts/mix-chart.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/charts/mix-chart.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/charts/mix-chart.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/charts/mix-chart.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/avatar-upload.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/avatar-upload.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/avatar-upload.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/avatar-upload.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/back-to-top.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/back-to-top.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/back-to-top.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/back-to-top.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/count-to.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/count-to.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/count-to.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/count-to.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/drag-kanban.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/drag-kanban.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/drag-kanban.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/drag-kanban.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/drag-select.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/drag-select.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/drag-select.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/drag-select.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/dropzone.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/dropzone.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/dropzone.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/dropzone.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/json-editor.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/json-editor.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/json-editor.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/json-editor.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/markdown.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/markdown.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/markdown.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/markdown.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/mixin.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/mixin.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/mixin.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/mixin.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/tinymce.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/tinymce.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/tinymce.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/tinymce.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/sundry/icons/element-icons.js b/app/Modules/Admin/Resources/vue-element-admin/views/demo/icons/element-icons.js
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/sundry/icons/element-icons.js
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/icons/element-icons.js
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/sundry/icons/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/icons/index.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/sundry/icons/index.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/icons/index.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/sundry/icons/svg-icons.js b/app/Modules/Admin/Resources/vue-element-admin/views/demo/icons/svg-icons.js
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/sundry/icons/svg-icons.js
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/icons/svg-icons.js
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/sundry/redirect/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/redirect/index.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/sundry/redirect/index.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/redirect/index.vue
-- 
Gitee