Commit 63d2000b authored by qiaobin's avatar qiaobin

Merge remote-tracking branch 'origin/dev'

parents 72a67316 4f3a3528
<!DOCTYPE html>
<!-- 版本过低提示页 -->
<html>
<head>
<title>提示</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta
name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1"
/>
<style>
#main-img {
width: 100%;
}
</style>
</head>
<body>
<img id="main-img" src="http://chengshijiangren.oss-cn-beijing.aliyuncs.com/onsite-service-admin/img/1/1081623977324974080.png" />
</body>
</html>
...@@ -19,16 +19,16 @@ const err = (error) => { ...@@ -19,16 +19,16 @@ const err = (error) => {
if (error.response) { if (error.response) {
let data = error.response.data let data = error.response.data
if (data.status == SYS_CONST.REQUEST.CONTROLLER_ERROR) { if (data.status == SYS_CONST.REQUEST.CONTROLLER_ERROR) {
notification.error({message: '请求失败', description: data.message}) notification.error({message: '请求失败', description: data.msg})
} else if (data.status == SYS_CONST.REQUEST.NOT_AUTHORITY) { } else if (data.status == SYS_CONST.REQUEST.NOT_AUTHORITY) {
notification.error({message: '权限不足', description: '当前用户无此操作权限,请联系管理员'}) notification.error({message: '权限不足', description: '当前用户无此操作权限,请联系管理员'})
} else if (data.status == SYS_CONST.REQUEST.NOT_LOGIN) { } else if (data.status == SYS_CONST.REQUEST.NOT_LOGIN) {
gotoLogin() gotoLogin()
} else { } else {
notification.error({message: '请求失败', description: ((error.response || {}).data || {}).message || "请求出现错误,请稍后再试"}) notification.error({message: '请求失败', description: ((error.response || {}).data || {}).msg || "请求出现错误,请稍后再试"})
} }
} else { } else {
notification.error({message: '请求失败', description: "请求出现错误,请稍后再试"}) notification.error({message: '请求失败', description: ((error.response || {}).data || {}).msg || "请求出现错误,请稍后再试"})
} }
return Promise.reject(error) return Promise.reject(error)
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment