Merge remote-tracking branch 'origin/main'

@@ -142,14 +142,22 @@ export struct DynamicDetailComponent {
                 .margin({right: $r('app.float.margin_6')})
                 .margin({right: $r('app.float.margin_6')})
                 if(!StringUtils.isEmpty(this.followStatus)){
                 if(!StringUtils.isEmpty(this.followStatus)){
                   if (this.followStatus == '0') {
                   if (this.followStatus == '0') {
-                    Text('+关注')
-                      .width($r('app.float.margin_54'))
-                      .height($r('app.float.margin_24'))
+                    Row() {
+                      Blank().layoutWeight(1)
+                      Image($r('app.media.icon_add_attention'))
+                        .width($r('app.float.vp_12'))
+                        .height($r('app.float.vp_12'))
+                        .margin({right:2})
+                      Text('关注')
                         .textAlign(TextAlign.Center)
                         .textAlign(TextAlign.Center)
                         .fontSize($r('app.float.font_size_12'))
                         .fontSize($r('app.float.font_size_12'))
+                        .fontColor($r('app.color.color_fff'))
+                      Blank().layoutWeight(1)
+                    }
+                    .width($r('app.float.margin_54'))
+                    .height($r('app.float.margin_24'))
                     .borderRadius($r('app.float.vp_3'))
                     .borderRadius($r('app.float.vp_3'))
                     .backgroundColor($r('app.color.color_ED2800'))
                     .backgroundColor($r('app.color.color_ED2800'))
-                      .fontColor($r('app.color.color_fff'))
                     .onClick(() => {
                     .onClick(() => {
                         this.handleAccention()
                         this.handleAccention()
                       })
                       })

@@ -41,7 +41,7 @@ const TAG = 'OperRowListView';
 @Preview
 @Preview
 @Component
 @Component
 export struct OperRowListView {
 export struct OperRowListView {
-  @Prop contentDetailData: ContentDetailDTO // 稿件详情
+  @Prop @Watch('onDetailUpdated') contentDetailData: ContentDetailDTO // 稿件详情
   @State operationButtonList: string[] = ['comment', 'collect', 'share'] // 组件展示条件
   @State operationButtonList: string[] = ['comment', 'collect', 'share'] // 组件展示条件
   @ObjectLink publishCommentModel: publishCommentModel
   @ObjectLink publishCommentModel: publishCommentModel
   // @State contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
   // @State contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
@@ -52,7 +52,9 @@ export struct OperRowListView {
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   needLike: boolean = true
   needLike: boolean = true
 
 
-  async aboutToAppear() {
+  // async aboutToAppear() {
+  async onDetailUpdated() {
+    if (!this.contentDetailData) return
     const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
     const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
     if (user_id) {
     if (user_id) {
       this.getInteractDataStatus()
       this.getInteractDataStatus()
@@ -99,6 +101,7 @@ export struct OperRowListView {
         })
         })
         .width(42)
         .width(42)
 
 
+        if (this.contentDetailData) {
           ForEach(this.operationButtonList, (item: string, index: number) => {
           ForEach(this.operationButtonList, (item: string, index: number) => {
             if (item == 'comment') {
             if (item == 'comment') {
               this.builderComment()
               this.builderComment()
@@ -114,6 +117,7 @@ export struct OperRowListView {
             }
             }
           })
           })
         }
         }
+      }
       .width('100%')
       .width('100%')
       .justifyContent(FlexAlign.Start)
       .justifyContent(FlexAlign.Start)
     }
     }