Merge remote-tracking branch 'origin/main'

@@ -42,8 +42,12 @@ export struct CompParser {
   aboutToAppear(): void {
   aboutToAppear(): void {
     // 轮播图屏蔽音频类型稿件
     // 轮播图屏蔽音频类型稿件
     if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
     if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
-      this.audioItems = this.compDTO.operDataList.filter(item => item.appStyle === '13')
-      this.noneAudioItems = this.compDTO.operDataList.filter(item => item.appStyle !== '13')
+      this.audioItems = this.compDTO.operDataList.filter(item => {
+        return item.objectType === '13' || item.linkUrl.includes('audiotopic')
+      })
+      this.noneAudioItems = this.compDTO.operDataList.filter(item => {
+        return item.objectType !== '13' && !item.linkUrl.includes('audiotopic')
+      })
       this.compDTO.operDataList = this.noneAudioItems;
       this.compDTO.operDataList = this.noneAudioItems;
     }
     }
   }
   }

@@ -73,7 +73,7 @@ export struct OperRowListView {
   @Prop operationButtonList?: string[] = ['comment', 'collect', 'share'] // 组件展示条件
   @Prop operationButtonList?: string[] = ['comment', 'collect', 'share'] // 组件展示条件
   @State needLike: boolean = true
   @State needLike: boolean = true
   @ObjectLink publishCommentModel: publishCommentModel
   @ObjectLink publishCommentModel: publishCommentModel
-  @State styleType: number = 1
+  @State styleType: number = -1
   @State showCommentIcon: boolean = true
   @State showCommentIcon: boolean = true
   @State bgColor: ResourceColor = Color.White
   @State bgColor: ResourceColor = Color.White
   @State interactData: InteractDataDTO = {} as InteractDataDTO
   @State interactData: InteractDataDTO = {} as InteractDataDTO

@@ -97,6 +97,7 @@ export struct DetailDialog {
         contentDetailData: this.contentDetailData,
         contentDetailData: this.contentDetailData,
         publishCommentModel: this.publishCommentModel,
         publishCommentModel: this.publishCommentModel,
         showCommentIcon: true,
         showCommentIcon: true,
+        styleType: 1,
         onBack: () => {
         onBack: () => {
           WindowModel.shared.setWindowLayoutFullScreen(false)
           WindowModel.shared.setWindowLayoutFullScreen(false)
           WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
           WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })