修改项说明：申请兑换奖品开发

Class/ApplyPrizeViewController.h

+//
+//  ApplyPrizeViewController.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/22.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+@interface ApplyPrizeViewController : BaseViewController
+
+
+@property (weak, nonatomic) IBOutlet UIScrollView *exchangeScrollView;
+
+@property (weak, nonatomic) IBOutlet UITextField *consigneeTextField;
+
+@property (weak, nonatomic) IBOutlet UITextField *mobileTextField;
+
+@property (weak, nonatomic) IBOutlet UITextField *addressTextField;
+
+@property (weak, nonatomic) IBOutlet UITextField *addressDetailsTextField;
+
+
+@end

Class/ApplyPrizeViewController.m

+//
+//  ApplyPrizeViewController.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/22.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "ApplyPrizeViewController.h"
+#import "ModifyShippingAddressView.h"
+@interface ApplyPrizeViewController ()<CityselectedDelegate,UITextFieldDelegate>
+
+/**
+ *  城市选择器
+ */
+@property (nonatomic,strong) ModifyShippingAddressView *citySelecteview;
+
+@end
+
+@implementation ApplyPrizeViewController
+
+#pragma mark -取消弹出的圆角
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    self.view.superview.layer.cornerRadius = 0;
+}
+
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    [self setUpTextFieldAction];
+}
+
+#pragma mark - 设置UITextField
+- (void)setUpTextFieldAction
+{
+    UIView *leftView1 = [[UIView alloc]init];
+    leftView1.frame = CGRectMake(0, 0, 10, 1);
+    self.consigneeTextField.leftView = leftView1;
+    self.consigneeTextField.leftViewMode = UITextFieldViewModeAlways;
+    UIView *leftView2 = [[UIView alloc]init];
+    leftView2.frame = CGRectMake(0, 0, 10, 1);
+    self.mobileTextField.leftView = leftView2;
+    self.mobileTextField.leftViewMode = UITextFieldViewModeAlways;
+    UIView *leftView3 = [[UIView alloc]init];
+    leftView3.frame = CGRectMake(0, 0, 10, 1);
+    self.addressTextField.leftView = leftView3;
+    self.addressTextField.leftViewMode = UITextFieldViewModeAlways;
+    UIView *rightView = [[UIView alloc]initWithFrame:CGRectMake(self.addressDetailsTextField.width-20, 0, 20, self.addressDetailsTextField.height)];
+    UIImageView *imageView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 10, 15, 10)];
+    imageView.image = TCImage(@"down_arr");
+    [rightView addSubview:imageView];
+    self.addressTextField.rightView = rightView;
+    self.addressTextField.rightViewMode = UITextFieldViewModeAlways;
+    UIView *leftView4 = [[UIView alloc]init];
+    leftView4.frame = CGRectMake(0, 0, 10, 1);
+    self.addressDetailsTextField.leftView = leftView4;
+    self.addressDetailsTextField.leftViewMode = UITextFieldViewModeAlways;
+}
+
+#pragma mark - <UITextFieldDelegate>
+- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField
+{
+    if ([textField isEqual:self.addressTextField]) {
+        [self selectedCityClickAction];
+        return NO;
+    }
+    return YES;
+}
+
+
+#pragma mark -城市选择器
+- (void)selectedCityClickAction
+{
+    self.citySelecteview.frame = CGRectMake(0, self.view.frame.size.height, self.view.frame.size.width, 160);
+    [self.view addSubview:self.citySelecteview];
+    self.citySelecteview.delegate = self;
+    [self.citySelecteview.selectedCityButton addTarget:self action:@selector(completeButton) forControlEvents:UIControlEventTouchUpInside];
+    [UIView animateWithDuration:0.2 animations:^{
+        self.citySelecteview.frame = CGRectMake(0, self.view.frame.size.height-160, self.view.frame.size.width, 160);
+    }completion:^(BOOL finished) {
+    }];
+}
+
+#pragma mark -完成按钮点击
+- (void)completeButton
+{
+    [UIView animateWithDuration:0.2 animations:^{
+        
+        self.citySelecteview.frame = CGRectMake(0, ScreenHeight, self.view.frame.size.width, 160);
+    }completion:^(BOOL finished) {
+        
+        [self.citySelecteview removeFromSuperview];
+        self.citySelecteview = nil;
+    }];
+}
+
+
+#pragma mark - 取消
+- (IBAction)cancelButtonClickAction:(UIButton *)sender {
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+#pragma mark - 提交
+- (IBAction)submitButtonClickAction:(UIButton *)sender {
+    
+}
+
+
+
+#pragma mark - lazy
+/**
+ *  城市选择View
+ *
+ *  @return ModifyShippingAddressView
+ */
+- (ModifyShippingAddressView *)citySelecteview
+{
+    if (_citySelecteview == nil) {
+        _citySelecteview = [[[NSBundle mainBundle] loadNibNamed:@"ModifyShippingAddressView"
+                                                          owner:self options:nil] lastObject];
+    }
+    return _citySelecteview;
+}
+
+@end

Class/GuideIntegralViewController.m

@@ -8,6 +8,7 @@
 
 #import "GuideIntegralViewController.h"
 #import "IntegralDetailsViewController.h"
+#import "PrizeMainViewController.h"
 
 @interface GuideIntegralViewController ()
 
@@ -29,11 +30,11 @@
     self.yearIntegralLabel.text = [NSString stringWithFormat:@"%ld",scoreModel.annualRanking];
 }
 
