wl-design-mobile 0.5.3 → 0.5.5

package/edit/select/styles/css/index.css

@@ -129,6 +129,5 @@
 
 .cell-group-div {
     flex: 1;
-    overflow-y: auto;
     margin-top: 44px;
 }

package/package.json

@@ -1,31 +1,33 @@
-{
-  "name": "wl-design-mobile",
-  "version": "0.5.3",
-  "description": "",
-  "main": "index.js",
-  "author": "finch",
-  "license": "ISC",
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/",
-    "files": [
-      "!**/.*",
-      "!**/CHANGELOG.md",
-      "**/*"
-    ]
-  },
-  "dependencies": {
-    "core-js": "^3.8.3",
-    "vant": "^2.13.2",
-    "vue-router": "^3.0.5",
-    "moment": "^2.30.1",
-    "axios": "^1.7.2",
-    "dingtalk-jsapi": "^3.0.12",
-    "weixin-js-sdk": "^1.6.5",
-    "@wecom/jssdk": "^1.4.5"
-  },
-  "devDependencies": {
-    "vue": "^2.6.14"
-  },
-  "scripts": {}
-}
+{
+  "name": "wl-design-mobile",
+  "version": "0.5.5",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "publish": "pnpm publish --access public --no-git-checks"
+  },
+  "author": "finch",
+  "license": "ISC",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/",
+    "files": [
+      "!**/.*",
+      "!**/CHANGELOG.md",
+      "**/*"
+    ]
+  },
+  "dependencies": {
+    "core-js": "^3.8.3",
+    "vant": "^2.13.2",
+    "vue-router": "^3.0.5",
+    "moment": "^2.30.1",
+    "axios": "^1.7.2",
+    "dingtalk-jsapi": "^3.0.12",
+    "weixin-js-sdk": "^1.6.5",
+    "@wecom/jssdk": "^1.4.5"
+  },
+  "devDependencies": {
+    "vue": "^2.6.14"
+  }
+}

package/search/styles/css/index.css

@@ -132,7 +132,6 @@
 
 .cell-group-div {
     flex: 1;
-    /*overflow-y: auto;*/
     margin-top: 44px;
 }
 

package/util/jssdk.js

