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

KuDianProject/Earning/View/KDPEarningHeadView.m

@@ -50,15 +50,15 @@
     [imgv sd_setImageWithURL:[NSURL URLWithString:model.img]placeholderImage:[UIImage imageNamed:placholderImg]];
     [self.headImgBtn addSubview:imgv];
     
-    UIImageView *imgV=[[UIImageView alloc]init];
-    imgV.image=[UIImage imageNamed:@"LIVE"];
-    [backImgV addSubview:imgV];
-    [imgV mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(self.headImgBtn.mas_left).offset(5);
-        make.width.mas_equalTo(22);
-        make.height.mas_equalTo(9);
-        make.top.mas_equalTo(self.headImgBtn.mas_bottom).offset(-7);
-    }];
+//    UIImageView *imgV=[[UIImageView alloc]init];
+//    imgV.image=[UIImage imageNamed:@"LIVE"];
+//    [backImgV addSubview:imgV];
+//    [imgV mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.left.mas_equalTo(self.headImgBtn.mas_left).offset(5);
+//        make.width.mas_equalTo(22);
+//        make.height.mas_equalTo(9);
+//        make.top.mas_equalTo(self.headImgBtn.mas_bottom).offset(-7);
+//    }];
    
     
     UILabel *titleL =[[UILabel alloc]initWithFrame:CGRectMake(50, KDStatusHeight, SCREEN_WIDTH-100, 44)];

KuDianProject/Login/model/KDPAccountTool.m

@@ -50,12 +50,14 @@
  */
 + (BOOL)deleteAccount
 {
+   
     
     //加载模型
     KDPAccountModel *account=[NSKeyedUnarchiver unarchiveObjectWithFile:CCAccountPath];
     [MiPushSDK unsetAlias:account.token];
     [[NSUserDefaults standardUserDefaults]removeObjectForKey:UserPhone];
     [[NSUserDefaults standardUserDefaults]synchronize];
+    
     return [[NSFileManager defaultManager] removeItemAtPath:CCAccountPath error:nil];
     
 }

KuDianProject/Public/KDPNetworkRequestHTTP.m

@@ -81,6 +81,7 @@
         }
     }];
 }
+
 +(void)appOpenLogin
 {
     [[NSNotificationCenter defaultCenter]postNotificationName:@"exitLogin" object:nil];

KuDianProject/Public/KDPublicMethod.m

@@ -146,8 +146,10 @@
 
 +(BOOL)is_hiddenMoney
 {
-    KDPAccountModel *model =[KDPAccountTool account];
-    if (model.is_hidden.integerValue == 1) {
+    //存储第一次打开APP，是否显示客服页面，
+    NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
+    NSString *oneStep =[defaults objectForKey:@"hidden"];
+    if (oneStep.integerValue == 1) {
         return YES;
     }
     return NO;

KuDianProject/TOP/Controller/KDPDrawerVC.m

@@ -124,6 +124,7 @@
         _listTabView.backgroundColor=[UIColor clearColor];
         _listTabView.emptyDataSetDelegate = self;
         _listTabView.emptyDataSetSource = self; _listTabView.separatorStyle=UITableViewCellSeparatorStyleNone;
+        _listTabView.scrollEnabled=NO;
         if (@available(iOS 11.0, *)) {
             _listTabView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
         } else {

KuDianProject/TOP/Controller/KDPGoodDetailVC.m

@@ -146,7 +146,7 @@
     bottomView.backgroundColor=[UIColor whiteColor];
     [self.view addSubview:bottomView];
     
-    collectButton=[[UIButton alloc]initWithFrame:CGRectMake(0, 0, 86, KDTabBarHeight-KDTabBottomHeight-5)];
+    collectButton=[[UIButton alloc]initWithFrame:CGRectMake(0, 3, 86, 33)];
     collectButton.titleLabel.font=[UIFont systemFontOfSize:10];
    
     [collectButton setTitle:@"收藏" forState:UIControlStateNormal];
@@ -159,11 +159,10 @@
     [collectButton setButtonImageTitleStyle:ButtonImageTitleStyleCenterDown padding:3];
     [collectButton addTarget:self action:@selector(detailCollectClickButton) forControlEvents:UIControlEventTouchUpInside];
     [bottomView addSubview:collectButton];
-    
    
     
-    
     UIButton *buybutton =[[UIButton alloc]initWithFrame:CGRectMake(collectButton.right, 3, (SCREEN_WIDTH-96)/2, 39)];
+    
     buybutton.backgroundColor=[UIColor gradientOneColor:[UIColor colorWithHexString:@"#FF235F"] toColor:[UIColor colorWithHexString:@"#FF7676"] Width:(SCREEN_WIDTH-96)/2];
     [buybutton setTitle:@"购买样品" forState:UIControlStateNormal];
     [bottomView addSubview:buybutton];

KuDianProject/TOP/Controller/KDPTopViewController.m

@@ -139,15 +139,15 @@
         make.top.mas_equalTo(KDStatusHeight+4);
         make.height.width.mas_equalTo(32);
     }];
-    UIImageView *imgV=[[UIImageView alloc]init];
-    imgV.image=[UIImage imageNamed:@"LIVE"];
-    [self.navBar addSubview:imgV];
-    [imgV mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(self.headImgBtn.mas_left).offset(5);
-        make.width.mas_equalTo(22);
-        make.height.mas_equalTo(9);
-        make.top.mas_equalTo(self.headImgBtn.mas_bottom).offset(-7);
-    }];
+//    UIImageView *imgV=[[UIImageView alloc]init];
+//    imgV.image=[UIImage imageNamed:@"LIVE"];
+//    [self.navBar addSubview:imgV];
+//    [imgV mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.left.mas_equalTo(self.headImgBtn.mas_left).offset(5);
+//        make.width.mas_equalTo(22);
+//        make.height.mas_equalTo(9);
+//        make.top.mas_equalTo(self.headImgBtn.mas_bottom).offset(-7);
+//    }];
     [self.messageButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.mas_equalTo(-10);
         make.top.mas_equalTo(KDStatusHeight+10);
@@ -207,9 +207,6 @@
     }
     earinCell.orderNumgL.text=self.orderNumber;
     earinCell.rebet_money=self.order_rebate_money;
-//    earinCell.liveDataBlock = ^{
-//        self.tabBarController.selectedIndex=2;
-//    };
     return earinCell;
     
 }

KuDianProject/TOP/Drawer/Control/KDPCollectHistoryVC.m

@@ -22,7 +22,10 @@
     [super viewDidLoad];
     self.page_num = 1;
     [self setNavUI];
-    [self.navBar addleftReturnButton:self selector:@selector(returnClickBtn)];
+    UIButton *returnBtn =[[UIButton alloc]initWithFrame:CGRectMake(0, KDStatusHeight, 0, 0)];
+    [returnBtn setImage:[UIImage imageNamed:@"return_white"] forState:UIControlStateNormal];
+    [returnBtn addTarget:self action:@selector(returnClickBtn) forControlEvents:UIControlEventTouchUpInside];
+    self.navigationItem.leftBarButtonItem=[[UIBarButtonItem alloc]initWithCustomView:returnBtn];
     [self reqeustData];
 }
 -(void)reqeustData

KuDianProject/TOP/Drawer/View/KDPServiceView.m

@@ -35,7 +35,7 @@
         [backV addSubview:label];
         
         
-        UILabel *contentL=[[UILabel alloc]initWithFrame:CGRectMake(71, label.bottom+21, 140, 75)];
+        UILabel *contentL=[[UILabel alloc]initWithFrame:CGRectMake(69, label.bottom+21, 150, 75)];
         contentL.font=[UIFont systemFontOfSize:15];
         contentL.numberOfLines=3;
         contentL.textAlignment=NSTextAlignmentCenter;

