From 17ade1be2cdeab4d0f2c52af08a4bb10caddff9d Mon Sep 17 00:00:00 2001
From: tantao <1416249906@qq.com>
Date: Thu, 25 Aug 2022 14:44:26 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=AE=8C=E5=96=84=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82loading=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/uitls/request.ts | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/uitls/request.ts b/src/uitls/request.ts
index e17caad..643ce28 100644
--- a/src/uitls/request.ts
+++ b/src/uitls/request.ts
@@ -1,8 +1,8 @@
 /** 
  *  @author TalkTao
  * @description  接口封装
-*/ 
-import store from "@/store/index";
+*/
+import { vuexStore } from "@/store/index";
 import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse, Method } from "axios";
 export interface AxiosResponseProps {
     code?: number;
@@ -32,12 +32,35 @@ class HttpRequest {
     interceptors(instance: AxiosInstance) {
         let requestList = [];
         const setLoadingToFalse = response => {
+
             requestList
                 .filter(item => item.url == response.config.url && item.method == response.config.method)
                 .forEach(item => (item.isLoading = false));
+
             //所有请求都加载完才让加载提示消失
-            if (requestList.every(item => !item.isLoading)) store.commit("changeIsLoading", false);
+            if (requestList.every(item => !item.isLoading)) vuexStore.commit("changeIsLoading", false);
+
         };
+
+        instance.interceptors.request.use(
+            (config: any) => {
+
+                let ignoreLoadingUrls = ["/login"];
+
+                if (!ignoreLoadingUrls.includes(config.url)) {
+
+                    if (requestList.length < 10) {
+                        requestList.unshift({ ...config, isLoading: true });
+                    } else {
+                        requestList = [...requestList.slice(0, 9), { ...config, isLoading: true }];
+                    }
+                    vuexStore.commit("changeIsLoading", true);
+                }
+                return config;
+            },
+            error => Promise.reject(error + '请求错误')
+        );
+
         instance.interceptors.response.use(
             response => {
                 setLoadingToFalse(response);
@@ -45,7 +68,7 @@ class HttpRequest {
             },
             error => {
                 if (error.response.status == 301) {
-                    store.commit("changeLoginModalVisible", true);
+                    vuexStore.commit("changeLoginModalVisible", true);
                 }
                 setLoadingToFalse(error);
                 return Promise.reject(error.response?.data);