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

KuDianProject.xcodeproj/project.pbxproj

@@ -113,6 +113,7 @@
 		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 */; };
+		C5EB45D922D5D70A006A24F0 /* KDPBalanceModel.m in Sources */ = {isa = PBXBuildFile; fileRef = C5EB45D822D5D70A006A24F0 /* KDPBalanceModel.m */; };
 		D5717435855D1EAB768416AB /* libPods-KuDianProject.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B9A054D75DA0898647035D54 /* libPods-KuDianProject.a */; };
 /* End PBXBuildFile section */
 
@@ -352,6 +353,8 @@
 		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>"; };
+		C5EB45D722D5D70A006A24F0 /* KDPBalanceModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = KDPBalanceModel.h; path = KuDianProject/TOP/Controller/KDPBalanceModel.h; sourceTree = SOURCE_ROOT; };
+		C5EB45D822D5D70A006A24F0 /* KDPBalanceModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = KDPBalanceModel.m; path = KuDianProject/TOP/Controller/KDPBalanceModel.m; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -789,9 +792,9 @@
 		C5D5623722CD9D300035A714 /* Earning */ = {
 			isa = PBXGroup;
 			children = (
+				C5EB45D422D5D6E8006A24F0 /* Model */,
 				C53FD3E322D2E61F00687706 /* Chart */,
 				C5D5623822CD9D300035A714 /* Controller */,
-				C5D5623922CD9D300035A714 /* Model */,
 				C5D5623A22CD9D300035A714 /* View */,
 			);
 			path = Earning;
@@ -812,13 +815,6 @@
 			path = Controller;
 			sourceTree = "<group>";
 		};
-		C5D5623922CD9D300035A714 /* Model */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Model;
-			sourceTree = "<group>";
-		};
 		C5D5623A22CD9D300035A714 /* View */ = {
 			isa = PBXGroup;
 			children = (
@@ -947,6 +943,16 @@
 			path = Model;
 			sourceTree = "<group>";
 		};
+		C5EB45D422D5D6E8006A24F0 /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				C5EB45D722D5D70A006A24F0 /* KDPBalanceModel.h */,
+				C5EB45D822D5D70A006A24F0 /* KDPBalanceModel.m */,
+			);
+			name = Model;
+			path = "New Group";
+			sourceTree = "<group>";
+		};
 		EDAD9A798350EDEB3C0EA15C /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -1138,6 +1144,7 @@
 				C5EB45D222D58B2A006A24F0 /* KDPProjectListVC.m in Sources */,
 				C5BAD0D722D47A510084663A /* UIButton+ImageTitleStyle.m in Sources */,
 				C5BAD0AF22D42EBA0084663A /* KDPCollectHistoryVC.m in Sources */,
+				C5EB45D922D5D70A006A24F0 /* KDPBalanceModel.m in Sources */,
 				C5BAD0CA22D46D990084663A /* KDPGoodDetailVC.m in Sources */,
 				C5BAD0B222D42ECA0084663A /* KDPIDViewController.m in Sources */,
 				76D7945422D2E02600C2ECFA /* KDPScreenViewController.m in Sources */,

KuDianProject/APPKDURL.h

@@ -31,7 +31,18 @@
 #define bannerURL [NSString stringWithFormat:@"%@api/adv/advByType",KDURL]
 
 #define topGoodRecommURL [NSString stringWithFormat:@"%@api/home/getHomeGoodsListV1",KDURL]
+#define historyURL [NSString stringWithFormat:@"%@api/brower/record",KDURL]
 
-
+#define collectURL [NSString stringWithFormat:@"%@api/goods_collect/handelCollection",KDURL]
 #define goodDetailURL [NSString stringWithFormat:@"%@api/goods/detail",KDURL]
+
+#define projectGoodURL [NSString stringWithFormat:@"%@api/goods/listGoods",KDURL]
+#define ChartAllMoneyURL  [NSString stringWithFormat:@"%@api/order/myEarningOrderStatistics",KDURL]
+
+#define balanceURL [NSString stringWithFormat:@"%@api/earning/accountPrice",KDURL]
+
+#define BalancelistURL [NSString stringWithFormat:@"%@api/earning/myBalanceList",KDURL]
+
+#define foreastURL [NSString stringWithFormat:@"%@api/earning/monthEarnings",KDURL]
+#define foreastDetailURL [NSString stringWithFormat:@"%@api/earning/incomeDetailList",KDURL]
 #endif /* APPKDURL_h */

KuDianProject/Earning/Chart/SSWlineIncomeChartView.m

@@ -296,7 +296,10 @@
         UILabel   *lab = [[UILabel alloc]init];
         lab.bounds = CGRectMake(0, 0, self.barWidth+self.gapWidth*4/5, 20);
         lab.center = CGPointMake(point.x, point.y+lab.bounds.size.height/2);
-//        lab.text = [NSString stringWithFormat:@"%@",self.xValuesArr[i]];
+        if (self.xValuesArr.count<=6) {
+            lab.text = [NSString stringWithFormat:@"%@",self.xValuesArr[i]];
+        }
+
         lab.textColor=[UIColor colorWithHexString:@"#333333"];
         lab.font = [UIFont systemFontOfSize:12];
         lab.textAlignment = NSTextAlignmentCenter;

