@tmsfe/tms-core 0.0.109 → 0.0.111

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tms-core",
-  "version": "0.0.109",
+  "version": "0.0.111",
   "description": "tms运行时框架",
   "repository": {
     "type": "git",

package/src/location/index.ts

@@ -55,19 +55,19 @@ let ipLocationPromise: null | Promise<IpLocationType> = null; // ip定位请求
  */
 class Location extends LocationBase {
   /**
-  * @desc 默认位置信息
-  * @property {object} locForNoAuth 默认的位置信息
-  * @property {string} locForNoAuth.privince 省份信息
-  * @property {string} locForNoAuth.cityCode 城市编码
-  * @property {string} locForNoAuth.cityName 城市名称
-  * @property {string} locForNoAuth.district 地区名称
-  * @property {string} locForNoAuth.latitude 维度
-  * @property {string} locForNoAuth.longitude 经度
-  * @example
-  * const app = getApp({ allowDefault: true });
-  * const locationManager = app.tms.getLocationManager(); // 获取位置管理器
-  * console.log(locationManager.locForNoAuth) // 获取默认位置
-  */
+   * @desc 默认位置信息
+   * @property {object} locForNoAuth 默认的位置信息
+   * @property {string} locForNoAuth.privince 省份信息
+   * @property {string} locForNoAuth.cityCode 城市编码
+   * @property {string} locForNoAuth.cityName 城市名称
+   * @property {string} locForNoAuth.district 地区名称
+   * @property {string} locForNoAuth.latitude 维度
+   * @property {string} locForNoAuth.longitude 经度
+   * @example
+   * const app = getApp({ allowDefault: true });
+   * const locationManager = app.tms.getLocationManager(); // 获取位置管理器
+   * console.log(locationManager.locForNoAuth) // 获取默认位置
+   */
   public locForNoAuth = {
     province: '广东省',
     cityCode: '440300',
@@ -133,7 +133,7 @@ class Location extends LocationBase {
 
       return Promise.reject(res);
     })
-      .catch(err => Promise.reject(err));
+    .catch(err => Promise.reject(err));
 
     return userLocationCache[cacheName];
   }
@@ -175,8 +175,13 @@ class Location extends LocationBase {
    */
   getLocationDetail(showModalWhenCloseAuth = false, type = LocationType, content = '', getPoi = 0) {
     return this.getLocation(showModalWhenCloseAuth, type, content)
-      .then((res: WxPostionType) => this.getPoiInfo(res.latitude, res.longitude, getPoi))
-      .catch(err => Promise.reject(err));
+    .then(async (res: WxPostionType) => {
+      const res2 = await this.getPoiInfo(res.latitude, res.longitude, getPoi);
+      // @ts-ignore
+      res2.accuracy = res.accuracy;
+      return res2;
+    })
+    .catch(err => Promise.reject(err));
   }
 
   /**
@@ -211,8 +216,13 @@ class Location extends LocationBase {
    */
   getLocationDetailSilent(getPoi = 0, type = 'gcj02') {
     return this.getLocationSilent(type)
-      .then((res: any) => this.getPoiInfo(res.latitude, res.longitude, getPoi))
-      .catch(err => Promise.reject(err));
+    .then(async (res: WxPostionType) => {
+      const res2 = await this.getPoiInfo(res.latitude, res.longitude, getPoi);
+      // @ts-ignore
+      res2.accuracy = res.accuracy;
+      return res2;
+    })
+    .catch(err => Promise.reject(err));
   }
 
   /**
@@ -229,7 +239,7 @@ class Location extends LocationBase {
    *   longitude: 116.2545454,
    *   adCode: 1212144,
    * }
-  */
+   */
   getUserLocation(): PostionType | undefined {
     return userLocation;
   }
@@ -327,18 +337,18 @@ class Location extends LocationBase {
     if (ipLocationPromise === null || force) {
       ipLocationPromise = new Promise((resolve, reject) => {
         request.post('basic/lbs/decodeip')
-          .then((res) => {
-            if (res.errCode === 0) {
-              resolve(res.resData as IpLocationType);
-              return;
-            }
-            reject({ erMsg: res.errMsg });
-            ipLocationPromise = null;
-          })
-          .catch((e) => {
-            reject(e);
-            ipLocationPromise = null;
-          });
+        .then((res) => {
+          if (res.errCode === 0) {
+            resolve(res.resData as IpLocationType);
+            return;
+          }
+          reject({ erMsg: res.errMsg });
+          ipLocationPromise = null;
+        })
+        .catch((e) => {
+          reject(e);
+          ipLocationPromise = null;
+        });
       });
     }
     return ipLocationPromise;