Merge branch 'master' of http://8.140.50.127:3000/JSY/jsy-app

api/system/user.js

@@ -18,7 +18,7 @@ export function updateUserPwd(oldPassword, newPassword) {
 export function userResetPwd(data) {
 	return request({
 		url: "/system/user/resetPwd",
-		method: "post",
+		method: "put",
 		data:data
 	})
 }

pages/mine/pwd/index.vue

@@ -20,6 +20,7 @@
 		userResetPwd
 	} from "@/api/system/user"
 	import store from '@/store'
+	import plugin from "@/plugins"
 	export default {
 		data() {
 			return {
@@ -65,19 +66,20 @@
 		},
 		methods: {
 			submit() {
-				this.$refs.form.validate().then(res => {
+				plugin.modal.confirm("您确定要修改密码吗?").then(res => {
-					let user = {};
+					this.$refs.form.validate().then(res => {
-					user.userId = store.state.user.user.userId;
+						let user = {};
-					user.password = this.user.newPassword;
+						user.userId = store.state.user.user.userId;
-					userResetPwd(user).then(response => {
+						user.password = this.user.newPassword;
-						uni.showToast({
+						userResetPwd(user).then(response => {
-							title: '修改成功',
+							uni.showToast({
-							mask: false,
+								title: '修改成功',
-							duration: 1000
+								mask: false,
-						});
+								duration: 1000
-						uni.navigateBack();
+							});
+							uni.navigateBack();
+						})
 					})
-
 				})
 			}
 		}

pages/work/user/index.vue

@@ -114,7 +114,7 @@
 <script>
 	import store from "@/store"
 	import {
-		updateUserPwd
+		userResetPwd
 	} from "@/api/system/user"
 	import {
 		checkPermi
@@ -315,14 +315,14 @@
 					return
 				}
 				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;
-						plugin.modal.msgSuccess("修改成功！")
+					plugin.modal.msgSuccess("修改成功！")
-					})
+				})
 			},
 			onDeleteClick(userId) {
 				let ids = [];