KuDianProject/Earning/Controller/KDPAccountVC.m

@@ -12,8 +12,11 @@
 @interface KDPAccountVC ()<UITableViewDelegate,UITableViewDataSource>
 {
     UILabel *_accountMoneyLabel;
+    UILabel *_tipeLabel;
+    NSInteger page_num;
 }
 @property(nonatomic,strong)UITableView *accountView;
+@property(nonatomic,strong)NSMutableArray *dataArray;
 @end
 
 @implementation KDPAccountVC
@@ -21,8 +24,41 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self setNavUI];
+    page_num = 1;
+    [self getAccountBalance];
+    [self getBalanceList];
+}
+-(void)getBalanceList
+{
+    [LoadingView show];
     
-    
+    [KDPNetworkRequestHTTP postURL:BalancelistURL params:@{@"page":@(page_num)} success:^(id  _Nonnull json) {
+        [LoadingView dismiss];
+        NSArray *array =[NSArray yy_modelArrayWithClass:[KDPBalanceModel class] json:json[@"data"]];
+        if (page_num ==1) {
+            [self.dataArray removeAllObjects];
+        }
+        [self.dataArray addObjectsFromArray:array];
+        [self.accountView reloadData];
+        
+    } failure:^(NSError * _Nonnull error) {
+        [LoadingView dismiss];
+    }];
+}
+-(void)getAccountBalance
+{
+    [LoadingView show];
+    [KDPNetworkRequestHTTP postURL:balanceURL params:nil success:^(id  _Nonnull json) {
+        [LoadingView dismiss];
+        _tipeLabel.text=json[@"data"][@"alert"];
+        NSString *contents = [NSString stringWithFormat:@"￥%@",json[@"data"][@"notEnd"]];
+        NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithString:contents];
+        
+        [str addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:18] range:NSMakeRange(0,1)]; //设置字体字号和字体类别
+        _accountMoneyLabel.attributedText = str;
+    } failure:^(NSError * _Nonnull error) {
+        [LoadingView dismiss];
+    }];
 }
 
 -(void)setNavUI
@@ -32,9 +68,7 @@
     self.navBar.navTitleLabel.text=@"我的账户";
     
     [self.view addSubview:self.accountView];
-    [self.accountView mas_makeConstraints:^(MASConstraintMaker *make) {
-        
-    }];
+    
 }
 
 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
@@ -44,11 +78,12 @@
         listC=[[KDPAccountListCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"account"];
         listC.selectionStyle=UITableViewCellSelectionStyleNone;
     }
+    listC.model=self.dataArray[indexPath.row];
     return listC;
 }
 -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    return 5;
+    return self.dataArray.count;
 }
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
@@ -97,11 +132,13 @@
 
 -(void)addAccountviews
 {
+    UIView *headV=[[UIView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 134)];
+    
     UIView *backV=[[UIView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 104)];
     backV.backgroundColor=[UIColor gradientOneColor:[UIColor colorWithHexString:@"#FF235F"] toColor:[UIColor colorWithHexString:@"#FF7676"] Width:SCREEN_WIDTH];
-    self.accountView.tableHeaderView=backV;
-    
+    self.accountView.tableHeaderView=headV;
     
+    [headV addSubview:backV];
     _accountMoneyLabel=[[UILabel alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, backV.height)];
     _accountMoneyLabel.center=backV.center;
     _accountMoneyLabel.font=[UIFont systemFontOfSize:48];
@@ -115,5 +152,18 @@
     _accountMoneyLabel.attributedText = str;
     [backV addSubview:_accountMoneyLabel];
     
+    
+    _tipeLabel=[[UILabel alloc]initWithFrame:CGRectMake(10, backV.bottom, SCREEN_WIDTH-20, 30)];
+    _tipeLabel.font=[UIFont systemFontOfSize:12];
+    _tipeLabel.textColor=[UIColor colorWithHexString:@"#999999"];
+    [headV addSubview:_tipeLabel];
+}
+
+-(NSMutableArray *)dataArray
+{
+    if (!_dataArray) {
+        _dataArray=[NSMutableArray array];
+    }
+    return _dataArray;
 }
 @end

KuDianProject/Earning/Controller/KDPForecastOrderListVC.h

@@ -11,6 +11,8 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface KDPForecastOrderListVC : KDPMainViewController
+@property(nonatomic,copy)NSString *yearMonthDay;
+@property(nonatomic,copy)NSString *isDay;
 
 @end
 

KuDianProject/Earning/Controller/KDPForecastOrderListVC.m

@@ -12,7 +12,10 @@
 @interface KDPForecastOrderListVC ()<UITableViewDelegate,UITableViewDataSource>
 {
     UILabel *_orderLabel;
+    
+    NSInteger page_num;
 }
+
 @property(nonatomic,strong)UITableView *forecastView;
 
 
