diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index 21511b8a..72e52568 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -728,6 +728,7 @@ export default defineComponent({ imgUrl = data.designOutfitUrl; imgWidth[key] = setImageWidth(key,img); } + if(key == 'upImgFiles')imgWidth[key] = setImageWidth(key,img); let url = imgUrl.split('?')[0] var match = url.match(/:(\d+)\/(.*)/); @@ -1372,6 +1373,7 @@ export default defineComponent({ Https.axiosPost(Https.httpUrls.canvasElementUpload, formData,config).then((rv)=>{ rv.imgUrl = rv.minioUrl fabric.Image.fromURL(rv.minioUrl,(img) => { + console.log(canvas.wrapperEl.parentNode.scrollTop); setCanvasImage(img,"upImgFiles",0,canvas.wrapperEl.parentNode.scrollTop,rv) canvas.add(img); },{ crossOrigin: "Anonymous" }) diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 5e2205ca..3296a77e 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -339,7 +339,7 @@ export default defineComponent({ ] }else if(this.type_.type2 == 'Sketchboard'){ this.printModelList = JSON.parse(JSON.stringify(this.store.state.UserHabit.SketchStyle)) - let imgList = ['/image/sketch/sketch-fine.jpg','/image/sketch/sketch-medium.jpg','/image/sketch/sketch-thick.jpg'] + let imgList = ['/image/sketch/sketch-thick.jpg','/image/sketch/sketch-medium.jpg','/image/sketch/sketch-fine.jpg'] this.printModelList.forEach((item:any,index:number)=>{ item.img = imgList[index] }) diff --git a/src/component/LibraryPage/ModelPlacement.vue b/src/component/LibraryPage/ModelPlacement.vue index e1b7a42b..abae0ba2 100644 --- a/src/component/LibraryPage/ModelPlacement.vue +++ b/src/component/LibraryPage/ModelPlacement.vue @@ -62,7 +62,7 @@ -->