wl-design-mobile 0.4.1 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wl-design-mobile",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "",
   "main": "index.js",
   "author": "finch",

package/util/jssdk.js

@@ -82,21 +82,26 @@ 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
+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)
+    })
   })
-
-  let timestamp = resp.data.timestamp
-  let nonceStr = resp.data.noncestr
-  let signature = resp.data.signature
-
-  return { timestamp, nonceStr, signature }
 }
 
 function configWw(){
@@ -107,7 +112,7 @@ function configWw(){
       getConfigSignature,                 // 必填，根据url生成企业签名的回调函数
       onConfigSuccess:(res) => {
         console.log('企业微信初始化js-sdk成功');
-        console.log(res.checkResult)
+        console.log(res)
         resolve()
       },
       onConfigFail:(res) =>{
@@ -168,22 +173,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 +223,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 +266,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({
@@ -355,7 +313,7 @@ let JsSDK = (function () {
             type: 'gcj02',
             success:()=>{
               ww.onLocationChange(function(event) {
-                console.log(event)
+                console.log('onLocationChange',event)
                 resolve({longitude:event.longitude,latitude:event.latitude})
               })
             },
@@ -363,7 +321,7 @@ let JsSDK = (function () {
               reject()
             }
           }).then(resp => {
-            console.log(resp)
+            console.log('企业微信开启连续定位',resp)
           })
         }).catch((error)=>{
           reject('企业微信开启连续定位失败：'+error)