From 73ab231176977d8f04763e4e60efbfe92492c94e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 24 Jul 2025 09:09:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/axios.js | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/src/axios.js b/src/axios.js
index 3dc3094..d0039aa 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;
//地址为已经配置状态则不添加前缀
@@ -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