提交

KuDianProject.xcodeproj/project.pbxproj

@@ -40,6 +40,9 @@
 		76D6EE8E22D5885600E7AC1C /* MSSAutoresizeLabelFlowConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 76D6EE8A22D5885600E7AC1C /* MSSAutoresizeLabelFlowConfig.m */; };
 		76D6EE9122D5996100E7AC1C /* KDPSearchResultViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76D6EE9022D5996100E7AC1C /* KDPSearchResultViewController.m */; };
 		76D6EE9622D5BBB100E7AC1C /* KDPSearchResuCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 76D6EE9522D5BBB100E7AC1C /* KDPSearchResuCollectionViewCell.m */; };
+		76D6EE9922D5D02300E7AC1C /* KDPLiveListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 76D6EE9822D5D02300E7AC1C /* KDPLiveListModel.m */; };
+		76D6EE9C22D5D53B00E7AC1C /* KDPLiveDetailModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 76D6EE9B22D5D53B00E7AC1C /* KDPLiveDetailModel.m */; };
+		76D6EE9F22D5DAFF00E7AC1C /* KDPClassModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 76D6EE9E22D5DAFF00E7AC1C /* KDPClassModel.m */; };
 		76D7941322CDCC9C00C2ECFA /* KDPLiveDataViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76D7941222CDCC9C00C2ECFA /* KDPLiveDataViewController.m */; };
 		76D7941622CDCCB900C2ECFA /* KDPSupplyGoodViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76D7941522CDCCB900C2ECFA /* KDPSupplyGoodViewController.m */; };
 		76D7942522CDD3CB00C2ECFA /* UINavigationBar+handle.m in Sources */ = {isa = PBXBuildFile; fileRef = 76D7941922CDD3C900C2ECFA /* UINavigationBar+handle.m */; };
@@ -198,6 +201,12 @@
 		76D6EE9022D5996100E7AC1C /* KDPSearchResultViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KDPSearchResultViewController.m; sourceTree = "<group>"; };
 		76D6EE9422D5BBB100E7AC1C /* KDPSearchResuCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KDPSearchResuCollectionViewCell.h; sourceTree = "<group>"; };
 		76D6EE9522D5BBB100E7AC1C /* KDPSearchResuCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KDPSearchResuCollectionViewCell.m; sourceTree = "<group>"; };
+		76D6EE9722D5D02300E7AC1C /* KDPLiveListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = KDPLiveListModel.h; path = KuDianProject/Search/Controller/View/KDPLiveListModel.h; sourceTree = SOURCE_ROOT; };
+		76D6EE9822D5D02300E7AC1C /* KDPLiveListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = KDPLiveListModel.m; path = KuDianProject/Search/Controller/View/KDPLiveListModel.m; sourceTree = SOURCE_ROOT; };
+		76D6EE9A22D5D53B00E7AC1C /* KDPLiveDetailModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = KDPLiveDetailModel.h; path = KuDianProject/Search/Controller/View/KDPLiveDetailModel.h; sourceTree = SOURCE_ROOT; };
+		76D6EE9B22D5D53B00E7AC1C /* KDPLiveDetailModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = KDPLiveDetailModel.m; path = KuDianProject/Search/Controller/View/KDPLiveDetailModel.m; sourceTree = SOURCE_ROOT; };
+		76D6EE9D22D5DAFF00E7AC1C /* KDPClassModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = KDPClassModel.h; path = KuDianProject/Search/Controller/View/KDPClassModel.h; sourceTree = SOURCE_ROOT; };
+		76D6EE9E22D5DAFF00E7AC1C /* KDPClassModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = KDPClassModel.m; path = KuDianProject/Search/Controller/View/KDPClassModel.m; sourceTree = SOURCE_ROOT; };
 		76D7941122CDCC9C00C2ECFA /* KDPLiveDataViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KDPLiveDataViewController.h; sourceTree = "<group>"; };
 		76D7941222CDCC9C00C2ECFA /* KDPLiveDataViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KDPLiveDataViewController.m; sourceTree = "<group>"; };
 		76D7941422CDCCB900C2ECFA /* KDPSupplyGoodViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KDPSupplyGoodViewController.h; sourceTree = "<group>"; };
@@ -578,6 +587,10 @@
 		76D7940D22CDCB9400C2ECFA /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				76D6EE9722D5D02300E7AC1C /* KDPLiveListModel.h */,
+				76D6EE9822D5D02300E7AC1C /* KDPLiveListModel.m */,
+				76D6EE9A22D5D53B00E7AC1C /* KDPLiveDetailModel.h */,
+				76D6EE9B22D5D53B00E7AC1C /* KDPLiveDetailModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -600,6 +613,8 @@
 		76D7940F22CDCBA500C2ECFA /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				76D6EE9D22D5DAFF00E7AC1C /* KDPClassModel.h */,
+				76D6EE9E22D5DAFF00E7AC1C /* KDPClassModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -1166,6 +1181,7 @@
 				764A24D622D44220009B3891 /* KDPUserInfo.m in Sources */,
 				76D6EE7122D4A7A100E7AC1C /* KDPTabBarVC.m in Sources */,
 				C5BAD0BE22D441A70084663A /* KDPWebInteractionVC.m in Sources */,
+				76D6EE9C22D5D53B00E7AC1C /* KDPLiveDetailModel.m in Sources */,
 				76D7942A22CDD3CB00C2ECFA /* UITableViewCell+Extension.m in Sources */,
 				C5BAD0E622D49AC80084663A /* KDPIDTipView.m in Sources */,
 				C53FD3F222D31C5500687706 /* KDPAccountListCell.m in Sources */,
