@smart100/spu-web-plugin 0.0.29 → 0.0.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "0.0.29",
+  "version": "0.0.30",
   "description": "",
   "scripts": {
     "dev": "npm run build:types && rollup -c -w",
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
-    "@smart100/wxworksuite-plugin": "^0.0.8",
+    "@smart100/wxworksuite-plugin": "^0.0.9",
     "axios": "^1.6.0",
     "co": "^4.6.0",
     "dayjs": "^1.11.10",

package/src/index.ts

@@ -9,7 +9,7 @@ import { initAxios, spuAxios, axios } from './axios'
 import { initSpuConfig, spuConfig } from './spuConfig'
 import { globalConfig } from './globalConfig'
 import { downloadService, uploadService } from './oss'
-import { getUniqueid, functionCheck } from './utils'
+import { getUniqueid, functionCheck, setTitle } from './utils'
 import urlquery from './urlquery'
 import AMapLoader from './AMapLoader'
 import login from './login'
@@ -39,6 +39,9 @@ const globalOptions: any = {
 }
 
 const install = (app: any, options: any) => {
+
+  urlquery.init()
+
   // console.log(app)
   // console.log(app.version)
   merge(globalOptions, options)
@@ -62,10 +65,8 @@ const install = (app: any, options: any) => {
   // }
 
   initStorageProxy(globalOptions)
-
   initAxios(globalOptions)
   initSpuConfig(globalOptions)
-  urlquery.init()
 
   // 安装企微第三方应用插件
   WxworksuitePluginInstall({
@@ -162,6 +163,7 @@ export {
   getUniqueid,
   getUuid,
   functionCheck,
+  setTitle,
   AMapLoader,
   getToken,
   getTokenExpires,

package/src/location.ts

@@ -2,7 +2,6 @@ import AMapLoader from './AMapLoader'
 import { cloneDeep } from 'lodash-es'
 import urlquery from './urlquery'
 
-
 type Location = {
   longitude: string;
   latitude: string;
@@ -18,7 +17,6 @@ let lastLocation: Location = null
 let runing = false
 let locationPromise: Promise<Location>
 
-
 const init = async () => {
   if (!AMap) {
     AMap = await AMapLoader.load({
@@ -58,7 +56,15 @@ const getAmapLocation = async (): Promise<Location> => {
 
 const getSpuLocation = async (): Promise<Location> => {
   return new Promise((resolve, reject) => {
+    let isload = false
+    setTimeout(() => {
+      if (!isload) {
+        console.error('getSpuLocation timeout 100000')
+        resolve(null)
+      }
+    }, 10000)
     window.Native.getLocation((result: any, error: any, status: any) => {
+      isload = true
       // console.log('getLocation result', result)
       // console.log('getLocation error', error)
       // console.log('getLocation status', status)
@@ -154,7 +160,6 @@ const getLocationPromise = async (): Promise<Location> => {
 
 
 const getLocation = async () => {
-  await init()
   // debugger
   // 缓存30秒
   if (datetime && Date.now() - datetime <= 30000 && lastLocation && !runing) {