From 0921caa4b261c9fe2b8e61ee8a1d7703e6411365 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 12 Oct 2021 10:24:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tools/UserPassword.vue    | 23 ++++++++++++-----------
 src/views/user/alteration/Alteration.vue |  2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/components/tools/UserPassword.vue b/src/components/tools/UserPassword.vue
index e751c82..cb22a05 100644
--- a/src/components/tools/UserPassword.vue
+++ b/src/components/tools/UserPassword.vue
@@ -11,12 +11,12 @@
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
 
-        <!--        <a-form-item-->
-        <!--          :labelCol="labelCol"-->
-        <!--          :wrapperCol="wrapperCol"-->
-        <!--          label="旧密码">-->
-        <!--          <a-input type="password" placeholder="请输入旧密码" v-decorator="[ 'oldpassword', validatorRules.oldpassword]"/>-->
-        <!--        </a-form-item>-->
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="旧密码">
+          <a-input type="password" placeholder="请输入旧密码" v-decorator="[ 'oldpassword', validatorRules.oldpassword]"/>
+        </a-form-item>
 
         <a-form-item
           :labelCol="labelCol"
@@ -63,11 +63,11 @@ export default {
       visible: false,
       confirmLoading: false,
       validatorRules: {
-        // oldpassword: {
-        //   rules: [{
-        //     required: true, message: '请输入旧密码!'
-        //   }]
-        // },
+        oldpassword: {
+          rules: [{
+            required: true, message: '请输入旧密码!'
+          }]
+        },
         password: {
           rules: [
             { required: true, message: '请输入新密码!' },
@@ -136,6 +136,7 @@ export default {
           encrypt.setPublicKey(this.rsaPublicKey)
           let params = {}
           params.rsaPublicKey = this.rsaPublicKey
+          params.password = encrypt.encrypt(values.oldpassword)
           params.newPassword = encrypt.encrypt(values.password)
           params.verifyPassword = encrypt.encrypt(values.confirmpassword)
           console.log('修改密码提交数据', params)
diff --git a/src/views/user/alteration/Alteration.vue b/src/views/user/alteration/Alteration.vue
index 0a79e2f..52d725f 100644
--- a/src/views/user/alteration/Alteration.vue
+++ b/src/views/user/alteration/Alteration.vue
@@ -180,7 +180,7 @@ export default {
             url = '/company/verificationChangePassword'
           } else {
             params.newPassword = encrypt.encrypt(values.password)
-            // 用password存了token
+            // 初次登录用password字段存了token
             params.password = that.temporaryUserInfo.result.token
             url = '/company/changePasswordWithToken'
           }