From 391024b9c721c8dae22de6974a5fc2d68cfab9cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E5=B7=9E?= Date: Wed, 21 Jul 2021 14:08:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E5=85=B3=E7=99=BB=E9=99=86=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/system.ts | 4 ++-- src/services/user.ts | 19 +++++++++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/services/system.ts b/src/services/system.ts index e3bff42..85d734e 100644 --- a/src/services/system.ts +++ b/src/services/system.ts @@ -45,10 +45,10 @@ const system = { }, /* 发往网关的请求 */ // 登陆 - login: async (userId: string, userPhone: string) => { + login: async (userId: string, userPhone: string, api: string) => { const res = await fetchLocalApi( 'login', - { userId, userPhone }, + { userId, userPhone, api }, { silent: true }, ); sendSocketMessage(`login:${userPhone}`); diff --git a/src/services/user.ts b/src/services/user.ts index 3f3d1cd..11f8a5b 100644 --- a/src/services/user.ts +++ b/src/services/user.ts @@ -34,16 +34,23 @@ export async function login(account: string, password: string) { return errorReponse('该账号没有访问权限'); } - const systemLoginRes = await system.login(res.data.id, res.data.phone); + const companyInfoRes = await fetchApi( + 'company/queryFrontDeskCompanyById', + { id: userData.companyId }, + { silent: true }, + ); + if (!isReqSuccess(companyInfoRes)) { + return companyInfoRes; + } + const systemLoginRes = await system.login( + res.data.id, + res.data.phone, + companyInfoRes.data?.company?.IpfsApi || '', + ); if (!isReqSuccess(systemLoginRes)) { return errorReponse('本地网管通讯失败'); } - // const companyInfoRes = await fetchApi('company/queryFrontDeskCompanyById', { id: userData.companyId }, { silent: true }); - // if (!isReqSuccess(companyInfoRes)) { - // return companyInfoRes; - // } - // const { data: { company: { SoftwareVersion } = {} } = {} } = companyInfoRes; // 角色判断