diff --git a/.eslintrc.js b/.eslintrc.js
index 78efa07f..ac247d01 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -9,7 +9,7 @@ module.exports = {
defineExpose: 'readonly',
withDefaults: 'readonly',
PROJECT_BUILD_TIME: 'readonly',
- BMapGL: 'readonly'
+ BMap: 'readonly'
},
parser: 'vue-eslint-parser',
parserOptions: {
@@ -34,6 +34,7 @@ module.exports = {
'import/prefer-default-export': 0,
'no-use-before-define': 'off',
'vue/multi-word-component-names': 0,
+ 'max-classes-per-file': 0,
'@typescript-eslint/no-explicit-any': 0,
'@typescript-eslint/no-inferrable-types': 0,
'@typescript-eslint/ban-ts-ignore': 'off',
diff --git a/src/hooks/common/index.ts b/src/hooks/common/index.ts
index 1fa6a5ef..c997d079 100644
--- a/src/hooks/common/index.ts
+++ b/src/hooks/common/index.ts
@@ -7,7 +7,6 @@ import useRouteProps from './useRouteProps';
import useBoolean from './useBoolean';
import useLoading from './useLoading';
import useScrollBehavior from './useScrollBehavior';
-import useScript from './useScript';
export {
useAppTitle,
@@ -18,6 +17,5 @@ export {
useRouteProps,
useBoolean,
useLoading,
- useScrollBehavior,
- useScript
+ useScrollBehavior
};
diff --git a/src/hooks/common/useScript.ts b/src/hooks/common/useScript.ts
deleted file mode 100644
index 638865a3..00000000
--- a/src/hooks/common/useScript.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { onUnmounted } from 'vue';
-import useLoading from './useLoading';
-import useBoolean from './useBoolean';
-
-export default function useScript(src: string) {
- const { loading, startLoading, endLoading } = useLoading();
- const { bool: isSuccess, setTrue: setIsSuccess, setFalse: setNotSuccess } = useBoolean();
-
- let script: HTMLScriptElement;
- function removeScript() {
- if (script) {
- script.remove();
- }
- }
-
- function load() {
- startLoading();
- return new Promise((resolve, reject) => {
- script = document.createElement('script');
- script.type = 'text/javascript';
- script.onload = () => {
- endLoading();
- setIsSuccess();
- resolve('');
- };
- script.onerror = err => {
- endLoading();
- setNotSuccess();
- reject(err);
- };
- script.src = src;
- document.head.appendChild(script);
- });
- }
-
- onUnmounted(() => {
- removeScript();
- });
-
- return {
- loading,
- isSuccess,
- load
- };
-}
diff --git a/src/settings/constant.ts b/src/settings/constant.ts
index 42ff6c49..e5c6fb93 100644
--- a/src/settings/constant.ts
+++ b/src/settings/constant.ts
@@ -1,2 +1,3 @@
/** 百度地图sdk地址 */
-export const BAIDU_MAP_SDK_URL = 'https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=KSezYymXPth1DIGILRX3oYN9PxbOQQmU';
+export const BAIDU_MAP_SDK_URL =
+ 'https://api.map.baidu.com/getscript?v=3.0&ak=KSezYymXPth1DIGILRX3oYN9PxbOQQmU&services=&t=20210201100830&s=1';
diff --git a/src/typings/bmapgl.d.ts b/src/typings/bmapgl.d.ts
index 3134ffdb..7d06ad6a 100644
--- a/src/typings/bmapgl.d.ts
+++ b/src/typings/bmapgl.d.ts
@@ -1 +1,5 @@
///
+declare namespace BMap {
+ class Map extends BMapGL.Map {}
+ class Point extends BMapGL.Point {}
+}
diff --git a/src/views/component/map/components/BaiduMap.vue b/src/views/component/map/components/BaiduMap.vue
index d1e5a2bd..668338d2 100644
--- a/src/views/component/map/components/BaiduMap.vue
+++ b/src/views/component/map/components/BaiduMap.vue
@@ -3,19 +3,18 @@