Merge remote-tracking branch 'origin/StableVersion' into develop

This commit is contained in:
X1627315083
2024-09-03 16:50:16 +08:00
14 changed files with 190 additions and 148 deletions

View File

@@ -406,7 +406,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)=>{
@@ -621,8 +622,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){

View File

@@ -573,8 +573,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){