diff --git a/server/api/v1/system/sys_user.go b/server/api/v1/system/sys_user.go
index 2c0618b46eb6925963c6851a3c1863860822470e..6da7540fdaa97aa78dd917b67a7df8522c76d95a 100644
--- a/server/api/v1/system/sys_user.go
+++ b/server/api/v1/system/sys_user.go
@@ -275,6 +275,8 @@ func (b *BaseApi) SetUserInfo(c *gin.Context) {
 	var user system.SysUser
 	_ = c.ShouldBindJSON(&user)
 	user.Username = ""
+	user.Password = ""
+	user.AuthorityId = ""
 	if err := utils.Verify(user, utils.IdVerify); err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return
@@ -299,6 +301,8 @@ func (b *BaseApi) SetSelfInfo(c *gin.Context) {
 	var user system.SysUser
 	_ = c.ShouldBindJSON(&user)
 	user.Username = ""
+	user.Password = ""
+	user.AuthorityId = ""
 	user.ID = utils.GetUserID(c)
 	if err, ReqUser := userService.SetUserInfo(user); err != nil {
 		global.GVA_LOG.Error("设置失败!", zap.Error(err))
diff --git a/server/core/server.go b/server/core/server.go
index 293c851758228963d015029923779a4e97a7b883..05e0df0edfc3d21d8258065a85c7332322bb6738 100644
--- a/server/core/server.go
+++ b/server/core/server.go
@@ -38,7 +38,7 @@ func RunWindowsServer() {
 
 	fmt.Printf(`
 	欢迎使用 github.com/flipped-aurora/gin-vue-admin/server
-	当前版本:V2.5.0 beta
+	当前版本:V2.5.0 beta.2
     加群方式:微信号：shouzi_1994 QQ群：622360840
 	GVA讨论社区:https://support.qq.com/products/371961
 	默认自动化文档地址:http://127.0.0.1%s/swagger/index.html
diff --git a/server/model/system/sys_user.go b/server/model/system/sys_user.go
index 40678cd42c37c12f00ccc8867199c455c91da1af..234494c2ef95bfbdf07309e1af1ac0b042e1a0ec 100644
--- a/server/model/system/sys_user.go
+++ b/server/model/system/sys_user.go
@@ -18,4 +18,6 @@ type SysUser struct {
 	AuthorityId string         `json:"authorityId" gorm:"default:888;comment:用户角色ID"`                                        // 用户角色ID
 	Authority   SysAuthority   `json:"authority" gorm:"foreignKey:AuthorityId;references:AuthorityId;comment:用户角色"`
 	Authorities []SysAuthority `json:"authorities" gorm:"many2many:sys_user_authority;"`
+	Phone       string         `json:"phone"  gorm:"comment:用户手机号"` // 用户角色ID
+	Email       string         `json:"email"  gorm:"comment:用户邮箱"`  // 用户邮箱
 }
diff --git a/server/resource/template/web/table.vue.tpl b/server/resource/template/web/table.vue.tpl
index c82f71ec14e3fdc2290a8bb1bbaf3a4975407077..cdad6847bb287ef9e5fc773948c96b2f5f82a97b 100644
--- a/server/resource/template/web/table.vue.tpl
+++ b/server/resource/template/web/table.vue.tpl
@@ -22,22 +22,22 @@
           <el-input v-model="searchInfo.{{.FieldJson}}" placeholder="搜索条件" />
         </el-form-item>{{ end }}{{ end }}{{ end }}
         <el-form-item>
-          <el-button size="mini" type="primary" icon="search" @click="onSubmit">查询</el-button>
-          <el-button size="mini" icon="refresh" @click="onReset">重置</el-button>
+          <el-button size="small" type="primary" icon="search" @click="onSubmit">查询</el-button>
+          <el-button size="small" icon="refresh" @click="onReset">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
     <div class="gva-table-box">
         <div class="gva-btn-list">
-            <el-button size="mini" type="primary" icon="plus" @click="openDialog">新增</el-button>
+            <el-button size="small" type="primary" icon="plus" @click="openDialog">新增</el-button>
             <el-popover v-model:visible="deleteVisible" placement="top" width="160">
             <p>确定要删除吗？</p>
             <div style="text-align: right; margin-top: 8px;">
-                <el-button size="mini" type="text" @click="deleteVisible = false">取消</el-button>
-                <el-button size="mini" type="primary" @click="onDelete">确定</el-button>
+                <el-button size="small" type="text" @click="deleteVisible = false">取消</el-button>
+                <el-button size="small" type="primary" @click="onDelete">确定</el-button>
             </div>
             <template #reference>
-                <el-button icon="delete" size="mini" style="margin-left: 10px;" :disabled="!multipleSelection.length">删除</el-button>
+                <el-button icon="delete" size="small" style="margin-left: 10px;" :disabled="!multipleSelection.length">删除</el-button>
             </template>
             </el-popover>
         </div>
@@ -70,7 +70,7 @@
         <el-table-column align="left" label="按钮组">
             <template #default="scope">
             <el-button type="text" icon="edit" size="small" class="table-button" @click="update{{.StructName}}Func(scope.row)">变更</el-button>
-            <el-button type="text" icon="delete" size="mini" @click="deleteRow(scope.row)">删除</el-button>
+            <el-button type="text" icon="delete" size="small" @click="deleteRow(scope.row)">删除</el-button>
             </template>
         </el-table-column>
         </el-table>
diff --git a/server/source/system/api.go b/server/source/system/api.go
index 5efc39d7a5d96832ea869797096a05f57a7fd65b..ca2fc3ae96e3c40b254449308552e78d2302f12b 100644
--- a/server/source/system/api.go
+++ b/server/source/system/api.go
@@ -22,13 +22,13 @@ func (a *api) Initialize() error {
 		{ApiGroup: "jwt", Method: "POST", Path: "/jwt/jsonInBlacklist", Description: "jwt加入黑名单(退出，必选)"},
 
 		{ApiGroup: "系统用户", Method: "DELETE", Path: "/user/deleteUser", Description: "删除用户"},
-		{ApiGroup: "系统用户", Method: "POST", Path: "/user/register", Description: "用户注册(必选)"},
+		{ApiGroup: "系统用户", Method: "POST", Path: "/user/register", Description: "用户注册"},
 		{ApiGroup: "系统用户", Method: "POST", Path: "/user/getUserList", Description: "获取用户列表"},
 		{ApiGroup: "系统用户", Method: "PUT", Path: "/user/setUserInfo", Description: "设置用户信息"},
 		{ApiGroup: "系统用户", Method: "PUT", Path: "/user/setSelfInfo", Description: "设置自身信息(必选)"},
 		{ApiGroup: "系统用户", Method: "GET", Path: "/user/getUserInfo", Description: "获取自身信息(必选)"},
 		{ApiGroup: "系统用户", Method: "POST", Path: "/user/setUserAuthorities", Description: "设置权限组"},
-		{ApiGroup: "系统用户", Method: "POST", Path: "/user/changePassword", Description: "修改密码（建(选择)"},
+		{ApiGroup: "系统用户", Method: "POST", Path: "/user/changePassword", Description: "修改密码（建议选择)"},
 		{ApiGroup: "系统用户", Method: "POST", Path: "/user/setUserAuthority", Description: "修改用户角色(必选)"},
 		{ApiGroup: "系统用户", Method: "POST", Path: "/user/resetPassword", Description: "重置用户密码"},
 
diff --git a/server/source/system/user.go b/server/source/system/user.go
index b1a375b8d4bb4f9fd870f8fe95f464e3f64def00..a47d1ff86b26ab5038088d20ceb5212ce7af1fb9 100644
--- a/server/source/system/user.go
+++ b/server/source/system/user.go
@@ -18,8 +18,8 @@ func (u *user) TableName() string {
 
 func (u *user) Initialize() error {
 	entities := []system.SysUser{
-		{UUID: uuid.NewV4(), Username: "admin", Password: "e10adc3949ba59abbe56e057f20f883e", NickName: "超级管理员", HeaderImg: "https://qmplusimg.henrongyi.top/gva_header.jpg", AuthorityId: "888"},
-		{UUID: uuid.NewV4(), Username: "a303176530", Password: "3ec063004a6f31642261936a379fde3d", NickName: "QMPlusUser", HeaderImg: "https:///qmplusimg.henrongyi.top/1572075907logo.png", AuthorityId: "9528"},
+		{UUID: uuid.NewV4(), Username: "admin", Password: "e10adc3949ba59abbe56e057f20f883e", NickName: "超级管理员", HeaderImg: "https://qmplusimg.henrongyi.top/gva_header.jpg", AuthorityId: "888", Phone: "17611111111", Email: "333333333@qq.com"},
+		{UUID: uuid.NewV4(), Username: "a303176530", Password: "3ec063004a6f31642261936a379fde3d", NickName: "QMPlusUser", HeaderImg: "https:///qmplusimg.henrongyi.top/1572075907logo.png", AuthorityId: "9528", Phone: "17611111111", Email: "333333333@qq.com"},
 	}
 	if err := global.GVA_DB.Create(&entities).Error; err != nil {
 		return errors.Wrap(err, u.TableName()+"表数据初始化失败!")
diff --git a/web/package.json b/web/package.json
index 237f6bb9641c397d0a3a4d7017bf5da425c5f238..54d3dc6372a687869bd8cd64b0dcfbd47ead4461 100644
--- a/web/package.json
+++ b/web/package.json
@@ -10,11 +10,11 @@
         "fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit"
     },
     "dependencies": {
-        "@element-plus/icons": "0.0.11",
+        "@element-plus/icons-vue": "^0.2.7",
         "axios": "^0.19.2",
         "core-js": "^3.6.5",
         "echarts": "4.9.0",
-        "element-plus": "1.2.0-beta.6",
+        "element-plus": "2.0.1",
         "highlight.js": "^10.6.0",
         "marked": "^2.0.0",
         "mitt": "^3.0.0",
diff --git a/web/src/components/upload/image.vue b/web/src/components/upload/image.vue
index 5b42c3d8d613e24801b3a78b8a50e7867d427029..d36e1aad0a75cb3f197f8b01fb995b52f0f9ba96 100644
--- a/web/src/components/upload/image.vue
+++ b/web/src/components/upload/image.vue
@@ -9,7 +9,7 @@
       :before-upload="beforeImageUpload"
       :multiple="false"
     >
-      <el-button size="mini" type="primary">压缩上传</el-button>
+      <el-button size="small" type="primary">压缩上传</el-button>
     </el-upload>
   </div>
 </template>
diff --git a/web/src/components/warningBar/warningBar.vue b/web/src/components/warningBar/warningBar.vue
index afc647d61f3961a565b6ad9a7e1efa2d183ab527..45e2bf25553415110ace995043341ffe22052647 100644
--- a/web/src/components/warningBar/warningBar.vue
+++ b/web/src/components/warningBar/warningBar.vue
@@ -11,7 +11,7 @@
   </div>
 </template>
 <script setup>
-import { WarningFilled } from '@element-plus/icons'
+import { WarningFilled } from '@element-plus/icons-vue'
 defineProps({
   title: {
     type: String,
diff --git a/web/src/core/config.js b/web/src/core/config.js
index 9efd6a2a1012f3a839fd1d9e7b56009ee554dcf4..d1d3a1bdbfd55423f331b4d2a22009c951a9f2d3 100644
--- a/web/src/core/config.js
+++ b/web/src/core/config.js
@@ -18,7 +18,7 @@ export const viteLogo = (env) => {
     )
     console.log(
       chalk.green(
-        `> 当前版本:V2.5.0`
+        `> 当前版本:V2.5.0 beta.2`
       )
     )
     console.log(
diff --git a/web/src/core/gin-vue-admin.js b/web/src/core/gin-vue-admin.js
index 44977159b938f9e77d0df5ec5f89124e78837784..19cddacdada1e06006683d0a71b2302bb4dddefb 100644
--- a/web/src/core/gin-vue-admin.js
+++ b/web/src/core/gin-vue-admin.js
@@ -10,7 +10,7 @@ export default {
     register(app)
     console.log(`
        欢迎使用 Gin-Vue-Admin
-       当前版本:V2.5.0 beta
+       当前版本:V2.5.0 beta.2
        加群方式:微信：shouzi_1994 QQ群：622360840
        GVA讨论社区:https://support.qq.com/products/371961
        默认自动化文档地址:http://127.0.0.1:${import.meta.env.VITE_SERVER_PORT}/swagger/index.html
diff --git a/web/src/core/global.js b/web/src/core/global.js
index ce66c251e9a6dbd54cee8b8bdd025c14a29365cd..e0e4a3fe7d7c337eca1c6dc74fba105c97d08487 100644
--- a/web/src/core/global.js
+++ b/web/src/core/global.js
@@ -2,7 +2,7 @@ import config from './config'
 import { emitter } from '@/utils/bus.js'
 
 // 统一导入el-icon图标
-import * as ElIconModules from '@element-plus/icons'
+import * as ElIconModules from '@element-plus/icons-vue'
 // 导入转换图标名称的函数
 
 export const closeThisPage = () => {
diff --git a/web/src/style/element_visiable.scss b/web/src/style/element_visiable.scss
index f6e2ee5dc36e01c6b5eff7bc664f86b2347a3eed..4a53ae62d466e014b3a57b1293dafb4a54c8c24f 100644
--- a/web/src/style/element_visiable.scss
+++ b/web/src/style/element_visiable.scss
@@ -68,13 +68,19 @@
     background-color: #fff;
     border-radius: 2px;
     margin-bottom: 12px;
-    .el-form {
-        .el-form-item {
-            padding-right: 28px;
-        }
+}
+
+.el-form--inline{
+    .el-form-item{
+        margin-right: 24px;
     }
 }
 
+.el-input__inner{
+    height: 40px;
+    line-height: 40px;
+}
+
 .gva-form-box {
     padding: 24px;
     background-color: #fff;
@@ -145,8 +151,13 @@
     }
 }
 
-.el-button--mini {
+.el-button--small {
     min-height: 32px;
+    font-size: 12px !important;
+}
+
+.el-checkbox{
+    height: auto;
 }
 
 .el-button {
diff --git a/web/src/style/main.scss b/web/src/style/main.scss
index 9c63ee5916c8a7b574031963b13d5dff3832a7da..7a34d7f5f4d588badb4757338222bb95b0ac70b2 100644
--- a/web/src/style/main.scss
+++ b/web/src/style/main.scss
@@ -971,10 +971,10 @@ li {
 .el-input-number__increase {
     position: absolute;
     z-index: 1;
-    top: 3px !important;
+    top: 2px !important;
     width: 42px;
-    height: 29px;
-    line-height: 29px;
+    height: 28px;
+    line-height: 28px;
     text-align: center;
     background: #F5F7FA;
     color: #606266;
diff --git a/web/src/style/newLogin.scss b/web/src/style/newLogin.scss
index c85510906cbdfa2ceec1084e941d3cc440c329c9..0f3f15f695062985080f302ce67d0b1129a17a71 100644
--- a/web/src/style/newLogin.scss
+++ b/web/src/style/newLogin.scss
@@ -8,7 +8,7 @@
     position: relative;
     .input-icon{
         padding-right: 6px;
-        padding-top: 2px;
+        padding-top: 4px;
     }
     .login_panle {
         position: absolute;
@@ -48,15 +48,18 @@
                     padding-left: 20px;
                 }
             }
+            .vPicBox{
+                display:flex;
+                justify-content:space-between;
+                width:100%;
+            }
             .vPic {
                 width: 33%;
                 height: 38px;
-                float: right !important;
                 background: #ccc;
                 img {
                     width: 100%;
                     height: 100%;
-                    cursor: pointer;
                     vertical-align: middle;
                 }
             }
diff --git a/web/src/view/example/breakpoint/breakpoint.vue b/web/src/view/example/breakpoint/breakpoint.vue
index eb7d8df61317aa28026795538f14f8e8226dde2c..2a76eac318fade2bce3edbfbe06016a3927a6b96 100644
--- a/web/src/view/example/breakpoint/breakpoint.vue
+++ b/web/src/view/example/breakpoint/breakpoint.vue
@@ -8,7 +8,7 @@
           <input v-show="false" id="file" ref="FileInput" multiple="multiple" type="file" @change="choseFile">
         </div>
       </form>
-      <el-button :disabled="limitFileSize" type="primary" size="mini" class="uploadBtn" @click="getFile">上传文件</el-button>
+      <el-button :disabled="limitFileSize" type="primary" size="small" class="uploadBtn" @click="getFile">上传文件</el-button>
       <div class="el-upload__tip">请上传不超过5MB的文件</div>
       <div class="list">
         <transition name="list" tag="p">
diff --git a/web/src/view/example/customer/customer.vue b/web/src/view/example/customer/customer.vue
index 1bbaa5bfdfff3a5ea08a08e2d507360ea6e7a6c3..fff19f26164ce410c85caf98f366559846df0467 100644
--- a/web/src/view/example/customer/customer.vue
+++ b/web/src/view/example/customer/customer.vue
@@ -3,7 +3,7 @@
     <warning-bar title="在资源权限中将此角色的资源权限清空 或者不包含创建者的角色 即可屏蔽此客户资源的显示" />
     <div class="gva-table-box">
       <div class="gva-btn-list">
-        <el-button size="mini" type="primary" icon="plus" @click="openDialog">新增</el-button>
+        <el-button size="small" type="primary" icon="plus" @click="openDialog">新增</el-button>
       </div>
       <el-table
         ref="multipleTable"
@@ -27,11 +27,11 @@
             <el-popover v-model:visible="scope.row.visible" placement="top" width="160">
               <p>确定要删除吗？</p>
               <div style="text-align: right; margin-top: 8px;">
-                <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
-                <el-button type="primary" size="mini" @click="deleteCustomer(scope.row)">确定</el-button>
+                <el-button size="small" type="text" @click="scope.row.visible = false">取消</el-button>
+                <el-button type="primary" size="small" @click="deleteCustomer(scope.row)">确定</el-button>
               </div>
               <template #reference>
-                <el-button type="text" icon="delete" size="mini">删除</el-button>
+                <el-button type="text" icon="delete" size="small" @click="scope.row.visible = true">删除</el-button>
               </template>
             </el-popover>
           </template>
diff --git a/web/src/view/example/excel/excel.vue b/web/src/view/example/excel/excel.vue
index ef58c3958b1f7032008832b2d55515ab022c3413..688aa776e6874af3d8afa911a18dd99833ffecba 100644
--- a/web/src/view/example/excel/excel.vue
+++ b/web/src/view/example/excel/excel.vue
@@ -10,10 +10,10 @@
           :on-success="loadExcel"
           :show-file-list="false"
         >
-          <el-button size="mini" type="primary" icon="upload">导入</el-button>
+          <el-button size="small" type="primary" icon="upload">导入</el-button>
         </el-upload>
-        <el-button class="excel-btn" size="mini" type="primary" icon="download" @click="handleExcelExport('ExcelExport.xlsx')">导出</el-button>
-        <el-button class="excel-btn" size="mini" type="success" icon="download" @click="downloadExcelTemplate()">下载模板</el-button>
+        <el-button class="excel-btn" size="small" type="primary" icon="download" @click="handleExcelExport('ExcelExport.xlsx')">导出</el-button>
+        <el-button class="excel-btn" size="small" type="success" icon="download" @click="downloadExcelTemplate()">下载模板</el-button>
       </div>
       <el-table :data="tableData" row-key="ID">
         <el-table-column align="left" label="ID" min-width="100" prop="ID" />
diff --git a/web/src/view/example/upload/upload.vue b/web/src/view/example/upload/upload.vue
index 224f51e1e9d1c78b0ad294b95bee5857fb1a5519..3099b915d1168c3cac4f37d33a05b705c41003de 100644
--- a/web/src/view/example/upload/upload.vue
+++ b/web/src/view/example/upload/upload.vue
@@ -11,7 +11,7 @@
           :show-file-list="false"
           class="upload-btn"
         >
-          <el-button size="mini" type="primary">普通上传</el-button>
+          <el-button size="small" type="primary">普通上传</el-button>
         </el-upload>
         <upload-image
           v-model:imageUrl="imageUrl"
diff --git a/web/src/view/login/index.vue b/web/src/view/login/index.vue
index c47f4e4dbc929274457c59eb635529fbe34d5654..0c2a99496e0670e35ad0cbb6e6bf944d35ed2f2c 100644
--- a/web/src/view/login/index.vue
+++ b/web/src/view/login/index.vue
@@ -48,29 +48,33 @@
               </template>
             </el-input>
           </el-form-item>
-          <el-form-item style="position: relative" prop="captcha">
-            <el-input
-              v-model="loginFormData.captcha"
-              placeholder="请输入验证码"
-              style="width: 60%"
-            />
-            <div class="vPic">
-              <img
-                v-if="picPath"
-                :src="picPath"
-                alt="请输入验证码"
-                @click="loginVerify()"
-              >
+          <el-form-item prop="captcha">
+            <div class="vPicBox">
+              <el-input
+                v-model="loginFormData.captcha"
+                placeholder="请输入验证码"
+                style="width: 60%"
+              />
+              <div class="vPic">
+                <img
+                  v-if="picPath"
+                  :src="picPath"
+                  alt="请输入验证码"
+                  @click="loginVerify()"
+                >
+              </div>
             </div>
           </el-form-item>
           <el-form-item>
             <el-button
               type="primary"
               style="width: 46%"
+              size="large"
               @click="checkInit"
             >前往初始化</el-button>
             <el-button
               type="primary"
+              size="large"
               style="width: 46%; margin-left: 8%"
               @click="submitForm"
             >登 录</el-button>
diff --git a/web/src/view/person/person.vue b/web/src/view/person/person.vue
index aeab78a98389cf1b37afcf01d436583aa4506419..a61134cc810a91331a5b593371ff1739a27853ff 100644
--- a/web/src/view/person/person.vue
+++ b/web/src/view/person/person.vue
@@ -94,15 +94,15 @@
                 <li>
                   <p class="title">密保手机</p>
                   <p class="desc">
-                    已绑定手机:1245678910
-                    <a href="javascript:void(0)">立即修改</a>
+                    已绑定手机:{{ userStore.userInfo.phone }}
+                    <a href="javascript:void(0)" @click="changePhoneFlag = true">立即修改</a>
                   </p>
                 </li>
                 <li>
                   <p class="title">密保邮箱</p>
                   <p class="desc">
-                    已绑定邮箱：gin-vue-admin@google.com.cn
-                    <a href="javascript:void(0)">立即修改</a>
+                    已绑定邮箱：{{ userStore.userInfo.email }}
+                    <a href="javascript:void(0)" @click="changeEmailFlag = true">立即修改</a>
                   </p>
                 </li>
                 <li>
@@ -167,6 +167,60 @@
         </div>
       </template>
     </el-dialog>
+
+    <el-dialog v-model="changePhoneFlag" title="绑定手机" width="600px">
+      <el-form :model="phoneForm">
+        <el-form-item label="手机号" label-width="120px">
+          <el-input v-model="phoneForm.phone" placeholder="请输入手机号" autocomplete="off" />
+        </el-form-item>
+        <el-form-item label="验证码" label-width="120px">
+          <div class="code-box">
+            <el-input v-model="phoneForm.code" autocomplete="off" placeholder="请自行设计短信服务，此处为模拟随便写" style="width:300px" />
+            <el-button size="small" type="primary" :disabled="time>0" @click="getCode">{{ time>0?`(${time}s)后重新获取`:'获取验证码' }}</el-button>
+          </div>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button
+            size="small"
+            @click="closeChangePhone"
+          >取消</el-button>
+          <el-button
+            type="primary"
+            size="small"
+            @click="changePhone"
+          >更改</el-button>
+        </span>
+      </template>
+    </el-dialog>
+
+    <el-dialog v-model="changeEmailFlag" title="绑定邮箱" width="600px">
+      <el-form :model="emailForm">
+        <el-form-item label="邮箱" label-width="120px">
+          <el-input v-model="emailForm.email" placeholder="请输入邮箱" autocomplete="off" />
+        </el-form-item>
+        <el-form-item label="验证码" label-width="120px">
+          <div class="code-box">
+            <el-input v-model="emailForm.code" placeholder="请自行设计邮件服务，此处为模拟随便写" autocomplete="off" style="width:300px" />
+            <el-button size="small" type="primary" :disabled="emailTime>0" @click="getEmailCode">{{ emailTime>0?`(${emailTime}s)后重新获取`:'获取验证码' }}</el-button>
+          </div>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button
+            size="small"
+            @click="closeChangeEmail"
+          >取消</el-button>
+          <el-button
+            type="primary"
+            size="small"
+            @click="changeEmail"
+          >更改</el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -288,6 +342,73 @@ const enterEdit = async() => {
 const handleClick = (tab, event) => {
   console.log(tab, event)
 }
+
+const changePhoneFlag = ref(false)
+const time = ref(0)
+const phoneForm = reactive({
+  phone: '',
+  code: ''
+})
+
+const getCode = async() => {
+  time.value = 60
+  let timer = setInterval(() => {
+    time.value--
+    if (time.value <= 0) {
+      clearInterval(timer)
+      timer = null
+    }
+  }, 1000)
+}
+
+const closeChangePhone = () => {
+  changePhoneFlag.value = false
+  phoneForm.phone = ''
+  phoneForm.code = ''
+}
+
+const changePhone = async() => {
+  const res = await setSelfInfo({ phone: phoneForm.phone })
+  if (res.code === 0) {
+    ElMessage.success('修改成功')
+    userStore.ResetUserInfo({ phone: phoneForm.phone })
+    closeChangePhone()
+  }
+}
+
+const changeEmailFlag = ref(false)
+const emailTime = ref(0)
+const emailForm = reactive({
+  email: '',
+  code: ''
+})
+
+const getEmailCode = async() => {
+  emailTime.value = 60
+  let timer = setInterval(() => {
+    emailTime.value--
+    if (emailTime.value <= 0) {
+      clearInterval(timer)
+      timer = null
+    }
+  }, 1000)
+}
+
+const closeChangeEmail = () => {
+  changeEmailFlag.value = false
+  emailForm.email = ''
+  emailForm.code = ''
+}
+
+const changeEmail = async() => {
+  const res = await setSelfInfo({ email: emailForm.email })
+  if (res.code === 0) {
+    ElMessage.success('修改成功')
+    userStore.ResetUserInfo({ email: emailForm.email })
+    closeChangeEmail()
+  }
+}
+
 </script>
 
 <style lang="scss">
@@ -425,4 +546,8 @@ const handleClick = (tab, event) => {
 .pointer {
   cursor: pointer;
 }
+.code-box{
+  display: flex;
+  justify-content: space-between;
+}
 </style>
diff --git a/web/src/view/superAdmin/api/api.vue b/web/src/view/superAdmin/api/api.vue
index 63878e0d9330d3c03c9e87ccc74e8e5c8b3a8e56..ebf8aa935371645aa41448b6298b034b23ad19b4 100644
--- a/web/src/view/superAdmin/api/api.vue
+++ b/web/src/view/superAdmin/api/api.vue
@@ -22,22 +22,22 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button size="mini" type="primary" icon="search" @click="onSubmit">查询</el-button>
-          <el-button size="mini" icon="refresh" @click="onReset">重置</el-button>
+          <el-button size="small" type="primary" icon="search" @click="onSubmit">查询</el-button>
+          <el-button size="small" icon="refresh" @click="onReset">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
     <div class="gva-table-box">
       <div class="gva-btn-list">
-        <el-button size="mini" type="primary" icon="plus" @click="openDialog('addApi')">新增</el-button>
+        <el-button size="small" type="primary" icon="plus" @click="openDialog('addApi')">新增</el-button>
         <el-popover v-model:visible="deleteVisible" placement="top" width="160">
           <p>确定要删除吗？</p>
           <div style="text-align: right; margin-top: 8px;">
-            <el-button size="mini" type="text" @click="deleteVisible = false">取消</el-button>
-            <el-button size="mini" type="primary" @click="onDelete">确定</el-button>
+            <el-button size="small" type="text" @click="deleteVisible = false">取消</el-button>
+            <el-button size="small" type="primary" @click="onDelete">确定</el-button>
           </div>
           <template #reference>
-            <el-button icon="delete" size="mini" :disabled="!apis.length" style="margin-left: 10px;">删除</el-button>
+            <el-button icon="delete" size="small" :disabled="!apis.length" style="margin-left: 10px;">删除</el-button>
           </template>
         </el-popover>
       </div>
diff --git a/web/src/view/superAdmin/authority/authority.vue b/web/src/view/superAdmin/authority/authority.vue
index a666649d6c2febb6b92b68937f7cc64291803115..87ba33ff7fa5167af519a19b2e5eaa6bee3c3613 100644
--- a/web/src/view/superAdmin/authority/authority.vue
+++ b/web/src/view/superAdmin/authority/authority.vue
@@ -3,7 +3,7 @@
     <warning-bar title="注：右上角头像下拉可切换角色" />
     <div class="gva-table-box">
       <div class="gva-btn-list">
-        <el-button size="mini" type="primary" icon="plus" @click="addAuthority('0')">新增角色</el-button>
+        <el-button size="small" type="primary" icon="plus" @click="addAuthority('0')">新增角色</el-button>
       </div>
       <el-table
         :data="tableData"
@@ -17,31 +17,31 @@
           <template #default="scope">
             <el-button
               icon="setting"
-              size="mini"
+              size="small"
               type="text"
               @click="opdendrawer(scope.row)"
             >设置权限</el-button>
             <el-button
               icon="plus"
-              size="mini"
+              size="small"
               type="text"
               @click="addAuthority(scope.row.authorityId)"
             >新增子角色</el-button>
             <el-button
               icon="copy-document"
-              size="mini"
+              size="small"
               type="text"
               @click="copyAuthorityFunc(scope.row)"
             >拷贝</el-button>
             <el-button
               icon="edit"
-              size="mini"
+              size="small"
               type="text"
               @click="editAuthority(scope.row)"
             >编辑</el-button>
             <el-button
               icon="delete"
-              size="mini"
+              size="small"
               type="text"
               @click="deleteAuth(scope.row)"
             >删除</el-button>
diff --git a/web/src/view/superAdmin/authority/components/apis.vue b/web/src/view/superAdmin/authority/components/apis.vue
index 554509a9d77ecca4839e21ce6da8ea9f13440edf..612e278881e5c00ec5f447ac30601ecadbc5e317 100644
--- a/web/src/view/superAdmin/authority/components/apis.vue
+++ b/web/src/view/superAdmin/authority/components/apis.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="clearflex">
-      <el-button class="fl-right" size="mini" type="primary" @click="authApiEnter">确 定</el-button>
+      <el-button class="fl-right" size="small" type="primary" @click="authApiEnter">确 定</el-button>
     </div>
     <el-tree
       ref="apiTree"
diff --git a/web/src/view/superAdmin/authority/components/datas.vue b/web/src/view/superAdmin/authority/components/datas.vue
index ea62ceaffbb163f088e86eb0a502e723ad942214..397c520e4bbf6b27cd6ae187c2e2f2165e347234 100644
--- a/web/src/view/superAdmin/authority/components/datas.vue
+++ b/web/src/view/superAdmin/authority/components/datas.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <div class="clearflex" style="margin:18px">
-      <el-button class="fl-right" size="mini" type="primary" @click="authDataEnter">确 定</el-button>
-      <el-button class="fl-left" size="mini" type="primary" @click="all">全选</el-button>
-      <el-button class="fl-left" size="mini" type="primary" @click="self">本角色</el-button>
-      <el-button class="fl-left" size="mini" type="primary" @click="selfAndChildren">本角色及子角色</el-button>
+      <el-button class="fl-right" size="small" type="primary" @click="authDataEnter">确 定</el-button>
+      <el-button class="fl-left" size="small" type="primary" @click="all">全选</el-button>
+      <el-button class="fl-left" size="small" type="primary" @click="self">本角色</el-button>
+      <el-button class="fl-left" size="small" type="primary" @click="selfAndChildren">本角色及子角色</el-button>
     </div>
     <el-checkbox-group v-model="dataAuthorityId" @change="selectAuthority">
       <el-checkbox v-for="(item,key) in authoritys" :key="key" :label="item">{{ item.authorityName }}</el-checkbox>
diff --git a/web/src/view/superAdmin/authority/components/menus.vue b/web/src/view/superAdmin/authority/components/menus.vue
index 4accf080158975b4efc434afdaa7743fcc0e4539..c6890a21c8df943863ffb4e91b8b0e0e662cefa2 100644
--- a/web/src/view/superAdmin/authority/components/menus.vue
+++ b/web/src/view/superAdmin/authority/components/menus.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="clearflex">
-      <el-button class="fl-right" size="mini" type="primary" @click="relation">确 定</el-button>
+      <el-button class="fl-right" size="small" type="primary" @click="relation">确 定</el-button>
     </div>
     <el-tree
       ref="menuTree"
@@ -20,7 +20,7 @@
           <span>
             <el-button
               type="text"
-              size="mini"
+              size="small"
               :style="{color:row.defaultRouter === data.name?'#E6A23C':'#85ce61'}"
               :disabled="!node.checked"
               @click="() => setDefault(data)"
diff --git a/web/src/view/superAdmin/dictionary/sysDictionary.vue b/web/src/view/superAdmin/dictionary/sysDictionary.vue
index 166177dbc3de78fd9781451f6ff50a127c41bdeb..7768a756372f65443837a1c6e2e51678f8883a8d 100644
--- a/web/src/view/superAdmin/dictionary/sysDictionary.vue
+++ b/web/src/view/superAdmin/dictionary/sysDictionary.vue
@@ -22,13 +22,13 @@
         </el-form-item>
         <el-form-item>
           <el-button
-            size="mini"
+            size="small"
             type="primary"
             icon="search"
             @click="onSubmit"
           >查询</el-button>
           <el-button
-            size="mini"
+            size="small"
             icon="refresh"
             @click="onReset"
           >重置</el-button>
@@ -38,7 +38,7 @@
     <div class="gva-table-box">
       <div class="gva-btn-list">
         <el-button
-          size="mini"
+          size="small"
           type="primary"
           icon="plus"
           @click="openDialog"
@@ -83,13 +83,13 @@
         <el-table-column align="left" label="按钮组">
           <template #default="scope">
             <el-button
-              size="mini"
+              size="small"
               icon="document"
               type="text"
               @click="toDetile(scope.row)"
             >详情</el-button>
             <el-button
-              size="mini"
+              size="small"
               icon="edit"
               type="text"
               @click="updateSysDictionaryFunc(scope.row)"
@@ -102,13 +102,13 @@
               <p>确定要删除吗？</p>
               <div style="text-align: right; margin-top: 8px">
                 <el-button
-                  size="mini"
+                  size="small"
                   type="text"
                   @click="scope.row.visible = false"
                 >取消</el-button>
                 <el-button
                   type="primary"
-                  size="mini"
+                  size="small"
                   @click="deleteSysDictionaryFunc(scope.row)"
                 >确定</el-button>
               </div>
@@ -116,8 +116,9 @@
                 <el-button
                   type="text"
                   icon="delete"
-                  size="mini"
+                  size="small"
                   style="margin-left: 10px"
+                  @click="scope.row.visible = true"
                 >删除</el-button>
               </template>
             </el-popover>
diff --git a/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue b/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
index 8173b165a1f262038595f4cc10e33bdd26de0cad..ccd44bc2d0e9914a179bc32ba9e37dd59954111d 100644
--- a/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
+++ b/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
@@ -15,14 +15,14 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button size="mini" type="primary" icon="search" @click="onSubmit">查询</el-button>
-          <el-button size="mini" icon="refresh" @click="onReset">重置</el-button>
+          <el-button size="small" type="primary" icon="search" @click="onSubmit">查询</el-button>
+          <el-button size="small" icon="refresh" @click="onReset">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
     <div class="gva-table-box">
       <div class="gva-btn-list">
-        <el-button size="mini" type="primary" icon="plus" @click="openDialog">新增字典项</el-button>
+        <el-button size="small" type="primary" icon="plus" @click="openDialog">新增字典项</el-button>
       </div>
       <el-table
         ref="multipleTable"
@@ -52,11 +52,11 @@
             <el-popover v-model:visible="scope.row.visible" placement="top" width="160">
               <p>确定要删除吗？</p>
               <div style="text-align: right; margin-top: 8px;">
-                <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
-                <el-button type="primary" size="mini" @click="deleteSysDictionaryDetailFunc(scope.row)">确定</el-button>
+                <el-button size="small" type="text" @click="scope.row.visible = false">取消</el-button>
+                <el-button type="primary" size="small" @click="deleteSysDictionaryDetailFunc(scope.row)">确定</el-button>
               </div>
               <template #reference>
-                <el-button type="text" icon="delete" size="mini">删除</el-button>
+                <el-button type="text" icon="delete" size="small" @click="scope.row.visible = true">删除</el-button>
               </template>
             </el-popover>
           </template>
diff --git a/web/src/view/superAdmin/menu/menu.vue b/web/src/view/superAdmin/menu/menu.vue
index d337808cfc6cc9b41dc138f8d83c7c5d9b123b2c..d09f7098b15b573a549f58be949adcdf08db4a16 100644
--- a/web/src/view/superAdmin/menu/menu.vue
+++ b/web/src/view/superAdmin/menu/menu.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="gva-table-box">
       <div class="gva-btn-list">
-        <el-button size="mini" type="primary" icon="plus" @click="addMenu('0')">新增根菜单</el-button>
+        <el-button size="small" type="primary" icon="plus" @click="addMenu('0')">新增根菜单</el-button>
       </div>
 
       <!-- 由于此处菜单跟左侧列表一一对应所以不需要分页 pageSize默认999 -->
@@ -36,19 +36,19 @@
         <el-table-column align="left" fixed="right" label="操作" width="300">
           <template #default="scope">
             <el-button
-              size="mini"
+              size="small"
               type="text"
               icon="plus"
               @click="addMenu(scope.row.ID)"
             >添加子菜单</el-button>
             <el-button
-              size="mini"
+              size="small"
               type="text"
               icon="edit"
               @click="editMenu(scope.row.ID)"
             >编辑</el-button>
             <el-button
-              size="mini"
+              size="small"
               type="text"
               icon="delete"
               @click="deleteMenu(scope.row.ID)"
@@ -110,7 +110,7 @@
         </el-form-item>
         <el-form-item label="文件路径" prop="component" style="width:60%">
           <el-input v-model="form.component" autocomplete="off" />
-          <span style="font-size:12px;margin-right:12px;">如果菜单包含子菜单，请创建router-view二级路由页面或者</span><el-button size="mini" @click="form.component = 'view/routerHolder.vue'">点我设置</el-button>
+          <span style="font-size:12px;margin-right:12px;">如果菜单包含子菜单，请创建router-view二级路由页面或者</span><el-button style="margin-top:4px" size="small" @click="form.component = 'view/routerHolder.vue'">点我设置</el-button>
         </el-form-item>
         <el-form-item label="展示名称" prop="meta.title" style="width:30%">
           <el-input v-model="form.meta.title" autocomplete="off" />
diff --git a/web/src/view/superAdmin/operation/sysOperationRecord.vue b/web/src/view/superAdmin/operation/sysOperationRecord.vue
index a297c7125dd5fe03078218d010475c55a53200d0..2323bca4b1e0dba4d21f45276f56b4a0749dd944 100644
--- a/web/src/view/superAdmin/operation/sysOperationRecord.vue
+++ b/web/src/view/superAdmin/operation/sysOperationRecord.vue
@@ -12,8 +12,8 @@
           <el-input v-model="searchInfo.status" placeholder="搜索条件" />
         </el-form-item>
         <el-form-item>
-          <el-button size="mini" type="primary" icon="search" @click="onSubmit">查询</el-button>
-          <el-button size="mini" icon="refresh" @click="onReset">重置</el-button>
+          <el-button size="small" type="primary" icon="search" @click="onSubmit">查询</el-button>
+          <el-button size="small" icon="refresh" @click="onReset">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -23,11 +23,11 @@
         <el-popover v-model:visible="deleteVisible" placement="top" width="160">
           <p>确定要删除吗？</p>
           <div style="text-align: right; margin-top: 8px;">
-            <el-button size="mini" type="text" @click="deleteVisible = false">取消</el-button>
-            <el-button size="mini" type="primary" @click="onDelete">确定</el-button>
+            <el-button size="small" type="text" @click="deleteVisible = false">取消</el-button>
+            <el-button size="small" type="primary" @click="onDelete">确定</el-button>
           </div>
           <template #reference>
-            <el-button icon="delete" size="mini" style="margin-left: 10px;" :disabled="!multipleSelection.length">删除</el-button>
+            <el-button icon="delete" size="small" style="margin-left: 10px;" :disabled="!multipleSelection.length">删除</el-button>
           </template>
         </el-popover>
       </div>
@@ -94,11 +94,11 @@
             <el-popover v-model:visible="scope.row.visible" placement="top" width="160">
               <p>确定要删除吗？</p>
               <div style="text-align: right; margin-top: 8px;">
-                <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
-                <el-button size="mini" type="primary" @click="deleteSysOperationRecordFunc(scope.row)">确定</el-button>
+                <el-button size="small" type="text" @click="scope.row.visible = false">取消</el-button>
+                <el-button size="small" type="primary" @click="deleteSysOperationRecordFunc(scope.row)">确定</el-button>
               </div>
               <template #reference>
-                <el-button icon="delete" size="mini" type="text">删除</el-button>
+                <el-button icon="delete" size="small" type="text" @click="scope.row.visible = true">删除</el-button>
               </template>
             </el-popover>
           </template>
diff --git a/web/src/view/superAdmin/user/user.vue b/web/src/view/superAdmin/user/user.vue
index a235870cb074b6c2aad7934b3146fab2bbd50b67..f9595f17ec5ab930b9ebc107b89939a6914fac80 100644
--- a/web/src/view/superAdmin/user/user.vue
+++ b/web/src/view/superAdmin/user/user.vue
@@ -3,35 +3,23 @@
     <warning-bar title="注：右上角头像下拉可切换角色" />
     <div class="gva-table-box">
       <div class="gva-btn-list">
-        <el-button size="mini" type="primary" icon="plus" @click="addUser">新增用户</el-button>
+        <el-button size="small" type="primary" icon="plus" @click="addUser">新增用户</el-button>
       </div>
-      <el-table :data="tableData">
-        <el-table-column align="left" label="头像" min-width="50">
+      <el-table
+        :data="tableData"
+        row-key="ID"
+      >
+        <el-table-column align="left" label="头像" min-width="75">
           <template #default="scope">
             <CustomPic style="margin-top:8px" :pic-src="scope.row.headerImg" />
           </template>
         </el-table-column>
-        <el-table-column align="left" label="UUID" min-width="250" prop="uuid" />
+        <el-table-column align="left" label="ID" min-width="50" prop="ID" />
         <el-table-column align="left" label="用户名" min-width="150" prop="userName" />
-        <el-table-column align="left" label="昵称" min-width="100" prop="nickName">
-          <template #default="scope">
-            <p v-if="!scope.row.editFlag" class="nickName">{{ scope.row.nickName }}
-              <el-icon class="pointer" color="#66b1ff" @click="openEidt(scope.row)">
-                <edit />
-              </el-icon>
-            </p>
-            <p v-if="scope.row.editFlag" class="nickName">
-              <el-input v-model="scope.row.nickName" />
-              <el-icon class="pointer" color="#67c23a" @click="enterEdit(scope.row)">
-                <check />
-              </el-icon>
-              <el-icon class="pointer" color="#f23c3c" @click="closeEdit(scope.row)">
-                <close />
-              </el-icon>
-            </p>
-          </template>
-        </el-table-column>
-        <el-table-column align="left" label="用户角色" min-width="150">
+        <el-table-column align="left" label="昵称" min-width="150" prop="nickName" />
+        <el-table-column align="left" label="手机号" min-width="180" prop="phone" />
+        <el-table-column align="left" label="邮箱" min-width="180" prop="email" />
+        <el-table-column align="left" label="用户角色" min-width="200">
           <template #default="scope">
             <el-cascader
               v-model="scope.row.authorityIds"
@@ -45,21 +33,24 @@
             />
           </template>
         </el-table-column>
-        <el-table-column align="left" label="操作" min-width="150">
+
+        <el-table-column label="操作" min-width="250" fixed="right">
           <template #default="scope">
             <el-popover v-model:visible="scope.row.visible" placement="top" width="160">
               <p>确定要删除此用户吗</p>
               <div style="text-align: right; margin-top: 8px;">
-                <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
-                <el-button type="primary" size="mini" @click="deleteUserFunc(scope.row)">确定</el-button>
+                <el-button size="small" type="text" @click="scope.row.visible = false">取消</el-button>
+                <el-button type="primary" size="small" @click="deleteUserFunc(scope.row)">确定</el-button>
               </div>
               <template #reference>
-                <el-button type="text" icon="delete" size="mini">删除</el-button>
+                <el-button type="text" icon="delete" size="small">删除</el-button>
               </template>
             </el-popover>
-            <el-button type="text" icon="magic-stick" size="mini" @click="resetPasswordFunc(scope.row)">重置密码</el-button>
+            <el-button type="text" icon="edit" size="small" @click="openEdit(scope.row)">编辑</el-button>
+            <el-button type="text" icon="magic-stick" size="small" @click="resetPasswordFunc(scope.row)">重置密码</el-button>
           </template>
         </el-table-column>
+
       </el-table>
       <div class="gva-pagination">
         <el-pagination
@@ -73,35 +64,52 @@
         />
       </div>
     </div>
-    <el-dialog v-model="addUserDialog" custom-class="user-dialog" title="新增用户">
-      <el-form ref="userForm" :rules="rules" :model="userInfo" label-width="80px">
-        <el-form-item label="用户名" prop="username">
-          <el-input v-model="userInfo.username" />
-        </el-form-item>
-        <el-form-item label="密码" prop="password">
-          <el-input v-model="userInfo.password" />
-        </el-form-item>
-        <el-form-item label="别名" prop="nickName">
-          <el-input v-model="userInfo.nickName" />
-        </el-form-item>
-        <el-form-item label="用户角色" prop="authorityId">
-          <el-cascader
-            v-model="userInfo.authorityIds"
-            style="width:100%"
-            :options="authOptions"
-            :show-all-levels="false"
-            :props="{ multiple:true,checkStrictly: true,label:'authorityName',value:'authorityId',disabled:'disabled',emitPath:false}"
-            :clearable="false"
-          />
-        </el-form-item>
-        <el-form-item label="头像" label-width="80px">
-          <div style="display:inline-block" @click="openHeaderChange">
-            <img v-if="userInfo.headerImg" class="header-img-box" :src="(userInfo.headerImg && userInfo.headerImg.slice(0, 4) !== 'http')?path+userInfo.headerImg:userInfo.headerImg">
-            <div v-else class="header-img-box">从媒体库选择</div>
-          </div>
-        </el-form-item>
+    <el-dialog
+      v-model="addUserDialog"
+      custom-class="user-dialog"
+      title="用户"
+      :show-close="false"
+      :close-on-press-escape="false"
+      :close-on-click-modal="false"
+    >
+      <div style="height:60vh;overflow:auto;padding:0 12px;">
+        <el-form ref="userForm" :rules="rules" :model="userInfo" label-width="80px">
+          <el-form-item v-if="dialogFlag === 'add'" label="用户名" prop="userName">
+            <el-input v-model="userInfo.userName" />
+          </el-form-item>
+          <el-form-item v-if="dialogFlag === 'add'" label="密码" prop="password">
+            <el-input v-model="userInfo.password" />
+          </el-form-item>
+          <el-form-item label="昵称" prop="nickName">
+            <el-input v-model="userInfo.nickName" />
+          </el-form-item>
+          <el-form-item label="手机号" prop="phone">
+            <el-input v-model="userInfo.phone" />
+          </el-form-item>
+          <el-form-item label="邮箱" prop="email">
+            <el-input v-model="userInfo.email" />
+          </el-form-item>
+          <el-form-item label="用户角色" prop="authorityId">
+            <el-cascader
+              v-model="userInfo.authorityIds"
+              style="width:100%"
+              :options="authOptions"
+              :show-all-levels="false"
+              :props="{ multiple:true,checkStrictly: true,label:'authorityName',value:'authorityId',disabled:'disabled',emitPath:false}"
+              :clearable="false"
+            />
+          </el-form-item>
+          <el-form-item label="头像" label-width="80px">
+            <div style="display:inline-block" @click="openHeaderChange">
+              <img v-if="userInfo.headerImg" class="header-img-box" :src="(userInfo.headerImg && userInfo.headerImg.slice(0, 4) !== 'http')?path+userInfo.headerImg:userInfo.headerImg">
+              <div v-else class="header-img-box">从媒体库选择</div>
+            </div>
+          </el-form-item>
+
+        </el-form>
+
+      </div>
 
-      </el-form>
       <template #footer>
         <div class="dialog-footer">
           <el-button size="small" @click="closeAddUserDialog">取 消</el-button>
@@ -120,6 +128,7 @@ export default {
 </script>
 
 <script setup>
+
 import {
   getUserList,
   setUserAuthorities,
@@ -242,40 +251,12 @@ const setOptions = (authData) => {
   setAuthorityOptions(authData, authOptions.value)
 }
 
-const backNickName = ref('')
-const openEidt = (row) => {
-  if (tableData.value.some(item => item.editFlag)) {
-    ElMessage('当前存在正在编辑的用户')
-    return
-  }
-  backNickName.value = row.nickName
-  row.editFlag = true
-}
-
-const enterEdit = async(row) => {
-  const res = await setUserInfo({ nickName: row.nickName, ID: row.ID })
-  if (res.code === 0) {
-    ElMessage({
-      type: 'success',
-      message: '设置成功'
-    })
-  }
-  backNickName.value = ref('')
-  row.editFlag = false
-}
-
-const closeEdit = (row) => {
-  row.nickName = backNickName.value
-  backNickName.value = ''
-  row.editFlag = false
-}
-
 const deleteUserFunc = async(row) => {
   const res = await deleteUser({ id: row.ID })
   if (res.code === 0) {
     ElMessage.success('删除成功')
-    await getTableData()
     row.visible = false
+    await getTableData()
   }
 }
 
@@ -286,11 +267,11 @@ const userInfo = ref({
   nickName: '',
   headerImg: '',
   authorityId: '',
-  authorityIds: []
+  authorityIds: [],
 })
 
 const rules = ref({
-  username: [
+  userName: [
     { required: true, message: '请输入用户名', trigger: 'blur' },
     { min: 5, message: '最低5位字符', trigger: 'blur' }
   ],
@@ -310,12 +291,25 @@ const enterAddUserDialog = async() => {
   userInfo.value.authorityId = userInfo.value.authorityIds[0]
   userForm.value.validate(async valid => {
     if (valid) {
-      const res = await register(userInfo.value)
-      if (res.code === 0) {
-        ElMessage({ type: 'success', message: '创建成功' })
+      const req = {
+        ...userInfo.value
+      }
+      if (dialogFlag.value === 'add') {
+        const res = await register(req)
+        if (res.code === 0) {
+          ElMessage({ type: 'success', message: '创建成功' })
+          await getTableData()
+          closeAddUserDialog()
+        }
+      }
+      if (dialogFlag.value === 'edit') {
+        const res = await setUserInfo(req)
+        if (res.code === 0) {
+          ElMessage({ type: 'success', message: '编辑成功' })
+          await getTableData()
+          closeAddUserDialog()
+        }
       }
-      await getTableData()
-      closeAddUserDialog()
     }
   })
 }
@@ -327,7 +321,11 @@ const closeAddUserDialog = () => {
   userInfo.value.authorityIds = []
   addUserDialog.value = false
 }
+
+const dialogFlag = ref('add')
+
 const addUser = () => {
+  dialogFlag.value = 'add'
   addUserDialog.value = true
 }
 const changeAuthority = async(row, flag) => {
@@ -344,6 +342,13 @@ const changeAuthority = async(row, flag) => {
     ElMessage({ type: 'success', message: '角色设置成功' })
   }
 }
+
+const openEdit = (row) => {
+  dialogFlag.value = 'edit'
+  userInfo.value = JSON.parse(JSON.stringify(row))
+  addUserDialog.value = true
+}
+
 </script>
 
 <style lang="scss">
diff --git a/web/src/view/systemTools/autoCode/component/fieldDialog.vue b/web/src/view/systemTools/autoCode/component/fieldDialog.vue
index c6454591f0f4f74bd4b705be1eb8d80e6637ed66..1b55308baf5982b3a4b194d642badf54e8b2291e 100644
--- a/web/src/view/systemTools/autoCode/component/fieldDialog.vue
+++ b/web/src/view/systemTools/autoCode/component/fieldDialog.vue
@@ -10,7 +10,7 @@
     >
       <el-form-item label="Field名称" prop="fieldName">
         <el-input v-model="middleDate.fieldName" autocomplete="off" style="width:80%" />
-        <el-button size="mini" style="width:18%;margin-left:2%" @click="autoFill">自动填充</el-button>
+        <el-button size="small" style="width:18%;margin-left:2%" @click="autoFill">自动填充</el-button>
       </el-form-item>
       <el-form-item label="Field中文名" prop="fieldDesc">
         <el-input v-model="middleDate.fieldDesc" autocomplete="off" />
diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue
index 84f31569a14e44de9f09d31f6e73afbc0f12a3f9..7479fd786c9ac80afc926e4dc185ced1397a2b57 100644
--- a/web/src/view/systemTools/autoCode/index.vue
+++ b/web/src/view/systemTools/autoCode/index.vue
@@ -39,7 +39,7 @@
               </el-select>
             </el-form-item>
             <el-form-item>
-              <el-button size="mini" type="primary" @click="getColumnFunc">使用此表创建</el-button>
+              <el-button size="small" type="primary" @click="getColumnFunc">使用此表创建</el-button>
             </el-form-item>
           </el-form>
         </el-collapse-item>
@@ -84,7 +84,7 @@
     <!-- 组件列表 -->
     <div class="gva-table-box">
       <div class="gva-btn-list">
-        <el-button size="mini" type="primary" @click="editAndAddField()">新增Field</el-button>
+        <el-button size="small" type="primary" @click="editAndAddField()">新增Field</el-button>
       </div>
       <el-table :data="form.fields">
         <el-table-column align="left" type="index" label="序列" width="100" />
@@ -100,19 +100,19 @@
         <el-table-column align="left" label="操作" width="300">
           <template #default="scope">
             <el-button
-              size="mini"
+              size="small"
               type="text"
               icon="edit"
               @click="editAndAddField(scope.row)"
             >编辑</el-button>
             <el-button
-              size="mini"
+              size="small"
               type="text"
               :disabled="scope.$index === 0"
               @click="moveUpField(scope.$index)"
             >上移</el-button>
             <el-button
-              size="mini"
+              size="small"
               type="text"
               :disabled="(scope.$index + 1) === form.fields.length"
               @click="moveDownField(scope.$index)"
@@ -120,11 +120,11 @@
             <el-popover v-model:visible="scope.row.visible" placement="top">
               <p>确定删除吗？</p>
               <div style="text-align: right; margin-top: 8px;">
-                <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
-                <el-button type="primary" size="mini" @click="deleteField(scope.$index)">确定</el-button>
+                <el-button size="small" type="text" @click="scope.row.visible = false">取消</el-button>
+                <el-button type="primary" size="small" @click="deleteField(scope.$index)">确定</el-button>
               </div>
               <template #reference>
-                <el-button size="mini" type="text" icon="delete">删除</el-button>
+                <el-button size="small" type="text" icon="delete" @click="scope.row.visible = true">删除</el-button>
               </template>
             </el-popover>
           </template>
@@ -132,8 +132,8 @@
       </el-table>
       <!-- 组件列表 -->
       <div class="gva-btn-list justify-content-flex-end auto-btn-list">
-        <el-button size="mini" type="primary" @click="enterForm(true)">预览代码</el-button>
-        <el-button size="mini" type="primary" @click="enterForm(false)">生成代码</el-button>
+        <el-button size="small" type="primary" @click="enterForm(true)">预览代码</el-button>
+        <el-button size="small" type="primary" @click="enterForm(false)">生成代码</el-button>
       </div>
     </div>
     <!-- 组件弹窗 -->
@@ -141,8 +141,8 @@
       <FieldDialog v-if="dialogFlag" ref="fieldDialogNode" :dialog-middle="dialogMiddle" />
       <template #footer>
         <div class="dialog-footer">
-          <el-button size="mini" @click="closeDialog">取 消</el-button>
-          <el-button size="mini" type="primary" @click="enterDialog">确 定</el-button>
+          <el-button size="small" @click="closeDialog">取 消</el-button>
+          <el-button size="small" type="primary" @click="enterDialog">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -151,8 +151,8 @@
       <template #title>
         <div class="previewCodeTool">
           <p>操作栏：</p>
-          <el-button size="mini" type="primary" @click="selectText">全选</el-button>
-          <el-button size="mini" type="primary" @click="copy">复制</el-button>
+          <el-button size="small" type="primary" @click="selectText">全选</el-button>
+          <el-button size="small" type="primary" @click="copy">复制</el-button>
         </div>
       </template>
       <PreviewCodeDialog v-if="previewFlag" ref="previewNode" :preview-code="preViewCode" />
diff --git a/web/src/view/systemTools/autoCodeAdmin/index.vue b/web/src/view/systemTools/autoCodeAdmin/index.vue
index 1f0385d253658122affd74e10ea46967f042ae3b..3e8103a238064544a30a9808ad656b9253c402ff 100644
--- a/web/src/view/systemTools/autoCodeAdmin/index.vue
+++ b/web/src/view/systemTools/autoCodeAdmin/index.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="gva-table-box">
       <div class="gva-btn-list">
-        <el-button size="mini" type="primary" icon="plus" @click="goAutoCode(null)">新增</el-button>
+        <el-button size="small" type="primary" icon="plus" @click="goAutoCode(null)">新增</el-button>
       </div>
       <el-table :data="tableData">
         <el-table-column
@@ -21,14 +21,14 @@
             <el-tag
               v-if="scope.row.flag"
               type="danger"
-              size="mini"
+              size="small"
               effect="dark"
             >
               已回滚
             </el-tag>
             <el-tag
               v-else
-              size="mini"
+              size="small"
               type="success"
               effect="dark"
             >
@@ -39,9 +39,9 @@
         <el-table-column align="left" label="操作" min-width="180">
           <template #default="scope">
             <div>
-              <el-button size="mini" type="text" :disabled="scope.row.flag === 1" @click="rollbackFunc(scope.row)">回滚</el-button>
-              <el-button size="mini" type="text" @click="goAutoCode(scope.row)">复用</el-button>
-              <el-button size="mini" type="text" @click="deleteRow(scope.row)">删除</el-button>
+              <el-button size="small" type="text" :disabled="scope.row.flag === 1" @click="rollbackFunc(scope.row)">回滚</el-button>
+              <el-button size="small" type="text" @click="goAutoCode(scope.row)">复用</el-button>
+              <el-button size="small" type="text" @click="deleteRow(scope.row)">删除</el-button>
             </div>
           </template>
         </el-table-column>
diff --git a/web/src/view/systemTools/system/system.vue b/web/src/view/systemTools/system/system.vue
index 10c72f4b3075feb173e1f163800a09cfd99b8285..22bccae4f871fdcc75a63f9e455456bfd5274ac3 100644
--- a/web/src/view/systemTools/system/system.vue
+++ b/web/src/view/systemTools/system/system.vue
@@ -333,8 +333,8 @@
       </el-collapse>
     </el-form>
     <div class="gva-btn-list">
-      <el-button type="primary" size="mini" @click="update">立即更新</el-button>
-      <el-button type="primary" size="mini" @click="reload">重启服务（开发中）</el-button>
+      <el-button type="primary" size="small" @click="update">立即更新</el-button>
+      <el-button type="primary" size="small" @click="reload">重启服务（开发中）</el-button>
     </div>
   </div>
 </template>