@smart100/spu-web-plugin 1.0.12 → 1.0.13

package/dist/index.d.ts

@@ -99,6 +99,11 @@ export const getLocation: () => Promise<{
   [propName: string]: any
 } | null>
 export const getDistance: (p1: [number, number], p2: [number, number]) => Promise<any>
+export const getAddress: (location: {
+  longitude: string
+  latitude: string
+  [propName: string]: any
+}) => Promise<string>
 export const spuAxios: any
 export const apaasAxios: any
 export const axios: any

package/dist/spu-web-plugin.mjs

@@ -1,4 +1,4 @@
-var version = "1.0.12";
+var version = "1.0.13";
 
 /** Detect free variable `global` from Node.js. */
 var freeGlobal$2 = typeof global == 'object' && global && global.Object === Object && global;
@@ -16162,11 +16162,27 @@ var TenantSetting = /*#__PURE__*/function () {
       //     }
       //   }
       // }
-      // tenantsetting.lbssetting.setting.type = 'amap'
-      // tenantsetting.lbssetting.setting.key.web = '1993ac213d2f4675ac1bffb1b03ef1f0'
-      // tenantsetting.lbssetting.setting.secretkey.web = '816fe46b7b7bce145940b93c1e4818fa'
-      // // tenantsetting.lbssetting.setting.type = 'tencent'
-      // // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT'
+      // // 高德地图key配置错误
+      // // 1 如果是key格式不对 那么没返回promise 连window.AMap都拿不到 地图和都不能用
+      // // 1 如果是key对式对 但key不对 有返回 window.AMap 但api定位调用失败 地图可以渲染空白地图
+      // // // 高德地图公司key
+      // // tenantsetting.lbssetting.setting.type = 'amap'
+      // // tenantsetting.lbssetting.setting.key.web = '1993ac213d2f4675ac1bffb1b03ef1f0'
+      // // tenantsetting.lbssetting.setting.secretkey.web = '816fe46b7b7bce145940b93c1e4818fa'
+      // // // 高德地图个人key
+      // // tenantsetting.lbssetting.setting.type = 'amap'
+      // // tenantsetting.lbssetting.setting.key.web = 'e4d25fe4661a34198c4e6f79abe9afac'
+      // // tenantsetting.lbssetting.setting.secretkey.web = 'a6b674affd9a3278c68602cf7ba02fcb'
+      // // tencent地图key配置错误
+      // // 1 如果是地图 会在地图上明确文字提示 鉴权失败，请传入正确的key
+      // // 2 如果是调用定位等api 会返回 catch 和详细的错误信息
+      // // getIPLocationByTMap fail: {"status":311,"message":"key格式错误","request_id":"ccedb04fd95e4f3f9cd45cfbad729d10","id":"cbm919vjdj0"}
+      // // getIPLocationByTMap fail: {"status":190,"message":"无效的key","request_id":"b6ca9d0749eb4c91a47db9412b1253ca","id":"cbm919wxo40"}
+      // tenantsetting.lbssetting.setting.type = 'tencent'
+      // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT'
+      // tenantsetting.lbssetting.setting.secretkey.web = 'zowvV5I2pSxqgGb2Sgr1x62HGXbqdxT0'
+      // // 百度地图key配置错误alert以下信息
+      // // 您提供的密钥不是有效的百度LBS开放平台密钥，或此密钥未对本应用的百度地图JavaScriptAPI授权。您可以访问如下网址了解如何获取有效的密钥：http://lbsyun.baidu.com/apiconsole/key#。
       // // tenantsetting.lbssetting.setting.type = 'baidu'
       // // tenantsetting.lbssetting.setting.key.web = '7r3bsPeQqJ74vsxf3EOXg7C1AM4lOWA1'
       // lsProxy.setItem('tenantsetting', JSON.stringify(tenantsetting))
@@ -17259,42 +17275,66 @@ var MapService = /*#__PURE__*/function () {
   }, {
     key: "initAmap",
     value: function () {
-      var _initAmap = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee4() {
-        var plugin, AMap;
-        return _regeneratorRuntime$1().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _initAmap = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee5() {
+        var _this = this;
+        return _regeneratorRuntime$1().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              if (this.secretkey) {
-                window._AMapSecurityConfig = {
-                  securityJsCode: this.secretkey
+              return _context5.abrupt("return", new Promise( /*#__PURE__*/function () {
+                var _ref = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee4(resolve, reject) {
+                  var time, plugin, AMap;
+                  return _regeneratorRuntime$1().wrap(function _callee4$(_context4) {
+                    while (1) switch (_context4.prev = _context4.next) {
+                      case 0:
+                        // 高德地图api初始化失败 没有返回reject 因此用超时机制检测
+                        time = setTimeout(function () {
+                          console.error('initAmap fail: 请检查 AMap key 是否正确配置');
+                          resolve(null);
+                        }, 3000);
+                        if (_this.secretkey) {
+                          window._AMapSecurityConfig = {
+                            securityJsCode: _this.secretkey
+                          };
+                        }
+                        plugin = ['AMap.Geolocation', 'AMap.Geocoder']; // debugger
+                        _context4.next = 5;
+                        return AMapLoader$1.load({
+                          key: _this.key,
+                          version: '2.0',
+                          plugins: plugin,
+                          AMapUI: {
+                            version: '1.1',
+                            plugins: []
+                          }
+                        });
+                      case 5:
+                        AMap = _context4.sent;
+                        // debugger
+                        clearTimeout(time);
+                        window.AMap = AMap;
+                        _this.AMap = window.AMap;
+                        _this.MapCore = window.AMap;
+                        // console.log(window)
+                        // console.log(window.AMap)
+                        // console.log(window.AMapUI)
+                        // console.log(window.AMapLoader)
+                        // console.log(window.AMap === aaaa)
+                        resolve(window.AMap);
+                      case 11:
+                      case "end":
+                        return _context4.stop();
+                    }
+                  }, _callee4);
+                }));
+                return function (_x, _x2) {
+                  return _ref.apply(this, arguments);
                 };
-              }
-              plugin = ['AMap.Geolocation', 'AMap.Geocoder'];
-              _context4.next = 4;
-              return AMapLoader$1.load({
-                key: this.key,
-                version: '2.0',
-                plugins: plugin,
-                AMapUI: {
-                  version: '1.1',
-                  plugins: []
-                }
-              });
-            case 4:
-              AMap = _context4.sent;
-              window.AMap = AMap;
-              this.AMap = AMap;
-              this.MapCore = window.AMap;
-              // console.log(window)
-              // console.log(window.AMap)
-              // console.log(window.AMapUI)
-              // console.log(window.AMapLoader)
-              // console.log(window.AMap === aaaa)
-            case 8:
+              }()));
+            case 1:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5);
       }));
       function initAmap() {
         return _initAmap.apply(this, arguments);
@@ -17304,15 +17344,17 @@ var MapService = /*#__PURE__*/function () {
   }, {
     key: "initBaidu",
     value: function () {
-      var _initBaidu = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee5() {
-        var _this = this;
-        return _regeneratorRuntime$1().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _initBaidu = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee6() {
+        var _this2 = this;
+        return _regeneratorRuntime$1().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              return _context5.abrupt("return", new Promise(function (resolve, reject) {
-                window.BMAP_INITIAL_CALLBACK = function () {
-                  _this.BMap = window.BMap;
-                  _this.MapCore = window.BMap;
+              return _context6.abrupt("return", new Promise(function (resolve, reject) {
+                window.BMAP_INITIAL_CALLBACK = function (e) {
+                  // console.log(e)
+                  // debugger
+                  _this2.BMap = window.BMap;
+                  _this2.MapCore = window.BMap;
                   // debugger
                   // 启用google标准坐标体系
                   // coordsType 指定输入输出的坐标类型，BMAP_COORD_GCJ02为gcj02坐标，BMAP_COORD_BD09为bd0ll坐标，默认为BMAP_COORD_BD09。
@@ -17321,7 +17363,7 @@ var MapService = /*#__PURE__*/function () {
                 };
                 var script = document.createElement('script');
                 // 使用最新 3.0 api https://lbsyun.baidu.com/index.php?title=jspopular3.0
-                script.src = "https://api.map.baidu.com/api?v=3.0&ak=".concat(_this.key, "&callback=BMAP_INITIAL_CALLBACK");
+                script.src = "https://api.map.baidu.com/api?v=3.0&ak=".concat(_this2.key, "&callback=BMAP_INITIAL_CALLBACK");
                 // script.src = `https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=${this.key}&callback=BMAP_INITIAL_CALLBACK`
                 script.onerror = function (err) {
                   reject(err);
@@ -17330,9 +17372,9 @@ var MapService = /*#__PURE__*/function () {
               }));
             case 1:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5);
+        }, _callee6);
       }));
       function initBaidu() {
         return _initBaidu.apply(this, arguments);
@@ -17436,9 +17478,9 @@ var getLocationByNative = /*#__PURE__*/function () {
               }
             }, 30000);
             window.Native.getLocation(function (res, error, status) {
-              // console.log('getLocation res', res)
-              // console.log('getLocation error', error)
-              // console.log('getLocation status', status)
+              // console.log('window.Native.getLocation res', res)
+              // console.log('window.Native.getLocation error', error)
+              // console.log('window.Native.getLocation status', status)
               isload = true;
               if (res && res !== null && res !== void 0 && res.longitude && res !== null && res !== void 0 && res.latitude) {
                 var result = {
@@ -17516,139 +17558,24 @@ var getLocationByNavigator = /*#__PURE__*/function () {
     return _ref2.apply(this, arguments);
   };
 }();
-// ipaas ip 定位
-var getIPLocationByIpaas = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee3(ip) {
-    return _regeneratorRuntime$1().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
-        case 0:
-          console.log('getIPLocationByIpaas start...');
-          return _context3.abrupt("return", new Promise(function (resolve, reject) {
-            var AMapKey = getAMapKey();
-            normalAxios$1.post('https://silkroad.wxchina.com/api/openapi/publishEvent?topic=xw-listener&subtopic=xw-listener&apicaseid=6684389338001815271', {
-              key: AMapKey.key,
-              ip: ip || ''
-            }).then(function (res) {
-              // console.log(res)
-              // debugger
-              // res.data.rectangle = '113.1017375,22.93212254;113.6770499,23.3809537'
-              if (res.data.rectangle) {
-                var rectangle = res.data.rectangle;
-                var rects = rectangle.split(';').map(function (rect) {
-                  var _rect$split = rect.split(','),
-                    _rect$split2 = _slicedToArray(_rect$split, 2),
-                    longitude = _rect$split2[0],
-                    latitude = _rect$split2[1];
-                  return {
-                    longitude: Number(longitude),
-                    latitude: Number(latitude)
-                  };
-                });
-                var result = {
-                  longitude: ((rects[0].longitude + rects[1].longitude) / 2).toString(),
-                  latitude: ((rects[0].latitude + rects[1].latitude) / 2).toString()
-                };
-                console.log("getIPLocationByIpaas success: ".concat(JSON.stringify(result)));
-                resolve(result);
-              } else {
-                console.error('getIPLocationByIpaas fail');
-                resolve(null);
-              }
-            })["catch"](function (err) {
-              console.error(err);
-              console.error('getIPLocationByIpaas fail');
-              resolve(null);
-            });
-          }));
-        case 2:
-        case "end":
-          return _context3.stop();
-      }
-    }, _callee3);
-  }));
-  return function getIPLocationByIpaas(_x) {
-    return _ref3.apply(this, arguments);
-  };
-}();
-// ipaas 逆地址解析
-var getAddressByIpaas = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee5(position) {
-    return _regeneratorRuntime$1().wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
-        case 0:
-          console.log('getAddressByIpaas start...');
-          // 如果不设置安全秘钥的话 js-api的逆地址查询不成功 返回 INVALID_USER_SCODE 改成用ipaas服务查询
-          return _context5.abrupt("return", new Promise( /*#__PURE__*/function () {
-            var _ref5 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee4(resolve, reject) {
-              var _result$data, AMapKey, result, address;
-              return _regeneratorRuntime$1().wrap(function _callee4$(_context4) {
-                while (1) switch (_context4.prev = _context4.next) {
-                  case 0:
-                    if (!position) {
-                      _context4.next = 15;
-                      break;
-                    }
-                    _context4.prev = 1;
-                    AMapKey = getAMapKey();
-                    _context4.next = 5;
-                    return normalAxios$1.post('https://silkroad.wxchina.com/api/openapi/publishEvent?topic=xw-listener&subtopic=xw-listener&apicaseid=6684389338001809906', {
-                      longitude: position.longitude,
-                      latitude: position.latitude,
-                      key: AMapKey.key
-                      // extensions: 'all'
-                    });
-                  case 5:
-                    result = _context4.sent;
-                    // console.log(result)
-                    address = result === null || result === void 0 || (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.formatted_address;
-                    if (address) {
-                      console.log("getAddressByIpaas success: ".concat(address));
-                      resolve(address);
-                    } else {
-                      console.error('getAddressByIpaas fail');
-                      resolve('');
-                    }
-                    _context4.next = 15;
-                    break;
-                  case 10:
-                    _context4.prev = 10;
-                    _context4.t0 = _context4["catch"](1);
-                    console.error(_context4.t0);
-                    console.error('getAddressByIpaas fail');
-                    resolve('');
-                  case 15:
-                  case "end":
-                    return _context4.stop();
-                }
-              }, _callee4, null, [[1, 10]]);
-            }));
-            return function (_x3, _x4) {
-              return _ref5.apply(this, arguments);
-            };
-          }()));
-        case 2:
-        case "end":
-          return _context5.stop();
-      }
-    }, _callee5);
-  }));
-  return function getAddressByIpaas(_x2) {
-    return _ref4.apply(this, arguments);
-  };
-}();
 // 高德定位
