Merge branch 'master' of http://101.200.220.49:8001/liuxueli/KDProject

KuDianProject.xcodeproj/project.pbxproj

@@ -107,6 +107,9 @@
 		C5D5626B22CDD75B0035A714 /* KDPRecommendHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = C5D5626A22CDD75B0035A714 /* KDPRecommendHeadView.m */; };
 		C5D5626E22CDFDD20035A714 /* KDPEarningHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = C5D5626D22CDFDD20035A714 /* KDPEarningHeadView.m */; };
 		C5D5627122CDFDF00035A714 /* KDPEarnTableHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = C5D5627022CDFDF00035A714 /* KDPEarnTableHeadView.m */; };
+		C5DA002A22D4A8B50000DFA8 /* KDPBannerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = C5DA002922D4A8B50000DFA8 /* KDPBannerModel.m */; };
+		C5DA002D22D4AACB0000DFA8 /* KDPGoodsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = C5DA002C22D4AACB0000DFA8 /* KDPGoodsModel.m */; };
+		C5EB45D222D58B2A006A24F0 /* KDPProjectListVC.m in Sources */ = {isa = PBXBuildFile; fileRef = C5EB45D122D58B2A006A24F0 /* KDPProjectListVC.m */; };
 		D5717435855D1EAB768416AB /* libPods-KuDianProject.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B9A054D75DA0898647035D54 /* libPods-KuDianProject.a */; };
 /* End PBXBuildFile section */
 
@@ -334,6 +337,12 @@
 		C5D5626D22CDFDD20035A714 /* KDPEarningHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KDPEarningHeadView.m; sourceTree = "<group>"; };
 		C5D5626F22CDFDF00035A714 /* KDPEarnTableHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KDPEarnTableHeadView.h; sourceTree = "<group>"; };
 		C5D5627022CDFDF00035A714 /* KDPEarnTableHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KDPEarnTableHeadView.m; sourceTree = "<group>"; };
+		C5DA002822D4A8B40000DFA8 /* KDPBannerModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KDPBannerModel.h; sourceTree = "<group>"; };
+		C5DA002922D4A8B50000DFA8 /* KDPBannerModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KDPBannerModel.m; sourceTree = "<group>"; };
+		C5DA002B22D4AACB0000DFA8 /* KDPGoodsModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KDPGoodsModel.h; sourceTree = "<group>"; };
+		C5DA002C22D4AACB0000DFA8 /* KDPGoodsModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KDPGoodsModel.m; sourceTree = "<group>"; };
+		C5EB45D022D58B2A006A24F0 /* KDPProjectListVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KDPProjectListVC.h; sourceTree = "<group>"; };
+		C5EB45D122D58B2A006A24F0 /* KDPProjectListVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KDPProjectListVC.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -815,9 +824,9 @@
 		C5D5623B22CD9D300035A714 /* TOP */ = {
 			isa = PBXGroup;
 			children = (
+				C5DA002722D4A8850000DFA8 /* Model */,
 				C5BAD0AA22D42E2D0084663A /* Drawer */,
 				C5D5623C22CD9D300035A714 /* Controller */,
-				C5D5623D22CD9D300035A714 /* Model */,
 				C5D5623E22CD9D300035A714 /* View */,
 			);
 			path = TOP;
@@ -836,17 +845,12 @@
 				C5BAD0D922D47DD60084663A /* KDPTodayLiveDataVC.m */,
 				C5BAD0DB22D47DFD0084663A /* KDPTodayListViewController.h */,
 				C5BAD0DC22D47DFD0084663A /* KDPTodayListViewController.m */,
+				C5EB45D022D58B2A006A24F0 /* KDPProjectListVC.h */,
+				C5EB45D122D58B2A006A24F0 /* KDPProjectListVC.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
 		};
-		C5D5623D22CD9D300035A714 /* Model */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Model;
-			sourceTree = "<group>";
-		};
 		C5D5623E22CD9D300035A714 /* View */ = {
 			isa = PBXGroup;
 			children = (
@@ -917,6 +921,17 @@
 			path = MainTab;
 			sourceTree = "<group>";
 		};
+		C5DA002722D4A8850000DFA8 /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				C5DA002822D4A8B40000DFA8 /* KDPBannerModel.h */,
+				C5DA002922D4A8B50000DFA8 /* KDPBannerModel.m */,
+				C5DA002B22D4AACB0000DFA8 /* KDPGoodsModel.h */,
+				C5DA002C22D4AACB0000DFA8 /* KDPGoodsModel.m */,
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
 		EDAD9A798350EDEB3C0EA15C /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -1105,6 +1120,7 @@
 				C5BAD0C722D461420084663A /* WYWeakScriptMessageDelegate.m in Sources */,
 				C53FD3EF22D31C3300687706 /* KDPAccountVC.m in Sources */,
 				76D7943122CDD7D600C2ECFA /* KDPHeightTool.m in Sources */,
+				C5EB45D222D58B2A006A24F0 /* KDPProjectListVC.m in Sources */,
 				C5BAD0D722D47A510084663A /* UIButton+ImageTitleStyle.m in Sources */,
 				C5BAD0AF22D42EBA0084663A /* KDPCollectHistoryVC.m in Sources */,
 				C5BAD0CA22D46D990084663A /* KDPGoodDetailVC.m in Sources */,
@@ -1180,9 +1196,11 @@
 				76D7944E22CDEBC000C2ECFA /* KDPSupplyContentReusableView.m in Sources */,
 				C5BAD0D322D46E300084663A /* KDPShopView.m in Sources */,
 				76D7942622CDD3CB00C2ECFA /* UINavigationController+FDFullscreenPopGesture.m in Sources */,
+				C5DA002A22D4A8B50000DFA8 /* KDPBannerModel.m in Sources */,
 				764A24CB22D43DE4009B3891 /* LoadingView.m in Sources */,
 				C5BAD0E322D48C600084663A /* SSWLineChartView.m in Sources */,
 				76D7942722CDD3CB00C2ECFA /* UIImageView+CornerRadius.m in Sources */,
+				C5DA002D22D4AACB0000DFA8 /* KDPGoodsModel.m in Sources */,
 				76D7945122CDF2AE00C2ECFA /* KDPSupplyGoodCollectionViewCell.m in Sources */,
 				764A24CC22D43DE4009B3891 /* ActivityIndicatorAnimation.m in Sources */,
 				76D7944B22CDE38400C2ECFA /* KDPSupplyCommentViewCell.m in Sources */,

KuDianProject/APPKDURL.h

@@ -27,4 +27,11 @@
 
 #define custSerURL @"https://mapi.kuxuan-inc.com/cool_store/service/index.html"
 
+#define topIncomeUrl [NSString stringWithFormat:@"%@api/home/getHomeTopOrderInfo",KDURL]
+#define bannerURL [NSString stringWithFormat:@"%@api/adv/advByType",KDURL]
+
+#define topGoodRecommURL [NSString stringWithFormat:@"%@api/home/getHomeGoodsListV1",KDURL]
+
+
+#define goodDetailURL [NSString stringWithFormat:@"%@api/goods/detail",KDURL]
 #endif /* APPKDURL_h */

KuDianProject/AppDelegate.m

@@ -8,6 +8,7 @@
 
 #import "AppDelegate.h"
 #import "KDPTabBarVC.h"
+#import "KDPAccountTool.h"
 #import "KDPWelcomePageViewController.h"
 @interface AppDelegate ()
 
@@ -21,7 +22,11 @@
     self.window.backgroundColor=[UIColor whiteColor];
     self.window.rootViewController=[[KDPTabBarVC alloc]init];
     [self.window makeKeyAndVisible];
-//    [self.window.rootViewController presentViewController:[[UINavigationController alloc]initWithRootViewController:[[KDPWelcomePageViewController alloc]init]] animated:YES completion:nil];
+    if (![KDPAccountTool isLogin]) {
+         [self.window.rootViewController presentViewController:[[UINavigationController alloc]initWithRootViewController:[[KDPWelcomePageViewController alloc]init]] animated:YES completion:nil];
+    }
+    
+
     return YES;
 }
 

