diff --git a/lib/saas/router/guard/permission-guard.ts b/lib/saas/router/guard/permission-guard.ts index 89f786d..5105adf 100644 --- a/lib/saas/router/guard/permission-guard.ts +++ b/lib/saas/router/guard/permission-guard.ts @@ -32,7 +32,7 @@ export function createPermissionGuard(router: Router, whiteNameList: string[]) { to.name && !whiteNameList.includes(to.name as string) ) { - NsMessage.error('登陆信息已过期,请重新登录!', 1); + NsMessage.error('登录信息已过期,请重新登录!', 1); next({ name: 'login' }); } else { // 存储用户信息 diff --git a/lib/util/http/axios.ts b/lib/util/http/axios.ts index e66a843..79aa7f9 100644 --- a/lib/util/http/axios.ts +++ b/lib/util/http/axios.ts @@ -78,7 +78,7 @@ export class NSAxios { const errCodeMap = new Map([ [13, ''], [1, ''], - [3005, JSON.stringify(() => routerConfig.logout())], + [3005, () => routerConfig.logout()], ]); // type closeType = (() => void) | undefined; @@ -88,10 +88,12 @@ export class NSAxios { const code = res?.data?.retcode; const msg = res?.data?.msg; if (errCodeMap.has(code)) { + console.log(errCodeMap.get(code)); + NsMessage.error({ content: msg, key: this.errorMsgKey, - onClose: errCodeMap.get(code) && JSON.parse(errCodeMap.get(code)!)(), + onClose: errCodeMap.get(code) && errCodeMap.get(code)(), }); return Promise.reject(res); }