diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 322aef5a..0aa9a4ab 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -312,6 +312,7 @@ export default defineComponent({ detailData.selectDetail.maskUrl = '' detailData.selectDetail.maskMinioUrl = '' } + console.log(list[i]) let data:any = { changed:false, color, diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue index 9d3d59cc..437de717 100644 --- a/src/component/Detail/canvas/index.vue +++ b/src/component/Detail/canvas/index.vue @@ -10,7 +10,7 @@ @canvasInit="canvasInit" @changeCanvas="changeCanvas" is-edit - :clothingImageUrl="selectDetail.undividedLayer || selectDetail.path" + :clothingImageUrl="selectDetail?.undividedLayerWithSinglePrint || selectDetail.undividedLayer || selectDetail.path" showFixedLayer :canvasJSON="canvasJSON" :clothing-image-opts="{ @@ -136,7 +136,7 @@ export default defineComponent({ }else{ if(detailData.currentView === 'redGreenExample'){ nextTick(()=>{ - setCanvas(detailData.selectDetail.undividedLayer || detailData.selectDetail.path).then(()=>{ + setCanvas(detailData.selectDetail?.undividedLayerWithSinglePrint || detailData.selectDetail.undividedLayer || detailData.selectDetail.path).then(()=>{ detailData.canvasLoad = true }) }) @@ -222,7 +222,7 @@ export default defineComponent({ const frontBackChange = (value:any)=>{ - let full = detailData.frontBack.front[detailData.imgDomIndex].undividedLayer || detailData.selectDetail.path + let full = detailData.frontBack.front[detailData.imgDomIndex]?.undividedLayerWithSinglePrint || detailData.frontBack.front[detailData.imgDomIndex].undividedLayer || detailData.selectDetail.path let size = { ...detailData.canvasConfig, } @@ -244,7 +244,6 @@ export default defineComponent({ } const canvasInit = (value:any)=>{ - // detailDom.editCanvas.addImageToLayer(detailData.selectDetail.undividedLayer,{layerId:value.layers.value[0].id,imageMode:'contains',undoable:false}) detailData.canvasInstance = value detailData.getCanvasIfEdit.fun = getCanvasLength detailData.isShowMark = false @@ -328,7 +327,7 @@ export default defineComponent({ }); }) } - setCanvas(detailData.selectDetail.undividedLayer || detailData.selectDetail.path).then(()=>{ + setCanvas(detailData.selectDetail?.undividedLayerWithSinglePrint || detailData.selectDetail.undividedLayer || detailData.selectDetail.path).then(()=>{ detailData.canvasLoad = true }) }) diff --git a/src/component/Detail/detailRight/editPrintElement.vue b/src/component/Detail/detailRight/editPrintElement.vue index f4f0e940..44b7b361 100644 --- a/src/component/Detail/detailRight/editPrintElement.vue +++ b/src/component/Detail/detailRight/editPrintElement.vue @@ -202,6 +202,7 @@ export default defineComponent({ }) } const addPrintELement = async (data:any)=>{ + console.log(data) let {scale,location} = await setScaleLocation(data) let item = { angle:0, diff --git a/src/store/Detail/designDetail.ts b/src/store/Detail/designDetail.ts index 967dff0f..d12bc315 100644 --- a/src/store/Detail/designDetail.ts +++ b/src/store/Detail/designDetail.ts @@ -72,11 +72,13 @@ const DesignDetail : Module = { // front[index].style.zIndex = v.priority front[index].id = v.id front[index].undividedLayer = v.undividedLayer + front[index].undividedLayerWithSinglePrint = v?.undividedLayerWithSinglePrint }else{ back[index] = v.layersObject[i] back[index].style.zIndex = v.priority back[index].id = v.id back[index].undividedLayer = v.undividedLayer + back[index].undividedLayerWithSinglePrint = v?.undividedLayerWithSinglePrint // back[index].style.zIndex = backIndex==0?v.layersObject[i]:backIndex++ } if(state.printZIndex < v.priority){ @@ -194,6 +196,7 @@ const DesignDetail : Module = { trims:null, type:null, undividedLayer:null, + undividedLayerWithSinglePrint:null, } if(!state.currentDetailType)state.currentDetailType = 'sketch' state.designDetail.clothes.forEach((item:any) => { @@ -225,6 +228,7 @@ const DesignDetail : Module = { await new Promise((resolve, reject) => { if(!state.frontBack?.body?.path){ state.frontBack.front[0].undividedLayer = value.rv.clothes[0].undividedLayer + state.frontBack.front[0].undividedLayerWithSinglePrint = value.rv.clothes[0]?.undividedLayerWithSinglePrint resolve('') } const img = new Image(); @@ -255,11 +259,13 @@ const DesignDetail : Module = { // state.frontBack.front[index].style.zIndex = v.priority state.frontBack.front[index].id = item.id state.frontBack.front[index].undividedLayer = item.undividedLayer + state.frontBack.front[index].undividedLayerWithSinglePrint = item?.undividedLayerWithSinglePrint }else{ state.frontBack.back[index] = item.layersObject[i] // state.frontBack.back[index].style.zIndex = v.priority state.frontBack.back[index].id = item.id state.frontBack.back[index].undividedLayer = item.undividedLayer + state.frontBack.back[index].undividedLayerWithSinglePrint = item?.undividedLayerWithSinglePrint } } } @@ -295,6 +301,7 @@ const DesignDetail : Module = { gradient:item.gradient, } state.selectDetail.undividedLayer = item.undividedLayer + state.selectDetail.undividedLayerWithSinglePrint = item?.undividedLayerWithSinglePrint if(state.selectDetail.newDetail?.sketch?.id && !state.selectDetail.id){ state.designDetail.clothes.push(state.selectDetail) }