wl-design-mobile 0.3.9 → 0.4.0

package/package.json

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

package/util/jssdk.js

@@ -1,5 +1,4 @@
 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'
@@ -68,13 +67,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)
@@ -82,43 +81,6 @@ function configWx(){
   })
 }
 
-async function getConfigSignature(url) {
-  const resp = await axios.post(config.platformServerContext + '/api/weixin/getJsConfig', {
-    appType: getAppType(),
-    appId: appId,
-    agentId: agentId,
-    corpId: corpId,
-    appKey: appKey,
-    url: url
-  })
-
-  let timestamp = resp.data.timestamp
-  let nonceStr = resp.data.noncestr
-  let signature = resp.data.signature
-
-  return { timestamp, nonceStr, signature }
-}
-
-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.checkResult)
-        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)=>{
@@ -168,22 +130,6 @@ let JsSDK = (function () {
           },
           complete: () => {},
         });
-      }else if(getAppType() === '20'){
-        configWw().then(()=>{
-          ww.scanQRCode({
-            needResult: true,
-            scanType: ['qrCode', 'barCode']
-          }). then(resp =>{
-            console.log("微信扫码结果：", resp)
-            if(resp.resultStr){
-              resolve(resp.resultStr)
-            }else{
-              reject("企业微信扫码失败!"+resp.errMsg)
-            }
-          })
-        }).catch((error)=>{
-          reject('企业微信扫码失败：'+error)
-        })
       }else{
         configWx().then(()=>{
           wx.scanQRCode({
@@ -234,22 +180,6 @@ let JsSDK = (function () {
         }).catch((error)=>{
           reject('钉钉获取位置失败：'+error)
         })
-      }else if(getAppType() === '20'){
-        configWw().then(()=>{
-          ww.getLocation({
-            type: 'gcj02'
-          }).then((resp) => {
-            console.log(resp);
-            if(resp.longitude){
-              resolve(resp)
-            }else{
-              reject("企业微信获取位置失败" + JSON.stringify(resp))
-            }
-          })
-        }).catch((error)=>{
-          reject('企业微信获取位置失败：'+error)
-        })
-
       }else{
         configWx().then(()=>{
           wx.getLocation({
@@ -293,21 +223,6 @@ let JsSDK = (function () {
         }).catch((error)=>{
           reject('钉钉启动内置地图位置失败：'+error)
         })
-      }else if(getAppType() === '20'){
-        configWw().then(()=>{
-          ww.openLocation({
-            latitude: latitude,//目的地latitude
-            longitude: longitude,//目的地longitude
-            name: name,
-            address: address,
-            scale: scale//地图缩放大小，可根据情况具体调整
-          }).then((resp)=>{
-            console.log(resp)
-            resolve()
-          })
-        }).catch((error)=>{
-          reject('企业微信启动内置地图失败：'+error)
-        })
       }else{
         configWx().then(()=>{
           wx.openLocation({
@@ -349,27 +264,32 @@ let JsSDK = (function () {
         }).catch((error)=>{
           reject('钉钉启动内置地图位置失败：'+error)
         })
-      }else if(getAppType() === '20'){
-        configWw().then(()=>{
-          ww.startAutoLBS({
-            type: 'gcj02',
-            success:()=>{
-              ww.onLocationChange(function(event) {
-                console.log(event)
-                resolve({longitude:event.longitude,latitude:event.latitude})
-              })
-            },
-            fail:()=>{
-              reject()
-            }
-          }).then(resp => {
-            console.log(resp)
-          })
+      }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()
+                }
+              });
         }).catch((error)=>{
-          reject('企业微信开启连续定位失败：'+error)
+          reject('微信开启连续定位失败：'+error)
         })
-      }else{
-        reject('微信不支持连续定位')
       }
     })
   }
@@ -394,17 +314,21 @@ let JsSDK = (function () {
         }).catch((error)=>{
           reject('钉钉启动内置地图位置失败：'+error)
         })
-      }else if(getAppType() === '20'){
-        configWw().then(()=>{
-          ww.stopAutoLBS().then(resp => {
-            console.log(resp)
-            resolve()
-          })
+      }else{
+        configWx().then(()=>{
+          wx.invoke('stopAutoLBS',{},
+              function(res) {
+                if(res.err_msg === "stopAutoLBS:ok"){
+                  //调用成功
+                  resolve()
+                }else {
+                  //错误处理
+                  reject()
+                }
+              });
         }).catch((error)=>{
-          reject('企业微信关闭连续定位失败：'+error)
+          reject('微信停止连续定位失败：'+error)
         })
-      }else{
-        reject('微信不支持连续定位')
       }
     })
   }