-
 #pragma mark - 添加积分明细、导购头像
 - (void)addChildViewController
 {
     IntegralDetailsViewController *integralDetails = [[[self class] getGuideIntegralStoryboardClass] instantiateViewControllerWithIdentifier:@"IntegralDetailsViewController"];
+    integralDetails.cellType = intrgralTableView;
     [self addChildViewController:integralDetails];
     integralDetails.view.frame = CGRectMake(0, 50, self.integralDetailsView.mj_w, self.integralDetailsView.mj_h-50);
     [self.integralDetailsView addSubview:integralDetails.view];
@@ -45,10 +46,11 @@
     }];
 }
 
-
 #pragma mark - 礼品兑换
 - (IBAction)exchangeButtonClick:(UIButton *)sender {
     
+    PrizeMainViewController *prizeMainVC = [[[self class] getGuideIntegralStoryboardClass] instantiateViewControllerWithIdentifier:@"PrizeMainViewController"];
+    [self.navigationController pushViewController:prizeMainVC animated:YES];
 }
 
 

Class/IntegralDetailsViewController.m

@@ -10,7 +10,7 @@
 #import "IntegralDetailsTableViewCell.h"
 #import "prizeDetailsTableViewCell.h"
 
-@interface IntegralDetailsViewController ()<UITableViewDelegate,UITableViewDataSource>
+@interface IntegralDetailsViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
 /**
  数据源
  */
@@ -36,6 +36,10 @@
 - (void)uiConfigAction
 {
     self.integralDetailsTableView.rowHeight = 70;
+    self.integralDetailsTableView.tableFooterView = [UIView new];
+    if (self.cellType == prizeTableView) {
+        self.integralDetailsTableView.frame = CGRectMake(0, 64, ScreenWidth, ScreenHeight-64);
+    }
 }
 
 #pragma mark - 设置刷新
@@ -100,6 +104,8 @@
         
         [weakSelf RemoveMBProgressHUDLoding];
         [weakSelf endRefreshingForTableView:weakSelf.integralDetailsTableView];
+        weakSelf.integralDetailsTableView.emptyDataSetSource = weakSelf;
+        weakSelf.integralDetailsTableView.emptyDataSetDelegate = weakSelf;
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             RsScoreDetails *integralDatas = [[RsScoreDetails alloc]initWithDictionary:returnValue[@"data"] error:nil];
             [weakSelf.datasArray addObjectsFromArray:integralDatas.recoreds];
@@ -125,7 +131,35 @@
 #pragma mark - 查询兑奖明细
 - (void)queryPrizeDetails:(BOOL)isRemove
 {
-    
+    WS(weakSelf);
+    [self CreateMBProgressHUDLoding];
+    NSString *url = [NSString stringWithFormat:SERVERREQUESTURL(ALLEXCHANGERECORD),[Shoppersmanager manager].Shoppers.employee.fid];
+    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:url WithCallClass:weakSelf WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+        
+        [weakSelf RemoveMBProgressHUDLoding];
+        [weakSelf endRefreshingForTableView:weakSelf.integralDetailsTableView];
+        weakSelf.integralDetailsTableView.emptyDataSetSource = weakSelf;
+        weakSelf.integralDetailsTableView.emptyDataSetDelegate = weakSelf;
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            RsScoreDetails *integralDatas = [[RsScoreDetails alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            [weakSelf.datasArray addObjectsFromArray:integralDatas.recoreds];
+            if (weakSelf.returnIntegralDetailsBlock) {
+                weakSelf.returnIntegralDetailsBlock(integralDatas);
+            }
+        }else {
+            [weakSelf ErrorMBProgressView:returnValue[@"message"]];
+        }
+        [weakSelf.integralDetailsTableView reloadData];
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        [weakSelf RemoveMBProgressHUDLoding];
+        [weakSelf endRefreshingForTableView:weakSelf.integralDetailsTableView];
+        [weakSelf ErrorMBProgressView:NETWORK];
+    } WithFailureBlock:^(NSError *error) {
+        [weakSelf RemoveMBProgressHUDLoding];
+        [weakSelf endRefreshingForTableView:weakSelf.integralDetailsTableView];
+        [weakSelf ErrorMBProgressView:error.localizedDescription];
+    }];
 }
 
 #pragma mark - <UITableViewDataSource,UITableViewDelegate>
@@ -146,7 +180,21 @@
 
 }
 
+#pragma mark -友好界面
+- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return kNoDataImage;
+}
+
+- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
+{
+    return YES;
+}
 
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return [[NSAttributedString alloc]initWithString:@"暂无数据~" attributes:nil];
+}
 
 
 #pragma mark - lazy

Class/PrizeListCollectionViewCell.h

+//
+//  PrizeListCollectionViewCell.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/22.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface PrizeListCollectionViewCell : UICollectionViewCell
+
+
+/**
+ 奖品图片
+ */
+@property (weak, nonatomic) IBOutlet UIImageView *prizeImageView;
+
+/**
+ 奖品描述
+ */
+@property (weak, nonatomic) IBOutlet UILabel *prizeDescribeLabel;
+
+/**
+ 勾选框
+ */
+@property (weak, nonatomic) IBOutlet UIButton *isSelectButton;
+
+/**
+ 奖品数据
+ */
+@property (nonatomic,strong) TOPrizeEntity *prizeModel;
+@end

Class/PrizeListCollectionViewCell.m

+//
+//  PrizeListCollectionViewCell.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/22.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "PrizeListCollectionViewCell.h"
+
+@implementation PrizeListCollectionViewCell
+
+- (void)setPrizeModel:(TOPrizeEntity *)prizeModel
+{
+    _prizeModel = prizeModel;
+    [self.prizeImageView sd_setImageWithURL:[NSURL URLWithString:_prizeModel.picture] placeholderImage:REPLACEIMAGE];
+    self.prizeDescribeLabel.text = _prizeModel.name;
+}
+
+@end

Class/PrizeListModel.h

+//
+//  PrizeListModel.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/22.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "opple_objc_json_client.h"
+
+@interface PrizeListModel : TOPrizeEntity
+
+
+- (instancetype)initWithSuper:(TOPrizeEntity *)model;
+@property (nonatomic,assign) BOOL isSelect;
+
+@end

Class/PrizeListModel.m

+//
+//  PrizeListModel.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/22.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "PrizeListModel.h"
+
+@implementation PrizeListModel
+
+
+- (instancetype)initWithSuper:(TOPrizeEntity *)model
+{
+    if (self = [super init]) {
+        self.fid = model.fid;
+        self.picture = model.picture;
+        self.createName = model.createName;
+        self.createBy = model.createBy;
+        self.updateName = model.updateName;
+        self.updateBy = model.updateBy;
+        self.code = model.code;
+        self.name = model.name;
+        self.createDate = model.createDate;
+        self.updateDate = model.updateDate;
+        self.isSelect = NO;
+    }
+    return self;
+}
+@end

Class/PrizeMainViewController.h

+//
+//  PrizeMainViewController.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/22.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+@interface PrizeMainViewController : BaseViewController
+
+
+
+/**
+ 兑奖记录
+ */
+@property (weak, nonatomic) IBOutlet UIButton *recordButton;
+
+/**
+ 申请兑奖
+ */
+@property (weak, nonatomic) IBOutlet UIButton *requestExchangeButton;
+
+/**
+ 奖品列表
+ */
+@property (weak, nonatomic) IBOutlet UICollectionView *prizeListCollectionView;
+
+/**
+ FlowLayout
+ */
+@property (weak, nonatomic) IBOutlet UICollectionViewFlowLayout *prizeCollectionViewFlowLayout;
+
+@end

Class/PrizeMainViewController.m

