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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  组件样式优化

@@ -24,6 +24,7 @@ export struct CompStyle_09 {
       // 大图
       // 大图
       Image(this.compDTO.operDataList[0].coverUrl)
       Image(this.compDTO.operDataList[0].coverUrl)
         .width('100%')
         .width('100%')
+        .borderRadius({topLeft: $r('app.float.image_border_radius'), topRight: $r('app.float.image_border_radius')})
       // 时间线--后端返回三个，
       // 时间线--后端返回三个，
       Column(){
       Column(){
         ForEach(this.compDTO.operDataList[0].slideShows, (item:slideShows, index:number) => {
         ForEach(this.compDTO.operDataList[0].slideShows, (item:slideShows, index:number) => {
@@ -44,7 +45,7 @@ export struct CompStyle_09 {
         .backgroundColor($r('app.color.color_F5F5F5'))
         .backgroundColor($r('app.color.color_F5F5F5'))
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
         .height(40)
         .height(40)
-        .borderRadius(3)
+        .borderRadius($r('app.float.button_border_radius'))
         .justifyContent(FlexAlign.Center)
         .justifyContent(FlexAlign.Center)
         .margin({top: 5})
         .margin({top: 5})
       }
       }
@@ -103,7 +104,7 @@ export struct CompStyle_09 {
               Image(item.fullColumnImgUrls[0].url)
               Image(item.fullColumnImgUrls[0].url)
               .width(90)
               .width(90)
                 .height(60)
                 .height(60)
-                .borderRadius(4)
+                .borderRadius($r('app.float.image_border_radius'))
             }
             }
           }
           }
         }
         }

@@ -26,6 +26,7 @@ export struct CompStyle_10 {
       // 大图
       // 大图
       Image(this.compDTO.operDataList[0] && this.compDTO.operDataList[0].coverUrl)
       Image(this.compDTO.operDataList[0] && this.compDTO.operDataList[0].coverUrl)
         .width('100%')
         .width('100%')
+        .borderRadius({topLeft: $r('app.float.image_border_radius'), topRight: $r('app.float.image_border_radius')})
         .onClick((event: ClickEvent) => {
         .onClick((event: ClickEvent) => {
           ProcessUtils.processPage(this.compDTO?.operDataList[0])
           ProcessUtils.processPage(this.compDTO?.operDataList[0])
         })
         })
@@ -49,7 +50,7 @@ export struct CompStyle_10 {
         .backgroundColor($r('app.color.color_F5F5F5'))
         .backgroundColor($r('app.color.color_F5F5F5'))
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
         .height(40)
         .height(40)
-        .borderRadius(3)
+        .borderRadius($r('app.float.button_border_radius'))
         .justifyContent(FlexAlign.Center)
         .justifyContent(FlexAlign.Center)
         .margin({top: 5})
         .margin({top: 5})
         .onClick((event: ClickEvent) => {
         .onClick((event: ClickEvent) => {
@@ -105,7 +106,7 @@ export struct CompStyle_10 {
           .width(117)
           .width(117)
           .height(78)
           .height(78)
           .objectFit(ImageFit.Cover)
           .objectFit(ImageFit.Cover)
-          .borderRadius(4)
+          .borderRadius($r('app.float.image_border_radius'))
           .margin({left: 12})
           .margin({left: 12})
       }
       }
     }
     }

@@ -47,7 +47,7 @@ export struct ZhGridLayoutComponent {
   buildItemCard(item: ContentDTO) {
   buildItemCard(item: ContentDTO) {
     Column() {
     Column() {
       Image(item.coverUrl)
       Image(item.coverUrl)
-        .borderRadius(5)
+        .width(44)
         .aspectRatio(1 / 1)
         .aspectRatio(1 / 1)
         .margin(16)
         .margin(16)
       Text(item.newsTitle)
       Text(item.newsTitle)

@@ -82,7 +82,11 @@
     },
     },
     {
     {
       "name": "image_border_radius",
       "name": "image_border_radius",
-      "value": "8vp"
+      "value": "5vp"
+    },
+    {
+      "name": "button_border_radius",
+      "value": "3vp"
     },
     },
     {
     {
       "name": "border_radius_6",
       "name": "border_radius_6",