From 35c6dfe29ca9765c36a2a458c71bde52d29f182b Mon Sep 17 00:00:00 2001 From: "X1627315083@163.com" <1627315083@qq.com> Date: Tue, 24 Mar 2026 14:43:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8D=B0=E8=8A=B1=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E4=B8=BA=E6=AD=A3=E7=89=87=E5=8F=A0=E5=BA=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/detailRight/editPrintElement.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/component/Detail/detailRight/editPrintElement.vue b/src/component/Detail/detailRight/editPrintElement.vue index ae2b63a8..22a20bf8 100644 --- a/src/component/Detail/detailRight/editPrintElement.vue +++ b/src/component/Detail/detailRight/editPrintElement.vue @@ -393,8 +393,8 @@ export default defineComponent({ angle: 0, flipX: false, flipY: false, - // blendMode: "multiply", - blendMode: "source-over", + blendMode: "multiply", + // blendMode: "source-over", gapX: 0, gapY: 0, } From d359cd7763dfd8bf74c50e1b0ca63dddb241134f Mon Sep 17 00:00:00 2001 From: "X1627315083@163.com" <1627315083@qq.com> Date: Mon, 30 Mar 2026 10:43:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=BF=A1=E7=94=A8=E5=8D=A1=E6=94=AF=E4=BB=98=E5=92=8C=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=AE=9D=E6=94=AF=E4=BB=98=E7=9A=84=E9=80=89=E9=A1=B9?= =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E9=BB=98=E8=AE=A4=E4=BF=A1=E7=94=A8?= =?UTF-8?q?=E5=8D=A1=E8=87=AA=E5=8A=A8=E7=BB=AD=E8=B4=B9=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/HomePage/renew.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/component/HomePage/renew.vue b/src/component/HomePage/renew.vue index 57148cb7..df5f28de 100644 --- a/src/component/HomePage/renew.vue +++ b/src/component/HomePage/renew.vue @@ -205,7 +205,7 @@
-
+
{{ $t('upgradePlan.Continue') }} From a25abeb527cb7ea1ab976e69f611d8c1a83aed6f Mon Sep 17 00:00:00 2001 From: "X1627315083@163.com" <1627315083@qq.com> Date: Fri, 10 Apr 2026 16:54:22 +0800 Subject: [PATCH 3/4] fix --- src/component/HomePage/Generate.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index cbbe631a..9efb6e3f 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -531,7 +531,7 @@ export default defineComponent({ } ) const setSpeed = (item: any) => { - speed.speedData = item + speed.speedData = {...item} } onMounted(() => { if (props.msg == 'Sketchboard') { From f16aa6ea14f31766d41898be79b236c9d089e029 Mon Sep 17 00:00:00 2001 From: "X1627315083@163.com" <1627315083@qq.com> Date: Fri, 10 Apr 2026 18:14:20 +0800 Subject: [PATCH 4/4] fix --- src/component/Canvas/CanvasEditor/index.vue | 2 ++ src/component/Detail/canvas/index.vue | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/component/Canvas/CanvasEditor/index.vue b/src/component/Canvas/CanvasEditor/index.vue index 882c556f..1d00d0e5 100644 --- a/src/component/Canvas/CanvasEditor/index.vue +++ b/src/component/Canvas/CanvasEditor/index.vue @@ -1040,6 +1040,7 @@ }, // 导出图片 exportImage: async ({ + isFrontBackUpdata = false, // 更新红绿图时候需要用，直接更新红绿图 isContainBg = false, // 是否包含背景图层 isContainFixed = false, // 是否包含固定图层 isContainFixedOther = true, // 是否包含其他固定图层--颜色图层 @@ -1056,6 +1057,7 @@ } = {}) => { loading.value = true canvasManager?.canvas?.discardActiveObject() + if(isFrontBackUpdata)await canvasManager?.changeCanvas() var base64 = await canvasManager.exportImage({ isContainBg, isContainFixed, diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue index 6023a4e6..3411955f 100644 --- a/src/component/Detail/canvas/index.vue +++ b/src/component/Detail/canvas/index.vue @@ -163,7 +163,6 @@ export default defineComponent({ const privewDetail = async (oldSelectDetail = detailData.selectDetail)=>{ // if(!detailDom.editCanvas)return return new Promise(async (res,reject)=>{ - console.log(detailDom.editCanvas) await detailDom.editCanvas.exportImage({ isContainFixed:true, width:props.sketchSize.width, @@ -245,17 +244,26 @@ export default defineComponent({ const frontBackChange = async (value:any)=>{ + let front = detailData.frontBack.front[detailData.imgDomIndex] + let back = detailData.frontBack.back[detailData.imgDomIndex] + store.commit('DesignDetail/updataDetailItem',{maskUrl:value}) if(!detailData.selectDetail.partialDesign.partialDesignPath && !detailData.selectDetail.partialDesign.partialDesignBase64){ await privewDetail() + }else{ + await detailDom.editCanvas.exportImage({ + isFrontBackUpdata: true, + isContainFixed:true, + width:props.sketchSize.width, + height:props.sketchSize.height, + }).then((rv)=>{ + if(detailData.selectDetail?.partialDesign)detailData.selectDetail.partialDesign.partialDesignBase64 = rv + }) } let full = detailData.selectDetail.partialDesign.partialDesignBase64 || detailData.selectDetail.partialDesign.partialDesignPath || detailData.selectDetail.path let size = { ...detailData.canvasConfig, } - store.commit('DesignDetail/updataDetailItem',{maskUrl:value}) segmentImage(value,full,size).then(async (rv)=>{ - let front = detailData.frontBack.front[detailData.imgDomIndex] - let back = detailData.frontBack.back[detailData.imgDomIndex] if(!front?.oldImageUrl)front.oldImageUrl = front.imageUrl if(!front?.oldMaskUrl)front.oldMaskUrl = front.maskUrl if(!back?.oldImageUrl)back.oldImageUrl = back.imageUrl @@ -267,7 +275,6 @@ export default defineComponent({ back.imageUrl = rv.targetBackUrl // store.commit('DesignDetail/updataDetailItem',{maskUrl:value}) }) - } const editSketchCanvasInit = async (value:any)=>{ detailData.canvasInstance = value