+//
+//  PrizeMainViewController.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/22.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "PrizeMainViewController.h"
+#import "PrizeListCollectionViewCell.h"
+#import "PrizeListModel.h"
+#import "ApplyPrizeViewController.h"
+#import "IntegralDetailsViewController.h"
+
+@interface PrizeMainViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
+
+/**
+ 查询奖品列表
+ */
+@property (nonatomic,strong) PrizeCondition *queryPrizeModel;
+
+/**
+ 奖品数据源
+ */
+@property (nonatomic,strong) NSMutableArray *prizeDatasArray;
+@end
+
+@implementation PrizeMainViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    [self setUpCollectionView];
+    [self queryExchangeQualification];
+    [self setUpRefreshAction];
+}
+
+#pragma mark - UICollectionView
+- (void)setUpCollectionView
+{
+    self.prizeCollectionViewFlowLayout.itemSize = CGSizeMake((ScreenWidth-100)/4, (ScreenWidth-100)/4);
+    self.prizeCollectionViewFlowLayout.minimumLineSpacing = 20;
+    self.prizeCollectionViewFlowLayout.minimumInteritemSpacing = 20;
+    self.prizeCollectionViewFlowLayout.sectionInset = UIEdgeInsetsMake(20, 20, 20, 20);
+}
+
+#pragma mark - 设置刷新
+- (void)setUpRefreshAction
+{
+    WS(weakSelf);
+    MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
+        [weakSelf.prizeListCollectionView.mj_footer resetNoMoreData];
+        weakSelf.queryPrizeModel.page.page = ONE;
+        [weakSelf getPrizeListDatasAction:YES];
+    }];
+    headerRefresh.stateLabel.hidden = YES;
+    headerRefresh.lastUpdatedTimeLabel.hidden = YES;
+    [headerRefresh beginRefreshing];
+    self.prizeListCollectionView.mj_header = headerRefresh;
+    
+    MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+        
+    }];
+    footer.automaticallyHidden = YES;
+    self.prizeListCollectionView.mj_footer = footer;
+}
+
+#pragma mark - 获取奖品列表
+- (void)getPrizeListDatasAction:(BOOL)isRemove
+{
+    WS(weakSelf);
+    [self CreateMBProgressHUDLoding];
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(PRIZELIST) WithCallClass:weakSelf WithRequestType:ZERO WithParameter:self.queryPrizeModel WithReturnValueBlock:^(id returnValue) {
+        
+        [weakSelf RemoveMBProgressHUDLoding];
+        [weakSelf endRefreshingForTableView:weakSelf.prizeListCollectionView];
+        weakSelf.prizeListCollectionView.emptyDataSetSource = weakSelf;
+        weakSelf.prizeListCollectionView.emptyDataSetDelegate = weakSelf;
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            PrizeResponse *prizeResult = [[PrizeResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            for (TOPrizeEntity *prize in prizeResult.prizes) {
+                PrizeListModel *model = [[PrizeListModel alloc]initWithSuper:prize];
+                [weakSelf.prizeDatasArray addObject:model];
+            }
+        }else {
+            [weakSelf ErrorMBProgressView:returnValue[@"message"]];
+        }
+        [weakSelf.prizeListCollectionView reloadData];
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        [weakSelf RemoveMBProgressHUDLoding];
+        [weakSelf endRefreshingForTableView:weakSelf.prizeListCollectionView];
+        [weakSelf ErrorMBProgressView:NETWORK];
+    } WithFailureBlock:^(NSError *error) {
+        [weakSelf RemoveMBProgressHUDLoding];
+        [weakSelf endRefreshingForTableView:weakSelf.prizeListCollectionView];
+        [weakSelf ErrorMBProgressView:error.localizedDescription];
+    }];
+}
+
+#pragma mark - 查询兑奖资格
+- (void)queryExchangeQualification
+{
+    WS(weakSelf);
+    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(EXCHANGEQUALIFICATION),[Shoppersmanager manager].Shoppers.employee.fid] WithCallClass:weakSelf WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+        
+        NSLog(@"%@",returnValue);
+        
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        [weakSelf ErrorMBProgressView:NETWORK];
+    } WithFailureBlock:^(NSError *error) {
+        [weakSelf ErrorMBProgressView:error.localizedDescription];
+    }];
+}
+
+#pragma mark - <UICollectionViewDelegate,UICollectionViewDataSource>
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
+{
+    return self.prizeDatasArray.count;
+}
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    PrizeListCollectionViewCell *prizeListCell = [collectionView dequeueReusableCellWithReuseIdentifier:@"PrizeListCollectionViewCell" forIndexPath:indexPath];
+    prizeListCell.prizeModel = self.prizeDatasArray[indexPath.row];
+    return prizeListCell;
+}
+
+#pragma mark - 申请兑奖
+- (IBAction)applyExchangeButton:(UIButton *)sender {
+    
+    ApplyPrizeViewController *applyPrizeVC = [[ApplyPrizeViewController alloc]init];
+    applyPrizeVC.preferredContentSize = applyPrizeVC.view.mj_size;
+    applyPrizeVC.modalPresentationStyle = UIModalPresentationFormSheet;
+    UIPopoverPresentationController *pop = applyPrizeVC.popoverPresentationController;
+    pop.permittedArrowDirections = UIPopoverArrowDirectionAny;
+    pop.sourceView = applyPrizeVC.view;
+    [self presentViewController:applyPrizeVC animated:YES completion:nil];
+}
+
+#pragma mark - 兑换记录
+- (IBAction)exchangeRecordButton:(UIButton *)sender {
+    
+    IntegralDetailsViewController *prizeDetails = [[[self class] getGuideIntegralStoryboardClass] instantiateViewControllerWithIdentifier:@"IntegralDetailsViewController"];
+    prizeDetails.cellType = prizeTableView;
+    [self.navigationController pushViewController:prizeDetails animated:YES];
+}
+
+
+#pragma mark -友好界面
+- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return kNoDataImage;
+}
+
+- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
+{
+    return YES;
+}
+
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return [[NSAttributedString alloc]initWithString:@"暂无数据~" attributes:nil];
+}
+
+#pragma mark - lazy
+- (NSMutableArray *)prizeDatasArray
+{
+    if (!_prizeDatasArray) {
+        _prizeDatasArray = [NSMutableArray array];
+    }
+    return _prizeDatasArray;
+}
+
+- (PrizeCondition *)queryPrizeModel
+{
+    if (!_queryPrizeModel) {
+        _queryPrizeModel = [[PrizeCondition alloc]init];
+        DataPage *page = [[DataPage alloc]init];
+        page.page = ONE;
+        page.rows = KROWS;
+        _queryPrizeModel.page = page;
+    }
+    return _queryPrizeModel;
+}
+
+@end

