Commit f4261d69 authored by 曹云霄's avatar 曹云霄

修改项说明:

parent 169dd272
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#import "IntegralDetailsViewController.h" #import "IntegralDetailsViewController.h"
#import "IntegralDetailsTableViewCell.h" #import "IntegralDetailsTableViewCell.h"
#import "prizeDetailsTableViewCell.h" #import "prizeDetailsTableViewCell.h"
#import "PrizeExchangeDetailsViewController.h"
@interface IntegralDetailsViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate> @interface IntegralDetailsViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
/** /**
...@@ -16,14 +17,11 @@ ...@@ -16,14 +17,11 @@
*/ */
@property (nonatomic,strong) NSMutableArray *datasArray; @property (nonatomic,strong) NSMutableArray *datasArray;
@end @end
@implementation IntegralDetailsViewController @implementation IntegralDetailsViewController
- (void)viewDidAppear:(BOOL)animated
{
[self.integralDetailsTableView.mj_header beginRefreshing];
}
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
...@@ -35,10 +33,12 @@ ...@@ -35,10 +33,12 @@
#pragma mark - UI #pragma mark - UI
- (void)uiConfigAction - (void)uiConfigAction
{ {
self.integralDetailsTableView.rowHeight = 70; self.integralDetailsTableView.rowHeight = (self.cellType == PrizeTableView)?90:70;
self.integralDetailsTableView.tableFooterView = [UIView new]; self.integralDetailsTableView.tableFooterView = [UIView new];
if (self.cellType == PrizeTableView) { if (self.cellType == PrizeTableView) {
self.integralDetailsTableView.frame = CGRectMake(0, 64, ScreenWidth, ScreenHeight-64); self.integralDetailsTableView.frame = CGRectMake(0, 64, ScreenWidth, ScreenHeight-64);
self.integralDetailsTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
self.integralDetailsTableView.backgroundColor = RGB(237, 238, 239, 1);
} }
} }
...@@ -68,6 +68,7 @@ ...@@ -68,6 +68,7 @@
headerRefresh.stateLabel.hidden = YES; headerRefresh.stateLabel.hidden = YES;
headerRefresh.lastUpdatedTimeLabel.hidden = YES; headerRefresh.lastUpdatedTimeLabel.hidden = YES;
self.integralDetailsTableView.mj_header = headerRefresh; self.integralDetailsTableView.mj_header = headerRefresh;
[self.integralDetailsTableView.mj_header beginRefreshing];
MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
switch (weakSelf.cellType) { switch (weakSelf.cellType) {
case IntrgralTableView: case IntrgralTableView:
...@@ -77,12 +78,7 @@ ...@@ -77,12 +78,7 @@
break; break;
case PrizeTableView: case PrizeTableView:
{ {
// if (++ weakSelf.drawModel.page.page > weakSelf.totalPage) { [weakSelf.integralDetailsTableView.mj_footer endRefreshingWithNoMoreData];
// [weakSelf.integralDetailsTableView.mj_footer endRefreshingWithNoMoreData];
// }else
// {
// [weakSelf queryPrizeDetails:NO];
// }
} }
break; break;
...@@ -143,11 +139,11 @@ ...@@ -143,11 +139,11 @@
weakSelf.integralDetailsTableView.emptyDataSetSource = weakSelf; weakSelf.integralDetailsTableView.emptyDataSetSource = weakSelf;
weakSelf.integralDetailsTableView.emptyDataSetDelegate = weakSelf; weakSelf.integralDetailsTableView.emptyDataSetDelegate = weakSelf;
if ([returnValue[@"code"] isEqualToNumber:@0]) { if ([returnValue[@"code"] isEqualToNumber:@0]) {
RsScoreDetails *integralDatas = [[RsScoreDetails alloc]initWithDictionary:returnValue[@"data"] error:nil]; if (isRemove) {
[weakSelf.datasArray addObjectsFromArray:integralDatas.recoreds]; [weakSelf.datasArray removeAllObjects];
if (weakSelf.returnIntegralDetailsBlock) {
weakSelf.returnIntegralDetailsBlock(integralDatas);
} }
RsPrizeBillResponse *integralDatas = [[RsPrizeBillResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
[weakSelf.datasArray addObjectsFromArray:integralDatas.bills];
}else { }else {
[weakSelf ErrorMBProgressView:returnValue[@"message"]]; [weakSelf ErrorMBProgressView:returnValue[@"message"]];
} }
...@@ -179,6 +175,8 @@ ...@@ -179,6 +175,8 @@
case PrizeTableView: case PrizeTableView:
{ {
prizeDetailsTableViewCell *prizeCell = [tableView dequeueReusableCellWithIdentifier:@"prizeDetailsTableViewCell" forIndexPath:indexPath]; prizeDetailsTableViewCell *prizeCell = [tableView dequeueReusableCellWithIdentifier:@"prizeDetailsTableViewCell" forIndexPath:indexPath];
prizeCell.prizeListModel = self.datasArray[indexPath.row];
prizeCell.backgroundColor = [UIColor clearColor];
return prizeCell; return prizeCell;
} }
break; break;
...@@ -196,7 +194,17 @@ ...@@ -196,7 +194,17 @@
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{ {
switch (self.cellType) {
case PrizeTableView:
{
PrizeExchangeDetailsViewController *exchangeDetails = [[[self class] getGuideIntegralStoryboardClass] instantiateViewControllerWithIdentifier:@"PrizeExchangeDetailsViewController"];
[self.navigationController pushViewController:exchangeDetails animated:YES];
}
break;
default:
break;
}
} }
#pragma mark -友好界面 #pragma mark -友好界面
......
...@@ -21,6 +21,11 @@ ...@@ -21,6 +21,11 @@
*/ */
@property (nonatomic,strong) RsPrizeBill *prizeBillResult; @property (nonatomic,strong) RsPrizeBill *prizeBillResult;
/**
section title Array
*/
@property (nonatomic,strong) NSArray *sectionTitleArray;
@end @end
@implementation PrizeExchangeDetailsViewController @implementation PrizeExchangeDetailsViewController
...@@ -65,7 +70,7 @@ ...@@ -65,7 +70,7 @@
#pragma mark - <UITableViewDelegate,UITableViewDataSource> #pragma mark - <UITableViewDelegate,UITableViewDataSource>
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{ {
switch (indexPath.row) { switch (indexPath.section) {
case ExchangeBillInformation: case ExchangeBillInformation:
{ {
PrizeExchangeBillTableViewCell *billCell = [tableView dequeueReusableCellWithIdentifier:@"PrizeExchangeBillTableViewCell" forIndexPath:indexPath]; PrizeExchangeBillTableViewCell *billCell = [tableView dequeueReusableCellWithIdentifier:@"PrizeExchangeBillTableViewCell" forIndexPath:indexPath];
...@@ -95,7 +100,7 @@ ...@@ -95,7 +100,7 @@
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{ {
return 3; return 1;
} }
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
...@@ -103,23 +108,26 @@ ...@@ -103,23 +108,26 @@
return 3; return 3;
} }
- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
{
return 60;
}
- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
{
PrizeExchangeSectionTableViewCell *headerView = [tableView dequeueReusableCellWithIdentifier:@"PrizeExchangeSectionTableViewCell"];
headerView.sectionTitleLabel.text = self.sectionTitleArray[section];
return headerView;
}
#pragma mark - lazy
- (NSArray *)sectionTitleArray
{
if (!_sectionTitleArray) {
_sectionTitleArray = @[@"兑换单信息",@"收货信息",@"奖励信息",@"物流信息"];
}
return _sectionTitleArray;
}
......
...@@ -198,13 +198,9 @@ ...@@ -198,13 +198,9 @@
#pragma mark - 兑换记录 #pragma mark - 兑换记录
- (IBAction)exchangeRecordButton:(UIButton *)sender { - (IBAction)exchangeRecordButton:(UIButton *)sender {
// IntegralDetailsViewController *prizeDetails = [[[self class] getGuideIntegralStoryboardClass] instantiateViewControllerWithIdentifier:@"IntegralDetailsViewController"]; IntegralDetailsViewController *prizeDetails = [[[self class] getGuideIntegralStoryboardClass] instantiateViewControllerWithIdentifier:@"IntegralDetailsViewController"];
// prizeDetails.cellType = PrizeTableView; prizeDetails.cellType = PrizeTableView;
// [self.navigationController pushViewController:prizeDetails animated:YES]; [self.navigationController pushViewController:prizeDetails animated:YES];
PrizeExchangeDetailsViewController *exchangeDetails = [[[self class] getGuideIntegralStoryboardClass] instantiateViewControllerWithIdentifier:@"PrizeExchangeDetailsViewController"];
[self.navigationController pushViewController:exchangeDetails animated:YES];
} }
......
...@@ -12,11 +12,23 @@ ...@@ -12,11 +12,23 @@
/**
兑奖时间
*/
@property (weak, nonatomic) IBOutlet UILabel *prizeTimeLabel; @property (weak, nonatomic) IBOutlet UILabel *prizeTimeLabel;
/**
兑奖单单号
*/
@property (weak, nonatomic) IBOutlet UILabel *prizeOrderNumberLabel; @property (weak, nonatomic) IBOutlet UILabel *prizeOrderNumberLabel;
/**
兑奖单状态
*/
@property (weak, nonatomic) IBOutlet UIButton *prizeStateButton; @property (weak, nonatomic) IBOutlet UIButton *prizeStateButton;
/**
兑奖单列表
*/
@property (nonatomic,strong) RsPrizeBill *prizeListModel;
@end @end
...@@ -12,18 +12,25 @@ ...@@ -12,18 +12,25 @@
- (void)awakeFromNib { - (void)awakeFromNib {
[super awakeFromNib]; [super awakeFromNib];
// Initialization code
} }
- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - (void)setPrizeListModel:(RsPrizeBill *)prizeListModel
[super setSelected:selected animated:animated]; {
_prizeListModel = prizeListModel;
// Configure the view for the selected state self.prizeTimeLabel.text = _prizeListModel.bill.createDate;
self.prizeOrderNumberLabel.text = _prizeListModel.bill.billnumber;
NSDictionary *textDict = [BaseViewController returnPrizeBillStateTitleColor:_prizeListModel.bill.state];
[self.prizeStateButton setTitle:textDict[@"title"] forState:UIControlStateNormal];
[self.prizeStateButton setTitleColor:textDict[@"color"] forState:UIControlStateNormal];
} }
#pragma mark - 兑奖单状态点击--->详情
- (IBAction)prizeStateButtonClickAction:(UIButton *)sender { - (IBAction)prizeStateButtonClickAction:(UIButton *)sender {
} }
@end @end
This diff is collapsed.
...@@ -425,10 +425,16 @@ ...@@ -425,10 +425,16 @@
#pragma mark - <##>查询兑奖单state对应文字 #pragma mark - <##>查询兑奖单state对应文字
//+ (id)returnPrizeBillStateTitleColor:(NSString *)stateCode + (id)returnPrizeBillStateTitleColor:(NSString *)stateCode
//{ {
// NSDictionary *dict;
//} if ([stateCode isEqualToString:@"requested"]) {
dict = @{@"title":@"已申请",@"color":RGB(127, 192, 62, 1)};
}else if ([stateCode isEqualToString:@"requested"]) {
dict = @{@"title":@"已发货",@"color":RGB(245, 185, 74, 1)};
}
return dict;
}
#pragma mark -查询购物车数量 #pragma mark -查询购物车数量
- (void)QueryShoppingCarNumber - (void)QueryShoppingCarNumber
......
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
//** //**
// * 服务器正式地址 // * 服务器正式地址
// */ // */
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL] //#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
/** /**
* 搜索框输入通知 * 搜索框输入通知
......
This diff is collapsed.
This diff is collapsed.
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