@@ -1211,6 +1227,8 @@
 				C5D5624D22CD9FBC0035A714 /* UIColor+KDPColor.m in Sources */,
 				C53FD40422D34DBD00687706 /* KDPDrawerListCell.m in Sources */,
 				C5BAD0E022D4845B0084663A /* KDPTodayListCell.m in Sources */,
+				76D6EE9F22D5DAFF00E7AC1C /* KDPClassModel.m in Sources */,
+				76D6EE9922D5D02300E7AC1C /* KDPLiveListModel.m in Sources */,
 				C5D5625922CDC9870035A714 /* MBProgressHUD+KDPCategory.m in Sources */,
 				76D6EE8C22D5885600E7AC1C /* MSSAutoresizeLabelFlowLayout.m in Sources */,
 				C5D5626E22CDFDD20035A714 /* KDPEarningHeadView.m in Sources */,

KuDianProject.xcodeproj/xcuserdata/kaipeng.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>KuDianProject.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>20</integer>
 		</dict>
 	</dict>
 </dict>

KuDianProject/LiveData/Controller/KDPLiveLeftTableViewCell.m

@@ -7,7 +7,7 @@
 //
 
 #import "KDPLiveLeftTableViewCell.h"
-
+#import "KDPLiveListModel.h"
 @implementation KDPLiveLeftTableViewCell
 {
     UILabel *_timeLabel;
@@ -167,6 +167,16 @@
     
 }
 
+- (void)configWithViewModel:(id)viewModel indexpath:(NSIndexPath *)indexPath{
+    KDPLiveListModel *model = (KDPLiveListModel*)viewModel;
+    _timeLabel.text = [NSString stringWithFormat:@"直播时间:%@",model.show_time];
+    _goodCountLabel.text = model.goods_num;
+    _orderLabel.text = model.order_num;
+    [_iconImageView sd_setImageWithURL:[NSURL URLWithString:model.show_img]];
+    _investLabel.text = model.pre_rebate;
+    
+}
+
 - (void)checkOrderAction:(UIButton *)sender{
     if (self.orderClickBlock) {
         self.orderClickBlock(sender);

KuDianProject/LiveData/Controller/KDPLiveLeftViewController.m

@@ -9,10 +9,15 @@
 #import "KDPLiveLeftViewController.h"
 #import "KDPLiveLeftTableViewCell.h"
 #import "KDPOrderDetailViewController.h"
+#import "KDPLiveListModel.h"
 @interface KDPLiveLeftViewController ()<UITableViewDelegate,UITableViewDataSource>
 
 @property (nonatomic, strong) UITableView *tableView;
 
+@property (nonatomic, assign) NSInteger page;
+
+@property (nonatomic, strong) NSMutableArray *dataSource;
+
 @end
 
 @implementation KDPLiveLeftViewController
@@ -24,6 +29,31 @@
     [self setUpUI];
 }
 
+- (void)requestData{
+    NSDictionary *params = @{@"page":@(self.page)};
+    NSString *liveListUrl = [NSString stringWithFormat:@"%@api/onlive/liveList",KDURL];
+    [LoadingView showInView:self.view];
+    [KDPNetworkRequestHTTP postURL:liveListUrl params:params success:^(id  _Nonnull json) {
+        [LoadingView dismiss];
+        NSArray *liveDataArr = [NSArray yy_modelArrayWithClass:[KDPLiveListModel class] json:json[@"data"]];
+        if (self.page == 1) {
+            [self.dataSource removeAllObjects];
+        }
+        if (liveDataArr.count > 0) {
+            [self.dataSource addObjectsFromArray:liveDataArr];
+        } else{
+            [self.tableView.mj_footer endRefreshingWithNoMoreData];
+        }
+        [self.tableView.mj_footer endRefreshing];
+        [self.tableView.mj_header endRefreshing];
+        [self.tableView reloadData];
+    } failure:^(NSError * _Nonnull error) {
+        [LoadingView dismiss];
+        [self.tableView.mj_footer endRefreshing];
+        [self.tableView.mj_header endRefreshing];
+    }];
+}
+
 - (void)setUpUI{
     // tip view
     UILabel *tipLabel = [[UILabel alloc] initWithFrame:CGRectMake(0,8, 223, 21)];
@@ -50,17 +80,36 @@
         _tableView.backgroundColor = [UIColor clearColor];
         [_tableView registerClass:[KDPLiveLeftTableViewCell class] forCellReuseIdentifier:NSStringFromClass([KDPLiveLeftTableViewCell class])];
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+        _tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+            self.page = 1;
+            [self requestData];
+        }];
+        _tableView.mj_footer = [MJRefreshBackFooter footerWithRefreshingBlock:^{
+            self.page ++;
+            [self requestData];
+        }];
+        [_tableView.mj_header beginRefreshing];
     }
     return _tableView;
 }
 
+- (NSMutableArray *)dataSource{
+    if (!_dataSource) {
+        _dataSource = [NSMutableArray array];
+    }
+    return _dataSource;
+}
+
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
     KDPLiveLeftTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([KDPLiveLeftTableViewCell class])];
         cell.orderClickBlock = ^(UIButton * _Nonnull btn) {
         KDPOrderDetailViewController *detailVC = [[KDPOrderDetailViewController alloc] init];
+        KDPLiveListModel *model = self.dataSource[indexPath.row];
+        detailVC.live_stream_id = model.live_stream_id;
         WeakSelf(weakSelf);
         [weakSelf.navigationController pushViewController:detailVC animated:YES];
     };
+    [cell configWithViewModel:self.dataSource[indexPath.row] indexpath:indexPath];
     cell.selectionStyle = UITableViewCellSelectionStyleNone;
     return cell;
 }
@@ -70,11 +119,7 @@
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
-    return 10;
-}
-
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
-    
+    return self.dataSource.count;
 }
 
 @end

