From c2f2cb66e7a8e100da2bff5b7b567b89077b3d28 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 30 Jan 2023 10:00:49 +0800
Subject: [PATCH 1/3] =?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/api/boe/userbasic.js   | 11 ++++++++++-
 src/views/user/Setting.vue | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/api/boe/userbasic.js b/src/api/boe/userbasic.js
index 1c825246..ea31c16b 100644
--- a/src/api/boe/userbasic.js
+++ b/src/api/boe/userbasic.js
@@ -48,6 +48,14 @@ const getOrgHrbpInfo = function(orgId) {
     return ajax.postJson(baseURL,'/org/orgHrbpInfo',{orgId});
 }
 
+/**
+ * 修改密码
+ * {newPassword:'',oldPassword:''}
+*/
+const modifyPassword = function(data) {
+    return ajax.postJson('/user/resetPassword',data);
+}
+
 export default {
     userParentOrg,
     findOrgsByKeyword,
@@ -55,5 +63,6 @@ export default {
     findOrgTreeByOrgId,
     getUserInfoById,
     getUserCrowds,
-    getOrgHrbpInfo
+    getOrgHrbpInfo,
+    modifyPassword
 }
diff --git a/src/views/user/Setting.vue b/src/views/user/Setting.vue
index 4b4419bf..a08602f6 100644
--- a/src/views/user/Setting.vue
+++ b/src/views/user/Setting.vue
@@ -242,6 +242,7 @@
   import userApi from "@/api/system/user";
   import accountApi from "@/api/account";
   import apiPassword from '@/api/boe/login.js'
+  import apiUserBasic from '@/api/boe/userbasic.js'
   import imageUpload from '@/components/ImageUpload/index.vue';
   import apiUserhobby from "@/api/phase2/userhobby.js"
   import apiBoeTeahcer from "@/api/boe/teacher.js"
@@ -665,7 +666,15 @@
       updatePassword(){
         this.$refs.form.validate((valid) => {
           if (valid) {
-            apiPassword.modifyPassword({oldPassword:this.passwordForm.oldPass,newPassword:this.passwordForm.newPass,confirmPassword:this.passwordForm.confirmPass}).then(res=>{
+            // apiPassword.modifyPassword({oldPassword:this.passwordForm.oldPass,newPassword:this.passwordForm.newPass,confirmPassword:this.passwordForm.confirmPass}).then(res=>{
+            //   if(res.status==200){
+            //     this.$message.success('修改密码成功')
+            //     this.dialogVisiblePassword = false;
+            //   }else{
+            //     this.$message.error(res.message);
+            //   }
+            // })
+            apiUserBasic.modifyPassword({oldPassword:this.passwordForm.oldPass,newPassword:this.passwordForm.newPass,confirmPassword:this.passwordForm.confirmPass}).then(res=>{
               if(res.status==200){
                 this.$message.success('修改密码成功')
                 this.dialogVisiblePassword = false;

From 77fff17562690dfd9534ccac3630c6d7e799fb9a Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 30 Jan 2023 10:30:37 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8A=A0=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/boe/userbasic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/boe/userbasic.js b/src/api/boe/userbasic.js
index ea31c16b..da997a48 100644
--- a/src/api/boe/userbasic.js
+++ b/src/api/boe/userbasic.js
@@ -49,7 +49,7 @@ const getOrgHrbpInfo = function(orgId) {
 }
 
 /**
- * 修改密码
+ * 修改密码，不再使用，已转化为userbasic接口
  * {newPassword:'',oldPassword:''}
 */
 const modifyPassword = function(data) {

From 6b7314cc23c1be7813b48a270ac15e14beae7e5c Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 30 Jan 2023 14:34:13 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/boe/userbasic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/boe/userbasic.js b/src/api/boe/userbasic.js
index da997a48..e39caf97 100644
--- a/src/api/boe/userbasic.js
+++ b/src/api/boe/userbasic.js
@@ -53,7 +53,7 @@ const getOrgHrbpInfo = function(orgId) {
  * {newPassword:'',oldPassword:''}
 */
 const modifyPassword = function(data) {
-    return ajax.postJson('/user/resetPassword',data);
+    return ajax.postJson(baseURL,'/user/resetPassword',data);
 }
 
 export default {