Merge branch 'master' of http://8.140.50.127:3000/JSY/jsy-app
This commit is contained in:
commit
9377adbb76
@ -18,7 +18,7 @@ export function updateUserPwd(oldPassword, newPassword) {
|
|||||||
export function userResetPwd(data) {
|
export function userResetPwd(data) {
|
||||||
return request({
|
return request({
|
||||||
url: "/system/user/resetPwd",
|
url: "/system/user/resetPwd",
|
||||||
method: "post",
|
method: "put",
|
||||||
data:data
|
data:data
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
userResetPwd
|
userResetPwd
|
||||||
} from "@/api/system/user"
|
} from "@/api/system/user"
|
||||||
import store from '@/store'
|
import store from '@/store'
|
||||||
|
import plugin from "@/plugins"
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
@ -65,6 +66,7 @@
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
submit() {
|
submit() {
|
||||||
|
plugin.modal.confirm("您确定要修改密码吗?").then(res => {
|
||||||
this.$refs.form.validate().then(res => {
|
this.$refs.form.validate().then(res => {
|
||||||
let user = {};
|
let user = {};
|
||||||
user.userId = store.state.user.user.userId;
|
user.userId = store.state.user.user.userId;
|
||||||
@ -77,7 +79,7 @@
|
|||||||
});
|
});
|
||||||
uni.navigateBack();
|
uni.navigateBack();
|
||||||
})
|
})
|
||||||
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -114,7 +114,7 @@
|
|||||||
<script>
|
<script>
|
||||||
import store from "@/store"
|
import store from "@/store"
|
||||||
import {
|
import {
|
||||||
updateUserPwd
|
userResetPwd
|
||||||
} from "@/api/system/user"
|
} from "@/api/system/user"
|
||||||
import {
|
import {
|
||||||
checkPermi
|
checkPermi
|
||||||
@ -315,9 +315,9 @@
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
let user = {};
|
let user = {};
|
||||||
user.userId = selectItem.value.userId;
|
user.userId = this.selectItem.userId;
|
||||||
user.password = userForm.value.passWord;
|
user.password = this.userForm.passWord;
|
||||||
updateUserPwd(user)
|
userResetPwd(user)
|
||||||
.then(res => {
|
.then(res => {
|
||||||
this.showModal = false;
|
this.showModal = false;
|
||||||
this.userForm.passWord = null;
|
this.userForm.passWord = null;
|
||||||
|
Loading…
Reference in New Issue
Block a user