wl-design-mobile 0.4.0 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wl-design-mobile",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "",
   "main": "index.js",
   "author": "finch",
@@ -21,7 +21,8 @@
     "moment": "^2.30.1",
     "axios": "^1.7.2",
     "dingtalk-jsapi": "^3.0.12",
-    "weixin-js-sdk": "^1.6.5"
+    "weixin-js-sdk": "^1.6.5",
+    "@wecom/jssdk": "^1.4.5"
   },
   "devDependencies": {
     "vue": "^2.6.14"

package/util/jssdk.js

@@ -1,4 +1,5 @@
 import wx from "weixin-js-sdk";
+import * as ww from '@wecom/jssdk'
 import * as dd from 'dingtalk-jsapi';
 import config from '../config/config'
 import {axios} from '../util/axios'
@@ -67,13 +68,13 @@ function configWx(){
       });
 
       wx.ready(() => {
-        console.log('初始化js-sdk成功');
+        console.log('微信初始化js-sdk成功');
         resolve()
       });
       wx.error(res => {
-        console.log('初始化js-sdk失败' + res.errMsg);
+        console.log('微信初始化js-sdk失败' + res.errMsg);
         console.log('友情提示：若想成功，则需通过params传参（而不是query）！！！');
-        reject('初始化js-sdk失败' + res.errMsg)
+        reject('微信初始化js-sdk失败' + res.errMsg)
       });
     }).catch((error)=>{
       reject('请求服务端jssdk签名失败：'+error)
@@ -81,6 +82,48 @@ function configWx(){
   })
 }
 
+function getConfigSignature(url) {
+  return new Promise((resolve,reject)=>{
+    axios.post(config.platformServerContext + '/api/weixin/getJsConfig', {
+      appType: getAppType(),
+      appId: appId,
+      agentId: agentId,
+      corpId: corpId,
+      appKey: appKey,
+      url: url.split('#')[0]
+    }).then(resp=>{
+      console.log('getConfigSignature',resp)
+      let timestamp = resp.data.timestamp
+      let nonceStr = resp.data.noncestr
+      let signature = resp.data.signature
+      resolve({ timestamp, nonceStr, signature })
+    }).catch((error)=>{
+      console.log(error)
+      reject(error)
+    })
+  })
+}
+
+function configWw(){
+  return new Promise((resolve, reject) =>{
+    ww.register({
+      corpId: appId,       // 必填，当前用户企业所属企业ID
+      jsApiList: ['chooseImage', 'uploadImage', 'downloadImage', 'getLocalImgData', 'openLocation', 'getLocation', 'scanQRCode', 'chooseWXPay', 'onHistoryBack','invoke','onLocationChange','previewFile'], // 必填，需要使用的JSAPI列表
+      getConfigSignature,                 // 必填，根据url生成企业签名的回调函数
+      onConfigSuccess:(res) => {
+        console.log('企业微信初始化js-sdk成功');
+        console.log(res)
+        resolve()
+      },
+      onConfigFail:(res) =>{
+        console.log('企业微信初始化js-sdk失败' + res.errMsg);
+        console.log(res)
+        reject('企业微信初始化js-sdk失败' + res.errMsg)
+      }
+    })
+  })
+}
+
 function configDd(){
   return new Promise((resolve, reject)=>{
     getJsConfig().then((resp)=>{
@@ -264,32 +307,27 @@ let JsSDK = (function () {
         }).catch((error)=>{
           reject('钉钉启动内置地图位置失败：'+error)
         })
-      }else{
-        configWx().then(()=>{
-          wx.invoke('startAutoLBS',{
-                type: 'gcj02', // wgs84是gps坐标，gcj02是火星坐标
-              },
-              function(res) {
-                if(res.err_msg === "startAutoLBS:ok"){
-                  //调用成功
-                  wx.onLocationChange(
-                      function(res) {
-                        if(res.errMsg === "auto:location:report:ok"){
-                          resolve({longitude:res.longitude,latitude:res.latitude})
-                        }else {
-                          //错误处理
-                          reject()
-                        }
-                      }
-                  );
-                }else {
-                  //错误处理
-                  reject()
-                }
-              });
+      }else if(getAppType() === '20'){
+        configWw().then(()=>{
+          ww.startAutoLBS({
+            type: 'gcj02',
+            success:()=>{
+              ww.onLocationChange(function(event) {
+                console.log('onLocationChange',event)
+                resolve({longitude:event.longitude,latitude:event.latitude})
+              })
+            },
+            fail:()=>{
+              reject()
+            }
+          }).then(resp => {
+            console.log('企业微信开启连续定位',resp)
+          })
         }).catch((error)=>{
-          reject('微信开启连续定位失败：'+error)
+          reject('企业微信开启连续定位失败：'+error)
         })
+      }else{
+        reject('微信不支持连续定位')
       }
     })
   }
@@ -314,21 +352,17 @@ let JsSDK = (function () {
         }).catch((error)=>{
           reject('钉钉启动内置地图位置失败：'+error)
         })
-      }else{
-        configWx().then(()=>{
-          wx.invoke('stopAutoLBS',{},
-              function(res) {
-                if(res.err_msg === "stopAutoLBS:ok"){
-                  //调用成功
-                  resolve()
-                }else {
-                  //错误处理
-                  reject()
-                }
-              });
+      }else if(getAppType() === '20'){
+        configWw().then(()=>{
+          ww.stopAutoLBS().then(resp => {
+            console.log(resp)
+            resolve()
+          })
         }).catch((error)=>{
-          reject('微信停止连续定位失败：'+error)
+          reject('企业微信关闭连续定位失败：'+error)
         })
+      }else{
+        reject('微信不支持连续定位')
       }
     })
   }