diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 9a917c9c..ee94e460 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -370,7 +370,7 @@ export default defineComponent({ // } color = list[i].color?.rgba?.r != null?`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:'' gradient = list[i].gradient - if(detailData.currentDetailType == 'sketch' && newData?.sketch){ + if((detailData.currentDetailType == 'sketch' && newData?.sketch) || detailData.isEditPattern.value == 'editSketch'){ color = detailData.designDetail.clothes?.[0]?.color?.rgba?.r?`${detailData.designDetail.clothes?.[0].color.rgba.r} ${detailData.designDetail.clothes[0].color.rgba.g} ${detailData.designDetail.clothes[0].color.rgba.b}`:'' detailData.selectDetail.maskUrl = '' detailData.selectDetail.maskMinioUrl = '' diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue index 3cdf8d69..c132061a 100644 --- a/src/component/Detail/canvas/index.vue +++ b/src/component/Detail/canvas/index.vue @@ -287,7 +287,7 @@ export default defineComponent({ return detailDom?.editCanvas?.getJSON() } const saveCanvas = async (canvasData:any)=>{ - const index = detailData.designDetail.clothes.findIndex(item => item.id === canvasData.id); + const index = detailData.designDetail.clothes.findIndex(item => item.id === canvasData?.id); await new Promise((resolve, reject) => { if(!detailDom?.editCanvas)return resolve() let canvasJSON = detailDom?.editCanvas?.getJSON()