Showing
1 changed file
with
10 additions
and
8 deletions
| @@ -2,13 +2,13 @@ import { ContentDTO } from 'wdBean'; | @@ -2,13 +2,13 @@ import { ContentDTO } from 'wdBean'; | ||
| 2 | import { CommonConstants } from 'wdConstant'; | 2 | import { CommonConstants } from 'wdConstant'; |
| 3 | import { ProcessUtils } from 'wdRouter'; | 3 | import { ProcessUtils } from 'wdRouter'; |
| 4 | import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; | 4 | import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; |
| 5 | +import { Notes } from './notes'; | ||
| 5 | 6 | ||
| 6 | const TAG: string = 'Card5Component'; | 7 | const TAG: string = 'Card5Component'; |
| 7 | 8 | ||
| 8 | /** | 9 | /** |
| 9 | * 卡片样式:"appStyle":"5" 头图卡 | 10 | * 卡片样式:"appStyle":"5" 头图卡 |
| 10 | */ | 11 | */ |
| 11 | -// @Entry | ||
| 12 | @Component | 12 | @Component |
| 13 | export struct Card5Component { | 13 | export struct Card5Component { |
| 14 | @State contentDTO: ContentDTO = {} as ContentDTO; | 14 | @State contentDTO: ContentDTO = {} as ContentDTO; |
| @@ -37,20 +37,22 @@ export struct Card5Component { | @@ -37,20 +37,22 @@ export struct Card5Component { | ||
| 37 | ] | 37 | ] |
| 38 | }) | 38 | }) |
| 39 | Row() { | 39 | Row() { |
| 40 | - if (this.titleShowPolicy === 1) { | 40 | + Stack() { |
| 41 | + if (this.contentDTO.objectType == '5') { | ||
| 42 | + Notes({ objectType: this.contentDTO.objectType }) | ||
| 43 | + } | ||
| 41 | Text(this.contentDTO.newsTitle) | 44 | Text(this.contentDTO.newsTitle) |
| 42 | - .width(CommonConstants.FULL_WIDTH) | ||
| 43 | - .height(CommonConstants.FULL_HEIGHT) | 45 | + .width(CommonConstants.FULL_WIDTH)// .height(CommonConstants.FULL_HEIGHT) |
| 44 | .fontColor(Color.White) | 46 | .fontColor(Color.White) |
| 45 | .fontSize($r('app.float.normal_text_size')) | 47 | .fontSize($r('app.float.normal_text_size')) |
| 46 | .fontWeight(FontWeight.Bold) | 48 | .fontWeight(FontWeight.Bold) |
| 47 | .maxLines(2) | 49 | .maxLines(2) |
| 48 | - .align(Alignment.Bottom) | ||
| 49 | - } | ||
| 50 | - | 50 | + .align(Alignment.TopStart) |
| 51 | + .textIndent(this.contentDTO.objectType == '5' ? 40 : 0) | ||
| 52 | + }.alignContent(Alignment.TopStart) | ||
| 51 | } | 53 | } |
| 52 | .justifyContent(FlexAlign.Start) | 54 | .justifyContent(FlexAlign.Start) |
| 53 | - .height(40) | 55 | + // .height(40) |
| 54 | .margin({ left: 12, bottom: 10, right: 12 }) | 56 | .margin({ left: 12, bottom: 10, right: 12 }) |
| 55 | } | 57 | } |
| 56 | } | 58 | } |
-
Please register or login to post a comment