Merge branch 'feature_20260330_拜访连拍速度优化' into uat(dev)

src/components/deleteUploadImgTaskPhoto.vue

@@ -119,9 +119,27 @@ export default {
       });
     },
     newimgarr(localIds) {
-      this.imgArr = this.imgArr.concat(localIds);
+      if (that.isIOS()) {
+        // 解决ios微信localId无法直接使用的问题，获取base64后再上传
+        that.setIosImg(localIds);
+      } else {
+        this.imgArr = this.imgArr.concat(localIds);
+      }
       // this.$emit('upDataDetail');
     },
+    isIOS() {
+      return /iPhone|iPad|iPod/i.test(navigator.userAgent);
+    },
+    setIosImg(localIds) {
+      localIds.forEach((localId) => {
+        this.wx.getLocalImgData({
+          localId: localId, // 图片的localID
+          success: (res) => {
+            this.imgArr.push(res.localData);
+          },
+        });
+      });
+    },
   },
 };
 </script>

src/components/uploadVNormalTaskPhoto.vue

@@ -219,13 +219,8 @@ export default {
                 success: function (res) {
                   let localIds = res.localIds;
                   that.localIdsArr = [];
-                  if (that.isIOS()) {
-                    // 解决ios微信localId无法直接使用的问题，获取base64后再上传
-                    that.setIosImg(localIds);
-                  } else {
-                    console.log('localIds', localIds);
-                    that.$emit('newimgarr', localIds);
-                  }
+                  console.log('localIds', localIds);
+                  that.$emit('newimgarr', localIds);
                   // that.syncUpload(localIds);
                 },
               });
@@ -233,25 +228,6 @@ export default {
           }
         });
     },
-    isIOS() {
-      return /iPhone|iPad|iPod/i.test(navigator.userAgent);
-    },
-    setIosImg(localIds) {
-      let that = this;
-      let localIdArr = [];
-      localIds.forEach((localId) => {
-        wx.getLocalImgData({
-          localId: localId, // 图片的localID
-          success: function (res) {
-            console.log('localIds', res.localData);
-            localIdArr.push(res.localData[0]);
-            if (localIdArr.length == localIds.length) {
-              that.$emit('newimgarr', localIdArr);
-            }
-          },
-        });
-      });
-    },
     syncUpload(localIds) {
       if (!localIds.length) {
         this.uploadImagev();