Commit 4bbb013d by suolong

listTotal参数新增

parent b946c1cd
...@@ -96,12 +96,27 @@ ...@@ -96,12 +96,27 @@
} }
NSDictionary *payload = [dataDict[@"data"] isKindOfClass:NSDictionary.class] ? dataDict[@"data"] : dataDict; NSDictionary *payload = [dataDict[@"data"] isKindOfClass:NSDictionary.class] ? dataDict[@"data"] : dataDict;
NSInteger respPage = [payload[@"page"] integerValue];
NSDictionary *listData = [payload[@"listData"] isKindOfClass:NSDictionary.class] ? payload[@"listData"] : nil;
NSDictionary *pageSource = (listData ?: payload);
NSInteger respPage = [pageSource[@"page"] integerValue];
if (respPage > 0) { if (respPage > 0) {
strongSelf.page = respPage; strongSelf.page = respPage;
} }
NSInteger listTotal = [listData[@"listTotal"] integerValue];
NSInteger total = [payload[@"total"] integerValue]; NSInteger total = [payload[@"total"] integerValue];
NSArray *list = [payload[@"list"] isKindOfClass:NSArray.class] ? payload[@"list"] : @[]; NSArray *list = nil;
if ([listData[@"list"] isKindOfClass:NSArray.class]) {
list = listData[@"list"];
} else if ([listData[@"userList"] isKindOfClass:NSArray.class]) {
list = listData[@"userList"];
} else if ([payload[@"list"] isKindOfClass:NSArray.class]) {
list = payload[@"list"];
} else {
list = @[];
}
if (strongSelf.page <= 1) { if (strongSelf.page <= 1) {
[strongSelf.userList removeAllObjects]; [strongSelf.userList removeAllObjects];
...@@ -135,7 +150,8 @@ ...@@ -135,7 +150,8 @@
[strongSelf.tableView reloadData]; [strongSelf.tableView reloadData];
if (strongSelf.totalUserChangedHandler) { if (strongSelf.totalUserChangedHandler) {
strongSelf.totalUserChangedHandler(total > 0 ? total : strongSelf.userList.count); NSInteger displayTotal = (listTotal > 0 ? listTotal : (total > 0 ? total : (NSInteger)strongSelf.userList.count));
strongSelf.totalUserChangedHandler(displayTotal);
} }
[strongSelf.tableView.mj_header endRefreshing]; [strongSelf.tableView.mj_header endRefreshing];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment