修改订单不能滑动的问题

liao3841054 · liao3841054 · commit 73f7338080dd · 2015-12-02T23:49:21.000+08:00
diff --git a/Coding_iOS/Controllers/Shop/ShopOrderViewController.m b/Coding_iOS/Controllers/Shop/ShopOrderViewController.m
@@ -119,18 +119,17 @@ - (void)carouselDidScroll:(iCarousel *)carousel{
 
 - (void)carouselCurrentItemIndexDidChange:(iCarousel *)carousel{
     
-    
     ShopOrderListView *listView = (ShopOrderListView *)carousel.currentItemView;
      _myOrder.orderType = carousel.currentItemIndex;
      listView.myOrder = _myOrder;
     [listView reloadData];
 
-//    if (_mySegmentControl) {
-//        _mySegmentControl.currentIndex = carousel.currentItemIndex;
-//    }
-//    [carousel.visibleItemViews enumerateObjectsUsingBlock:^(UIView *obj, NSUInteger idx, BOOL *stop) {
-//        [obj setSubScrollsToTop:(obj == carousel.currentItemView)];
-//    }];
+    if (_mySegmentControl) {
+        _mySegmentControl.currentIndex = carousel.currentItemIndex;
+    }
+    [carousel.visibleItemViews enumerateObjectsUsingBlock:^(UIView *obj, NSUInteger idx, BOOL *stop) {
+        [obj setSubScrollsToTop:(obj == carousel.currentItemView)];
+    }];
 }
 
 - (void)dealloc
diff --git a/Coding_iOS/Models/ShopOrderModel.m b/Coding_iOS/Models/ShopOrderModel.m
@@ -15,7 +15,7 @@ - (instancetype)init
     self = [super init];
     if (self) {
         _page = @1;
-        _pageSize = @100;
+        _pageSize = @20;
         _orderType  = ShopOrderAll;
         _dateSource = [NSMutableArray arrayWithCapacity:20];
     }
diff --git a/Coding_iOS/Views/TableListView/ShopOrderListView.m b/Coding_iOS/Views/TableListView/ShopOrderListView.m
@@ -96,15 +96,63 @@ - (void)reloadData
     }];
     
     [self.myTableView reloadData];
+    
+    __weak typeof(self) weakSelf = self;
+    [self.myTableView addInfiniteScrollingWithActionHandler:^{
+        [weakSelf refreshMore];
+    }];
 }
 
+
 - (void)refresh
 {
     [self.myRefreshControl endRefreshing];
     
 //    [self loadData];
 }
 
+- (void)refreshMore
+{
+    if (_myOrder.isLoading || !_myOrder.canLoadMore) {
+        [_myTableView.infiniteScrollingView stopAnimating];
+        [_myTableView.infiniteScrollingView ]
+        return;
+    }
+    _myOrder.willLoadMore = YES;
+    [self sendRequest];
+}
+
+- (void)sendRequest
+{
+//    __weak typeof(self) weakSelf = self;
+//    [[Coding_NetAPIManager sharedManager] request_Comments_WithProjectTpoic:self. andBlock:^(id data, NSError *error) {
+//        [weakSelf.refreshControl endRefreshing];
+//        [weakSelf.myTableView.infiniteScrollingView stopAnimating];
+//        if (data) {
+//            [weakSelf.curTopic configWithComments:data];
+//            weakSelf.myTableView.showsInfiniteScrolling = weakSelf.curTopic.canLoadMore;
+//        }
+//        [weakSelf.myTableView reloadData];
+//    }];
+    
+    __weak typeof(self) weakSelf = self;
+    _myOrder.page = @(_myOrder.page.intValue +1);
+    [[Coding_NetAPIManager sharedManager] request_shop_OrderListWithOrder:_myOrder andBlock:^(id data, NSError *error) {
+        [weakSelf.myRefreshControl endRefreshing];
+        [weakSelf endLoading];
+        [weakSelf.myTableView.infiniteScrollingView stopAnimating];
+        if (data) {
+            _dataSource = [_myOrder getDataSourceByOrderType];
+            [weakSelf.myTableView reloadData];
+        }
+//        [weakSelf configBlankPage:EaseBlankPageTypeTopic hasData:(weakSelf.myOrder.dateSource.count > 0) hasError:(error != nil) reloadButtonBlock:^(id sender) {
+//            [weakSelf refresh];
+//        }];
+
+    }];
+
+}
+
 //- (void)loadData
 //{
 //    __weak typeof(self) weakSelf = self;

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ - (instancetype)init`
`15`	`15`	`self = [super init];`
`16`	`16`	`if (self) {`
`17`	`17`	`_page = @1;`
`18`		`- _pageSize = @100;`
	`18`	`+ _pageSize = @20;`
`19`	`19`	`_orderType = ShopOrderAll;`
`20`	`20`	`_dateSource = [NSMutableArray arrayWithCapacity:20];`
`21`	`21`	`}`