Class/PromotionChooseViewController.m

@@ -73,15 +73,18 @@
             for (int i=0;i<weakSelf.customPromotionDatas.count;i++) {
                 CustomPromotionModel *model2 = weakSelf.customPromotionDatas[i];
                 if (![model2.conflicts containsObject:model1.type] && ![model1.conflicts containsObject:model2.type]) {
-                    for (int i=0;i<weakSelf.customPromotionDatas.count;i++) {
-                        CustomPromotionModel *model3 = weakSelf.customPromotionDatas[i];
-                        if ([model3.conflicts containsObject:model1.type]) {
-                            break;
-                        }
-                        if (i == weakSelf.customPromotionDatas.count-1) {
-                            model1.isSelected = YES;
-                        }
-                    }
+//                    for (int i=0;i<weakSelf.customPromotionDatas.count;i++) {
+//                        CustomPromotionModel *model3 = weakSelf.customPromotionDatas[i];
+//                        if ([model3.conflicts containsObject:model2.type]) {
+//                            break;
+//                        }
+//                        if (i == weakSelf.customPromotionDatas.count-1) {
+//                            model2.isSelected = YES;
+//                        }
+//                    }
+                    model1.isSelected = YES;
+                }else{
+//                    model1.isSelected = NO;
                 }
             }
         }else {

Class/Shoppingcart/AddressViewController.m

@@ -221,7 +221,7 @@
         
     } WithErrorCodeBlock:^(id errorCodeValue) {
         [weakSelf RemoveMBProgressHUDLoding];
-        [weakSelf ErrorMBProgressView:@"无网络"];
+        [weakSelf ErrorMBProgressView:NETWORK];
         
     } WithFailureBlock:^(id error) {
         

Class/Shoppingcart/GenerateOrdersViewController.m

@@ -315,20 +315,14 @@
     return nil;
 }
 
-
-
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
     return self.datasArray.count;
 }
 
-
-
-
 #pragma mark -新增或者修改收货地址
 - (void)CreateModifyShippingView:(AddressModel *)model Withindex:(NSInteger)cellindex
 {
-    
     AddressViewController *address = [[AddressViewController alloc]init];
     address.delegate = self;
     if (model != nil) {
@@ -345,9 +339,6 @@
     [self presentViewController:address animated:YES completion:nil];
 }
 
-
-
-
 #pragma mark -生成订单
 - (IBAction)CreateOrderButtonClick:(UIButton *)sender {
     

Lighting.xcodeproj/project.pbxproj

@@ -188,6 +188,11 @@
 		29E384CB1CE9B0BB00888199 /* HotCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E384CA1CE9B0BB00888199 /* HotCollectionViewCell.m */; };
 		29E384D11CE9C65700888199 /* SearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E384D01CE9C65700888199 /* SearchViewController.m */; };
 		29E9443D1DE3E0D0007CD26C /* prizeDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E9443C1DE3E0D0007CD26C /* prizeDetailsTableViewCell.m */; };
