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/mobilemap/index.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/components/mobilemap/index.vue b/src/components/mobilemap/index.vue
index 18780ee..f3a8643 100644
--- a/src/components/mobilemap/index.vue
+++ b/src/components/mobilemap/index.vue
@@ -14,13 +14,16 @@
<mobileCortrolSearch ref="mobileCortrolSearch"></mobileCortrolSearch>
<!-- 控制↑ -->
<!-- 控制大弹窗的弹窗 -->
- <mobilePopupOurAfter v-if="mBigPopupAfter"></mobilePopupOurAfter>
+ <!-- v-if="mBigPopupAfter" -->
+ <mobilePopupOurAfter></mobilePopupOurAfter>
<!-- 大弹窗 -->
<mobilePopupOur :style="[bigPopup]" v-if="mBigPopup"></mobilePopupOur>
<!-- 测试-跳转位置 -->
- <!-- <mobileGoTo></mobileGoTo> -->
+ <mobileGoTo></mobileGoTo>
<!-- 实景窗口 -->
<mobilePanorama></mobilePanorama>
+ <!-- 退出导航 -->
+ <mobileCloseRouter></mobileCloseRouter>
<!-- 盖住左下角 -->
<div class="cover_mobileMap">智慧社区</div>
</div>
@@ -267,8 +270,8 @@
// if (height > 2000) {
// conBack(2000);
// }
- if (height < 200 && isSet) {
- conBack(200);
+ if (height < 0 && isSet) {
+ conBack(0);
}
if (height > 4000 && isSet) {
conBack(4000);
@@ -325,7 +328,7 @@
luminanceAtZenith: 0.5,
});
- tilesetLayer.addOverlay(tileset);
+ // tilesetLayer.addOverlay(tileset);
// tilesetLayer.show = false;
let silhouetteBlue =
--
Gitblit v1.9.3