fix: 信息流卡片内外边距修改

@@ -75,6 +75,10 @@ export struct CompParser {
       // Text(JSON.stringify(this.compDTO.compStyle))
       this.componentBuilder();
     }
+    .margin({
+      left: 6,
+      right: (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05 || this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) ? 0 : 6
+    })
   }
 
   @Builder
@@ -206,16 +210,16 @@ export struct CompParser {
           this.compDTO.compStyle === CompStyle.Zh_Single_Row_06
       ) {
         if (this.compDTO.compStyle === this.nextCompDTO.compStyle) {
-          Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
+          Divider().strokeWidth(1).color('#f5f5f5').width('103%').padding({ left: 16, right: 16 }).margin({left: -6})
         } else {
-          Divider().strokeWidth(5).color('#f5f5f5')
+          Divider().strokeWidth(5).color('#f5f5f5').width('120%').margin({left: -6})
         }
       } else if (this.compDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) {
         // 大专题
         if (this.nextCompDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) {
-          Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
+          Divider().strokeWidth(1).color('#f5f5f5').width('103%').padding({ left: 16, right: 16 }).margin({left: -6})
         } else {
-          Divider().strokeWidth(5).color('#f5f5f5')
+          Divider().strokeWidth(5).color('#f5f5f5').width('120%').margin({left: -6})
         }
       } else if (this.compDTO.compType === 'appStyle' || this.compDTO.compStyle === CompStyle.Zh_Single_Row_01) {
         if (
@@ -225,9 +229,9 @@ export struct CompParser {
             this.nextCompDTO.compStyle === CompStyle.Zh_Single_Row_04 ||
             this.nextCompDTO.compStyle === CompStyle.Zh_Single_Row_06
         ) {
-          Divider().strokeWidth(5).color('#f5f5f5')
+          Divider().strokeWidth(5).color('#f5f5f5').width('120%').margin({left: -6})
         } else {
-          Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
+          Divider().strokeWidth(1).color('#f5f5f5').width('103%').padding({ left: 16, right: 16 }).margin({left: -6})
         }
       } else {
         // Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })

@@ -82,10 +82,11 @@ export struct Card11Component {
 
       // 评论等信息
       CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
-    }.width(CommonConstants.FULL_WIDTH)
+    }
+    .width(CommonConstants.FULL_WIDTH)
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      left: 10,
+      right: 10,
       top: $r('app.float.card_comp_pagePadding_tb'),
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })

@@ -80,11 +80,13 @@ export struct Card12Component {
       CarderInteraction({contentDTO: this.contentDTO})
     }
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      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)
     .onClick((event: ClickEvent) => {
       InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       if (router.getState().name !== 'MyCollectionListPage') {

@@ -96,11 +96,13 @@ export struct Card14Component {
       //TODO  底部的：分享、评论、点赞 功能；需要引用一个公共组件
     }
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      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)
     .onClick((event: ClickEvent) => {
       InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       if (router.getState().name !== 'MyCollectionListPage') {

@@ -95,11 +95,13 @@ export struct Card15Component {
       //TODO  底部的：分享、评论、点赞 功能；需要引用一个公共组件
     }
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      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)
     .onClick((event: ClickEvent) => {
       InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       if (router.getState().name !== 'MyCollectionListPage') {

@@ -128,11 +128,13 @@ export struct Card16Component {
       //TODO  底部的：分享、评论、点赞 功能；需要引用一个公共组件
     }
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      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)
     .onClick((event: ClickEvent) => {
       InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       if (router.getState().name !== 'MyCollectionListPage') {

@@ -134,12 +134,13 @@ export struct Card17Component {
       // 评论等信息
       CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
     }
-    .width(CommonConstants.FULL_WIDTH)
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      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)
   }
 }

@@ -86,11 +86,13 @@ export struct Card19Component {
       //TODO  底部的：分享、评论、点赞 功能；需要引用一个公共组件
     }
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      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)
     .onClick((event: ClickEvent) => {
       InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       if (router.getState().name !== 'MyCollectionListPage') {

@@ -80,11 +80,13 @@ export struct Card20Component {
       //TODO  底部的：分享、评论、点赞 功能；需要引用一个公共组件
     }
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      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)
     .onClick((event: ClickEvent) => {
       InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       if (router.getState().name !== 'MyCollectionListPage') {

@@ -102,11 +102,12 @@ export struct Card21Component {
       ProcessUtils.processPage(this.contentDTO)
     })
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      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)
   }
 }
\ No newline at end of file

@@ -115,13 +115,14 @@ export struct Card2Component {
       // 评论等信息
       CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
     }
-    .width(CommonConstants.FULL_WIDTH)
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      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)
     .onClick((event: ClickEvent) => {
       InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       if (router.getState().name !== 'MyCollectionListPage') {

@@ -78,13 +78,14 @@ export struct Card3Component {
       // 评论等信息
       CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
     }
-    .width(CommonConstants.FULL_WIDTH)
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      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)
     .onClick((event: ClickEvent) => {
       InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       if (router.getState().name !== 'MyCollectionListPage') {

@@ -133,13 +133,14 @@ export struct Card4Component {
       //bottom 评论等信息
       CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
     }
-    .width(CommonConstants.FULL_WIDTH)
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      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)
   }
 }
 

@@ -122,13 +122,14 @@ export struct Card5Component {
       }
     }
     .alignContent(Alignment.Bottom)
-    .width(CommonConstants.FULL_WIDTH)
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      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)
     .onClick((event: ClickEvent) => {
       InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
       if (router.getState().name !== 'MyCollectionListPage') {

@@ -123,12 +123,12 @@ export struct Card6Component {
       ProcessUtils.processPage(this.contentDTO)
     })
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      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)
     .height(this.contentDTO.appStyle === CompStyle.Card_13 ? '' : 184)
     .justifyContent(FlexAlign.SpaceBetween)

@@ -79,13 +79,14 @@ export struct SearchContentComponent {
       //bottom 评论等信息
       CardSourceInfo({compDTO:new CompDTO, contentDTO: this.contentDTO })
     }
-    .width(CommonConstants.FULL_WIDTH)
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      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)
   }
 }
 

@@ -33,8 +33,14 @@ export struct CompNormalTitle {
       .margin({ top: 16, bottom: 10 })
       .width(CommonConstants.FULL_WIDTH)
     }
+    .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)
-    .padding({ left: 16, right: 16 })
 
   }
 }

