diff --git a/utils/request.js b/utils/request.js index fc568d7..baf1cbe 100644 --- a/utils/request.js +++ b/utils/request.js @@ -56,26 +56,27 @@ function baseRequest(options) { return fly.request(url, params || data, { ...option }).then(res => { - const data = res.data || {}; + const resData = res.data || {}; if (res.status !== 200) { - return Promise.reject({msg: "请求失败", res, data}); + return Promise.reject({msg: "请求失败", res, resData}); } - if ([401, 403].indexOf(data.status) !== -1) { + if ([401, 403].indexOf(resData.status) !== -1) { handleLoginFailure(); - return Promise.reject({msg: res.data.msg, res, data, toLogin: true}); - } else if (data.status === 200) { - return Promise.resolve(data, res); + return Promise.reject({msg: res.data.msg, res, resData, toLogin: true}); + } else if (resData.status === 200) { + return Promise.resolve(resData, res); } else { - if (url.indexOf('api/systemStats/push') < 0) { + // 埋点数据推送、获取店铺分享图片 + if (url.indexOf('api/systemStats/push') < 0 && url.indexOf('api/hotelMain/shareImage') < 0) { uni.showToast({ - title: res.data.msg, + title: resData.msg, icon: 'none', duration: 3000, success() { } }) } - return Promise.reject({msg: res.data.msg, res, data}); + return Promise.reject({msg: resData.msg, res, data}); } }); }