From 3ada4183d9f87fd879018d8dc73c9bc6c0529eb8 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Sun, 18 Jun 2023 15:51:57 +0800
Subject: [PATCH] code refactor

---
 src/lib/map/amap.js | 12 ++++--------
 src/lib/services.js |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/lib/map/amap.js b/src/lib/map/amap.js
index a4687663..7823359b 100644
--- a/src/lib/map/amap.js
+++ b/src/lib/map/amap.js
@@ -62,17 +62,13 @@ export function createAmapInstance(mapHolder, mapContainer, options) {
         jogEnable: false
     });
 
-    AMap.plugin([
-        'AMap.ToolBar'
-    ], function() {
-        mapHolder.amapToolbar = new AMap.ToolBar({
-            position: 'LT'
-        });
-
-        amapInstance.addControl(mapHolder.amapToolbar);
+    const amapToolbar = new AMap.ToolBar({
+        position: 'LT'
     });
+    amapInstance.addControl(amapToolbar);
 
     mapHolder.amapInstance = amapInstance;
+    mapHolder.amapToolbar = amapToolbar;
     mapHolder.inited = true;
 }
 
diff --git a/src/lib/services.js b/src/lib/services.js
index 012e65ac..fa746aba 100644
--- a/src/lib/services.js
+++ b/src/lib/services.js
@@ -422,7 +422,7 @@ export default {
         return `${api.baiduMapJavascriptUrl}&ak=${settings.getBaiduMapAK()}&callback=${callbackFnName}`;
     },
     generateAmapJavascriptUrl: (callbackFnName) => {
-        return `${api.amapJavascriptUrl}&key=${settings.getAmapApplicationKey()}&callback=${callbackFnName}`;
+        return `${api.amapJavascriptUrl}&key=${settings.getAmapApplicationKey()}&plugin=AMap.ToolBar&callback=${callbackFnName}`;
     },
     generateAmapApiInternalProxyUrl: () => {
         return `${window.location.origin}${api.baseAmapApiProxyUrlPath}`;