diff --git a/src/views/system/user/resetPwd.vue b/src/views/system/user/resetPwd.vue
index 99d95e8..8d18ff3 100644
--- a/src/views/system/user/resetPwd.vue
+++ b/src/views/system/user/resetPwd.vue
@@ -2,13 +2,13 @@
   <el-dialog :visible.sync="dialogFormVisible" title="修改密码" width="350px" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="userForm" label-position="right" label-width="80px">
       <el-form-item label="原密码" prop="oldpassword">
-        <el-input v-model="userForm.oldPassword" type="password" placeholder="必填"/>
+        <el-input v-model.trim="userForm.oldpassword" type="password" placeholder="必填"/>
       </el-form-item>
       <el-form-item label="密码" prop="password">
-        <el-input v-model="userForm.password" type="password" placeholder="必填"/>
+        <el-input v-model.trim="userForm.password" type="password" placeholder="必填"/>
       </el-form-item>
       <el-form-item label="重复密码" prop="repassword">
-        <el-input v-model="userForm.repassword" type="password" placeholder="必填"/>
+        <el-input v-model.trim="userForm.repassword" type="password" placeholder="必填"/>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -27,6 +27,13 @@
   name: 'ResetPwd',
   components: { SelectTree },
   data() {
+    const validateOldPass = (rule, value, callback) => {
+      console.log('验证旧密码')
+      if (value === '') {
+        callback(new Error('旧密码不能为空'))
+      }
+      callback()
+    }
     const validatePass = (rule, value, callback) => {
       console.log('验证密码')
       if (value === '') {
@@ -44,12 +51,12 @@
         } else {
           callback(new Error('必须由数字、字母、字符中至少两种组成'))
         }
-
         callback()
       }
     }
-    const validatePass2 = (rule, value, callback) => {
+    const validateRepass = (rule, value, callback) => {
       console.log('验证重复密码')
+      debugger
       if (value === '') {
         callback(new Error('重复密码不能为空'))
       } else if (value !== this.userForm.password) {
@@ -62,14 +69,14 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       userForm: {
-        oldPassword: '', // 原密码
+        oldpassword: '', // 原密码
         password: '', // 密码
         repassword: '' // 重复密码
       }, // 表单
       rules: {
-        oldpassword: [{ required: true, validator: validatePass, trigger: ['blur', 'change'] }],
-        password: [{ required: true, validator: validatePass, trigger: ['blur', 'change'] }],
-        repassword: [{ required: true, validator: validatePass2, trigger: ['blur', 'change'] }]
+        oldpassword: [{ required: true, validator: validateOldPass, trigger: ['blur', 'change'] }],
+        password: [{ required: true, validator: validatePass, trigger: ['blur'] }],
+        repassword: [{ required: true, validator: validateRepass, trigger: ['blur'] }]
       } // 前端校验规则
     }
   },
@@ -85,7 +92,7 @@
     // 重置表单
     resetForm() {
       this.userForm = {
-        oldPassword: '',
+        oldpassword: '',
         password: '', // 密码
         repassword: '' // 重复密码
       }
@@ -94,7 +101,7 @@
     saveData: function() {
       this.$refs['dataForm'].validate((valid) => {
         const userForm = {
-          oldPwd: this.userForm.oldPassword,
+          oldPwd: this.userForm.oldpassword,
           newPwd: this.userForm.password
         }
         userForm.oldPwd = RSAencrypt(userForm.oldPwd)