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

shuishen

2021-12-24 a3761173a91a1fd7270b848f9f8d255c0bfa9b6c

 src/components/mobilePopupOur/index.vue

@@ -174,9 +174,10 @@
        this.choiceMain == "出入口" ||
        this.choiceMain == "停车场"
      ) {
        // 不传头部下拉菜单，因为请求链接不同
        // 改变传入属性
        d = {
          campus: campus,
          lifetype: type,
        };
      } else {
        d = {
@@ -200,6 +201,7 @@
              icon: icon,
              icons: icon + item.mechanismname, //图片响应改变
              from: this.choiceMain,
              video: item.videourl,
              buts:
                this.mBigPopup.name == "校园建筑" ||
                this.mBigPopup.name == "文化风景"
@@ -227,6 +229,7 @@
              telePhone: item.telephone,
              address: item.address,
              introduce: item.introduce,
              video: item.videourl,
              buts:
                that.mBigPopup.name == "校园建筑" ||
                that.mBigPopup.name == "文化风景"