@@ -1,508 +1,523 @@
-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'
-import {Toast } from 'vant'
-
-let appId,agentId,corpId,appKey
-
-const APP_ID = 'JsSdk_appId'
-const AGENT_ID = 'JsSdk_agentId'
-const CORP_ID = 'JsSdk_corpId'
-const APP_KEY = 'JsSdk_appKey'
-
-function init({appId:a,agentId:b,corpId:c,appKey:d}){
-  appId = a
-  agentId = b
-  corpId = c
-  appKey = d
-
-  if(appId){
-    sessionStorage.setItem(APP_ID,appId)
-  }
-
-  if(agentId){
-    sessionStorage.setItem(AGENT_ID,agentId)
-  }
-
-  if(corpId){
-    sessionStorage.setItem(CORP_ID,corpId)
-  }
-
-  if(appKey){
-    sessionStorage.setItem(APP_KEY,appKey)
-  }
-}
-
-
-function getAppType() {
-  let ua = navigator.userAgent.toLowerCase();
-  let isWxWork = ua.match(/WxWork/i) == 'wxwork';
-  if (isWxWork) {
-    return '20'
-  }
-
-  let isWx = ua.match(/MicroMessenger/i) == 'micromessenger';
-  if (isWx) {
-    if(agentId){//如果有agentId认为是企业微信
-      return '20'
-    }
-    return '10'
-  }
-
-  if (dd.env.platform != 'notInDingTalk') {
-    return '30'
-  }
-
-  return ''
-}
-
-function getJsConfig(){
-  let url = window.location.href.split('#')[0]
-  return new Promise((resolve, reject)=>{
-    axios.post(config.platformServerContext + '/api/weixin/getJsConfig', {
-      appType: getAppType(),
-      appId: sessionStorage.getItem(APP_ID),
-      agentId: sessionStorage.getItem(AGENT_ID),
-      corpId: sessionStorage.getItem(CORP_ID),
-      appKey: sessionStorage.getItem(APP_KEY),
-      url: url
-    }).then((resp) => {
-      resolve(resp.data)
-    }).catch((error) => {
-      reject(error)
-    })
-  })
-}
-
-function configWx(){
-  return new Promise((resolve, reject) =>{
-    getJsConfig().then((resp)=>{
-      wx.config({
-        debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
-        appId: sessionStorage.getItem(APP_ID), // 必填，公众号的唯一标识
-        timestamp: resp.timestamp, // 必填，生成签名的时间戳
-        nonceStr: resp.noncestr, // 必填，生成签名的随机串
-        signature: resp.signature, // 必填，签名
-        jsApiList: ['chooseImage', 'uploadImage', 'downloadImage', 'getLocalImgData', 'openLocation', 'getLocation', 'scanQRCode', 'chooseWXPay', 'onHistoryBack','invoke','onLocationChange','previewFile'] // 必填，需要使用的JS接口列表
-        //jsApiList: ['chooseImage', 'uploadImage', 'downloadImage', 'getLocalImgData', 'openLocation', 'getLocation', 'scanQRCode', 'chooseWXPay', 'onHistoryBack','startLocationUpdateBackground','startLocationUpdate','onLocationChange','offLocationChange']   // 必填，需要使用的JS接口列表
-      });
-
-      wx.ready(() => {
-        console.log('微信初始化js-sdk成功');
-        resolve()
-      });
-      wx.error(res => {
-        console.log('微信初始化js-sdk失败' + res.errMsg);
-        console.log('友情提示：若想成功，则需通过params传参（而不是query）！！！');
-        reject('微信初始化js-sdk失败' + res.errMsg)
-      });
-    }).catch((error)=>{
-      reject('请求服务端jssdk签名失败：'+error)
-    })
-  })
-}
-
-function getConfigSignature(url) {
-  return new Promise((resolve,reject)=>{
-    axios.post(config.platformServerContext + '/api/weixin/getJsConfig', {
-      appType: getAppType(),
-      appId: sessionStorage.getItem(APP_ID),
-      agentId: sessionStorage.getItem(AGENT_ID),
-      corpId: sessionStorage.getItem(CORP_ID),
-      appKey: sessionStorage.getItem(APP_KEY),
-      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: sessionStorage.getItem(APP_ID),       // 必填，当前用户企业所属企业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)=>{
-      //钉钉js-api配置
-      console.log("当前页面："+location.href);
-      dd.config({
-        agentId:sessionStorage.getItem(AGENT_ID),
-        corpId: sessionStorage.getItem(CORP_ID),      // 必填，公众号的唯一标识
-        timeStamp: resp.timestamp,  // 必填，生成签名的时间戳
-        nonceStr: resp.noncestr,   // 必填，生成签名的随机串
-        signature: resp.signature,  // 必填，签名
-        jsApiList: [
-          'getDeviceUUID',
-          'getLocation',
-
-        ] // 必填，需要使用的jsapi列表，注意：不要带dd。
-      });
-
-      dd.ready(() => {
-        console.log('初始化钉钉 js-sdk成功');
-        resolve()
-      });
-      dd.error(res => {
-        console.log('初始化钉钉 js-sdk失败' + JSON.stringify(res));
-        console.log('友情提示：若想成功，则需通过params传参（而不是query）！！！');
-        reject('初始化钉钉 js-sdk失败' + JSON.stringify(res))
-      });
-    }).catch((error)=>{
-      reject('请求服务端jssdk签名失败：'+error)
-    })
-  })
-}
-
-let JsSDK = (function () {
-  function scanQRCode(){
-    return new Promise((resolve, reject) =>{
-      if(getAppType() === '30'){
-        dd.scan({
-          type: 'all',
-          success: (res) => {
-            console.log('钉钉扫码结果',res)
-            resolve(res.text)
-          },
-          fail: (err) => {
-            console.log('钉钉扫码失败',err)
-            reject('钉钉扫码失败：'+err)
-          },
-          complete: () => {},
-        });
-      }else{
-        configWx().then(()=>{
-          wx.scanQRCode({
-            desc: 'scanQRCode desc',
-            needResult: 1,
-            scanType: ["qrCode", "barCode"],
-            success: function (resp) {
-              console.log("微信扫码结果：",resp)
-              let result = resp.resultStr
-              resolve(result)
-            },
-            fail: function (res) {
-              console.log("失败res=>",res)
-              if (res.errMsg.indexOf('function_not_exist') > 0) {
-                reject('版本过低请升级');
-              } else {
-                reject("微信扫码失败,请联系系统管理员!");
-              }
-            }
-          })
-        }).catch((error)=>{
-          reject('微信扫码失败：'+error)
-        })
-      }
-    })
-  }
-  function takePhoto(){
-    return new Promise((resolve, reject) =>{
-      if(getAppType() === '30'){
-        reject('钉钉不支持此方式拍照')
-      }else{
-        configWx().then(()=>{
-          wx.chooseImage({
-            count: 1, // 默认1
-            sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
-            sourceType: ['camera'], // 可以指定来源是相册还是相机，默认二者都有
-            success: function (res) {
-              let localIds = res.localIds; // 返回选定照片的本地ID列表，localId可以作为img标签的src属性显示图片
-              let localId = localIds[0];
-              Toast.loading({
-                duration: 0, // 持续展示 toast
-                forbidClick: false,
-                message: '正在上传',
-              });
-              setTimeout(() => {
-                wx.uploadImage({
-                  localId: localId, // 需要上传的图片的本地ID，由chooseImage接口获得
-                  isShowProgressTips: 0, // 默认为1，显示进度提示
-                  success: function (res) {
-                    Toast.clear()
-                    let serverId = res.serverId; // 返回图片的服务器端ID
-                    resolve({
-                      appId:sessionStorage.getItem(APP_ID),
-                      agentId:sessionStorage.getItem(AGENT_ID),
-                      serverId:serverId
-                    })
-                  }
-                })
-              }, 200);
-            },
-            cancel:function (){
-              reject('取消拍照')
-            }
-          })
-        }).catch((error)=>{
-          reject('微信拍照失败：'+error)
-        })
-      }
-    })
-  }
-  function choosePhoto({count = 1} = {}) {
-    return new Promise((resolve, reject) => {
-      if (getAppType() === '30') {
-        reject('钉钉不支持此方式选择照片');
-      } else {
-        configWx().then(() => {
-          wx.chooseImage({
-            count: count, // 默认1
-            sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
-            sourceType: ['album'], // 可以指定来源是相册还是相机，默认二者都有
-            success: async function (res) {
-              let localIds = res.localIds; // 返回选定照片的本地ID列表，localId可以作为img标签的src属性显示图片
-              Toast.loading({
-                duration: 0, // 持续展示 toast
-                forbidClick: false,
-                message: '正在上传',
-              });
-              let uploadPromises = localIds.map(localId => {
-                return new Promise((resolve, reject) => {
-                  wx.uploadImage({
-                    localId: localId, // 需要上传的图片的本地ID，由chooseImage接口获得
-                    isShowProgressTips: 0, // 默认为1，显示进度提示
-                    success: function (res) {
-                      let serverId = res.serverId; // 返回图片的服务器端ID
-                      resolve(serverId);
-                    },
-                    fail: function (error) {
-                      reject(error);
-                    }
-                  });
-                });
-              });
-
-              try {
-                let serverIds = await Promise.all(uploadPromises);
-                console.log('choosePhoto',serverIds)
-                Toast.clear()
-                resolve({
-                  appId: sessionStorage.getItem(APP_ID),
-                  agentId: sessionStorage.getItem(AGENT_ID),
-                  serverId:serverIds[0],
-                  serverIds: serverIds
-                });
-              } catch (error) {
-                Toast.clear()
-                reject('上传图片失败：' + error);
-              }
-            },
-            cancel: function () {
-              reject('取消选择照片');
-            }
-          });
-        }).catch((error) => {
-          reject('微信选择照片失败：' + error);
-        });
-      }
-    });
-  }
-  function getLocation(){
-    return new Promise((resolve, reject)=>{
-      if(getAppType() === '30'){
-        configDd().then(()=>{
-          dd.getLocation({
-            targetAccuracy: '200',
-            cacheTimeout: 20,
-            coordinate: '1',
-            useCache: true,
-            withReGeocode: true,
-            type: 1,
-            success: (res) => {
-              console.log('钉钉获取当前位置结果：', res)
-              resolve(res)
-            },
-            fail: (error) => {
-              console.log('钉钉获取位置失败：', error)
-              reject('钉钉获取位置失败：'+error)
-            },
-            complete: () => {},
-          })
-        }).catch((error)=>{
-          reject('钉钉获取位置失败：'+error)
-        })
-      }else{
-        configWx().then(()=>{
-          wx.getLocation({
-            type: 'gcj02', //获取gcj02的坐标
-            success: (res) => {
-              //res.longitude 获取经度
-              //res.latitude 获取纬度
-              console.log(res);
-              resolve(res)
-            }, fail: (res) => {
-              console.log("微信获取位置失败。"+JSON.stringify(res));
-              reject("微信获取位置失败" + JSON.stringify(res))
-            }
-          });
-        }).catch((error)=>{
-          reject('微信获取位置失败：'+error)
-        })
-      }
-    })
-  }
-  function openLocation({longitude,latitude,name,address,scale= 15} = {}){
-    return new Promise((resolve, reject)=>{
-      if(getAppType() === '30'){
-        configDd().then(()=>{
-          dd.openLocation({
-            title: name,
-            address: address,
-            latitude: latitude,
-            longitude: longitude,
-            success: () => {
-              resolve()
-            },
-            fail: () => {
-              reject()
-            },
-            complete: () => {
-              resolve()
-            },
-          });
-
-        }).catch((error)=>{
-          reject('钉钉启动内置地图位置失败：'+error)
-        })
-      }else{
-        configWx().then(()=>{
-          wx.openLocation({
-            latitude: latitude,//目的地latitude
-            longitude: longitude,//目的地longitude
-            name: name,
-            address: address,
-            scale: scale//地图缩放大小，可根据情况具体调整
-          });
-          resolve()
-        }).catch((error)=>{
-          reject('微信启动内置地图失败：'+error)
-        })
-      }
-    })
-  }
-
-  function startAutoLBS({sceneId:sceneId}){
-    return new Promise((resolve, reject)=>{
-      if(getAppType() === '30'){
-        configDd().then(()=>{
-          dd.startLocating({
-            sceneId: sceneId,
-            useCache: true,
-            withReGeocode: false,
-            targetAccuracy: 200,
-            callBackInterval: 1000,
-            iOSDistanceFilter: 10,
-            success: (res) => {
-              resolve({longitude:res.longitude,latitude:res.latitude})
-            },
-            fail: () => {
-              reject()
-            },
-            complete: () => {
-              resolve()
-            },
-          });
-        }).catch((error)=>{
-          reject('钉钉启动内置地图位置失败：'+error)
-        })
-      }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)
-        })
-      }else{
-        reject('微信不支持连续定位')
-      }
-    })
-  }
-
-  function stopAutoLBS({sceneId:sceneId}){
-    return new Promise((resolve, reject)=>{
-      if(getAppType() === '30'){
-        configDd().then(()=>{
-          dd.stopLocating({
-            sceneId: sceneId,
-            success: () => {
-              resolve()
-            },
-            fail: () => {
-              reject()
-            },
-            complete: () => {
-              resolve()
-            },
-          });
-          resolve()
-        }).catch((error)=>{
-          reject('钉钉启动内置地图位置失败：'+error)
-        })
-      }else if(getAppType() === '20'){
-        configWw().then(()=>{
-          ww.stopAutoLBS().then(resp => {
-            console.log(resp)
-            resolve()
-          })
-        }).catch((error)=>{
-          reject('企业微信关闭连续定位失败：'+error)
-        })
-      }else{
-        reject('微信不支持连续定位')
-      }
-    })
-  }
-
-  // 公开API
-  return {
-    init:init,
-    takePhoto:takePhoto,
-    choosePhoto:choosePhoto,
-    scanQRCode: scanQRCode,
-    getLocation:getLocation,
-    openLocation:openLocation,
-    startAutoLBS:startAutoLBS,
-    stopAutoLBS:stopAutoLBS,
-  };
-})();
-
-export default JsSDK
-
+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'
+import {Toast } from 'vant'
+
+let appId,agentId,corpId,appKey
+
+const APP_ID = 'JsSdk_appId'
+const AGENT_ID = 'JsSdk_agentId'
+const CORP_ID = 'JsSdk_corpId'
+const APP_KEY = 'JsSdk_appKey'
+
+function init({appId:a,agentId:b,corpId:c,appKey:d}){
+  appId = a
+  agentId = b
+  corpId = c
+  appKey = d
+
+  if(appId){
+    sessionStorage.setItem(APP_ID,appId)
+  }
+
+  if(agentId){
+    sessionStorage.setItem(AGENT_ID,agentId)
+  }
+
+  if(corpId){
+    sessionStorage.setItem(CORP_ID,corpId)
+  }
+
+  if(appKey){
+    sessionStorage.setItem(APP_KEY,appKey)
+  }
+}
+
+
+function getAppType() {
+  let ua = navigator.userAgent.toLowerCase();
+  let isWxWork = ua.match(/WxWork/i) == 'wxwork';
+  if (isWxWork) {
+    return '20'
+  }
+
+  let isWx = ua.match(/MicroMessenger/i) == 'micromessenger';
+  if (isWx) {
+    if(agentId){//如果有agentId认为是企业微信
+      return '20'
+    }
+    return '10'
+  }
+
+  if (dd.env.platform != 'notInDingTalk') {
+    return '30'
+  }
+
+  return ''
+}
+
+function getCurrentUrl() {
+  // iOS 14+需要特殊处理
+  if (isIOS14Plus()) {
+    return window.location.origin +
+      window.location.pathname +
+      window.location.search
+  }
+  return window.location.href.split('#')[0]
+}
+
+function isIOS14Plus() {
+  const os = navigator.userAgent
+  return /iPhone OS 1[4-9]/.test(os) || /iPhone OS [2-9]\d/.test(os)
+}
+
+function getJsConfig(){
+  let url = getCurrentUrl()
+  return new Promise((resolve, reject)=>{
+    axios.post(config.platformServerContext + '/api/weixin/getJsConfig', {
+      appType: getAppType(),
+      appId: sessionStorage.getItem(APP_ID),
+      agentId: sessionStorage.getItem(AGENT_ID),
+      corpId: sessionStorage.getItem(CORP_ID),
+      appKey: sessionStorage.getItem(APP_KEY),
+      url: url
+    }).then((resp) => {
+      resolve(resp.data)
+    }).catch((error) => {
+      reject(error)
+    })
+  })
+}
+
+function configWx(){
+  return new Promise((resolve, reject) =>{
+    getJsConfig().then((resp)=>{
+      wx.config({
+        debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+        appId: sessionStorage.getItem(APP_ID), // 必填，公众号的唯一标识
+        timestamp: resp.timestamp, // 必填，生成签名的时间戳
+        nonceStr: resp.noncestr, // 必填，生成签名的随机串
+        signature: resp.signature, // 必填，签名
+        jsApiList: ['chooseImage', 'uploadImage', 'downloadImage', 'getLocalImgData', 'openLocation', 'getLocation', 'scanQRCode', 'chooseWXPay', 'onHistoryBack','invoke','onLocationChange','previewFile'] // 必填，需要使用的JS接口列表
+        //jsApiList: ['chooseImage', 'uploadImage', 'downloadImage', 'getLocalImgData', 'openLocation', 'getLocation', 'scanQRCode', 'chooseWXPay', 'onHistoryBack','startLocationUpdateBackground','startLocationUpdate','onLocationChange','offLocationChange']   // 必填，需要使用的JS接口列表
+      });
+
+      wx.ready(() => {
+        console.log('微信初始化js-sdk成功');
+        resolve()
+      });
+      wx.error(res => {
+        console.log('微信初始化js-sdk失败' + res.errMsg);
+        console.log('友情提示：若想成功，则需通过params传参（而不是query）！！！');
+        reject('微信初始化js-sdk失败' + res.errMsg)
+      });
+    }).catch((error)=>{
+      reject('请求服务端jssdk签名失败：'+error)
+    })
+  })
+}
+
+function getConfigSignature(url) {
+  return new Promise((resolve,reject)=>{
+    axios.post(config.platformServerContext + '/api/weixin/getJsConfig', {
+      appType: getAppType(),
+      appId: sessionStorage.getItem(APP_ID),
+      agentId: sessionStorage.getItem(AGENT_ID),
+      corpId: sessionStorage.getItem(CORP_ID),
+      appKey: sessionStorage.getItem(APP_KEY),
+      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: sessionStorage.getItem(APP_ID),       // 必填，当前用户企业所属企业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)=>{
+      //钉钉js-api配置
+      console.log("当前页面："+location.href);
+      dd.config({
+        agentId:sessionStorage.getItem(AGENT_ID),
+        corpId: sessionStorage.getItem(CORP_ID),      // 必填，公众号的唯一标识
+        timeStamp: resp.timestamp,  // 必填，生成签名的时间戳
+        nonceStr: resp.noncestr,   // 必填，生成签名的随机串
+        signature: resp.signature,  // 必填，签名
+        jsApiList: [
+          'getDeviceUUID',
+          'getLocation',
+
+        ] // 必填，需要使用的jsapi列表，注意：不要带dd。
+      });
+
+      dd.ready(() => {
+        console.log('初始化钉钉 js-sdk成功');
+        resolve()
+      });
+      dd.error(res => {
+        console.log('初始化钉钉 js-sdk失败' + JSON.stringify(res));
+        console.log('友情提示：若想成功，则需通过params传参（而不是query）！！！');
+        reject('初始化钉钉 js-sdk失败' + JSON.stringify(res))
+      });
+    }).catch((error)=>{
+      reject('请求服务端jssdk签名失败：'+error)
+    })
+  })
+}
+
+let JsSDK = (function () {
+  function scanQRCode(){
+    return new Promise((resolve, reject) =>{
+      if(getAppType() === '30'){
+        dd.scan({
+          type: 'all',
+          success: (res) => {
+            console.log('钉钉扫码结果',res)
+            resolve(res.text)
+          },
+          fail: (err) => {
+            console.log('钉钉扫码失败',err)
+            reject('钉钉扫码失败：'+err)
+          },
+          complete: () => {},
+        });
+      }else{
+        configWx().then(()=>{
+          wx.scanQRCode({
+            desc: 'scanQRCode desc',
+            needResult: 1,
+            scanType: ["qrCode", "barCode"],
+            success: function (resp) {
+              console.log("微信扫码结果：",resp)
+              let result = resp.resultStr
+              resolve(result)
+            },
+            fail: function (res) {
+              console.log("失败res=>",res)
+              if (res.errMsg.indexOf('function_not_exist') > 0) {
+                reject('版本过低请升级');
+              } else {
+                reject("微信扫码失败,请联系系统管理员!");
+              }
+            }
+          })
+        }).catch((error)=>{
+          reject('微信扫码失败：'+error)
+        })
+      }
+    })
+  }
+  function takePhoto(){
+    return new Promise((resolve, reject) =>{
+      if(getAppType() === '30'){
+        reject('钉钉不支持此方式拍照')
+      }else{
+        configWx().then(()=>{
+          wx.chooseImage({
+            count: 1, // 默认1
+            sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
+            sourceType: ['camera'], // 可以指定来源是相册还是相机，默认二者都有
+            success: function (res) {
+              let localIds = res.localIds; // 返回选定照片的本地ID列表，localId可以作为img标签的src属性显示图片
+              let localId = localIds[0];
+              Toast.loading({
+                duration: 0, // 持续展示 toast
+                forbidClick: false,
+                message: '正在上传',
+              });
+              setTimeout(() => {
+                wx.uploadImage({
+                  localId: localId, // 需要上传的图片的本地ID，由chooseImage接口获得
+                  isShowProgressTips: 0, // 默认为1，显示进度提示
+                  success: function (res) {
+                    Toast.clear()
+                    let serverId = res.serverId; // 返回图片的服务器端ID
+                    resolve({
+                      appId:sessionStorage.getItem(APP_ID),
+                      agentId:sessionStorage.getItem(AGENT_ID),
+                      serverId:serverId
+                    })
+                  }
+                })
+              }, 200);
+            },
+            cancel:function (){
+              reject('取消拍照')
+            }
+          })
+        }).catch((error)=>{
+          reject('微信拍照失败：'+error)
+        })
+      }
+    })
+  }
+  function choosePhoto({count = 1} = {}) {
+    return new Promise((resolve, reject) => {
+      if (getAppType() === '30') {
+        reject('钉钉不支持此方式选择照片');
+      } else {
+        configWx().then(() => {
+          wx.chooseImage({
+            count: count, // 默认1
+            sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
+            sourceType: ['album'], // 可以指定来源是相册还是相机，默认二者都有
+            success: async function (res) {
+              let localIds = res.localIds; // 返回选定照片的本地ID列表，localId可以作为img标签的src属性显示图片
+              Toast.loading({
+                duration: 0, // 持续展示 toast
+                forbidClick: false,
+                message: '正在上传',
+              });
+              let uploadPromises = localIds.map(localId => {
+                return new Promise((resolve, reject) => {
+                  wx.uploadImage({
+                    localId: localId, // 需要上传的图片的本地ID，由chooseImage接口获得
+                    isShowProgressTips: 0, // 默认为1，显示进度提示
+                    success: function (res) {
+                      let serverId = res.serverId; // 返回图片的服务器端ID
+                      resolve(serverId);
+                    },
+                    fail: function (error) {
+                      reject(error);
+                    }
+                  });
+                });
+              });
+
+              try {
+                let serverIds = await Promise.all(uploadPromises);
+                console.log('choosePhoto',serverIds)
+                Toast.clear()
+                resolve({
+                  appId: sessionStorage.getItem(APP_ID),
+                  agentId: sessionStorage.getItem(AGENT_ID),
+                  serverId:serverIds[0],
+                  serverIds: serverIds
+                });
+              } catch (error) {
+                Toast.clear()
+                reject('上传图片失败：' + error);
+              }
+            },
+            cancel: function () {
+              reject('取消选择照片');
+            }
+          });
+        }).catch((error) => {
+          reject('微信选择照片失败：' + error);
+        });
+      }
+    });
+  }
+  function getLocation(){
+    return new Promise((resolve, reject)=>{
+      if(getAppType() === '30'){
+        configDd().then(()=>{
+          dd.getLocation({
+            targetAccuracy: '200',
+            cacheTimeout: 20,
+            coordinate: '1',
+            useCache: true,
+            withReGeocode: true,
+            type: 1,
+            success: (res) => {
+              console.log('钉钉获取当前位置结果：', res)
+              resolve(res)
+            },
+            fail: (error) => {
+              console.log('钉钉获取位置失败：', error)
+              reject('钉钉获取位置失败：'+error)
+            },
+            complete: () => {},
+          })
+        }).catch((error)=>{
+          reject('钉钉获取位置失败：'+error)
+        })
+      }else{
+        configWx().then(()=>{
+          wx.getLocation({
+            type: 'gcj02', //获取gcj02的坐标
+            success: (res) => {
+              //res.longitude 获取经度
+              //res.latitude 获取纬度
+              console.log(res);
+              resolve(res)
+            }, fail: (res) => {
+              console.log("微信获取位置失败。"+JSON.stringify(res));
+              reject("微信获取位置失败" + JSON.stringify(res))
+            }
+          });
+        }).catch((error)=>{
+          reject('微信获取位置失败：'+error)
+        })
+      }
+    })
+  }
+  function openLocation({longitude,latitude,name,address,scale= 15} = {}){
+    return new Promise((resolve, reject)=>{
+      if(getAppType() === '30'){
+        configDd().then(()=>{
+          dd.openLocation({
+            title: name,
+            address: address,
+            latitude: latitude,
+            longitude: longitude,
+            success: () => {
+              resolve()
+            },
+            fail: () => {
+              reject()
+            },
+            complete: () => {
+              resolve()
+            },
+          });
+
+        }).catch((error)=>{
+          reject('钉钉启动内置地图位置失败：'+error)
+        })
+      }else{
+        configWx().then(()=>{
+          wx.openLocation({
+            latitude: latitude,//目的地latitude
+            longitude: longitude,//目的地longitude
+            name: name,
+            address: address,
+            scale: scale//地图缩放大小，可根据情况具体调整
+          });
+          resolve()
+        }).catch((error)=>{
+          reject('微信启动内置地图失败：'+error)
+        })
+      }
+    })
+  }
+
+  function startAutoLBS({sceneId:sceneId}){
+    return new Promise((resolve, reject)=>{
+      if(getAppType() === '30'){
+        configDd().then(()=>{
+          dd.startLocating({
+            sceneId: sceneId,
+            useCache: true,
+            withReGeocode: false,
+            targetAccuracy: 200,
+            callBackInterval: 1000,
+            iOSDistanceFilter: 10,
+            success: (res) => {
+              resolve({longitude:res.longitude,latitude:res.latitude})
+            },
+            fail: () => {
+              reject()
+            },
+            complete: () => {
+              resolve()
+            },
+          });
+        }).catch((error)=>{
+          reject('钉钉启动内置地图位置失败：'+error)
+        })
+      }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)
+        })
+      }else{
+        reject('微信不支持连续定位')
+      }
+    })
+  }
+
+  function stopAutoLBS({sceneId:sceneId}){
+    return new Promise((resolve, reject)=>{
+      if(getAppType() === '30'){
+        configDd().then(()=>{
+          dd.stopLocating({
+            sceneId: sceneId,
+            success: () => {
+              resolve()
+            },
+            fail: () => {
+              reject()
+            },
+            complete: () => {
+              resolve()
+            },
+          });
+          resolve()
+        }).catch((error)=>{
+          reject('钉钉启动内置地图位置失败：'+error)
+        })
+      }else if(getAppType() === '20'){
+        configWw().then(()=>{
+          ww.stopAutoLBS().then(resp => {
+            console.log(resp)
+            resolve()
+          })
+        }).catch((error)=>{
+          reject('企业微信关闭连续定位失败：'+error)
+        })
+      }else{
+        reject('微信不支持连续定位')
+      }
+    })
+  }
+
+  // 公开API
+  return {
+    init:init,
+    takePhoto:takePhoto,
+    choosePhoto:choosePhoto,
+    scanQRCode: scanQRCode,
+    getLocation:getLocation,
+    openLocation:openLocation,
+    startAutoLBS:startAutoLBS,
+    stopAutoLBS:stopAutoLBS,
+  };
+})();
+
+export default JsSDK
+