-var getLocationByAmap = /*#__PURE__*/function () {
+var getLocationByAMap = /*#__PURE__*/function () {
   var _ref6 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee6() {
     return _regeneratorRuntime$1().wrap(function _callee6$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
-          console.log('getLocationByAmap start...');
+          console.log('getLocationByAMap start...');
           return _context6.abrupt("return", new Promise(function (resolve, reject) {
-            var geolocation = new window.AMap.Geolocation({
+            var _window;
+            if (!((_window = window) !== null && _window !== void 0 && _window.AMap)) {
+              console.error('getLocationByAMap fail: AMap is undefinded');
+              resolve(null);
+              return;
+            }
+            new window.AMap.Geolocation({
               enableHighAccuracy: true,
               timeout: 15000
-            });
-            geolocation.getCurrentPosition(function (status, res) {
+            }).getCurrentPosition(function (status, res) {
               // console.log(status, result)
               // debugger
               if (status === 'complete') {
@@ -17659,10 +17586,10 @@ var getLocationByAmap = /*#__PURE__*/function () {
                   longitude: lng.toString(),
                   latitude: lat.toString()
                 };
-                console.log("getLocationByAmap success: ".concat(JSON.stringify(result)));
+                console.log("getLocationByAMap success: ".concat(JSON.stringify(result)));
                 resolve(result);
               } else {
-                console.error('getLocationByAmap fail');
+                console.error('getLocationByAMap fail');
                 resolve(null);
               }
             });
@@ -17673,23 +17600,28 @@ var getLocationByAmap = /*#__PURE__*/function () {
       }
     }, _callee6);
   }));
-  return function getLocationByAmap() {
+  return function getLocationByAMap() {
     return _ref6.apply(this, arguments);
   };
 }();
 // 高德城市定位
-var getCityLocationByAmap = /*#__PURE__*/function () {
+var getCityLocationByAMap = /*#__PURE__*/function () {
   var _ref7 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee7() {
     return _regeneratorRuntime$1().wrap(function _callee7$(_context7) {
       while (1) switch (_context7.prev = _context7.next) {
         case 0:
-          console.log('getCityLocationByAmap start...');
+          console.log('getCityLocationByAMap start...');
           return _context7.abrupt("return", new Promise(function (resolve, reject) {
-            var geolocation = new window.AMap.Geolocation({
+            var _window2;
+            if (!((_window2 = window) !== null && _window2 !== void 0 && _window2.AMap)) {
+              console.error('getCityLocationByAMap fail: AMap is undefinded');
+              resolve(null);
+              return;
+            }
+            new window.AMap.Geolocation({
               enableHighAccuracy: true,
               timeout: 15000
-            });
-            geolocation.getCityInfo(function (status, res) {
+            }).getCityInfo(function (status, res) {
               // console.log(res)
               // debugger
               if (status === 'complete') {
@@ -17699,10 +17631,10 @@ var getCityLocationByAmap = /*#__PURE__*/function () {
                   longitude: lng.toString(),
                   latitude: lat.toString()
                 };
-                console.log("getCityLocationByAmap success: ".concat(JSON.stringify(result)));
+                console.log("getCityLocationByAMap success: ".concat(JSON.stringify(result)));
                 resolve(result);
               } else {
-                console.error('getCityLocationByAmap fail');
+                console.error('getCityLocationByAMap fail');
                 resolve(null);
               }
             });
@@ -17713,19 +17645,25 @@ var getCityLocationByAmap = /*#__PURE__*/function () {
       }
     }, _callee7);
   }));
-  return function getCityLocationByAmap() {
+  return function getCityLocationByAMap() {
     return _ref7.apply(this, arguments);
   };
 }();
 // 高德逆地址解析
-var getAddressByAmap = /*#__PURE__*/function () {
+var getAddressByAMap = /*#__PURE__*/function () {
   var _ref8 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee8(position) {
     return _regeneratorRuntime$1().wrap(function _callee8$(_context8) {
       while (1) switch (_context8.prev = _context8.next) {
         case 0:
-          console.log('getAddressByAmap start...');
+          console.log('getAddressByAMap start...');
           return _context8.abrupt("return", new Promise(function (resolve, reject) {
             if (position) {
+              var _window3;
+              if (!((_window3 = window) !== null && _window3 !== void 0 && _window3.AMap)) {
+                console.error('getAddressByAMap fail: AMap is undefinded');
+                resolve('');
+                return;
+              }
               new window.AMap.Geocoder({
                 city: '',
                 radius: 500
@@ -17736,10 +17674,10 @@ var getAddressByAmap = /*#__PURE__*/function () {
                 // debugger
                 if (status === 'complete' && result.info === 'OK' && result !== null && result !== void 0 && (_result$regeocode = result.regeocode) !== null && _result$regeocode !== void 0 && _result$regeocode.formattedAddress) {
                   var address = result.regeocode.formattedAddress || '';
-                  console.log("getAddressByAmap success: ".concat(address));
+                  console.log("getAddressByAMap success: ".concat(address));
                   resolve(address);
                 } else {
-                  console.error("getAddressByAmap fail: status = ".concat(status, ", result = ").concat(result));
+                  console.error("getAddressByAMap fail: status = ".concat(status, ", result = ").concat(result));
                   resolve('');
                 }
               });
@@ -17751,7 +17689,7 @@ var getAddressByAmap = /*#__PURE__*/function () {
       }
     }, _callee8);
   }));
-  return function getAddressByAmap(_x5) {
+  return function getAddressByAMap(_x5) {
     return _ref8.apply(this, arguments);
   };
 }();
@@ -17763,11 +17701,12 @@ var getIPLocationByTMap = /*#__PURE__*/function () {
         case 0:
           console.log('getIPLocationByTMap start...');
           return _context9.abrupt("return", new Promise(function (resolve, reject) {
-            var ipLocation = new window.TMap.service.IPLocation();
             var params = ip ? {
               ip: ip
             } : {};
-            ipLocation.locate(params).then(function (res) {
+            new window.TMap.service.IPLocation().locate(_objectSpread2$1(_objectSpread2$1({}, params), {}, {
+              servicesk: mapService.secretkey
+            })).then(function (res) {
               var result = {
                 longitude: res.result.location.lng.toString(),
                 latitude: res.result.location.lat.toString()
@@ -17799,13 +17738,11 @@ var getAddressByTMap = /*#__PURE__*/function () {
           console.log('getAddressByTMap start...');
           return _context10.abrupt("return", new Promise(function (resolve, reject) {
             if (position) {
-              var location = new window.TMap.LatLng(position.latitude, position.longitude);
-              // console.log(position)
-              // console.log(location)
               // debugger
               new window.TMap.service.Geocoder().getAddress({
-                location: location,
-                getPoi: false
+                location: new window.TMap.LatLng(position.latitude, position.longitude),
+                getPoi: false,
+                servicesk: mapService.secretkey
               }).then(function (res) {
                 var _res$result, _res$result2;
                 // console.log(res)
@@ -18015,6 +17952,7 @@ var getAddressByBmap = /*#__PURE__*/function () {
                         resolve(address);
                       } else {
                         console.error('getAddressByBmap fail');
+                        // console.error(result)
                         resolve('');
                       }
                     });
@@ -18040,7 +17978,7 @@ var getAddressByBmap = /*#__PURE__*/function () {
 }();
 var getLocationPromise = /*#__PURE__*/function () {
   var _ref17 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee17() {
-    var _window;
+    var _window4;
     var isuseiplocarion,
       location,
       _args17 = arguments;
@@ -18049,7 +17987,7 @@ var getLocationPromise = /*#__PURE__*/function () {
         case 0:
           isuseiplocarion = _args17.length > 0 && _args17[0] !== undefined ? _args17[0] : false;
           location = null; // 在 SPU 容器里使用 Native-API 的定位
-          if (!((_window = window) !== null && _window !== void 0 && (_window = _window.Native) !== null && _window !== void 0 && _window.getLocation)) {
+          if (!((_window4 = window) !== null && _window4 !== void 0 && (_window4 = _window4.Native) !== null && _window4 !== void 0 && _window4.getLocation)) {
             _context17.next = 6;
             break;
           }
@@ -18068,15 +18006,15 @@ var getLocationPromise = /*#__PURE__*/function () {
           location = _context17.sent;
         case 10:
           if (location) {
-            _context17.next = 39;
+            _context17.next = 35;
             break;
           }
           if (!(mapService.type === 'amap')) {
-            _context17.next = 25;
+            _context17.next = 21;
             break;
           }
           _context17.next = 14;
-          return getLocationByAmap();
+          return getLocationByAMap();
         case 14:
           location = _context17.sent;
           if (!(!location && isuseiplocarion)) {
@@ -18084,50 +18022,41 @@ var getLocationPromise = /*#__PURE__*/function () {
             break;
           }
           _context17.next = 18;
-          return getCityLocationByAmap();
+          return getCityLocationByAMap();
         case 18:
           location = _context17.sent;
         case 19:
-          if (!(!location && isuseiplocarion)) {
-            _context17.next = 23;
-            break;
-          }
-          _context17.next = 22;
-          return getIPLocationByIpaas();
-        case 22:
-          location = _context17.sent;
-        case 23:
-          _context17.next = 39;
+          _context17.next = 35;
           break;
-        case 25:
+        case 21:
           if (!(mapService.type === 'tencent' && isuseiplocarion)) {
-            _context17.next = 31;
+            _context17.next = 27;
             break;
           }
-          _context17.next = 28;
+          _context17.next = 24;
           return getIPLocationByTMap();
-        case 28:
+        case 24:
           location = _context17.sent;
-          _context17.next = 39;
+          _context17.next = 35;
           break;
-        case 31:
+        case 27:
           if (!(mapService.type === 'baidu')) {
-            _context17.next = 39;
+            _context17.next = 35;
             break;
           }
-          _context17.next = 34;
+          _context17.next = 30;
           return getLocationByBMap();
-        case 34:
+        case 30:
           location = _context17.sent;
           if (!(!location && isuseiplocarion)) {
-            _context17.next = 39;
+            _context17.next = 35;
             break;
           }
-          _context17.next = 38;
+          _context17.next = 34;
           return getCityLocationByBMap();
-        case 38:
+        case 34:
           location = _context17.sent;
-        case 39:
+        case 35:
           // 开发模式下为了方便测试提供虚拟定位
           if (!location && urlquery.isvirtuallocation) {
             location = {
@@ -18135,24 +18064,37 @@ var getLocationPromise = /*#__PURE__*/function () {
               latitude: '39.908671'
             };
           }
+          // if (location) {
+          //   for (let i = 0, len = 5000; i < len; i++) {
+          //     // location.latitude = (Number(location.latitude) + 0.02).toString()
+          //     location.longitude = (Number(location.longitude) + 0.002).toString()
+          //     await getAddress(location)
+          //     .then((res: any) => {
+          //       console.log(res)
+          //     }).catch((err: any) => {
+          //       console.error(err)
+          //     })
+          //     await delay(300)
+          //   }
+          // }
           if (!(location && !location.address)) {
-            _context17.next = 47;
+            _context17.next = 43;
             break;
           }
-          _context17.next = 43;
+          _context17.next = 39;
           return getAddress(location);
-        case 43:
+        case 39:
           _context17.t0 = _context17.sent;
           if (_context17.t0) {
-            _context17.next = 46;
+            _context17.next = 42;
             break;
           }
           _context17.t0 = '经纬度获取成功，但地址获取失败。';
-        case 46:
+        case 42:
           location.address = _context17.t0;
-        case 47:
+        case 43:
           return _context17.abrupt("return", location);
-        case 48:
+        case 44:
         case "end":
           return _context17.stop();
       }
@@ -18224,51 +18166,42 @@ var getAddress = /*#__PURE__*/function () {
         case 2:
           address = '';
           if (address) {
-            _context18.next = 24;
+            _context18.next = 20;
             break;
           }
           if (!(mapService.type === 'amap')) {
-            _context18.next = 14;
+            _context18.next = 10;
             break;
           }
           _context18.next = 7;
-          return getAddressByAmap(position);
+          return getAddressByAMap(position);
         case 7:
           address = _context18.sent;
-          if (address) {
-            _context18.next = 12;
-            break;
-          }
-          _context18.next = 11;
-          return getAddressByIpaas(position);
-        case 11:
-          address = _context18.sent;
-        case 12:
-          _context18.next = 24;
+          _context18.next = 20;
           break;
-        case 14:
+        case 10:
           if (!(mapService.type === 'tencent')) {
-            _context18.next = 20;
+            _context18.next = 16;
             break;
           }
-          _context18.next = 17;
+          _context18.next = 13;
           return getAddressByTMap(position);
-        case 17:
+        case 13:
           address = _context18.sent;
-          _context18.next = 24;
+          _context18.next = 20;
           break;
-        case 20:
+        case 16:
           if (!(mapService.type === 'baidu')) {
-            _context18.next = 24;
+            _context18.next = 20;
             break;
           }
-          _context18.next = 23;
+          _context18.next = 19;
           return getAddressByBmap(position);
-        case 23:
+        case 19:
           address = _context18.sent;
-        case 24:
+        case 20:
           return _context18.abrupt("return", address);
-        case 25:
+        case 21:
         case "end":
           return _context18.stop();
       }
@@ -70051,4 +69984,4 @@ var SPUWebPlugin = {
   version: version
 };
 
-export { AMapLoader, Module, normalAxios$1 as apaasAxios, normalAxios$1 as axios, checkLogin, index as components, SPUWebPlugin as default, downloadService, expandexp, functionCheck, getDistance, getLocation, getRefreshToken, getToken, getTokenExpires, getUniqueid, getUser, v4 as getUuid, globalConfig, globalOptions, isInApp, isdebugger, isvirtuallocation, lsProxy, mapService, setTitle, singleLogin, spuAxios, spuConfig, ssProxy, updateToken, uploadService, wxworkSuite };
+export { AMapLoader, Module, normalAxios$1 as apaasAxios, normalAxios$1 as axios, checkLogin, index as components, SPUWebPlugin as default, downloadService, expandexp, functionCheck, getAddress, getDistance, getLocation, getRefreshToken, getToken, getTokenExpires, getUniqueid, getUser, v4 as getUuid, globalConfig, globalOptions, isInApp, isdebugger, isvirtuallocation, lsProxy, mapService, setTitle, singleLogin, spuAxios, spuConfig, ssProxy, updateToken, uploadService, wxworkSuite };

package/package.json

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

package/src/index.ts

@@ -2,7 +2,7 @@ import { version } from '../package.json'
 import { merge } from 'lodash-es'
 import { v4 as getUuid } from 'uuid'
 import { installStorageProxy, lsProxy, ssProxy } from './storageProxy'
-import { getLocation, getDistance } from './map/index'
+import { getLocation, getDistance, getAddress } from './map/index'
 import { installAxios, spuAxios, axios } from './axios'
 import { installSpuConfig, spuConfig } from './spuConfig'
 import { globalConfig } from './globalConfig'
@@ -101,6 +101,7 @@ export {
   ssProxy,
   getLocation,
   getDistance,
+  getAddress,
   spuAxios,
   axios,
   axios as apaasAxios,

package/src/map/MapService.ts

@@ -127,45 +127,51 @@ class MapService {
   }
 
   private async initAmap() {
-    if (this.secretkey) {
-      window._AMapSecurityConfig = {
-        securityJsCode: this.secretkey
-      }
-    }
-
-    const plugin = ['AMap.Geolocation', 'AMap.Geocoder']
+    return new Promise(async (resolve, reject) => {
+      // 高德地图api初始化失败 没有返回reject 因此用超时机制检测
+      const time = setTimeout(() => {
+        console.error('initAmap fail: 请检查 AMap key 是否正确配置')
+        resolve(null)
+      }, 3000)
 
-    const AMap = await AMapLoader.load({
-      key: this.key,
-      version: '2.0',
-      plugins: plugin,
-      AMapUI: {
-        version: '1.1',
-        plugins: []
+      if (this.secretkey) {
+        window._AMapSecurityConfig = {
+          securityJsCode: this.secretkey
+        }
       }
+
+      const plugin = ['AMap.Geolocation', 'AMap.Geocoder']
+      // debugger
+
+      const AMap = await AMapLoader.load({
+        key: this.key,
+        version: '2.0',
+        plugins: plugin,
+        AMapUI: {
+          version: '1.1',
+          plugins: []
+        }
+      })
+      // debugger
+      clearTimeout(time)
+
+      window.AMap = AMap
+      this.AMap = window.AMap
+      this.MapCore = window.AMap
+      // console.log(window)
+      // console.log(window.AMap)
+      // console.log(window.AMapUI)
+      // console.log(window.AMapLoader)
+      // console.log(window.AMap === aaaa)
+      resolve(window.AMap)
     })
-    window.AMap = AMap
-    this.AMap = AMap
-    this.MapCore = window.AMap
-    // console.log(window)
-    // console.log(window.AMap)
-    // console.log(window.AMapUI)
-    // console.log(window.AMapLoader)
-    // console.log(window.AMap === aaaa)
   }
 
   private async initBaidu() {
-    // await importJS(
-    //     `https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=${this.key}`,
-    //     'BMap'
-    // )
-    // await delay(300)
-    // function initialize() {
-    //     const mp = new BMap.Map('map')
-    //     mp.centerAndZoom(new BMap.Point(121.491, 31.233), 11)
-    // }
     return new Promise((resolve, reject) => {
-      window.BMAP_INITIAL_CALLBACK = () => {
+      window.BMAP_INITIAL_CALLBACK = (e: any) => {
+        // console.log(e)
+        // debugger
         this.BMap = window.BMap
         this.MapCore = window.BMap
         // debugger

package/src/map/index.ts

@@ -3,6 +3,7 @@ import { cloneDeep } from 'lodash-es'
 import { mapService } from './MapService'
 import { getAMapKey } from './AMapKey'
 import { axios } from '../axios'
+import { delay } from '../utils'
 import { wgs84ToGcj02, BMapTransformBD09ToGCJ02Points } from './utils'
 
 type Location = {
@@ -30,9 +31,9 @@ const getLocationByNative = async (): Promise<Location> => {
       }
     }, 30000)
     window.Native.getLocation((res: any, error: any, status: any) => {
-      // console.log('getLocation res', res)
-      // console.log('getLocation error', error)
-      // console.log('getLocation status', status)
+      // console.log('window.Native.getLocation res', res)
+      // console.log('window.Native.getLocation error', error)
+      // console.log('window.Native.getLocation status', status)
       isload = true
       if (res && res?.longitude && res?.latitude) {
         const result = {
@@ -174,15 +175,18 @@ const getAddressByIpaas = async (position: Location): Promise<string> => {
 }
 
 // 高德定位
-const getLocationByAmap = async (): Promise<Location> => {
-  console.log('getLocationByAmap start...')
+const getLocationByAMap = async (): Promise<Location> => {
+  console.log('getLocationByAMap start...')
   return new Promise((resolve, reject) => {
-    const geolocation = new window.AMap.Geolocation({
+    if (!window?.AMap) {
+      console.error('getLocationByAMap fail: AMap is undefinded')
+      resolve(null)
+      return
+    }
+    new window.AMap.Geolocation({
       enableHighAccuracy: true,
       timeout: 15000
-    })
-
-    geolocation.getCurrentPosition((status: string, res: any) => {
+    }).getCurrentPosition((status: string, res: any) => {
       // console.log(status, result)
       // debugger
       if (status === 'complete') {
@@ -191,10 +195,10 @@ const getLocationByAmap = async (): Promise<Location> => {
           longitude: lng.toString(),
           latitude: lat.toString()
         }
-        console.log(`getLocationByAmap success: ${JSON.stringify(result)}`)
+        console.log(`getLocationByAMap success: ${JSON.stringify(result)}`)
         resolve(result)
       } else {
-        console.error('getLocationByAmap fail')
+        console.error('getLocationByAMap fail')
         resolve(null)
       }
     })
@@ -202,14 +206,18 @@ const getLocationByAmap = async (): Promise<Location> => {
 }
 
 // 高德城市定位
-const getCityLocationByAmap = async (): Promise<Location> => {
-  console.log('getCityLocationByAmap start...')
+const getCityLocationByAMap = async (): Promise<Location> => {
+  console.log('getCityLocationByAMap start...')
   return new Promise((resolve, reject) => {
-    const geolocation = new window.AMap.Geolocation({
+    if (!window?.AMap) {
+      console.error('getCityLocationByAMap fail: AMap is undefinded')
+      resolve(null)
+      return
+    }
+    new window.AMap.Geolocation({
       enableHighAccuracy: true,
       timeout: 15000
-    })
-    geolocation.getCityInfo((status: string, res: any) => {
+    }).getCityInfo((status: string, res: any) => {
       // console.log(res)
       // debugger
       if (status === 'complete') {
@@ -219,10 +227,10 @@ const getCityLocationByAmap = async (): Promise<Location> => {
           longitude: lng.toString(),
           latitude: lat.toString()
         }
-        console.log(`getCityLocationByAmap success: ${JSON.stringify(result)}`)
+        console.log(`getCityLocationByAMap success: ${JSON.stringify(result)}`)
         resolve(result)
       } else {
-        console.error('getCityLocationByAmap fail')
+        console.error('getCityLocationByAMap fail')
         resolve(null)
       }
     })
@@ -230,10 +238,15 @@ const getCityLocationByAmap = async (): Promise<Location> => {
 }
 
 // 高德逆地址解析
-const getAddressByAmap = async (position: Location): Promise<string> => {
-  console.log('getAddressByAmap start...')
+const getAddressByAMap = async (position: Location): Promise<string> => {
+  console.log('getAddressByAMap start...')
   return new Promise((resolve, reject) => {
     if (position) {
+      if (!window?.AMap) {
+        console.error('getAddressByAMap fail: AMap is undefinded')
+        resolve('')
+        return
+      }
       new window.AMap.Geocoder({
         city: '',
         radius: 500
@@ -243,10 +256,10 @@ const getAddressByAmap = async (position: Location): Promise<string> => {
         // debugger
         if (status === 'complete' && result.info === 'OK' && result?.regeocode?.formattedAddress) {
           const address = result.regeocode.formattedAddress || ''
-          console.log(`getAddressByAmap success: ${address}`)
+          console.log(`getAddressByAMap success: ${address}`)
           resolve(address)
         } else {
-          console.error(`getAddressByAmap fail: status = ${status}, result = ${result}`)
+          console.error(`getAddressByAMap fail: status = ${status}, result = ${result}`)
           resolve('')
         }
       })
@@ -258,10 +271,9 @@ const getAddressByAmap = async (position: Location): Promise<string> => {
 const getIPLocationByTMap = async (ip?: string): Promise<Location> => {
   console.log('getIPLocationByTMap start...')
   return new Promise((resolve, reject) => {
-    const ipLocation = new window.TMap.service.IPLocation()
     const params = ip ? { ip } : {}
-    ipLocation
-      .locate(params)
+    new window.TMap.service.IPLocation()
+      .locate({ ...params, servicesk: mapService.secretkey })
       .then((res: any) => {
         const result = {
           longitude: res.result.location.lng.toString(),
@@ -283,14 +295,12 @@ const getAddressByTMap = async (position: Location): Promise<string> => {
   console.log('getAddressByTMap start...')
   return new Promise((resolve, reject) => {
     if (position) {
-      const location = new window.TMap.LatLng(position.latitude, position.longitude)
-      // console.log(position)
-      // console.log(location)
       // debugger
       new window.TMap.service.Geocoder()
         .getAddress({
-          location,
-          getPoi: false
+          location: new window.TMap.LatLng(position.latitude, position.longitude),
+          getPoi: false,
+          servicesk: mapService.secretkey
         })
         .then((res: any) => {
           // console.log(res)
@@ -432,6 +442,7 @@ const getAddressByBmap = async (position: Location): Promise<string> => {
         resolve(address)
       } else {
         console.error('getAddressByBmap fail')
+        // console.error(result)
         resolve('')
       }
     })
@@ -453,13 +464,14 @@ const getLocationPromise = async (isuseiplocarion = false): Promise<Location> =>
 
   if (!location) {
     if (mapService.type === 'amap') {
-      location = await getLocationByAmap()
-      if (!location && isuseiplocarion) {
-        location = await getCityLocationByAmap()
-      }
+      location = await getLocationByAMap()
       if (!location && isuseiplocarion) {
-        location = await getIPLocationByIpaas()
+        location = await getCityLocationByAMap()
       }
+      // 改成不使用ipaas了
+      // if (!location && isuseiplocarion) {
+      //   location = await getIPLocationByIpaas()
+      // }
     } else if (mapService.type === 'tencent' && isuseiplocarion) {
       location = await getIPLocationByTMap()
     } else if (mapService.type === 'baidu') {
@@ -478,6 +490,20 @@ const getLocationPromise = async (isuseiplocarion = false): Promise<Location> =>
     }
   }
 
+  // if (location) {
+  //   for (let i = 0, len = 5000; i < len; i++) {
+  //     // location.latitude = (Number(location.latitude) + 0.02).toString()
+  //     location.longitude = (Number(location.longitude) + 0.002).toString()
+  //     await getAddress(location)
+  //     .then((res: any) => {
+  //       console.log(res)
+  //     }).catch((err: any) => {
+  //       console.error(err)
+  //     })
+  //     await delay(300)
+  //   }
+  // }
+
   if (location && !location.address) {
     location.address = (await getAddress(location)) || '经纬度获取成功，但地址获取失败。'
   }
@@ -519,12 +545,11 @@ const getAddress = async (position: Location): Promise<string> => {
 
   if (!address) {
     if (mapService.type === 'amap') {
-      address = await getAddressByAmap(position)
-
-      if (!address) {
-        // 如果不设置安全秘钥的话 js-api的逆地址查询不成功 返回 INVALID_USER_SCODE 改成用ipaas服务查询
-        address = await getAddressByIpaas(position)
-      }
+      address = await getAddressByAMap(position)
+      // if (!address) {
+      //   // 如果不设置安全秘钥的话 js-api的逆地址查询不成功 返回 INVALID_USER_SCODE 改成用ipaas服务查询
+      //   address = await getAddressByIpaas(position)
+      // }
     } else if (mapService.type === 'tencent') {
       address = await getAddressByTMap(position)
     } else if (mapService.type === 'baidu') {

package/src/tenantSetting.ts

@@ -60,13 +60,31 @@ class TenantSetting {
     //   }
     // }
 
-    // tenantsetting.lbssetting.setting.type = 'amap'
-    // tenantsetting.lbssetting.setting.key.web = '1993ac213d2f4675ac1bffb1b03ef1f0'
-    // tenantsetting.lbssetting.setting.secretkey.web = '816fe46b7b7bce145940b93c1e4818fa'
+    // // 高德地图key配置错误
+    // // 1 如果是key格式不对 那么没返回promise 连window.AMap都拿不到 地图和都不能用
+    // // 1 如果是key对式对 但key不对 有返回 window.AMap 但api定位调用失败 地图可以渲染空白地图
 
-    // // tenantsetting.lbssetting.setting.type = 'tencent'
-    // // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT'
+    // // // 高德地图公司key
+    // // tenantsetting.lbssetting.setting.type = 'amap'
+    // // tenantsetting.lbssetting.setting.key.web = '1993ac213d2f4675ac1bffb1b03ef1f0'
+    // // tenantsetting.lbssetting.setting.secretkey.web = '816fe46b7b7bce145940b93c1e4818fa'
 
+    // // // 高德地图个人key
+    // // tenantsetting.lbssetting.setting.type = 'amap'
+    // // tenantsetting.lbssetting.setting.key.web = 'e4d25fe4661a34198c4e6f79abe9afac'
+    // // tenantsetting.lbssetting.setting.secretkey.web = 'a6b674affd9a3278c68602cf7ba02fcb'
+
+    // // tencent地图key配置错误
+    // // 1 如果是地图 会在地图上明确文字提示 鉴权失败，请传入正确的key
+    // // 2 如果是调用定位等api 会返回 catch 和详细的错误信息
+    // // getIPLocationByTMap fail: {"status":311,"message":"key格式错误","request_id":"ccedb04fd95e4f3f9cd45cfbad729d10","id":"cbm919vjdj0"}
+    // // getIPLocationByTMap fail: {"status":190,"message":"无效的key","request_id":"b6ca9d0749eb4c91a47db9412b1253ca","id":"cbm919wxo40"}
+    // tenantsetting.lbssetting.setting.type = 'tencent'
+    // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT'
+    // tenantsetting.lbssetting.setting.secretkey.web = 'zowvV5I2pSxqgGb2Sgr1x62HGXbqdxT0'
+
+    // // 百度地图key配置错误alert以下信息
+    // // 您提供的密钥不是有效的百度LBS开放平台密钥，或此密钥未对本应用的百度地图JavaScriptAPI授权。您可以访问如下网址了解如何获取有效的密钥：http://lbsyun.baidu.com/apiconsole/key#。
     // // tenantsetting.lbssetting.setting.type = 'baidu'
     // // tenantsetting.lbssetting.setting.key.web = '7r3bsPeQqJ74vsxf3EOXg7C1AM4lOWA1'
 

package/src/types/index.d.ts

@@ -99,6 +99,11 @@ export const getLocation: () => Promise<{
   [propName: string]: any
 } | null>
 export const getDistance: (p1: [number, number], p2: [number, number]) => Promise<any>
+export const getAddress: (location: {
+  longitude: string
+  latitude: string
+  [propName: string]: any
+}) => Promise<string>
 export const spuAxios: any
 export const apaasAxios: any
 export const axios: any