diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue index 4868c7b6..58b71c0d 100644 --- a/src/component/WorksPage/newScaleImage.vue +++ b/src/component/WorksPage/newScaleImage.vue @@ -400,7 +400,8 @@ export default defineComponent({ if(imgData.scaleImageData.openSource == 0){ return message.info(t('newScaleImage.jsContent2')) } - router.push({name:'homePage',params: {id:imgData.scaleImageData.id,type:'Works',isDesign:0}}) + router.push({name:'homePage',params: {id:imgData.scaleImageData.id,type:'Works'}}) + store.commit('setChooseIsDesign',false) // router.push({name:'homePage',params: {id:imgData.scaleImageData.userLikeGroupSourceId,type:'Works'}}) } let setCommentReply = (value:any,str:any)=>{ @@ -593,8 +594,6 @@ export default defineComponent({ let commentBtn = parent.querySelector('.left_content_item_unfold') let commentDomSon = el.querySelector('div') let maxHeight = Number((window.getComputedStyle(el).maxHeight).split('px')[0]) - console.log(commentDomSon.offsetHeight , maxHeight); - if(commentDomSon.offsetHeight > maxHeight){ commentBtn.style.display = 'block' }else if(!binding.value.detailUnfold){ diff --git a/src/component/WorksPage/newScaleImageMobile.vue b/src/component/WorksPage/newScaleImageMobile.vue index 17e5db93..e4b8e31c 100644 --- a/src/component/WorksPage/newScaleImageMobile.vue +++ b/src/component/WorksPage/newScaleImageMobile.vue @@ -568,8 +568,6 @@ export default defineComponent({ let commentBtn = parent.querySelector('.left_content_item_unfold') let commentDomSon = el.querySelector('div') let maxHeight = Number((window.getComputedStyle(el).maxHeight).split('px')[0]) - console.log(commentDomSon.offsetHeight , maxHeight); - if(commentDomSon.offsetHeight > maxHeight){ commentBtn.style.display = 'block' }else if(!binding.value.detailUnfold){ diff --git a/src/store/uploadFile/uploadFile.ts b/src/store/uploadFile/uploadFile.ts index 724ae4e5..e901aee3 100644 --- a/src/store/uploadFile/uploadFile.ts +++ b/src/store/uploadFile/uploadFile.ts @@ -22,6 +22,7 @@ interface UploadFiles{ marketingSketchFiles:any, allBoardData:any, //备份的所有数据,点finish之后备份 moodTemplateId:any, + chooseIsDesign:any, } const UploadFilesModule : Module = { @@ -44,6 +45,7 @@ const UploadFilesModule : Module = { marketingSketchFiles:[], allBoardData:{}, moodTemplateId:'', + chooseIsDesign:{value:true}, }, mutations:{ @@ -206,6 +208,9 @@ const UploadFilesModule : Module = { }, setAllBoardDataChoose(state,data){ state.allBoardData = data + }, + setChooseIsDesign(state,data){ + state.chooseIsDesign.value = data }, clearAllData(state){ state.moodboard = [] @@ -224,6 +229,7 @@ const UploadFilesModule : Module = { state.marketingSketchFiles = [] state.moodTemplateId = '' state.disposeMoodboard = [] + state.chooseIsDesign.value = true // state.showSketchboard = [] }, clearAllId(state){ diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue index ce8bd5d1..f053f578 100644 --- a/src/views/HomeView/HomeView.vue +++ b/src/views/HomeView/HomeView.vue @@ -336,7 +336,8 @@ export default defineComponent({ let allBoardData:any = computed(()=>{ return store.state.UploadFilesModule.allBoardData}) let isMannequinShow = ref(false) - let chooseIsDesign:any = ref(1) + let chooseIsDesign:any = computed(()=>{ + return store.state.UploadFilesModule.chooseIsDesign}) return { store, likeDesignCollectionList, @@ -473,7 +474,6 @@ export default defineComponent({ // this.store.commit("clearAllCollection"); } if (this.$route.params.id) { - this.chooseIsDesign = this.$route.params.isDesign if(this.$route.params.type == 'History'){ this.getHistoryChoose(this.$route.params.id, "normal"); }else if(this.$route.params.type == 'Works'){ @@ -607,7 +607,6 @@ export default defineComponent({ _this.store.commit("clearAllCollection"); _this.store.commit("setAllBoardDataChoose",{}); _this.store.commit("clearShowSketchboard",{}); - _this.chooseIsDesign = 1; _this.isHaveReviewCollection = false } }); @@ -667,7 +666,7 @@ export default defineComponent({ //设计新的collection designNewCollection() { - if(this.chooseIsDesign == 0){ + if(!this.chooseIsDesign.value){ message.info(this.t('HomeView.jsContent10')); return } diff --git a/src/views/HomeView/history.vue b/src/views/HomeView/history.vue index 944a002f..70b9ddd8 100644 --- a/src/views/HomeView/history.vue +++ b/src/views/HomeView/history.vue @@ -349,11 +349,13 @@ export default defineComponent({ }, retrieveHome(record:any){ - let num = 1 + let num = true if(record.original == 0){ - num = 0 + num = false } - this.$router.push({name:'homePage',params: {id:record.id,type:'History',isDesign:num}}) + this.$router.push({name:'homePage',params: {id:record.id,type:'History'}}) + this.store.commit('setChooseIsDesign',num) + }, removeLabel(){ let setLabel:any = this.$refs.setLabel