@smart100/spu-web-plugin 1.0.16 → 1.0.17

package/dist/index.d.ts

@@ -123,7 +123,7 @@ export const getServToken: () => Promise<{
   securitytoken: string
   expiration: string
 }>
-export const getCloudServ: () => any
+export const getCloudServ: (type?: StorageType) => any
 export const getUniqueid: () => string
 export const getUuid: () => string
 export const functionCheck: (functioncode?: string) => boolean

package/dist/spu-web-plugin.mjs

@@ -1,4 +1,4 @@
-var version = "1.0.16";
+var version = "1.0.17";
 
 /** Detect free variable `global` from Node.js. */
 var freeGlobal$2 = typeof global == 'object' && global && global.Object === Object && global;
@@ -18066,66 +18066,67 @@ var getLocationPromise = /*#__PURE__*/function () {
           location = _context17.sent;
         case 6:
           if (location) {
-            _context17.next = 10;
-            break;
-          }
-          _context17.next = 9;
-          return getLocationByNavigator();
-        case 9:
-          location = _context17.sent;
-        case 10:
-          if (location) {
-            _context17.next = 35;
+            _context17.next = 31;
             break;
           }
           if (!(mapService.type === 'amap')) {
-            _context17.next = 21;
+            _context17.next = 17;
             break;
           }
-          _context17.next = 14;
+          _context17.next = 10;
           return getLocationByAMap();
-        case 14:
+        case 10:
           location = _context17.sent;
           if (!(!location && isuseiplocarion)) {
-            _context17.next = 19;
+            _context17.next = 15;
             break;
           }
-          _context17.next = 18;
+          _context17.next = 14;
           return getCityLocationByAMap();
-        case 18:
+        case 14:
           location = _context17.sent;
-        case 19:
-          _context17.next = 35;
+        case 15:
+          _context17.next = 31;
           break;
-        case 21:
+        case 17:
           if (!(mapService.type === 'tencent' && isuseiplocarion)) {
-            _context17.next = 27;
+            _context17.next = 23;
             break;
           }
-          _context17.next = 24;
+          _context17.next = 20;
           return getIPLocationByTMap();
-        case 24:
+        case 20:
           location = _context17.sent;
-          _context17.next = 35;
+          _context17.next = 31;
           break;
-        case 27:
+        case 23:
           if (!(mapService.type === 'baidu')) {
-            _context17.next = 35;
+            _context17.next = 31;
             break;
           }
-          _context17.next = 30;
+          _context17.next = 26;
           return getLocationByBMap();
-        case 30:
+        case 26:
           location = _context17.sent;
           if (!(!location && isuseiplocarion)) {
+            _context17.next = 31;
+            break;
+          }
+          _context17.next = 30;
+          return getCityLocationByBMap();
+        case 30:
+          location = _context17.sent;
+        case 31:
+          if (location) {
             _context17.next = 35;
             break;
           }
           _context17.next = 34;
-          return getCityLocationByBMap();
+          return getLocationByNavigator();
         case 34:
           location = _context17.sent;
         case 35:
+          // location = null
           // 开发模式下为了方便测试提供虚拟定位
           if (!location && urlquery.isvirtuallocation) {
             location = {

package/package.json

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

package/src/map/index.ts

@@ -95,20 +95,19 @@ const getLocationByNavigator = async (): Promise<Location> => {
 }
 
 // ipaas ip 定位
-const getIPLocationByIpaas = async (
-  ip?: string
-): Promise<Location> => {
+const getIPLocationByIpaas = async (ip?: string): Promise<Location> => {
   console.log('getIPLocationByIpaas start...')
   return new Promise((resolve, reject) => {
     const AMapKey = getAMapKey()
 
-    axios.post(
-      'https://silkroad.wxchina.com/api/openapi/publishEvent?topic=xw-listener&subtopic=xw-listener&apicaseid=6684389338001815271',
-      {
-        key: AMapKey.key, // 好像不传也没问题 因为key是在ipaas那边设置的
-        ip: ip || ''
-      }
-    )
+    axios
+      .post(
+        'https://silkroad.wxchina.com/api/openapi/publishEvent?topic=xw-listener&subtopic=xw-listener&apicaseid=6684389338001815271',
+        {
+          key: AMapKey.key, // 好像不传也没问题 因为key是在ipaas那边设置的
+          ip: ip || ''
+        }
+      )
       .then((res: any) => {
         // console.log(res)
         // debugger
@@ -134,7 +133,8 @@ const getIPLocationByIpaas = async (
           console.error('getIPLocationByIpaas fail')
           resolve(null)
         }
-      }).catch((err: any) => {
+      })
+      .catch((err: any) => {
         console.error(err)
         console.error('getIPLocationByIpaas fail')
         resolve(null)
@@ -150,12 +150,15 @@ const getAddressByIpaas = async (position: Location): Promise<string> => {
     if (position) {
       try {
         const AMapKey = getAMapKey()
-        const result = await axios.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'
-        })
+        const result = await axios.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'
+          }
+        )
         // console.log(result)
         const address = result?.data?.formatted_address
         if (address) {
@@ -484,11 +487,6 @@ const getLocationPromise = async (isuseiplocarion = false): Promise<Location> =>
     location = await getLocationByNative()
   }
 
-  if (!location) {
-    location = await getLocationByNavigator()
-  }
-  // location = null
-
   if (!location) {
     if (mapService.type === 'amap') {
       location = await getLocationByAMap()
@@ -509,6 +507,11 @@ const getLocationPromise = async (isuseiplocarion = false): Promise<Location> =>
     }
   }
 
+  if (!location) {
+    location = await getLocationByNavigator()
+  }
+  // location = null
+
   // 开发模式下为了方便测试提供虚拟定位
   if (!location && urlquery.isvirtuallocation) {
     location = {

package/src/types/index.d.ts

@@ -123,7 +123,7 @@ export const getServToken: () => Promise<{
   securitytoken: string
   expiration: string
 }>
-export const getCloudServ: () => any
+export const getCloudServ: (type?: StorageType) => any
 export const getUniqueid: () => string
 export const getUuid: () => string
 export const functionCheck: (functioncode?: string) => boolean