@@ -24,6 +27,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self setNavUI];
+    page_num = 1;
 }
 -(void)setNavUI
 {
@@ -34,6 +38,16 @@
     [self.view addSubview:self.forecastView];
     
 }
+-(void)getMonthOrderList
+{
+    [LoadingView show];
+    NSDictionary *param=@{@"page":@(page_num),@"yearMonthDay":self.yearMonthDay,@"type":@"1",@"isDay":self.isDay};
+    [KDPNetworkRequestHTTP postURL:foreastDetailURL params:param success:^(id  _Nonnull json) {
+        [LoadingView dismiss];
+    } failure:^(NSError * _Nonnull error) {
+        [LoadingView dismiss];
+    }];
+}
 
 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {

KuDianProject/Earning/Controller/KDPForecastVC.m

@@ -12,7 +12,9 @@
 @interface KDPForecastVC ()<UITableViewDelegate,UITableViewDataSource>
 {
     UILabel *_orderNumMoneyLabel;
+    
 }
+@property(nonatomic,strong)NSMutableArray *dataArray;
 @property(nonatomic,strong)UITableView *forecastView;
 
 @end
@@ -22,6 +24,21 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self setNavUI];
+    [self getForecastEarn];
+    
+}
+-(void)getForecastEarn
+{
+    [LoadingView show];
+    [KDPNetworkRequestHTTP postURL:foreastURL params:@{@"type":@"1"} success:^(id  _Nonnull json) {
+        _orderNumMoneyLabel.text=[NSString stringWithFormat:@"预估订单:%@  收益:%@元",json[@"total_count"],json[@"total_rebate"]];
+        [self.dataArray removeAllObjects];
+        [self.dataArray addObjectsFromArray:[NSArray yy_modelArrayWithClass:[KDPBalanceModel class] json:json[@"all_month"]]];
+        [self.forecastView reloadData];
+        [LoadingView dismiss];
+    } failure:^(NSError * _Nonnull error) {
+        [LoadingView dismiss];
+    }];
 }
 -(void)setNavUI
 {
@@ -40,12 +57,12 @@
         listC=[[KDPForecastListCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"fore"];
         listC.selectionStyle=UITableViewCellSelectionStyleNone;
     }
-    listC.accessoryType=UITableViewCellAccessoryDisclosureIndicator;
+    listC.model=self.dataArray[indexPath.row]; listC.accessoryType=UITableViewCellAccessoryDisclosureIndicator;
     return listC;
 }
 -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    return 5;
+    return self.dataArray.count;
 }
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
@@ -108,4 +125,12 @@
     lineV.backgroundColor=[UIColor colorWithHexString:LineColor];
     [backV addSubview:lineV];
 }
+
+-(NSMutableArray *)dataArray
+{
+    if (!_dataArray) {
+        _dataArray=[NSMutableArray array];
+    }
+    return _dataArray;
+}
 @end

KuDianProject/Earning/View/KDPAccountListCell.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-
+#import "KDPBalanceModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface KDPAccountListCell : UITableViewCell
@@ -16,6 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic,strong)UILabel *timeLabel;
 @property(nonatomic,strong)UILabel *moneyLabel;
 @property(nonatomic,strong)UILabel *tipeLabel;
+@property(nonatomic,strong)KDPBalanceModel *model;
 @end
 
 NS_ASSUME_NONNULL_END

KuDianProject/Earning/View/KDPAccountListCell.m

@@ -38,7 +38,7 @@
         self.moneyLabel=[[UILabel alloc]initWithFrame:CGRectMake(SCREEN_WIDTH-155, self.iconImgV.top, 140, 25)];
         self.moneyLabel.textColor=[UIColor colorWithHexString:fontColor];
         self.moneyLabel.font=[UIFont boldSystemFontOfSize:18];
-        self.moneyLabel.text=@"--";
+//        self.moneyLabel.text=@"--";
         self.moneyLabel.textAlignment=NSTextAlignmentRight;
         [self addSubview:self.moneyLabel];
         
@@ -47,7 +47,7 @@
        
         self.tipeLabel.font=[UIFont systemFontOfSize:12];
         self.tipeLabel.textAlignment=NSTextAlignmentRight;
-        self.tipeLabel.text=@"申请中";
+        
         [self addSubview:self.tipeLabel];
         
         UIView *lineV=[[UIView alloc]initWithFrame:CGRectMake(self.iconImgV.right, 79, self.width-self.iconImgV.right-10, 1)];
@@ -57,4 +57,21 @@
     }
     return self;
 }
+
+-(void)setModel:(KDPBalanceModel *)model
+{
+    _model=model;
+    [self.iconImgV sd_setImageWithURL:[NSURL URLWithString:model.img]];
+    self.titleLabel.text=model.title;
+    self.timeLabel.text=model.create_time;
+    self.tipeLabel.text=model.message;
+    if (model.mode.integerValue == 1) {//佣金收入
+        self.moneyLabel.textColor=[UIColor colorWithHexString:@"#FF8712"];
+        self.moneyLabel.text=[NSString stringWithFormat:@"%@",model.rebate];
+    }else if (model.mode.integerValue == 2){//提现
+        self.moneyLabel.textColor=[UIColor colorWithHexString:@"#343434"];
+        self.moneyLabel.text=[NSString stringWithFormat:@"%@",model.rebate];
+    }
+    
+}
 @end

