From c9a04704b894f6669804056f6d851edc39191637 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Wed, 4 Nov 2020 13:34:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(h5):=20=E4=BF=AE=E5=A4=8D=20uni.chooseLocat?=
 =?UTF-8?q?ion=E3=80=81uni.openLocation=20=E9=A1=B5=E9=9D=A2=E5=9C=A8?=
 =?UTF-8?q?=E5=90=AF=E7=94=A8=20leftWindow=20=E5=90=8E=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=94=99=E4=BD=8D=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system-routes/choose-location/index.vue   |  2 +-
 .../system-routes/open-location/index.vue     | 33 ++++++++++++-------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/platforms/h5/components/system-routes/choose-location/index.vue b/src/platforms/h5/components/system-routes/choose-location/index.vue
index de0db1acb..0b2be451e 100644
--- a/src/platforms/h5/components/system-routes/choose-location/index.vue
+++ b/src/platforms/h5/components/system-routes/choose-location/index.vue
@@ -220,7 +220,7 @@ export default {
 
 .uni-system-choose-location {
   display: block;
-  position: fixed;
+  position: absolute;
   left: 0;
   top: 0;
   width: 100%;
diff --git a/src/platforms/h5/components/system-routes/open-location/index.vue b/src/platforms/h5/components/system-routes/open-location/index.vue
index 4e6d1b0e8..66d49bf57 100644
--- a/src/platforms/h5/components/system-routes/open-location/index.vue
+++ b/src/platforms/h5/components/system-routes/open-location/index.vue
@@ -1,24 +1,27 @@
 <template>
   <div class="uni-system-open-location">
-    <div class="map-content">
+    <div
+      class="map-content"
+      :class="{ 'fix-position': isPoimarkerSrc }"
+    >
       <iframe
         ref="map"
         :src="src"
         allow="geolocation"
         sandbox="allow-scripts allow-same-origin allow-forms allow-top-navigation allow-modals allow-popups"
         frameborder="0"
-        @load="_load"
+        @load="_check"
       />
       <!-- 去这里 -->
-      <div
-        v-if="isPoimarkerSrc"
-        class="actTonav"
-        @click="_nav"
+      <div
+        v-if="isPoimarkerSrc"
+        class="actTonav"
+        @click="_nav"
       />
     </div>
-    <div
-      class="nav-btn-back"
-      @click="_back"
+    <div
+      class="nav-btn-back"
+      @click="_back"
     >
       <i class="uni-btn-icon">&#xe601;</i>
     </div>
@@ -46,7 +49,7 @@ export default {
       name,
       address,
       src: latitude && longitude ? `${poimarkerSrc}?type=0&marker=coord:${latitude},${longitude};title:${name};addr:${address};&key=${key}&referer=${referer}` : '',
-      isPoimarkerSrc: false
+      isPoimarkerSrc: true
     }
   },
   methods: {
@@ -56,8 +59,9 @@ export default {
       } else {
         getApp().$router.back()
       }
+      this._check()
     },
-    _load () {
+    _check () {
       if (this.$refs.map.src.indexOf(poimarkerSrc) === 0) {
         this.isPoimarkerSrc = true
       } else {
@@ -75,7 +79,7 @@ export default {
 <style>
 .uni-system-open-location {
   display: block;
-  position: fixed;
+  position: absolute;
   left: 0;
   top: 0;
   width: 100%;
@@ -116,6 +120,11 @@ export default {
   overflow: hidden;
 }
 
+.map-content.fix-position {
+  top: -74px;
+  bottom: -44px;
+}
+
 .map-content > iframe {
   width: 100%;
   height: 100%;
-- 
GitLab