Showing
1 changed file
with
6 additions
and
2 deletions
| 1 | -import { PageDTO, CompDTO, PageInfoDTO, ContentDTO } from 'wdBean'; | 1 | +import { CompDTO, ContentDTO, PageDTO, PageInfoDTO } from 'wdBean'; |
| 2 | import { CompStyle, ViewType } from 'wdConstant/Index'; | 2 | import { CompStyle, ViewType } from 'wdConstant/Index'; |
| 3 | import { CollectionUtils, DateTimeUtils, Logger, NetworkUtil } from 'wdKit'; | 3 | import { CollectionUtils, DateTimeUtils, Logger, NetworkUtil } from 'wdKit'; |
| 4 | import { closeRefresh } from '../utils/PullDownRefresh'; | 4 | import { closeRefresh } from '../utils/PullDownRefresh'; |
| 5 | import PageModel from './PageModel'; | 5 | import PageModel from './PageModel'; |
| 6 | import PageViewModel from './PageViewModel'; | 6 | import PageViewModel from './PageViewModel'; |
| 7 | import { promptAction } from '@kit.ArkUI'; | 7 | import { promptAction } from '@kit.ArkUI'; |
| 8 | -import { AdvRuleBean, CompAdvBean } from 'wdBean/src/main/ets/bean/adv/AdvsRuleBean'; | 8 | +import { CompAdvBean } from 'wdBean/src/main/ets/bean/adv/AdvsRuleBean'; |
| 9 | import PageAdModel from './PageAdvModel'; | 9 | import PageAdModel from './PageAdvModel'; |
| 10 | import { ArrayList } from '@kit.ArkTS'; | 10 | import { ArrayList } from '@kit.ArkTS'; |
| 11 | import { WDViewDefaultType } from '../components/view/EmptyComponent'; | 11 | import { WDViewDefaultType } from '../components/view/EmptyComponent'; |
| @@ -104,7 +104,11 @@ export class PageHelper { | @@ -104,7 +104,11 @@ export class PageHelper { | ||
| 104 | if (pageDto && pageDto.compList && pageDto.compList.length > 0) { | 104 | if (pageDto && pageDto.compList && pageDto.compList.length > 0) { |
| 105 | pageModel.viewType = ViewType.LOADED; | 105 | pageModel.viewType = ViewType.LOADED; |
| 106 | let sizeBefore: number = pageModel.compList.size(); | 106 | let sizeBefore: number = pageModel.compList.size(); |
| 107 | + if (isLastGroup) { | ||
| 108 | + // 认为分页只会在最后一个group里 | ||
| 107 | pageModel.currentPage++; | 109 | pageModel.currentPage++; |
| 110 | + } | ||
| 111 | + // pageModel.currentPage++; | ||
| 108 | pageModel.hasMore = true; | 112 | pageModel.hasMore = true; |
| 109 | 113 | ||
| 110 | //移除音频 和 活动 | 114 | //移除音频 和 活动 |
-
Please register or login to post a comment