zhangbo1_wd

首页下拉刷新调整,减少空白区域

@@ -87,13 +87,12 @@ export struct PageComponent { @@ -87,13 +87,12 @@ export struct PageComponent {
87 ListItem() { 87 ListItem() {
88 if (this.pageModel.hasMore) { 88 if (this.pageModel.hasMore) {
89 LoadMoreLayout({ isVisible: this.pageModel.isVisiblePullUpLoad }) 89 LoadMoreLayout({ isVisible: this.pageModel.isVisiblePullUpLoad })
90 - } else if (!this.pageModel.contentNeedScroll) { 90 + } else {
91 PageNoMoreLayout({ noMoreBean: new NoMoreBean(this.pageModel.pageInfo.baselineCopywriting) }) 91 PageNoMoreLayout({ noMoreBean: new NoMoreBean(this.pageModel.pageInfo.baselineCopywriting) })
92 } 92 }
93 } 93 }
94 } 94 }
95 - // comp自己处理分页,这里设置EdgeEffect.None  
96 - .edgeEffect(this.pageModel.contentNeedScroll ? EdgeEffect.None : EdgeEffect.Spring) 95 + .edgeEffect(EdgeEffect.None)
97 .scrollBar(BarState.Off) 96 .scrollBar(BarState.Off)
98 .cachedCount(5) 97 .cachedCount(5)
99 .height(CommonConstants.FULL_PARENT) 98 .height(CommonConstants.FULL_PARENT)
@@ -141,7 +141,7 @@ struct ThemeListPage { @@ -141,7 +141,7 @@ struct ThemeListPage {
141 // refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullUpLoad, this.pageModel.pullUpLoadImage, 141 // refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullUpLoad, this.pageModel.pullUpLoadImage,
142 // this.pageModel.pullUpLoadText, this.pageModel.pullUpLoadHeight) 142 // this.pageModel.pullUpLoadText, this.pageModel.pullUpLoadHeight)
143 // }) 143 // })
144 - } else if (!this.pageModel.contentNeedScroll) { 144 + } else {
145 PageNoMoreLayout({ noMoreBean: new NoMoreBean(this.pageModel.pageInfo.baselineCopywriting) }) 145 PageNoMoreLayout({ noMoreBean: new NoMoreBean(this.pageModel.pageInfo.baselineCopywriting) })
146 } 146 }
147 } 147 }
@@ -24,9 +24,6 @@ export default class PageModel { @@ -24,9 +24,6 @@ export default class PageModel {
24 // 当前请求数据的group 24 // 当前请求数据的group
25 groupData: GroupInfoDTO = {} as GroupInfoDTO; 25 groupData: GroupInfoDTO = {} as GroupInfoDTO;
26 compList: LazyDataSource<BaseDTO> = new LazyDataSource(); 26 compList: LazyDataSource<BaseDTO> = new LazyDataSource();
27 - // 是否comp自己处理分页加载;默认是最后一个comp下的content有分页数据,需要节目内容的分页加载  
28 - // (如:首页-视频tab-直播tab,最后一个comp是直播回看列表,视频内容需要分页加载)  
29 - contentNeedScroll: boolean = false;  
30 // 页面状态,刷新、加载更多等,1-首次、2-下拉、3上拉 27 // 页面状态,刷新、加载更多等,1-首次、2-下拉、3上拉
31 loadStrategy: number = 1; 28 loadStrategy: number = 1;
32 currentPage: number = 1; 29 currentPage: number = 1;