提交 08e7d544 编写于 作者: d-u-a's avatar d-u-a

update: H5 map组件支持用户在manifest配置key,增加错误提示信息

上级 8610f162
<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>
......@@ -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>
......@@ -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)
})
})
}
......
......@@ -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]
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册