【iOS】当马币余额为0，并且没有过交易记录，马币页面显示不对

wanghengheng · wanghengheng · commit c268170ef776 · 2017-10-30T15:48:18.000+08:00
diff --git a/Coding_iOS/Controllers/PointRecordsViewController.m b/Coding_iOS/Controllers/PointRecordsViewController.m
@@ -87,7 +87,7 @@ - (void)refreshMore{
 }
 
 - (void)sendRequest{
-    if (_curRecords.list.count <= 0) {
+    if (_curRecords.list.count <= 0 && !_curRecords.points_left) {
         [self.view beginLoading];
     }
     __weak typeof(self) weakSelf = self;
@@ -100,15 +100,15 @@ - (void)sendRequest{
             [weakSelf.myTableView reloadData];
             weakSelf.myTableView.showsInfiniteScrolling = weakSelf.curRecords.canLoadMore;
         }
-        [weakSelf.view configBlankPage:EaseBlankPageTypeView hasData:(weakSelf.curRecords.list.count > 0) hasError:(error != nil) reloadButtonBlock:^(id sender) {
+        [weakSelf.view configBlankPage:EaseBlankPageTypeView hasData:(weakSelf.curRecords.list.count > 0 || weakSelf.curRecords.points_left) hasError:(error != nil) reloadButtonBlock:^(id sender) {
             [weakSelf refresh];
         }];
     }];
 }
 
 #pragma mark Table M
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
-    return _curRecords.list.count <= 0? 0:2;
+    return _curRecords.list.count <= 0? 1:2;
 }
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
     return section == 0? 2: self.curRecords.list.count;
@@ -117,9 +117,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     
     if (indexPath.section == 0) {
         if (indexPath.row == 0) {
-            PointRecord *record = [_curRecords.list firstObject];
             PointTopCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_PointTopCell forIndexPath:indexPath];
-            cell.pointLeftStr = [NSString stringWithFormat:@"%.2f", record.points_left.floatValue];
+            cell.pointLeftStr = _curRecords.points_left? [NSString stringWithFormat:@"%.2f", _curRecords.points_left.floatValue]: @"--";
             [tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:0 hasSectionLine:NO];
             return cell;
         }else{
diff --git a/Coding_iOS/Models/PointRecords.h b/Coding_iOS/Models/PointRecords.h
@@ -15,6 +15,8 @@
 @property (readwrite, nonatomic, strong) NSDictionary *propertyArrayMap;
 @property (readwrite, nonatomic, strong) NSMutableArray *list;
 
+@property (strong, nonatomic) NSNumber *points_left;
+
 - (NSString *)toPath;
 - (NSDictionary *)toParams;
 - (void)configWithObj:(PointRecords *)records;
diff --git a/Coding_iOS/Models/PointRecords.m b/Coding_iOS/Models/PointRecords.m
@@ -22,6 +22,12 @@ - (instancetype)init
     }
     return self;
 }
+- (NSNumber *)points_left{
+    if (!_points_left && _list.count > 0) {
+        _points_left = [(PointRecord *)_list.firstObject points_left];
+    }
+    return _points_left;
+}
 - (NSString *)toPath{
     return @"api/point/records";
 }
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.m b/Coding_iOS/Util/Manager/Coding_NetAPIManager.m
@@ -2412,7 +2412,16 @@ - (void)request_PointRecords:(PointRecords *)records andBlock:(void (^)(id data,
 
             data = [data valueForKey:@"data"];
             PointRecords *resultA = [NSObject objectOfClass:@"PointRecords" fromJSON:data];
-            block(resultA, nil);
+            if (!records.points_left) {
+                [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/point/points" withParams:nil withMethodType:Get andBlock:^(id data, NSError *error) {
+                    if (data) {
+                        records.points_left = data[@"data"][@"points_left"];
+                    }
+                    block(resultA, nil);
+                }];
+            }else{
+                block(resultA, nil);
+            }
         }else{
             block(nil, error);
         }

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,12 @@ - (instancetype)init`
`22`	`22`	`}`
`23`	`23`	`return self;`
`24`	`24`	`}`
	`25`	`+- (NSNumber *)points_left{`
	`26`	`+ if (!_points_left && _list.count > 0) {`
	`27`	`+ _points_left = [(PointRecord *)_list.firstObject points_left];`
	`28`	`+ }`
	`29`	`+ return _points_left;`
	`30`	`+}`
`25`	`31`	`- (NSString *)toPath{`
`26`	`32`	`return @"api/point/records";`
`27`	`33`	`}`