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

shuishen

2022-01-14 eecadc9f4fc4f067dba0221125bacb180ce3b0e2

 src/components/mobilePopupOur/index.vue

@@ -143,7 +143,7 @@
      this.$store.commit("MSET_BIGPOPUP", false);
    },
    getDataHeardDown() {
      if (this.choiceMain == "机构单位") {
      if (this.choiceMain == "机构单位" || this.choiceMain == "活动") {
        //不请求头部标签页数据
        this.getOutList(this.choiceKey);
        return;
@@ -212,6 +212,44 @@
                  : ["定位"],
            });
          });
        } else if (this.mBigPopup.name == "活动") {
          // 社区建筑使用该id获取具体信息
          data.records.forEach((item) => {
            let icon = item.tpurl.split(",");
            let useData = {
              name: item.hdname,
              // lntLat: [item.jd, item.wd],
              // alt: item.gd,
              // heading: item.heading,
              // pitch: item.pitch,
              // roll: item.roll,
              bgImg: item.tpurl,
              icon: icon,
              icons: icon + item.hdname, //图片响应改变
              from: this.choiceMain,
              // QRImg: item.codeurl,
              websiteUrl: item.websiteurl,
              telePhone: item.telephone,
              // address: item.address,
              introduce: item.context,
              video: item.videourl,
              buts:
                that.mBigPopup.name == "社区建筑" ||
                that.mBigPopup.name == "文化风景"
                  ? ["定位", "实景", "图集"]
                  : ["定位"],
              //活动添加的字段
              addressname: item.addressname.split(";"),
              address: item.address.split(";"),
              lxname: item.lxname.split(";"),
              lx: item.lx.split(";"),
              lntLat: [
                item.address.split(";")[0].split(",")[0],
                item.address.split(";")[0].split(",")[1],
              ],
            };
            outList.push(useData);
          });
        } else {
          //正常获取全部数据
          data.records.forEach((item) => {
@@ -243,7 +281,7 @@
          });
        }
        that.fullscreenLoading = false;
        if (this.choiceMain == "机构单位") {
        if (this.choiceMain == "机构单位" || this.choiceMain == "活动") {
          that.onlyData = outList;
          return;
        }