Merge branch 'master' of http://47.122.114.111:9999/zhuzhequan/electron-printer

src/views/design/head/index.vue

@@ -251,12 +251,9 @@ export default {
             canvas.className = "createCanvas";
             canvas.width = canvasItem.canvasWidth;
             canvas.height = canvasItem.canvasHeight;
-            let objects = canvasItem.options.objects.filter(
-              (el) => el.type === "image"
-            );
             let list = [];
-            for (let i in objects) {
-              list.push(this.drawImage(canvas, canvasItem.list[i]));
+            for (let listItem of canvasItem.list) {
+              list.push(this.drawImage(canvas, listItem));
             }
             await Promise.all(list);
             let base = canvas.toDataURL("image/png", 1);
@@ -426,7 +423,7 @@ export default {
         );
         this.detail = findByPodProductionNo.data;
         this.imgList = [];
-        let designImagesCanvasJsonList = this.detail.drParam;
+        let designImagesCanvasJsonList =  this.detail.drParam;
         await this.hasDesignImagesCanvasJsonList(designImagesCanvasJsonList);
         this.$store.commit("setProductDetail", findByPodProductionNo.data);
         ipcRenderer.send("win-subScreen", findByPodProductionNo.data);