KuDianProject/Earning/View/KDPEarnTableHeadView.h

@@ -16,6 +16,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property(nonatomic,strong)SSWlineIncomeChartView *chartView;//图表
 
+@property(nonatomic,strong)UIButton *volumeButton;
+@property(nonatomic,strong)UIButton *incomeButton;
+@property(nonatomic,copy)NSString *chartcate;
+@property(nonatomic,copy)NSString *chartType;
 @property(nonatomic,copy)void(^accountBlock)(void);
 @end
 

KuDianProject/Earning/View/KDPEarnTableHeadView.m

@@ -36,8 +36,7 @@
     backv.userInteractionEnabled=YES;
     [backv addSubview:self.chartView];
    
-    self.chartView.xValuesArr=[NSMutableArray arrayWithArray:@[@"13:00",@"13:00",@"13:00",@"13:00",@"13:00"]];
-    self.chartView.yValuesArr=[NSMutableArray arrayWithArray:@[@"0",@"50",@"100",@"200",@"300"]];
+    
     
 }
 #pragma mark---添加切换按钮
@@ -45,10 +44,13 @@
 {
     UIView *backV=[[UIView alloc]initWithFrame:CGRectMake(10, 80, self.width-20, 60)];
     [self addSubview:backV];
-    
-    
+    self.chartType=@"0";
+    self.chartcate=@"0";
+    [self requestChartData];
     UIButton *volumeButton =[[UIButton alloc]initWithFrame:CGRectMake(14, 15, 70, 30)];
     [volumeButton setTitle:@"销量走势" forState:UIControlStateNormal];
+    self.volumeButton =volumeButton;
+    [volumeButton addTarget:self action:@selector(volumeClickButton) forControlEvents:UIControlEventTouchUpInside];
     [volumeButton setTitleColor:[UIColor colorWithHexString:@"#333333"] forState:UIControlStateNormal];
     volumeButton.titleLabel.font=[UIFont systemFontOfSize:16];
     [backV addSubview:volumeButton];
@@ -58,8 +60,10 @@
     [backV addSubview:LineV];
     
     UIButton *incomeButton =[[UIButton alloc]initWithFrame:CGRectMake(LineV.right+5, 15, 70, 30)];
-    [incomeButton setTitle:@"销量走势" forState:UIControlStateNormal];
+    [incomeButton addTarget:self action:@selector(incomeClickButton) forControlEvents:UIControlEventTouchUpInside];
+    [incomeButton setTitle:@"收益走势" forState:UIControlStateNormal];
     [incomeButton setTitleColor:[UIColor colorWithHexString:@"#666666"] forState:UIControlStateNormal];
+    self.incomeButton=incomeButton;
     incomeButton.titleLabel.font=[UIFont systemFontOfSize:16];
     [backV addSubview:incomeButton];
     
@@ -73,7 +77,17 @@
         _chartView.unit=@"单";
         _chartView.yScaleValue=100;
         _chartView.showEachYValus=NO;
-        
+        __weak KDPEarnTableHeadView *headview=self;
+        _chartView.changeMineBtn = ^(UIButton * _Nonnull button) {
+            if (button.tag == 1001) {//昨天
+                headview.chartType=@"1";
+            }else if (button.tag == 2001){//本月
+                headview.chartType=@"2";
+            }else{//今天
+                headview.chartType=@"0";
+            }
+            [headview requestChartData];
+        };
     }
     return _chartView;
 }
@@ -111,7 +125,22 @@
     lineV.backgroundColor=[UIColor colorWithHexString:LineColor];
     [backv addSubview:lineV];
 }
-
+#pragma makr---销量走势
+-(void)volumeClickButton
+{
+    [self.volumeButton setTitleColor:[UIColor colorWithHexString:fontColor] forState:UIControlStateNormal];
+    [self.incomeButton setTitleColor:[UIColor colorWithHexString:@"#666666"] forState:UIControlStateNormal];
+    self.chartcate=@"0";
+    [self requestChartData];
+}
+#pragma mark---收益走势
+-(void)incomeClickButton
+{
+    [self.incomeButton setTitleColor:[UIColor colorWithHexString:fontColor] forState:UIControlStateNormal];
+    [self.volumeButton setTitleColor:[UIColor colorWithHexString:@"#666666"] forState:UIControlStateNormal];
+    self.chartcate=@"1";
+    [self requestChartData];
+}
 
 #pragma mark---账号余额
 -(void)balanclickBtn
@@ -120,4 +149,27 @@
         self.accountBlock();
     }
 }
