From eecadc9f4fc4f067dba0221125bacb180ce3b0e2 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 14 Jan 2022 17:29:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web

---
 src/components/mobilePopupOurOnce/index.vue |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/mobilePopupOurOnce/index.vue b/src/components/mobilePopupOurOnce/index.vue
index c1e197f..00a3331 100644
--- a/src/components/mobilePopupOurOnce/index.vue
+++ b/src/components/mobilePopupOurOnce/index.vue
@@ -94,8 +94,12 @@
         return;
       }
       let that = this;
-      // console.log(that.ourData.lntLat);
       if (val == "定位") {
+        //活动定位
+        if (this.ourData.name == "活动") {
+          console.log(this.ourData);
+          return;
+        }
         //随地图移动窗口
         this.$store.commit("MSET_BIGPOPUP", false); //关闭全屏弹窗
         setTimeout(() => {
@@ -202,4 +206,4 @@
     }
   }
 }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.3