From 7e0893bdeb6215343170ef654e5d2c8a59bfa9b1 Mon Sep 17 00:00:00 2001
From: jsy_zjg <31502350@qq.com>
Date: Tue, 7 Jan 2025 19:20:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/system/user.js        | 2 +-
 pages/work/user/index.vue | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/api/system/user.js b/api/system/user.js
index 1479b4e..ce0af84 100644
--- a/api/system/user.js
+++ b/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
 	})
 }
diff --git a/pages/work/user/index.vue b/pages/work/user/index.vue
index f63d3d9..e780213 100644
--- a/pages/work/user/index.vue
+++ b/pages/work/user/index.vue
@@ -114,7 +114,7 @@
 <script>
 	import store from "@/store"
 	import {
-		updateUserPwd
+		userResetPwd
 	} from "@/api/system/user"
 	import {
 		checkPermi
@@ -315,9 +315,10 @@
 					return
 				}
 				let user = {};
-				user.userId = selectItem.value.userId;
-				user.password = userForm.value.passWord;
-				updateUserPwd(user)
+				user.userId = this.selectItem.userId;
+				user.password = this.userForm.passWord;
+				console.log(user)
+				userResetPwd(user)
 					.then(res => {
 						this.showModal = false;
 						this.userForm.passWord = null;

From 87c847cbdf7a62d1e7a9956633c7365d97d57c5d Mon Sep 17 00:00:00 2001
From: jsy_zjg <31502350@qq.com>
Date: Wed, 8 Jan 2025 12:24:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/pwd/index.vue  | 27 +++++++++++++++------------
 pages/work/user/index.vue | 15 +++++++++------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/pages/mine/pwd/index.vue b/pages/mine/pwd/index.vue
index e1b810c..e3c8400 100644
--- a/pages/mine/pwd/index.vue
+++ b/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,21 @@
 		},
 		methods: {
 			submit() {
-				this.$refs.form.validate().then(res => {
-					let user = {};
-					user.userId = store.state.user.user.userId;
-					user.password = this.user.newPassword;
-					userResetPwd(user).then(response => {
-						uni.showToast({
-							title: '修改成功',
-							mask: false,
-							duration: 1000
-						});
-						uni.navigateBack();
+				plugin.modal.confirm("您确定要修改密码吗?").then(res => {
+					this.$refs.form.validate().then(res => {
+						let user = {};
+						user.userId = store.state.user.user.userId;
+						user.password = this.user.newPassword;
+						userResetPwd(user).then(response => {
+							uni.showToast({
+								title: '修改成功',
+								mask: false,
+								duration: 1000
+							});
+							uni.navigateBack();
+						})
+					
 					})
-
 				})
 			}
 		}
diff --git a/pages/work/user/index.vue b/pages/work/user/index.vue
index e780213..a4edd2b 100644
--- a/pages/work/user/index.vue
+++ b/pages/work/user/index.vue
@@ -318,12 +318,15 @@
 				user.userId = this.selectItem.userId;
 				user.password = this.userForm.passWord;
 				console.log(user)
-				userResetPwd(user)
-					.then(res => {
-						this.showModal = false;
-						this.userForm.passWord = null;
-						plugin.modal.msgSuccess("修改成功！")
-					})
+				plugin.modal.confirm("您确定要修改密码吗?").then(res => {
+					userResetPwd(user)
+						.then(res => {
+							this.showModal = false;
+							this.userForm.passWord = null;
+							plugin.modal.msgSuccess("修改成功！")
+						})
+					
+				})
 			},
 			onDeleteClick(userId) {
 				let ids = [];

From 5d1c25d46e0e3810ddd5d431f23bcc1bca4c9833 Mon Sep 17 00:00:00 2001
From: jsy_zjg <31502350@qq.com>
Date: Wed, 8 Jan 2025 12:31:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/pwd/index.vue  |  1 -
 pages/work/user/index.vue | 14 +++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/pages/mine/pwd/index.vue b/pages/mine/pwd/index.vue
index e3c8400..8246471 100644
--- a/pages/mine/pwd/index.vue
+++ b/pages/mine/pwd/index.vue
@@ -79,7 +79,6 @@
 							});
 							uni.navigateBack();
 						})
-					
 					})
 				})
 			}
diff --git a/pages/work/user/index.vue b/pages/work/user/index.vue
index a4edd2b..1e89446 100644
--- a/pages/work/user/index.vue
+++ b/pages/work/user/index.vue
@@ -317,15 +317,11 @@
 				let user = {};
 				user.userId = this.selectItem.userId;
 				user.password = this.userForm.passWord;
-				console.log(user)
-				plugin.modal.confirm("您确定要修改密码吗?").then(res => {
-					userResetPwd(user)
-						.then(res => {
-							this.showModal = false;
-							this.userForm.passWord = null;
-							plugin.modal.msgSuccess("修改成功！")
-						})
-					
+				userResetPwd(user)
+				.then(res => {
+					this.showModal = false;
+					this.userForm.passWord = null;
+					plugin.modal.msgSuccess("修改成功！")
 				})
 			},
 			onDeleteClick(userId) {