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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix: 20234 【uat】 进入热点，查看“英姿飒爽！武警女兵进行课目训练太帅了”卡片图片，卡片图片拉伸了，预期不拉申
  fix: 19537 【UI走查-卡片】折叠屏展开-人民号动态视频卡
  fix: 19535 【UI走查-卡片】折叠屏展开-人民号小视频卡
  fix: 19533 【UI走查-卡片】折叠屏展开-所有带图片的卡片，图片都要增加一个描边
  fix: 19532 【UI走查-卡片】折叠屏展开-人民号三图卡
  fix: 19531 【UI走查-卡片】折叠屏展开-人民号单图卡
  fix |> 修复进入人民号文章详情页，鸿蒙显示最新评论
  fix: 轮播图只有一条数据时折叠屏展开适配
  fix: 直播预告卡折叠屏展开适配

@@ -155,6 +155,7 @@ export struct RmhTitle {
           .height(21)
           .lineHeight(21)
           .margin({bottom: 1})
+
         Flex({alignContent: FlexAlign.Start, wrap: FlexWrap.NoWrap}) {
           Row() {
             if (!(this.hideTime && this.getDaysBetweenDates(Number(this.publishTime)) > 2)) {
@@ -184,9 +185,9 @@ export struct RmhTitle {
             }
 
           }
-          .width('75%')
           .height(14)
         }
+        .width('calc(100% - 36vp - 8vp)')
       }
       .justifyContent(FlexAlign.SpaceBetween)
 

@@ -41,9 +41,12 @@ export struct CardAdvBigImageComponent {
         .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
         .width(CommonConstants.FULL_WIDTH)
         .aspectRatio(16 / 9)
-        .borderRadius(4)
-        .borderWidth(0.5)
-        .borderColor($r('app.color.color_0D000000'))
+        .border({
+          width: 0.5,
+          color: '#0D000000',  // 5% 透明度的黑色
+          style: BorderStyle.Solid,
+          radius: 4
+        })
         .width(CommonConstants.FULL_WIDTH)
 
       CardAdvBottom({pageModel:this.pageModel,compDTO:this.compDTO}).margin({

@@ -51,9 +51,12 @@ export struct CardAdvGanMiComponent {
             .width(CommonConstants.FULL_WIDTH)
             .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
             .aspectRatio(343 / 40)
-            .borderRadius(4)
-            .borderWidth(0.5)
-            .borderColor($r('app.color.color_0D000000'))
+            .border({
+              width: 0.5,
+              color: '#0D000000',  // 5% 透明度的黑色
+              style: BorderStyle.Solid,
+              radius: 4
+            })
 
           // 广告标签和删除功能
           CardAdvTop({ pageModel: this.pageModel, compDTO: this.compDTO })
@@ -79,9 +82,12 @@ export struct CardAdvGanMiComponent {
                 .width('100%')
                 .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
                 .aspectRatio(150 / 84)
-                .borderWidth(0.5)
-                .borderColor($r('app.color.color_0D000000'))
-                .borderRadius(4)
+                .border({
+                  width: 0.5,
+                  color: '#0D000000',  // 5% 透明度的黑色
+                  style: BorderStyle.Solid,
+                  radius: 4
+                })
 
               Text(content.title)
                 .fontSize('16fp')

@@ -44,9 +44,12 @@ export struct CardAdvLongImageComponent {
         .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
         .width(CommonConstants.FULL_WIDTH)
         .aspectRatio(343 / 96)
-        .borderRadius(4)
-        .borderWidth(0.5)
-        .borderColor($r('app.color.color_0D000000'))
+        .border({
+          width: 0.5,
+          color: '#0D000000',  // 5% 透明度的黑色
+          style: BorderStyle.Solid,
+          radius: 4
+        })
 
       CardAdvBottom({ pageModel: this.pageModel, compDTO:this.compDTO }).margin({
         top: 8,

@@ -66,6 +66,7 @@ export struct CardAdvSmallImageComponent {
         .borderWidth(0.5)
         .borderColor($r('app.color.color_0D000000'))
         .borderRadius(4)//.alt('wwww.baidu.com')
+        .borderStyle(BorderStyle.Solid)
         .alignRules({
           top: { anchor: 'title_name', align: VerticalAlign.Top },
           left: { anchor: 'title_name', align: HorizontalAlign.End },

@@ -57,6 +57,8 @@ export struct CardAdvThreeImageComponent {
                       bottomRight: index === 2 ? $r('app.float.image_border_radius') : 0,
                     })
                     .borderColor($r('app.color.color_0D000000'))
+                    .borderStyle(BorderStyle.Solid)
+                    .borderWidth(0.5)
                 }
               }
             })

@@ -47,6 +47,7 @@ export struct CardAdvVideoComponent {
           .borderRadius(4)
           .borderWidth(0.5)
           .borderColor($r('app.color.color_0D000000'))
+          .borderStyle(BorderStyle.Solid)
         //播放状态+时长
         CardMediaInfo({
           contentDTO: this.contentDTO, livePeopleNum:false,

@@ -49,6 +49,7 @@ export struct CardAdvVideoExComponent {
           .borderRadius(4)
           .borderWidth(0.5)
           .borderColor($r('app.color.color_0D000000'))
+          .borderStyle(BorderStyle.Solid)
           .onClick(() => {
             ProcessUtils.openAdvDetail(this.compDTO.matInfo)
 

@@ -122,6 +122,9 @@ export struct Card10Component {
             topLeft: $r('app.float.image_border_radius'),
             topRight: $r('app.float.image_border_radius')
           })
+          .borderStyle(BorderStyle.Solid)
+          .borderWidth(0.5)
+          .borderColor($r('app.color.color_0D000000'))
           .onClick((event: ClickEvent) => {
             InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
             ProcessUtils.processPage(this.contentDTO)
@@ -246,13 +249,16 @@ export struct Card10ComponentTimelineItem {
             .backgroundColor(0xf5f5f5)
             .width(117)
             .height(78)
-            .objectFit(ImageFit.Cover)
+            .objectFit(ImageFit.Contain)
             .borderRadius($r('app.float.image_border_radius'))
-            .margin({ left: 12 })
+            .borderStyle(BorderStyle.Solid)
+            .borderWidth(0.5)
+            .borderColor($r('app.color.color_0D000000'))
           CardMediaInfo({
             contentDTO: this.createMediaInfoContent(this.slideItem)
           })
         }
+        .margin({ left: 12 })
         .alignContent(Alignment.BottomEnd)
         .height(78)
       } else {

@@ -78,13 +78,18 @@ export struct Card14Component {
           .fontFamily('PingFang SC-Regular')
           .textAlign(TextAlign.Start)
           .margin({right: 12})
-          .width('64%')
+          .width('calc(100% - 117vp - 12vp)')
 
         Image(this.loadImg ? this.contentDTO.fullColumnImgUrls?.[0]?.url || this.contentDTO.fullColumnImgUrls?.[0]?.fullUrl : '')
-          .backgroundColor(0xf5f5f5)
+        .backgroundColor(0xf5f5f5)
           .aspectRatio(3 / 2)
           .height(78)
           .borderRadius($r('app.float.image_border_radius'))
+          .border({
+            width: 1,
+            color: '#0D000000'
+          })
+          .borderStyle(BorderStyle.Solid)
         .backgroundImageSize(ImageSize.Auto)
 
       }

@@ -83,6 +83,9 @@ export struct Card15Component {
         Image(this.loadImg ? this.contentDTO.fullColumnImgUrls?.[0]?.url || this.contentDTO.fullColumnImgUrls?.[0]?.fullUrl : '')
           .backgroundColor(0xf5f5f5)
           .borderRadius($r('app.float.image_border_radius'))
+          .borderStyle(BorderStyle.Solid)
+          .borderWidth(0.5)
+          .borderColor($r('app.color.color_0D000000'))
         //播放状态+时长
         CardMediaInfo({
           contentDTO: this.contentDTO

@@ -101,13 +101,16 @@ export struct Card16Component {
                         bottomLeft: index === 0 ? $r('app.float.image_border_radius') : 0,
                         bottomRight: index === 2 ? $r('app.float.image_border_radius') : 0,
                       })
+                      .border({
+                        width: 1,
+                        color: '#0D000000'
+                      })
                   }
                 }
               })
             }
           }
           .width(CommonConstants.FULL_PARENT)
-          .margin({ top: 8 })
           CardMediaInfo({
             contentDTO: this.contentDTO
           })
@@ -175,6 +178,10 @@ struct createImg {
               .width(CommonConstants.FULL_WIDTH)
               .aspectRatio(16 / 9)
               .borderRadius($r('app.float.image_border_radius'))
+              .border({
+                width: 1,
+                color: '#0D000000'
+              })
             CardMediaInfo({ contentDTO: this.contentDTO })
           }
           .align(Alignment.BottomEnd)
@@ -189,6 +196,10 @@ struct createImg {
               .backgroundColor(0xf5f5f5)
               .width(CommonConstants.FULL_WIDTH)
               .borderRadius($r('app.float.image_border_radius'))
+              .border({
+                width: 1,
+                color: '#0D000000'
+              })
             CardMediaInfo({ contentDTO: this.contentDTO })
           }
           .align(Alignment.BottomEnd)

@@ -77,6 +77,9 @@ export struct Card17Component {
                 topLeft: $r('app.float.image_border_radius'),
                 bottomLeft: $r('app.float.image_border_radius'),
               })
+              .borderStyle(BorderStyle.Solid)
+              .borderWidth(0.5)
+              .borderColor($r('app.color.color_0D000000'))
           }
 
           GridCol({ span: { xs: 4 } }) {
@@ -89,6 +92,9 @@ export struct Card17Component {
               .borderRadius({
                 topRight: $r('app.float.image_border_radius'),
               })
+              .borderStyle(BorderStyle.Solid)
+              .borderWidth(0.5)
+              .borderColor($r('app.color.color_0D000000'))
           }
         }
 
@@ -106,6 +112,9 @@ export struct Card17Component {
               .borderRadius({
                 bottomRight: $r('app.float.image_border_radius'),
               })
+              .borderStyle(BorderStyle.Solid)
+              .borderWidth(0.5)
+              .borderColor($r('app.color.color_0D000000'))
           }
         }
 

@@ -233,12 +233,18 @@ struct createImg {
                     .height(198)
                     .autoResize(true)
                     .borderRadius(this.caclImageRadius(index))
+                    .borderStyle(BorderStyle.Solid)
+                    .borderWidth(0.5)
+                    .borderColor($r('app.color.color_0D000000'))
                 } else if (this.getPicType(item.weight, item.height) === 2) {
                   Image(this.loadImg ? item.url || item.fullUrl : '')
                     .width('100%')
                     .height(305)
                     .autoResize(true)
                     .borderRadius(this.caclImageRadius(index))
+                    .borderStyle(BorderStyle.Solid)
+                    .borderWidth(0.5)
+                    .borderColor($r('app.color.color_0D000000'))
                 }
                 this.longPicTip(item.weight, item.height)
 
@@ -257,6 +263,9 @@ struct createImg {
                 .autoResize(true)
                   .aspectRatio(3/4)
                 .borderRadius(this.caclImageRadius(index))
+                .borderStyle(BorderStyle.Solid)
+                .borderWidth(0.5)
+                .borderColor($r('app.color.color_0D000000'))
                 .opacity(!item.weight && !item.height ? 0 : 1)
                 .onComplete((event?) => {
                   this.onePicW = event?.width || 0;
@@ -277,6 +286,9 @@ struct createImg {
                   })
                   .autoResize(true)
                   .borderRadius(this.caclImageRadius(index))
+                  .borderStyle(BorderStyle.Solid)
+                  .borderWidth(0.5)
+                  .borderColor($r('app.color.color_0D000000'))
                   .opacity(!item.weight && !item.height ? 0 : 1)
                   .onComplete((event?) => {
                     this.onePicW = event?.width || 0;
@@ -300,6 +312,9 @@ struct createImg {
                 .width('226lvp')
                 .height('226lvp')
                 .borderRadius(this.caclImageRadius(index))
+                .borderStyle(BorderStyle.Solid)
+                .borderWidth(0.5)
+                .borderColor($r('app.color.color_0D000000'))
               if(this.getPicType(item.weight, item.height) !== 3){
                 this.longPicTip(item.weight, item.height)
               }
@@ -314,6 +329,9 @@ struct createImg {
                 .backgroundColor(0xf5f5f5)
                 .aspectRatio(1)
                 .borderRadius(this.caclImageRadius(index))
+                .borderStyle(BorderStyle.Solid)
+                .borderWidth(0.5)
+                .borderColor($r('app.color.color_0D000000'))
                 .width('100%')
                 .autoResize(true)
               if (this.getPicType(item.weight, item.height) !== 3) {

@@ -74,7 +74,7 @@ export struct Card21Component {
             .maxLines(4)
             .textOverflow({ overflow: TextOverflow.Ellipsis })
             .padding({ right: 12 })
-            .lineHeight(22)
+            .lineHeight(25)
         }
 
         GridItem() {
@@ -83,6 +83,9 @@ export struct Card21Component {
               .backgroundColor(0xf5f5f5)
               .width(CommonConstants.FULL_WIDTH)
               .borderRadius($r('app.float.image_border_radius'))
+              .borderStyle(BorderStyle.Solid)
+              .borderWidth(0.5)
+              .borderColor($r('app.color.color_0D000000'))
             CardMediaInfo({ contentDTO: this.contentDTO })
           }
           .alignContent(Alignment.BottomEnd)

@@ -107,6 +107,9 @@ export struct Card2Component {
             .width(CommonConstants.FULL_WIDTH)
             .aspectRatio(16 / 9)
             .borderRadius($r('app.float.image_border_radius'))
+            .borderStyle(BorderStyle.Solid)
+            .borderWidth(0.5)
+            .borderColor($r('app.color.color_0D000000'))
             .backgroundColor(0xf5f5f5)
           //播放状态+时长
           CardMediaInfo({

@@ -110,6 +110,9 @@ export struct Card4Component {
                         bottomLeft: index === 0 ? $r('app.float.image_border_radius') : 0,
                         bottomRight: index === 2 ? $r('app.float.image_border_radius') : 0,
                       })
+                      .borderStyle(BorderStyle.Solid)
+                      .borderWidth(0.5)
+                      .borderColor($r('app.color.color_0D000000'))
                   }
                 }
               })

@@ -63,6 +63,9 @@ export struct Card5Component {
             bottomRight: $r('app.float.image_border_radius')
           }
         )
+        .borderStyle(BorderStyle.Solid)
+        .borderWidth(0.5)
+        .borderColor($r('app.color.color_0D000000'))
         .height(this.loadImg ? '' : 114)
         .autoResize(true)
       if (this.titleShowPolicy == 1) {

@@ -125,6 +125,7 @@ export struct Card6Component {
           .aspectRatio(this.contentDTO.appStyle === CompStyle.Card_13 ? 3 / 2 : 3 / 4)
           .height(this.contentDTO.appStyle === CompStyle.Card_13 ? 78 : 156)
           .border({width: 1, color: 0xf5f5f5})
+          .borderStyle(BorderStyle.Solid)
         CardMediaInfo({ contentDTO: this.contentDTO })
       }
 

@@ -44,6 +44,7 @@ export struct LiveBigImage01Component {
             topLeft: '4vp',
             topRight: '4vp'
           })
+          .borderStyle(BorderStyle.Solid)
         this.LiveImage()
 
 

@@ -127,7 +127,7 @@ export struct CommentComponent {
 
   /*标题：全部评论*/
   @Builder
-  titleHeader(title: string = "最新评论", showGapLine: boolean = false) {
+  titleHeader(title: string = "评论", showGapLine: boolean = false) {
 
     Column() {
       if (showGapLine) {

@@ -87,88 +87,109 @@ export struct ZhCarouselLayout01 {
   build() {
 
     if (this.compDTO?.operDataList?.length) {
-      Stack() {
-        Swiper() {
-          ForEach(this.compDTO?.operDataList, (item: ContentDTO, index: number) => {
-            CarouselLayout01CardView({
-              item: item,
-              length: this.compDTO.operDataList.length,
-              showPicBorderRadius: this.compDTO.operDataList.length == 1
-            })
-              .onClick((event: ClickEvent) => {
-                InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
-                Logger.info(TAG, `ZhCarouselLayout01 onClick event index: ${index}`)
-                ProcessUtils.processPage(item)
+      if (this.compDTO?.operDataList.length > 1) {
+        Stack() {
+          Swiper() {
+            ForEach(this.compDTO?.operDataList, (item: ContentDTO, index: number) => {
+              CarouselLayout01CardView({
+                item: item,
+                length: this.compDTO.operDataList.length,
+                showPicBorderRadius: this.compDTO.operDataList.length == 1
               })
+                .onClick((event: ClickEvent) => {
+                  InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
+                  Logger.info(TAG, `ZhCarouselLayout01 onClick event index: ${index}`)
+                  ProcessUtils.processPage(item)
+                })
+            })
+          }
+          .borderRadius($r('app.float.image_border_radius'))
+          .displayCount(this.buildDisplayCount()) // 仅展示1个图片
+          .cachedCount(2)
+          .index(0) // The default index of Swiper.
+          .indicator(false)
+          .loop(true)
+          .vertical(false)
+          .curve(Curve.Linear)
+          .autoPlay(this.isAutoPlay())
+          .onAnimationStart((index: number, targetIndex: number) => {
+            // Logger.info(TAG, `Swiper onAnimationStart index : ${index}, targetIndex: ${targetIndex}`);
+            this.swiperIndex = targetIndex
           })
-        }
-        .borderRadius($r('app.float.image_border_radius'))
-        .displayCount(this.buildDisplayCount()) // 仅展示1个图片
-        .cachedCount(2)
-        .index(0) // The default index of Swiper.
-        .indicator(false)
-        .loop(true)
-        .vertical(false)
-        .curve(Curve.Linear)
-        .autoPlay(this.isAutoPlay())
-        .onAnimationStart((index: number, targetIndex: number) => {
-          // Logger.info(TAG, `Swiper onAnimationStart index : ${index}, targetIndex: ${targetIndex}`);
-          this.swiperIndex = targetIndex
-        })
-        .onChange((index: number) => {
-          // Logger.info(TAG, `Swiper onChange index : ${index}`);
+          .onChange((index: number) => {
+            // Logger.info(TAG, `Swiper onChange index : ${index}`);
 
-        })
-        .onAnimationEnd((index: number, extraInfo: SwiperAnimationEvent) => {
-          this.firstWd = 12
-          setTimeout(() => {
-            this.SecondWd = 12
-          }, 2000)
-          // console.info("onAnimationEnd, index: " + index)
-        })
+          })
+          .onAnimationEnd((index: number, extraInfo: SwiperAnimationEvent) => {
+            this.firstWd = 12
+            setTimeout(() => {
+              this.SecondWd = 12
+            }, 2000)
+            // console.info("onAnimationEnd, index: " + index)
+          })
 
-        if (this.compDTO?.operDataList.length > 1) {
-          // 自定义indicator
-          GridRow({
-            columns: this.data.totalCount(),
-            gutter: { x: 2 }
-          }) {
-            LazyForEach(this.data, (item: string, index: number) => {
-              GridCol() {
-                if (index === this.swiperIndex) {
-                  indicatorAnimations({
-                    index: index,
-                    isAutoPlay: this.isAutoPlay()
-                  })
-                } else {
-                  Row() {
-                    Image($r('app.media.swiper_indicator_gray'))
-                      .width('100%')
-                      .height(2)
+          if (this.compDTO?.operDataList.length > 1) {
+            // 自定义indicator
+            GridRow({
+              columns: this.data.totalCount(),
+              gutter: { x: 2 }
+            }) {
+              LazyForEach(this.data, (item: string, index: number) => {
+                GridCol() {
+                  if (index === this.swiperIndex) {
+                    indicatorAnimations({
+                      index: index,
+                      isAutoPlay: this.isAutoPlay()
+                    })
+                  } else {
+                    Row() {
+                      Image($r('app.media.swiper_indicator_gray'))
+                        .width('100%')
+                        .height(2)
+                    }
                   }
                 }
-              }
-            }, (item: string) => item)
+              }, (item: string) => item)
+            }
+            .width(CommonConstants.FULL_PARENT)
+            .padding({
+              left: 10,
+              right: 10,
+              top: 12,
+              bottom: 12
+            })
+            .alignItems(ItemAlign.End)
           }
-          .width(CommonConstants.FULL_PARENT)
+        }
+        .alignContent(Alignment.BottomEnd)
+        .padding({
+          left: 10,
+          right: 10,
+          top: $r('app.float.card_comp_pagePadding_tb'),
+          bottom: $r('app.float.card_comp_pagePadding_tb')
+        })
+        .backgroundColor(0xffffff)
+        .width(CommonConstants.FULL_WIDTH)
+      } else {
+        CarouselLayout01CardView({
+          item: this.compDTO.operDataList[0],
+          length: 1,
+          showPicBorderRadius: this.compDTO.operDataList.length == 1
+        })
+          .onClick((event: ClickEvent) => {
+            InfomationCardClick.track(this.compDTO, this.compDTO.operDataList[0], this.pageId, this.pageName)
+            ProcessUtils.processPage(this.compDTO.operDataList[0])
+          })
           .padding({
             left: 10,
             right: 10,
-            top: 12,
-            bottom: 12
+            top: $r('app.float.card_comp_pagePadding_tb'),
+            bottom: $r('app.float.card_comp_pagePadding_tb')
           })
-          .alignItems(ItemAlign.End)
-        }
+          .backgroundColor(0xffffff)
+          .width(CommonConstants.FULL_WIDTH)
+          .borderRadius($r('app.float.image_border_radius'))
       }
-      .alignContent(Alignment.BottomEnd)
-      .padding({
-        left: 10,
-        right: 10,
-        top: $r('app.float.card_comp_pagePadding_tb'),
-        bottom: $r('app.float.card_comp_pagePadding_tb')
-      })
-      .backgroundColor(0xffffff)
-      .width(CommonConstants.FULL_WIDTH)
     } else {
       EmptyComponent({ emptyHeight: 200 })
     }
@@ -204,6 +225,9 @@ struct CarouselLayout01CardView {
         .objectFit(ImageFit.Cover)
         .backgroundColor(0xf5f5f5)
         .borderRadius(this.showPicBorderRadius ? $r('app.float.image_border_radius') : 0)
+        .borderStyle(BorderStyle.Solid)
+        .borderWidth(0.5)
+        .borderColor($r('app.color.color_0D000000'))
 
       Stack() {
         Row()

@@ -61,6 +61,7 @@ export struct ZhGridLayout02NewsContent {
           .borderWidth(0.5)
           .borderColor($r('app.color.color_0D000000'))
           .borderRadius(4)
+          .borderStyle(BorderStyle.Solid)
         if (this.compDTO.operDataList[index].liveRoomDataBean != undefined
           && this.compDTO.operDataList[index].liveRoomDataBean?.pv != undefined) {
           Text(this.computeShowNum(this.compDTO.operDataList[index].liveRoomDataBean))

@@ -61,9 +61,10 @@ export struct ZhGridLayout03 {
         .backgroundColor(0xf5f5f5)
         .width(44)
         .aspectRatio(1 / 1)
-      // .margin({
-      //   bottom: 16
-      // })
+        .borderStyle(BorderStyle.Solid)
+        .borderWidth(0.5)
+        .borderColor($r('app.color.color_0D000000'))
+
       Text(item.newsTitle)
         .fontSize(13)
         .maxLines(1)

@@ -186,6 +186,9 @@ export struct ZhSingleColumn09 {
                 .width('100%')
                 .height('100%')
                 .borderRadius(3)
+                .borderStyle(BorderStyle.Solid)
+                .borderWidth(0.5)
+                .borderColor($r('app.color.color_0D000000'))
               Row() {
               }
               .width('100%')

@@ -241,6 +241,9 @@ struct CreatorItem {
             .height(208)
             .backgroundColor(0xf5f5f5)
             .borderRadius(4)
+            .borderStyle(BorderStyle.Solid)
+            .borderWidth(0.5)
+            .borderColor($r('app.color.color_0D000000'))
 
           Row()
             .width(156)

@@ -220,6 +220,9 @@ export struct ZhSingleRow03 {
             .margin({left: 1.5 * (this.moreWidth - this.initMoreWidth)})
           }
         }
+        .constraintSize({
+          minWidth: '100%'
+        })
       }
       .align(Alignment.Start)
       .scrollable(this.compDTO.operDataList.length >= 2 ? ScrollDirection.Horizontal : ScrollDirection.None)
@@ -259,7 +262,7 @@ export struct ZhSingleRow03 {
   ItemCard(item: ContentDTO) {
     if (this.compDTO.operDataList.length >= 2) {
       Column() {
-        Row() {
+        Flex({alignContent: FlexAlign.Start}) {
           Image(this.loadImg ? item.coverUrl : '')
             .backgroundColor(0xf5f5f5)
             .borderRadius(4)
@@ -268,16 +271,20 @@ export struct ZhSingleRow03 {
             .border({
               width: 0.7,
               color: '#EDEDED',
+              style: BorderStyle.Solid
             })
+            .flexShrink(0)
 
 
           Text(item.newsTitle)
-            .width(154)
-            .height(60)
+            .constraintSize({
+              maxHeight: 60
+            })
             .maxLines(3)
             .fontSize(15)
             .textOverflow({overflow: TextOverflow.Ellipsis})
             .margin({left: 12})
+            .flexShrink(1)
         }
         .margin({bottom: 16})
 
@@ -348,7 +355,11 @@ export struct ZhSingleRow03 {
 
         }
       }
-      .width(298)
+      // .width(298)
+      .constraintSize({
+        minWidth: 298,
+        maxWidth: '60%'
+      })
       .height(116)
       .padding({top: 12, bottom: 12, left: 12, right: 12})
       .backgroundColor(0xf9f9f9)
@@ -369,6 +380,7 @@ export struct ZhSingleRow03 {
             .border({
               width: 0.7,
               color: '#EDEDED',
+              style: BorderStyle.Solid
             })
 
           Text(item.newsTitle)

@@ -44,6 +44,9 @@ export struct AppointmentListChildComponent {
             .objectFit(ImageFit.Auto)
             .interpolation(ImageInterpolation.High)
             .borderRadius(4)
+            .borderStyle(BorderStyle.Solid)
+            .borderWidth(0.5)
+            .borderColor($r('app.color.color_0D000000'))
 
 
           if (this.item.status == "wait") {

@@ -91,6 +91,7 @@ export struct PeopleShipHomeArticleListComponent {
           ListItem() {
             Column() {
               CardParser({compDTO:new CompDTO, contentDTO: item , isPeopleShipHome:true})
+                .margin({left: 6, right: 6})
               Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
             }
           }.width("100%")

@@ -159,6 +159,9 @@ export struct LiveHorizontalCardComponent {
                       .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
                       // .borderRadius(4)
                       .objectFit(ImageFit.Contain)
+                      .borderStyle(BorderStyle.Solid)
+                      .borderWidth(0.5)
+                      .borderColor($r('app.color.color_0D000000'))
                     CardMediaInfo({
                       livePeopleNum:false,
                       contentDTO: item