瀏覽代碼

Merge branch '09/26smallFuction' into 03/03GRADE

mo 2 年之前
父節點
當前提交
5ecf2b803e
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      src/utils/request-loading.js
  2. 1 1
      src/views/repairManager/repairList.vue

+ 1 - 1
src/utils/request-loading.js

@@ -11,7 +11,6 @@ export async function showFullScreenLoading(store) {
     load.startLoading()
     load.startLoading()
   } else {
   } else {
     await store.dispatch('app/setLoadCount', 1)
     await store.dispatch('app/setLoadCount', 1)
-
     clearTimeout(timer)
     clearTimeout(timer)
     timer = null
     timer = null
   }
   }
@@ -22,6 +21,7 @@ export async function showFullScreenLoading(store) {
 export async function tryHideFullScreenLoading(store) {
 export async function tryHideFullScreenLoading(store) {
   await store.dispatch('app/setLoadCount', -1)
   await store.dispatch('app/setLoadCount', -1)
   if (store.getters.loadCount <= 0 && store.getters.isLoading) {
   if (store.getters.loadCount <= 0 && store.getters.isLoading) {
+    if(timer)return
     timer = setTimeout(async () => {
     timer = setTimeout(async () => {
       await store.dispatch('app/resetLoadCount')
       await store.dispatch('app/resetLoadCount')
       await store.dispatch('app/setLoadStatus', false)
       await store.dispatch('app/setLoadStatus', false)

+ 1 - 1
src/views/repairManager/repairList.vue

@@ -527,7 +527,7 @@ export default {
       // soundList
       // soundList
       this.soundLists = [];
       this.soundLists = [];
       for (let i in this.soundList) {
       for (let i in this.soundList) {
-        if (this.soundList[i].subjects.length > 0) {
+        if (this.soundList[i]?.subjects?.length > 0) {
           this.soundLists = this.soundLists.concat(this.soundList[i].subjects);
           this.soundLists = this.soundLists.concat(this.soundList[i].subjects);
         }
         }
       }
       }