Merge branch 'master' of http://192.168.0.105:10010/r/school-web

shuishen

2022-01-14 eecadc9f4fc4f067dba0221125bacb180ce3b0e2

 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>
</style>