+
+
+-(void)requestChartData
+{
+    [LoadingView show];
+    NSDictionary *param=@{@"type":self.chartType,@"cate":self.chartcate};
+    [KDPNetworkRequestHTTP postURL:ChartAllMoneyURL params:param success:^(id  _Nonnull json) {
+        [LoadingView dismiss];
+        NSArray *arrya =json;
+        NSMutableArray *xArr=[NSMutableArray array];
+        NSMutableArray *yArr=[NSMutableArray array];
+        for (NSDictionary *dic in arrya) {
+            [yArr addObject:dic[@"num"]];
+            [xArr addObject:dic[@"time"]];
+        }
+        self.chartView.barWidth=SCREEN_WIDTH/xArr.count-80/xArr.count;
+        self.chartView.xValuesArr=xArr;
+        self.chartView.yValuesArr=yArr;
+        
+    } failure:^(NSError * _Nonnull error) {
+        [LoadingView dismiss];
+    }];
+}
 @end

KuDianProject/Earning/View/KDPForecastListCell.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-
+#import "KDPBalanceModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface KDPForecastListCell : UITableViewCell
@@ -16,6 +16,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic,strong)UILabel *numberLabel;
 @property(nonatomic,strong)UILabel *moneyLabel;
 
+@property(nonatomic,strong)KDPBalanceModel *model;
+
 @end
 
 NS_ASSUME_NONNULL_END

KuDianProject/Earning/View/KDPForecastListCell.m

@@ -48,4 +48,16 @@
     return self;
 }
 
+-(void)setModel:(KDPBalanceModel *)model
+{
+    _model = model;
+    NSArray *array =[model.yearAndMonth componentsSeparatedByString:@"-"];
+    if (array.count > 1) {
+        self.timeMonthLabel.text=[NSString stringWithFormat:@"%@月",array[1]];
+        self.timeYearLabel.text=[NSString stringWithFormat:@"%@年",array[0]];
+    }
+    self.numberLabel.text=[NSString stringWithFormat:@"共%@单",model.totalOrder];
+    self.moneyLabel.text=[NSString stringWithFormat:@"￥%@",model.rebateMoney];
+}
+
 @end

KuDianProject/Login/model/KDPAccountModel.h

@@ -19,6 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic,strong)NSString *img;
 @property(nonatomic,strong)NSString *has_kwai;
 
+@property(nonatomic,strong)NSString *is_hidden;//判断金额是否显示
 
 @property (nonatomic, strong) NSString *name;
 

KuDianProject/Login/model/KDPAccountModel.m

@@ -36,7 +36,7 @@
     [encoder encodeObject:self.name forKey:@"name"];
     [encoder encodeObject:self.phone forKey:@"phone"];
     [encoder encodeObject:self.has_kwai forKey:@"has_kwai"];
-    
+    [encoder encodeObject:self.is_hidden forKey:@"is_hidden"];
     //
 }
 
@@ -58,7 +58,7 @@
         self.phone=[decoder decodeObjectForKey:@"phone"];
         self.sex=[decoder decodeObjectForKey:@"sex"];
         self.has_kwai=[decoder decodeObjectForKey:@"has_kwai"];
-        
+        self.is_hidden=[decoder decodeObjectForKey:@"is_hidden"];
     }
     return self;
 }

KuDianProject/MainTab/KDPNavBar.m

@@ -24,7 +24,7 @@
         }];
         
         [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.top.mas_equalTo(self.mas_bottom).offset(1);
+            make.top.mas_equalTo(self.mas_bottom).offset(-1);
             make.left.right.mas_equalTo(0);
             make.height.mas_equalTo(1);
         }];

KuDianProject/PrefixHeader.pch

@@ -61,6 +61,10 @@
 #import "KDPGoodsModel.h"
 #import "KDPWebInteractionVC.h"
 #import "KDPProjectListVC.h"
+#import "KDPCollectHistoryVC.h"
+#import "KDPRecommendGoodCell.h"
+#import "KDPAccountModel.h"
+#import "KDPBalanceModel.h"
 
 // 类别
 #import "UIView+Gradient.h"

KuDianProject/Public/KDPublicMethod.h

@@ -22,6 +22,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark--计算高度
 + (CGFloat)getHeightByWidth:(CGFloat)width title:(NSString *)title font:(UIFont*)font;
+
++(BOOL)is_hiddenMoney;
 @end
 
 NS_ASSUME_NONNULL_END

KuDianProject/Public/KDPublicMethod.m

@@ -143,4 +143,14 @@
     CGFloat height = label.frame.size.height;
     return ceil(height);
 }
+
++(BOOL)is_hiddenMoney
+{
+    KDPAccountModel *model =[KDPAccountTool account];
+    if (model.is_hidden.integerValue == 1) {
+        return YES;
+    }
+    return NO;
+    
+}
 @end

KuDianProject/TOP/Controller/KDPBalanceModel.h

@@ -0,0 +1,34 @@
+//
+//  KDPBalanceModel.h
+//  KuDianProject
+//
+//  Created by 学丽 on 2019/7/10.
+//  Copyright © 2019 KDP. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface KDPBalanceModel : NSObject
+@property(nonatomic,copy) NSString *Id;
+@property(nonatomic,copy) NSString *message;
+@property(nonatomic,copy) NSString *create_time;
+@property(nonatomic,copy) NSString *type;//0 申请中  1 已通过  2未通过
+@property(nonatomic,copy) NSString *img;
+@property(nonatomic,copy) NSString *rebate;
+@property(nonatomic,copy) NSString *problem_url;//提现说明
+@property(nonatomic,copy) NSString *mode;//1佣金 2提现
+@property(nonatomic,copy) NSString *title;
+
+@property(nonatomic,copy)NSString*rebateMoney;
+@property(nonatomic,copy)NSString*yearAndMonth;
+@property(nonatomic,copy)NSString*totalOrder;
+
+
+
+
+
+@end
+
+NS_ASSUME_NONNULL_END

