Merge remote-tracking branch 'remotes/origin/master' into minJeecg

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,

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) => {

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 {

src/store/user.ts

@@ -15,6 +15,7 @@ const initState = {
 	post: '',
 	orgCode: '',
 	workNo: '',
+	userIdentity: '',
 	// 本地存储时间
 	localStorageTime: 0,
 }

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，非微信没有这个字段 */