KuDianProject/PrefixHeader.pch

@@ -56,6 +56,11 @@
 #import "KDPTodayLiveDataVC.h"
 #import "KDPTodayListViewController.h"
 #import "KDPIDTipView.h"
+#import "KDPProjectListVC.h"
+#import "KDPBannerModel.h"
+#import "KDPGoodsModel.h"
+#import "KDPWebInteractionVC.h"
+#import "KDPProjectListVC.h"
 
 // 类别
 #import "UIView+Gradient.h"
@@ -66,4 +71,6 @@
 #import "UINavigationBar+handle.h"
 #import "UINavigationController+FDFullscreenPopGesture.h"
 #import "UICollectionViewCell+Extension.h"
+
+
 #endif /* PrefixHeader_pch */

KuDianProject/Public/KDPNetworkRequestHTTP.m

@@ -22,11 +22,11 @@
     [manager.requestSerializer setValue:app_Version forHTTPHeaderField:@"version"];
     [manager.requestSerializer setValue:SOURCE_ID forHTTPHeaderField:@"source"];
     [manager.requestSerializer setValue:@"ios" forHTTPHeaderField:@"platform"];
-//    if ([AccountTool isLogin]) {
-//        NSString *token = [AccountTool account].token;
-//
-//        [manager.requestSerializer setValue:token forHTTPHeaderField:@"token"];
-//    }
+    if ([KDPAccountTool isLogin]) {
+        NSString *token = [KDPAccountTool account].token;
+
+        [manager.requestSerializer setValue:token forHTTPHeaderField:@"token"];
+    }
     
     NSString *deviceUUID = [[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString];
     NSString *uuid = [NSString stringWithFormat:@"I-%@",deviceUUID];
@@ -96,12 +96,11 @@
     [manager.requestSerializer setValue:app_Version forHTTPHeaderField:@"version"];
     [manager.requestSerializer setValue:SOURCE_ID forHTTPHeaderField:@"source"];
     [manager.requestSerializer setValue:@"ios" forHTTPHeaderField:@"platform"];
-    //    if ([AccountTool isLogin]) {
-    //        NSString *token = [AccountTool account].token;
-    //
-    //        [manager.requestSerializer setValue:token forHTTPHeaderField:@"token"];
-    //    }
-    
+    if ([KDPAccountTool isLogin]) {
+        NSString *token = [KDPAccountTool account].token;
+        
+        [manager.requestSerializer setValue:token forHTTPHeaderField:@"token"];
+    }
     NSString *deviceUUID = [[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString];
     NSString *uuid = [NSString stringWithFormat:@"I-%@",deviceUUID];
     [manager.requestSerializer setValue:uuid forHTTPHeaderField:@"idfa"];

KuDianProject/Public/KDPublicMethod.h

@@ -19,6 +19,9 @@ NS_ASSUME_NONNULL_BEGIN
 +(NSDictionary *)getMessage;
 + (NSDictionary *)dictionaryWithJsonString:(NSString *)jsonString;
 + (NSString *)convertToJsonData:(NSDictionary *)dict;
+
+#pragma mark--计算高度
++ (CGFloat)getHeightByWidth:(CGFloat)width title:(NSString *)title font:(UIFont*)font;
 @end
 
 NS_ASSUME_NONNULL_END

KuDianProject/Public/KDPublicMethod.m

@@ -132,4 +132,15 @@
     return mutStr;
     
 }
+
++ (CGFloat)getHeightByWidth:(CGFloat)width title:(NSString *)title font:(UIFont*)font
+{
+    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, width, 0)];
+    label.text = title;
+    label.font = font;
+    label.numberOfLines = 0;
+    [label sizeToFit];
+    CGFloat height = label.frame.size.height;
+    return ceil(height);
+}
 @end

KuDianProject/TOP/Controller/KDPGoodDetailVC.h

@@ -7,11 +7,11 @@
 //
 
 #import "KDPMainViewController.h"
-
+#import "KDPGoodsModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface KDPGoodDetailVC : KDPMainViewController
-
+@property(nonatomic,strong)KDPGoodsModel *model;
 @end
 
 NS_ASSUME_NONNULL_END

KuDianProject/TOP/Controller/KDPGoodDetailVC.m

@@ -10,36 +10,121 @@
 #import "KDPDetailGoodInformationView.h"
 #import "KDPSellingPointView.h"
 #import "KDPShopView.h"
+#import <WebKit/WebKit.h>
 #define goodHeight 496+KDStatusHeight
 
-@interface KDPGoodDetailVC ()<UIScrollViewDelegate>
+@interface KDPGoodDetailVC ()<UIScrollViewDelegate,UIWebViewDelegate,WKNavigationDelegate>
 {
     UIView *bottomView;
     UIButton *collectButton;
     
+    
 }
+@property(nonatomic,strong)UIButton *collectButton;
 @property(nonatomic,strong)UIScrollView *detailBottonView;
 @property(nonatomic,strong)KDPDetailGoodInformationView *infoView;
 @property(nonatomic,strong)KDPSellingPointView *pointView;
 @property(nonatomic,strong)KDPShopView *shopView;
+
+@property(nonatomic,strong)KDPGoodsModel *detailModel;
+
+
+@property(nonatomic,strong)WKWebView *detaiWebV;
 @end
 
 @implementation KDPGoodDetailVC
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.view.backgroundColor=[UIColor whiteColor];
-    [self.view addSubview:self.detailBottonView];
-    [self.detailBottonView addSubview:self.infoView];
-    [self.detailBottonView addSubview:self.pointView];
-    [self.detailBottonView addSubview:self.shopView];
+    [self addDetailUI];
     [self addbottomView];
+    self.infoView.model=self.model;
+    @try {
+        [self.detaiWebV removeObserver:self forKeyPath:@"scrollView.contentSize"];
+    } @catch (NSException *exception) {
+        
+    }
     
