Commit 75b3d262 authored by 曹云霄's avatar 曹云霄

第一次选择省市区时需要刷新数据

parent c0ba85d4
...@@ -60,6 +60,7 @@ ...@@ -60,6 +60,7 @@
[XBLoadingView showHUDViewWithSuccessText:@"保存成功" completeBlock:^{ [XBLoadingView showHUDViewWithSuccessText:@"保存成功" completeBlock:^{
[weakSelf dismissViewControllerAnimated:YES completion:nil]; [weakSelf dismissViewControllerAnimated:YES completion:nil];
}]; }];
[weakSelf getStoreAddress:nil];
}else { }else {
[XBLoadingView showHUDViewWithText:MESSAGE(returnValue)]; [XBLoadingView showHUDViewWithText:MESSAGE(returnValue)];
......
...@@ -719,7 +719,6 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -719,7 +719,6 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
//支付成功 //支付成功
WS(weakSelf); WS(weakSelf);
[settlement setPaySuccessReturnBlock:^{ [settlement setPaySuccessReturnBlock:^{
if (weakSelf.DelecteAndPayButtonBlock) { if (weakSelf.DelecteAndPayButtonBlock) {
weakSelf.DelecteAndPayButtonBlock(_cellindex,PAID); weakSelf.DelecteAndPayButtonBlock(_cellindex,PAID);
} }
......
...@@ -388,6 +388,7 @@ ...@@ -388,6 +388,7 @@
orderDetails.isShowPayButton = YES; orderDetails.isShowPayButton = YES;
orderDetails.isUserInteractionEnabled = YES; orderDetails.isUserInteractionEnabled = YES;
orderDetails.isShowHeaderView = YES; orderDetails.isShowHeaderView = YES;
orderDetails.isShowShareButton = YES;
orderDetails.isSliding = YES;//取消滑动返回 orderDetails.isSliding = YES;//取消滑动返回
[weakSelf pushViewController:orderDetails animated:YES]; [weakSelf pushViewController:orderDetails animated:YES];
......
...@@ -54,13 +54,14 @@ ...@@ -54,13 +54,14 @@
[super viewDidLoad]; [super viewDidLoad];
[self setupCollectionView]; [self setupCollectionView];
self.tempIndex = @"0";
} }
#pragma mark -获取数据 #pragma mark -获取数据
- (void)loadWebDataSource - (void)loadWebDataSource
{ {
WS(weakSelf); WS(weakSelf);
if (self.pullPageIndex == ONE) { if (self.pullPageIndex == ZERO) {
[self.datasArray removeAllObjects]; [self.datasArray removeAllObjects];
} }
self.requestModel.page.page = self.pullPageIndex; self.requestModel.page.page = self.pullPageIndex;
......
...@@ -60,6 +60,7 @@ ...@@ -60,6 +60,7 @@
[super viewDidLoad]; [super viewDidLoad];
[self setupCollectionView]; [self setupCollectionView];
self.tempIndex = @"0";
} }
#pragma mark - UICollectionView #pragma mark - UICollectionView
...@@ -76,7 +77,7 @@ ...@@ -76,7 +77,7 @@
- (void)loadWebDataSource - (void)loadWebDataSource
{ {
WS(weakSelf); WS(weakSelf);
if (self.pullPageIndex == ONE) { if (self.pullPageIndex == ZERO) {
[self.datasArray removeAllObjects]; [self.datasArray removeAllObjects];
} }
self.requestModel.page.page = self.pullPageIndex; self.requestModel.page.page = self.pullPageIndex;
......
...@@ -39,13 +39,14 @@ ...@@ -39,13 +39,14 @@
[super viewDidLoad]; [super viewDidLoad];
[self setupCollectionView]; [self setupCollectionView];
self.tempIndex = @"0";
} }
#pragma mark -加载数据 #pragma mark -加载数据
- (void)loadWebDataSource - (void)loadWebDataSource
{ {
WS(weakSelf); WS(weakSelf);
if (self.pullPageIndex == ONE) { if (self.pullPageIndex == ZERO) {
[self.readPacketArray removeAllObjects]; [self.readPacketArray removeAllObjects];
} }
self.queryReadPacket.page.page = self.pullPageIndex; self.queryReadPacket.page.page = self.pullPageIndex;
...@@ -78,6 +79,7 @@ ...@@ -78,6 +79,7 @@
}]; }];
} }
#pragma mark - UICollectionView #pragma mark - UICollectionView
- (void)setupCollectionView - (void)setupCollectionView
{ {
......
...@@ -20,6 +20,11 @@ ...@@ -20,6 +20,11 @@
*/ */
@property (nonatomic, assign) NSInteger pullPageIndex; @property (nonatomic, assign) NSInteger pullPageIndex;
/**
临时分页
*/
@property (nonatomic,copy) NSString *tempIndex;
/** /**
* 加载网络数据 需要重载 * 加载网络数据 需要重载
*/ */
......
...@@ -28,7 +28,11 @@ ...@@ -28,7 +28,11 @@
self.collectionView.delegate = self; self.collectionView.delegate = self;
self.collectionView.dataSource = self; self.collectionView.dataSource = self;
self.collectionView.alwaysBounceVertical = YES; self.collectionView.alwaysBounceVertical = YES;
self.pullPageIndex = ONE; if ([self.tempIndex isEqualToString:@"0"]) {
_pullPageIndex = ZERO;
}else {
_pullPageIndex = ONE;
}
} }
#pragma mark - 添加上、下拉刷新 #pragma mark - 添加上、下拉刷新
...@@ -57,7 +61,11 @@ ...@@ -57,7 +61,11 @@
{ {
[self setupNotDataDelegate]; [self setupNotDataDelegate];
[XBLoadingView showHUDViewWithDefault]; [XBLoadingView showHUDViewWithDefault];
_pullPageIndex = ONE; if ([self.tempIndex isEqualToString:@"0"]) {
_pullPageIndex = ZERO;
}else {
_pullPageIndex = ONE;
}
[self loadWebDataSource]; [self loadWebDataSource];
} }
......
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 to comment