KuDianProject/LiveData/Controller/KDPOrderDetailTableViewCell.m

@@ -7,7 +7,7 @@
 //
 
 #import "KDPOrderDetailTableViewCell.h"
-
+#import "KDPLiveDetailModel.h"
 @interface KDPOrderDetailTableViewCell ()
 
 @property (nonatomic, strong) UILabel *timeLabel;
@@ -46,38 +46,29 @@
     self.timeLabel = [[UILabel alloc] init];
     self.timeLabel.textColor = [UIColor colorWithHex:0x333333];
     self.timeLabel.font = FONT_SYS(12);
-    self.timeLabel.text = @"直播时间:2019-07-03 20:00:00";
     [self.contentView addSubview:self.timeLabel];
     
     self.goodTitleLabel = [[UILabel alloc] init];
     self.goodTitleLabel.textColor = [UIColor colorWithHex:0x333333];
     self.goodTitleLabel.font = FONT_SYS(15);
-    self.goodTitleLabel.text = @"这是一个商品名这是一个商品名这是";
     [self.contentView addSubview:self.goodTitleLabel];
     
     self.createTimeLabel = [[UILabel alloc] init];
     self.createTimeLabel.textColor = [UIColor colorWithHex:0x999999];
     self.createTimeLabel.font = FONT_SYS(12);
-    self.createTimeLabel.text = @"创建日:04-04 12:00";
     [self.contentView addSubview:self.createTimeLabel];
     
     self.endTimeLabel = [[UILabel alloc] init];
     self.endTimeLabel.textColor = [UIColor colorWithHex:0x999999];
     self.endTimeLabel.font = FONT_SYS(12);
-    self.endTimeLabel.text = @"结算日:05-05 12:12";
     [self.contentView addSubview:self.endTimeLabel];
     
     self.payMonny = [[UILabel alloc] init];
     self.payMonny.textColor = [UIColor colorWithHex:0x666666];
     self.payMonny.font = FONT_SYS(12);
-    self.payMonny.text = @"付款金额¥29.8";
     [self.contentView addSubview:self.payMonny];
     
     self.commMonny = [[UILabel alloc] init];
-    NSString *string = @"结算佣金¥5.00";
-    NSMutableAttributedString *commAtt = [[NSMutableAttributedString alloc] initWithString:string attributes:@{NSForegroundColorAttributeName:[UIColor baseColor],NSFontAttributeName:FONT_SYS(12)}];
-    [commAtt addAttributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:0x666666]} range:[string rangeOfString:@"结算佣金"]];
-    [self.commMonny setAttributedText:commAtt];
     [self.contentView addSubview:self.commMonny];
     
 }
@@ -140,4 +131,17 @@
     
 }
 
+- (void)configWithViewModel:(id)viewModel indexpath:(NSIndexPath *)indexPath{
+    KDPLiveDetailModel *detailModel = (KDPLiveDetailModel *)viewModel;
+    [self.iconImageView sd_setImageWithURL:[NSURL URLWithString:detailModel.img]];
+    self.goodTitleLabel.text = detailModel.name;
+    self.createTimeLabel.text = [NSString stringWithFormat:@"创建日:%@",detailModel.order_create_at];
+    self.endTimeLabel.text = [NSString stringWithFormat:@"结算日:%@",detailModel.order_balance_at];
+    self.payMonny.text = [NSString stringWithFormat:@"付款金额:￥%@",detailModel.money];
+    NSString *string = [NSString stringWithFormat:@"结算佣金:￥%@",detailModel.rebate];
+    NSMutableAttributedString *commAtt = [[NSMutableAttributedString alloc] initWithString:string attributes:@{NSForegroundColorAttributeName:[UIColor baseColor],NSFontAttributeName:FONT_SYS(12)}];
+    [commAtt addAttributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:0x666666]} range:[string rangeOfString:@"结算佣金:"]];
+    [self.commMonny setAttributedText:commAtt];
+}
+
 @end

KuDianProject/LiveData/Controller/KDPOrderDetailViewController.h

@@ -12,6 +12,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface KDPOrderDetailViewController : KDPMainViewController
 
+@property (nonatomic, copy) NSString *live_stream_id;
+
 @end
 
 NS_ASSUME_NONNULL_END

KuDianProject/LiveData/Controller/KDPOrderDetailViewController.m

@@ -8,10 +8,15 @@
 
 #import "KDPOrderDetailViewController.h"
 #import "KDPOrderDetailTableViewCell.h"
+#import "KDPLiveDetailModel.h"
 @interface KDPOrderDetailViewController ()<UITableViewDelegate,UITableViewDataSource>
 
 @property (nonatomic, strong) UITableView *tableview;
 
+@property (nonatomic, assign) NSInteger page;
+
+@property (nonatomic, strong) NSMutableArray *dataSource;
+
 @end
 
 @implementation KDPOrderDetailViewController
@@ -25,6 +30,31 @@
     [self.navBar addleftReturnButton:self selector:@selector(popAction)];
 }
 
+- (void)requestDetailDataWithPage:(NSInteger )page{
+    NSString *detailUrl = [NSString stringWithFormat:@"%@api/onlive/liveDetail",KDURL];
+    self.live_stream_id = self.live_stream_id.length ? self.live_stream_id : @"";
+    [LoadingView show];
+    [KDPNetworkRequestHTTP postURL:detailUrl params:@{@"page":@(self.page),@"live_stream_id":self.live_stream_id} success:^(id  _Nonnull json) {
+        [LoadingView dismiss];
+        NSArray *liveDataArr = [NSArray yy_modelArrayWithClass:[KDPLiveDetailModel class] json:json[@"data"]];
+        if (self.page == 1) {
+            [self.dataSource removeAllObjects];
+        }
+        if (liveDataArr.count > 0) {
+            [self.dataSource addObjectsFromArray:liveDataArr];
+        } else{
+            [self.tableview.mj_footer endRefreshingWithNoMoreData];
+        }
+        [self.tableview.mj_footer endRefreshing];
+        [self.tableview.mj_header endRefreshing];
+        [self.tableview reloadData];
+    } failure:^(NSError * _Nonnull error) {
+        [LoadingView dismiss];
+        [self.tableview.mj_footer endRefreshing];
+        [self.tableview.mj_header endRefreshing];
+    }];
+}
+
 - (void)popAction{
     [self.navigationController popViewControllerAnimated:YES];
 }
