From b419b2add64d70bf1bdb2f491c3eb090dda2cfa3 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Wed, 27 May 2020 11:44:34 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/huge/frontEnd/hugeOA
---
src/api/request.js | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/src/api/request.js b/src/api/request.js
index 2228239..5d6752d 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -32,7 +32,7 @@
method = 'get',
showToast = true,
autoLogin = true,
- headers = {}
+ headers = {},
} = options;
let token = window.localStorage.getItem('token') || undefined;
@@ -50,9 +50,9 @@
method,
data,
params,
- headers
+ headers,
})
- .then(res => {
+ .then((res) => {
// Taro.hideLoading();
const { code, data, msg } = res.data;
if (code == '0') {
@@ -64,24 +64,15 @@
code == '10003'
) {
// token失效重新返回登录页面
- this.props.history.push({ pathname: '/login' });
+ // this.props.history.push({ pathname: '/login' });
+ window.location.href = window.location.origin + '#/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' });
+ window.location.href = window.location.origin + '#/login';
});
}
--
Gitblit v1.8.0