Merge remote-tracking branch 'origin/main'

@@ -206,6 +206,7 @@ export struct PeopleShipHomeArticleListComponent {
       }
       }
       for (const element of listData.list) {
       for (const element of listData.list) {
         let contentDTO = new ContentDTO()
         let contentDTO = new ContentDTO()
+        console.info(TAG, 'element.appStyle'+`${element.appStyle}`)
         contentDTO.appStyle = this.changeCommon(element.appStyle)
         contentDTO.appStyle = this.changeCommon(element.appStyle)
         contentDTO.newsTitle = element.title;
         contentDTO.newsTitle = element.title;
         contentDTO.newsSummary = element.description;
         contentDTO.newsSummary = element.description;

@@ -158,6 +158,7 @@ export struct OperRowListView {
     console.info(TAG, 'contentDetailData----', JSON.stringify(this.contentDetailData))
     console.info(TAG, 'contentDetailData----', JSON.stringify(this.contentDetailData))
     console.info(TAG, 'likeBean----', JSON.stringify(this.likeBean))
     console.info(TAG, 'likeBean----', JSON.stringify(this.likeBean))
     console.info(TAG, 'this.operationButtonList', JSON.stringify(this.operationButtonList))
     console.info(TAG, 'this.operationButtonList', JSON.stringify(this.operationButtonList))
+
     // 评论需要数据
     // 评论需要数据
     /*  this.publishCommentModel.targetId = this.contentDetailData.newsId + ''
     /*  this.publishCommentModel.targetId = this.contentDetailData.newsId + ''
       this.publishCommentModel.targetRelId = this.contentDetailData.reLInfo?.relId + ''
       this.publishCommentModel.targetRelId = this.contentDetailData.reLInfo?.relId + ''

@@ -172,6 +172,7 @@ export struct DetailPlayShortVideoPage {
     this.queryNewsInfoOfUser()
     this.queryNewsInfoOfUser()
 
 
     this.contentTrackingDict()
     this.contentTrackingDict()
+    this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
   }
   }
 
 
   contentTrackingDict() {
   contentTrackingDict() {

@@ -45,7 +45,7 @@ export struct VideoChannelDetail {
   @Prop @Watch('autoRefreshChange') autoRefresh: number = 0
   @Prop @Watch('autoRefreshChange') autoRefresh: number = 0
   @Consume barBackgroundColor: Color
   @Consume barBackgroundColor: Color
   private swiperController: SwiperController = new SwiperController()
   private swiperController: SwiperController = new SwiperController()
-  @Provide showComment: boolean = false
+  @Consume showComment: boolean
   @Provide windowWidth: number = AppStorage.get<number>('windowWidth') || 0
   @Provide windowWidth: number = AppStorage.get<number>('windowWidth') || 0
   @Provide windowHeight: number = AppStorage.get<number>('windowHeight') || 0
   @Provide windowHeight: number = AppStorage.get<number>('windowHeight') || 0
   @Provide bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @Provide bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0

@@ -32,6 +32,7 @@ export struct VideoChannelPage {
   @State indicatorWidth: number = 0
   @State indicatorWidth: number = 0
   // 传递给page的自动刷新通知
   // 传递给page的自动刷新通知
   @State autoRefresh2Page: number = 0
   @State autoRefresh2Page: number = 0
+  @Provide showComment: boolean = false
   aboutToAppear(): void {
   aboutToAppear(): void {
     this.setBarBackgroundColor()
     this.setBarBackgroundColor()
     console.log(TAG, 'aboutToAppear')
     console.log(TAG, 'aboutToAppear')