@@ -40,13 +70,30 @@
         [_tableview registerClass:[KDPOrderDetailTableViewCell class] forCellReuseIdentifier:NSStringFromClass([KDPOrderDetailTableViewCell class])];
         _tableview.showsVerticalScrollIndicator = NO;
         _tableview.showsHorizontalScrollIndicator = NO;
+        _tableview.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+            self.page = 1;
+            [self requestDetailDataWithPage:self.page];
+        }];
+        _tableview.mj_footer = [MJRefreshBackFooter footerWithRefreshingBlock:^{
+            self.page ++;
+            [self requestDetailDataWithPage:self.page];
+        }];
+        [_tableview.mj_header beginRefreshing];
     }
     return _tableview;
 }
 
+- (NSMutableArray *)dataSource{
+    if (!_dataSource) {
+        _dataSource = [NSMutableArray array];
+    }
+    return _dataSource;
+}
+
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
     KDPOrderDetailTableViewCell *detailCell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([KDPOrderDetailTableViewCell class])];
     detailCell.selectionStyle = UITableViewCellSelectionStyleNone;
+    [detailCell configWithViewModel:self.dataSource[indexPath.row] indexpath:indexPath];
     return detailCell;
 }
 
@@ -55,7 +102,7 @@
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
-    return 10;
+    return self.dataSource.count;
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{

KuDianProject/Search/Controller/KDPSearchResultViewController.m

@@ -8,12 +8,18 @@
 
 #import "KDPSearchResultViewController.h"
 #import "KDPSupplyContentReusableView.h"
-@interface KDPSearchResultViewController ()
+#import "KDPRecommendGoodCell.h"
+#import "KDPScreenViewController.h"
+@interface KDPSearchResultViewController ()<UICollectionViewDelegate,UICollectionViewDataSource>
 
 @property (nonatomic, strong) UICollectionView *collectionView;
 
 @property (nonatomic, strong) NSMutableArray *dataSource;
 
+@property (nonatomic, assign) NSInteger page;
+
+@property (nonatomic, strong) NSMutableDictionary *params;
+
 @end
 
 @implementation KDPSearchResultViewController
@@ -21,13 +27,83 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
+    [self setupNav];
+    [self.view addSubview:self.collectionView];
+    [self requestGoodData];
 }
 
 - (void)setupNav{
     self.navBar.hidden = YES;
+    UIView *navView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, KDNavBarHeight)];
+    navView.backgroundColor = [UIColor whiteColor];
+    [self.view addSubview:navView];
+    self.view.backgroundColor = [UIColor colorWithHex:0xf4f4f4];
+
+    UIButton *returnBtn =[[UIButton alloc]initWithFrame:CGRectMake(15, KDNavBarHeight - 13-18, 11, 18)];
+    [returnBtn addTarget:self action:@selector(returnClickBtn) forControlEvents:UIControlEventTouchUpInside];
+    [returnBtn setImage:[UIImage imageNamed:@"return_black"] forState:UIControlStateNormal];
+    returnBtn.adjustsImageWhenHighlighted = NO;
+    [navView addSubview:returnBtn];
+    
+    UIButton *searchBtn =[[UIButton alloc]initWithFrame:CGRectMake(41, KDStatusHeight+5, SCREEN_WIDTH-55, 31)];
+    searchBtn.layer.cornerRadius=15.5;
+    searchBtn.backgroundColor=[UIColor colorWithHex:0xEEEEEE];
+    [searchBtn addTarget:self action:@selector(returnClickBtn) forControlEvents:UIControlEventTouchUpInside];
+    [navView addSubview:searchBtn];
+    
+    UIImageView *iconimg=[[UIImageView alloc]initWithFrame:CGRectMake(12, 8, 15, 15)];
+    iconimg.image=[UIImage imageNamed:@"search_icon"];
+    [searchBtn addSubview:iconimg];
+    
+    UITextField *textField=[[UITextField alloc]init];
+    textField.textColor=[UIColor whiteColor];
+    textField.backgroundColor=[UIColor colorWithHex:0x929292];
+    textField.font=[UIFont systemFontOfSize:14];
+    textField.userInteractionEnabled=NO;
+    [searchBtn addSubview:textField];
+    textField.layer.cornerRadius=2;
+    textField.layer.masksToBounds=YES;
+    [textField mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(iconimg.right+5);
+        make.top.mas_equalTo(3);
+        make.height.mas_equalTo(24);
+    }];
+    
+    textField.text = [NSString stringWithFormat:@"  %@ ×  ",self.keyWordStr];
     
 }
 
