Showing
3 changed files
with
9 additions
and
5 deletions
| @@ -109,6 +109,7 @@ export struct HomePageBottomFollowComponent { | @@ -109,6 +109,7 @@ export struct HomePageBottomFollowComponent { | ||
| 109 | CustomPullToRefresh({ | 109 | CustomPullToRefresh({ |
| 110 | alldata:this.data_follow, | 110 | alldata:this.data_follow, |
| 111 | scroller:this.scroller, | 111 | scroller:this.scroller, |
| 112 | + hasMore:this.hasMore, | ||
| 112 | customList:()=>{ | 113 | customList:()=>{ |
| 113 | this.ListLayout() | 114 | this.ListLayout() |
| 114 | }, | 115 | }, |
| @@ -128,6 +129,7 @@ export struct HomePageBottomFollowComponent { | @@ -128,6 +129,7 @@ export struct HomePageBottomFollowComponent { | ||
| 128 | this.isLoading = true | 129 | this.isLoading = true |
| 129 | //加载分页数据 | 130 | //加载分页数据 |
| 130 | this.getNewPageData() | 131 | this.getNewPageData() |
| 132 | + if(resolve) resolve('刷新成功') | ||
| 131 | } | 133 | } |
| 132 | } | 134 | } |
| 133 | }) | 135 | }) |
| @@ -197,7 +199,7 @@ export struct HomePageBottomFollowComponent { | @@ -197,7 +199,7 @@ export struct HomePageBottomFollowComponent { | ||
| 197 | 199 | ||
| 198 | getMyFollowListDetail() { | 200 | getMyFollowListDetail() { |
| 199 | if (this.hasMore) { | 201 | if (this.hasMore) { |
| 200 | - let object = new FollowListDetailRequestItem(-1, 20, this.curPageNum) | 202 | + let object = new FollowListDetailRequestItem(-1, 10, this.curPageNum) |
| 201 | 203 | ||
| 202 | MinePageDatasModel.getMineFollowListData(object, getContext(this)).then((value) => { | 204 | MinePageDatasModel.getMineFollowListData(object, getContext(this)).then((value) => { |
| 203 | if (this.curPageNum === 1) this.data_follow.clear() | 205 | if (this.curPageNum === 1) this.data_follow.clear() |
| @@ -222,7 +224,7 @@ export struct HomePageBottomFollowComponent { | @@ -222,7 +224,7 @@ export struct HomePageBottomFollowComponent { | ||
| 222 | }) | 224 | }) |
| 223 | this.data_follow.notifyDataReload() | 225 | this.data_follow.notifyDataReload() |
| 224 | this.count = this.data_follow.totalCount() | 226 | this.count = this.data_follow.totalCount() |
| 225 | - if (this.data_follow.totalCount() < value.totalCount) { | 227 | + if (value.hasNext === 1) { |
| 226 | this.curPageNum++ | 228 | this.curPageNum++ |
| 227 | } else { | 229 | } else { |
| 228 | this.hasMore = false | 230 | this.hasMore = false |
| @@ -70,6 +70,7 @@ export struct OtherHomePageBottomFollowComponent{ | @@ -70,6 +70,7 @@ export struct OtherHomePageBottomFollowComponent{ | ||
| 70 | CustomPullToRefresh({ | 70 | CustomPullToRefresh({ |
| 71 | alldata:this.data_follow, | 71 | alldata:this.data_follow, |
| 72 | scroller:this.scroller, | 72 | scroller:this.scroller, |
| 73 | + hasMore:this.hasMore, | ||
| 73 | customList:()=>{ | 74 | customList:()=>{ |
| 74 | this.ListLayout() | 75 | this.ListLayout() |
| 75 | }, | 76 | }, |
| @@ -89,6 +90,7 @@ export struct OtherHomePageBottomFollowComponent{ | @@ -89,6 +90,7 @@ export struct OtherHomePageBottomFollowComponent{ | ||
| 89 | this.isLoading = true | 90 | this.isLoading = true |
| 90 | //加载分页数据 | 91 | //加载分页数据 |
| 91 | this.getNewPageData() | 92 | this.getNewPageData() |
| 93 | + if(resolve) resolve('刷新成功') | ||
| 92 | } | 94 | } |
| 93 | } | 95 | } |
| 94 | }) | 96 | }) |
| @@ -160,7 +162,7 @@ export struct OtherHomePageBottomFollowComponent{ | @@ -160,7 +162,7 @@ export struct OtherHomePageBottomFollowComponent{ | ||
| 160 | this.isLoading = true | 162 | this.isLoading = true |
| 161 | //关注列表 | 163 | //关注列表 |
| 162 | if(this.hasMore){ | 164 | if(this.hasMore){ |
| 163 | - let object = new UserFollowListRequestItem(Number(this.curUserId),20,this.curPageNum,"1") | 165 | + let object = new UserFollowListRequestItem(Number(this.curUserId),10,this.curPageNum,"1") |
| 164 | 166 | ||
| 165 | MinePageDatasModel.getOtherUserFollowListData(object,getContext(this)).then((value)=>{ | 167 | MinePageDatasModel.getOtherUserFollowListData(object,getContext(this)).then((value)=>{ |
| 166 | 168 | ||
| @@ -186,7 +188,7 @@ export struct OtherHomePageBottomFollowComponent{ | @@ -186,7 +188,7 @@ export struct OtherHomePageBottomFollowComponent{ | ||
| 186 | this.data_follow.notifyDataReload() | 188 | this.data_follow.notifyDataReload() |
| 187 | this.count = this.data_follow.totalCount() | 189 | this.count = this.data_follow.totalCount() |
| 188 | 190 | ||
| 189 | - if (this.data_follow.totalCount() < value.totalCount) { | 191 | + if (value.hasNext === 1) { |
| 190 | this.curPageNum++ | 192 | this.curPageNum++ |
| 191 | }else { | 193 | }else { |
| 192 | this.hasMore = false | 194 | this.hasMore = false |
| @@ -665,7 +665,7 @@ export struct PaperSingleColumn999CardView { | @@ -665,7 +665,7 @@ export struct PaperSingleColumn999CardView { | ||
| 665 | buildSourceString(): string { | 665 | buildSourceString(): string { |
| 666 | let contentString: string = '' | 666 | let contentString: string = '' |
| 667 | if (this.item?.rmhInfo?.rmhName.length > 0) { | 667 | if (this.item?.rmhInfo?.rmhName.length > 0) { |
| 668 | - contentString = this.item?.rmhInfo?.rmhName | 668 | + // contentString = this.item?.rmhInfo?.rmhName |
| 669 | }else if(this.item?.source.length > 0){ | 669 | }else if(this.item?.source.length > 0){ |
| 670 | contentString = this.item?.source | 670 | contentString = this.item?.source |
| 671 | } | 671 | } |
-
Please register or login to post a comment