Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

@@ -258,7 +258,7 @@ export struct MorningEveningPaperComponent {
             })
             })
         }
         }
       }
       }
-      .height(`calc(100% - ${this.bottomSafeHeight + this.topSafeHeight + 'vp'})`)
+      .height(`calc(100% - ${this.bottomSafeHeight + this.topSafeHeight + 'vp'})`).scrollBar(BarState.Off)
 
 
       PaperTitleComponent()
       PaperTitleComponent()
     }
     }

@@ -412,7 +412,7 @@ export struct PaperSingleColumn999CardView {
     } else if (hours < 24) {
     } else if (hours < 24) {
       result = `${hours}小时前`;
       result = `${hours}小时前`;
     } else {
     } else {
-      result = `${days}天前`;
+      result = '';
     }
     }
 
 
     console.log(result);
     console.log(result);
@@ -422,12 +422,13 @@ export struct PaperSingleColumn999CardView {
   build() {
   build() {
     Column() {
     Column() {
       Text(this.item?.newsTitle)
       Text(this.item?.newsTitle)
+        .fontColor('#222222')
         .fontSize(16)
         .fontSize(16)
         .fontWeight(FontWeight.Bold)
         .fontWeight(FontWeight.Bold)
         .alignSelf(ItemAlign.Start)
         .alignSelf(ItemAlign.Start)
         .maxLines(3)
         .maxLines(3)
         .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
         .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
-        .margin({ left: 22, right: 22, top: 28 })
+        .margin({ left: 16, right: 16, top: 16 })
       if (this.item?.coverUrl) {
       if (this.item?.coverUrl) {
         Stack({ alignContent: Alignment.BottomEnd }) {
         Stack({ alignContent: Alignment.BottomEnd }) {
           Image(this.item?.coverUrl)
           Image(this.item?.coverUrl)
@@ -462,35 +463,36 @@ export struct PaperSingleColumn999CardView {
             .width(CommonConstants.FULL_PARENT)
             .width(CommonConstants.FULL_PARENT)
             .justifyContent(FlexAlign.End)
             .justifyContent(FlexAlign.End)
           }
           }
-        }.margin({ left: 22, right: 22 })
+        }.margin({ left: 16, right: 16 })
       }
       }
       if (this.item?.newsSummary) {
       if (this.item?.newsSummary) {
         Text(this.item?.newsSummary)
         Text(this.item?.newsSummary)
+          .fontColor('#6666666')
           .fontSize(14)
           .fontSize(14)
           .padding({ top: 10 })
           .padding({ top: 10 })
           .alignSelf(ItemAlign.Start)
           .alignSelf(ItemAlign.Start)
           .maxLines(3)
           .maxLines(3)
           .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
           .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
-          .margin({ left: 22, right: 22 })
+          .margin({ left: 16, right: 16 })
       }
       }
       if (this.item) {
       if (this.item) {
         Row() {
         Row() {
           Row() {
           Row() {
             Text(this.item?.source)
             Text(this.item?.source)
               .fontSize(12)
               .fontSize(12)
-              .fontColor(Color.Gray)
-              .margin({ left: 22 })
+              .fontColor('#B0B0B0')
+              .margin({ left: 16 })
             Image($r('app.media.point'))
             Image($r('app.media.point'))
               .width(16)
               .width(16)
               .height(16)
               .height(16)
               .margin({ top: 10, bottom: 10 })
               .margin({ top: 10, bottom: 10 })
             Text(this.getPublishTime())
             Text(this.getPublishTime())
               .fontSize(12)
               .fontSize(12)
-              .fontColor(Color.Gray)
-            if (this.interactData && this.interactData.commentNum && Number(this.interactData.collectNum) > 0) {
+              .fontColor('#B0B0B0')
+            if (this.item.objectType != '2' && this.interactData && this.interactData.commentNum && Number(this.interactData.collectNum) > 0) {
               Text(this.interactData.commentNum + "评")
               Text(this.interactData.commentNum + "评")
                 .fontSize(12)
                 .fontSize(12)
-                .fontColor(Color.Gray)
+                .fontColor('#B0B0B0')
                 .margin({ left: 6 })
                 .margin({ left: 6 })
             }
             }
           }
           }