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/mobilemap/index.vue | 5 +----
src/components/mobilePopupOur/index.vue | 2 +-
src/components/mobilePopupOurOnce/index.vue | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/components/mobilePopupOur/index.vue b/src/components/mobilePopupOur/index.vue
index 3d1c1ed..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>
diff --git a/src/components/mobilePopupOurOnce/index.vue b/src/components/mobilePopupOurOnce/index.vue
index 252d733..f12dcc0 100644
--- a/src/components/mobilePopupOurOnce/index.vue
+++ b/src/components/mobilePopupOurOnce/index.vue
@@ -126,7 +126,7 @@
useJWD: true, // 仅使用经纬度
from: "PopupOurOnce",
};
- window.popupsDom = that.$store.dispatch("setMobileWindows", d);
+ that.$store.dispatch("setMobileWindows", d);
}, 500);
// 固定窗口
// that.$store.dispatch("SET_OPENWIDOWFIXED", d);
diff --git a/src/components/mobilemap/index.vue b/src/components/mobilemap/index.vue
index 5a8772e..928e127 100644
--- a/src/components/mobilemap/index.vue
+++ b/src/components/mobilemap/index.vue
@@ -1075,10 +1075,7 @@
// from: 'PopupOurOnce'
};
- window.popupsDom = that.$store.dispatch(
- "setMobileWindows",
- dataInitialization
- );
+ that.$store.dispatch("setMobileWindows", dataInitialization);
}
}
}, 0);
--
Gitblit v1.9.3