+- (void)requestGoodData{
+    if (![KDPAccountTool isLogin]) {
+        return;
+    }
+    [self.params setValue:[NSString stringWithFormat:@"%ld",(long)self.page] forKey:@"page"];
+    [LoadingView showInView:self.view];
+    NSString *getGoodUrl = [NSString stringWithFormat:@"%@api/goods/search",KDURL];
+    [KDPNetworkRequestHTTP postURL:getGoodUrl params:self.params success:^(id  _Nonnull json) {
+        [LoadingView dismiss];
+        NSArray *dataArr = [NSArray yy_modelArrayWithClass:[KDPGoodsModel class] json:json[@"data"]];
+        if (self.page == 1) {
+            [self.dataSource removeAllObjects];
+        }
+        if (dataArr.count > 0) {
+            [self.dataSource addObjectsFromArray:dataArr];
+        } else{
+            [self.collectionView.mj_footer endRefreshingWithNoMoreData];
+        }
+        [self.collectionView.mj_footer endRefreshing];
+        [self.collectionView.mj_header endRefreshing];
+        [self.collectionView reloadData];
+
+    } failure:^(NSError * _Nonnull error) {
+        [LoadingView dismiss];
+    }];
+}
+
+- (void)returnClickBtn{
+    [self.navigationController popViewControllerAnimated:NO];
+}
+
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
     [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDefault;
@@ -38,5 +114,91 @@
     [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleLightContent;
 }
 
+- (UICollectionView *)collectionView{
+    if (!_collectionView) {
+        UICollectionViewFlowLayout *flowLayout = [[UICollectionViewFlowLayout alloc] init];
+        flowLayout.itemSize = CGSizeMake(SCREEN_WIDTH, 130);
+        flowLayout.minimumLineSpacing = 0;
+        flowLayout.minimumInteritemSpacing = 0;
+        flowLayout.sectionHeadersPinToVisibleBounds = YES;
+        _collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, KDNavBarHeight, SCREEN_WIDTH, SCREEN_HEIGHT-KDNavBarHeight) collectionViewLayout:flowLayout];
+        _collectionView.showsVerticalScrollIndicator = NO;
+        _collectionView.showsHorizontalScrollIndicator = NO;
+        [_collectionView registerClass:[KDPRecommendGoodCell class] forCellWithReuseIdentifier:NSStringFromClass([KDPRecommendGoodCell class])];
+        [_collectionView registerClass:[KDPSupplyContentReusableView class] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:NSStringFromClass([KDPSupplyContentReusableView class])];
+        _collectionView.backgroundColor = [UIColor whiteColor];
+        _collectionView.delegate = self;
+        _collectionView.dataSource = self;
+        _collectionView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+            self.page = 1;
+            [self requestGoodData];
+        }];
+        
+        _collectionView.mj_footer = [MJRefreshBackNormalFooter  footerWithRefreshingBlock:^{
+            self.page ++;
+            [self requestGoodData];
+        }];
+    }
+    return _collectionView;
+}
+
+- (NSMutableArray *)dataSource{
+    if (!_dataSource) {
+        _dataSource = [NSMutableArray array];
+    }
+    return _dataSource;
+}
+
+- (NSMutableDictionary *)params{
+    if (!_params) {
+        _params = [NSMutableDictionary dictionaryWithObjectsAndKeys:@"",@"page",@"",@"sort",self.keyWordStr,@"keyword",@"",@"start_price",@"",@"end_price",@"",@"start_tk_rate",@"0",@"is_has_coupon", nil];
+    }
+    return _params;
+}
+
+- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath{
+    KDPSupplyContentReusableView *reusAbleView;
+    if (kind == UICollectionElementKindSectionHeader) {
+            reusAbleView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:NSStringFromClass([KDPSupplyContentReusableView class]) forIndexPath:indexPath];
+        reusAbleView.layer.borderWidth = 0.3;
+        reusAbleView.layer.borderColor = [UIColor colorWithHex:0xf4f4f4].CGColor;
+            reusAbleView.changeBlock = ^(BOOL isPrice) {
+                KDPScreenViewController *screenVC = [[KDPScreenViewController alloc] initWithPrice:isPrice];
+                screenVC.view.frame = CGRectMake(91, 0, SCREEN_WIDTH-91, SCREEN_HEIGHT);
+                CWLateralSlideConfiguration *conf = [CWLateralSlideConfiguration configurationWithDistance:0 maskAlpha:0.7 scaleY:1 direction:CWDrawerTransitionFromRight backImage:nil];
+                [self cw_showDrawerViewController:screenVC animationType:0 configuration:conf];
+            };
+            return reusAbleView;
+    }
+    return reusAbleView;
+}
+
+- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section{
+    if (section == 0) {
+        return CGSizeMake(SCREEN_WIDTH, 33);
+    }
+    return CGSizeZero;
+}
+
+- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView{
+    return 1;
+}
+
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{
+    return self.dataSource.count;
+}
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{
+    KDPRecommendGoodCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([KDPRecommendGoodCell class]) forIndexPath:indexPath];
+    cell.model = self.dataSource[indexPath.row];
+    return cell;
+}
+
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
+    KDPGoodDetailVC *detailVC = [[KDPGoodDetailVC alloc] init];
+    detailVC.model = self.dataSource[indexPath.row];
+    [self.navigationController pushViewController:detailVC animated:YES];
+}
+
 
 @end

KuDianProject/Search/Controller/KDPSearchViewController.m

@@ -197,6 +197,7 @@
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
     UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"searchList"];
+    cell.selectionStyle = UITableViewCellSelectionStyleNone;
     if (!cell) {
         cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"searchList"];
         cell.selectionStyle = UITableViewCellSelectionStyleNone;
@@ -217,7 +218,7 @@
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
-    [self requestSearchData:self.searchArray[indexPath.row]];
+    [self skipToResultWithString:self.searchArray[indexPath.row]];
 }
 
 #pragma mark - 懒加载

KuDianProject/Search/Controller/View/KDPClassModel.h

@@ -0,0 +1,23 @@
+//
+//  KDPClassModel.h
+//  KuDianProject
+//
+//  Created by admin on 2019/7/10.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface KDPClassModel : NSObject
+
+@property(nonatomic,copy)NSString*name;
+@property(nonatomic,copy)NSString*icon;
+@property(nonatomic,copy)NSString*Id;
+@property(nonatomic,copy)NSString*type;
+@property(nonatomic,copy)NSString*backimg;
+
+@end
+
+NS_ASSUME_NONNULL_END

