From 64a96a0cff7d731ce26d039b1f80db389ffd0802 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 15 Sep 2025 13:35:03 +0800 Subject: [PATCH 1/4] fix --- src/views/HomeMain.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index 25c5c6fe..69f3782e 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -349,7 +349,7 @@ export default defineComponent({ const pastDuePage = computed(()=>{ const isAllowedRoute = route.path === '/home/events' || route.path === '/home/works'; const hasNoSystemAccess = userDetail.value.systemList.indexOf(1) === -1; - return !hasNoSystemAccess && !isAllowedRoute; + return hasNoSystemAccess && !isAllowedRoute; }) watch(()=>homeMainData.userDetailLanguage,(newVal)=>{ if(locale.value == newVal || !newVal)return From 06a313c216f6730d5a95ab42bce17070b72703cf Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 16 Sep 2025 11:39:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BA=A2=E7=BB=BF?= =?UTF-8?q?=E5=9B=BE=E6=9B=B4=E6=96=B0=E5=89=8D=E5=90=8E=E7=89=87=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/canvas/index.vue | 2 +- src/component/Detail/detailLeft/module/currentList.vue | 2 ++ src/component/Detail/model/modelPosition.vue | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue index 485fb8dd..875d8d6b 100644 --- a/src/component/Detail/canvas/index.vue +++ b/src/component/Detail/canvas/index.vue @@ -185,7 +185,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 66c719d5..16c5eed2 100644 --- a/src/component/Detail/detailLeft/module/currentList.vue +++ b/src/component/Detail/detailLeft/module/currentList.vue @@ -58,6 +58,8 @@ export default defineComponent({ if(props.type != 'models'){ 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 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; } } } From 26bb4f2d6b620a1f173ff5d48cd07fffc1bc3506 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 16 Sep 2025 12:31:09 +0800 Subject: [PATCH 3/4] fix --- src/component/Detail/detailLeft/module/currentList.vue | 6 +++--- src/component/Detail/detailLeft/sketch.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/component/Detail/detailLeft/module/currentList.vue b/src/component/Detail/detailLeft/module/currentList.vue index 16c5eed2..36094527 100644 --- a/src/component/Detail/detailLeft/module/currentList.vue +++ b/src/component/Detail/detailLeft/module/currentList.vue @@ -56,13 +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 b5895d3a..59dcfa14 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 = '' From ffa60e26b8b19a0082751359e7f4ec38ac7f81fc Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 16 Sep 2025 13:14:20 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddetail=E5=88=87=E6=8D=A2s?= =?UTF-8?q?ketch=E5=89=8D=E5=90=8E=E7=89=87=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/DesignDetail.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 5f9bcc6e..e81ff67e 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