@smart100/spu-web-plugin 1.0.14 → 1.0.15

package/dist/spu-web-plugin.mjs

@@ -1,4 +1,4 @@
-var version = "1.0.14";
+var version = "1.0.15";
 
 /** Detect free variable `global` from Node.js. */
 var freeGlobal$2 = typeof global == 'object' && global && global.Object === Object && global;
@@ -18064,61 +18064,58 @@ var getLocationPromise = /*#__PURE__*/function () {
         case 9:
           location = _context17.sent;
         case 10:
-          _context17.next = 12;
-          return mapService.init();
-        case 12:
           if (location) {
-            _context17.next = 37;
+            _context17.next = 35;
             break;
           }
           if (!(mapService.type === 'amap')) {
-            _context17.next = 23;
+            _context17.next = 21;
             break;
           }
-          _context17.next = 16;
+          _context17.next = 14;
           return getLocationByAMap();
-        case 16:
+        case 14:
           location = _context17.sent;
           if (!(!location && isuseiplocarion)) {
-            _context17.next = 21;
+            _context17.next = 19;
             break;
           }
-          _context17.next = 20;
+          _context17.next = 18;
           return getCityLocationByAMap();
-        case 20:
+        case 18:
           location = _context17.sent;
-        case 21:
-          _context17.next = 37;
+        case 19:
+          _context17.next = 35;
           break;
-        case 23:
+        case 21:
           if (!(mapService.type === 'tencent' && isuseiplocarion)) {
-            _context17.next = 29;
+            _context17.next = 27;
             break;
           }
-          _context17.next = 26;
+          _context17.next = 24;
           return getIPLocationByTMap();
-        case 26:
+        case 24:
           location = _context17.sent;
-          _context17.next = 37;
+          _context17.next = 35;
           break;
-        case 29:
+        case 27:
           if (!(mapService.type === 'baidu')) {
-            _context17.next = 37;
+            _context17.next = 35;
             break;
           }
-          _context17.next = 32;
+          _context17.next = 30;
           return getLocationByBMap();
-        case 32:
+        case 30:
           location = _context17.sent;
           if (!(!location && isuseiplocarion)) {
-            _context17.next = 37;
+            _context17.next = 35;
             break;
           }
-          _context17.next = 36;
+          _context17.next = 34;
           return getCityLocationByBMap();
-        case 36:
+        case 34:
           location = _context17.sent;
-        case 37:
+        case 35:
           // 开发模式下为了方便测试提供虚拟定位
           if (!location && urlquery.isvirtuallocation) {
             location = {
@@ -18140,23 +18137,23 @@ var getLocationPromise = /*#__PURE__*/function () {
           //   }
           // }
           if (!(location && !location.address)) {
-            _context17.next = 45;
+            _context17.next = 43;
             break;
           }
-          _context17.next = 41;
+          _context17.next = 39;
           return getAddress(location);
-        case 41:
+        case 39:
           _context17.t0 = _context17.sent;
           if (_context17.t0) {
-            _context17.next = 44;
+            _context17.next = 42;
             break;
           }
           _context17.t0 = '经纬度获取成功，但地址获取失败。';
-        case 44:
+        case 42:
           location.address = _context17.t0;
-        case 45:
+        case 43:
           return _context17.abrupt("return", location);
-        case 46:
+        case 44:
         case "end":
           return _context17.stop();
       }
@@ -18181,24 +18178,27 @@ function _getLocation() {
       while (1) switch (_context20.prev = _context20.next) {
         case 0:
           isuseiplocarion = _args20.length > 0 && _args20[0] !== undefined ? _args20[0] : false;
+          _context20.next = 3;
+          return mapService.init();
+        case 3:
           if (!(datetime && Date.now() - datetime <= cachetime && lastLocation && !runing)) {
-            _context20.next = 3;
+            _context20.next = 5;
             break;
           }
           return _context20.abrupt("return", cloneDeep$1(lastLocation));
-        case 3:
+        case 5:
           if (!(runing && locationPromise)) {
-            _context20.next = 5;
+            _context20.next = 7;
             break;
           }
           return _context20.abrupt("return", locationPromise);
-        case 5:
+        case 7:
           // console.log('runing')
           runing = true;
           locationPromise = getLocationPromise(isuseiplocarion);
-          _context20.next = 9;
+          _context20.next = 11;
           return locationPromise;
-        case 9:
+        case 11:
           locationRes = _context20.sent;
           runing = false;
           if (locationRes) {
@@ -18206,7 +18206,7 @@ function _getLocation() {
             lastLocation = locationRes;
           }
           return _context20.abrupt("return", locationRes);
-        case 13:
+        case 15:
         case "end":
           return _context20.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "",
   "scripts": {
     "dev": "npm run build:types && rollup -c -w",

package/src/map/index.ts

@@ -489,8 +489,6 @@ const getLocationPromise = async (isuseiplocarion = false): Promise<Location> =>
   }
   // location = null
 
-  await mapService.init()
-
   if (!location) {
     if (mapService.type === 'amap') {
       location = await getLocationByAMap()
@@ -544,6 +542,7 @@ const getLocationPromise = async (isuseiplocarion = false): Promise<Location> =>
 // https://www.jianshu.com/p/559029832a67
 // 不能精确定位的情况下是否启用ip城市定位，ip定位用于不需要精确定位的场景
 async function getLocation(isuseiplocarion = false) {
+  await mapService.init()
   // debugger
   // 缓存30秒
   if (datetime && Date.now() - datetime <= cachetime && lastLocation && !runing) {