From 08e7d5447a869c42f3844a2ceb41994334dc290e Mon Sep 17 00:00:00 2001
From: handongxun <handongxun@dcloud.io>
Date: Thu, 9 May 2019 15:39:15 +0800
Subject: [PATCH] =?UTF-8?q?update:=20H5=20map=E7=BB=84=E4=BB=B6=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E7=94=A8=E6=88=B7=E5=9C=A8manifest=E9=85=8D=E7=BD=AEk?=
 =?UTF-8?q?ey=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=94=99=E8=AF=AF=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system-routes/choose-location/index.vue   | 28 +++++++++----------
 .../system-routes/open-location/index.vue     | 20 ++++++-------
 src/platforms/h5/service/api/location.js      |  8 +++---
 .../h5/view/components/map/index.vue          |  2 +-
 4 files changed, 29 insertions(+), 29 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 2420500cde..d6041a01cc 100644
--- a/src/platforms/h5/components/system-routes/choose-location/index.vue
+++ b/src/platforms/h5/components/system-routes/choose-location/index.vue
@@ -1,26 +1,26 @@
 <template>
   <div class="uni-system-choose-location">
-    <system-header
-      :confirm="!!data"
-      @back="_back"
+    <system-header
+      :confirm="!!data"
+      @back="_back"
       @confirm="_choose">选择位置</system-header>
     <div class="map-content">
-      <iframe
-        :src="src"
-        allow="geolocation"
-        seamless
-        sandbox="allow-scripts allow-same-origin allow-forms"
+      <iframe
+        :src="src"
+        allow="geolocation"
+        seamless
+        sandbox="allow-scripts allow-same-origin allow-forms"
         frameborder="0" />
     </div>
   </div>
 </template>
 <script>
-import SystemHeader from '../system-header'
+import SystemHeader from '../system-header'
 
 export default {
-  name: 'SystemChooseLocation',
-  components: {
-    SystemHeader
+  name: 'SystemChooseLocation',
+  components: {
+    SystemHeader
   },
   data () {
     return {
@@ -29,7 +29,7 @@ export default {
     }
   },
   mounted () {
-    var key = 'WXTBZ-6WERU-ECCVS-BZJCK-LW5OJ-SIBOS'
+    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) => {
       var loc = event.data
@@ -81,4 +81,4 @@ export default {
 		width: 100%;
 		height: 100%;
 	}
-</style>
+</style>
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 16e9541a69..2863af4929 100644
--- a/src/platforms/h5/components/system-routes/open-location/index.vue
+++ b/src/platforms/h5/components/system-routes/open-location/index.vue
@@ -2,17 +2,17 @@
   <div class="uni-system-open-location">
     <system-header @back="_back">位置</system-header>
     <div class="map-content">
-      <iframe
-        ref="map"
-        :src="src"
-        allow="geolocation"
-        sandbox="allow-scripts allow-same-origin allow-forms"
+      <iframe
+        ref="map"
+        :src="src"
+        allow="geolocation"
+        sandbox="allow-scripts allow-same-origin allow-forms"
         frameborder="0"
         @load="_load" />
       <!-- 去这里 -->
-      <div
-        v-if="isPoimarkerSrc"
-        class="actTonav"
+      <div
+        v-if="isPoimarkerSrc"
+        class="actTonav"
         @click="_nav" />
     </div>
   </div>
@@ -20,7 +20,7 @@
 <script>
 import SystemHeader from '../system-header'
 
-const key = 'WXTBZ-6WERU-ECCVS-BZJCK-LW5OJ-SIBOS'
+const key = __uniConfig.qqMapKey
 const referer = 'uniapp'
 const poimarkerSrc = 'https://apis.map.qq.com/tools/poimarker'
 
@@ -110,4 +110,4 @@ export default {
 		height: 60px;
 		border-radius: 60px;
 	}
-</style>
+</style>
diff --git a/src/platforms/h5/service/api/location.js b/src/platforms/h5/service/api/location.js
index 4388c70b74..3477a23f6f 100644
--- a/src/platforms/h5/service/api/location.js
+++ b/src/platforms/h5/service/api/location.js
@@ -9,7 +9,7 @@ function wgs84ToGcj02 (coords, success, error) {
   /**
    * uniapp 内置key
    */
-  var key = 'WXTBZ-6WERU-ECCVS-BZJCK-LW5OJ-SIBOS'
+  var key = __uniConfig.qqMapKey
   var url = `https://apis.map.qq.com/ws/coord/v1/translate?locations=${coords.latitude},${coords.longitude}&type=1&key=${key}&output=jsonp`
   getJSONP(url, {}, (res) => {
     if ('locations' in res && res.locations.length) {
@@ -18,7 +18,7 @@ function wgs84ToGcj02 (coords, success, error) {
         latitude: res.locations[0].lat
       })
     } else {
-      error()
+      error(res)
     }
   }, error)
 }
@@ -48,9 +48,9 @@ export function getLocation ({
       if (type === 'WGS84') {
         callback(coords)
       } else {
-        wgs84ToGcj02(coords, callback, () => {
+        wgs84ToGcj02(coords, callback, (err) => {
           invoke(callbackId, {
-            errMsg: 'getLocation:fail'
+            errMsg: 'getLocation:fail ' + JSON.stringify(err)
           })
         })
       }
diff --git a/src/platforms/h5/view/components/map/index.vue b/src/platforms/h5/view/components/map/index.vue
index f653b778d3..f1d9c4345c 100644
--- a/src/platforms/h5/view/components/map/index.vue
+++ b/src/platforms/h5/view/components/map/index.vue
@@ -791,7 +791,7 @@ export default {
         maps = window.qq.maps
         callback()
       } else {
-        let key = 'XVXBZ-NDMC4-JOGUS-XGIEE-QVHDZ-AMFV2'
+        let key = __uniConfig.qqMapKey
         let callbackName = '_callback' + Date.now()
         window[callbackName] = function () {
           delete window[callbackName]
-- 
GitLab