diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index fed0013e..92313e5b 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -298,7 +298,8 @@ export default defineComponent({ // 0.35822305 // ] let isCurrent = list[i].id == detailData?.selectDetail?.id - let color = (detailData.currentDetailType == 'color' && isCurrent && newData?.rgba?.r)?(newData?.rgba?.r?`${newData.rgba.r} ${newData.rgba.g} ${newData.rgba.b}`:''):(list[i].color?.rgba?.r?`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:'') + console.log(isCurrent,newData) + let color = (detailData.currentDetailType == 'color' && isCurrent)?(newData?.rgba?.r?`${newData.rgba.r} ${newData.rgba.g} ${newData.rgba.b}`:''):(list[i].color?.rgba?.r?`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:'') 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}`:'' detailData.selectDetail.maskUrl = '' diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue index 87573f2d..49b1caad 100644 --- a/src/component/WorksPage/newScaleImage.vue +++ b/src/component/WorksPage/newScaleImage.vue @@ -440,8 +440,13 @@ export default defineComponent({ if(userDetail.value.systemList.indexOf(1) == -1){ return message.info(t('newScaleImage.jsContent1')) } - return message.info(t('newScaleImage.jsContent2')) + const targetDate = new Date('2025-09-01T00:00:00'); + // 解析输入日期字符串 + const inputDate = new Date(imgData.scaleImageData.createDate); + if(inputDate < targetDate){ + return message.info(t('newScaleImage.jsContent2')) + } if(imgData.scaleImageData.openSource == 0){ return message.info(t('newScaleImage.jsContent2')) }