From cf7c21a160e8fd158f2621d13a1c882d487e5bb0 Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Mon, 8 Sep 2025 13:27:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=B4=E6=97=B6=E5=8A=B3?=
 =?UTF-8?q?=E5=8A=A1=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/index.ts              |  1 -
 src/pages-user/userEdit/userEdit.vue |  3 +++
 src/pages/login/login.vue            | 14 +++++++-------
 src/store/user.ts                    |  1 +
 src/typings.d.ts                     |  1 +
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/api/system/index.ts b/src/api/system/index.ts
index b6aa305..a257519 100644
--- a/src/api/system/index.ts
+++ b/src/api/system/index.ts
@@ -13,7 +13,6 @@ interface LoginParams {
  */
 export function loginApi(config : LoginParams) {
 	// 如果传了 captcha，走本地登录（/sys/login）,否则走单点登录（/sys/sinopecLogin）
-	console.log('----',config)
 	const url = config.captcha ? '/sys/login' : '/sys/sinopecLogin';
 	return http({
 		url,
diff --git a/src/pages-user/userEdit/userEdit.vue b/src/pages-user/userEdit/userEdit.vue
index ad67aea..2751f3b 100644
--- a/src/pages-user/userEdit/userEdit.vue
+++ b/src/pages-user/userEdit/userEdit.vue
@@ -27,6 +27,8 @@
 					placeholder="请输入手机号" :rules="[{ validator: rules.phone }]" />
 				<wd-input label="邮箱" prop="email" clearable label-width="100px" v-model="model.email"
 					placeholder="请输入邮箱" :rules="[{ validator: rules.email }]" />
+				<wd-input label="密码" prop="clock" clearable label-width="100px" v-model="model.password"
+					placeholder="修改密码,不修改密码无需输入" v-if="userStore.userInfo.userIdentity == 3"/>
 			</wd-cell-group>
 			<view class="footer p5">
 				<wd-button type="primary" size="large" @click="handleSubmit" block>提交</wd-button>
@@ -65,6 +67,7 @@
 		// sex: userStore.userInfo.sex ?? 1,
 		phone: userStore.userInfo.phone,
 		email: userStore.userInfo.email,
+		password: ''
 	})
 	const rules = {
 		phone: (value : string) => {
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 07f4ecf..272449f 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -119,7 +119,7 @@
 			toast.warning('请输入密码')
 			return
 		}
-		const params = {
+		let params = {
 			username: userName.value,
 			password: password.value,
 		};
@@ -128,7 +128,7 @@
 			await queryUsernameByLdhth(userName.value).then(res => {
 				if (res) {
 					params = {
-						username: Base64.encode(encodeURIComponent(userName.value)),
+						username: Base64.encode(encodeURIComponent(res)),
 						password: Base64.encode(encodeURIComponent(password.value)),
 					};
 				} else {
@@ -137,12 +137,12 @@
 			})
 		} else {
 			/*开发环境 */
-			// params.captcha = 'app';
+			params.captcha = 'app';
 			/*生产环境 */
-			params = {
-				username: Base64.encode(encodeURIComponent(userName.value)),
-				password: Base64.encode(encodeURIComponent(password.value)),
-			};
+			// params = {
+			// 	username: Base64.encode(encodeURIComponent(userName.value)),
+			// 	password: Base64.encode(encodeURIComponent(password.value)),
+			// };
 		}
 		login(params)
 	}
diff --git a/src/store/user.ts b/src/store/user.ts
index e969b17..b2b4205 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -15,6 +15,7 @@ const initState = {
 	post: '',
 	orgCode: '',
 	workNo: '',
+	userIdentity: '',
 	// 本地存储时间
 	localStorageTime: 0,
 }
diff --git a/src/typings.d.ts b/src/typings.d.ts
index 29838cf..9c9216e 100644
--- a/src/typings.d.ts
+++ b/src/typings.d.ts
@@ -28,6 +28,7 @@ declare global {
 		tenantId ?: string | number
 		// sex ?: number
 		phone ?: string
+		userIdentity ?: string | number
 		post ?: string
 		email ?: string
 		/** 微信的 openid，非微信没有这个字段 */