developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
陈剑华
80bc04ce 2 parents 85a7eff3 9e04f345

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 2 changed files with 26 additions and 17 deletions
... ... @@ -48,19 +48,26 @@ export struct PeopleShipHomeArticleListComponent {
} else if (this.viewType == 2) {
ErrorComponent()
} else {
this.ListLayout()
// CustomPullToRefresh({
// alldata:this.arr,
// scroller:this.scroller,
// hasMore: false,
// customList:()=>{
// this.ListLayout()
// },
// onRefresh:(resolve)=>{
// this.currentPage = 1
// this.getPeopleShipPageArticleList(resolve)
// },
// })
CustomPullToRefresh({
alldata:this.arr,
scroller:this.scroller,
hasMore:this.hasMore,
customList:()=>{
this.ListLayout()
},
onRefresh:(resolve)=>{
this.currentPage = 1
this.getPeopleShipPageArticleList(resolve)
},
onLoadMore:(resolve)=> {
if (this.hasMore === false) {
if(resolve) resolve('')
return
}
this.currentPage++
this.getPeopleShipPageArticleList(resolve)
}
})
}
}
... ... @@ -90,14 +97,16 @@ export struct PeopleShipHomeArticleListComponent {
// 加载更多
ListItem() {
if (this.hasMore && this.arr && this.arr.length > 0) {
LoadMoreLayout({ isVisible: this.hasMore })
} else if (!this.hasMore && !this.isLoading) {
// if (this.hasMore && this.arr && this.arr.length > 0) {
// LoadMoreLayout({ isVisible: this.hasMore })
// } else
if (!this.hasMore && !this.isLoading) {
PeopleShipNoMoreData()
}
}
}
.cachedCount(4)
.scrollBar(BarState.Off)
.backgroundColor(Color.Transparent)
.width("100%")
.height("100%")
... ...
... ... @@ -104,8 +104,8 @@ struct LaunchAdvertisingPage {
.margin({top:'10lpx',right:'19lpx'})
.backgroundColor('#80000000')
.onClick(() => {
this.enter()
this.trackingLaunchJumpOver()
this.enter()
}).margin({right:16})
}.margin({top:50}).width('100%').height('56lpx')
... ...