+    [self.detaiWebV addObserver:self forKeyPath:@"scrollView.contentSize" options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:nil];
+    [self.detailBottonView addSubview:self.detaiWebV];
+    [self.detaiWebV mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(self.shopView.mas_bottom).offset(40);
+        make.width.mas_equalTo(SCREEN_WIDTH);
+        make.left.mas_equalTo(0);
+    }];
+    [self getGoodDetail];
 }
+- (void)dealloc {
+    @try{
+        [self.detaiWebV removeObserver:self forKeyPath:@"scrollView.contentSize"];
+    }@catch (NSException *exception) {
+        
+    }
+    NSLog(@"释放了------------");
+}
+#pragma makr---商品详情
+-(void)getGoodDetail
+{
+    if (self.model.goods_id.length<=0) {
+        return;
+    }
+    [LoadingView show];
+    [KDPNetworkRequestHTTP postURL:goodDetailURL params:@{@"goods_id":self.model.goods_id} success:^(id  _Nonnull json) {
+        self.detailModel=[KDPGoodsModel yy_modelWithJSON:json[@"data"]];
+        if (self.detailModel.goods_point.length>0) {
+            [self good_points];
+        }
+        self.infoView.model=self.detailModel;
+        self.shopView.shopDic=self.detailModel.shop;
+        [self loadRequestWeb];
+        [LoadingView dismiss];
+        
+    } failure:^(NSError * _Nonnull error) {
+        [LoadingView dismiss];
+    }];
+}
+
+#pragma mark----Web详情
+-(void)loadRequestWeb
+{
+    
+    NSURL *url=[NSURL URLWithString:self.detailModel.detail_url];
+    NSURLRequest *requests=[NSURLRequest requestWithURL:url];
+    [self.detaiWebV loadRequest:requests];
+}
+-(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context
+{
+    CGFloat heights =[KDPublicMethod getHeightByWidth:SCREEN_WIDTH-40 title:self.detailModel.goods_point font:[UIFont systemFontOfSize:13]];
+    
+    if ([keyPath isEqualToString:@"scrollView.contentSize"]) {
+        id height =[change valueForKey:NSKeyValueChangeNewKey];
+        CGSize size;
+        [(NSValue *)height getValue:&size];
+        [self.detaiWebV mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.height.mas_equalTo(size.height);
+        }];
+        self.detailBottonView.contentSize=CGSizeMake(0, size.height+goodHeight+115+heights);
+    }
+}
+
+#pragma makr---赋值。卖点
+-(void)good_points
+{
+    CGFloat height =[KDPublicMethod getHeightByWidth:SCREEN_WIDTH-40 title:self.detailModel.goods_point font:[UIFont systemFontOfSize:13]];
+    self.pointView.point_good =self.detailModel.goods_point;
+    [self.pointView mas_updateConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(goodHeight);
+        make.height.mas_equalTo(height+50);
 
+    }];
+    [self.shopView mas_updateConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(self.pointView.mas_bottom);
+    }];
+    
+}
 -(void)addbottomView
 {
-    bottomView =[[UIView alloc]initWithFrame:CGRectMake(0, self.detailBottonView.bottom, SCREEN_WIDTH, KDTabBarHeight)];
+    bottomView =[[UIView alloc]initWithFrame:CGRectMake(0, SCREEN_HEIGHT-KDTabBarHeight, SCREEN_WIDTH, KDTabBarHeight)];
     bottomView.backgroundColor=[UIColor whiteColor];
     [self.view addSubview:bottomView];
     
@@ -110,7 +195,7 @@
 -(KDPDetailGoodInformationView *)infoView
 {
     if (!_infoView) {
-        _infoView=[[KDPDetailGoodInformationView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, goodHeight)];
+        _infoView=[[KDPDetailGoodInformationView alloc]init];
         __weak KDPGoodDetailVC *weakself=self;
         _infoView.returnBlock = ^{
             [weakself.navigationController popViewControllerAnimated:YES];
@@ -122,7 +207,7 @@
 -(KDPShopView *)shopView
 {
     if (!_shopView) {
-        _shopView=[[KDPShopView alloc]initWithFrame:CGRectMake(0, self.pointView.bottom, SCREEN_WIDTH, 70)];
+        _shopView=[[KDPShopView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 70)];
         
         
     }
@@ -132,17 +217,95 @@
 -(KDPSellingPointView *)pointView
 {
     if (!_pointView) {
-        _pointView=[[KDPSellingPointView alloc]initWithFrame:CGRectMake(0, self.infoView.bottom, SCREEN_WIDTH, 60)];
+        _pointView=[[KDPSellingPointView alloc]init];
         
     }
     return _pointView;
 }
-
+-(void)addDetailUI
+{
+    self.view.backgroundColor=[UIColor whiteColor];
+    [self.view addSubview:self.detailBottonView];
+    [self.detailBottonView addSubview:self.infoView];
+    [self.detailBottonView addSubview:self.pointView];
+    [self.detailBottonView addSubview:self.shopView];
+    [self.detailBottonView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.top.mas_equalTo(0);
+        make.bottom.mas_equalTo(self.view.mas_bottom).offset(-KDTabBarHeight);
+    }];
+    [self.infoView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.top.mas_equalTo(0);
+        make.width.mas_equalTo(SCREEN_WIDTH);
+        make.height.mas_equalTo(goodHeight);
+    }];
+    [self.pointView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(self.infoView.mas_bottom);
+        make.left.mas_equalTo(0);
+        make.width.mas_equalTo(SCREEN_WIDTH);
+        make.height.mas_equalTo(0);
+        
+    }];
+    [self.shopView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(0);
+        make.width.mas_equalTo(SCREEN_WIDTH);
+        make.height.mas_equalTo(75);
+        make.top.mas_equalTo(self.pointView.mas_bottom);
+    }];
+    [self addDetailTitle];
+    
+   
+    UIButton *returnBtn =[[UIButton alloc]initWithFrame:CGRectMake(15, KDStatusHeight+10, 30, 30)];
+    returnBtn.layer.cornerRadius=15;
+    returnBtn.layer.masksToBounds=YES;
+    [self.view addSubview:returnBtn];
+    returnBtn.backgroundColor=[UIColor colorWithRed:0/255.0 green:0/255.0 blue:0/255.0 alpha:0.4];
+    [returnBtn setImage:[UIImage imageNamed:@"return_white"] forState:UIControlStateNormal];
+    [returnBtn addTarget:self action:@selector(exitclickButton) forControlEvents:UIControlEventTouchUpInside];
+    
+    self.collectButton=[[UIButton alloc]initWithFrame:CGRectMake(self.view.width-47, KDStatusHeight+10, 30, 30)];
+    [self.collectButton setImage:[UIImage imageNamed:@"detail_collection"] forState:UIControlStateNormal];
+    [self.view addSubview:self.collectButton];
+    
+    
+}
+-(void)addDetailTitle
+{
+   
+    UILabel *titleL=[[UILabel alloc]init];
+    titleL.textColor=[UIColor colorWithHexString:fontColor];
+    titleL.text=@"————  商品详情  ————";
+    titleL.font=[UIFont systemFontOfSize:14];
+    titleL.textAlignment=NSTextAlignmentCenter;
+    [self.detailBottonView addSubview:titleL];
+    [titleL mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(self.shopView.mas_bottom);
+        make.height.mas_equalTo(40);
+        make.width.mas_equalTo(SCREEN_WIDTH);
+        make.left.mas_equalTo(0);
+    }];
+    
+    
+    
+    
+}
+-(void)exitclickButton
+{
+    [self.navigationController popViewControllerAnimated:YES];
+}
+-(WKWebView *)detaiWebV
+{
+    if (!_detaiWebV) {
+        _detaiWebV= [[WKWebView alloc]init];
+        _detaiWebV.navigationDelegate=self;
+        _detaiWebV.scrollView.scrollEnabled=NO;
+    }
+    return _detaiWebV;
+}
 
 -(UIScrollView *)detailBottonView
 {
     if (!_detailBottonView) {
-        _detailBottonView=[[UIScrollView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT-KDTabBarHeight)];
+        _detailBottonView=[[UIScrollView alloc]init];
         _detailBottonView.delegate=self;
         _detailBottonView.backgroundColor=[UIColor whiteColor];
         _detailBottonView.showsVerticalScrollIndicator=NO;

KuDianProject/TOP/Controller/KDPProjectListVC.h

@@ -0,0 +1,18 @@
+//
+//  KDPProjectListVC.h
+//  KuDianProject
+//
+//  Created by 学丽 on 2019/7/10.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import "KDPMainViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface KDPProjectListVC : KDPMainViewController
+@property(nonatomic,strong)NSString *projectID;
+
+@end
+
+NS_ASSUME_NONNULL_END

KuDianProject/TOP/Controller/KDPProjectListVC.m

@@ -0,0 +1,32 @@
+//
+//  KDPProjectListVC.m
+//  KuDianProject
+//
+//  Created by 学丽 on 2019/7/10.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import "KDPProjectListVC.h"
+
+@interface KDPProjectListVC ()
+
+@end
+
+@implementation KDPProjectListVC
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

KuDianProject/TOP/Controller/KDPTopViewController.m

@@ -12,26 +12,109 @@
 #define recommendCell @"recommendCell"
 #define recommendHead @"recommendHead"
 @interface KDPTopViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout>
+{
+    
+    
+}
+@property(nonatomic,strong)NSMutableArray *dataArray;
+@property(nonatomic,strong)NSArray *bannerArray;
+@property(nonatomic,copy)NSString *orderNumber;
+@property(nonatomic,copy)NSString *order_rebate_money;
 @property(nonatomic,strong)UIButton *headImgBtn;//左侧头像按钮
 @property(nonatomic,strong)UIButton *messageButton;//右侧消息按钮
 
 @property(nonatomic,strong)UICollectionView *dataCollectionView;
 
+
+//服务端传参
+@property(nonatomic,strong)NSString *pageNum;
+@property(nonatomic,strong)NSString *selection_page;
+@property(nonatomic,strong)NSString *selection_id;
+
+@property(nonatomic,strong)NSString *selection_id_count;
+
+@property(nonatomic,strong)NSString *selection_id_page;
+
 @end
 
 @implementation KDPTopViewController
-
+-(void)initialieValues
+{
+    self.pageNum=@"1";
+    self.selection_id=@"0";
+    self.selection_id_count=@"0";
+    self.selection_id_page=@"0";
+    self.selection_page=@"0";
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
-   
+    [self initialieValues];
     [self initUI];
     
-    KDPIDTipView *piv=[[KDPIDTipView alloc]init];
-    [self.view addSubview:piv];
-    [piv mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.top.right.bottom.mas_equalTo(0);
+//    KDPIDTipView *piv=[[KDPIDTipView alloc]init];
+//    [self.view addSubview:piv];
+//    [piv mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.left.top.right.bottom.mas_equalTo(0);
+//    }];
+    [self getUserTodayIncom];
+    [self getBanner];
+    [self getRecommendGood];
+}
+
+#pragma makr---首页收益
+-(void)getUserTodayIncom
+{
+    [LoadingView show];
+    [KDPNetworkRequestHTTP postURL:topIncomeUrl params:nil success:^(id  _Nonnull json) {
+        self.orderNumber =json[@"num"];//总数量;
+        self.order_rebate_money = json[@"total_rebate"];
+        [self.dataCollectionView reloadData];
+        [LoadingView dismiss];
+    } failure:^(NSError * _Nonnull error) {
+        [LoadingView dismiss];
+    }];
+}
+
+#pragma makr---首页banner
+-(void)getBanner
+{
+    [LoadingView show];
+    [KDPNetworkRequestHTTP getURL:bannerURL params:@{@"adv_type":@"1"} success:^(id  _Nonnull json) {
+        [LoadingView dismiss];
+        self.bannerArray=[NSArray yy_modelArrayWithClass:[KDPBannerModel class] json:json[@"data"]];
+        [self.dataCollectionView reloadData];
+        
+    } failure:^(NSError * _Nonnull error) {
+        [LoadingView dismiss];
+    }];
+}
+
+#pragma makr---获取首页数据
+-(void)getRecommendGood
+{
+    [LoadingView show];
+    NSDictionary *dic=@{@"page":self.pageNum,@"selection_page":self.selection_page,@"selection_id":self.selection_id,@"selection_id_page":self.selection_id_page,@"selection_id_count":self.selection_id_count};
+    [KDPNetworkRequestHTTP postURL:topGoodRecommURL params:dic success:^(id  _Nonnull json) {
+        [LoadingView dismiss];
+        self.selection_id_page = json[@"selection_id_count"];
+        self.selection_id = json[@"selection_id"];
+         self.selection_page = json[@"selection_page"];
+        self.selection_id_count = json[@"selection_id_count"];
+        if (self.pageNum.integerValue == 1) {
+            [self.dataArray removeAllObjects];
+            
+        }
+        NSArray *currentA=[NSArray yy_modelArrayWithClass:[KDPGoodsModel class] json:json[@"data"]];
+        [self.dataArray addObjectsFromArray:currentA];
+        
+        
+        [self.dataCollectionView reloadData];
+        
+    } failure:^(NSError * _Nonnull error) {
+        [LoadingView dismiss];
     }];
 }
+
 -(void)initUI
 {
     self.navBar.navTitleLabel.text=@"酷店";
@@ -75,14 +158,35 @@
 {
     if (indexPath.section == 1) {
         KDPBannerCell *bannerC=[collectionView dequeueReusableCellWithReuseIdentifier:bannerCell forIndexPath:indexPath];
+        bannerC.bannerArr  = self.bannerArray;
+        bannerC.bannerBlock = ^(KDPBannerModel * _Nonnull model) {
+            if (model.click_type.integerValue == 1) {//h5
+                KDPWebInteractionVC *web=[[KDPWebInteractionVC alloc]init];
+                web.url=model.click_param;
+                [self.navigationController pushViewController:web animated:YES];
+            }else if (model.click_type.integerValue == 2){//商品详情
+                KDPGoodDetailVC *goodD=[[KDPGoodDetailVC alloc]init];
+                KDPGoodsModel *models=[[KDPGoodsModel alloc]init];
+                models.goods_id=model.click_param;
+                goodD.model=models;
+                [self.navigationController pushViewController:goodD animated:YES];
+            }else if (model.click_type.integerValue == 3)
+            {//x专题列表
+                KDPProjectListVC *listV=[[KDPProjectListVC alloc]init];
+                listV.projectID=model.click_param;
+                [self.navigationController pushViewController:listV animated:YES];
+            }
+        };
         return bannerC;
     }
     if (indexPath.section == 2) {
         KDPRecommendGoodCell *goodC=[collectionView dequeueReusableCellWithReuseIdentifier:recommendCell forIndexPath:indexPath];
-        
+        goodC.model=self.dataArray[indexPath.row];
         return goodC;
     }
     KDPLiveEarningCell *earinCell =[collectionView dequeueReusableCellWithReuseIdentifier:liveEarningCell forIndexPath:indexPath];
+    earinCell.orderNumgL.text=self.orderNumber;
+    earinCell.Forecastlabel.text=self.order_rebate_money;
     earinCell.liveDataBlock = ^{
         self.tabBarController.selectedIndex=2;
     };
@@ -97,7 +201,7 @@
 -(NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
     if (section == 2) {
-        return 5;
+        return self.dataArray.count;
     }
     return 1;
 }
@@ -119,6 +223,7 @@
     }
     if (indexPath.section == 2) {
         KDPGoodDetailVC *goodDetail=[[KDPGoodDetailVC alloc]init];
+        goodDetail.model=self.dataArray[indexPath.row];
         [self.navigationController pushViewController:goodDetail animated:YES];
     }
 }
@@ -141,7 +246,13 @@
     return nil;
 }
 
-
+-(NSMutableArray *)dataArray
+{
+    if (!_dataArray) {
+        _dataArray=[NSMutableArray array];
+    }
+    return _dataArray;
+}
 #pragma mark---页面布局
 -(UIButton *)headImgBtn
 {

KuDianProject/TOP/Drawer/Control/KDPWebInteractionVC.m

@@ -102,17 +102,23 @@ static NSString *kd_h5_open_goodDetail=@"kd_h5_open_goodDetail";
 #pragma mark--跳转详情
 -(void)JumpGoodDetail:(WKScriptMessage *)message
 {
-//    NSDictionary *dict = [self dictionaryWithJsonString:message.body];
-//    KDGoodModel *model =[[KDGoodModel alloc]init];
-//    model.goods_id = [NSString stringWithFormat:@"%@",dict[@"goodsid"]];
-//    KDGoodDetailVC *detailVC = [[KDGoodDetailVC alloc] init];
-//    detailVC.model = model;
-//
-//    [self.navigationController pushViewController:detailVC animated:YES];
+    NSDictionary *dict = [KDPublicMethod dictionaryWithJsonString:message.body];
+    KDPGoodsModel *model =[[KDPGoodsModel alloc]init];
+    model.goods_id = [NSString stringWithFormat:@"%@",dict[@"goodsid"]];
+    KDPGoodDetailVC *detailVC = [[KDPGoodDetailVC alloc] init];
+    detailVC.model = model;
+
+    [self.navigationController pushViewController:detailVC animated:YES];
 }
 -(void)getGoodDetail:(WKScriptMessage *)message
 {
-   
+    NSDictionary *dict = [KDPublicMethod dictionaryWithJsonString:message.body];
+    KDPGoodsModel *model =[[KDPGoodsModel alloc]init];
+    model.goods_id = [NSString stringWithFormat:@"%@",dict[@"goodsId"]];
+    KDPGoodDetailVC *detailVC = [[KDPGoodDetailVC alloc] init];
+    detailVC.model = model;
+    
+    [self.navigationController pushViewController:detailVC animated:YES];
 }
 #pragma mark---保存本地
 -(void)saveLocal:(WKScriptMessage *)message
@@ -147,19 +153,19 @@ static NSString *kd_h5_open_goodDetail=@"kd_h5_open_goodDetail";
  */
 - (void)sendUserTokenToJS:(WKScriptMessage *)message {
     
-//    __block NSString *token = [AccountTool account].token;
-//
-//    NSDictionary *dict = [self dictionaryWithJsonString:message.body];
-//    NSString *jsMethod = dict[@"js_callback"];
-//    if (!token) {
-//        token = @"";
-//    }
-//    NSDictionary *tokenPara = @{@"token":token};
-//    NSString *jsonDict = [self convertToJsonData:tokenPara];
-//    NSString *callBacKMethod = [NSString stringWithFormat:@"%@('%@')",jsMethod,jsonDict];
-//    [self.webInterView evaluateJavaScript:callBacKMethod completionHandler:^(id _Nullable value, NSError * _Nullable error) {
-//
-//    }];
+    __block NSString *token = [KDPAccountTool account].token;
+
+    NSDictionary *dict = [KDPublicMethod dictionaryWithJsonString:message.body];
+    NSString *jsMethod = dict[@"js_callback"];
+    if (!token) {
+        token = @"";
+    }
+    NSDictionary *tokenPara = @{@"token":token};
+    NSString *jsonDict = [KDPublicMethod convertToJsonData:tokenPara];
+    NSString *callBacKMethod = [NSString stringWithFormat:@"%@('%@')",jsMethod,jsonDict];
+    [self.webInterView evaluateJavaScript:callBacKMethod completionHandler:^(id _Nullable value, NSError * _Nullable error) {
+
+    }];
     
 }
 - (void)loadRequest {

KuDianProject/TOP/Model/KDPBannerModel.h

@@ -0,0 +1,21 @@
+//
+//  KDPBannerModel.h
+//  KuDianProject
+//
+//  Created by 学丽 on 2019/7/9.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface KDPBannerModel : NSObject
+@property (nonatomic, strong) NSString *click_type;
+@property (nonatomic, strong) NSString *click_param;
+@property (nonatomic, strong) NSString *img;
+@property (nonatomic, strong) NSString *type;
+@property (nonatomic, strong) NSString *title;
+@end
+
+NS_ASSUME_NONNULL_END

KuDianProject/TOP/Model/KDPBannerModel.m

@@ -0,0 +1,16 @@
+//
+//  KDPBannerModel.m
+//  KuDianProject
+//
+//  Created by 学丽 on 2019/7/9.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import "KDPBannerModel.h"
+
+@implementation KDPBannerModel
+-(void)setValue:(id)value forUndefinedKey:(NSString *)key
+{
+    
+}
+@end

KuDianProject/TOP/Model/KDPGoodsModel.h

@@ -0,0 +1,43 @@
+//
+//  KDPGoodsModel.h
+//  KuDianProject
+//
+//  Created by 学丽 on 2019/7/9.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface KDPGoodsModel : NSObject
+@property(nonatomic,copy)NSString *zk_final_price;//原价
+@property(nonatomic,copy)NSString *order_count;//原价
+@property(nonatomic,copy)NSString *commission_rate;
+
+@property(nonatomic,copy)NSString *shop_title;
+@property(nonatomic,copy)NSString *shop_type;
+@property(nonatomic,copy)NSString *Id;
+@property(nonatomic,copy)NSString *name;
+@property(nonatomic,copy)NSString *goods_id;
+@property(nonatomic,copy)NSString *title;
+@property(nonatomic,copy)NSString *img;
+@property(nonatomic,strong)NSDictionary *shop;
+@property(nonatomic,copy)NSString *origin;
+@property(nonatomic,copy)NSArray *small_img;
+@property(nonatomic,copy)NSString *price;
+@property(nonatomic,copy)NSString *is_collect;//是否收藏
+@property(nonatomic,copy)NSString *selection_tag;
+@property(nonatomic,copy)NSString *discount_price;
+@property(nonatomic,copy)NSString *coupon_price;
+@property(nonatomic,copy)NSString *is_coupon;
+@property(nonatomic,copy)NSString *volume;
+@property(nonatomic,copy)NSString *commisson_price;
+@property(nonatomic,copy)NSString *detail_url;
+@property(nonatomic,copy)NSString *commission_price;
+@property(nonatomic,copy)NSString *goods_point;//商品卖点
+
+
+@end
+
+NS_ASSUME_NONNULL_END

KuDianProject/TOP/Model/KDPGoodsModel.m

@@ -0,0 +1,19 @@
+//
+//  KDPGoodsModel.m
+//  KuDianProject
+//
+//  Created by 学丽 on 2019/7/9.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import "KDPGoodsModel.h"
+
+@implementation KDPGoodsModel
+-(void)setValue:(id)value forUndefinedKey:(NSString *)key
+{
+    
+}
++ (NSDictionary *)modelCustomPropertyMapper {
+    return @{@"Id" : @"id"};
+}
+@end

KuDianProject/TOP/View/Detail/KDPDetailGoodInformationView.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-
+#import "KDPGoodsModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface KDPDetailGoodInformationView : UIView<SDCycleScrollViewDelegate>
@@ -19,7 +19,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic,strong)UILabel *volumeL;
 @property(nonatomic,strong)UILabel *originalLabel;
 @property(nonatomic,copy)void(^returnBlock)(void);
-
+@property(nonatomic,strong)KDPGoodsModel *model;
+@property(nonatomic,strong)UIImageView *couponImgV;
+@property(nonatomic,strong)UILabel *couponPriceL;
 @end
 
 NS_ASSUME_NONNULL_END

KuDianProject/TOP/View/Detail/KDPDetailGoodInformationView.m

@@ -19,19 +19,9 @@
         self.imgView.backgroundColor=[UIColor colorWithHexString:LineColor];
         [self addSubview:self.imgView];
         
-        self.collectButton=[[UIButton alloc]initWithFrame:CGRectMake(self.width-37, KDStatusHeight, 22, 22)];
-        [self.collectButton setImage:[UIImage imageNamed:@"detail_collection"] forState:UIControlStateNormal];
-        [self addSubview:self.collectButton];
+       
         
         
-        UIButton *returnBtn =[[UIButton alloc]initWithFrame:CGRectMake(15, KDStatusHeight, 30, 30)];
-        returnBtn.layer.cornerRadius=15;
-        returnBtn.layer.masksToBounds=YES;
-        [self addSubview:returnBtn];
-        returnBtn.backgroundColor=[UIColor colorWithRed:0/255.0 green:0/255.0 blue:0/255.0 alpha:0.4];
-        [returnBtn setImage:[UIImage imageNamed:@"return_white"] forState:UIControlStateNormal];
-        [returnBtn addTarget:self action:@selector(exitclickButton) forControlEvents:UIControlEventTouchUpInside];
-        
         self.shopImgV=[[UIImageView alloc]initWithFrame:CGRectMake(10, self.imgView.bottom+14, 20, 20)];
         self.shopImgV.image=[UIImage imageNamed:@"taobao_icon"];
         [self addSubview:self.shopImgV];
@@ -63,19 +53,111 @@
         NSMutableAttributedString *attribtStr = [[NSMutableAttributedString alloc]initWithString:textStr attributes:attribtDic];
         self.originalLabel.attributedText=attribtStr;
         
-        self.volumeL=[[UILabel alloc]initWithFrame:CGRectMake(self.width-150, self.priceL.bottom+5, 140, 14)];
+        self.volumeL=[[UILabel alloc]initWithFrame:CGRectMake(SCREEN_WIDTH-150, self.originalLabel.top, 140, 14)];
         self.volumeL.textAlignment=NSTextAlignmentRight;
         self.volumeL.text=@"月销:--";
         self.volumeL.textColor=[UIColor colorWithHexString:@"#a9a9a9"];
         self.volumeL.font=[UIFont systemFontOfSize:10];
         [self addSubview:self.volumeL];
         
+        [self addSubview:self.couponImgV];
+        [self.couponImgV addSubview:self.couponPriceL];
+
+        self.couponImgV.frame=CGRectMake(SCREEN_WIDTH-70, self.priceL.top, 60, 16);
+        self.couponPriceL.frame=CGRectMake(20, 0, 40, 16);
         
         
+        UIView *lineV=[[UIView alloc]init];
+        lineV.backgroundColor=[UIColor colorWithHexString:LineColor];
+        [self addSubview:lineV];
+        [lineV mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.mas_equalTo(10);
+            make.right.mas_equalTo(-10);
+            make.top.mas_equalTo(self.mas_bottom).offset(-5);
+            make.height.mas_equalTo(5);
+        }];
     }
     return self;
 }
 
+
+-(void)setModel:(KDPGoodsModel *)model
+{
+    _model=model;
+    self.detailTitleL.attributedText=[KDPublicMethod sethanggaoWithStr:[NSString stringWithFormat:@"        %@",model.title] linSpacing:5];
+    if (model.shop_type.integerValue == 1) {
+        self.shopImgV.image =[UIImage imageNamed:@"tm_icon"];
+    }else{
+        self.shopImgV.image =[UIImage imageNamed:@"taobao_icon"];
+        
+    }
+    
+    self.volumeL.text=[NSString stringWithFormat:@"月销 %@",model.volume];
+    
+    NSString *timetitle= [NSString stringWithFormat:@"￥%@/利润%@",model.discount_price,model.commission_rate];
+    NSString *prices =[NSString stringWithFormat:@"￥%@/",model.discount_price];
+    NSMutableAttributedString *timestr = [[NSMutableAttributedString alloc] initWithString:timetitle];
+    [timestr addAttribute:NSForegroundColorAttributeName value:[UIColor colorWithHexString:@"#333333"] range:NSMakeRange(0,prices.length)];
+    [timestr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:16] range:NSMakeRange(prices.length,2)]; //设置字体字号和字体类别
+    [timestr addAttribute:NSForegroundColorAttributeName value:[UIColor colorWithHexString:ThemeColor] range:NSMakeRange(prices.length,timetitle.length-prices.length)];
+    
+    self.priceL.attributedText=timestr;
+    //原价
+    NSString *textStr =[NSString stringWithFormat:@"￥%@",model.price];
+    
+    //中划线
+    NSDictionary *attribtDic = @{NSStrikethroughStyleAttributeName: [NSNumber numberWithInteger:NSUnderlineStyleSingle]};
+    NSMutableAttributedString *attribtStr = [[NSMutableAttributedString alloc]initWithString:textStr attributes:attribtDic];
+    self.originalLabel.attributedText=attribtStr;
+    
+    
+    NSMutableArray *array =[NSMutableArray array];
+    [array addObject:model.img];
+    [array addObjectsFromArray:model.small_img];
+    self.imgView.imageURLStringsGroup=array;
+
+    
+    if (model.coupon_price.floatValue>0) {
+        self.couponImgV.hidden=NO;
+        self.couponPriceL.text=model.coupon_price;
+    }else{
+        self.couponImgV.hidden=YES;
+    }
+    
+}
+
+
+-(UIImageView *)couponImgV
+{
+    if (!_couponImgV) {
+        _couponImgV=[[UIImageView alloc]init];
+        _couponImgV.image=[UIImage imageNamed:@"coupon_icon"];
+        
+        UILabel *quanL=[[UILabel alloc]initWithFrame:CGRectMake(0, 0, 20, 16)];
+        quanL.text=@"券";
+        quanL.font=[UIFont systemFontOfSize:12];
+        quanL.textColor=[UIColor whiteColor];
+        quanL.textAlignment=NSTextAlignmentCenter;
+        [_couponImgV addSubview:quanL];
+        
+    }
+    return _couponImgV;
+}
+-(UILabel *)couponPriceL
+{
+    if (!_couponPriceL) {
+        _couponPriceL=[[UILabel alloc]init];
+        _couponPriceL.text=@"---";
+        _couponPriceL.textColor=[UIColor colorWithHexString:ThemeColor];
+        _couponPriceL.font=[UIFont systemFontOfSize:12];
+        _couponPriceL.textAlignment=NSTextAlignmentCenter;
+        
+    }
+    return _couponPriceL;
+}
+
+
+
 -(void)exitclickButton
 {
     if (self.returnBlock) {

KuDianProject/TOP/View/Detail/KDPSellingPointView.h

@@ -13,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface KDPSellingPointView : UIView
 @property(nonatomic,strong)UILabel *pointLabel;
 @property(nonatomic,strong)UIView *hotView;
+@property(nonatomic,copy)NSString *point_good;
 @end
 
 NS_ASSUME_NONNULL_END

KuDianProject/TOP/View/Detail/KDPSellingPointView.m

@@ -14,7 +14,7 @@
 {
     self =[super initWithFrame:frame];
     if (self) {
-        self.hotView=[[UIView alloc]initWithFrame:CGRectMake(10, 0, SCREEN_WIDTH-20, 50)];
+        self.hotView=[[UIView alloc]initWithFrame:CGRectMake(10, 0, SCREEN_WIDTH-20, 0)];
         self.hotView.layer.cornerRadius=5;
         self.hotView.layer.masksToBounds=YES;
         [self addSubview:self.hotView];
@@ -56,10 +56,25 @@
     return self;
 }
 
-
+-(void)setPoint_good:(NSString *)point_good
+{
+    _point_good  = point_good;
+    self.pointLabel.text=point_good;
+     CGFloat height =[KDPublicMethod getHeightByWidth:SCREEN_WIDTH-40 title:point_good font:[UIFont systemFontOfSize:13]];
+    self.hotView.frame=CGRectMake(10, 0, SCREEN_WIDTH-20, 45+height);
+    self.pointLabel.frame=CGRectMake(10,28, SCREEN_WIDTH-40, 10+height);
+    
+}
 #pragma mark---复制
 -(void)copyclickButton
 {
-    
+    UIPasteboard * pastboard = [UIPasteboard generalPasteboard];
+    if (self.point_good) {
+        pastboard.string =self.point_good;
+        [MBProgressHUD showMessage:@"复制成功"];
+        
+    }else {
+        [MBProgressHUD showMessage:@"复制失败"];
+    }
 }
 @end

KuDianProject/TOP/View/Detail/KDPShopView.h

@@ -7,13 +7,14 @@
 //
 
 #import <UIKit/UIKit.h>
-
+#import "KDPGoodsModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface KDPShopView : UIView
 @property(nonatomic,strong)UIImageView *shopimgV;
 @property(nonatomic,strong)UILabel *shopLabel;
 @property(nonatomic,strong)UILabel *desclabel;
+@property(nonatomic,strong)NSDictionary *shopDic;
 @end
 
 NS_ASSUME_NONNULL_END

KuDianProject/TOP/View/Detail/KDPShopView.m

@@ -18,7 +18,7 @@
         self.shopimgV.backgroundColor=[UIColor colorWithHexString:LineColor];
         [self addSubview:self.shopimgV];
         
-        self.shopLabel=[[UILabel alloc]initWithFrame:CGRectMake(self.shopimgV.right+10, 10, self.width-self.shopimgV.right-10, 20)];
+        self.shopLabel=[[UILabel alloc]initWithFrame:CGRectMake(self.shopimgV.right+10, 15, self.width-self.shopimgV.right-10, 20)];
         self.shopLabel.textColor=[UIColor colorWithHexString:fontColor];
         self.shopLabel.font=[UIFont systemFontOfSize:14];
         [self addSubview:self.shopLabel];
@@ -28,7 +28,26 @@
         self.desclabel.textColor=[UIColor colorWithHexString:@"#999999"];
         [self addSubview:self.desclabel];
         
+        
+        UIView *lineV=[[UIView alloc]init];
+        lineV.backgroundColor=[UIColor colorWithHexString:LineColor];
+        [self addSubview:lineV];
+        [lineV mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.mas_equalTo(10);
+            make.right.mas_equalTo(-10);
+            make.top.mas_equalTo(self.mas_bottom).offset(-5);
+            make.height.mas_equalTo(5);
+        }];
     }
     return self;
 }
+
+-(void)setShopDic:(NSDictionary *)shopDic
+{
+    _shopDic = shopDic;
+    [self.shopimgV sd_setImageWithURL:[NSURL URLWithString:shopDic[@"pic_path"]]];
+    self.shopLabel.text=shopDic[@"title"];
+    
+    self.desclabel.text=[NSString stringWithFormat:@"商品描述:%@  服务态度:%@  发货速度:%@",shopDic[@"item_score"],shopDic[@"service_score"],shopDic[@"delivery_score"]];
+}
 @end

KuDianProject/TOP/View/KDPBannerCell.h

@@ -8,10 +8,14 @@
 
 #import <UIKit/UIKit.h>
 #import <SDCycleScrollView.h>
+#import "KDPBannerModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
-@interface KDPBannerCell : UICollectionViewCell
+@interface KDPBannerCell : UICollectionViewCell<SDCycleScrollViewDelegate>
 @property(nonatomic,strong)SDCycleScrollView *sdCycleView;
+@property(nonatomic,strong)NSArray *bannerArr;
+
+@property(nonatomic,copy)void(^bannerBlock)(KDPBannerModel *model);
 @end
 
 NS_ASSUME_NONNULL_END

KuDianProject/TOP/View/KDPBannerCell.m

@@ -28,8 +28,28 @@
 {
     if (!_sdCycleView) {
         _sdCycleView =[[SDCycleScrollView alloc]init];
-        _sdCycleView.backgroundColor=[UIColor colorWithHexString:ThemeColor];
+        _sdCycleView.backgroundColor=[UIColor colorWithHexString:LineColor];
+        _sdCycleView.delegate=self;
     }
     return _sdCycleView;
 }
