From d8d8758cfa2be580e02949a8266cb3c68da97efa Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 03 Jun 2021 13:55:22 +0800
Subject: [PATCH] 修复关闭confirm提示框控制台报错问题
---
ruoyi-ui/src/utils/request.js | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js
index c7e2c36..14879eb 100644
--- a/ruoyi-ui/src/utils/request.js
+++ b/ruoyi-ui/src/utils/request.js
@@ -21,6 +21,28 @@
if (getToken() && !isToken) {
config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
}
+ // get请求映射params参数
+ if (config.method === 'get' && config.params) {
+ let url = config.url + '?';
+ for (const propName of Object.keys(config.params)) {
+ const value = config.params[propName];
+ var part = encodeURIComponent(propName) + "=";
+ if (value !== null && typeof(value) !== "undefined") {
+ if (typeof value === 'object') {
+ for (const key of Object.keys(value)) {
+ let params = propName + '[' + key + ']';
+ var subPart = encodeURIComponent(params) + "=";
+ url += subPart + encodeURIComponent(value[key]) + "&";
+ }
+ } else {
+ url += part + encodeURIComponent(value) + "&";
+ }
+ }
+ }
+ url = url.slice(0, -1);
+ config.params = {};
+ config.url = url;
+ }
return config
}, error => {
console.log(error)
@@ -34,19 +56,16 @@
// 获取错误信息
const msg = errorCode[code] || res.data.msg || errorCode['default']
if (code === 401) {
- MessageBox.confirm(
- '登录状态已过期，您可以继续留在该页面，或者重新登录',
- '系统提示',
- {
+ MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
confirmButtonText: '重新登录',
cancelButtonText: '取消',
type: 'warning'
}
).then(() => {
store.dispatch('LogOut').then(() => {
- location.reload() // 为了重新实例化vue-router对象 避免bug
+ location.href = '/index';
})
- })
+ }).catch(() => {});
} else if (code === 500) {
Message({
message: msg,
@@ -89,6 +108,9 @@
transformRequest: [(params) => {
return tansParams(params)
}],
+ headers: {
+ 'Content-Type': 'application/x-www-form-urlencoded'
+ },
responseType: 'blob'
}).then((data) => {
const content = data
@@ -109,7 +131,5 @@
console.error(r)
})
}
-
-
export default service
--
Gitblit v1.9.3