Merge remote-tracking branch 'origin/main'

@@ -91,29 +91,19 @@ export struct CardSourceInfo {
   }
   }
 
 
   build() {
   build() {
-    Flex({ alignItems: ItemAlign.Center }) {
+    Flex({ justifyContent: FlexAlign.Start, direction: FlexDirection.Row }) {
       // 标签
       // 标签
-      if (this.contentDTO.corner) {
-        Text(this.contentDTO.corner)
-          .fontSize($r("app.float.font_size_11"))
-          .fontColor($r("app.color.color_ED2800"))
-          .margin({ right: 6 })
-      }
-      if (this.contentDTO.cornerMark) {
-        Text(this.contentDTO.cornerMark)
+      if (this.contentDTO.cornerMark || this.contentDTO.corner) {
+        Text(this.contentDTO.cornerMark || this.contentDTO.corner)
           .fontSize($r("app.float.font_size_11"))
           .fontSize($r("app.float.font_size_11"))
           .fontColor($r("app.color.color_ED2800"))
           .fontColor($r("app.color.color_ED2800"))
           .margin({ right: 6 })
           .margin({ right: 6 })
+          .flexShrink(0)
       }
       }
+
       // 来源信息
       // 来源信息
-      if (this.contentDTO.rmhPlatform === 1) {
-        Text(this.contentDTO.rmhInfo?.rmhName)
-          .fontSize($r("app.float.font_size_11"))
-          .fontColor($r("app.color.color_B0B0B0"))
-          .maxLines(1)
-          .textOverflow({ overflow: TextOverflow.Ellipsis })
-      } else if (this.contentDTO.source) {
-        Text(`${this.contentDTO.source}`)
+      if (this.contentDTO.rmhPlatform === 1 || this.contentDTO.source) {
+        Text(this.contentDTO.rmhPlatform === 1 ? this.contentDTO.rmhInfo?.rmhName : this.contentDTO.source)
           .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"))
           .maxLines(1)
           .maxLines(1)
@@ -169,6 +159,7 @@ 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 })
   }
   }