From acb45c731c3ccd0a67061efb4e7bdf4f56005672 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 12 Jan 2022 08:52:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/mobilePopupOurOnce/index.vue | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/components/mobilePopupOurOnce/index.vue b/src/components/mobilePopupOurOnce/index.vue
index bb20d60..c1e197f 100644
--- a/src/components/mobilePopupOurOnce/index.vue
+++ b/src/components/mobilePopupOurOnce/index.vue
@@ -60,7 +60,7 @@
this.srcList = this.onceData.icon;
this.icon = this.srcList[0];
}
- if (this.onceData.from == "校园建筑") {
+ if (this.onceData.from == "社区建筑" || this.onceData.from == "文化风景") {
this.getOnceCampus(this.onceData.id);
} else {
this.ourData = this.onceData;
@@ -94,6 +94,7 @@
return;
}
let that = this;
+ // console.log(that.ourData.lntLat);
if (val == "定位") {
//随地图移动窗口
this.$store.commit("MSET_BIGPOPUP", false); //关闭全屏弹窗
@@ -104,6 +105,7 @@
lntLat: that.ourData.lntLat,
query: { ...this.ourData, seebut: this.seebut },
useJWD: true, //仅使用经纬度
+ from: "PopupOurOnce",
};
that.popupsDom = that.$store.dispatch("setMobileWindows", d);
}, 500);
@@ -119,7 +121,7 @@
imgsDom.click();
}
},
- //"校园建筑"↓
+ //"社区建筑"↓
getOnceCampus(id) {
getChildNavDetail({ id: id }).then((res) => {
var result = res.data.data[0].list;
@@ -135,11 +137,13 @@
websiteUrl: result.websiteurl,
telePhone: result.telephone,
address: result.address,
+ introduce: result.introduce,
+ video: result.videourl,
};
this.ourData = d;
});
},
- //"校园建筑"↑
+ //"社区建筑"↑
},
};
</script>
@@ -152,8 +156,9 @@
justify-content: center !important;
}
.mobilePopupOurOnce {
- padding: 0 0;
+ padding: 8px 0 0 0;
margin: 0 8px;
+ // background-image: linear-gradient(#29baf1, #28bbf0);
.mobilePopupOurOnce_center {
// margin-bottom: 8px;
height: 80px;
@@ -165,7 +170,7 @@
height: 100%;
@extend .flexCenter;
img {
- width: 100px;
+ width: 80px;
height: 80px;
}
}
@@ -181,6 +186,7 @@
text-indent: 1em;
display: flex !important;
align-items: center !important;
+ // color: #fff;
}
.mobilePopupOurOnce_r_down {
height: 50%;
@@ -189,6 +195,7 @@
display: flex !important;
align-items: center !important;
.mobilePopupOurOnce_r_d_in {
+ // color: #fff;
font-size: 17px;
}
}
--
Gitblit v1.9.3