KuDianProject/TOP/Controller/KDPBalanceModel.m

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

KuDianProject/TOP/Controller/KDPGoodDetailVC.m

@@ -20,7 +20,7 @@
     
     
 }
-@property(nonatomic,strong)UIButton *collectButton;
+
 @property(nonatomic,strong)UIScrollView *detailBottonView;
 @property(nonatomic,strong)KDPDetailGoodInformationView *infoView;
 @property(nonatomic,strong)KDPSellingPointView *pointView;
@@ -62,7 +62,7 @@
     }
     NSLog(@"释放了------------");
 }
-#pragma makr---商品详情
+#pragma mark---商品详情
 -(void)getGoodDetail
 {
     if (self.model.goods_id.length<=0) {
@@ -78,7 +78,8 @@
         self.shopView.shopDic=self.detailModel.shop;
         [self loadRequestWeb];
         [LoadingView dismiss];
-        
+        [self isCollect];
+        [self saveHistoryModel:self.detailModel];
     } failure:^(NSError * _Nonnull error) {
         [LoadingView dismiss];
     }];
@@ -107,7 +108,7 @@
     }
 }
 
-#pragma makr---赋值。卖点
+#pragma mark---赋值。卖点
 -(void)good_points
 {
     CGFloat height =[KDPublicMethod getHeightByWidth:SCREEN_WIDTH-40 title:self.detailModel.goods_point font:[UIFont systemFontOfSize:13]];
@@ -262,9 +263,10 @@
     [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];
+    UIButton * collectBtn=[[UIButton alloc]initWithFrame:CGRectMake(self.view.width-47, KDStatusHeight+10, 30, 30)];
+    [collectBtn setImage:[UIImage imageNamed:@"detail_collection"] forState:UIControlStateNormal];
+    [collectBtn addTarget:self action:@selector(collectPageClickSel) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:collectBtn];
     
     
 }
@@ -322,10 +324,96 @@
 }
 
 
-#pragma makr----收藏
+#pragma mark----收藏
 -(void)detailCollectClickButton
 {
+    [LoadingView show];
+    NSString *collect=self.detailModel.is_collect;
+    if (collect.integerValue == 0) {//收藏
+        collect=@"1";
+    }else{
+        collect=@"0";
+    }
+    NSDictionary *param=@{@"is_add":collect,@"goods_id":self.detailModel.goods_id};
+    [KDPNetworkRequestHTTP postURL:collectURL params:param success:^(id  _Nonnull json) {
+        [LoadingView dismiss];
+        if ([json[@"flag"] integerValue] == 1) {
+            [MBProgressHUD showSuccess:@"收藏成功"];
+        }
+        self.detailModel.is_collect=collect;
+        [self isCollect];
+    } failure:^(NSError * _Nonnull error) {
+        [LoadingView dismiss];
+    }];
+}
+#pragma mark---判断是否收藏
+-(void)isCollect
+{
+    if (self.detailModel.is_collect.integerValue == 1) {
+        collectButton.selected = YES;
+    }else{
+        collectButton.selected=NO;
+    }
+}
+-(void)collectPageClickSel
+{
+    KDPCollectHistoryVC *histT=[[KDPCollectHistoryVC alloc]init];
+    [self.navigationController pushViewController:histT animated:YES];
+}
+
+#pragma mark---添加历史记录
+-(void)saveHistoryModel:(KDPGoodsModel *)model
+{
+    NSString *goods_id=@"";
+    if (model.goods_id.length>0) {
+        goods_id= model.goods_id;
+    }
+    NSString *price=@"";
+    if (model.price.length>0) {
+        price = model.price;
+    }
+    NSString *img=@"";
+    if (model.img.length>0) {
+        img =model.img;
+    }
+    
+    NSString *commission_rate=@"";
+    if (model.commission_rate.length>0) {
+        commission_rate = model.commission_rate;
+    }
+    NSString *commission_price=@"";
+    if (model.commission_price.length>0) {
+        commission_price = model.commission_price;
+    }
+    NSString *shop_title=@"";
+    if ([model.shop[@"title"] length]>0) {
+        shop_title = model.shop[@"title"];
+    }
+    NSString *title=@"";
+    if (model.title.length>0) {
+        title = model.title;
+    }
+    NSString *volume=@"";
+    if (model.volume.length>0) {
+        volume = model.volume;
+    }
+    
+    NSString *live_price=@"";
+    if (model.discount_price.length>0) {
+        live_price = model.discount_price;
+    }
+    
+    NSString *shop_type=@"";
+    if (model.shop_type.length>0) {
+        shop_type= model.shop_type;
+    }
     
+    NSDictionary *paramDic =@{@"title":title,@"img":img,@"goods_id":goods_id,@"volume":volume,@"shop_type":shop_type,@"shop_title":shop_title,@"price":price,@"commission_rate":commission_rate,@"discount_price":live_price,@"commission_price":commission_price};
+    [KDPNetworkRequestHTTP postURL:historyURL params:paramDic success:^(id  _Nonnull json) {
+        NSLog(@"%@",json);
+    } failure:^(NSError * _Nonnull error) {
+        
+    }];
 }
 
 @end

