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

@@ -175,11 +175,13 @@ export struct DynamicDetailComponent {
                         color: '#0D000000',  // 5% 透明度的黑色
                         style: BorderStyle.Solid
                       })
-                    Image(this.contentDetailData.rmhInfo?.honoraryIcon)
-                      .width($r('app.float.margin_48'))
-                      .height($r('app.float.margin_48'))
-                      .objectFit(ImageFit.Cover)
-                      .borderRadius($r('app.float.margin_24'))
+                    if (!!this.contentDetailData.rmhInfo?.honoraryIcon) {
+                      Image(this.contentDetailData.rmhInfo?.honoraryIcon)
+                        .width($r('app.float.margin_48'))
+                        .height($r('app.float.margin_48'))
+                        .objectFit(ImageFit.Cover)
+                        .borderRadius($r('app.float.margin_24'))
+                    }
                     if (!StringUtils.isEmpty(this.contentDetailData.rmhInfo?.authIcon)) {
                       Stack() {
                         Image(this.contentDetailData.rmhInfo?.authIcon)
@@ -192,8 +194,8 @@ export struct DynamicDetailComponent {
                       .alignContent(Alignment.BottomEnd)
                     }
                   }
-                  .width($r('app.float.margin_48'))
-                  .height($r('app.float.margin_48'))
+                  .width(!!this.contentDetailData.rmhInfo?.honoraryIcon ? $r('app.float.margin_48') : $r('app.float.margin_36'))
+                  .height(!!this.contentDetailData.rmhInfo?.honoraryIcon ? $r('app.float.margin_48') : $r('app.float.margin_36'))
                   .alignContent(Alignment.Center)
                   .onClick(async () => {
                     let retvalue = await FastClickUtil.isMinDelayTime()
@@ -203,6 +205,7 @@ export struct DynamicDetailComponent {
                     ProcessUtils.gotoPeopleShipHomePage(this.contentDetailData.rmhInfo == null ? "" :
                     this.contentDetailData.rmhInfo.rmhId)
                   })
+                  .margin({right: 6})
 
                   Column() {
                     //昵称
@@ -229,8 +232,6 @@ export struct DynamicDetailComponent {
                       .height(14)
                       .lineHeight(14)
                   }
-                  .width('70%')
-                  .margin({ right: $r('app.float.margin_6') })
 
                   Blank()
                   if ((this.contentDetailData.rmhPlatform == 1 && this.contentDetailData?.rmhInfo?.userType != "5") && !StringUtils.isEmpty(this.followStatus)) {
@@ -278,10 +279,13 @@ export struct DynamicDetailComponent {
                         })
                     }
                   }
-                }.padding({
-                  left: $r('app.float.vp_16')
-                , right: $r('app.float.vp_16')
-                }).width('100%')
+                }
+                .margin({
+                  left: $r('app.float.vp_16'),
+                  right: $r('app.float.vp_16')
+                })
+                .width('calc(100% - 32vp)')
+
                 //标题
                 Text(this.titleText())
                   .fontColor($r('app.color.color_222222'))
@@ -644,7 +648,9 @@ export struct DynamicDetailComponent {
             }
             .width(CommonConstants.FULL_WIDTH)
             .height(CommonConstants.FULL_HEIGHT)
-            .padding({ bottom: 100 })
+            .padding({
+              bottom: 100,
+            })
             .scrollBar(BarState.Off)
             .alignSelf(ItemAlign.Start)
           }
@@ -678,7 +684,7 @@ export struct DynamicDetailComponent {
           .height(100)
 
       }
-      .margin({bottom: 65})
+      .margin({bottom: 65, top: 10})
     }
     .alignSelf(ItemAlign.Start)
     .backgroundColor('#FFFFFFFF')