diff --git a/src/component/HomePage/Cropper.vue b/src/component/HomePage/Cropper.vue index 4988b3db..f6d9661a 100644 --- a/src/component/HomePage/Cropper.vue +++ b/src/component/HomePage/Cropper.vue @@ -30,7 +30,7 @@ :outputSize="option.size" :outputType="option.outputType" :auto-crop="option.autoCrop" - :fixedBox="!isRound" + :fixedBox="isRound" :movable="true" :fixed="isRound" :auto-crop-width="option.autoCropWidth" @@ -333,6 +333,7 @@ export default defineComponent({ .cut_picture_review_block{ width: 100%; height: calc(100% - 6.8rem*1.2); + min-height: calc(100% - 6.8rem*1.2); margin: 0 auto; .next_step_button{ margin-top: 2rem; diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue index 7d5c54d7..b77d8f86 100644 --- a/src/component/WorksPage/newScaleImage.vue +++ b/src/component/WorksPage/newScaleImage.vue @@ -276,6 +276,7 @@ import { Modal,message } from "ant-design-vue"; import { useI18n } from 'vue-i18n'; import { ExclamationCircleOutlined } from '@ant-design/icons-vue'; import fullScreenImg from '@/component/HomePage/fullScreenImg.vue' +import { debounce } from 'lodash-es' export default defineComponent({ components:{fullScreenImg}, @@ -437,26 +438,26 @@ export default defineComponent({ }) } - let setChoose = async () =>{ + let setChoose = debounce(async()=>{ if(userDetail.value.systemList.indexOf(1) == -1){ - return message.info(t('newScaleImage.jsContent1')) - } + return message.info(t('newScaleImage.jsContent1')) + } - 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')) - } - let id = await getWorks(imgData.scaleImageData.id) - router.push(`/home/history/${id}`) - // router.push({name:'home',params: {id:imgData.scaleImageData.id,type:'Works'}}) - store.commit('setChooseIsDesign',false) - // router.push({name:'homePage',params: {id:imgData.scaleImageData.userLikeGroupSourceId,type:'Works'}}) - } + 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')) + } + let id = await getWorks(imgData.scaleImageData.id) + router.push(`/home/history/${id}`) + // router.push({name:'home',params: {id:imgData.scaleImageData.id,type:'Works'}}) + store.commit('setChooseIsDesign',false) + },300) + let setCommentReply = (value:any,str:any)=>{ imgData.commentReply.leve1Id = value.id imgData.commentReply.leve2Id = null diff --git a/src/component/home/design/collection/MoodboardUpload.vue b/src/component/home/design/collection/MoodboardUpload.vue index f938579d..9afe46aa 100644 --- a/src/component/home/design/collection/MoodboardUpload.vue +++ b/src/component/home/design/collection/MoodboardUpload.vue @@ -711,10 +711,9 @@ export default defineComponent({ top: 50%; left: 50%; transform: translate(-50%,-50%); - float: left; - object-fit: contain; - user-select:none; - -webkit-user-drag: none; + // float: left; + // user-select:none; + // -webkit-user-drag: none; } } .wh1{ diff --git a/src/component/home/design/collection/PrintboardUpload.vue b/src/component/home/design/collection/PrintboardUpload.vue index 531b3782..636a7412 100644 --- a/src/component/home/design/collection/PrintboardUpload.vue +++ b/src/component/home/design/collection/PrintboardUpload.vue @@ -145,7 +145,7 @@ - +