KuDianProject/TOP/View/Detail/KDPDetailGoodInformationView.h

@@ -20,8 +20,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic,strong)UILabel *originalLabel;
 @property(nonatomic,copy)void(^returnBlock)(void);
 @property(nonatomic,strong)KDPGoodsModel *model;
+@property(nonatomic,strong)UILabel *profitsLabel;
 @property(nonatomic,strong)UIImageView *couponImgV;
 @property(nonatomic,strong)UILabel *couponPriceL;
+
 @end
 
 NS_ASSUME_NONNULL_END

KuDianProject/TOP/View/Detail/KDPDetailGoodInformationView.m

@@ -15,16 +15,19 @@
     self=[super initWithFrame:frame];
     if (self) {
         
-        self.imgView=[[SDCycleScrollView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 355+KDStatusHeight)];
+        self.imgView=[[SDCycleScrollView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 395+KDStatusHeight)];
         self.imgView.backgroundColor=[UIColor colorWithHexString:LineColor];
         [self addSubview:self.imgView];
         
-       
+        UIView*backV=[[UIView alloc]initWithFrame:CGRectMake(0, self.imgView.height-50, SCREEN_WIDTH, 50)];
+        backV.backgroundColor=[UIColor colorWithHexString:@"#444444"];
+        [self addSubview:backV];
+        
         
         
-        self.shopImgV=[[UIImageView alloc]initWithFrame:CGRectMake(10, self.imgView.bottom+14, 20, 20)];
-        self.shopImgV.image=[UIImage imageNamed:@"taobao_icon"];
-        [self addSubview:self.shopImgV];
+//        self.shopImgV=[[UIImageView alloc]initWithFrame:CGRectMake(10, self.imgView.bottom+14, 20, 20)];
+//        self.shopImgV.image=[UIImage imageNamed:@"taobao_icon"];
+//        [self addSubview:self.shopImgV];
         
         self.detailTitleL=[[UILabel alloc]initWithFrame:CGRectMake(10, self.imgView.bottom+14, SCREEN_WIDTH-20, 45)];
         self.detailTitleL.numberOfLines=0;
@@ -34,17 +37,37 @@
         [self addSubview:self.detailTitleL];
         
         
-        self.priceL=[[UILabel alloc]initWithFrame:CGRectMake(10, self.detailTitleL.bottom+8, 300, 36)];
-        self.priceL.textColor=[UIColor blackColor];
+        self.priceL=[[UILabel alloc]initWithFrame:CGRectMake(10, 0, 300, 50)];
+        self.priceL.textColor=[UIColor whiteColor];
         self.priceL.font=[UIFont boldSystemFontOfSize:25];
         self.priceL.text=@"￥--";
-        [self addSubview:self.priceL];
         
-        self.originalLabel=[[UILabel alloc]initWithFrame:CGRectMake(10, self.priceL.bottom+5, 100, 14)];
-        self.originalLabel.textColor=[UIColor colorWithHexString:@"#A9A9A9"];
+        [backV addSubview:self.priceL];
+        [self.priceL mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.height.mas_equalTo(50);
+            make.left.mas_equalTo(10);
+            make.top.mas_equalTo(0);
+        }];
+        
+        self.originalLabel=[[UILabel alloc]initWithFrame:CGRectMake(self.priceL.right+10, 0, 100, 50)];
+        self.originalLabel.textColor=[UIColor whiteColor];
         self.originalLabel.font=[UIFont systemFontOfSize:10];
-        [self addSubview:self.originalLabel];
+        [backV addSubview:self.originalLabel];
+        [self.originalLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.mas_equalTo(self.priceL.mas_right).offset(5);
+            make.height.mas_equalTo(45);
+            make.top.mas_equalTo(5);
+        }];
         
