wl-design-mobile 0.4.6 → 0.4.8

package/package.json

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

package/util/jssdk.js

@@ -6,6 +6,11 @@ import {axios} from '../util/axios'
 
 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
@@ -13,19 +18,19 @@ function init({appId:a,agentId:b,corpId:c,appKey:d}){
   appKey = d
 
   if(appId){
-    sessionStorage.setItem('JsSdk_appId',appId)
+    sessionStorage.setItem(APP_ID,appId)
   }
 
   if(agentId){
-    sessionStorage.setItem('JsSdk_agentId',agentId)
+    sessionStorage.setItem(AGENT_ID,agentId)
   }
 
   if(corpId){
-    sessionStorage.setItem('JsSdk_corpId',corpId)
+    sessionStorage.setItem(CORP_ID,corpId)
   }
 
   if(appKey){
-    sessionStorage.setItem('JsSdk_appKey',appKey)
+    sessionStorage.setItem(APP_KEY,appKey)
   }
 }
 
@@ -57,10 +62,10 @@ function getJsConfig(){
   return new Promise((resolve, reject)=>{
     axios.post(config.platformServerContext + '/api/weixin/getJsConfig', {
       appType: getAppType(),
-      appId: sessionStorage.getItem('JsSdk_appId'),
-      agentId: sessionStorage.getItem('JsSdk_agentId'),
-      corpId: sessionStorage.getItem('JsSdk_corpId'),
-      appKey: sessionStorage.getItem('JsSdk_appKey'),
+      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)
@@ -75,7 +80,7 @@ function configWx(){
     getJsConfig().then((resp)=>{
       wx.config({
         debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
-        appId: sessionStorage.getItem('JsSdk_appId'), // 必填，公众号的唯一标识
+        appId: sessionStorage.getItem(APP_ID), // 必填，公众号的唯一标识
         timestamp: resp.timestamp, // 必填，生成签名的时间戳
         nonceStr: resp.noncestr, // 必填，生成签名的随机串
         signature: resp.signature, // 必填，签名
@@ -102,10 +107,10 @@ function getConfigSignature(url) {
   return new Promise((resolve,reject)=>{
     axios.post(config.platformServerContext + '/api/weixin/getJsConfig', {
       appType: getAppType(),
-      appId: sessionStorage.getItem('JsSdk_appId'),
-      agentId: sessionStorage.getItem('JsSdk_agentId'),
-      corpId: sessionStorage.getItem('JsSdk_corpId'),
-      appKey: sessionStorage.getItem('JsSdk_appKey'),
+      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)
@@ -123,7 +128,7 @@ function getConfigSignature(url) {
 function configWw(){
   return new Promise((resolve, reject) =>{
     ww.register({
-      corpId: sessionStorage.getItem('JsSdk_appId'),       // 必填，当前用户企业所属企业ID
+      corpId: sessionStorage.getItem(APP_ID),       // 必填，当前用户企业所属企业ID
       jsApiList: ['chooseImage', 'uploadImage', 'downloadImage', 'getLocalImgData', 'openLocation', 'getLocation', 'scanQRCode', 'chooseWXPay', 'onHistoryBack','invoke','onLocationChange','previewFile'], // 必填，需要使用的JSAPI列表
       getConfigSignature,                 // 必填，根据url生成企业签名的回调函数
       onConfigSuccess:(res) => {
@@ -146,8 +151,8 @@ function configDd(){
       //钉钉js-api配置
       console.log("当前页面："+location.href);
       dd.config({
-        agentId:sessionStorage.getItem('JsSdk_agentId'),
-        corpId: sessionStorage.getItem('JsSdk_corpId'),      // 必填，公众号的唯一标识
+        agentId:sessionStorage.getItem(AGENT_ID),
+        corpId: sessionStorage.getItem(CORP_ID),      // 必填，公众号的唯一标识
         timeStamp: resp.timestamp,  // 必填，生成签名的时间戳
         nonceStr: resp.noncestr,   // 必填，生成签名的随机串
         signature: resp.signature,  // 必填，签名
@@ -235,8 +240,8 @@ let JsSDK = (function () {
                   success: function (res) {
                     let serverId = res.serverId; // 返回图片的服务器端ID
                     resolve({
-                      appId:sessionStorage.getItem('JsSdk_appId'),
-                      agentId:sessionStorage.getItem('JsSdk_agentId'),
+                      appId:sessionStorage.getItem(APP_ID),
+                      agentId:sessionStorage.getItem(AGENT_ID),
                       serverId:serverId
                     })
                   }
@@ -253,49 +258,57 @@ let JsSDK = (function () {
       }
     })
   }
-  function choosePhoto({count = 1} = {}){
-    return new Promise((resolve, reject) =>{
-      if(getAppType() === '30'){
-        reject('钉钉不支持此方式选择照片')
-      }else{
-        configWx().then(()=>{
+  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: function (res) {
+            success: async function (res) {
               let localIds = res.localIds; // 返回选定照片的本地ID列表，localId可以作为img标签的src属性显示图片
-              // let localId = localIds[0];
-              setTimeout(() => {
-                let serverIds = []
-                localIds.forEach((localId) =>{
+
+              let uploadPromises = localIds.map(localId => {
+                return new Promise((resolve, reject) => {
                   wx.uploadImage({
                     localId: localId, // 需要上传的图片的本地ID，由chooseImage接口获得
                     isShowProgressTips: 1, // 默认为1，显示进度提示
                     success: function (res) {
                       let serverId = res.serverId; // 返回图片的服务器端ID
-                      serverIds.push(serverId)
+                      resolve(serverId);
+                    },
+                    fail: function (error) {
+                      reject(error);
                     }
-                  })
-                })
+                  });
+                });
+              });
 
+              try {
+                let serverIds = await Promise.all(uploadPromises);
+                console.log('choosePhoto',serverIds)
                 resolve({
-                  appId:sessionStorage.getItem('JsSdk_appId'),
-                  agentId:sessionStorage.getItem('JsSdk_agentId'),
+                  appId: sessionStorage.getItem(APP_ID),
+                  agentId: sessionStorage.getItem(AGENT_ID),
                   serverId:serverIds[0],
-                  serverIds:serverIds
-                })
-              }, 200);
+                  serverIds: serverIds
+                });
+              } catch (error) {
+                reject('上传图片失败：' + error);
+              }
             },
-            cancel:function (){
-              reject('取消选择照片')
+            cancel: function () {
+              reject('取消选择照片');
             }
-          })
-        }).catch((error)=>{
-          reject('微信选择照片失败：'+error)
-        })
+          });
+        }).catch((error) => {
+          reject('微信选择照片失败：' + error);
+        });
       }
-    })
+    });
   }
   function getLocation(){
     return new Promise((resolve, reject)=>{