+
+-(void)setBannerArr:(NSArray *)bannerArr
+{
+    _bannerArr = bannerArr;
+    NSMutableArray  *array =[NSMutableArray array];
+    for (KDPBannerModel *model in bannerArr) {
+        [array addObject:model.img];
+    }
+    self.sdCycleView.imageURLStringsGroup=array;
+}
+
+
+
+-(void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index
+{
+    if (self.bannerBlock) {
+        self.bannerBlock(self.bannerArr[index]);
+    }
+}
 @end

KuDianProject/TOP/View/KDPRecommendGoodCell.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-
+#import "KDPGoodsModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface KDPRecommendGoodCell : UICollectionViewCell
@@ -18,7 +18,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic,strong)UILabel *recomPriceL;
 @property(nonatomic,strong)UILabel *recomOriginL;
 @property(nonatomic,strong)UILabel *recomVolumeL;
+@property(nonatomic,strong)UIImageView *couponImgV;
+@property(nonatomic,strong)UILabel *couponPriceL;
 @property(nonatomic,strong)UILabel *recomprofitL;
+@property(nonatomic,strong)KDPGoodsModel *model;
 @end
 
 NS_ASSUME_NONNULL_END

KuDianProject/TOP/View/KDPRecommendGoodCell.m

@@ -22,6 +22,8 @@
             make.top.mas_equalTo(0);
             make.bottom.mas_equalTo(-1);
         }];