+        self.profitsLabel=[[UILabel alloc]initWithFrame:CGRectMake(backV.width-88, 11, 78, 28)];
+        self.profitsLabel.text=@"利润  --%";
+        self.profitsLabel.textColor=[UIColor whiteColor];
+        self.profitsLabel.font=[UIFont systemFontOfSize:16];
+        self.profitsLabel.backgroundColor=[UIColor gradientOneColor:[UIColor colorWithHexString:@"#FF235F"] toColor:[UIColor colorWithHexString:@"#FF7676"] Width:78];
+        self.profitsLabel.layer.cornerRadius=6;
+        self.profitsLabel.layer.masksToBounds=YES;
+        self.profitsLabel.textAlignment=NSTextAlignmentCenter;
+        [backV addSubview:self.profitsLabel];
         //原件
         NSString *textStr =@"￥---";
         
@@ -53,17 +76,18 @@
         NSMutableAttributedString *attribtStr = [[NSMutableAttributedString alloc]initWithString:textStr attributes:attribtDic];
         self.originalLabel.attributedText=attribtStr;
         
-        self.volumeL=[[UILabel alloc]initWithFrame:CGRectMake(SCREEN_WIDTH-150, self.originalLabel.top, 140, 14)];
+        self.volumeL=[[UILabel alloc]initWithFrame:CGRectMake(SCREEN_WIDTH-150, self.detailTitleL.bottom+5, 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.couponImgV.frame=CGRectMake(self.detailTitleL.left, self.volumeL.top-1, 60, 16);
         self.couponPriceL.frame=CGRectMake(20, 0, 40, 16);
         
         
@@ -88,27 +112,20 @@
     if (model.title.length<=0) {
         return;
     }
-    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.detailTitleL.attributedText=[KDPublicMethod sethanggaoWithStr:[NSString stringWithFormat:@"%@",model.title] linSpacing:5];
     
     self.volumeL.text=[NSString stringWithFormat:@"月销 %@",model.volume];
     
-    NSString *timetitle= [NSString stringWithFormat:@"￥%@/利润%@",model.discount_price,model.commission_rate];
-    NSString *prices =[NSString stringWithFormat:@"￥%@/",model.discount_price];
+    NSString *timetitle= [NSString stringWithFormat:@"利润 %@",model.commission_rate];
+    
     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)];
+    [timestr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12] range:NSMakeRange(0,3)]; //设置字体
+    self.profitsLabel.attributedText=timestr;
+    
+    self.priceL.text=[NSString stringWithFormat:@"￥%@",model.discount_price];
     
-    self.priceL.attributedText=timestr;
     //原价
     NSString *textStr =[NSString stringWithFormat:@"￥%@",model.price];
-    
     //中划线
     NSDictionary *attribtDic = @{NSStrikethroughStyleAttributeName: [NSNumber numberWithInteger:NSUnderlineStyleSingle]};
     NSMutableAttributedString *attribtStr = [[NSMutableAttributedString alloc]initWithString:textStr attributes:attribtDic];
@@ -120,7 +137,6 @@
     [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;

KuDianProject/TOP/View/KDPLiveEarningCell.m

@@ -175,18 +175,19 @@
 #pragma mark---金额隐私切换
 -(void)changeBtnclickBtn:(UIButton *)bnt
 {
-    KDPAccountModel *model=[KDPAccountTool account];
-    
-    if (model.is_hidden.integerValue == 0) {
-        model.is_hidden = @"1";
+    //存储第一次打开APP，是否显示客服页面，
+    NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
+    NSString *oneStep =[defaults objectForKey:@"hidden"];
+    if (oneStep.integerValue == 0) {
+        [defaults setValue:@"1" forKey:@"hidden"];
         bnt.selected=YES;
         
     }else{
-        model.is_hidden = @"0";
+        [defaults setValue:@"0" forKey:@"hidden"];
         bnt.selected=NO;
         
     }
-    [KDPAccountTool saveAccount:model];
+    [defaults synchronize];
     [self ishidden_rebat];
 }
 -(void)setRebet_money:(NSString *)rebet_money