wl-design-mobile 0.7.0 → 0.7.2

package/package.json

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

package/util/jssdk.js

@@ -250,39 +250,67 @@ let JsSDK = (function () {
       }
     })
   }
-  function takePhoto(){
+  function takePhoto({count = 1} = {}){
     return new Promise((resolve, reject) =>{
       if(getAppType() === '30'){
         reject('钉钉不支持此方式拍照')
       }else{
         configWx().then(()=>{
           wx.chooseImage({
-            count: 1, // 默认1
+            count: count, // 默认1
             sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
             sourceType: ['camera'], // 可以指定来源是相册还是相机，默认二者都有
-            success: function (res) {
+            success: async 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);
+              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);
+              }
+              // 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('取消拍照')