Merge remote-tracking branch 'origin/main'

@@ -107,8 +107,8 @@ export struct ImageAndTextPageComponent {
                         .height(24)
                         .margin({ right: 5 })
                     }
-                    if (this.interactData?.likeNum) {
-                      Text(`${this.interactData?.likeNum}`)
+                    if (this.interactData?.likeNum != 0) {
+                      Text(NumberFormatterUtils.formatNumberWithWan(this.interactData?.likeNum))
                         .fontSize(16)
                         .fontColor(this.newsStatusOfUser?.likeStatus === '1' ? '#ED2800' : '#999999')
                         .fontWeight(500)
@@ -301,12 +301,8 @@ export struct ImageAndTextPageComponent {
     }
     PageRepository.getContentInteract(params).then(res => {
       if (res.data) {
-        this.interactData.likeNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.likeNum)
-        this.interactData.collectNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.collectNum)
-        this.interactData.commentNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.commentNum)
+        this.interactData =res.data[0]
       }
-      console.log(TAG, '获取互动点赞等数据===', JSON.stringify(res))
-      console.log(TAG, 'this.interactData', JSON.stringify(this.interactData))
     })
   }