fix
This commit is contained in:
@@ -400,7 +400,8 @@ export default defineComponent({
|
|||||||
if(imgData.scaleImageData.openSource == 0){
|
if(imgData.scaleImageData.openSource == 0){
|
||||||
return message.info(t('newScaleImage.jsContent2'))
|
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'}})
|
// router.push({name:'homePage',params: {id:imgData.scaleImageData.userLikeGroupSourceId,type:'Works'}})
|
||||||
}
|
}
|
||||||
let setCommentReply = (value:any,str:any)=>{
|
let setCommentReply = (value:any,str:any)=>{
|
||||||
@@ -593,8 +594,6 @@ export default defineComponent({
|
|||||||
let commentBtn = parent.querySelector('.left_content_item_unfold')
|
let commentBtn = parent.querySelector('.left_content_item_unfold')
|
||||||
let commentDomSon = el.querySelector('div')
|
let commentDomSon = el.querySelector('div')
|
||||||
let maxHeight = Number((window.getComputedStyle(el).maxHeight).split('px')[0])
|
let maxHeight = Number((window.getComputedStyle(el).maxHeight).split('px')[0])
|
||||||
console.log(commentDomSon.offsetHeight , maxHeight);
|
|
||||||
|
|
||||||
if(commentDomSon.offsetHeight > maxHeight){
|
if(commentDomSon.offsetHeight > maxHeight){
|
||||||
commentBtn.style.display = 'block'
|
commentBtn.style.display = 'block'
|
||||||
}else if(!binding.value.detailUnfold){
|
}else if(!binding.value.detailUnfold){
|
||||||
|
|||||||
@@ -568,8 +568,6 @@ export default defineComponent({
|
|||||||
let commentBtn = parent.querySelector('.left_content_item_unfold')
|
let commentBtn = parent.querySelector('.left_content_item_unfold')
|
||||||
let commentDomSon = el.querySelector('div')
|
let commentDomSon = el.querySelector('div')
|
||||||
let maxHeight = Number((window.getComputedStyle(el).maxHeight).split('px')[0])
|
let maxHeight = Number((window.getComputedStyle(el).maxHeight).split('px')[0])
|
||||||
console.log(commentDomSon.offsetHeight , maxHeight);
|
|
||||||
|
|
||||||
if(commentDomSon.offsetHeight > maxHeight){
|
if(commentDomSon.offsetHeight > maxHeight){
|
||||||
commentBtn.style.display = 'block'
|
commentBtn.style.display = 'block'
|
||||||
}else if(!binding.value.detailUnfold){
|
}else if(!binding.value.detailUnfold){
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ interface UploadFiles{
|
|||||||
marketingSketchFiles:any,
|
marketingSketchFiles:any,
|
||||||
allBoardData:any, //备份的所有数据,点finish之后备份
|
allBoardData:any, //备份的所有数据,点finish之后备份
|
||||||
moodTemplateId:any,
|
moodTemplateId:any,
|
||||||
|
chooseIsDesign:any,
|
||||||
}
|
}
|
||||||
|
|
||||||
const UploadFilesModule : Module<UploadFiles,RootState> = {
|
const UploadFilesModule : Module<UploadFiles,RootState> = {
|
||||||
@@ -44,6 +45,7 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
|
|||||||
marketingSketchFiles:[],
|
marketingSketchFiles:[],
|
||||||
allBoardData:{},
|
allBoardData:{},
|
||||||
moodTemplateId:'',
|
moodTemplateId:'',
|
||||||
|
chooseIsDesign:{value:true},
|
||||||
|
|
||||||
},
|
},
|
||||||
mutations:{
|
mutations:{
|
||||||
@@ -206,6 +208,9 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
|
|||||||
},
|
},
|
||||||
setAllBoardDataChoose(state,data){
|
setAllBoardDataChoose(state,data){
|
||||||
state.allBoardData = data
|
state.allBoardData = data
|
||||||
|
},
|
||||||
|
setChooseIsDesign(state,data){
|
||||||
|
state.chooseIsDesign.value = data
|
||||||
},
|
},
|
||||||
clearAllData(state){
|
clearAllData(state){
|
||||||
state.moodboard = []
|
state.moodboard = []
|
||||||
@@ -224,6 +229,7 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
|
|||||||
state.marketingSketchFiles = []
|
state.marketingSketchFiles = []
|
||||||
state.moodTemplateId = ''
|
state.moodTemplateId = ''
|
||||||
state.disposeMoodboard = []
|
state.disposeMoodboard = []
|
||||||
|
state.chooseIsDesign.value = true
|
||||||
// state.showSketchboard = []
|
// state.showSketchboard = []
|
||||||
},
|
},
|
||||||
clearAllId(state){
|
clearAllId(state){
|
||||||
|
|||||||
@@ -336,7 +336,8 @@ export default defineComponent({
|
|||||||
let allBoardData:any = computed(()=>{
|
let allBoardData:any = computed(()=>{
|
||||||
return store.state.UploadFilesModule.allBoardData})
|
return store.state.UploadFilesModule.allBoardData})
|
||||||
let isMannequinShow = ref(false)
|
let isMannequinShow = ref(false)
|
||||||
let chooseIsDesign:any = ref(1)
|
let chooseIsDesign:any = computed(()=>{
|
||||||
|
return store.state.UploadFilesModule.chooseIsDesign})
|
||||||
return {
|
return {
|
||||||
store,
|
store,
|
||||||
likeDesignCollectionList,
|
likeDesignCollectionList,
|
||||||
@@ -473,7 +474,6 @@ export default defineComponent({
|
|||||||
// this.store.commit("clearAllCollection");
|
// this.store.commit("clearAllCollection");
|
||||||
}
|
}
|
||||||
if (this.$route.params.id) {
|
if (this.$route.params.id) {
|
||||||
this.chooseIsDesign = this.$route.params.isDesign
|
|
||||||
if(this.$route.params.type == 'History'){
|
if(this.$route.params.type == 'History'){
|
||||||
this.getHistoryChoose(this.$route.params.id, "normal");
|
this.getHistoryChoose(this.$route.params.id, "normal");
|
||||||
}else if(this.$route.params.type == 'Works'){
|
}else if(this.$route.params.type == 'Works'){
|
||||||
@@ -607,7 +607,6 @@ export default defineComponent({
|
|||||||
_this.store.commit("clearAllCollection");
|
_this.store.commit("clearAllCollection");
|
||||||
_this.store.commit("setAllBoardDataChoose",{});
|
_this.store.commit("setAllBoardDataChoose",{});
|
||||||
_this.store.commit("clearShowSketchboard",{});
|
_this.store.commit("clearShowSketchboard",{});
|
||||||
_this.chooseIsDesign = 1;
|
|
||||||
_this.isHaveReviewCollection = false
|
_this.isHaveReviewCollection = false
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -667,7 +666,7 @@ export default defineComponent({
|
|||||||
|
|
||||||
//设计新的collection
|
//设计新的collection
|
||||||
designNewCollection() {
|
designNewCollection() {
|
||||||
if(this.chooseIsDesign == 0){
|
if(!this.chooseIsDesign.value){
|
||||||
message.info(this.t('HomeView.jsContent10'));
|
message.info(this.t('HomeView.jsContent10'));
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -349,11 +349,13 @@ export default defineComponent({
|
|||||||
},
|
},
|
||||||
|
|
||||||
retrieveHome(record:any){
|
retrieveHome(record:any){
|
||||||
let num = 1
|
let num = true
|
||||||
if(record.original == 0){
|
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(){
|
removeLabel(){
|
||||||
let setLabel:any = this.$refs.setLabel
|
let setLabel:any = this.$refs.setLabel
|
||||||
|
|||||||
Reference in New Issue
Block a user