From 90c37f4237c9b22f667f636ffc71a47394b3b7a4 Mon Sep 17 00:00:00 2001
From: zhenyuWang <13641039885@163.com>
Date: Tue, 2 Aug 2022 15:57:58 +0800
Subject: [PATCH] =?UTF-8?q?refactor(h5=20map):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=AB=98=E5=BE=B7=E5=9C=B0=E5=9B=BE=E9=85=8D=E7=BD=AE=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/webpack-uni-pages-loader/lib/platforms/h5.js | 9 +++++++++
 src/platforms/h5/helpers/location.js                  | 8 ++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/webpack-uni-pages-loader/lib/platforms/h5.js b/packages/webpack-uni-pages-loader/lib/platforms/h5.js
index 379683cc2..03b1110dc 100644
--- a/packages/webpack-uni-pages-loader/lib/platforms/h5.js
+++ b/packages/webpack-uni-pages-loader/lib/platforms/h5.js
@@ -431,6 +431,12 @@ 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
 
   let locale = manifestJson.locale
   locale = locale && locale.toUpperCase() !== 'AUTO' ? locale : ''
@@ -456,6 +462,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.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},{});
diff --git a/src/platforms/h5/helpers/location.js b/src/platforms/h5/helpers/location.js
index 5c8476dd5..2670ae0a1 100644
--- a/src/platforms/h5/helpers/location.js
+++ b/src/platforms/h5/helpers/location.js
@@ -23,12 +23,12 @@ export function getMapInfo () {
       key: __uniConfig.googleMapKey
     }
   }
-  if (__uniConfig.sdkConfigs.maps.AMap && __uniConfig.sdkConfigs.maps.AMap.key) {
+  if (__uniConfig.AMapKey) {
     return {
       type: MapType.AMAP,
-      key: __uniConfig.sdkConfigs.maps.AMap.key,
-      securityJsCode: __uniConfig.sdkConfigs.maps.AMap.securityJsCode,
-      serviceHost: __uniConfig.sdkConfigs.maps.AMap.serviceHost
+      key: __uniConfig.AMapKey,
+      securityJsCode: __uniConfig.AMapSecurityJsCode,
+      serviceHost: __uniConfig.AMapServiceHost
     }
   }
   return {
-- 
GitLab