Merge remote-tracking branch 'origin/main'

@@ -26,6 +26,7 @@ import { common } from '@kit.AbilityKit';
 import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils'
 import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils'
 import {TrackConstants,TrackParamConvert}from 'wdTracking/Index'
 import {TrackConstants,TrackParamConvert}from 'wdTracking/Index'
 import { ColorUtils } from '../../utils/ColorUtils';
 import { ColorUtils } from '../../utils/ColorUtils';
+import { EmptyComponent,WDViewDefaultType } from '../view/EmptyComponent';
 
 
 const TAG = 'MorningEveningPaperComponent';
 const TAG = 'MorningEveningPaperComponent';
 
 
@@ -37,6 +38,7 @@ export struct MorningEveningPaperComponent {
   @State compListItem: CompList = {} as CompList
   @State compListItem: CompList = {} as CompList
   @Provide  commentList: InteractDataDTO[] = []
   @Provide  commentList: InteractDataDTO[] = []
   @State audioPlayUrl: string = ""
   @State audioPlayUrl: string = ""
+  @State isNoListContent:boolean = false;
   // @Consume dailyPaperTopicPageId: number
   // @Consume dailyPaperTopicPageId: number
   // @Provide compListItem: CompList = {} as CompList
   // @Provide compListItem: CompList = {} as CompList
   // @State morningEveningPaperDTO: MorningEveningPaperDTO = {
   // @State morningEveningPaperDTO: MorningEveningPaperDTO = {
@@ -172,6 +174,7 @@ export struct MorningEveningPaperComponent {
         this.totalTime = DateFormatUtil.secondToTime(duration);
         this.totalTime = DateFormatUtil.secondToTime(duration);
         this.progressVal = Math.floor(position * 100 / duration);
         this.progressVal = Math.floor(position * 100 / duration);
       }
       }
+      this.isNoListContent = this.compListItem && this.compListItem?.operDataList?.length > 0 ?false:true
     } catch (exception) {
     } catch (exception) {
 
 
     }
     }
@@ -264,6 +267,9 @@ export struct MorningEveningPaperComponent {
         }
         }
 
 
         ListItem() {
         ListItem() {
+          if(this.isNoListContent){
+            EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoListContent})
+          }else {
             SingleColumn999Component({
             SingleColumn999Component({
               compListItem: this.compListItem,
               compListItem: this.compListItem,
             })
             })
@@ -272,6 +278,7 @@ export struct MorningEveningPaperComponent {
               })
               })
           }
           }
         }
         }
+      }
       // .height(`calc(100% - ${this.bottomSafeHeight + this.topSafeHeight + 'vp'})`)
       // .height(`calc(100% - ${this.bottomSafeHeight + this.topSafeHeight + 'vp'})`)
       .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
       .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
       .scrollBar(BarState.Off)
       .scrollBar(BarState.Off)

@@ -152,7 +152,7 @@ export struct SingleColumn999Component {
         scrollBackward: NestedScrollMode.SELF_FIRST
         scrollBackward: NestedScrollMode.SELF_FIRST
       })
       })
     } else {
     } else {
-      EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoListContent})
+      // EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoListContent})
     }
     }
   }
   }