处理图片相关问题

manifest.json

@@ -62,7 +62,7 @@
         "devServer" : {
             "proxy" : {
                 "/service" : {
-                    "target" : "http://192.168.4.105", //请求的目标域名
+                    "target" : "http://192.168.3.111", //请求的目标域名
                     "changeOrigin" : true, //是否跨域
                     "secure" : false
                 }

pages/assign/assign.vue

@@ -700,15 +700,17 @@
       });
       return;
     }
+    console.log(dataInfo)
     console.log(dataInfo.handlerImgList)
+    console.log(dataInfo.incidentData.repairImgList)
     
     uni.showLoading({
       title: "加载中",
       mask: true,
     });
     
-    if(dataInfo.handlerImgList.length || dataInfo.incidentData.repairImgList.length){
-      // 有图片
+    if(dataInfo.handlerImgList.length){
+      // 有处理图片
       let handlerOrder$ = handlerOrder();
       let requestList = [handlerOrder$];
       Promise.all(requestList).then(resList => {
@@ -724,6 +726,23 @@
           });
         }
       })
+    }else if(dataInfo.incidentData.repairImgList.length){
+      // 有报修图片,无处理图片
+      let handlerOrder$ = handlerOrder();
+      let requestList = [handlerOrder$];
+      Promise.all(requestList).then(resList => {
+        uni.hideLoading();
+        console.log(resList);
+        if(resList[0].state == 200){
+          dataInfo.incidentId = resList[0].data.id;
+          handlerImgSuccessNew();
+        }else{
+          uni.showToast({
+            icon: 'none',
+            title: resList[0].msg || '请求数据失败！'
+          });
+        }
+      })
     }else{
       // 没有图片
       let handlerOrder$ = handlerOrder();

share/useUploadFile.js

@@ -11,6 +11,16 @@ export function useUploadFile() {
     })
   }
   /**
+   * 图片加载完成
+   */
+  const newImage = (img) => {
+    return new Promise((resolve,reject) => {
+      img.onload = () => {
+        resolve()
+      }
+    })
+  }
+  /**
    * 上传图片
    */
   const uploadFile = async (imgObj, type, incidentId) => {
@@ -24,6 +34,7 @@ export function useUploadFile() {
     let ctx = canvas.getContext('2d')
     canvas.width = canvasWidth
     canvas.height = canvasHeight
+    await newImage(img)
     ctx.drawImage(img, 0, 0, canvasWidth, canvasHeight)
     
     const fileSrc = await toBlob(canvas, imgObj)