From 4e7126f783274280135d78dc371ba920b0a029d9 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 15 Sep 2025 13:33:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E5=B8=83=E6=96=B0=E5=A2=9Eicon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/CHelp.svg | 17 ++++++ src/assets/icons/editFrontBack.svg | 60 +++++++++++++++++++ .../CanvasEditor/components/ToolsSidebar.vue | 2 + src/component/Detail/DesignDetail.vue | 19 ++++-- src/component/Detail/canvas/index.vue | 32 +++++----- src/component/Detail/model/index.vue | 58 ++++++++++-------- src/component/Detail/model/modelNav.vue | 8 +-- src/lang/cn.ts | 1 + src/lang/en.ts | 1 + src/store/Detail/designDetail.ts | 1 - src/views/HomeMain.vue | 2 +- 11 files changed, 146 insertions(+), 55 deletions(-) create mode 100644 src/assets/icons/CHelp.svg create mode 100644 src/assets/icons/editFrontBack.svg diff --git a/src/assets/icons/CHelp.svg b/src/assets/icons/CHelp.svg new file mode 100644 index 00000000..f8b7726b --- /dev/null +++ b/src/assets/icons/CHelp.svg @@ -0,0 +1,17 @@ + + + + + + + + diff --git a/src/assets/icons/editFrontBack.svg b/src/assets/icons/editFrontBack.svg new file mode 100644 index 00000000..6977c448 --- /dev/null +++ b/src/assets/icons/editFrontBack.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue b/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue index 2c687311..21762558 100644 --- a/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue +++ b/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue @@ -357,6 +357,8 @@ const handleToolClick = (tool) => { user-select: none; min-width: 5.8rem; height: 100%; + /* overflow-y: auto; */ + /* overflow-x: hidden; */ } .red-green-mode { diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 5f9bcc6e..1845a748 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -59,7 +59,7 @@ :key="positionKey" @canvasReload="canvasReload" @detailEdit="detailEdit" - @addSketch="()=>isEditPattern.value=false" + @addSketch="()=>isEditPattern.value = ''" @revocation="revocation" @oppositeRevocation="oppositeRevocation" > @@ -87,7 +87,7 @@
- +
@@ -36,6 +40,7 @@ --> - - @@ -87,6 +79,10 @@ export default defineComponent({ editCanvas }, props:{ + isEditPattern:{ + type:String, + default:'' + } }, setup(props,{emit}) { const store = useStore(); @@ -114,7 +110,7 @@ export default defineComponent({ canvasLoad:false, canvasConfig:{ } as any, - currentView:'', + currentView:props.isEditPattern, getCanvasIfEdit:inject('getCanvasIfEdit')as any, canvasInstance:null as any, canvasJSON:'', @@ -202,7 +198,7 @@ export default defineComponent({ 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.imageUrl + if(!front?.oldMaskUrl)front.oldMaskUrl = front.maskUrl if(!back?.oldImageUrl)back.oldImageUrl = back.imageUrl if(!front?.oldMaskUrl)store.commit('DesignDetail/updataDetailItem',{maskUrl:front.oldMaskUrl}) @@ -267,9 +263,11 @@ export default defineComponent({ onBeforeUnmount(()=>{ let front = detailData.frontBack.front[detailData.imgDomIndex] let back = detailData.frontBack.back[detailData.imgDomIndex] + if(front?.oldImageUrl)front.imageUrl = front.oldImageUrl if(front?.oldMaskUrl)front.maskUrl = front.oldMaskUrl if(back?.oldImageUrl)back.imageUrl = back.oldImageUrl + console.log(front) if(front?.oldMaskUrl)store.commit('DesignDetail/updataDetailItem',{maskUrl:front.oldMaskUrl}) sessionStorage.removeItem('frontBackEdit'); @@ -279,9 +277,7 @@ export default defineComponent({ }) onMounted(()=>{ nextTick(async ()=>{ - detailData.currentView = 'canvasEditor' - setTimeout(()=>{ - }) + // detailData.currentView = 'canvasEditor' if(detailData.selectDetail.canvasId){ detailData.isShowMark = true await new Promise((resolve, reject) => { diff --git a/src/component/Detail/model/index.vue b/src/component/Detail/model/index.vue index 37921146..c19c3e50 100644 --- a/src/component/Detail/model/index.vue +++ b/src/component/Detail/model/index.vue @@ -4,7 +4,7 @@
- +
@@ -14,7 +14,12 @@ - + + + + + + @@ -65,29 +70,29 @@ export default defineComponent({ } const showDesignImgDetail = (str:any)=>{ new Promise((resolve, reject) => { - // if( - // getDetailListData.isEditPattern.value&& - // detailData?.getCanvasIfEdit?.fun&&detailData?.getCanvasIfEdit?.fun() > 0 - // ){ - // Modal.confirm({ - // title: t('collectionModal.jsContent2'), - // icon: createVNode(ExclamationCircleOutlined), - // okText: 'Yes', - // cancelText: 'No', - // mask:false, - // centered:true, - // onOk() { - // resolve(true) - // emit('detailEdit',str) - // }, - // onCancel(){ - // resolve(false) - // } - // }); - // }else{ + if( + getDetailListData.isEditPattern.value&& + detailData?.getCanvasIfEdit?.fun&&detailData?.getCanvasIfEdit?.fun() > 0 + ){ + Modal.confirm({ + title: t('collectionModal.jsContent2'), + icon: createVNode(ExclamationCircleOutlined), + okText: 'Yes', + cancelText: 'No', + mask:false, + centered:true, + onOk() { + resolve(true) + emit('detailEdit',str) + }, + onCancel(){ + resolve(false) + } + }); + }else{ resolve(true) emit('detailEdit',str) - // } + } }) } const deleteItem = ()=>{ @@ -117,7 +122,7 @@ export default defineComponent({ },1000) } const setBack = ()=>{ - emit('detailEdit','edit') + emit('detailEdit') } onMounted(()=>{ window.addEventListener('resize', handleResize); @@ -196,6 +201,11 @@ export default defineComponent({ @media (min-width: 1024px) { font-size: 2.4rem; } + > img{ + width: 80%; + color: #fff; + height: 80%; + } } > i:hover{ background: #000000; diff --git a/src/component/Detail/model/modelNav.vue b/src/component/Detail/model/modelNav.vue index 00e6f753..45bdb6dc 100644 --- a/src/component/Detail/model/modelNav.vue +++ b/src/component/Detail/model/modelNav.vue @@ -32,10 +32,6 @@ export default defineComponent({ }, emits:['canvasReload','addSketch','deleteItem'], props:{ - isEditPattern:{ - type:Boolean, - default:false, - }, }, setup(props,{emit}) { const store = useStore(); @@ -95,7 +91,9 @@ export default defineComponent({ // }); // }else{ resolve(true) - emit('canvasReload') + if(detailData.selectDetail.id !== item.id){ + emit('canvasReload') + } // } }).then((rv)=>{ if(rv)store.commit('DesignDetail/setDesignColthes',item.id) diff --git a/src/lang/cn.ts b/src/lang/cn.ts index f587818a..51eae368 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -1278,6 +1278,7 @@ export default { SelectBGColor:'选择背景颜色', ok:'确定', editFrontBack:'编辑服装前片后片', + help:'帮助', back:'返回', }, speedList:{ diff --git a/src/lang/en.ts b/src/lang/en.ts index 4512db6d..054059ad 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -1280,6 +1280,7 @@ export default { SelectBGColor:'Select Background Color', ok:'OK', editFrontBack:'Edit the front and back sections', + help:'Help', back:'Back', }, speedList:{ diff --git a/src/store/Detail/designDetail.ts b/src/store/Detail/designDetail.ts index adcd1886..103621c9 100644 --- a/src/store/Detail/designDetail.ts +++ b/src/store/Detail/designDetail.ts @@ -138,7 +138,6 @@ const DesignDetail : Module = { } }, setDesignColthes(state,data){ - console.log(data) if(!state.currentDetailType)state.currentDetailType = 'sketch' //切换选择 // state.currentDetailType = '' diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index 84d4def4..04c28ff3 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -240,7 +240,7 @@
-
+
{{$t('Header.pastDue')}}