@smart100/spu-web-plugin 1.0.24 → 1.0.25-beta.2

package/dist/spu-web-plugin.mjs

@@ -1,4 +1,4 @@
-var version = "1.0.24";
+var version = "1.0.25-beta.2";
 
 /** Detect free variable `global` from Node.js. */
 var freeGlobal$2 = typeof global == 'object' && global && global.Object === Object && global;
@@ -17770,8 +17770,24 @@ var getLocationByNative = /*#__PURE__*/function () {
                 var result = {
                   longitude: res.longitude.toString(),
                   latitude: res.latitude.toString(),
-                  address: res.address || ''
+                  address: res.address || '',
+                  // poiname: res.poiname || '',
+                  regionid: res.regionid || '',
+                  country: res.country || '',
+                  province: res.province || '',
+                  city: res.city || '',
+                  district: res.district || '',
+                  street: res.street || '',
+                  number: res.number || '',
+                  detailaddr: res.detailaddr || ''
+                  // poiid: res.poiid || '',
+                  // poitypename: res.poitypename || '',
+                  // poitypecode: res.poitypecode || '',
+                  // phonenumber: res.phonenumber || '',
+                  // signboard: res.signboard || '',
+                  // maptype: res.maptype || '',
                 };
+
                 console.log("getLocationByNative success: ".concat(JSON.stringify(result)));
                 resolve(result);
               } else {
@@ -17868,10 +17884,54 @@ var getLocationByAMap = /*#__PURE__*/function () {
                   lat = _res$position.lat;
                 var result = {
                   longitude: lng.toString(),
-                  latitude: lat.toString()
+                  latitude: lat.toString(),
+                  address: '',
+                  // poiname: '',
+                  regionid: '',
+                  country: '',
+                  province: '',
+                  city: '',
+                  district: '',
+                  street: '',
+                  number: '',
+                  detailaddr: ''
+                  // poiid: '',   // 图商的id
+                  // poitypename: '', // 图商的poi类型名称
+                  // poitypecode: '', // 图商的poi类型code
+                  // phonenumber: '',
+                  // signboard: '',
+                  // maptype: "amap"
                 };
-                console.log("getLocationByAMap success: ".concat(JSON.stringify(result)));
-                resolve(result);
+                // 通过经纬度获取详细地址信息
+                getAddressDetailByAMap({
+                  longitude: lng.toString(),
+                  latitude: lat.toString()
+                }).then(function (addrssDetail) {
+                  if (addrssDetail) {
+                    result.address = addrssDetail.addressDetail.address;
+                    // result.poiname = addrssDetail.addressDetail.poiname
+                    result.regionid = addrssDetail.addressDetail.regionid;
+                    result.country = addrssDetail.addressDetail.country;
+                    result.province = addrssDetail.addressDetail.province;
+                    result.city = addrssDetail.addressDetail.city;
+                    result.district = addrssDetail.addressDetail.district;
+                    result.street = addrssDetail.addressDetail.street;
+                    result.number = addrssDetail.addressDetail.number;
+                    result.detailaddr = addrssDetail.addressDetail.detailaddr;
+                    // result.poiid = addrssDetail.addressDetail.poiid
+                    // result.poitypename = addrssDetail.addressDetail.poitypename
+                    // result.poitypecode = addrssDetail.addressDetail.poitypecode
+                    // result.phonenumber = addrssDetail.addressDetail.phonenumber
+                    // result.signboard = addrssDetail.addressDetail.signboard
+                  }
+
+                  console.log("getLocationByAMap success: ".concat(JSON.stringify(result)));
+                  resolve(result);
+                })["catch"](function (err) {
+                  console.error(err);
+                  console.error('getLocationByAMap fail');
+                  resolve(null);
+                });
               } else {
                 console.error('getLocationByAMap fail');
                 resolve(null);
@@ -17913,10 +17973,56 @@ var getCityLocationByAMap = /*#__PURE__*/function () {
                 var lat = res.position[1].toString();
                 var result = {
                   longitude: lng.toString(),
-                  latitude: lat.toString()
+                  latitude: lat.toString(),
+                  address: '',
+                  // poiname: '',
+                  regionid: '',
+                  country: '',
+                  province: '',
+                  city: '',
+                  district: '',
+                  street: '',
+                  number: '',
+                  detailaddr: ''
+                  // poiid: '',   // 图商的id
+                  // poitypename: '', // 图商的poi类型名称
+                  // poitypecode: '', // 图商的poi类型code
+                  // phonenumber: '',
+                  // signboard: '',
+                  // maptype: "amap"
                 };
+
                 console.log("getCityLocationByAMap success: ".concat(JSON.stringify(result)));
-                resolve(result);
+                // 通过经纬度获取详细地址信息
+                getAddressDetailByAMap({
+                  longitude: lng.toString(),
+                  latitude: lat.toString()
+                }).then(function (addrssDetail) {
+                  if (addrssDetail) {
+                    result.address = addrssDetail.addressDetail.address;
+                    // result.poiname = addrssDetail.addressDetail.poiname
+                    result.regionid = addrssDetail.addressDetail.regionid;
+                    result.country = addrssDetail.addressDetail.country;
+                    result.province = addrssDetail.addressDetail.province;
+                    result.city = addrssDetail.addressDetail.city;
+                    result.district = addrssDetail.addressDetail.district;
+                    result.street = addrssDetail.addressDetail.street;
+                    result.number = addrssDetail.addressDetail.number;
+                    result.detailaddr = addrssDetail.addressDetail.detailaddr;
+                    // result.poiid = addrssDetail.addressDetail.poiid
+                    // result.poitypename = addrssDetail.addressDetail.poitypename
+                    // result.poitypecode = addrssDetail.addressDetail.poitypecode
+                    // result.phonenumber = addrssDetail.addressDetail.phonenumber
+                    // result.signboard = addrssDetail.addressDetail.signboard
+                  }
+
+                  console.log("getLocationByAMap success: ".concat(JSON.stringify(result)));
+                  resolve(result);
+                })["catch"](function (err) {
+                  console.error(err);
+                  console.error('getLocationByAMap fail');
+                  resolve(null);
+                });
               } else {
                 console.error('getCityLocationByAMap fail');
                 resolve(null);
@@ -17977,16 +18083,112 @@ var getAddressByAMap = /*#__PURE__*/function () {
     return _ref8.apply(this, arguments);
   };
 }();
-// 腾讯ip定位：通过终端设备IP地址获取其当前所在地理位置，精确到市级，常用于显示当地城市天气预报、初始化用户城市等非精确定位场景。
-var getIPLocationByTMap = /*#__PURE__*/function () {
-  var _ref9 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee9(ip) {
+// 高德逆地址解析详细数据
+var getAddressDetailByAMap = /*#__PURE__*/function () {
+  var _ref9 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee9(position) {
     return _regeneratorRuntime$1().wrap(function _callee9$(_context9) {
       while (1) switch (_context9.prev = _context9.next) {
         case 0:
-          console.log('getIPLocationByTMap start...');
+          console.log('getAddressDetailByAMap start...');
           return _context9.abrupt("return", new Promise(function (resolve, reject) {
             var _window4;
-            if (!((_window4 = window) !== null && _window4 !== void 0 && _window4.TMap)) {
+            if (!((_window4 = window) !== null && _window4 !== void 0 && _window4.AMap)) {
+              console.error('getAddressDetailByAMap fail: AMap is undefinded');
+              resolve(null);
+              return;
+            }
+            if (position) {
+              new window.AMap.Geocoder({
+                radius: 500,
+                extensions: 'all'
+              }).getAddress([position.longitude, position.latitude], function (status, result) {
+                // console.log(status)
+                // console.log(result)
+                if (status === 'complete' && result.info === 'OK' && result !== null && result !== void 0 && result.regeocode) {
+                  console.log("getAddressByAMap success:", result.regeocode);
+                  var addressComponent = result.regeocode.addressComponent || {};
+                  // 确保 country 字段被正确获取
+                  // 直接从高德地图 API 返回的数据中获取 country 字段
+                  var country = addressComponent.country || '';
+                  var aois = result.regeocode.aois || [];
+                  var pois = result.regeocode.pois || [];
+                  if (Array.isArray(addressComponent.city)) {
+                    addressComponent.city = addressComponent.city.join(',');
+                  }
+                  var street = addressComponent.street || (addressComponent.streetNumber && isObject$4(addressComponent.streetNumber) ? addressComponent.streetNumber.street : '');
+                  var number = addressComponent.streetNumber && isObject$4(addressComponent.streetNumber) ? addressComponent.streetNumber.number : addressComponent.streetNumber || '';
+                  if (Array.isArray(street)) {
+                    street = street.join(',');
+                  }
+                  if (Array.isArray(number)) {
+                    number = number.join(',');
+                  }
+                  var poiname = aois && aois[0] && aois[0].name || '';
+                  var detailAddr = street + number + poiname || '';
+                  var address = (addressComponent.province || '') + (addressComponent.city || '') + (addressComponent.district || '') + (detailAddr || '');
+                  var tmpFullDistrinct = (addressComponent.province || '') + (addressComponent.city || '') + (addressComponent.district || '');
+                  if (!address.endsWith(poiname)) {
+                    address = address + poiname;
+                  }
+                  var selectedDetailAddr = detailAddr || '';
+                  // 去除前面的行政区域
+                  if (selectedDetailAddr.startsWith(tmpFullDistrinct)) {
+                    selectedDetailAddr = selectedDetailAddr.slice(tmpFullDistrinct.length);
+                  }
+                  pois && pois[0] && pois[0].id;
+                  pois && pois[0] && pois[0].type;
+                  var addressDetail = {
+                    regeocode: result.regeocode,
+                    addressDetail: {
+                      longitude: position.longitude,
+                      latitude: position.latitude,
+                      address: address || '',
+                      // poiname: poiname || '',
+                      regionid: addressComponent.adcode || '',
+                      country: country || '',
+                      province: addressComponent.province || '',
+                      city: addressComponent.city || '',
+                      district: addressComponent.district || addressComponent.township || '',
+                      street: street || '',
+                      number: number || '',
+                      detailaddr: selectedDetailAddr || ''
+                      // poiid: poiid || '',
+                      // poitypename: poitypename || '',
+                      // poitypecode: '',
+                      // phonenumber: getPoiPhoneNumber(pois && pois[0] && pois[0].tel),
+                      // signboard: '',
+                      // maptype: 'amap',
+                    }
+                  };
+
+                  resolve(addressDetail);
+                } else {
+                  console.error("getAddressByAMap fail: status = ".concat(status, ", result = ").concat(result));
+                  resolve(null);
+                }
+              });
+            }
+          }));
+        case 2:
+        case "end":
+          return _context9.stop();
+      }
+    }, _callee9);
+  }));
+  return function getAddressDetailByAMap(_x6) {
+    return _ref9.apply(this, arguments);
+  };
+}();
+// 腾讯ip定位：通过终端设备IP地址获取其当前所在地理位置，精确到市级，常用于显示当地城市天气预报、初始化用户城市等非精确定位场景。
+var getIPLocationByTMap = /*#__PURE__*/function () {
+  var _ref10 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee10(ip) {
+    return _regeneratorRuntime$1().wrap(function _callee10$(_context10) {
+      while (1) switch (_context10.prev = _context10.next) {
+        case 0:
+          console.log('getIPLocationByTMap start...');
+          return _context10.abrupt("return", new Promise(function (resolve, reject) {
+            var _window5;
+            if (!((_window5 = window) !== null && _window5 !== void 0 && _window5.TMap)) {
               console.error('getIPLocationByTMap fail: TMap is undefinded');
               resolve(null);
               return;
@@ -18011,24 +18213,24 @@ var getIPLocationByTMap = /*#__PURE__*/function () {
           }));
         case 2:
         case "end":
-          return _context9.stop();
+          return _context10.stop();
       }
-    }, _callee9);
+    }, _callee10);
   }));
-  return function getIPLocationByTMap(_x6) {
-    return _ref9.apply(this, arguments);
+  return function getIPLocationByTMap(_x7) {
+    return _ref10.apply(this, arguments);
   };
 }();
 // 腾讯逆地址解析
 var getAddressByTMap = /*#__PURE__*/function () {
-  var _ref10 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee10(position) {
-    return _regeneratorRuntime$1().wrap(function _callee10$(_context10) {
-      while (1) switch (_context10.prev = _context10.next) {
+  var _ref11 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee11(position) {
+    return _regeneratorRuntime$1().wrap(function _callee11$(_context11) {
+      while (1) switch (_context11.prev = _context11.next) {
         case 0:
           console.log('getAddressByTMap start...');
-          return _context10.abrupt("return", new Promise(function (resolve, reject) {
-            var _window5;
-            if (!((_window5 = window) !== null && _window5 !== void 0 && _window5.TMap)) {
+          return _context11.abrupt("return", new Promise(function (resolve, reject) {
+            var _window6;
+            if (!((_window6 = window) !== null && _window6 !== void 0 && _window6.TMap)) {
               console.error('getAddressByTMap fail: TMap is undefinded');
               resolve('');
               return;
@@ -18055,41 +18257,41 @@ var getAddressByTMap = /*#__PURE__*/function () {
           }));
         case 2:
         case "end":
-          return _context10.stop();
+          return _context11.stop();
       }
-    }, _callee10);
+    }, _callee11);
   }));
-  return function getAddressByTMap(_x7) {
-    return _ref10.apply(this, arguments);
+  return function getAddressByTMap(_x8) {
+    return _ref11.apply(this, arguments);
   };
 }();
 // 百度浏览器定位
 var getLocationByBMap = /*#__PURE__*/function () {
-  var _ref11 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee12() {
-    return _regeneratorRuntime$1().wrap(function _callee12$(_context12) {
-      while (1) switch (_context12.prev = _context12.next) {
+  var _ref12 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee13() {
+    return _regeneratorRuntime$1().wrap(function _callee13$(_context13) {
+      while (1) switch (_context13.prev = _context13.next) {
         case 0:
           console.log('getLocationByBMap start...');
-          return _context12.abrupt("return", new Promise(function (resolve, reject) {
-            var _window6;
-            if (!((_window6 = window) !== null && _window6 !== void 0 && _window6.BMap)) {
+          return _context13.abrupt("return", new Promise(function (resolve, reject) {
+            var _window7;
+            if (!((_window7 = window) !== null && _window7 !== void 0 && _window7.BMap)) {
               console.error('getLocationByBMap fail: BMap is undefinded');
               resolve(null);
               return;
             }
             new window.BMap.Geolocation().getCurrentPosition( /*#__PURE__*/function () {
-              var _ref12 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee11(res) {
+              var _ref13 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee12(res) {
                 var lng, lat, result;
-                return _regeneratorRuntime$1().wrap(function _callee11$(_context11) {
-                  while (1) switch (_context11.prev = _context11.next) {
+                return _regeneratorRuntime$1().wrap(function _callee12$(_context12) {
+                  while (1) switch (_context12.prev = _context12.next) {
                     case 0:
                       if (res) {
-                        _context11.next = 4;
+                        _context12.next = 4;
                         break;
                       }
                       console.error('getLocationByBMap fail');
                       resolve(null);
-                      return _context11.abrupt("return");
+                      return _context12.abrupt("return");
                     case 4:
                       // 初始化已经指定 window.BMap.coordType = 'BMAP_COORD_GCJ02' 定位返回的定位信息，外层[latitude,longitude]依然是BD09，然后point里面的是GCJ02
                       // {
@@ -18132,12 +18334,12 @@ var getLocationByBMap = /*#__PURE__*/function () {
                       resolve(result);
                     case 9:
                     case "end":
-                      return _context11.stop();
+                      return _context12.stop();
                   }
-                }, _callee11);
+                }, _callee12);
               }));
-              return function (_x8) {
-                return _ref12.apply(this, arguments);
+              return function (_x9) {
+                return _ref13.apply(this, arguments);
               };
             }(), {
               enableHighAccuracy: true
@@ -18145,49 +18347,49 @@ var getLocationByBMap = /*#__PURE__*/function () {
           }));
         case 2:
         case "end":
-          return _context12.stop();
+          return _context13.stop();
       }
-    }, _callee12);
+    }, _callee13);
   }));
   return function getLocationByBMap() {
-    return _ref11.apply(this, arguments);
+    return _ref12.apply(this, arguments);
   };
 }();
 // 百度城市定位
 var getCityLocationByBMap = /*#__PURE__*/function () {
-  var _ref13 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee14() {
-    return _regeneratorRuntime$1().wrap(function _callee14$(_context14) {
-      while (1) switch (_context14.prev = _context14.next) {
+  var _ref14 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee15() {
+    return _regeneratorRuntime$1().wrap(function _callee15$(_context15) {
+      while (1) switch (_context15.prev = _context15.next) {
         case 0:
           console.log('getCityLocationByBMap start...');
-          return _context14.abrupt("return", new Promise(function (resolve, reject) {
-            var _window7;
-            if (!((_window7 = window) !== null && _window7 !== void 0 && _window7.BMap)) {
+          return _context15.abrupt("return", new Promise(function (resolve, reject) {
+            var _window8;
+            if (!((_window8 = window) !== null && _window8 !== void 0 && _window8.BMap)) {
               console.error('getCityLocationByBMap fail: BMap is undefinded');
               resolve(null);
               return;
             }
             new window.BMap.LocalCity().get( /*#__PURE__*/function () {
-              var _ref14 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee13(res) {
+              var _ref15 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee14(res) {
                 var lng, lat, point, result;
-                return _regeneratorRuntime$1().wrap(function _callee13$(_context13) {
-                  while (1) switch (_context13.prev = _context13.next) {
+                return _regeneratorRuntime$1().wrap(function _callee14$(_context14) {
+                  while (1) switch (_context14.prev = _context14.next) {
                     case 0:
                       // console.log(res)
                       // debugger
                       lng = res.center.lng.toString();
                       lat = res.center.lat.toString();
                       if (!(lng && lat)) {
-                        _context13.next = 11;
+                        _context14.next = 11;
                         break;
                       }
-                      _context13.next = 5;
+                      _context14.next = 5;
                       return BMapTransformBD09ToGCJ02Points([{
                         lng: lng,
                         lat: lat
                       }]);
                     case 5:
-                      point = _context13.sent;
+                      point = _context14.sent;
                       // console.log(point)
                       // debugger
                       result = {
@@ -18196,61 +18398,61 @@ var getCityLocationByBMap = /*#__PURE__*/function () {
                       };
                       console.log("getCityLocationByBMap success: ".concat(JSON.stringify(result)));
                       resolve(result);
-                      _context13.next = 13;
+                      _context14.next = 13;
                       break;
                     case 11:
                       console.error('getCityLocationByBMap fail');
                       resolve(null);
                     case 13:
                     case "end":
-                      return _context13.stop();
+                      return _context14.stop();
                   }
-                }, _callee13);
+                }, _callee14);
               }));
-              return function (_x9) {
-                return _ref14.apply(this, arguments);
+              return function (_x10) {
+                return _ref15.apply(this, arguments);
               };
             }());
           }));
         case 2:
         case "end":
-          return _context14.stop();
+          return _context15.stop();
       }
-    }, _callee14);
+    }, _callee15);
   }));
   return function getCityLocationByBMap() {
-    return _ref13.apply(this, arguments);
+    return _ref14.apply(this, arguments);
   };
 }();
 // 百度逆地址解析
 var getAddressByBmap = /*#__PURE__*/function () {
-  var _ref15 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee16(position) {
-    return _regeneratorRuntime$1().wrap(function _callee16$(_context16) {
-      while (1) switch (_context16.prev = _context16.next) {
+  var _ref16 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee17(position) {
+    return _regeneratorRuntime$1().wrap(function _callee17$(_context17) {
+      while (1) switch (_context17.prev = _context17.next) {
         case 0:
           console.log('getAddressByBmap start...');
-          return _context16.abrupt("return", new Promise( /*#__PURE__*/function () {
-            var _ref16 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee15(resolve, reject) {
-              var _window8;
+          return _context17.abrupt("return", new Promise( /*#__PURE__*/function () {
+            var _ref17 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee16(resolve, reject) {
+              var _window9;
               var point;
-              return _regeneratorRuntime$1().wrap(function _callee15$(_context15) {
-                while (1) switch (_context15.prev = _context15.next) {
+              return _regeneratorRuntime$1().wrap(function _callee16$(_context16) {
+                while (1) switch (_context16.prev = _context16.next) {
                   case 0:
-                    if ((_window8 = window) !== null && _window8 !== void 0 && _window8.BMap) {
-                      _context15.next = 4;
+                    if ((_window9 = window) !== null && _window9 !== void 0 && _window9.BMap) {
+                      _context16.next = 4;
                       break;
                     }
                     console.error('getAddressByBmap fail: BMap is undefinded');
                     resolve('');
-                    return _context15.abrupt("return");
+                    return _context16.abrupt("return");
                   case 4:
                     if (position) {
-                      _context15.next = 8;
+                      _context16.next = 8;
                       break;
                     }
                     console.error('getAddressByBmap fail');
                     resolve('');
-                    return _context15.abrupt("return");
+                    return _context16.abrupt("return");
                   case 8:
                     // // 把 GCJ02 转化为百度 BD09 地址
                     // const points: any = await transformGCJ02ToBD09Points([{
@@ -18275,104 +18477,104 @@ var getAddressByBmap = /*#__PURE__*/function () {
                     });
                   case 10:
                   case "end":
-                    return _context15.stop();
+                    return _context16.stop();
                 }
-              }, _callee15);
+              }, _callee16);
             }));
-            return function (_x11, _x12) {
-              return _ref16.apply(this, arguments);
+            return function (_x12, _x13) {
+              return _ref17.apply(this, arguments);
             };
           }()));
         case 2:
         case "end":
-          return _context16.stop();
+          return _context17.stop();
       }
-    }, _callee16);
+    }, _callee17);
   }));
-  return function getAddressByBmap(_x10) {
-    return _ref15.apply(this, arguments);
+  return function getAddressByBmap(_x11) {
+    return _ref16.apply(this, arguments);
   };
 }();
 var getLocationPromise = /*#__PURE__*/function () {
-  var _ref17 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee17() {
-    var _window9;
+  var _ref18 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee18() {
+    var _window10;
     var isuseiplocation,
       location,
-      _args17 = arguments;
-    return _regeneratorRuntime$1().wrap(function _callee17$(_context17) {
-      while (1) switch (_context17.prev = _context17.next) {
+      _args18 = arguments;
+    return _regeneratorRuntime$1().wrap(function _callee18$(_context18) {
+      while (1) switch (_context18.prev = _context18.next) {
         case 0:
-          isuseiplocation = _args17.length > 0 && _args17[0] !== undefined ? _args17[0] : false;
+          isuseiplocation = _args18.length > 0 && _args18[0] !== undefined ? _args18[0] : false;
           location = null; // 在 SPU 容器里使用 Native-API 的定位
-          if (!((_window9 = window) !== null && _window9 !== void 0 && (_window9 = _window9.Native) !== null && _window9 !== void 0 && _window9.getLocation)) {
-            _context17.next = 6;
+          if (!((_window10 = window) !== null && _window10 !== void 0 && (_window10 = _window10.Native) !== null && _window10 !== void 0 && _window10.getLocation)) {
+            _context18.next = 6;
             break;
           }
-          _context17.next = 5;
+          _context18.next = 5;
           return getLocationByNative();
         case 5:
-          location = _context17.sent;
+          location = _context18.sent;
         case 6:
           if (location) {
-            _context17.next = 31;
+            _context18.next = 31;
             break;
           }
           if (!(mapService.type === 'amap')) {
-            _context17.next = 17;
+            _context18.next = 17;
             break;
           }
-          _context17.next = 10;
+          _context18.next = 10;
           return getLocationByAMap();
         case 10:
-          location = _context17.sent;
+          location = _context18.sent;
           if (!(!location && isuseiplocation)) {
-            _context17.next = 15;
+            _context18.next = 15;
             break;
           }
-          _context17.next = 14;
+          _context18.next = 14;
           return getCityLocationByAMap();
         case 14:
-          location = _context17.sent;
+          location = _context18.sent;
         case 15:
-          _context17.next = 31;
+          _context18.next = 31;
           break;
         case 17:
           if (!(mapService.type === 'tencent' && isuseiplocation)) {
-            _context17.next = 23;
+            _context18.next = 23;
             break;
           }
-          _context17.next = 20;
+          _context18.next = 20;
           return getIPLocationByTMap();
         case 20:
-          location = _context17.sent;
-          _context17.next = 31;
+          location = _context18.sent;
+          _context18.next = 31;
           break;
         case 23:
           if (!(mapService.type === 'baidu')) {
-            _context17.next = 31;
+            _context18.next = 31;
             break;
           }
-          _context17.next = 26;
+          _context18.next = 26;
           return getLocationByBMap();
         case 26:
-          location = _context17.sent;
+          location = _context18.sent;
           if (!(!location && isuseiplocation)) {
-            _context17.next = 31;
+            _context18.next = 31;
             break;
           }
-          _context17.next = 30;
+          _context18.next = 30;
           return getCityLocationByBMap();
         case 30:
-          location = _context17.sent;
+          location = _context18.sent;
         case 31:
           if (location) {
-            _context17.next = 35;
+            _context18.next = 35;
             break;
           }
-          _context17.next = 34;
+          _context18.next = 34;
           return getLocationByNavigator();
         case 34:
-          location = _context17.sent;
+          location = _context18.sent;
         case 35:
           // location = null
           // 开发模式下为了方便测试提供虚拟定位
@@ -18396,30 +18598,30 @@ var getLocationPromise = /*#__PURE__*/function () {
           //   }
           // }
           if (!(location && !location.address)) {
-            _context17.next = 43;
+            _context18.next = 43;
             break;
           }
-          _context17.next = 39;
+          _context18.next = 39;
           return getAddress(location);
         case 39:
-          _context17.t0 = _context17.sent;
-          if (_context17.t0) {
-            _context17.next = 42;
+          _context18.t0 = _context18.sent;
+          if (_context18.t0) {
+            _context18.next = 42;
             break;
           }
-          _context17.t0 = '经纬度获取成功，但地址获取失败。';
+          _context18.t0 = '经纬度获取成功，但地址获取失败。';
         case 42:
-          location.address = _context17.t0;
+          location.address = _context18.t0;
         case 43:
-          return _context17.abrupt("return", location);
+          return _context18.abrupt("return", location);
         case 44:
         case "end":
-          return _context17.stop();
+          return _context18.stop();
       }
-    }, _callee17);
+    }, _callee18);
   }));
   return function getLocationPromise() {
-    return _ref17.apply(this, arguments);
+    return _ref18.apply(this, arguments);
   };
 }();
 // WGS84 GCJ-02 BD-09 坐标系
@@ -18429,104 +18631,104 @@ function getLocation() {
   return _getLocation.apply(this, arguments);
 } // 逆地址解析
 function _getLocation() {
-  _getLocation = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee20() {
+  _getLocation = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee21() {
     var isuseiplocation,
       locationRes,
-      _args20 = arguments;
-    return _regeneratorRuntime$1().wrap(function _callee20$(_context20) {
-      while (1) switch (_context20.prev = _context20.next) {
+      _args21 = arguments;
+    return _regeneratorRuntime$1().wrap(function _callee21$(_context21) {
+      while (1) switch (_context21.prev = _context21.next) {
         case 0:
-          isuseiplocation = _args20.length > 0 && _args20[0] !== undefined ? _args20[0] : false;
-          _context20.next = 3;
+          isuseiplocation = _args21.length > 0 && _args21[0] !== undefined ? _args21[0] : false;
+          _context21.next = 3;
           return mapService.init();
         case 3:
           if (!(datetime && Date.now() - datetime <= cachetime && lastLocation && !runing)) {
-            _context20.next = 5;
+            _context21.next = 5;
             break;
           }
-          return _context20.abrupt("return", cloneDeep$1(lastLocation));
+          return _context21.abrupt("return", cloneDeep$1(lastLocation));
         case 5:
           if (!(runing && locationPromise)) {
-            _context20.next = 7;
+            _context21.next = 7;
             break;
           }
-          return _context20.abrupt("return", locationPromise);
+          return _context21.abrupt("return", locationPromise);
         case 7:
           // console.log('runing')
           runing = true;
           locationPromise = getLocationPromise(isuseiplocation);
-          _context20.next = 11;
+          _context21.next = 11;
           return locationPromise;
         case 11:
-          locationRes = _context20.sent;
+          locationRes = _context21.sent;
           runing = false;
           if (locationRes) {
             datetime = Date.now();
             lastLocation = locationRes;
           }
-          return _context20.abrupt("return", locationRes);
+          return _context21.abrupt("return", locationRes);
         case 15:
         case "end":
-          return _context20.stop();
+          return _context21.stop();
       }
-    }, _callee20);
+    }, _callee21);
   }));
   return _getLocation.apply(this, arguments);
 }
 var getAddress = /*#__PURE__*/function () {
-  var _ref18 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee18(position) {
+  var _ref19 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee19(position) {
     var address;
-    return _regeneratorRuntime$1().wrap(function _callee18$(_context18) {
-      while (1) switch (_context18.prev = _context18.next) {
+    return _regeneratorRuntime$1().wrap(function _callee19$(_context19) {
+      while (1) switch (_context19.prev = _context19.next) {
         case 0:
-          _context18.next = 2;
+          _context19.next = 2;
           return mapService.init();
         case 2:
           address = '';
           if (address) {
-            _context18.next = 20;
+            _context19.next = 20;
             break;
           }
           if (!(mapService.type === 'amap')) {
-            _context18.next = 10;
+            _context19.next = 10;
             break;
           }
-          _context18.next = 7;
+          _context19.next = 7;
           return getAddressByAMap(position);
         case 7:
-          address = _context18.sent;
-          _context18.next = 20;
+          address = _context19.sent;
+          _context19.next = 20;
           break;
         case 10:
           if (!(mapService.type === 'tencent')) {
-            _context18.next = 16;
+            _context19.next = 16;
             break;
           }
-          _context18.next = 13;
+          _context19.next = 13;
           return getAddressByTMap(position);
         case 13:
-          address = _context18.sent;
-          _context18.next = 20;
+          address = _context19.sent;
+          _context19.next = 20;
           break;
         case 16:
           if (!(mapService.type === 'baidu')) {
-            _context18.next = 20;
+            _context19.next = 20;
             break;
           }
-          _context18.next = 19;
+          _context19.next = 19;
           return getAddressByBmap(position);
         case 19:
-          address = _context18.sent;
+          address = _context19.sent;
         case 20:
-          return _context18.abrupt("return", address);
+          return _context19.abrupt("return", address);
         case 21:
         case "end":
-          return _context18.stop();
+          return _context19.stop();
       }
-    }, _callee18);
+    }, _callee19);
   }));
-  return function getAddress(_x13) {
-    return _ref18.apply(this, arguments);
+  return function getAddress(_x14) {
+    return _ref19.apply(this, arguments);
   };
 }();
 // const getDistance = async (p1: [number, number], p2: [number, number]) => {
@@ -18535,10 +18737,10 @@ var getAddress = /*#__PURE__*/function () {
 // }
 // 两个经纬度距离计算
 var getDistance = /*#__PURE__*/function () {
-  var _ref19 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee19(latlng1, latlng2) {
+  var _ref20 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee20(latlng1, latlng2) {
     var lng1, lat1, lng2, lat2, radLat1, radLat2, a, b, s;
-    return _regeneratorRuntime$1().wrap(function _callee19$(_context19) {
-      while (1) switch (_context19.prev = _context19.next) {
+    return _regeneratorRuntime$1().wrap(function _callee20$(_context20) {
+      while (1) switch (_context20.prev = _context20.next) {
         case 0:
           // console.log(latlng1)
           // console.log(latlng2)
@@ -18553,15 +18755,15 @@ var getDistance = /*#__PURE__*/function () {
           s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
           s = s * 6378.137; // EARTH_RADIUS
           s = Math.round(s * 10000) / 10000;
-          return _context19.abrupt("return", s * 1000);
+          return _context20.abrupt("return", s * 1000);
         case 12:
         case "end":
-          return _context19.stop();
+          return _context20.stop();
       }
-    }, _callee19);
+    }, _callee20);
   }));
-  return function getDistance(_x14, _x15) {
-    return _ref19.apply(this, arguments);
+  return function getDistance(_x15, _x16) {
+    return _ref20.apply(this, arguments);
   };
 }();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "1.0.24",
+  "version": "1.0.25-beta.2",
   "description": "",
   "scripts": {
     "dev": "npm run build:types && rollup -c -w",
@@ -29,6 +29,7 @@
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.5",
+    "@rollup/rollup-darwin-x64": "^4.53.3",
     "@types/crypto-js": "^4.2.2",
     "@types/lodash-es": "^4.17.10",
     "@types/node": "^20.8.10",
@@ -52,4 +53,4 @@
     "uuid": "^9.0.1",
     "vconsole": "^3.15.1"
   }
-}
+}

package/src/map/index.ts

@@ -1,10 +1,10 @@
 import { urlquery } from '../urlquery'
-import { cloneDeep } from 'lodash-es'
+import { cloneDeep, isObject } from 'lodash-es'
 import { mapService } from './MapService'
 import { getAMapKey } from './AMapKey'
 import { axios } from '../axios'
 import { delay } from '../utils'
-import { wgs84ToGcj02, BMapTransformBD09ToGCJ02Points } from './utils'
+import { wgs84ToGcj02, BMapTransformBD09ToGCJ02Points, getPoiPhoneNumber } from './utils'
 
 type Location = {
   longitude: string
@@ -39,7 +39,22 @@ const getLocationByNative = async (): Promise<Location> => {
         const result = {
           longitude: res.longitude.toString(),
           latitude: res.latitude.toString(),
-          address: res.address || ''
+          address: res.address || '',
+          // poiname: res.poiname || '',
+          regionid: res.regionid || '',
+          country: res.country || '',
+          province: res.province || '',
+          city: res.city || '',
+          district: res.district || '',
+          street: res.street || '',
+          number: res.number || '',
+          detailaddr: res.detailaddr || '',
+          // poiid: res.poiid || '',
+          // poitypename: res.poitypename || '',
+          // poitypecode: res.poitypecode || '',
+          // phonenumber: res.phonenumber || '',
+          // signboard: res.signboard || '',
+          // maptype: res.maptype || '',
         }
         console.log(`getLocationByNative success: ${JSON.stringify(result)}`)
         resolve(result)
@@ -74,6 +89,7 @@ const getLocationByNavigator = async (): Promise<Location> => {
               latitude: Gcj02.lat.toString(),
               longitude: Gcj02.lng.toString()
             }
+
             console.log(`getLocationByNavigator success: ${JSON.stringify(result)}`)
             resolve(result)
           } else {
@@ -196,10 +212,54 @@ const getLocationByAMap = async (): Promise<Location> => {
         const { lng, lat } = res.position
         const result = {
           longitude: lng.toString(),
-          latitude: lat.toString()
+          latitude: lat.toString(),
+          address: '',
+          // poiname: '',
+          regionid: '',
+          country: '',
+          province: '',
+          city: '',
+          district: '',
+          street: '',
+          number: '',
+          detailaddr: '',
+          // poiid: '',   // 图商的id
+          // poitypename: '', // 图商的poi类型名称
+          // poitypecode: '', // 图商的poi类型code
+          // phonenumber: '',
+          // signboard: '',
+          // maptype: "amap"
         }
-        console.log(`getLocationByAMap success: ${JSON.stringify(result)}`)
-        resolve(result)
+        // 通过经纬度获取详细地址信息
+        getAddressDetailByAMap({
+          longitude: lng.toString(),
+          latitude: lat.toString()
+        }).then((addrssDetail: IAddressDetail | null) => {
+          if (addrssDetail) {
+            result.address = addrssDetail.addressDetail.address
+            // result.poiname = addrssDetail.addressDetail.poiname
+            result.regionid = addrssDetail.addressDetail.regionid
+            result.country = addrssDetail.addressDetail.country
+            result.province = addrssDetail.addressDetail.province
+            result.city = addrssDetail.addressDetail.city
+            result.district = addrssDetail.addressDetail.district
+            result.street = addrssDetail.addressDetail.street
+            result.number = addrssDetail.addressDetail.number
+            result.detailaddr = addrssDetail.addressDetail.detailaddr
+            // result.poiid = addrssDetail.addressDetail.poiid
+            // result.poitypename = addrssDetail.addressDetail.poitypename
+            // result.poitypecode = addrssDetail.addressDetail.poitypecode
+            // result.phonenumber = addrssDetail.addressDetail.phonenumber
+            // result.signboard = addrssDetail.addressDetail.signboard
+          }
+          console.log(`getLocationByAMap success: ${JSON.stringify(result)}`)
+          resolve(result)
+        }).catch((err: any) => {
+          console.error(err)
+          console.error('getLocationByAMap fail')
+          resolve(null)
+        })
+
       } else {
         console.error('getLocationByAMap fail')
         resolve(null)
@@ -228,10 +288,55 @@ const getCityLocationByAMap = async (): Promise<Location> => {
         const lat = res.position[1].toString()
         const result = {
           longitude: lng.toString(),
-          latitude: lat.toString()
+          latitude: lat.toString(),
+          address: '',
+          // poiname: '',
+          regionid: '',
+          country: '',
+          province: '',
+          city: '',
+          district: '',
+          street: '',
+          number: '',
+          detailaddr: '',
+          // poiid: '',   // 图商的id
+          // poitypename: '', // 图商的poi类型名称
+          // poitypecode: '', // 图商的poi类型code
+          // phonenumber: '',
+          // signboard: '',
+          // maptype: "amap"
         }
         console.log(`getCityLocationByAMap success: ${JSON.stringify(result)}`)
-        resolve(result)
+
+        // 通过经纬度获取详细地址信息
+        getAddressDetailByAMap({
+          longitude: lng.toString(),
+          latitude: lat.toString()
+        }).then((addrssDetail: IAddressDetail | null) => {
+          if (addrssDetail) {
+            result.address = addrssDetail.addressDetail.address
+            // result.poiname = addrssDetail.addressDetail.poiname
+            result.regionid = addrssDetail.addressDetail.regionid
+            result.country = addrssDetail.addressDetail.country
+            result.province = addrssDetail.addressDetail.province
+            result.city = addrssDetail.addressDetail.city
+            result.district = addrssDetail.addressDetail.district
+            result.street = addrssDetail.addressDetail.street
+            result.number = addrssDetail.addressDetail.number
+            result.detailaddr = addrssDetail.addressDetail.detailaddr
+            // result.poiid = addrssDetail.addressDetail.poiid
+            // result.poitypename = addrssDetail.addressDetail.poitypename
+            // result.poitypecode = addrssDetail.addressDetail.poitypecode
+            // result.phonenumber = addrssDetail.addressDetail.phonenumber
+            // result.signboard = addrssDetail.addressDetail.signboard
+          }
+          console.log(`getLocationByAMap success: ${JSON.stringify(result)}`)
+          resolve(result)
+        }).catch((err: any) => {
+          console.error(err)
+          console.error('getLocationByAMap fail')
+          resolve(null)
+        })
       } else {
         console.error('getCityLocationByAMap fail')
         resolve(null)
@@ -270,6 +375,127 @@ const getAddressByAMap = async (position: Location): Promise<string> => {
   })
 }
 
+interface IAddressDetail {
+  regeocode: IAny
+  addressDetail: {
+    longitude: string
+    latitude: string
+    address: string
+    // poiname: string
+    regionid: string
+    country: string
+    province: string
+    city: string
+    district: string
+    street: string
+    number: string
+    detailaddr: string
+    // poiid: string
+    // poitypename: string
+    // poitypecode: string
+    // phonenumber: string
+    // signboard: string
+    // maptype: string
+  }
+}
+// 高德逆地址解析详细数据
+const getAddressDetailByAMap = async (position: Location): Promise<IAddressDetail | null> => {
+  console.log('getAddressDetailByAMap start...')
+  return new Promise((resolve, reject) => {
+    if (!window?.AMap) {
+      console.error('getAddressDetailByAMap fail: AMap is undefinded')
+      resolve(null)
+      return
+    }
+    if (position) {
+      new window.AMap.Geocoder({
+        radius: 500,
+        extensions: 'all'
+      }).getAddress([position.longitude, position.latitude], (status: string, result: any) => {
+        // console.log(status)
+        // console.log(result)
+        if (status === 'complete' && result.info === 'OK' && result?.regeocode) {
+          console.log(`getAddressByAMap success:`, result.regeocode)
+
+          const addressComponent = result.regeocode.addressComponent || {}
+
+          // 确保 country 字段被正确获取
+          // 直接从高德地图 API 返回的数据中获取 country 字段
+          const country = addressComponent.country || ''
+
+          let aois = result.regeocode.aois || []
+          let pois = result.regeocode.pois || []
+          if (Array.isArray(addressComponent.city)) {
+            addressComponent.city = addressComponent.city.join(',')
+          }
+          let street = addressComponent.street || (addressComponent.streetNumber && isObject(addressComponent.streetNumber) ? addressComponent.streetNumber.street : '')
+          let number = addressComponent.streetNumber && isObject(addressComponent.streetNumber) ? addressComponent.streetNumber.number : (addressComponent.streetNumber || '')
+          if (Array.isArray(street)) {
+            street = street.join(',')
+          }
+          if (Array.isArray(number)) {
+            number = number.join(',')
+          }
+          let poiname = (aois && aois[0] && aois[0].name) || ''
+
+          let detailAddr =
+            street + number + poiname || ''
+
+          let address =
+            (addressComponent.province || '') +
+            (addressComponent.city || '') +
+            (addressComponent.district || '') +
+            (detailAddr || '')
+          let tmpFullDistrinct =
+            (addressComponent.province || '') +
+            (addressComponent.city || '') +
+            (addressComponent.district || '')
+          if (!address.endsWith(poiname)) {
+            address = address + poiname
+          }
+          let selectedDetailAddr = detailAddr || ''
+          // 去除前面的行政区域
+          if (selectedDetailAddr.startsWith(tmpFullDistrinct)) {
+            selectedDetailAddr = selectedDetailAddr.slice(tmpFullDistrinct.length)
+          }
+          let poiid = pois && pois[0] && pois[0].id
+          let poitypename = pois && pois[0] && pois[0].type
+
+          const addressDetail: IAddressDetail = {
+            regeocode: result.regeocode,
+            addressDetail: {
+              longitude: position.longitude,
+              latitude: position.latitude,
+              address: address || '',
+              // poiname: poiname || '',
+              regionid: addressComponent.adcode || '',
+              country: country || '',
+              province: addressComponent.province || '',
+              city: addressComponent.city || '',
+              district: addressComponent.district ||
+                addressComponent.township ||
+                '',
+              street: street || '',
+              number: number || '',
+              detailaddr: selectedDetailAddr || '',
+              // poiid: poiid || '',
+              // poitypename: poitypename || '',
+              // poitypecode: '',
+              // phonenumber: getPoiPhoneNumber(pois && pois[0] && pois[0].tel),
+              // signboard: '',
+              // maptype: 'amap',
+            }
+          }
+          resolve(addressDetail)
+        } else {
+          console.error(`getAddressByAMap fail: status = ${status}, result = ${result}`)
+          resolve(null)
+        }
+      })
+    }
+  })
+}
+
 // 腾讯ip定位：通过终端设备IP地址获取其当前所在地理位置，精确到市级，常用于显示当地城市天气预报、初始化用户城市等非精确定位场景。
 const getIPLocationByTMap = async (ip?: string): Promise<Location> => {
   console.log('getIPLocationByTMap start...')

package/src/map/utils.ts

@@ -1,4 +1,4 @@
-function transformLat (x: number, y: number) {
+function transformLat(x: number, y: number) {
   let ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x))
   ret += (20.0 * Math.sin(6.0 * x * Math.PI) + 20.0 * Math.sin(2.0 * x * Math.PI)) * 2.0 / 3.0
   ret += (20.0 * Math.sin(y * Math.PI) + 40.0 * Math.sin(y / 3.0 * Math.PI)) * 2.0 / 3.0
@@ -6,7 +6,7 @@ function transformLat (x: number, y: number) {
   return ret
 }
 
-function transformLon (x: number, y: number) {
+function transformLon(x: number, y: number) {
   let ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x))
   ret += (20.0 * Math.sin(6.0 * x * Math.PI) + 20.0 * Math.sin(2.0 * x * Math.PI)) * 2.0 / 3.0
   ret += (20.0 * Math.sin(x * Math.PI) + 40.0 * Math.sin(x / 3.0 * Math.PI)) * 2.0 / 3.0
@@ -14,11 +14,11 @@ function transformLon (x: number, y: number) {
   return ret
 }
 
-function outOfChina (lng: number, lat: number) {
+function outOfChina(lng: number, lat: number) {
   return (lng < 72.004 || lng > 137.8347) || (lat < 0.8293 || lat > 55.8271)
 }
 
-function delta (lng: number, lat: number) {
+function delta(lng: number, lat: number) {
   const a = 6378245.0 // 地球长半轴
   const ee = 0.00669342162296594323 // 扁率
   let dLat = transformLat(lng - 105.0, lat - 35.0)
@@ -35,7 +35,7 @@ function delta (lng: number, lat: number) {
   }
 }
 
-function wgs84ToGcj02 (lng: number, lat: number) {
+function wgs84ToGcj02(lng: number, lat: number) {
   if (outOfChina(lng, lat)) {
     return {
       lng: lng,
@@ -96,3 +96,19 @@ export {
   BMapTransformBD09ToGCJ02Points,
   BMapTransformGCJ02ToBD09Points
 }
+
+
+export const getPoiPhoneNumber = (tel: string | string[]) => {
+  if (Array.isArray(tel)) {
+    tel = tel.filter((item) => item).join(';')
+  }
+  // tel里面:020-84060333;13570071479 需要优先去除手机号，否则用电话
+  if (tel) {
+    const phoneReg = /1[3456789]\d{9}/
+    const phone = tel.match(phoneReg)
+    if (phone) {
+      return phone[0]
+    }
+  }
+  return tel
+}