From 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 01 Sep 2025 11:20:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/axios.js | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/src/axios.js b/src/axios.js
index 3dc3094..4acc439 100644
--- a/src/axios.js
+++ b/src/axios.js
@@ -14,8 +14,6 @@
import { isURL, validatenull } from '@/utils/validate';
import { ElMessage } from 'element-plus';
import website from '@/config/website';
-import NProgress from 'nprogress'; // progress bar
-import 'nprogress/nprogress.css'; // progress bar style
import { Base64 } from 'js-base64';
import { baseUrl } from '@/config/env';
import crypto from '@/utils/crypto';
@@ -32,15 +30,10 @@
};
//跨域请求，允许保存cookie
axios.defaults.withCredentials = true;
-// NProgress Configuration
-NProgress.configure({
- showSpinner: false,
-});
+
//http request拦截
axios.interceptors.request.use(
config => {
- // start progress bar
- NProgress.start();
// 初始化错误提示状态
isErrorShown = false;
//地址为已经配置状态则不添加前缀
@@ -48,7 +41,7 @@
config.url = baseUrl + config.url;
}
//安全请求header
- config.headers['areaCode'] = store?.state?.user?.userInfo?.detail?.areaCode;
+ config.headers['areaCode'] = config?.params?.areaCode || store?.state?.user?.userInfo?.detail?.areaCode;
config.headers['Blade-Requested-With'] = 'BladeHttpRequest';
//headers判断是否需要
const authorization = config.authorization === false;
@@ -98,7 +91,6 @@
//http response拦截
axios.interceptors.response.use(
res => {
- NProgress.done();
const status = res.data.error_code || res.data.code || res.status;
const statusWhiteList = website.statusWhiteList || [];
const message = res.data.msg || res.data.error_description || res.data.message || '系统错误';
@@ -227,7 +219,6 @@
return res;
},
error => {
- NProgress.done();
return Promise.reject(new Error(error));
}
);
--
Gitblit v1.9.3