diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 1845a748..7f480dd0 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -302,14 +302,15 @@ export default defineComponent({ if(detailData.currentDetailType == 'sketch' && newData){ 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}`:'' } + console.log(list[i]) let data:any = { changed:false, color, designType:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.designType:list[i].designType, id:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.id:list[i].id, - maskMinioUrl:list[i]?.maskMinioUrl, + maskMinioUrl:(newData && detailData.currentDetailType == 'sketch')?'':list[i]?.maskMinioUrl, // maskUrl:'', - maskUrl:list[i].maskUrl, + maskUrl:(newData && detailData.currentDetailType == 'sketch')?'':list[i]?.maskUrl, // offset:[ // -233.13985, // 406.90964 diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue index bed54f63..b4fa1534 100644 --- a/src/component/Detail/canvas/index.vue +++ b/src/component/Detail/canvas/index.vue @@ -190,7 +190,7 @@ export default defineComponent({ }) } const frontBackChange = (value:any)=>{ - let full = detailData.frontBack.front[detailData.imgDomIndex].undividedLayer || detailData.frontBack.front[detailData.imgDomIndex].imageUrl + let full = detailData.frontBack.front[detailData.imgDomIndex].undividedLayer || detailData.selectDetail.path let size = { ...detailData.canvasConfig, } diff --git a/src/component/Detail/detailLeft/module/currentList.vue b/src/component/Detail/detailLeft/module/currentList.vue index 4684d870..95143250 100644 --- a/src/component/Detail/detailLeft/module/currentList.vue +++ b/src/component/Detail/detailLeft/module/currentList.vue @@ -56,11 +56,13 @@ export default defineComponent({ }) const selectImgItem = (file:any)=>{ if(props.type != 'models'){ - if(!file.resData.minIOPath){ - file.minIOPath = getMinioUrl(file.imgUrl || file.resData.url) + if(!file.resData?.minIOPath){ + file.minIOPath = getMinioUrl(file?.imgUrl || file?.resData?.url) + }else{ + file.minIOPath = file.resData.minIOPath } if(!file.designType){ - file.designType = file.resData.designType + file.designType = file?.resData?.designType } } // store.commit('DesignDetail/setNewDetail',file.resData) diff --git a/src/component/Detail/detailLeft/sketch.vue b/src/component/Detail/detailLeft/sketch.vue index 8ecd33e9..a637ca17 100644 --- a/src/component/Detail/detailLeft/sketch.vue +++ b/src/component/Detail/detailLeft/sketch.vue @@ -76,10 +76,10 @@ export default defineComponent({ selectImgItem(data) return } - data.id = id if(data?.imgUrl)data.url = data.imgUrl let value = { data, + id, } if(detailData.currentDetailType == 'sketch'){ detailData.selectDetail.sketchString = '' diff --git a/src/component/Detail/model/modelPosition.vue b/src/component/Detail/model/modelPosition.vue index deb47ba9..c7edf80a 100644 --- a/src/component/Detail/model/modelPosition.vue +++ b/src/component/Detail/model/modelPosition.vue @@ -481,7 +481,7 @@ export default defineComponent({ align-items: center; justify-content: center; img{ - height: auto; + // height: auto; } } }