From a4f102defd2c7918617717f3307b6a3ef63859ff Mon Sep 17 00:00:00 2001 From: Mr Ke <kelq@hugeinfo.com.cn> Date: Fri, 29 May 2020 18:03:17 +0800 Subject: [PATCH] 绩效总览 (列表、详情)、绩效指标 (配置) --- src/api/request.js | 31 ++++++++++--------------------- 1 files changed, 10 insertions(+), 21 deletions(-) diff --git a/src/api/request.js b/src/api/request.js index 106447f..10f16d4 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -3,13 +3,11 @@ import { message } from 'antd'; import { NetworkState, BASE_URL, MockUrl } from './httpurl'; +import { createHashHistory } from 'history'; const CODE_SUCCESS = '200'; +const history = createHashHistory(); -let token = window.localStorage.getItem('token') || undefined; -let loginUser = window.localStorage.getItem('loginUser') || undefined; -let posId = loginUser ? JSON.parse(loginUser).posId : undefined; - -let recognitionParams = ['posId'].reduce((p, n) => { +let recognitionParams = [].reduce((p, n) => { if (eval(n)) { p[n] = eval(n); return p; @@ -36,8 +34,9 @@ method = 'get', showToast = true, autoLogin = true, - headers = {} + headers = {}, } = options; + let token = window.localStorage.getItem('token') || undefined; headers['Content-type'] = 'application/json'; headers['Accept'] = 'application/json'; @@ -53,9 +52,9 @@ method, data, params, - headers + headers, }) - .then(res => { + .then((res) => { // Taro.hideLoading(); const { code, data, msg } = res.data; if (code == '0') { @@ -67,24 +66,14 @@ code == '10003' ) { // token失效重新返回登录页面 - this.props.history.push({ pathname: '/login' }); + history.push('/login'); } else { message.warning(msg); return false; } }) - .catch(err => { + .catch((err) => { console.log(err); - let defaultMsg = ''; - - if (err.code !== CODE_SUCCESS) { - defaultMsg = '请求异常,请检查网络连接状况'; - } - // Taro.showToast({ - // title: defaultMsg, - // icon: "none" - // }); - // return Promise.reject({ message: defaultMsg, ...err }); - return Promise.reject({ msg: 'error' }); + // history.push('/login'); }); } -- Gitblit v1.8.0