Merge remote-tracking branch 'origin/third'

This commit is contained in:
yujicun
2023-01-31 10:40:40 +08:00
2 changed files with 20 additions and 2 deletions

View File

@@ -48,6 +48,14 @@ const getOrgHrbpInfo = function(orgId) {
return ajax.postJson(baseURL,'/org/orgHrbpInfo',{orgId});
}
/**
* 修改密码不再使用已转化为userbasic接口
* {newPassword:'',oldPassword:''}
*/
const modifyPassword = function(data) {
return ajax.postJson(baseURL,'/user/resetPassword',data);
}
export default {
userParentOrg,
findOrgsByKeyword,
@@ -55,5 +63,6 @@ export default {
findOrgTreeByOrgId,
getUserInfoById,
getUserCrowds,
getOrgHrbpInfo
getOrgHrbpInfo,
modifyPassword
}

View File

@@ -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;