提交 90c37f42 编写于 作者: DCloud-WZF's avatar DCloud-WZF 💬

refactor(h5 map): 优化高德地图配置获取

上级 c94eddf3
...@@ -431,6 +431,12 @@ module.exports = function (pagesJson, manifestJson, loader) { ...@@ -431,6 +431,12 @@ module.exports = function (pagesJson, manifestJson, loader) {
const qqMapKey = sdkConfigs.maps && sdkConfigs.maps.qqmap && sdkConfigs.maps.qqmap.key const qqMapKey = sdkConfigs.maps && sdkConfigs.maps.qqmap && sdkConfigs.maps.qqmap.key
const googleMapKey = sdkConfigs.maps && sdkConfigs.maps.google && sdkConfigs.maps.google.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
let locale = manifestJson.locale let locale = manifestJson.locale
locale = locale && locale.toUpperCase() !== 'AUTO' ? locale : '' locale = locale && locale.toUpperCase() !== 'AUTO' ? locale : ''
...@@ -456,6 +462,9 @@ global.__uniConfig.networkTimeout = ${JSON.stringify(networkTimeoutConfig)}; ...@@ -456,6 +462,9 @@ global.__uniConfig.networkTimeout = ${JSON.stringify(networkTimeoutConfig)};
global.__uniConfig.sdkConfigs = ${JSON.stringify(sdkConfigs)}; global.__uniConfig.sdkConfigs = ${JSON.stringify(sdkConfigs)};
global.__uniConfig.qqMapKey = ${JSON.stringify(qqMapKey)}; global.__uniConfig.qqMapKey = ${JSON.stringify(qqMapKey)};
global.__uniConfig.googleMapKey = ${JSON.stringify(googleMapKey)}; 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.locale = ${JSON.stringify(locale)}; global.__uniConfig.locale = ${JSON.stringify(locale)};
global.__uniConfig.fallbackLocale = ${JSON.stringify(manifestJson.fallbackLocale)}; 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},{}); 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 () { ...@@ -23,12 +23,12 @@ export function getMapInfo () {
key: __uniConfig.googleMapKey key: __uniConfig.googleMapKey
} }
} }
if (__uniConfig.sdkConfigs.maps.AMap && __uniConfig.sdkConfigs.maps.AMap.key) { if (__uniConfig.AMapKey) {
return { return {
type: MapType.AMAP, type: MapType.AMAP,
key: __uniConfig.sdkConfigs.maps.AMap.key, key: __uniConfig.AMapKey,
securityJsCode: __uniConfig.sdkConfigs.maps.AMap.securityJsCode, securityJsCode: __uniConfig.AMapSecurityJsCode,
serviceHost: __uniConfig.sdkConfigs.maps.AMap.serviceHost serviceHost: __uniConfig.AMapServiceHost
} }
} }
return { return {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册