Merge branch '0601Action' into 03/03GRADE

src/api/systemManage.js

@@ -50,7 +50,8 @@ export function queryByOrganId (data) {
   return request({
     url: api + '/cooperationOrgan/queryByOrganId',
     method: 'get',
-    params: data
+    params: data,
+    hideLoading:true
   })
 }
 

src/utils/request-loading.js

@@ -10,16 +10,26 @@ export async function showFullScreenLoading(store) {
     await store.dispatch('app/setLoadStatus', true)
     load.startLoading()
   } else {
-    await store.dispatch('app/setLoadCount', 1)
-    clearTimeout(timer)
-    timer = null
+    if(store.getters.loadCount < 0){
+      await store.dispatch('app/resetLoadCount')
+      await store.dispatch('app/setLoadCount', 1)
+      clearTimeout(timer)
+      timer = null
+    }else{
+      await store.dispatch('app/setLoadCount', 1)
+      clearTimeout(timer)
+      timer = null
+    }
+
   }
 
 
 }
 
 export async function tryHideFullScreenLoading(store) {
+  console.log(store.getters.loadCount)
   await store.dispatch('app/setLoadCount', -1)
+
   if (store.getters.loadCount <= 0 && store.getters.isLoading) {
     if(timer)return
     timer = setTimeout(async () => {

src/utils/request.js

@@ -74,7 +74,11 @@ const service = axios.create({
 service.interceptors.request.use(
   async config => {
     // do something before request is sent
-    await showFullScreenLoading(store);
+    let hideLoading = config.hideLoading || false;
+    if (!hideLoading) {
+      await showFullScreenLoading(store);
+    }
+
     if (store.getters.token) {
       // let each request carry token
       // ['X-Token'] is a custom headers key