KuDianProject/TOP/Controller/KDPProjectListVC.h

@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface KDPProjectListVC : KDPMainViewController
 @property(nonatomic,strong)NSString *projectID;
-
+@property(nonatomic,strong)NSString *type;
 @end
 
 NS_ASSUME_NONNULL_END

KuDianProject/TOP/Controller/KDPProjectListVC.m

@@ -8,25 +8,114 @@
 
 #import "KDPProjectListVC.h"
 
-@interface KDPProjectListVC ()
-
+@interface KDPProjectListVC ()<UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout>
+@property(nonatomic,strong)UICollectionView *listview;
+@property(nonatomic,assign)NSInteger pageNum;
+@property(nonatomic,strong)NSMutableArray *dataArray;
 @end
 
 @implementation KDPProjectListVC
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    // Do any additional setup after loading the view.
+    self.pageNum=1;
+    [self.navBar addleftReturnButton:self selector:@selector(returnClickBtn)];
+    self.view.backgroundColor=[UIColor whiteColor];
+    [self.view addSubview:self.listview];
+    [self.listview mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(0);
+        make.top.mas_equalTo(KDNavBarHeight);
+        make.height.mas_equalTo(SCREEN_HEIGHT-KDNavBarHeight);
+        make.width.mas_equalTo(SCREEN_WIDTH);
+    }];
+    [self goodListProject];
+    
+}
+-(void)goodListProject
+{
+    [LoadingView show];
+    NSDictionary *dics =@{@"page":@(self.pageNum),@"id":self.projectID,@"type":self.type,@"start_price":@"",@"end_price":@"",@"start_tk_rate":@""};
+    [KDPNetworkRequestHTTP postURL:projectGoodURL params:dics success:^(id  _Nonnull json) {
+        [LoadingView dismiss];
+        if (self.pageNum == 1) {
+            [self.dataArray removeAllObjects];
+        }
+        NSArray *array =[NSArray yy_modelArrayWithClass:[KDPGoodsModel class] json:json[@"data"]];
+        [self.dataArray addObjectsFromArray:array];
+        [self.listview reloadData];
+    } failure:^(NSError * _Nonnull error) {
+        [LoadingView dismiss];
+    }];
+}
+#pragma mark---CollectDelegate&&DataSource
+-(UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    KDPRecommendGoodCell *recommC=[collectionView dequeueReusableCellWithReuseIdentifier:@"recomm" forIndexPath:indexPath];
+    recommC.model=self.dataArray[indexPath.row];
+    return recommC;
+}
+-(NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
+{
+    return self.dataArray.count;
+}
+-(NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
+{
+    return 1;
+}
+-(CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    return CGSizeMake(SCREEN_WIDTH, 121);
+}
+-(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    KDPGoodDetailVC *goodDetail=[[KDPGoodDetailVC alloc]init];
+    goodDetail.model=self.dataArray[indexPath.row];
+    [self.navigationController pushViewController:goodDetail animated:YES];
 }
 
-/*
-#pragma mark - Navigation
+-(void)returnClickBtn
+{
+    [self.navigationController popViewControllerAnimated:YES];
+}
+
+
+-(void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    self.navigationController.navigationBar.hidden=YES;
+    self.tabBarController.tabBar.hidden=YES;
+}
+-(void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    self.tabBarController.tabBar.hidden=NO;
+}
+
+-(UICollectionView *)listview
+{
+    if (!_listview) {
+        UICollectionViewFlowLayout *layout =[[UICollectionViewFlowLayout alloc]init];
+        layout.minimumLineSpacing=0;
+        layout.minimumInteritemSpacing=0;
+        
+        _listview=[[UICollectionView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT) collectionViewLayout:layout];
+        _listview.showsVerticalScrollIndicator=NO;
+        _listview.backgroundColor=[UIColor whiteColor];
+        _listview.delegate=self;
+        _listview.dataSource=self;
+        [_listview registerClass:[KDPRecommendGoodCell class] forCellWithReuseIdentifier:@"recomm"];
+        
+    }
+    return _listview;
+}
 
-// 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.
+-(NSMutableArray *)dataArray
+{
+    if (!_dataArray) {
+        _dataArray=[NSMutableArray array];
+        
+    }
+    return _dataArray;
 }
-*/
 
 @end

KuDianProject/TOP/Controller/KDPTopViewController.m

@@ -68,6 +68,8 @@
     [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) {
@@ -173,7 +175,13 @@
             }else if (model.click_type.integerValue == 3)
             {//x专题列表
                 KDPProjectListVC *listV=[[KDPProjectListVC alloc]init];
+                listV.navBar.navTitleLabel.text=model.title;
                 listV.projectID=model.click_param;
+                if (model.type.length == 0) {
+                    listV.type = @"module";
+                }else{
+                    listV.type = model.type;
+                }
                 [self.navigationController pushViewController:listV animated:YES];
             }
         };
@@ -186,7 +194,7 @@
     }
     KDPLiveEarningCell *earinCell =[collectionView dequeueReusableCellWithReuseIdentifier:liveEarningCell forIndexPath:indexPath];
     earinCell.orderNumgL.text=self.orderNumber;