@@ -154,13 +154,14 @@ export struct ZhCarouselLayout01 {
         }
       }
       .alignContent(Alignment.BottomEnd)
-      .width(CommonConstants.FULL_WIDTH)
       .padding({
-        left: $r('app.float.card_comp_pagePadding_lf'),
-        right: $r('app.float.card_comp_pagePadding_lf'),
+        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)
       .onClick((event: ClickEvent) => {
         InfomationCardClick.track(this.compDTO, this.compDTO.operDataList[this.swiperIndex], this.pageId, this.pageName)
         Logger.info(TAG, `ZhCarouselLayout01 onClick event index: ${this.swiperIndex}`);

@@ -37,7 +37,15 @@ export struct ZhGridLayout02NewsContent {
           this.buildItemCard(item, index);
         }
       })
-    }.width("100%").padding({ left: 16, right: 16 })
+    }
+    .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)
 
   }
 

@@ -43,11 +43,13 @@ export struct ZhGridLayout03 {
       })
     }
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      left: 10,
+      right: 10,
       top: $r('app.float.card_comp_pagePadding_tb'),
-      bottom: '0vp'
+      bottom: $r('app.float.card_comp_pagePadding_tb')
     })
+    .backgroundColor(0xffffff)
+    .width('100%')
   }
 
   /**

@@ -44,13 +44,14 @@ export struct ZhSingleColumn04 {
         })
       }
     }
-    .width(CommonConstants.FULL_WIDTH)
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      left: 10,
+      right: 10,
       top: $r('app.float.card_comp_pagePadding_tb'),
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
+    .backgroundColor(0xffffff)
+    .width('100%')
   }
 
   @Builder

@@ -42,13 +42,14 @@ export struct ZhSingleColumn05 {
         WDRouterRule.jumpWithAction(taskAction)
       })
     }
-    .width(CommonConstants.FULL_WIDTH)
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      left: 10,
+      right: 10,
       top: $r('app.float.card_comp_pagePadding_tb'),
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
+    .backgroundColor(0xffffff)
+    .width('100%')
 
   }
 }

@@ -194,12 +194,13 @@ export struct ZhSingleColumn09 {
       .justifyContent(FlexAlign.SpaceBetween)
     }
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      left: 10,
+      right: 10,
       top: $r('app.float.card_comp_pagePadding_tb'),
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
-    .backgroundColor($r('app.color.white'))
+    .backgroundColor(0xffffff)
+    .width('100%')
     .visibility(this.selfClosed ? Visibility.None : Visibility.Visible)
   }
 }

@@ -151,12 +151,13 @@ export struct ZhSingleRow02 {
       })
     }
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      // right: $r('app.float.card_comp_pagePadding_lf'),
-      top: 8,
-      bottom: 8
+      left: 10,
+      // right: 10,
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
     })
-    .backgroundColor($r('app.color.white'))
+    .backgroundColor(0xffffff)
+    .width('100%')
     .margin({ bottom: 8 })
   }
 

@@ -222,12 +222,13 @@ export struct ZhSingleRow03 {
       })
     }
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      left: 10,
+      right: 10,
       top: $r('app.float.card_comp_pagePadding_tb'),
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
-    .backgroundColor($r('app.color.white'))
+    .backgroundColor(0xffffff)
+    .width('100%')
   }
 
   @Builder

@@ -91,8 +91,14 @@ export struct ZhSingleRow04 {
       .edgeEffect(EdgeEffect.None)
     }
     .width(CommonConstants.FULL_WIDTH)
-    .backgroundColor($r("app.color.white"))
-    .margin({ bottom: 8 })
+    .padding({
+      left: 10,
+      right: 10,
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
+    })
+    .backgroundColor(0xffffff)
+    .width('100%')
   }
 }
 

@@ -53,13 +53,13 @@ export struct ZhSingleRow05 {
       .height(170)
     }
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      // right: $r('app.float.card_comp_pagePadding_lf'),
+      left: 10,
+      // right: 10,
       top: $r('app.float.card_comp_pagePadding_tb'),
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
-    .backgroundColor($r('app.color.white'))
-    .margin({ bottom: 8 })
+    .backgroundColor(0xffffff)
+    .width('100%')
   }
 
   @Builder

@@ -166,12 +166,13 @@ export struct ZhSingleRow06 {
       .width('100%')
     }
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
+      left: 10,
+      right: 10,
       top: $r('app.float.card_comp_pagePadding_tb'),
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
-    .backgroundColor($r('app.color.white'))
+    .backgroundColor(0xffffff)
+    .width('100%')
     .onClick(() => {
       InfomationCardClick.track(this.compDTO, this.compDTO.operDataList[0], this.pageId, this.pageName)
     })