diff --git a/resources/beike/admin/views/pages/admin_roles/edit.blade.php b/resources/beike/admin/views/pages/admin_roles/edit.blade.php
index 1394dc7f..bf4e10bf 100644
--- a/resources/beike/admin/views/pages/admin_roles/edit.blade.php
+++ b/resources/beike/admin/views/pages/admin_roles/edit.blade.php
@@ -16,9 +16,9 @@
 
         <el-form-item label="权限" prop="roles">
           <div class="roles-wrap border">
-            <div class="header-wrap px-2">
-              <button class="btn btn-outline-dark btn-sm me-3" type="button">选中所有</button>
-              <button class="btn btn-outline-dark btn-sm" type="button">取消选中</button>
+            <div class="header-wrap bg-dark p-2 text-dark bg-opacity-10 px-2">
+              <el-button size="small" @click="updateAllState(true)">选中所有</el-button>
+              <el-button size="small" @click="updateAllState(false)">取消选中</el-button>
             </div>
             <div v-for="role, index in form.roles" :key="index">
               <div class="bg-light px-2 d-flex">
@@ -99,6 +99,14 @@
           this.form.roles[index].methods.map(e => e.selected = !!type)
         },
 
+        updateAllState(type) {
+          this.form.roles.forEach(e => {
+            e.methods.forEach(method => {
+              method.selected = !!type
+            });
+          });
+        },
+
         addFormSubmit(form) {
           const self = this;
           const type = this.type == 'add' ? 'post' : 'put';
diff --git a/resources/beike/admin/views/pages/admin_users/index.blade.php b/resources/beike/admin/views/pages/admin_users/index.blade.php
index 6013bb63..a584b88d 100644
--- a/resources/beike/admin/views/pages/admin_users/index.blade.php
+++ b/resources/beike/admin/views/pages/admin_users/index.blade.php
@@ -64,7 +64,7 @@
           <el-input v-model="dialog.form.email" placeholder="邮箱"></el-input>
         </el-form-item>
 
-        <el-form-item label="密码" prop="password">
+        <el-form-item label="密码" :prop="dialog.form.id === null || dialog.form.id == '' ? 'password' : ''">
           <el-input v-model="dialog.form.password" placeholder="密码"></el-input>
         </el-form-item>