From 07eb495fb6e4f0b56de957d4b36d6ab736399f96 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Tue, 16 Jun 2020 20:56:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3iOS=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=86=85=E7=BD=AE=E6=B5=8F=E8=A7=88=E5=99=A8=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=E5=90=8E?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=90=8E=E9=80=80=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20=20fixed=20#1789?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system-routes/choose-location/index.vue   | 24 +++++++++++--------
 .../system-routes/open-location/index.vue     | 18 +++++---------
 2 files changed, 20 insertions(+), 22 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 60e3702ed..3926676b6 100644
--- a/src/platforms/h5/components/system-routes/choose-location/index.vue
+++ b/src/platforms/h5/components/system-routes/choose-location/index.vue
@@ -3,9 +3,9 @@
     <system-header
       :confirm="!!data"
       @back="_back"
-      @confirm="_choose"
-    >
-      选择位置
+      @confirm="_choose"
+    >
+      选择位置
     </system-header>
     <div class="map-content">
       <iframe
@@ -13,7 +13,7 @@
         allow="geolocation"
         seamless
         sandbox="allow-scripts allow-same-origin allow-forms"
-        frameborder="0"
+        frameborder="0"
       />
     </div>
   </div>
@@ -27,15 +27,14 @@ export default {
     SystemHeader
   },
   data () {
+    const key = __uniConfig.qqMapKey
     return {
-      src: '',
+      src: `https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=${key}&referer=uniapp`,
       data: null
     }
   },
   mounted () {
-    var key = __uniConfig.qqMapKey
-    this.src = `https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=${key}&referer=uniapp`
-    window.addEventListener('message', (event) => {
+    function handler (event) {
       var loc = event.data
       if (loc && loc.module === 'locationPicker') {
         this.data = {
@@ -45,12 +44,17 @@ export default {
           longitude: loc.latlng.lng
         }
       }
-    }, false)
+    }
+    this.__messageHandle = handler.bind(this)
+    window.addEventListener('message', this.__messageHandle, false)
+  },
+  beforeDestroy () {
+    window.removeEventListener('message', this.__messageHandle, false)
   },
   methods: {
     _choose () {
       if (this.data) {
-        UniViewJSBridge.publishHandler('onChooseLocation', this.data)
+        UniViewJSBridge.publishHandler('onChooseLocation', Object.assign({}, this.data))
         getApp().$router.back()
       }
     },
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 607fd64bb..cbaac425d 100644
--- a/src/platforms/h5/components/system-routes/open-location/index.vue
+++ b/src/platforms/h5/components/system-routes/open-location/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="uni-system-open-location">
-    <system-header @back="_back">
-      位置
+    <system-header @back="_back">
+      位置
     </system-header>
     <div class="map-content">
       <iframe
@@ -10,13 +10,13 @@
         allow="geolocation"
         sandbox="allow-scripts allow-same-origin allow-forms allow-top-navigation allow-modals allow-popups"
         frameborder="0"
-        @load="_load"
+        @load="_load"
       />
       <!-- 去这里 -->
       <div
         v-if="isPoimarkerSrc"
         class="actTonav"
-        @click="_nav"
+        @click="_nav"
       />
     </div>
   </div>
@@ -47,16 +47,10 @@ export default {
       scale,
       name,
       address,
-      src: '',
+      src: latitude && longitude ? `${poimarkerSrc}?type=0&marker=coord:${latitude},${longitude};title:${name};addr:${address};&key=${key}&referer=${referer}` : '',
       isPoimarkerSrc: false
     }
   },
-  mounted () {
-    if (this.latitude && this.longitude) {
-      this.src =
-					`${poimarkerSrc}?type=0&marker=coord:${this.latitude},${this.longitude};title:${this.name};addr:${this.address};&key=${key}&referer=${referer}`
-    }
-  },
   methods: {
     _back () {
       if (this.$refs.map.src.indexOf(poimarkerSrc) !== 0) {
@@ -73,7 +67,7 @@ export default {
       }
     },
     _nav () {
-      var url =
+      var url =
           `https://map.qq.com/nav/drive#routes/page?transport=2&epointy=${this.latitude}&epointx=${this.longitude}&eword=${encodeURIComponent(this.name || '目的地')}&referer=${referer}`
       this.$refs.map.src = url
     }
-- 
GitLab