fix(login): surface business failures and localize the login panel art
- request interceptor: treat flag=failure / success=false as a business error even when code is 0 (the gateway returns code 0 for login failures), so the backend message is shown instead of being swallowed - tag already-notified errors so callers do not toast twice - user store: throw a readable error when the login response has no token (previously crashed on null.token and the login page silently ignored it) - login page: show an error message for errors the interceptor did not report - replace the remote gw.alipayobjects.com decoration with a local svg Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
parent
e9c73ecd79
commit
9aa6e4ca0d
10
src/assets/images/login-panel-pattern.svg
Normal file
10
src/assets/images/login-panel-pattern.svg
Normal file
@ -0,0 +1,10 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 400" width="400" height="400">
|
||||
<g fill="none" stroke="#ffffff" stroke-width="1.5">
|
||||
<circle cx="80" cy="70" r="55"/>
|
||||
<circle cx="320" cy="120" r="90"/>
|
||||
<circle cx="180" cy="300" r="120"/>
|
||||
<circle cx="360" cy="330" r="60"/>
|
||||
<path d="M0 210c70 0 70-70 140-70s70 70 140 70 70-70 120-70"/>
|
||||
<path d="M0 262c70 0 70-70 140-70s70 70 140 70 70-70 120-70"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 445 B |
@ -42,9 +42,15 @@ export const useUserStore = defineStore('user', {
|
||||
password,
|
||||
device: appStore.device
|
||||
})
|
||||
const data = resp.data
|
||||
this.token = data.token
|
||||
setToken(data.token)
|
||||
const data = resp.data as { token?: string } | null
|
||||
// 兜底:业务层未返回 token 时视为登录失败,避免后续在 null 上取属性导致报错被静默吞掉
|
||||
if (!data?.token) {
|
||||
const { message } = resp as unknown as { message?: string }
|
||||
throw new Error(message || '登录失败,请稍后重试')
|
||||
}
|
||||
const token = data.token
|
||||
this.token = token
|
||||
setToken(token)
|
||||
// 打印组件连接在路由守卫 getInfo 成功后统一触发一次(此时才可按“用户+仓库”配置决定尝试哪些组件)
|
||||
return true
|
||||
},
|
||||
|
||||
@ -41,6 +41,24 @@ type ServiceRequestConfig = {
|
||||
listTimeout?: number | false
|
||||
}
|
||||
|
||||
/**
|
||||
* 业务失败判定:网关失败时可能返回 code=0,但会同时给出 flag=failure(/failed/fail/error) 或 success=false。
|
||||
* 仅凭 code 判断会把这类响应误认为成功(例如登录密码错误时页面无任何提示)。
|
||||
*/
|
||||
function isBusinessFailure(res: unknown): boolean {
|
||||
if (!res || typeof res !== 'object') return false
|
||||
const { success, flag } = res as { success?: unknown; flag?: unknown }
|
||||
if (success === false || flag === false) return true
|
||||
return typeof flag === 'string' && ['failure', 'failed', 'fail', 'error'].includes(flag.toLowerCase())
|
||||
}
|
||||
|
||||
/** 统一构造业务错误,并标记是否已由拦截器提示过,避免调用方重复弹窗 */
|
||||
function createBusinessError(message: string, notified: boolean) {
|
||||
const err = new Error(message) as Error & { notified?: boolean }
|
||||
err.notified = notified
|
||||
return err
|
||||
}
|
||||
|
||||
/** 取出网关接口名(`/system` 网关通过 `params.method` 指定,如 waybill.warehouse.list) */
|
||||
function getGatewayMethod(config: { params?: unknown }): string | undefined {
|
||||
const params = config.params as { method?: unknown } | undefined
|
||||
@ -169,25 +187,25 @@ service.interceptors.response.use(
|
||||
// 静默请求:业务码/网络失败不弹全局提示(调用方自行回退默认值)
|
||||
const silentError = Boolean((response.config as unknown as ServiceRequestConfig | undefined)?.silentError)
|
||||
|
||||
// 检查业务状态码
|
||||
if (!SUCCESS_CODES.includes(res.code)) {
|
||||
// 检查业务状态码(同时识别 flag/success 显式失败标记,见 isBusinessFailure)
|
||||
if (isBusinessFailure(res) || !SUCCESS_CODES.includes(res?.code)) {
|
||||
// 优先使用后端返回的 message,如果没有则从映射表获取,最后使用默认值
|
||||
const errorMessage = res.message || (ERROR_CODE_MAP as Record<number | string, string>)[res.code] || '请求失败'
|
||||
const errorMessage = res?.message || (ERROR_CODE_MAP as Record<number | string, string>)[res?.code] || '请求失败'
|
||||
|
||||
// Token 失效处理
|
||||
if ([401, 50008, 50012, 50014].includes(res.code)) {
|
||||
if ([401, 50008, 50012, 50014].includes(res?.code)) {
|
||||
handleTokenExpired()
|
||||
return Promise.reject(new Error(errorMessage))
|
||||
return Promise.reject(createBusinessError(errorMessage, true))
|
||||
}
|
||||
|
||||
// 权限不足处理
|
||||
if ([403, 40005, 40006].includes(res.code)) {
|
||||
if ([403, 40005, 40006].includes(res?.code)) {
|
||||
if (!silentError) ElMessage.warning('没有操作权限')
|
||||
return Promise.reject(new Error(errorMessage))
|
||||
return Promise.reject(createBusinessError(errorMessage, !silentError))
|
||||
}
|
||||
|
||||
if (!silentError) ElMessage.error(errorMessage)
|
||||
return Promise.reject(new Error(errorMessage))
|
||||
return Promise.reject(createBusinessError(errorMessage, !silentError))
|
||||
} else {
|
||||
// 请求成功,返回数据
|
||||
return res
|
||||
@ -238,6 +256,7 @@ service.interceptors.response.use(
|
||||
|
||||
if ((error.config as unknown as ServiceRequestConfig | undefined)?.silentError !== true) {
|
||||
ElMessage.error(message)
|
||||
error.notified = true
|
||||
}
|
||||
return Promise.reject(error)
|
||||
}
|
||||
|
||||
@ -347,8 +347,10 @@ const handleLogin = () => {
|
||||
try {
|
||||
await userStore.login(loginForm)
|
||||
router.push({ path: redirect.value || '/', query: otherQuery.value })
|
||||
} catch {
|
||||
// handled by interceptor
|
||||
} catch (err) {
|
||||
// 拦截器已提示过的错误不再重复弹窗,未提示的(如缺少 token 的兜底异常)在此提示
|
||||
const { notified, message } = (err ?? {}) as { notified?: boolean; message?: string }
|
||||
if (!notified) ElMessage.error(message || t('login.loginFailed'))
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@ -598,7 +600,7 @@ onUnmounted(() => {
|
||||
height: 100%;
|
||||
top: 0;
|
||||
left: 0;
|
||||
background: url('https://gw.alipayobjects.com/zos/rmsportal/TVirbqOXmUycLUXfInid.svg') no-repeat center;
|
||||
background: url('../../assets/images/login-panel-pattern.svg') no-repeat center;
|
||||
background-size: cover;
|
||||
opacity: 0.1;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user