fix: 增加标签

@@ -49,8 +49,10 @@ export struct Card2Component {
       Column() {
       Column() {
         Stack() {
         Stack() {
           //新闻标题
           //新闻标题
-          if (this.contentDTO.objectType == '5') {
-            Notes({ objectType: this.contentDTO.objectType })
+          if (this.contentDTO.newTags) {
+              Notes({ newTags: this.contentDTO.newTags })
+          } else if (this.contentDTO.objectType == '5') {
+              Notes({ objectType: this.contentDTO.objectType })
           }
           }
 
 
           Text() {
           Text() {
@@ -68,9 +70,13 @@ export struct Card2Component {
           .maxLines(2)
           .maxLines(2)
           .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
           .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
           .align(Alignment.Start)
           .align(Alignment.Start)
-          .textIndent(this.contentDTO.objectType == '5' ? 35 : 0)
-        }
-        .alignContent(Alignment.TopStart)
+          .textIndent(this.contentDTO.newTags?.length < 5 && this.contentDTO.newTags?.length > 2 ? 58 :
+          (this.contentDTO.newTags?.length != 0 && this.contentDTO.newTags?.length) ||
+            this.contentDTO.objectType == '5' ? 30 : 0)
+      }.alignContent(Alignment.TopStart)
+          //.textIndent(this.contentDTO.objectType == '5' ? 35 : 0)
+       // }
+       // .alignContent(Alignment.TopStart)
 
 
         //大图
         //大图
         Stack() {
         Stack() {

@@ -4,7 +4,7 @@ import { ProcessUtils } from 'wdRouter';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
-
+import { Notes } from './notes';
 const TAG: string = 'Card4Component';
 const TAG: string = 'Card4Component';
 
 
 /**
 /**
@@ -43,6 +43,11 @@ export struct Card4Component {
     Column() {
     Column() {
       //body
       //body
       Column() {
       Column() {
+      if (this.contentDTO.newTags) {
+          Notes({ newTags: this.contentDTO.newTags })
+       } else if (this.contentDTO.objectType == '5') {
+          Notes({ objectType: this.contentDTO.objectType })
+       }    
         //新闻标题
         //新闻标题
         Text() {
         Text() {
           if (this.titleMarked) {
           if (this.titleMarked) {
@@ -96,6 +101,10 @@ export struct Card4Component {
         this.clicked = true;
         this.clicked = true;
         ProcessUtils.processPage(this.contentDTO)
         ProcessUtils.processPage(this.contentDTO)
       })
       })
+      .textIndent(this.contentDTO.newTags?.length < 5 && this.contentDTO.newTags?.length > 2 ? 58 :
+          (this.contentDTO.newTags?.length != 0 && this.contentDTO.newTags?.length) ||
+            this.contentDTO.objectType == '5' ? 30 : 0)
+      }.alignContent(Alignment.TopStart)
       //bottom 评论等信息
       //bottom 评论等信息
       CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
       CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
     }
     }