-    earinCell.Forecastlabel.text=self.order_rebate_money;
+    earinCell.rebet_money=self.order_rebate_money;
     earinCell.liveDataBlock = ^{
         self.tabBarController.selectedIndex=2;
     };

KuDianProject/TOP/View/Detail/KDPDetailGoodInformationView.m

@@ -34,7 +34,7 @@
         [self addSubview:self.detailTitleL];
         
         
-        self.priceL=[[UILabel alloc]initWithFrame:CGRectMake(10, self.detailTitleL.bottom+8, 200, 36)];
+        self.priceL=[[UILabel alloc]initWithFrame:CGRectMake(10, self.detailTitleL.bottom+8, 300, 36)];
         self.priceL.textColor=[UIColor blackColor];
         self.priceL.font=[UIFont boldSystemFontOfSize:25];
         self.priceL.text=@"￥--";

KuDianProject/TOP/View/KDPLiveEarningCell.h

@@ -13,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface KDPLiveEarningCell : UICollectionViewCell
 @property(nonatomic,strong)UILabel *orderNumgL;//订单数量
 @property(nonatomic,strong)UILabel *Forecastlabel;//预估收益
+@property(nonatomic,strong)NSString *rebet_money;
 @property(nonatomic,strong)UIImageView *backImgV;
 
 @property(nonatomic,copy)void(^liveDataBlock)(void);

KuDianProject/TOP/View/KDPLiveEarningCell.m

@@ -16,7 +16,7 @@
         self.backImgV=[[UIImageView alloc]init];
         self.backImgV.image=[UIImage imageNamed:@"top_icon-backnew"];
         [self addSubview:self.backImgV];
-        
+        self.backImgV.userInteractionEnabled=YES;
         
         [self.backImgV mas_makeConstraints:^(MASConstraintMaker *make) {
             make.left.top.right.mas_equalTo(0);
@@ -73,6 +73,7 @@
     
     UIView *oderV=[[UIView alloc]init];
     oderV.backgroundColor=[UIColor clearColor];
+    oderV.userInteractionEnabled=YES;
     [self.backImgV addSubview:oderV];
     [oderV mas_makeConstraints:^(MASConstraintMaker *make) {
         make.width.mas_equalTo(114);
@@ -108,8 +109,12 @@
     
     UIButton *changeBtn =[[UIButton alloc]init];
     [changeBtn setImage:[UIImage imageNamed:@"open_hidden_icon"] forState:UIControlStateNormal];
-    [changeBtn addTarget:self action:@selector(changeBtnclickBtn) forControlEvents:UIControlEventTouchUpInside];
+    [changeBtn setImage:[UIImage imageNamed:@"close_hidden_icon"] forState:UIControlStateSelected];
+    changeBtn.userInteractionEnabled=YES;
+    changeBtn.selected=[KDPublicMethod is_hiddenMoney];
+    [changeBtn addTarget:self action:@selector(changeBtnclickBtn:) forControlEvents:UIControlEventTouchUpInside];
     [oderV addSubview:changeBtn];
+    
     [changeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(ordertitleL.mas_right).offset(0);
         make.top.mas_equalTo(0);
@@ -159,9 +164,34 @@
     }
 }
 #pragma mark---金额隐私切换
--(void)changeBtnclickBtn
+-(void)changeBtnclickBtn:(UIButton *)bnt
 {
+    KDPAccountModel *model=[KDPAccountTool account];
     
+    if (model.is_hidden.integerValue == 0) {
+        model.is_hidden = @"1";
+        bnt.selected=YES;
+        
+    }else{
+        model.is_hidden = @"0";
+        bnt.selected=NO;
+        
+    }
+    [KDPAccountTool saveAccount:model];
+    [self ishidden_rebat];
+}
+-(void)setRebet_money:(NSString *)rebet_money
+{
+    _rebet_money  = rebet_money;
+    [self ishidden_rebat];
+}
+-(void)ishidden_rebat
+{
+    if ([KDPublicMethod is_hiddenMoney]) {
+        self.Forecastlabel.text = @"****";
+    }else{
+        self.Forecastlabel.text=_rebet_money;
+    }
 }
 
 #pragma mark---

KuDianProject/TOP/View/KDPRecommendGoodCell.m

@@ -99,6 +99,17 @@
             make.left.mas_equalTo(20);
             make.top.right.bottom.mas_equalTo(0);
         }];
+        
+        
+        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(-1);
+            make.height.mas_equalTo(1);
+        }];
     }
     return self;
 }