From bf58722dfd03ea1513f3acc7331d4d4403fca76e Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 18 Mar 2022 11:48:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web

---
 src/components/mobilePopupOur/index.vue |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/mobilePopupOur/index.vue b/src/components/mobilePopupOur/index.vue
index f7db975..b0e91c2 100644
--- a/src/components/mobilePopupOur/index.vue
+++ b/src/components/mobilePopupOur/index.vue
@@ -37,7 +37,7 @@
         ></el-empty>
         <mobilePopupOurOnce
           v-for="(citem, cindex) in onlyData"
-          :key="citem.icons + ''"
+          :key="citem.name + cindex"
           :ends="onlyData.length - 1 == cindex"
           :onceData="citem"
         ></mobilePopupOurOnce>
@@ -123,6 +123,13 @@
     this.$store.commit("MSET_BIGPOPUPAFTER", false); //关闭前一个弹窗
     // console.log("请求对应街道接口", this.popupOurOpenData);
     this.getDataHeardDown();
+  },
+  watch: {
+    fullscreenLoading() {
+      if (this.fullscreenLoading) {
+        this.notLine();
+      }
+    },
   },
   methods: {
     handleClick(tab, event) {
@@ -294,7 +301,6 @@
         }
         that.tabTable[+campus - 1].child = outList;
       });
-      this.notLine();
     },
     //搜索请求
     getListSearchMethod(name) {
@@ -340,11 +346,12 @@
         that.fullscreenLoading = false;
         that.onlyData = outList;
       });
-      this.notLine();
     },
     notLine() {
+      console.log("等待关闭");
       setTimeout(() => {
         this.fullscreenLoading = false;
+        console.log("关闭dolog");
       }, 5000);
     },
   },

--
Gitblit v1.9.3