Showing
3 changed files
with
7 additions
and
3 deletions
| @@ -86,7 +86,7 @@ export struct PeopleShipHomeArticleListComponent { | @@ -86,7 +86,7 @@ export struct PeopleShipHomeArticleListComponent { | ||
| 86 | 86 | ||
| 87 | // 加载更多 | 87 | // 加载更多 |
| 88 | ListItem() { | 88 | ListItem() { |
| 89 | - if (this.hasMore) { | 89 | + if (this.hasMore && this.arr && this.arr.length > 0) { |
| 90 | LoadMoreLayout({ isVisible: this.hasMore }) | 90 | LoadMoreLayout({ isVisible: this.hasMore }) |
| 91 | } else if (!this.hasMore && !this.isLoading) { | 91 | } else if (!this.hasMore && !this.isLoading) { |
| 92 | PeopleShipNoMoreData() | 92 | PeopleShipNoMoreData() |
| @@ -368,7 +368,11 @@ export struct PeopleShipHomePageTopComponent { | @@ -368,7 +368,11 @@ export struct PeopleShipHomePageTopComponent { | ||
| 368 | 368 | ||
| 369 | private computeShowNum(count: number) { | 369 | private computeShowNum(count: number) { |
| 370 | if (count >= 10000) { | 370 | if (count >= 10000) { |
| 371 | - return `${(count / 10000).toFixed(1)}万` | 371 | + let num = ( count / 10000).toFixed(1) |
| 372 | + if (Number(num.substring(num.length-1)) == 0) { | ||
| 373 | + num = num.substring(0, num.length-2) | ||
| 374 | + } | ||
| 375 | + return num + '万' | ||
| 372 | } | 376 | } |
| 373 | return `${count}` | 377 | return `${count}` |
| 374 | } | 378 | } |
| @@ -96,7 +96,7 @@ struct ReserveMorePage { | @@ -96,7 +96,7 @@ struct ReserveMorePage { | ||
| 96 | ) | 96 | ) |
| 97 | // 加载更多 | 97 | // 加载更多 |
| 98 | ListItem() { | 98 | ListItem() { |
| 99 | - if (this.hasMore) { | 99 | + if (this.hasMore && this.data && this.data.totalCount() > 0) { |
| 100 | LoadMoreLayout({ isVisible: this.hasMore }) | 100 | LoadMoreLayout({ isVisible: this.hasMore }) |
| 101 | } else if (!this.hasMore && !this.isLoading) { | 101 | } else if (!this.hasMore && !this.isLoading) { |
| 102 | PeopleShipNoMoreData() | 102 | PeopleShipNoMoreData() |
-
Please register or login to post a comment