diff --git a/src/assets/images/homePage/recommendtitleMobile.png b/src/assets/images/homePage/recommendtitleMobile.png new file mode 100644 index 00000000..4abf27da Binary files /dev/null and b/src/assets/images/homePage/recommendtitleMobile.png differ diff --git a/src/assets/images/homePage/squareBgMobile.png b/src/assets/images/homePage/squareBgMobile.png new file mode 100644 index 00000000..c190f95e Binary files /dev/null and b/src/assets/images/homePage/squareBgMobile.png differ diff --git a/src/component/Detail/detailRight/editPrintElement.vue b/src/component/Detail/detailRight/editPrintElement.vue index c71dd322..521005b4 100644 --- a/src/component/Detail/detailRight/editPrintElement.vue +++ b/src/component/Detail/detailRight/editPrintElement.vue @@ -339,7 +339,7 @@ export default defineComponent({ editPrintElementData.stateOverallSingle = 'single' let arr:any = editPrintElementData.selectDetail.printObject.prints if(props.type == 'element'){ - arr = editPrintElementData.selectDetail.printObject.trims + arr = editPrintElementData.selectDetail.trims } if(editPrintElementData.selectDetail.newDetail?.[editPrintElementData.currentDetailType]){ arr = editPrintElementData.selectDetail.newDetail[editPrintElementData.currentDetailType] diff --git a/src/component/home/design/index.vue b/src/component/home/design/index.vue index ff5b49b7..56ba55aa 100644 --- a/src/component/home/design/index.vue +++ b/src/component/home/design/index.vue @@ -212,10 +212,10 @@ -
+
-
+
@@ -306,6 +306,8 @@
+ {{ designTools.designTools }}123 + diff --git a/src/component/home/design/tools.vue b/src/component/home/design/tools.vue index e9f1c123..be048b05 100644 --- a/src/component/home/design/tools.vue +++ b/src/component/home/design/tools.vue @@ -328,9 +328,8 @@ export default defineComponent({ } const exportElement = async ()=>{ //设置导出 - console.log(data.canvasDetailData) let img = [] as any; - if(data.canvasDetailData.commandManager.undoStack.length > 0){ + if(data.canvasDetailData?.commandManager?.undoStack?.length > 0){ await dataDom.editCanvas.exportImage({isContainBg:true,isContainFixed:false}).then((rv:any)=>{ var imageDataURL = rv img.push({ diff --git a/src/store/Detail/designDetail.ts b/src/store/Detail/designDetail.ts index c5ba5f60..52ca83a2 100644 --- a/src/store/Detail/designDetail.ts +++ b/src/store/Detail/designDetail.ts @@ -270,7 +270,7 @@ const DesignDetail : Module = { state.selectDetail.scale = [1,1] state.selectDetail.offset = [0,0] state.selectDetail.printObject = item.printObject - state.selectDetail.trims = item.trims + state.selectDetail.trims = item.trims.prints state.selectDetail.type = item.type state.selectDetail.undividedLayer = item.undividedLayer if(state.selectDetail.newDetail?.sketch?.id && !state.selectDetail.id){ diff --git a/src/views/HomeRecommend.vue b/src/views/HomeRecommend.vue index 919f0565..517733f4 100644 --- a/src/views/HomeRecommend.vue +++ b/src/views/HomeRecommend.vue @@ -1,12 +1,19 @@