提交 05af3fae 编写于 作者: DCloud-WZF's avatar DCloud-WZF 💬

refactor(map): 修改h5高德地图 key 与 app 一致

上级 0fc59ce1
......@@ -431,12 +431,11 @@ module.exports = function (pagesJson, manifestJson, loader) {
const qqMapKey = sdkConfigs.maps && sdkConfigs.maps.qqmap && sdkConfigs.maps.qqmap.key
const googleMapKey = sdkConfigs.maps && sdkConfigs.maps.google && sdkConfigs.maps.google.key
const AMapKey = sdkConfigs.maps && sdkConfigs.maps.AMap && sdkConfigs.maps.AMap.key
const AMapSecurityJsCode =
sdkConfigs.maps && sdkConfigs.maps.AMap && sdkConfigs.maps.AMap.securityJsCode
const AMapServiceHost =
sdkConfigs.maps && sdkConfigs.maps.AMap && sdkConfigs.maps.AMap.serviceHost
const aMapKey = sdkConfigs.maps && sdkConfigs.maps.amap && sdkConfigs.maps.amap.key
const aMapSecurityJsCode =
sdkConfigs.maps && sdkConfigs.maps.amap && sdkConfigs.maps.amap.securityJsCode
const aMapServiceHost =
sdkConfigs.maps && sdkConfigs.maps.amap && sdkConfigs.maps.amap.serviceHost
let locale = manifestJson.locale
locale = locale && locale.toUpperCase() !== 'AUTO' ? locale : ''
......@@ -462,9 +461,9 @@ global.__uniConfig.networkTimeout = ${JSON.stringify(networkTimeoutConfig)};
global.__uniConfig.sdkConfigs = ${JSON.stringify(sdkConfigs)};
global.__uniConfig.qqMapKey = ${JSON.stringify(qqMapKey)};
global.__uniConfig.googleMapKey = ${JSON.stringify(googleMapKey)};
global.__uniConfig.AMapKey = ${JSON.stringify(AMapKey)};
global.__uniConfig.AMapSecurityJsCode = ${JSON.stringify(AMapSecurityJsCode)};
global.__uniConfig.AMapServiceHost = ${JSON.stringify(AMapServiceHost)};
global.__uniConfig.aMapKey = ${JSON.stringify(aMapKey)};
global.__uniConfig.aMapSecurityJsCode = ${JSON.stringify(aMapSecurityJsCode)};
global.__uniConfig.aMapServiceHost = ${JSON.stringify(aMapServiceHost)};
global.__uniConfig.locale = ${JSON.stringify(locale)};
global.__uniConfig.fallbackLocale = ${JSON.stringify(manifestJson.fallbackLocale)};
global.__uniConfig.locales = locales.keys().reduce((res,key)=>{const locale=key.replace(/\\.\\/(uni-app.)?(.*).json/,'$2');const messages = locales(key);Object.assign(res[locale]||(res[locale]={}),messages.common||messages);return res},{});
......
......@@ -23,12 +23,12 @@ export function getMapInfo () {
key: __uniConfig.googleMapKey
}
}
if (__uniConfig.AMapKey) {
if (__uniConfig.aMapKey) {
return {
type: MapType.AMAP,
key: __uniConfig.AMapKey,
securityJsCode: __uniConfig.AMapSecurityJsCode,
serviceHost: __uniConfig.AMapServiceHost
key: __uniConfig.aMapKey,
securityJsCode: __uniConfig.aMapSecurityJsCode,
serviceHost: __uniConfig.aMapServiceHost
}
}
return {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册