Skip to content

Commit f48458d

Browse files
committed
Merge branch 'develop' into center
2 parents 32cbd2b + 95f4882 commit f48458d

3 files changed

Lines changed: 17 additions & 11 deletions

File tree

src/config/error-code.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const errorCode = {
2-
777: '前端不知道,找后端小哥哥',
2+
777: '前端错误码未定义',
33
999: '服务器未知错误',
44
10000: '认证失败',
55
10020: '资源不存在',

src/config/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const Config = {
66
sideBarLevel: 3, // 侧边栏层级限制, 3表示三级, 可设置 2 和 3
77
showSidebarSearch: true, // 默认打开侧边栏搜索
88
defaultRoute: '/about', // 默认打开的路由
9+
useFrontEndErrorMsg: false, // 默认采用后端返回异常
910
}
1011

1112
export default Config

src/lin/plugins/axios.js

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,21 +146,26 @@ _axios.interceptors.response.use(
146146
return
147147
}
148148
console.log('msg', msg)
149-
// 本次请求添加 params 参数:showBackend 为 true, 弹出后端返回错误信息
150-
if (params && params.showBackend) {
151-
message = msg
152-
} else {
153-
// 弹出前端自定义错误信息
154-
const errorArr = Object.entries(ErrorCode).filter(v => v[0] === error_code.toString())
155-
// 匹配到前端自定义的错误码
156-
if (errorArr.length > 0) {
157-
if (errorArr[0][1] !== '') {
158-
message = errorArr[0][1] // eslint-disable-line
149+
if (Config.useFrontEndErrorMsg) {
150+
// 这一次请求添加 params 参数:showBackend 为 true, 弹出后端返回错误信息
151+
if (params && params.showBackend) {
152+
message = msg
153+
} else {
154+
// 弹出前端自定义错误信息
155+
const errorArr = Object.entries(ErrorCode).filter(v => v[0] === error_code.toString())
156+
// 匹配到前端自定义的错误码
157+
if (errorArr.length > 0) {
158+
if (errorArr[0][1] !== '') {
159+
message = errorArr[0][1] // eslint-disable-line
160+
}
159161
} else {
160162
message = ErrorCode['777']
161163
}
162164
}
165+
} else {
166+
message = msg
163167
}
168+
164169
Vue.prototype.$message({
165170
message,
166171
type: 'error',

0 commit comments

Comments
 (0)