From 8b3151b8ce2b4c8ec1f74d6ff4c25291069dacfe Mon Sep 17 00:00:00 2001
From: AN <1983933789@qq.com>
Date: Sun, 22 Jun 2025 12:49:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(projects):=20=E4=BF=AE=E5=A4=8D=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF-=E4=BF=AE=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E6=9C=AA=E5=8A=A0=E5=AF=86=E4=B8=94=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/service/api/system/tenant.ts         |  2 +-
 src/service/api/system/user.ts           |  6 +++++-
 src/typings/api/system.api.d.ts          |  7 ++++---
 src/views/_builtin/user-center/index.vue | 11 ++++++-----
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/service/api/system/tenant.ts b/src/service/api/system/tenant.ts
index 0fd939a1..0724a4c1 100644
--- a/src/service/api/system/tenant.ts
+++ b/src/service/api/system/tenant.ts
@@ -16,7 +16,7 @@ export function fetchCreateTenant(data: Api.System.TenantOperateParams) {
     method: 'post',
     headers: {
       isEncrypt: true,
-      repeatSubmit: true
+      repeatSubmit: false
     },
     data
   });
diff --git a/src/service/api/system/user.ts b/src/service/api/system/user.ts
index e7c03d86..df1c11d2 100644
--- a/src/service/api/system/user.ts
+++ b/src/service/api/system/user.ts
@@ -81,7 +81,8 @@ export function fetchResetUserPassword(userId: CommonType.IdType, password: stri
     url: '/system/user/resetPwd',
     method: 'put',
     headers: {
-      isEncrypt: true
+      isEncrypt: true,
+      repeatSubmit: false
     },
     data: { userId, password }
   });
@@ -118,6 +119,9 @@ export function fetchUpdateUserPassword(data: Api.System.UserPasswordOperatePara
   return request<boolean>({
     url: '/system/user/profile/updatePwd',
     method: 'put',
+    headers: {
+      isEncrypt: true
+    },
     data
   });
 }
diff --git a/src/typings/api/system.api.d.ts b/src/typings/api/system.api.d.ts
index d91b0fef..c3df96eb 100644
--- a/src/typings/api/system.api.d.ts
+++ b/src/typings/api/system.api.d.ts
@@ -152,9 +152,10 @@ declare namespace Api {
     type UserProfileOperateParams = CommonType.RecordNullable<Pick<User, 'nickName' | 'email' | 'phonenumber' | 'sex'>>;
 
     /** user password operate params */
-    type UserPasswordOperateParams = CommonType.RecordNullable<
-      Pick<User, 'userId' | 'password'> & { newPassword: string }
-    >;
+    type UserPasswordOperateParams = CommonType.RecordNullable<{
+      oldPassword: string;
+      newPassword: string;
+    }>;
 
     /** user info */
     type UserInfo = {
diff --git a/src/views/_builtin/user-center/index.vue b/src/views/_builtin/user-center/index.vue
index a603f4ef..de6ad42c 100644
--- a/src/views/_builtin/user-center/index.vue
+++ b/src/views/_builtin/user-center/index.vue
@@ -46,14 +46,14 @@ function createDefaultProfileModel(): ProfileModel {
 
 function createDefaultPasswordModel(): PasswordModel {
   return {
-    password: '',
+    oldPassword: '',
     confirmPassword: '',
     newPassword: ''
   };
 }
 
 type ProfileRuleKey = Extract<keyof ProfileModel, 'nickName' | 'email' | 'phonenumber' | 'sex'>;
-type PasswordRuleKey = Extract<keyof PasswordModel, 'password' | 'confirmPassword' | 'newPassword'>;
+type PasswordRuleKey = Extract<keyof PasswordModel, 'oldPassword' | 'newPassword' | 'confirmPassword'>;
 
 const profileRules: Record<ProfileRuleKey, App.Global.FormRule> = {
   nickName: createRequiredRule('昵称不能为空'),
@@ -63,7 +63,7 @@ const profileRules: Record<ProfileRuleKey, App.Global.FormRule> = {
 };
 
 const passwordRules: Record<PasswordRuleKey, App.Global.FormRule> = {
-  password: createRequiredRule('密码不能为空'),
+  oldPassword: createRequiredRule('旧密码不能为空'),
   confirmPassword: createRequiredRule('确认密码不能为空'),
   newPassword: createRequiredRule('新密码不能为空')
 };
@@ -90,7 +90,8 @@ async function updatePassword() {
     return;
   }
   startBtnLoading();
-  const { error } = await fetchUpdateUserPassword(passwordModel);
+  const { oldPassword, newPassword } = passwordModel;
+  const { error } = await fetchUpdateUserPassword({ oldPassword, newPassword });
   if (!error) {
     window.$message?.success('密码修改成功');
     // 清空表单
@@ -185,7 +186,7 @@ async function updatePassword() {
           >
             <NFormItem label="旧密码" path="password">
               <NInput
-                v-model:value="passwordModel.password"
+                v-model:value="passwordModel.oldPassword"
                 type="password"
                 placeholder="请输入旧密码"
                 show-password-on="click"