developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
yumaochao
ca1b74c0 1 parent 41aa1ef3

fix：somebug

Inline Side-by-side
Showing 2 changed files with 14 additions and 4 deletions
@@ -174,6 +174,7 @@ export struct CardMediaInfo { @@ -174,6 +174,7 @@ export struct CardMediaInfo {
174 .mediaLogo() 174 .mediaLogo()
175 Text(`${this.contentDTO.photoNum}`) 175 Text(`${this.contentDTO.photoNum}`)
176 .mediaTextImgtype() 176 .mediaTextImgtype()
  177 + .fontFamily('BebasNeue')
177 } 178 }
178 .margin({ left: 80,top: 55}) 179 .margin({ left: 80,top: 55})
179 180
@@ -63,10 +63,15 @@ export struct Card2Component { @@ -63,10 +63,15 @@ export struct Card2Component {
63 Stack() { 63 Stack() {
64 if(this.contentDTO.objectType == '5'){ 64 if(this.contentDTO.objectType == '5'){
65 Notes({ objectType: this.contentDTO.objectType }).height(30).align(Alignment.Center) 65 Notes({ objectType: this.contentDTO.objectType }).height(30).align(Alignment.Center)
66 - } else {  
67 - if (this.contentDTO.seoTags) { 66 + }else if(this.contentDTO.objectType == '2'){
  67 + if(this.contentDTO.seoTags){
68 Notes({ newTags: this.contentDTO.seoTags }).height(30).align(Alignment.Center) 68 Notes({ newTags: this.contentDTO.seoTags }).height(30).align(Alignment.Center)
69 - } else if (this.contentDTO.newTags) { 69 + }else if(this.contentDTO.newTags){
  70 + Notes({ newTags: this.contentDTO.newTags }).height(30).align(Alignment.Center)
  71 +
  72 + }
  73 + }else {
  74 + if(this.contentDTO.newTags){
70 Notes({ newTags: this.contentDTO.newTags }).height(30).align(Alignment.Center) 75 Notes({ newTags: this.contentDTO.newTags }).height(30).align(Alignment.Center)
71 } 76 }
72 } 77 }
@@ -86,7 +91,11 @@ export struct Card2Component { @@ -86,7 +91,11 @@ export struct Card2Component {
86 .lineHeight(27) 91 .lineHeight(27)
87 .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。 92 .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
88 .align(Alignment.Start) 93 .align(Alignment.Start)
89 - .textIndent(this.calculateTextIndent()) 94 + .textIndent(
  95 + (this.contentDTO.objectType === '2' && (this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) > 2 && (this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) < 5) ? 58 :
  96 + (this.contentDTO.objectType === '2' && (this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) > 0 || this.contentDTO.objectType === '5') ? 35 :
  97 + 0
  98 + )
90 }.alignContent(Alignment.TopStart) 99 }.alignContent(Alignment.TopStart)
91 100
92 //.textIndent(this.contentDTO.objectType == '5' ? 35 : 0) 101 //.textIndent(this.contentDTO.objectType == '5' ? 35 : 0)