Showing
3 changed files
with
15 additions
and
10 deletions
| @@ -84,10 +84,10 @@ export struct PageComponent { | @@ -84,10 +84,10 @@ export struct PageComponent { | ||
| 84 | // 加载更多 | 84 | // 加载更多 |
| 85 | ListItem() { | 85 | ListItem() { |
| 86 | if (this.pageModel.hasMore) { | 86 | if (this.pageModel.hasMore) { |
| 87 | - LoadMoreLayout({ | ||
| 88 | - refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullUpLoad, this.pageModel.pullUpLoadImage, | ||
| 89 | - this.pageModel.pullUpLoadText, this.pageModel.pullUpLoadHeight) | ||
| 90 | - }) | 87 | + // LoadMoreLayout({ |
| 88 | + // refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullUpLoad, this.pageModel.pullUpLoadImage, | ||
| 89 | + // this.pageModel.pullUpLoadText, this.pageModel.pullUpLoadHeight) | ||
| 90 | + // }) | ||
| 91 | } else if (!this.pageModel.contentNeedScroll) { | 91 | } else if (!this.pageModel.contentNeedScroll) { |
| 92 | PageNoMoreLayout({ noMoreBean: new NoMoreBean(this.pageModel.pageInfo.baselineCopywriting) }) | 92 | PageNoMoreLayout({ noMoreBean: new NoMoreBean(this.pageModel.pageInfo.baselineCopywriting) }) |
| 93 | } | 93 | } |
| @@ -35,7 +35,7 @@ export function listTouchEvent(pageModel: PageModel, pageAdvModel: PageAdModel, | @@ -35,7 +35,7 @@ export function listTouchEvent(pageModel: PageModel, pageAdvModel: PageAdModel, | ||
| 35 | touchUpPullRefresh(pageModel, pageAdvModel); | 35 | touchUpPullRefresh(pageModel, pageAdvModel); |
| 36 | } else { | 36 | } else { |
| 37 | // Fingers up, handle loading more. | 37 | // Fingers up, handle loading more. |
| 38 | - touchUpLoadMore(pageModel); | 38 | + // touchUpLoadMore(pageModel); |
| 39 | } | 39 | } |
| 40 | break; | 40 | break; |
| 41 | default: | 41 | default: |
| @@ -4,13 +4,18 @@ import PageHelper from '../viewmodel/PageHelper'; | @@ -4,13 +4,18 @@ import PageHelper from '../viewmodel/PageHelper'; | ||
| 4 | 4 | ||
| 5 | export function touchMoveLoadMore(model: PageModel, event: TouchEvent) { | 5 | export function touchMoveLoadMore(model: PageModel, event: TouchEvent) { |
| 6 | // list size +1 | 6 | // list size +1 |
| 7 | - if (model.endIndex === model.compList.totalCount() || model.endIndex === model.compList.totalCount() + 1) { | ||
| 8 | - model.offsetY = event.touches[0].y - model.downY; | ||
| 9 | - if (Math.abs(model.offsetY) > vp2px(model.pullUpLoadHeight) / 2) { | 7 | + if (model.endIndex >= model.compList.totalCount()-3 && model.endIndex <= model.compList.totalCount()) { |
| 8 | + // model.offsetY = event.touches[0].y - model.downY; | ||
| 9 | + // if (Math.abs(model.offsetY) > vp2px(model.pullUpLoadHeight) / 2) { | ||
| 10 | + // model.isCanLoadMore = true; | ||
| 11 | + // model.isVisiblePullUpLoad = true; | ||
| 12 | + // model.offsetY = -vp2px(model.pullUpLoadHeight) + model.offsetY * Const.Y_OFF_SET_COEFFICIENT; | ||
| 13 | + // } | ||
| 14 | + | ||
| 15 | + // 不用分页动画,直接预加载 | ||
| 10 | model.isCanLoadMore = true; | 16 | model.isCanLoadMore = true; |
| 11 | model.isVisiblePullUpLoad = true; | 17 | model.isVisiblePullUpLoad = true; |
| 12 | - model.offsetY = -vp2px(model.pullUpLoadHeight) + model.offsetY * Const.Y_OFF_SET_COEFFICIENT; | ||
| 13 | - } | 18 | + touchUpLoadMore(model); |
| 14 | } | 19 | } |
| 15 | } | 20 | } |
| 16 | 21 |
-
Please register or login to post a comment