fix

src/component/HomePage/ExportModel.vue

@@ -468,8 +468,10 @@ export default defineComponent({
 							for (const key in allBoardData.value) {
 								if (item == key) {
 									//循环渲染顺序
-										
-									let imgWidth = setImageWidth(key); //这是设置画布等宽
+									let imgWidth //这是设置画布等宽
+									if(item !== 'likeDesignCollectionList' && item !== 'FinalizeImage'){
+										imgWidth = await setImageWidth(key);
+									}
 									let sketchGroupingItem = [];
 									if (
 										item == "moodboardFiles" &&
@@ -478,7 +480,7 @@ export default defineComponent({
 										continue;
 									}
 									for (const [allItemIndex, allItem,] of allBoardData.value[key].entries()) {
-										await new Promise((resolve, reject) => {
+										await new Promise(async (resolve, reject) => {
 											if(!allItem){
 												resolve()
 											}
@@ -497,9 +499,11 @@ export default defineComponent({
 											} else {
 												let itemCanvasImg = allItem.imgUrl;
 												if (key == "likeDesignCollectionList") {
+													
 													itemCanvasImg =
 														allItem.designOutfitUrl;
 												}
+												if(item == 'likeDesignCollectionList' || item == 'FinalizeImage')imgWidth = await setImageWidth(key,itemCanvasImg); 
 												fabric.Image.fromURL(itemCanvasImg,(img) => {
 													let scaleWH = imgWidth / img.width; //计算放到画布上缩小倍率
 													if(key == "sketchboardFiles"){
@@ -513,7 +517,7 @@ export default defineComponent({
 															position.y = maxHeight;
 														}
 													}
-													setCanvasImage(img,key,position.x,position.y,allItem)//设置图片
+													setCanvasImage(img,key,position.x,position.y,allItem,imgWidth)//设置图片
 													position.height = img.height * scaleWH + margin;
 													if (key == "sketchboardFiles") {
 														if (sketchGroupingItem.length <3) {
@@ -608,7 +612,7 @@ export default defineComponent({
 			}
 		
 		
-		let setImageWidth = (key)=>{
+		let setImageWidth = async (key,img)=>{
 			let imgWidth = canvasWH.value.width; //这是设置画布等宽
 			if (
 				disposeMoodboardShow &&
@@ -632,14 +636,29 @@ export default defineComponent({
 					sketchGrouping;
 			}
 			if (key == "likeDesignCollectionList" || key == 'FinalizeImage') {
-				imgWidth =
-					(canvasWH.value.width -
-						(likeDesign - 1) * 20) /
-					likeDesign;
+				if(img){
+					await new Promise((resolve, reject) => {
+						let imgObj = new Image();
+						imgObj.onload = function () {
+							let height = imgObj.height
+							imgObj.height = canvasWH.value.width / 4 * 1.8
+							let heightScale = imgObj.height / height
+							imgWidth = imgObj.width * heightScale
+							// imgObj.remove()
+							resolve(imgObj.width)
+						}
+						imgObj.src = img;
+					})
+				}
+				// imgWidth =
+
+				// 	(canvasWH.value.width -
+				// 		(likeDesign - 1) * 20) /
+				// 	likeDesign;
 			}
 			return imgWidth
 		}
-		let setCanvasImage = (img,key,left,top,data)=>{
+		let setCanvasImage = (img,key,left,top,data,imgWidth)=>{
 			// data
 			let imgId = 0
 			let minioUrl = ''//表示收藏或者generate
@@ -671,7 +690,7 @@ export default defineComponent({
 			minioUrl = match[2]
 			// let id = 
 			let proportion = img.height / img.width; //计算图形宽高比例
-			let imgWidth = setImageWidth(key)
+			// let imgWidth = setImageWidth(key)
 			let scaleWH = imgWidth / img.width; //计算放到画布上缩小倍率
 			img.set({
 				// width: imgWidth/img.width,