KuDianProject/Search/Controller/View/KDPClassModel.m

@@ -0,0 +1,17 @@
+//
+//  KDPClassModel.m
+//  KuDianProject
+//
+//  Created by admin on 2019/7/10.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import "KDPClassModel.h"
+
+@implementation KDPClassModel
+
++ (NSDictionary<NSString *,id> *)modelCustomPropertyMapper {
+    return @{@"Id":@"id"};
+}
+
+@end

KuDianProject/Search/Controller/View/KDPLiveDetailModel.h

@@ -0,0 +1,25 @@
+//
+//  KDPLiveDetailModel.h
+//  KuDianProject
+//
+//  Created by admin on 2019/7/10.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface KDPLiveDetailModel : NSObject
+
+@property (nonatomic, copy) NSString *money;
+@property (nonatomic, copy) NSString *rebate;
+@property (nonatomic, copy) NSString *name;
+@property (nonatomic, copy) NSString *img;
+@property (nonatomic, copy) NSString *order_create_at;
+@property (nonatomic, copy) NSString *order_balance_at;
+
+
+@end
+
+NS_ASSUME_NONNULL_END

KuDianProject/Search/Controller/View/KDPLiveDetailModel.m

@@ -0,0 +1,13 @@
+//
+//  KDPLiveDetailModel.m
+//  KuDianProject
+//
+//  Created by admin on 2019/7/10.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import "KDPLiveDetailModel.h"
+
+@implementation KDPLiveDetailModel
+
+@end

KuDianProject/Search/Controller/View/KDPLiveListModel.h

@@ -0,0 +1,25 @@
+//
+//  KDPLiveListModel.h
+//  KuDianProject
+//
+//  Created by admin on 2019/7/10.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface KDPLiveListModel : NSObject
+
+@property (nonatomic, copy) NSString *show_img;
+@property (nonatomic, copy) NSString *show_time;
+@property (nonatomic, copy) NSString *live_stream_id;
+@property (nonatomic, copy) NSString *goods_num;
+@property (nonatomic, copy) NSString *pre_rebate;
+@property (nonatomic, copy) NSString *order_num;
+
+
+@end
+
+NS_ASSUME_NONNULL_END

KuDianProject/Search/Controller/View/KDPLiveListModel.m

@@ -0,0 +1,13 @@
+//
+//  KDPLiveListModel.m
+//  KuDianProject
+//
+//  Created by admin on 2019/7/10.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import "KDPLiveListModel.h"
+
+@implementation KDPLiveListModel
+
+@end

KuDianProject/SupplyGood/Controller/KDPSupplyContentViewController.h

@@ -7,11 +7,13 @@
 //
 
 #import "KDPMainViewController.h"
-
+#import "KDPClassModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface KDPSupplyContentViewController : KDPMainViewController
 
+@property (nonatomic, strong) KDPClassModel *classModel;
+
 @end
 
 NS_ASSUME_NONNULL_END

KuDianProject/SupplyGood/Controller/KDPSupplyContentViewController.m

@@ -16,6 +16,14 @@
 
 @property (nonatomic, strong) UICollectionView *collectionView;
 
+@property (nonatomic, assign) NSInteger page;
+
+@property (nonatomic, strong) NSMutableDictionary *mutabParams;
+
+@property (nonatomic, strong) NSMutableArray *dataSource;
+
+@property (nonatomic, strong) NSMutableArray *topGoodList;
+
 @end
 
 @implementation KDPSupplyContentViewController
@@ -24,6 +32,9 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     [self setUpUI];
+//    if ([self.classModel.type isEqualToString:@"cate"]) {
+//        [self requestTopListWithGoodId:self.classModel.Id];
+//    }
 }
 
 - (void)setUpUI{
@@ -32,6 +43,47 @@
     [self.view addSubview:self.collectionView];
 }
 
+#pragma mark 网络请求
+
+- (void)requestGoodlistData{
+    NSString *goodlistUrl = [NSString stringWithFormat:@"%@api/goods/listGoods",KDURL];
+    [self.mutabParams setValue:@(self.page) forKey:@"page"];
+    [KDPNetworkRequestHTTP postURL:goodlistUrl params:self.mutabParams success:^(id  _Nonnull json) {
+        [LoadingView dismiss];
+        NSArray *array =[NSArray yy_modelArrayWithClass:[KDPClassModel class] json:json[@"data"]];
+        [self.collectionView.mj_footer endRefreshing];
+        [self.collectionView.mj_header endRefreshing];
+        if (self.page == 1) {
+            [self.dataSource removeAllObjects];
+        }
+        if (array.count > 0) {
+            [self.dataSource addObjectsFromArray:array];
+        }
+        if (array.count == 0) {
+            [self.collectionView.mj_footer endRefreshingWithNoMoreData];
+        }
+        [self.collectionView reloadData];
+    } failure:^(NSError * _Nonnull error) {
+        [self.collectionView.mj_footer endRefreshing];
+        [self.collectionView.mj_header endRefreshing];
+        [LoadingView dismiss];
+    }];
+}
+
+- (void)requestTopListWithGoodId:(NSString *)Id{
+    [LoadingView showInView:self.view];
+    NSString *childListUrl = [NSString stringWithFormat:@"%@api/goods/childList",KDURL];
+    [KDPNetworkRequestHTTP postURL:childListUrl params:@{@"pid":Id} success:^(id  _Nonnull json) {
+        [self.topGoodList removeAllObjects];
+        NSArray *array =[NSArray yy_modelArrayWithClass:[KDPClassModel class] json:json[@"list"]];
+        [self.topGoodList addObjectsFromArray:array];
+        [LoadingView dismiss];
+        [self.collectionView reloadData];
+    } failure:^(NSError * _Nonnull error) {
+        [LoadingView dismiss];
+    }];
+}
+
 #pragma mark - lazy load
 
 - (UICollectionView *)collectionView{
@@ -48,19 +100,49 @@
         [_collectionView registerClass:[KDPSupplyCommentViewCell class] forCellWithReuseIdentifier:NSStringFromClass([KDPSupplyCommentViewCell class])];
         [_collectionView registerClass:[KDPSupplyGoodCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([KDPSupplyGoodCollectionViewCell class])];
         [_collectionView registerClass:[KDPSupplyContentReusableView class] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:NSStringFromClass([KDPSupplyContentReusableView class])];
+        _collectionView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+            self.page = 1;
+            [self requestGoodlistData];
+        }];
+        _collectionView.mj_footer = [MJRefreshBackFooter footerWithRefreshingBlock:^{
+            self.page ++;
+            [self requestGoodlistData];
+        }];
+        [_collectionView.mj_header beginRefreshing];
     }
     return _collectionView;
 }
 