+        [backV addSubview:self.couponImgV];
+        [self.couponImgV addSubview:self.couponPriceL];
         [backV addSubview:self.recomImgV];
         [backV addSubview:self.recomTitleL];
         [backV addSubview:self.recomShopL];
@@ -40,8 +42,8 @@
         [self.recomTitleL mas_makeConstraints:^(MASConstraintMaker *make) {
             make.left.mas_equalTo(self.recomImgV.mas_right).offset(10);
             make.top.mas_equalTo(self.recomImgV.mas_top);
-            make.height.mas_equalTo(41);
-            make.right.mas_equalTo(-10);
+            make.height.mas_equalTo(21);
+            make.right.mas_equalTo(0);
         }];
         [self.recomShopiconImg mas_makeConstraints:^(MASConstraintMaker *make) {
             make.left.mas_equalTo(self.recomTitleL.mas_left);
@@ -68,7 +70,7 @@
         
         [self.recomPriceL mas_makeConstraints:^(MASConstraintMaker *make) {
             make.left.mas_equalTo(self.recomTitleL.mas_left);
-            make.top.mas_equalTo(self.recomShopiconImg.mas_bottom).offset(13);
+            make.top.mas_equalTo(self.recomShopiconImg.mas_bottom).offset(11);
             make.height.mas_equalTo(25);
         }];
         
@@ -83,9 +85,20 @@
             make.right.mas_equalTo(-10);
             make.height.mas_equalTo(26);
             make.width.mas_equalTo(78);
-            make.top.mas_equalTo(self.recomVolumeL.mas_bottom).offset(8);
+            make.top.mas_equalTo(self.recomVolumeL.mas_bottom).offset(21);
+        }];
+        
+        [self.couponImgV mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.top.mas_equalTo(self.recomPriceL.mas_bottom).offset(6);
+            make.height.mas_equalTo(16);
+            make.width.mas_equalTo(60);
+            make.left.mas_equalTo(self.recomPriceL.mas_left);
+        }];
+        
+        [self.couponPriceL mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.mas_equalTo(20);
+            make.top.right.bottom.mas_equalTo(0);
         }];