+		29E944421DE3EC7C007CD26C /* PrizeMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E944411DE3EC7C007CD26C /* PrizeMainViewController.m */; };
+		29E944461DE3EFFE007CD26C /* PrizeListCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E944451DE3EFFE007CD26C /* PrizeListCollectionViewCell.m */; };
+		29E9444D1DE40D5F007CD26C /* PrizeListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E9444C1DE40D5F007CD26C /* PrizeListModel.m */; };
+		29E944521DE413D6007CD26C /* ApplyPrizeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E944501DE413D6007CD26C /* ApplyPrizeViewController.m */; };
+		29E944531DE413D6007CD26C /* ApplyPrizeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29E944511DE413D6007CD26C /* ApplyPrizeViewController.xib */; };
 		29EAAE8E1CDC3E8E00C4DBA2 /* BillingInfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29EAAE8D1CDC3E8E00C4DBA2 /* BillingInfoView.m */; };
 		29EAAE901CDC3E9700C4DBA2 /* BillingInfoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29EAAE8F1CDC3E9700C4DBA2 /* BillingInfoView.xib */; };
 		29EAAE951CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29EAAE941CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m */; };
@@ -549,6 +554,15 @@
 		29E384D01CE9C65700888199 /* SearchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchViewController.m; sourceTree = "<group>"; };
 		29E9443B1DE3E0D0007CD26C /* prizeDetailsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prizeDetailsTableViewCell.h; sourceTree = "<group>"; };
 		29E9443C1DE3E0D0007CD26C /* prizeDetailsTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = prizeDetailsTableViewCell.m; sourceTree = "<group>"; };
+		29E944401DE3EC7C007CD26C /* PrizeMainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrizeMainViewController.h; sourceTree = "<group>"; };
+		29E944411DE3EC7C007CD26C /* PrizeMainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PrizeMainViewController.m; sourceTree = "<group>"; };
+		29E944441DE3EFFE007CD26C /* PrizeListCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrizeListCollectionViewCell.h; sourceTree = "<group>"; };
+		29E944451DE3EFFE007CD26C /* PrizeListCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PrizeListCollectionViewCell.m; sourceTree = "<group>"; };
+		29E9444B1DE40D5F007CD26C /* PrizeListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrizeListModel.h; sourceTree = "<group>"; };
+		29E9444C1DE40D5F007CD26C /* PrizeListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PrizeListModel.m; sourceTree = "<group>"; };
+		29E9444F1DE413D6007CD26C /* ApplyPrizeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplyPrizeViewController.h; sourceTree = "<group>"; };
+		29E944501DE413D6007CD26C /* ApplyPrizeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ApplyPrizeViewController.m; sourceTree = "<group>"; };
+		29E944511DE413D6007CD26C /* ApplyPrizeViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ApplyPrizeViewController.xib; sourceTree = "<group>"; };
 		29EAAE8C1CDC3E8E00C4DBA2 /* BillingInfoView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BillingInfoView.h; sourceTree = "<group>"; };
 		29EAAE8D1CDC3E8E00C4DBA2 /* BillingInfoView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BillingInfoView.m; sourceTree = "<group>"; };
 		29EAAE8F1CDC3E9700C4DBA2 /* BillingInfoView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BillingInfoView.xib; sourceTree = "<group>"; };
@@ -1320,13 +1334,9 @@
 		29834EC11CDF768C001A484F /* XXuserController */ = {
 			isa = PBXGroup;
 			children = (
-				29834EC21CDF76C1001A484F /* UserViewController.h */,
-				29834EC31CDF76C1001A484F /* UserViewController.m */,
-				29834EC41CDF76C1001A484F /* UserViewController.xib */,
-				29EC33171CE023D5005F0C13 /* ChangePasswordViewController.h */,
-				29EC33181CE023D5005F0C13 /* ChangePasswordViewController.m */,
-				29EC33191CE023D5005F0C13 /* ChangePasswordViewController.xib */,
+				29E9443E1DE3EBE9007CD26C /* GuideMain */,
 				295DE5691DDC5DBD00E27725 /* GuideIntegral */,
+				29E9443F1DE3EC03007CD26C /* Prize */,
 				29B3EE6E1DCE15EC0065FCCF /* MyLuckyDraw */,
 				295DEAA01DB7562A006ED4A6 /* CardStock */,
 				2916A73B1D70230600644C8C /* RebateVC */,
@@ -1735,6 +1745,59 @@
 			name = view;
 			sourceTree = "<group>";
 		};
+		29E9443E1DE3EBE9007CD26C /* GuideMain */ = {
+			isa = PBXGroup;
+			children = (
+				29834EC21CDF76C1001A484F /* UserViewController.h */,
+				29834EC31CDF76C1001A484F /* UserViewController.m */,
+				29834EC41CDF76C1001A484F /* UserViewController.xib */,
+				29EC33171CE023D5005F0C13 /* ChangePasswordViewController.h */,
+				29EC33181CE023D5005F0C13 /* ChangePasswordViewController.m */,
+				29EC33191CE023D5005F0C13 /* ChangePasswordViewController.xib */,
+			);
+			name = GuideMain;
+			sourceTree = "<group>";
+		};
+		29E9443F1DE3EC03007CD26C /* Prize */ = {
+			isa = PBXGroup;
+			children = (
+				29E9444E1DE4139D007CD26C /* Controllers */,
+				29E944471DE40D13007CD26C /* Models */,
+				29E944431DE3EFD4007CD26C /* Cells */,
+			);
+			name = Prize;
+			sourceTree = "<group>";
+		};
+		29E944431DE3EFD4007CD26C /* Cells */ = {
+			isa = PBXGroup;
+			children = (
+				29E944441DE3EFFE007CD26C /* PrizeListCollectionViewCell.h */,
+				29E944451DE3EFFE007CD26C /* PrizeListCollectionViewCell.m */,
+			);
+			name = Cells;
+			sourceTree = "<group>";
+		};
+		29E944471DE40D13007CD26C /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				29E9444B1DE40D5F007CD26C /* PrizeListModel.h */,
+				29E9444C1DE40D5F007CD26C /* PrizeListModel.m */,
+			);
+			name = Models;
+			sourceTree = "<group>";
+		};
+		29E9444E1DE4139D007CD26C /* Controllers */ = {
+			isa = PBXGroup;
+			children = (
+				29E944401DE3EC7C007CD26C /* PrizeMainViewController.h */,
+				29E944411DE3EC7C007CD26C /* PrizeMainViewController.m */,
+				29E9444F1DE413D6007CD26C /* ApplyPrizeViewController.h */,
+				29E944501DE413D6007CD26C /* ApplyPrizeViewController.m */,
+				29E944511DE413D6007CD26C /* ApplyPrizeViewController.xib */,
+			);
+			name = Controllers;
+			sourceTree = "<group>";
+		};
 		29EAAE911CDC412100C4DBA2 /* controller */ = {
 			isa = PBXGroup;
 			children = (
@@ -1969,6 +2032,7 @@
 				294BFDD11D47225A00BFD53F /* OppleMain.storyboard in Resources */,
 				29BFBD911CE44BC200C238FB /* goodsDetailsSectionview.xib in Resources */,
 				29C0E73F1DD98335006CCCF9 /* LearningCenter.storyboard in Resources */,
+				29E944531DE413D6007CD26C /* ApplyPrizeViewController.xib in Resources */,
 				29D260FD1CEED53400A9787D /* goodsDetailsTableViewCell.xib in Resources */,
 				29CF0EC81DDC564900A37171 /* GuideIntegral.storyboard in Resources */,
 				29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */,
@@ -2071,6 +2135,7 @@
 				292A14311CE81D1D00EB4430 /* AddressModel.m in Sources */,
 				29A938221CDADE4700F21E54 /* ProductDetailsTableViewCell.m in Sources */,
 				29E384BE1CE9933300888199 /* AdditionalTableViewCell.m in Sources */,
+				29E944461DE3EFFE007CD26C /* PrizeListCollectionViewCell.m in Sources */,
 				2921F3031DB5EBD600D6439B /* PromotionalDeductionModel.m in Sources */,
 				294BFDD51D47227900BFD53F /* ExperienceCentreViewController.m in Sources */,
 				29E384C81CE9A8BF00888199 /* SearchCollectionViewCell.m in Sources */,
@@ -2129,6 +2194,7 @@
 				29498C601D053B7C004FA79B /* ShoppingBagTableViewCell.m in Sources */,
 				29BAA3AB1DC9FB5B00927D04 /* PromptTableViewCell.m in Sources */,
 				29EAAE9C1CDC74CA00C4DBA2 /* AllCustomerViewController.m in Sources */,
+				29E944421DE3EC7C007CD26C /* PrizeMainViewController.m in Sources */,
 				2933934F1CD3158B000D997B /* instructionsLabe.m in Sources */,
 				29F726011CE1D05D0072FE0E /* ScreeningCollectionReusableView.m in Sources */,
 				2921F3001DB5E91A00D6439B /* NSDictionary+category.m in Sources */,
@@ -2143,6 +2209,7 @@
 				29834EB41CDF1EAA001A484F /* screeningSecondView.m in Sources */,
 				29706DA61CD082990003C412 /* main.m in Sources */,
 				2936F2961D017BBD007CA67C /* GoodsImageView.m in Sources */,
+				29E9444D1DE40D5F007CD26C /* PrizeListModel.m in Sources */,
 				29498C541D050DFC004FA79B /* UIImagePickerController+SupportDirection.m in Sources */,
 				291D6A621CFFE212007891AE /* DataDictModel.m in Sources */,
 				29A938251CDAE31200F21E54 /* ProductDetailsHeaderView.m in Sources */,
@@ -2183,6 +2250,7 @@
 				29D260F81CEEAF2D00A9787D /* FullScreenViewCell.m in Sources */,
 				290887061CE58BC2000B7097 /* screeningButton.m in Sources */,
 				295DEAC21DB786B8006ED4A6 /* CardDontUseViewController.m in Sources */,
+				29E944521DE413D6007CD26C /* ApplyPrizeViewController.m in Sources */,
 				292AD2001DE309C1003EC56E /* IntegralDetailsViewController.m in Sources */,
 				044708611CD7C1E800555827 /* MainSetViewController.m in Sources */,
 				29E28CE81CE0B91B00812A55 /* HENLENSONG.m in Sources */,

Lighting/Images.xcassets/Brand Assets.launchimage/Contents.json

 {
   "images" : [
     {
-      "orientation" : "landscape",
+      "orientation" : "portrait",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
       "scale" : "1x"
     },
     {
       "orientation" : "landscape",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
-      "scale" : "2x"
+      "minimum-system-version" : "7.0",
+      "scale" : "1x"
     },
     {
       "orientation" : "portrait",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
-      "scale" : "1x"
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
     },
     {
-      "orientation" : "portrait",
+      "orientation" : "landscape",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
       "scale" : "2x"
     }
   ],

Lighting/Images.xcassets/navi.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "navi.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "navi@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "navi@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Tools/CYConstManager.h

@@ -287,6 +287,21 @@ extern NSString *const USEWECHATCARD;
  *  查询积分
  */
 extern NSString *const INTEGRALQUERY;
+
+/**
+ *  奖品列表
+ */
+extern NSString *const PRIZELIST;
+
+/**
+ *  所有的兑奖记录
+ */
+extern NSString *const ALLEXCHANGERECORD;
+
+/**
+ *  是否有兑奖资格
+ */
+extern NSString *const EXCHANGEQUALIFICATION;
 /*****************************************接口地址*****************************************/
 
 

Tools/CYConstManager.m

@@ -281,6 +281,21 @@ NSString *const USEWECHATCARD = @"http://wxcard.opple.com/api/Pay?voucherNo=%@&o
  *  查询积分
  */
 NSString *const INTEGRALQUERY = @"/score/details?employee=%@";
+
+/**
+ *  奖品列表
+ */
+NSString *const PRIZELIST = @"/prize/query";
+
+/**
+ *  所有的兑奖记录
+ */
+NSString *const ALLEXCHANGERECORD = @"/prizebill/all?employee=%@";
+
+/**
+ *  是否有兑奖资格
+ */
+NSString *const EXCHANGEQUALIFICATION  = @"/prizequalification?employee=%@";
 /*****************************************接口地址*****************************************/
 
 

Tools/PopoverViewController.h

@@ -41,7 +41,7 @@
 /**
  *  传入数据源
  */
-@property (nonatomic,strong) NSMutableArray *datasArray;
+@property (nonatomic,strong) NSArray *datasArray;
 
 /**
  *  代理

Tools/PrefixHeader.pch

@@ -140,13 +140,13 @@
 /**
  *  服务器开发地址
  */
-//#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
+#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
 
 
 /**
  *  服务器测试地址
  */
-#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
+//#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
 
 //**
 // *  服务器正式地址