+- (NSMutableDictionary *)mutabParams{
+    if (!_mutabParams) {
+        _mutabParams = [NSMutableDictionary dictionaryWithDictionary:@{@"page":@(self.page),@"id":self.classModel.Id,@"type":self.classModel.type,@"start_price":@"",@"end_price":@"",@"start_tk_rate":@""}];
+    }
+    return _mutabParams;
+}
+
+- (NSMutableArray *)dataSource{
+    if (!_dataSource) {
+        _dataSource = [NSMutableArray array];
+    }
+    return _dataSource;
+}
+
+- (NSMutableArray *)topGoodList{
+    if (!_topGoodList) {
+        _topGoodList = [NSMutableArray array];
+    }
+    return _topGoodList;
+}
+
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{
-    UICollectionViewCell *cell;
     if (indexPath.section == 0) {
-        cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([KDPSupplyCommentViewCell class]) forIndexPath:indexPath];
+        KDPSupplyCommentViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([KDPSupplyCommentViewCell class]) forIndexPath:indexPath];
         return cell;
     }
     
     if (indexPath.section == 1) {
-         cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([KDPSupplyGoodCollectionViewCell class]) forIndexPath:indexPath];
+         KDPSupplyGoodCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([KDPSupplyGoodCollectionViewCell class]) forIndexPath:indexPath];
+        [cell configCellWithModel:self.dataSource[indexPath.row] indexPath:indexPath];
         return cell;
     }
     return nil;

KuDianProject/SupplyGood/Controller/KDPSupplyGoodViewController.m

@@ -11,10 +11,15 @@
 #import "XLPageViewControllerConfig.h"
 #import "KDPSupplyContentViewController.h"
 #import "KDPSearchViewController.h"
+#import "KDPClassModel.h"
 @interface KDPSupplyGoodViewController ()<XLPageViewControllerDelegate,XLPageViewControllerDataSrouce>
 
 @property (nonatomic, strong) XLPageViewController *pageVC;
 
+@property (nonatomic, strong) NSMutableArray *classArray;
+
+@property (nonatomic, strong) UIImageView *topBackImageView;
+
 @end
 
 @implementation KDPSupplyGoodViewController
@@ -25,12 +30,22 @@
     [self setUpTopView];
     [self setUpPageVc];
     self.view.backgroundColor = [UIColor colorWithRGB:0xf4f4f4];
+    [self requestTopListData];
 }
 
 #pragma event handle
 
 - (void)requestTopListData{
-    
+    NSString *classUrl = [NSString stringWithFormat:@"%@api/goods/listTopBar",KDURL];
+    [LoadingView showInView:self.view];
+    [KDPNetworkRequestHTTP postURL:classUrl params:nil success:^(id  _Nonnull json) {
+        [LoadingView dismiss];
+        NSArray *classArr = [NSArray yy_modelArrayWithClass:[KDPClassModel class] json:json[@"list"]];
+        [self.classArray addObjectsFromArray:classArr];
+        [self.pageVC reloadData];
+    } failure:^(NSError * _Nonnull error) {
+        [LoadingView dismiss];
+    }];
 }
 
 - (void)setUpPageVc{
@@ -68,8 +83,6 @@
     [self.view addSubview:self.pageVC.view];
 }
 
