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 }]" /> + 提交 @@ -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 512b6f6..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 { 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,非微信没有这个字段 */