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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  电子报优化骨架屏逻辑
  电子报优化骨架屏逻辑
  fix: 18537 精选评论卡-评论有动态表情时不该不展示
  fix: 18537 精选评论卡-评论有动态表情时不该不展示

 export interface commentInfo {
 export interface commentInfo {
   commentTitle: string,
   commentTitle: string,
+  commentPics: string,
   newsTitle: string,
   newsTitle: string,
   userId?: string,
   userId?: string,
   userName?: string,
   userName?: string,

@@ -40,7 +40,6 @@ export struct ENewspaperItemComponent {
       Image(this.newspaperListItemBean.pagePic)
       Image(this.newspaperListItemBean.pagePic)
         .width(px2vp(this.itemPicWidth))
         .width(px2vp(this.itemPicWidth))
         .height(px2vp(this.itemPicHeight))
         .height(px2vp(this.itemPicHeight))
-        .alt($r('app.media.paper_placeholder'))
         .onComplete((event) => {
         .onComplete((event) => {
           if (event?.loadingStatus == 1) {
           if (event?.loadingStatus == 1) {
             this.contentWidth = event?.contentWidth
             this.contentWidth = event?.contentWidth
@@ -50,9 +49,9 @@ export struct ENewspaperItemComponent {
         })
         })
         .objectFit(ImageFit.Fill)
         .objectFit(ImageFit.Fill)
         .zIndex(10)
         .zIndex(10)
-      // newsSkeleton()
-      //   .height('100%')
-      //   .zIndex(1)
+      newsSkeleton()
+        .visibility(this.isShowSkeleton ? Visibility.Visible : Visibility.None)
+        .zIndex(1)
       if (this.contentWidth !== 0) {
       if (this.contentWidth !== 0) {
         Canvas(this.context)
         Canvas(this.context)
           .width(px2vp(this.contentWidth))
           .width(px2vp(this.contentWidth))

@@ -29,6 +29,7 @@ export struct ZhSingleRow06 {
   @State loadImg: boolean = false;
   @State loadImg: boolean = false;
 
 
   async aboutToAppear(): Promise<void> {
   async aboutToAppear(): Promise<void> {
+    console.log('Zh_Single_Row-06', JSON.stringify(this.compDTO.operDataList[0]?.commentInfo))
     this.getInteractDataStatus()
     this.getInteractDataStatus()
     this.loadImg = await onlyWifiLoadImg();
     this.loadImg = await onlyWifiLoadImg();
   }
   }
@@ -101,13 +102,24 @@ export struct ZhSingleRow06 {
           .textOverflow({overflow: TextOverflow.Ellipsis})
           .textOverflow({overflow: TextOverflow.Ellipsis})
           .lineHeight(23)
           .lineHeight(23)
           .fontSize(16)
           .fontSize(16)
+          .margin({bottom: this.compDTO.operDataList[0]?.commentInfo?.commentPics ? 0 : 10})
+          .padding({bottom: this.compDTO.operDataList[0]?.commentInfo?.commentPics ? 0 : 10})
+          .textAlign(TextAlign.Start)
+          .width('100%')
+          .border({width: { bottom: this.compDTO.operDataList[0]?.commentInfo?.commentPics ? 0 : 1 }})
+          .borderColor(0xf4f4f4)
+
+        Text('[动画表情]')
+          .fontWeight(500)
+          .lineHeight(23)
+          .fontSize(16)
           .margin({bottom: 10})
           .margin({bottom: 10})
           .padding({bottom: 10})
           .padding({bottom: 10})
           .textAlign(TextAlign.Start)
           .textAlign(TextAlign.Start)
           .width('100%')
           .width('100%')
           .border({width: {bottom: 1}})
           .border({width: {bottom: 1}})
           .borderColor(0xf4f4f4)
           .borderColor(0xf4f4f4)
-
+          .visibility(this.compDTO.operDataList[0]?.commentInfo?.commentPics ? Visibility.Visible : Visibility.None)
 
 
         Row() {
         Row() {
           Image($r('app.media.icon_clip'))
           Image($r('app.media.icon_clip'))