Merge branch 'hotfix/income' of http://git.yoho.cn/fe/xianyu-ufo-app-web into hotfix/income
Showing
2 changed files
with
3 additions
and
3 deletions
| @@ -48,7 +48,7 @@ export default { | @@ -48,7 +48,7 @@ export default { | ||
| 48 | loadingOptions() { | 48 | loadingOptions() { |
| 49 | return { | 49 | return { |
| 50 | hide: !this.totalPage, | 50 | hide: !this.totalPage, |
| 51 | - noMore: this.page > this.totalPage | 51 | + noMore: this.page >= this.totalPage |
| 52 | }; | 52 | }; |
| 53 | } | 53 | } |
| 54 | }, | 54 | }, |
| @@ -83,7 +83,7 @@ export default { | @@ -83,7 +83,7 @@ export default { | ||
| 83 | let { page, pagetotal } = res.data || {}; | 83 | let { page, pagetotal } = res.data || {}; |
| 84 | 84 | ||
| 85 | this.page = page || 0; | 85 | this.page = page || 0; |
| 86 | - this.pageTotal = pagetotal || 0; | 86 | + this.totalPage = pagetotal || 0; |
| 87 | } | 87 | } |
| 88 | }); | 88 | }); |
| 89 | } | 89 | } |
-
Please register or login to post a comment