developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
张善主
b710d9df 2 parents b6a461ef c37c5bd9

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 2 changed files with 7 additions and 7 deletions
@@ -28,6 +28,11 @@ export struct CardSourceInfo { @@ -28,6 +28,11 @@ export struct CardSourceInfo {
28 .maxLines(1) 28 .maxLines(1)
29 .textOverflow({ overflow: TextOverflow.Ellipsis }) 29 .textOverflow({ overflow: TextOverflow.Ellipsis })
30 } 30 }
  31 + if (((this.contentDTO.rmhPlatform === 1 && this.contentDTO.rmhInfo?.rmhName && this.contentDTO.rmhInfo?.rmhName != '') || (this.contentDTO.source && this.contentDTO.source != '')) && (this.getContentDtoBean()?.interactData?.commentNum || DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)) != '')) {
  32 + Image($r("app.media.point"))
  33 + .width(16)
  34 + .height(16)
  35 + }
31 // 新闻tab下的卡片，2天之前的不显示时间。但是如果是搜索情况下展示的卡片，显示时间 36 // 新闻tab下的卡片，2天之前的不显示时间。但是如果是搜索情况下展示的卡片，显示时间
32 if (this.contentDTO.isSearch || this.contentDTO.isCollection || 37 if (this.contentDTO.isSearch || this.contentDTO.isCollection ||
33 !this.contentDTO.isSearch && DateTimeUtils.getCommentTime 38 !this.contentDTO.isSearch && DateTimeUtils.getCommentTime
@@ -36,12 +41,6 @@ export struct CardSourceInfo { @@ -36,12 +41,6 @@ export struct CardSourceInfo {
36 .contentDTO.publishTime)) 41 .contentDTO.publishTime))
37 .indexOf 42 .indexOf
38 ('-') === -1) { 43 ('-') === -1) {
39 - if (this.contentDTO.rmhPlatform === 1 && this.contentDTO.rmhInfo?.rmhName || this  
40 - .contentDTO.rmhPlatform !== 1 && this.contentDTO.source) {  
41 - Image($r("app.media.point"))  
42 - .width(16)  
43 - .height(16)  
44 - }  
45 Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime))) 44 Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
46 .fontSize($r("app.float.font_size_11")) 45 .fontSize($r("app.float.font_size_11"))
47 .fontColor($r("app.color.color_B0B0B0")) 46 .fontColor($r("app.color.color_B0B0B0"))
@@ -13,8 +13,9 @@ export struct PeopleShipHomePageHeadComponent { @@ -13,8 +13,9 @@ export struct PeopleShipHomePageHeadComponent {
13 .width(this.diameter) 13 .width(this.diameter)
14 .height(this.diameter) 14 .height(this.diameter)
15 .borderRadius(this.diameter/2) 15 .borderRadius(this.diameter/2)
16 - .borderWidth('1vp') 16 + .borderWidth('0.5vp')
17 .borderStyle(BorderStyle.Solid) 17 .borderStyle(BorderStyle.Solid)
  18 + .shadow({radius: 10, color: '#222226bd'})
18 .borderColor(Color.White) 19 .borderColor(Color.White)
19 .objectFit(ImageFit.Cover) 20 .objectFit(ImageFit.Cover)
20 .backgroundColor(Color.White) 21 .backgroundColor(Color.White)