Merge remote-tracking branch 'origin/main'

@@ -140,7 +140,7 @@ export struct CardSourceInfo {
       }
       }
 
 
       // 评论数
       // 评论数
-      if (!this.isCompInnerSource && Number(this.getContentDtoBean()?.interactData?.commentNum) > 0 &&
+      if ((this.contentDTO.rmhPlatform === 1 || this.contentDTO.source) && !this.isCompInnerSource && Number(this.getContentDtoBean()?.interactData?.commentNum) > 0 &&
       this.showCommentNum()) {
       this.showCommentNum()) {
         Text(`${this.handlerNum(this.getContentDtoBean()?.interactData?.commentNum.toString())}评`)
         Text(`${this.handlerNum(this.getContentDtoBean()?.interactData?.commentNum.toString())}评`)
           .fontSize($r("app.float.font_size_11"))
           .fontSize($r("app.float.font_size_11"))
@@ -148,7 +148,7 @@ export struct CardSourceInfo {
           .flexShrink(0)
           .flexShrink(0)
       } else {
       } else {
 
 
-        if (this.isCompInnerSource && this.contentDTO.interactData && this.contentDTO.interactData?.commentNum > 0) {
+        if ((this.contentDTO.rmhPlatform === 1 || this.contentDTO.source) && this.isCompInnerSource && this.contentDTO.interactData && this.contentDTO.interactData?.commentNum > 0) {
           Text(`${this.handlerNum(this.contentDTO.interactData?.commentNum.toString())}评`)
           Text(`${this.handlerNum(this.contentDTO.interactData?.commentNum.toString())}评`)
             .fontSize($r("app.float.font_size_11"))
             .fontSize($r("app.float.font_size_11"))
             .fontColor($r("app.color.color_B0B0B0"))
             .fontColor($r("app.color.color_B0B0B0"))
@@ -159,7 +159,6 @@ export struct CardSourceInfo {
 
 
     }
     }
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
-    .height(16)
     .margin({ top: this.viewShowData ? 8 : 0 })
     .margin({ top: this.viewShowData ? 8 : 0 })
   }
   }
 
 
@@ -202,11 +201,11 @@ export struct CardSourceInfo {
     }
     }
 
 
     // 评论数
     // 评论数
-    if (!this.isCompInnerSource && Number(this.getContentDtoBean()?.interactData?.commentNum) > 0 &&
+    if ((this.contentDTO.rmhPlatform === 1 || this.contentDTO.source) && !this.isCompInnerSource && Number(this.getContentDtoBean()?.interactData?.commentNum) > 0 &&
     this.showCommentNum()) {
     this.showCommentNum()) {
       have = true
       have = true
     } else {
     } else {
-      if (this.isCompInnerSource && this.contentDTO.interactData && this.contentDTO.interactData?.commentNum > 0) {
+      if ((this.contentDTO.rmhPlatform === 1 || this.contentDTO.source) && this.isCompInnerSource && this.contentDTO.interactData && this.contentDTO.interactData?.commentNum > 0) {
         have = true
         have = true
       }
       }
     }
     }