-
-
 - (void)searchBtnClick:(UIButton *)sender{
     KDPSearchViewController *searchVC = [[KDPSearchViewController alloc] init];
     [self.navigationController pushViewController:searchVC animated:NO];
@@ -82,6 +95,11 @@
     [topBackView setGradientBackgroundWithColors:@[[UIColor colorWithRGB:0xFF235F],[UIColor colorWithRGB:0xFF7676]] locations:@[@0,@1] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
     [self.view addSubview:topBackView];
     
+    UIImageView *imageView = [[UIImageView alloc] initWithFrame:topBackView.bounds];
+    [self.view addSubview:imageView];
+    imageView.hidden = YES;
+    self.topBackImageView = imageView;
+    
     // search
     UIButton *searchBtn = [UIButton buttonWithType:UIButtonTypeCustom];
     searchBtn.frame = CGRectMake(15, KDStatusHeight + 7, SCREEN_WIDTH - 30, 31);
@@ -100,24 +118,38 @@
     
 }
 
+- (NSMutableArray *)classArray{
+    if (!_classArray) {
+        _classArray = [NSMutableArray array];
+    }
+    return _classArray;
+}
+
 #pragma mark - XLPageViewController datasource and delegate
 
 - (NSInteger)pageViewControllerNumberOfPage{
-    NSArray *array = @[@"测试一",@"测试2",@"测试3",@"测试4",@"测试5",@"测试6",@"测试7",@"测试8"];
-    return array.count;
+    return self.classArray.count;
 }
 
 - (NSString *)pageViewController:(XLPageViewController *)pageViewController titleForIndex:(NSInteger)index{
-    NSArray *array = @[@"测试一",@"测试2",@"测试3",@"测试4",@"测试5",@"测试6",@"测试7",@"测试8"];
-    return array[index];
+    KDPClassModel *model = self.classArray[index];
+    return model.name;
 }
 
 - (void)pageViewController:(XLPageViewController *)pageViewController didSelectedAtIndex:(NSInteger)index{
+    KDPClassModel *classModel = self.classArray[index];
+    if (classModel.backimg.length) {
+        self.topBackImageView.hidden = NO;
+        [self.topBackImageView sd_setImageWithURL:[NSURL URLWithString:classModel.backimg]];
+    } else{
+        self.topBackImageView.hidden = YES;
+    }
     NSLog(@"%ld",index);
 }
 
 - (UIViewController *)pageViewController:(XLPageViewController *)pageViewController viewControllerForIndex:(NSInteger)index{
     KDPSupplyContentViewController *contentVC = [[KDPSupplyContentViewController alloc] init];
+    contentVC.classModel = self.classArray[index];
     return contentVC;
 }
 

KuDianProject/SupplyGood/View/KDPSupplyGoodCollectionViewCell.m

@@ -16,6 +16,14 @@
 
 @property (nonatomic, strong) UILabel *priceLabel;
 
+@property (nonatomic, strong) UILabel *disCountPriceLabel;
+
+@property (nonatomic, strong) UIImageView *quanImageView;
+
+@property (nonatomic, strong) UILabel *quanLabel;
+
+@property (nonatomic, strong) UIView *profitView;
+
 @property (nonatomic, strong) UILabel *profitLabel;
 
 @end
@@ -37,19 +45,20 @@
     [self.contentView addSubview:self.iconImageView];
     
     self.goodLabel = [[UILabel alloc] init];
-    self.goodLabel.font = FONT_SYS(14);
-    self.goodLabel.textColor = [UIColor colorWithRGB:0x000000];
-    self.goodLabel.numberOfLines = 2;
+    self.goodLabel.font = FONT_SYS(15);
+    self.goodLabel.textColor = [UIColor colorWithHex:0x333333];
+    self.goodLabel.numberOfLines = 1;
     [self.goodLabel sizeToFit];
-    self.goodLabel.textAlignment = NSTextAlignmentCenter;
+    self.goodLabel.textAlignment = NSTextAlignmentLeft;
     [self.contentView addSubview:self.goodLabel];
     
     self.priceLabel = [[UILabel alloc] init];
-    self.priceLabel.font = FONT_SYS(16);
-    self.priceLabel.textColor = [UIColor colorWithRGB:0xFF7D00];
-    self.priceLabel.text = @"¥398";
     [self.contentView addSubview:self.priceLabel];
     
+    self.disCountPriceLabel = [[UILabel alloc] init];
+    [self.contentView addSubview:self.disCountPriceLabel];
+    
+    
     self.profitLabel = [[UILabel alloc] init];
     self.profitLabel.layer.cornerRadius = 10;
     self.profitLabel.layer.masksToBounds = YES;
@@ -85,7 +94,18 @@
 }
 
 - (void)configCellWithModel:(id)model indexPath:(NSIndexPath *)indexpath{
+    KDPGoodsModel *goodModel = (KDPGoodsModel *)model;
+    [self.iconImageView sd_setImageWithURL:[NSURL URLWithString:goodModel.img]];
+    self.goodLabel.text = goodModel.title;
     
 }
 
+- (UIImageView *)quanImageView{
+    if (!_quanImageView) {
+        _quanImageView = [[UIImageView alloc] init];
+        _quanImageView.image = [UIImage imageNamed:@"coupon_icon"];
+    }
+    return _quanImageView;
+}
+
 @end

Pods/Pods.xcodeproj/xcuserdata/kaipeng.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,102 +7,102 @@
 		<key>AFNetworking.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</dict>
 		<key>Bugly.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>1</integer>
 		</dict>
 		<key>CWLateralSlide.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>2</integer>
 		</dict>
 		<key>MBProgressHUD.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>4</integer>
 		</dict>
 		<key>MJExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>7</integer>
+			<integer>6</integer>
 		</dict>
 		<key>MJRefresh.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>8</integer>
+			<integer>7</integer>
 		</dict>
 		<key>Masonry.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>3</integer>
 		</dict>
 		<key>MiPushSDK.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>5</integer>
 		</dict>
 		<key>PYSearch.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>10</integer>
+			<integer>9</integer>
 		</dict>
 		<key>Pods-KuDianProject.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>9</integer>
+			<integer>8</integer>
 		</dict>
 		<key>SDCycleScrollView.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>11</integer>
+			<integer>10</integer>
 		</dict>
 		<key>SDWebImage.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>12</integer>
+			<integer>11</integer>
 		</dict>
 		<key>SVProgressHUD.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>13</integer>
+			<integer>12</integer>
 		</dict>
 		<key>UMengAnalytics.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>14</integer>
+			<integer>13</integer>
 		</dict>
 		<key>YYCache.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>15</integer>
+			<integer>14</integer>
 		</dict>
 		<key>YYCategories.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>16</integer>
+			<integer>15</integer>
 		</dict>
 		<key>YYImage.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>17</integer>
+			<integer>16</integer>
 		</dict>
 		<key>YYModel.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>18</integer>
+			<integer>17</integer>
 		</dict>
 		<key>YYText.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>19</integer>
+			<integer>18</integer>
 		</dict>
 		<key>YYWebImage.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>20</integer>
+			<integer>19</integer>
 		</dict>
 	</dict>
 </dict>