-    
     }
     return self;
 }
@@ -186,4 +199,66 @@
     return _recomprofitL;
 }
 
+-(UIImageView *)couponImgV
+{
+    if (!_couponImgV) {
+        _couponImgV=[[UIImageView alloc]init];
+        _couponImgV.image=[UIImage imageNamed:@"coupon_icon"];
+        
+        UILabel *quanL=[[UILabel alloc]initWithFrame:CGRectMake(0, 0, 20, 16)];
+        quanL.text=@"券";
+        quanL.font=[UIFont systemFontOfSize:12];
+        quanL.textColor=[UIColor whiteColor];
+        quanL.textAlignment=NSTextAlignmentCenter;
+        [_couponImgV addSubview:quanL];
+        
+    }
+    return _couponImgV;
+}
+-(UILabel *)couponPriceL
+{
+    if (!_couponPriceL) {
+        _couponPriceL=[[UILabel alloc]init];
+        _couponPriceL.text=@"---";
+        _couponPriceL.textColor=[UIColor colorWithHexString:ThemeColor];
+        _couponPriceL.font=[UIFont systemFontOfSize:12];
+        _couponPriceL.textAlignment=NSTextAlignmentCenter;
+        
+    }
+    return _couponPriceL;
+}
+
+
+-(void)setModel:(KDPGoodsModel *)model
+{
+    _model = model;
+    //设置字体字号和字体类别
+    self.recomprofitL.text=[NSString stringWithFormat:@"利润%@",model.commission_rate];
+    [self.recomImgV sd_setImageWithURL:[NSURL URLWithString:model.img]];
+    self.recomShopL.text=model.shop_title;
+     self.recomTitleL.attributedText=[KDPublicMethod sethanggaoWithStr:model.title linSpacing:5];
+    if (model.shop_type.integerValue == 1) {
+        self.recomShopiconImg.image =[UIImage imageNamed:@"tm_icon"];
+    }else{
+        self.recomShopiconImg.image =[UIImage imageNamed:@"taobao_icon"];
+        
+    }
+    //原件
+    NSString *textStr =[NSString stringWithFormat:@"￥%@",model.price];
+    //中划线
+    NSDictionary *attribtDic = @{NSStrikethroughStyleAttributeName: [NSNumber numberWithInteger:NSUnderlineStyleSingle]};
+    NSMutableAttributedString *attribtStr = [[NSMutableAttributedString alloc]initWithString:textStr attributes:attribtDic];
+    // 赋值
+    self.recomOriginL.attributedText = attribtStr;
+     self.recomPriceL.text=[NSString stringWithFormat:@"￥%@",model.discount_price];
+    self.recomVolumeL.text=[NSString stringWithFormat:@"月销%@",model.volume];
+    
+    if (model.coupon_price.floatValue>0) {
+        self.couponImgV.hidden=NO;
+        self.couponPriceL.text=model.coupon_price;
+    }else{
+        self.couponImgV.hidden=YES;
+    }
+    
+}
 @end