提交一下给小西

KXCardHelp.xcodeproj/project.pbxproj

@@ -190,6 +190,7 @@
 		4AAC109221B8F9D4004BE83C /* XJCustomWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AAC109121B8F9D4004BE83C /* XJCustomWebViewController.m */; };
 		4AAC10AD21B908DF004BE83C /* WWCheckCardListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AAC10AC21B908DF004BE83C /* WWCheckCardListViewController.m */; };
 		4AAC10B021B914B2004BE83C /* WWCheckCardListDetailVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AAC10AF21B914B2004BE83C /* WWCheckCardListDetailVC.m */; };
+		4AAC10B321BA5A3F004BE83C /* KXInstallmentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AAC10B121BA5A3E004BE83C /* KXInstallmentViewController.m */; };
 		5B982B19B445B1CF86AEC93C /* libPods-KXCardHelp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E6ACD581411C8CD82F0EE3FF /* libPods-KXCardHelp.a */; };
 /* End PBXBuildFile section */
 
@@ -536,6 +537,8 @@
 		4AAC10AC21B908DF004BE83C /* WWCheckCardListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WWCheckCardListViewController.m; sourceTree = "<group>"; };
 		4AAC10AE21B914B2004BE83C /* WWCheckCardListDetailVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WWCheckCardListDetailVC.h; sourceTree = "<group>"; };
 		4AAC10AF21B914B2004BE83C /* WWCheckCardListDetailVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WWCheckCardListDetailVC.m; sourceTree = "<group>"; };
+		4AAC10B121BA5A3E004BE83C /* KXInstallmentViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KXInstallmentViewController.m; sourceTree = "<group>"; };
+		4AAC10B221BA5A3E004BE83C /* KXInstallmentViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KXInstallmentViewController.h; sourceTree = "<group>"; };
 		E6ACD581411C8CD82F0EE3FF /* libPods-KXCardHelp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-KXCardHelp.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -1835,6 +1838,8 @@
 		4AAC103C21B508D1004BE83C /* Controller */ = {
 			isa = PBXGroup;
 			children = (
+				4AAC10B221BA5A3E004BE83C /* KXInstallmentViewController.h */,
+				4AAC10B121BA5A3E004BE83C /* KXInstallmentViewController.m */,
 				4AAC103D21B508D1004BE83C /* WWCheckHomeViewController.h */,
 				4AAC103E21B508D1004BE83C /* WWCheckHomeViewController.m */,
 				4AAC105921B6470B004BE83C /* WWCheckAddCardViewController.h */,
@@ -2195,6 +2200,7 @@
 				4AAC10AD21B908DF004BE83C /* WWCheckCardListViewController.m in Sources */,
 				119A9FE72138E0350020C78E /* LVKBHomeMessageViewController.m in Sources */,
 				119AA0182138E0350020C78E /* LVKBPersonRecordTableViewCell.m in Sources */,
+				4AAC10B321BA5A3F004BE83C /* KXInstallmentViewController.m in Sources */,
 				4AAC107121B7709C004BE83C /* WWDatePickerView.m in Sources */,
 				119A9FDC2138E0350020C78E /* LVKBCreditBankAuthenticationViewController.m in Sources */,
 				119A9FFA2138E0350020C78E /* KXNewsWebViewController.m in Sources */,

KXCardHelp.xcworkspace/xcuserdata/wangwei.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -13,37 +13,5 @@
             stopOnStyle = "0">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KXCardHelp/Main/CheckPage/CreditCardManager/Mine/Controller/WWCheckCardListDetailVC.m"
-            timestampString = "565840923.926773"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "139"
-            endingLineNumber = "139"
-            landmarkName = "-clickCellButton:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KXCardHelp/Main/CheckPage/CreditCardManager/Mine/Controller/WWCheckCardListDetailVC.m"
-            timestampString = "565840923.9273961"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "136"
-            endingLineNumber = "136"
-            landmarkName = "-clickCellButton:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

KXCardHelp/AppDelegate/HFile/LVKBDefineHeader.h

@@ -38,7 +38,7 @@
 #define KXAlertTextDate @"KXAlertTextDate"
 
 //渠道号
-#define CHCHANNEL_ID        @"2002"//--
+#define CHCHANNEL_ID        @"2008"//--
 #define HomeAdvID           @"17"//弹窗
 #define AppdelegateAdvID    @"18"//启动图
 
@@ -48,8 +48,8 @@
 #define  UMAPP_KEY  @"5b7e1f9fb27b0a6573000010"//--
 #define  BUGLY_ID   @"2b8be66cb7"//--
 #define APPLE_APP_ID @"1433874143"//--
-#define BAIDU_APP_ID @"fLeeuCReuMCTlBFeQzIKjXhm"//--
-#define BAIDU_SECRET @"98fXjaxW73HHCt4QhYmhfCdCu4md2NgK"//--
+#define BAIDU_APP_ID @"RmyUkQQ5zGPztDATQAcb8LRB"//--
+#define BAIDU_SECRET @"v05kUTuG3gwvXKdgLoXTbMl7RCgOWz0b"//--
 //公钥
 #define RSAPublicKey @"MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4G6ZCXm4oFZD4cW3wHxUPBfeEKJJmfyGruOMwvT4W/r6FbD1ptEPrcnCDjmhqXwA2egxEWWojgXwxd7/JXFYRxiahPcwQBK4UfY7C7evpwp5J2v/v6FMeV6k/DWaVHX6z7un8W12E6LEosAFL+JLF11y3cXaHwITkQMToVhfz9QIDAQAB"
 

KXCardHelp/AppDelegate/HFile/LVKBURLHeader.h

@@ -12,12 +12,12 @@
 #define CHURLHeader_h
 
 //测试环境
-#define BaseURL  @"http://182.92.118.1:5240"
+//#define BaseURL  @"http://182.92.118.1:5240"
 //static NSString *const advURL = @"http://182.92.118.1:8070/api";   //广告测试URL
 
 
 //真实环
-//#define BaseURL     @"https://api.lanjiekuan.com"
+#define BaseURL     @"https://api.lanjiekuan.com"
 static NSString *const advURL = @"http://ads.726p.com/api";   //广告线上URL
 
 /**********************************************************/

KXCardHelp/Base/Tab/LVKBBaseTabBarViewController.m

@@ -23,7 +23,7 @@
     [self.tabBar setBarTintColor:[UIColor whiteColor]];
     
     NSNumber *num=[[NSUserDefaults standardUserDefaults]objectForKey:IOS_TYPE];
-    if (num &&[num integerValue]==1) {   //0
+    if (num &&[num integerValue]==0) {   //0
         [self initViewControllers];
         self.initViewFlag=YES;
     }
@@ -60,7 +60,7 @@
         [[NSUserDefaults standardUserDefaults]setObject:ios forKey:IOS_TYPE];
         [[NSUserDefaults standardUserDefaults] synchronize];
         if (!self.initViewFlag) {
-            if ([ios integerValue]==1) {   //0
+            if ([ios integerValue]==0) {   //0
                 [self initViewControllers];
             }else{
                 [self initViewControllers2];

KXCardHelp/Main/CheckPage/CreditCardManager/HomePage/Controller/KXInstallmentViewController.h

@@ -0,0 +1,13 @@
+//
+//  KXInstallmentViewController.h
+//  CAISHEN
+//
+//  Created by jcymac on 2017/11/9.
+//  Copyright © 2017年 kuxuan. All rights reserved.
+//
+
+#import "LVKBBaseViewController.h"
+
+@interface KXInstallmentViewController : LVKBBaseViewController
+
+@end

KXCardHelp/Main/CheckPage/CreditCardManager/HomePage/Controller/KXInstallmentViewController.m

@@ -0,0 +1,384 @@
+//
+//  KXInstallmentViewController.m
+//  CAISHEN
+//
+//  Created by jcymac on 2017/11/9.
+//  Copyright © 2017年 kuxuan. All rights reserved.
+//
+
+#import "KXInstallmentViewController.h"
+#import <ReactiveCocoa/ReactiveCocoa.h>
+
+@interface KXInstallmentViewController ()<UITableViewDataSource,UITableViewDelegate,UITextFieldDelegate>
+@property(nonatomic,strong)UITableView *tableView;
+
+@property(nonatomic,strong)UIView *headView;
+@property(nonatomic,strong)UIView *footerView;
+@property(nonatomic,copy)NSString *result;
+@property(nonatomic,strong)NSArray *array;
+@property(nonatomic,strong)UITextField *money;
+@property(nonatomic,strong)UITextField *date;
+@property(nonatomic,strong)UITextField *rate;
+@property(nonatomic,strong)UIButton *btn;
+@property(nonatomic,strong)UILabel *lableDown;
+@property(nonatomic,strong)UIView *leftView;
+@property(nonatomic,strong)UIView *RightView;
+@property(nonatomic,strong)UILabel *paymentlLabel;
+@property(nonatomic,strong)UILabel *repaymentLabel;
+
+@property(nonatomic,assign)float resultInt;
+@end
+
+@implementation KXInstallmentViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    [self createNavBar];
+    [self setupView];
+    [self setPosition];
+}
+-(void)setPosition{
+    //左边数字
+    CGRect leftRect=self.leftView.bounds;
+    leftRect.size.height=leftRect.size.height/2;
+    leftRect.origin.y=leftRect.size.height;
+    self.paymentlLabel.frame=leftRect;
+    //右边数字
+    CGRect rightRect=self.RightView.bounds;
+    rightRect.size.height=rightRect.size.height/2;
+    rightRect.origin.y=rightRect.size.height;
+    self.repaymentLabel.frame=rightRect;
+}
+
+
+-(UILabel *)paymentlLabel{//左边那个
+    if (!_paymentlLabel) {
+        _paymentlLabel=[[UILabel alloc]init];
+        _paymentlLabel.textColor=[UIColor CHColorWithHex:0x000000];
+        _paymentlLabel.font=[UIFont systemFontOfSize:26/2];
+        _paymentlLabel.textAlignment=NSTextAlignmentCenter;
+        _paymentlLabel.text=@"0";
+    }
+    return _paymentlLabel;
+    
+}
+
+-(UILabel *)repaymentLabel{//右边那个
+    if (!_repaymentLabel) {
+        _repaymentLabel=[[UILabel alloc]init];
+        _repaymentLabel.textColor=[UIColor CHColorWithHex:0x000000];
+        _repaymentLabel.font=[UIFont systemFontOfSize:26/2];
+        _repaymentLabel.textAlignment=NSTextAlignmentCenter;
+        _repaymentLabel.text=@"0";
+    }
+    return _repaymentLabel;
+}
+
+-(UIView *)leftView{
+    if (!_leftView) {
+        _leftView=[[UIView alloc]initWithFrame:CGRectMake(0, 100, SCREEN_WIDTH/2, 80)];
+//        _leftView.backgroundColor=[UIColor redColor];
+        //支付利息(元)
+        CGRect rect=_leftView.bounds;
+        rect.size.height=rect.size.height/2;
+        UILabel *label=[[UILabel alloc]initWithFrame:rect];
+        label.text=@"支付利息(元)";
+        label.textAlignment=NSTextAlignmentCenter;
+        label.font=[UIFont systemFontOfSize:22/2];
+        label.textColor=[UIColor CHColorWithHex:0x414141];
+        [_leftView addSubview:label];
+    }
+    return _leftView;
+}
+
+-(UIView *)RightView{
+    if (!_RightView) {
+        _RightView=[[UIView alloc]initWithFrame:CGRectMake(SCREEN_WIDTH/2, 100, SCREEN_WIDTH/2, 80)];
+        CGRect rect=_RightView.bounds;
+        rect.size.height=rect.size.height/2;
+        UILabel *label=[[UILabel alloc]initWithFrame:rect];
+        label.text=@"还款总额(元)";
+        label.textAlignment=NSTextAlignmentCenter;
+        label.font=[UIFont systemFontOfSize:22/2];
+        label.textColor=[UIColor CHColorWithHex:0x414141];
+        [_RightView addSubview:label];
+    }
+    return _RightView;
+}
+
+
+-(UIButton *)btn{
+    if (!_btn) {
+        _btn= [UIButton buttonWithType:UIButtonTypeCustom];
+        _btn.frame=CGRectMake(0, 0, 484/2, 80/2);
+        _btn.backgroundColor=[UIColor  baseColor];
+        [_btn setTitle:@"我要分期" forState:UIControlStateNormal];
+        _btn.titleLabel.font=[UIFont systemFontOfSize:FITSIZE(14)];
+        [_btn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        _btn.layer.cornerRadius = 80/4;
+        [_btn addTarget:self action:@selector(individualIncomeGo:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _btn;
+}
+
+
+
+-(void)individualIncomeGo:(UIButton *)sender{
+    //总利息
+    self.paymentlLabel.text=[self individualIncomeSalary:self.money.text Threshold:self.date.text];
+    //还款总额
+    self.repaymentLabel.text=[NSString stringWithFormat:@"%.2f",([self.paymentlLabel.text floatValue]+[self.money.text intValue])];
+    //每月月供
+    self.lableDown.text=[NSString stringWithFormat:@"%.2f",([self.repaymentLabel.text floatValue]/[self.date.text intValue])];
+}
+-(NSString * )individualIncomeSalary:(NSString *)money Threshold:(NSString *)date{
+    NSInteger moneyInt=[money intValue];
+    NSInteger dateInt=[date intValue];
+    NSString *result=[NSString stringWithFormat:@"%.2f",moneyInt*dateInt*0.0048];
+    return result;
+}
+-(NSArray *)array{
+    if (!_array) {
+        _array= [NSArray arrayWithObjects:
+                @{@"name":@"分期金额",@"placeholder":@"请输入金额"},
+                @{@"name":@"分期期数",@"placeholder":@"请输入期数"},
+                @{@"name":@"月利率(%)",@"text":@"0.48"},nil];
+    }
+    return _array;
+}
+
+-(NSString *)result{
+    return [NSString stringWithFormat:@"%.2f",self.resultInt];
+    
+}
+- (CGFloat)tableView:(UITableView*)tableView heightForHeaderInSection:(NSInteger)section{
+    return 30;
+    
+}
+
+
+- (nullable UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
+    UIView *header=[[UIView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 30)];
+    UILabel *label=[[UILabel alloc]initWithFrame:CGRectMake(34/2, 0, SCREEN_WIDTH-34, 30)];
+    label.text=@"请输入分期信息";
+    label.font=[UIFont systemFontOfSize:26/2];
+    label.textColor=[UIColor CHColorWithHex:0x9a9a9a];
+    [header addSubview:label];
+    return header;
+}
+
+-(UIView *)footerView{
+    if (!_footerView) {
+        _footerView=[[UIView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 200)];
+        [_footerView addSubview:self.btn];
+        self.btn.center=_footerView.center;
+    }
+    
+    return _footerView;
+}
+
+-(UILabel *)lableDown{
+    if (!_lableDown) {
+        _lableDown=[[UILabel alloc]init];
+        _lableDown.text=@"0";
+        _lableDown.font=[UIFont systemFontOfSize:40/2];
+        _lableDown.textColor=[UIColor CHColorWithHex:0xe42a4a];
+        _lableDown.textAlignment=NSTextAlignmentCenter;
+    }
+    return _lableDown;
+}
+-(UIView *)headView{
+    if (!_headView) {
+        _headView=[[UIView alloc]initWithFrame:CGRectMake(0, NavBarHeight, SCREEN_WIDTH, 200)];
+        _headView.backgroundColor=[UIColor whiteColor];
+        UILabel *lableTop=[[UILabel alloc]initWithFrame:CGRectMake(0, 50/2, SCREEN_WIDTH, 30)];
+        lableTop.text=@"每月月供(元)";
+        lableTop.font=[UIFont systemFontOfSize:26/2];
+        lableTop.textColor=[UIColor CHColorWithHex:0x414141];
+        lableTop.textAlignment=NSTextAlignmentCenter;
+        self.lableDown.frame=CGRectMake(0, lableTop.frame.origin.y+lableTop.frame.size.height+10, SCREEN_WIDTH, 30);
+        [_headView addSubview:lableTop];
+        [_headView addSubview:self.lableDown];
+        
+        
+    }
+    return _headView;
+}
+-(UITableView *)tableView{
+    if (!_tableView) {
+        _tableView=[[UITableView alloc]initWithFrame:CGRectMake(0, NavBarHeight,SCREEN_WIDTH, SCREEN_HEIGHT - NavBarHeight) style:UITableViewStylePlain];
+        _tableView.tableHeaderView=self.headView;
+        _tableView.tableFooterView=self.footerView;
+        _tableView.separatorStyle=UITableViewCellSeparatorStyleNone;
+        _tableView.delegate=self;
+        _tableView.dataSource=self;
+        [_tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:@"individualIncome"];
+    }
+    return _tableView;
+}
+
+
+
+
+-(void)setupView{
+    [self.view addSubview:self.tableView];
+    [self.headView addSubview:self.leftView];
+    [self.headView addSubview:self.RightView];
+    [self.leftView addSubview:self.paymentlLabel];
+    [self.RightView addSubview:self.repaymentLabel];
+    
+}
+-(void)createNavBar{
+    self.navigationBar.backgroundColor = [UIColor checkBaseColor];
+    [self.navigationBar setNavTitle:@"分期计算器"];
+    self.navigationBar.navTitleLabel.textColor = [UIColor whiteColor];
+    self.navigationBar.navTitleLabel.font = [UIFont fontWithName:@"PingFangSC-Medium" size: 18];
+    UIButton *leftBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 40, 40)];
+    [leftBtn setImage:[UIImage imageNamed:@"back_black"] forState:UIControlStateNormal];
+    [[leftBtn rac_signalForControlEvents:UIControlEventTouchUpInside]subscribeNext:^(id x) {
+        [self.navigationController popViewControllerAnimated:YES];
+    }];
+    [self.navigationBar setCustomLeftButtons:@[leftBtn]];
+}
+
+//RAC 添加信号，处理计算按钮是否可点击
+- (void)addSingal {
+    UITextField *textField1 = (UITextField *)[self.view viewWithTag:1000+0];
+    UITextField *textField2 = (UITextField *)[self.view viewWithTag:1000+1];
+    UITextField *textField3 = (UITextField *)[self.view viewWithTag:1000+2];
+    
+    if (!(textField1 && textField2)) {
+        return;
+    }
+    
+    RACSignal *textSingal1 = [textField1.rac_textSignal map:^id(NSString * value) {
+        return @(value.length > 0);
+    }];
+    RACSignal *textSingal2 = [textField2.rac_textSignal map:^id(NSString * value) {
+        return @(value.length > 0);
+    }];
+    RACSignal *textSingal3 = [textField3.rac_textSignal map:^id(NSString * value) {
+        return @(value.length > 0);
+    }];
+    
+    RACSignal *calculActiveSignal = [RACSignal
+                                     combineLatest:@[
+                                                     textSingal1,
+                                                     textSingal2,
+                                                     textSingal3
+                                                     ]
+                                     reduce:^id(NSNumber *textSingal1, NSNumber *textSingal2, NSNumber *textSingal3) {
+                                         return @([textSingal1 boolValue] && [textSingal2 boolValue] && [textSingal3 boolValue]);
+                                     }];
+    
+    [calculActiveSignal subscribeNext:^(NSNumber *calculEnble) {
+        self.btn.enabled = [calculEnble boolValue];
+        self.btn.backgroundColor = [UIColor checkBaseColor];
+        [self.btn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    }];
+}
+
+
+-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(nonnull NSIndexPath *)indexPath{
+    return 98/2;
+}
+
+
+#pragma mark UITableViewDataSource
+
+-(void) tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if([indexPath row] == ((NSIndexPath*)[[tableView indexPathsForVisibleRows] lastObject]).row){
+        [self addSingal];
+    }
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
+    return self.array.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
+    UITableViewCell *cell=[tableView dequeueReusableCellWithIdentifier:@"individualIncome"];
+    if (!cell) {
+        
+        cell=[[UITableViewCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"individualIncome"];
+    }
+    NSDictionary *dic=self.array[indexPath.row];
+    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+    UITextField *text=[[UITextField alloc]initWithFrame:CGRectMake(34/2,0, SCREEN_WIDTH-34,cell.bounds.size.height-1)];
+    text.tag = 1000 + indexPath.row;
+    text.delegate=self;
+    text.placeholder=dic[@"placeholder"];
+    text.text=dic[@"text"];
+    [text setFont:[UIFont systemFontOfSize:26/2]];
+    text.textColor=[UIColor CHColorWithHex:0x414141];
+    text.keyboardType=UIKeyboardTypeNumberPad;
+    text.textAlignment=NSTextAlignmentRight;
+    UILabel *label=[[UILabel alloc]initWithFrame:CGRectMake(0, 0,100, text.bounds.size.height)];
+    label.text=dic[@"name"];
+    [label setFont:[UIFont systemFontOfSize:26/2]];
+    label.textColor=[UIColor CHColorWithHex:0x414141];
+    text.leftView=label;
+    text.leftViewMode=UITextFieldViewModeAlways;
+    [cell addSubview:text];
+    //自定义下划线
+    if (indexPath.row<2) {
+        UIView *separator=[[UIView alloc]initWithFrame:CGRectMake(34/2, cell.bounds.size.height-0.5, SCREEN_WIDTH-34, 0.5)];
+        separator.backgroundColor=[UIColor CHColorWithHex:0xe6e8e6];
+        [cell addSubview:separator];
+    }
+//    else{
+//        cell.userInteractionEnabled=NO;
+//    }
+    //计算数据
+    switch (indexPath.row) {
+        case 0:
+            self.money=text;
+            break;
+        case 1:
+            self.date=text;
+            break;
+        case 2:
+            text.keyboardType=UIKeyboardTypeDecimalPad;
+            self.rate=text;
+    }
+    
+    
+    return cell;
+}
+
+//只允许输入数字和点
+- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string{
+    if (range.length==1) {
+        return YES;
+    }
+    NSLog(@"aa");
+    //有点
+    if (textField==self.rate) {
+        if (([textField.text rangeOfString:@"."].location!=NSNotFound )&& ([string isEqualToString:@"."])) {
+            return NO;
+        }
+        if ([@"0123456789." rangeOfString:string].location == NSNotFound) {
+            return NO;
+        }
+        if([textField.text length]>10){
+            return NO;
+        }
+    }else{
+    
+        if ([@"0123456789" rangeOfString:string].location == NSNotFound) {
+            return NO;
+        }
+        if([textField.text length]>10){
+            return NO;
+        }
+        
+    }
+    return YES;
+}
+
+
+
+
+@end

KXCardHelp/Main/CheckPage/CreditCardManager/HomePage/Controller/WWCheckAddCardViewController.h

@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface WWCheckAddCardViewController : LVKBBaseViewController
 
-@property (nonatomic, copy)void(^addCardSuccessBlock)(void);
+//@property (nonatomic, copy)void(^addCardSuccessBlock)(void);
 
 @end
 

KXCardHelp/Main/CheckPage/CreditCardManager/HomePage/Controller/WWCheckAddCardViewController.m

@@ -20,7 +20,7 @@ static NSString *ScanCellID = @"ScanCellID";
 static NSString *TFCellID = @"TFCellID";
 static NSString *DateCellID = @"DateCellID";
 
-@interface WWCheckAddCardViewController ()<UITableViewDelegate, UITableViewDataSource, UITextFieldDelegate, WWDatePickerViewDelegate>
+@interface WWCheckAddCardViewController ()<UITableViewDelegate, UITableViewDataSource, UITextFieldDelegate, WWDatePickerViewDelegate, tapImageDelegate>
 
 @property (nonatomic, strong)UITableView *tableView;            //tableView
 @property (nonatomic, strong)NSMutableArray *dataArray;         //数据源
@@ -75,6 +75,7 @@ static NSString *DateCellID = @"DateCellID";
         cell.textField.placeholder = palceholderArray[indexPath.row];
         cell.textField.tag = indexPath.row + 1000;
         cell.textField.delegate = self;
+        cell.delegate = self;
         return cell;
     } else if (indexPath.row == 3 || indexPath.row == 4) {
         WWCheckAddCardDateCell *cell = [tableView dequeueReusableCellWithIdentifier:DateCellID forIndexPath:indexPath];
@@ -129,14 +130,15 @@ static NSString *DateCellID = @"DateCellID";
     
     [LVKBHttp post:checkAddCardRequest params:self.paramaDict success:^(id json) {
         NSLog(@"%@", json);
-        self.addCardSuccessBlock();
+        [self.navigationController popViewControllerAnimated:YES];
     } failure:^(NSError *error) {
         NSLog(@"%@", error);
     }];
 }
 
 #pragma mark - 选择日期
-- (void)onClickDataPicker:(int)state{    
+- (void)onClickDataPicker:(int)state{
+    [self.view endEditing:YES];
     NSMutableArray *dateStrArr = [[NSMutableArray alloc] init];
     for (int i = 1; i < 32; i ++) {
         NSString *dateStr = [NSString stringWithFormat:@"%d日", i];
@@ -217,4 +219,43 @@ static NSString *DateCellID = @"DateCellID";
     return _paramaDict;
 }
 
+#pragma mark - 点击扫描信用卡  百度ocr
+- (void)tapImageAction {
+    if(![PublicFunction isCanUseCamera]){
+        [self showMessage:@"没有相机权限,请前往设置开启"];
+        return;
+    }
+    UIViewController * vc = [AipCaptureCardVC ViewControllerWithCardType:CardTypeBankCard andImageHandler:^(UIImage *image) {
+        [self dismissViewControllerAnimated:YES completion:nil];
+        
+        [[AipOcrService shardService] detectBankCardFromImage:image successHandler:^(id result) {
+            if ([NSThread currentThread]!=[NSThread mainThread]) {
+                dispatch_sync(dispatch_get_main_queue(), ^{
+
+                    NSString *bankNum = result[@"result"][@"bank_card_number"];  //卡号
+                    NSString *bankName = result[@"result"][@"bank_name"];        //所属银行
+                    
+                    UITextField *bankNumTF = [self.view viewWithTag:1000];
+                    UITextField *bankNameTF = [self.view viewWithTag:1001];
+                    
+                    bankNumTF.text = bankNum;
+                    bankNameTF.text = bankName;
+                    
+                    [self.paramaDict setValue:bankNum forKey:@"card_no"];
+                    [self.paramaDict setValue:bankName forKey:@"bank_name"];
+                    
+                });
+            } else {
+                //
+            }
+            
+        } failHandler:^(NSError *err) {
+            [self showMessage:@"识别失败"];
+        }];
+    }];
+    
+    [self presentViewController:vc animated:YES completion:nil];
+}
+
+
 @end

KXCardHelp/Main/CheckPage/CreditCardManager/HomePage/Controller/WWCheckExpenseCountVC.m

@@ -20,6 +20,7 @@ static NSString *cellID = @"cellID";
 @property (nonatomic, strong)UITableView *tableView;          //tableView
 @property (nonatomic, strong)NSMutableArray *dataArray;       //数据源
 @property (nonatomic, strong)WWCheckHomeDataView *cardDataView;       //卡片数据汇总
+@property (nonatomic, strong)UIView *noDataView;
 
 @end
 
@@ -58,7 +59,6 @@ static NSString *cellID = @"cellID";
     
     [LVKBHttp post:checkCardListRequest params:@{@"token" : token} success:^(id json) {
         
-        
         NSArray *array = [NSArray yy_modelArrayWithClass:[WWCheckCardListModel class] json:json[@"card_list"]];
         [self.dataArray addObjectsFromArray:array];
         [self.tableView reloadData];
@@ -67,6 +67,17 @@ static NSString *cellID = @"cellID";
         self.cardDataView.surplusAmount.text = [NSString stringWithFormat:@"剩余额度：%@", json[@"card_sum"][@"remaining_account"]];
         self.cardDataView.totalAmount.text = [NSString stringWithFormat:@"总额度：%@", json[@"card_sum"][@"all_credit_account"]];
         
+        if (array.count>0) {
+            self.noDataView.hidden = YES;
+            [self.dataArray addObjectsFromArray:array];
+            [self.tableView reloadData];
+            
+            self.cardDataView.useAmount.text = [NSString stringWithFormat:@"%@", json[@"card_sum"][@"all_bill_account"]];
+            self.cardDataView.surplusAmount.text = [NSString stringWithFormat:@"剩余额度：%@", json[@"card_sum"][@"remaining_account"]];
+            self.cardDataView.totalAmount.text = [NSString stringWithFormat:@"总额度：%@", json[@"card_sum"][@"all_credit_account"]];
+        } else {
+            self.noDataView.hidden = NO;
+        }
         
     } failure:^(NSError *error) {
         
@@ -138,4 +149,26 @@ static NSString *cellID = @"cellID";
     return _dataArray;
 }
 
+- (UIView *)noDataView {
+    if (!_noDataView) {
+        _noDataView = [[UIView alloc]initWithFrame:CGRectMake(0, 160*SCREEN_MUTI, SCREEN_WIDTH, 180*SCREEN_MUTI)];
+        
+        //图片
+        UIImageView *imgView = [[UIImageView alloc] initWithFrame:CGRectMake((SCREEN_WIDTH-180*SCREEN_MUTI)/2, 0, 180*SCREEN_MUTI, 130*SCREEN_MUTI)];
+        imgView.image = [UIImage imageNamed:@"home_bankAuthentication_no"];
+        [_noDataView addSubview:imgView];
+        
+        //文字
+        UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, imgView.bottom + 20*SCREEN_MUTI, SCREEN_WIDTH, 20)];
+        label.text = @"您还没有信用卡消费记录";
+        label.font = [UIFont fontWithName:@"PingFangSC-Medium" size: 14];
+        label.textColor = WWColor(128, 128, 128, 1);
+        label.textAlignment = NSTextAlignmentCenter;
+        [_noDataView addSubview:label];
+        
+        [self.view addSubview:_noDataView];
+    }
+    return _noDataView;
+}
+
 @end

KXCardHelp/Main/CheckPage/CreditCardManager/HomePage/Controller/WWCheckHomeViewController.m

@@ -10,6 +10,8 @@
 #import "WWCheckAddCardViewController.h"   //添加信用卡VC
 #import "WWCheckRemindMeViewController.h"  //智能提醒
 #import "WWCheckExpenseCountVC.h"          //消费统计
+#import "KXInstallmentViewController.h"    //账单分期
+#import "WWCheckCardListDetailVC.h"        //信用卡详情
 
 #import "WWCheckHomeDataView.h"    //卡片额度汇总数据
 #import "WWCheckHomeToolView.h"    //上面三个按钮View
@@ -44,9 +46,13 @@ static NSString *cellID = @"cellID";
     self.view.backgroundColor = [UIColor whiteColor];
     [self.view addSubview:self.tableView];
     [self.view addSubview:self.footView];
-    [self loadCardListData];   //加载卡片数据
 }
 
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    
+    [self loadCardListData];   //加载卡片数据
+}
 
 
 #pragma mark - tableView
@@ -76,9 +82,16 @@ static NSString *cellID = @"cellID";
     cell.model = self.dataArray[indexPath.section];
     cell.delegate = self;
     cell.selectionStyle = UITableViewCellSelectionStyleNone;
+    cell.delegate = self;
     return cell;
 }
 
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    WWCheckCardListDetailVC *detailVC = [[WWCheckCardListDetailVC alloc] init];
+    detailVC.cardModel = self.dataArray[indexPath.section];
+    [self.navigationController pushViewController:detailVC animated:YES];
+}
+
 #pragma mark - 点击上面三个按钮功能
 - (void)clickToolButtonWithIndex:(int)index {
     NSLog(@"%d", index);
@@ -89,7 +102,8 @@ static NSString *cellID = @"cellID";
         WWCheckExpenseCountVC *countVC = [[WWCheckExpenseCountVC alloc] init];
         [self.navigationController pushViewController:countVC animated:YES];
     } else {                  //账单分期
-        
+        KXInstallmentViewController *installmentVC = [[KXInstallmentViewController alloc] init];
+        [self.navigationController pushViewController:installmentVC animated:YES];
     }
 }
 
@@ -101,6 +115,7 @@ static NSString *cellID = @"cellID";
         return;
     }
     
+    [self.dataArray removeAllObjects];
     [LVKBHttp post:checkCardListRequest params:@{@"token" : token} success:^(id json) {
         
         [self. bannerView removeFromSuperview];
@@ -118,25 +133,32 @@ static NSString *cellID = @"cellID";
     } failure:^(NSError *error) {
         [self.cardDataView removeFromSuperview];
         [self. tableHeaderView addSubview:self.bannerView];
+        [self.tableView reloadData];
     }];
 }
 
 #pragma mark - 添加信用卡
 - (void)onClickAddCardBtn {
     WWCheckAddCardViewController *addVC = [[WWCheckAddCardViewController alloc] init];
-    addVC.addCardSuccessBlock = ^{
-        [self loadCardListData];
-    };
+//    addVC.addCardSuccessBlock = ^{
+//        [self loadCardListData];
+//    };
     [self.navigationController pushViewController:addVC animated:YES];
 }
 
 #pragma mark - 点击cell上按钮
 - (void)clickCellButton:(WWCheckCardListModel *)model {
     if ([model.status isEqualToString:@"1"]) {         //立即还款
+        [LVKBHttp post:checkeRefundCardRequest params:@{@"id" : model.ID} success:^(id json) {
+            //还款成功, 刷新数据
+            [self loadCardListData];
+        } failure:^(NSError *error) {
+            //
+            NSLog(@"%@", error);
+        }];
+    } else if ([model.status isEqualToString:@"2"]) {  //已还款
         //
-    } else if ([model.status isEqualToString:@"2"]) {  //已逾期
-        //
-    } else {   //已还款
+    } else {   //已逾期
         
     }
 }

KXCardHelp/Main/CheckPage/CreditCardManager/HomePage/Model/WWCheckCardListModel.m

@@ -10,7 +10,7 @@
 
 @implementation WWCheckCardListModel
 
-- (NSDictionary *)modelCustomPropertyMapper {
++ (NSDictionary *)modelCustomPropertyMapper {
     return @{@"ID" : @"id"};
 }
 

KXCardHelp/Main/CheckPage/CreditCardManager/HomePage/View/WWCheckAddCardInfoCell.h

@@ -10,12 +10,20 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+@protocol tapImageDelegate <NSObject>
+
+- (void)tapImageAction;
+
+@end
+
 @interface WWCheckAddCardInfoCell : UITableViewCell
 
 @property (weak, nonatomic) IBOutlet UILabel *titleLabel;
 @property (weak, nonatomic) IBOutlet UITextField *textField;
 @property (weak, nonatomic) IBOutlet UIImageView *rightImage;
 
+@property (nonatomic, strong)id<tapImageDelegate>delegate;
+
 @end
 
 NS_ASSUME_NONNULL_END

KXCardHelp/Main/CheckPage/CreditCardManager/HomePage/View/WWCheckAddCardInfoCell.m

@@ -13,6 +13,10 @@
 - (void)awakeFromNib {
     [super awakeFromNib];
     // Initialization code
+    
+    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapImage)];
+    self.rightImage.userInteractionEnabled = YES;
+    [self.rightImage addGestureRecognizer:tap];
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
@@ -21,4 +25,10 @@
     // Configure the view for the selected state
 }
 
+- (void)tapImage {
+    if (self.delegate && [self.delegate respondsToSelector:@selector(tapImageAction)]) {
+        [self.delegate tapImageAction];
+    }
+}
+
 @end

KXCardHelp/Main/CheckPage/CreditCardManager/HomePage/View/WWCheckHomeCardCell.m

@@ -46,17 +46,17 @@
         self.bankDayState.text = @"天后出账";
         self.bankDayState.textColor = WWColor(83, 79, 79, 1);
         
-    } else if ([_model.status isEqualToString:@"2"]) {  //已逾期
-        [self.bankStateBtn setTitle:@"已逾期" forState:UIControlStateNormal];
-        self.bankDayNum.text = _model.overdue_days;
-        self.bankDayState.text = @"天已逾期";
-        self.bankDayState.textColor = [UIColor whiteColor];
-        
-    } else {   //已还款
+    } else if ([_model.status isEqualToString:@"2"]) {  //已还款
         [self.bankStateBtn setTitle:@"已还款" forState:UIControlStateNormal];
         self.bankDayNum.text = _model.charge_off_days;
         self.bankDayState.text = @"天后出账";
         self.bankDayState.textColor = WWColor(83, 79, 79, 1);
+        
+    } else {   //已还款
+        [self.bankStateBtn setTitle:@"已逾期" forState:UIControlStateNormal];
+        self.bankDayNum.text = _model.overdue_days;
+        self.bankDayState.text = @"天已逾期";
+        self.bankDayState.textColor = [UIColor whiteColor];
     }
     
     //到期时间

KXCardHelp/Main/CheckPage/CreditCardManager/Mine/Controller/WWCheckCardListDetailVC.m

@@ -7,6 +7,7 @@
 //
 
 #import "WWCheckCardListDetailVC.h"
+#import "WWCheckRemindMeViewController.h"   //智能提醒
 
 #import "WWCheckHomeCardCell.h"    //银行卡Cell
 
@@ -27,6 +28,7 @@ static NSString *cellID = @"cellID";
     
     [self createNaviBar];
     [self.view addSubview:self.tableView];
+    [self createBottonView];
 }
 
 #pragma mark - 创建导航栏
@@ -43,8 +45,82 @@ static NSString *cellID = @"cellID";
         [self.navigationController popViewControllerAnimated:YES];
     }];
     [self.navigationBar setCustomLeftButtons:@[leftBtn]];
+    
+    UIButton *rightBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 40, 40)];
+    [rightBtn setImage:[UIImage imageNamed:@"back_black"] forState:UIControlStateNormal];
+    [[rightBtn rac_signalForControlEvents:UIControlEventTouchUpInside]subscribeNext:^(id x) {
+        [self deleteCard];   //删除信用卡
+    }];
+    [self.navigationBar setCustomRightButtons:@[rightBtn]];
 }
 
+#pragma mark - 底部View  智能提醒/立即还款
+- (void)createBottonView {
+    //智能提醒
+    UIButton *remindBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - 50, SCREEN_WIDTH/2, 50)];
+    remindBtn.backgroundColor = [UIColor whiteColor];
+    remindBtn.titleLabel.font = [UIFont fontWithName:@"PingFangSC-Medium" size: 16];
+    [remindBtn setTitle:@"智能提醒" forState:UIControlStateNormal];
+    remindBtn.layer.borderWidth = 1.0;
+    remindBtn.layer.borderColor = [UIColor checkBaseColor].CGColor;
+    [remindBtn setTitleColor:[UIColor checkBaseColor] forState:UIControlStateNormal];
+    [remindBtn addTarget:self action:@selector(onClickRemindBtn) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:remindBtn];
+    
+    //立即还款 /已还清
+    UIButton *refundBtn = [[UIButton alloc] initWithFrame:CGRectMake(SCREEN_WIDTH/2, SCREEN_HEIGHT - 50, SCREEN_WIDTH/2, 50)];
+    refundBtn.backgroundColor = [UIColor whiteColor];
+    refundBtn.titleLabel.font = [UIFont fontWithName:@"PingFangSC-Medium" size: 16];
+    
+    if ([self.cardModel.status isEqualToString:@"1"]) {   //立即还款
+        [refundBtn setTitle:@"立即还款" forState:UIControlStateNormal];
+        refundBtn.backgroundColor = [UIColor checkBaseColor];
+        [refundBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    } else if ([self.cardModel.status isEqualToString:@"2"]) {  //已还款
+        [refundBtn setTitle:@"已还款" forState:UIControlStateNormal];
+        refundBtn.backgroundColor = [UIColor lightGrayColor];
+        [refundBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    } else {   //已逾期
+        [refundBtn setTitle:@"已逾期" forState:UIControlStateNormal];
+        refundBtn.backgroundColor = [UIColor checkBaseColor];
+        [refundBtn setTitleColor:[UIColor redColor] forState:UIControlStateNormal];
+    }
+    
+    [refundBtn addTarget:self action:@selector(clickRefundBtn) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:refundBtn];
+}
+
+#pragma mark - 智能提醒
+- (void)onClickRemindBtn {
+    WWCheckRemindMeViewController *remindVC = [[WWCheckRemindMeViewController alloc] init];
+    [self.navigationController pushViewController:remindVC animated:YES];
+}
+
+#pragma mark - 立即还款
+- (void)clickRefundBtn {
+    if ([self.cardModel.status isEqualToString:@"1"]) {   //立即还款
+        [LVKBHttp post:checkeRefundCardRequest params:@{@"id" : self.cardModel.ID} success:^(id json) {
+            //
+            [self.navigationController popViewControllerAnimated:YES];
+        } failure:^(NSError *error) {
+            //
+            NSLog(@"%@", error);
+            [MBProgressHUD showError:@"网络异常"];
+        }];
+    }
+}
+
+#pragma mark - 删除信用卡
+- (void)deleteCard {
+    [LVKBHttp post:checkeDelCarddCardRequest params:@{@"id" : self.cardModel.ID} success:^(id json) {
+        //
+        [self.navigationController popViewControllerAnimated:YES];
+    } failure:^(NSError *error) {
+        //
+        NSLog(@"%@", error);
+        [MBProgressHUD showError:@"网络异常"];
+    }];
+}
 
 #pragma mark - UITableView delegate
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
@@ -136,10 +212,11 @@ static NSString *cellID = @"cellID";
     if ([model.status isEqualToString:@"1"]) {   //立即还款
         [LVKBHttp post:checkeRefundCardRequest params:@{@"id" : model.ID} success:^(id json) {
             //
-            NSLog(@"%@", json);
+            [self.navigationController popViewControllerAnimated:YES];
         } failure:^(NSError *error) {
             //
             NSLog(@"%@", error);
+            [MBProgressHUD showError:@"网络异常"];
         }];
     }
 }

KXCardHelp/Main/Home/Receipt/VC/LVKBHomeReceiptViewController.m

@@ -11,6 +11,9 @@
 #import "LVKBHomeReceiptOKViewController.h"
 #import "LVKBHomeCreditCardViewChild2Controller.h"
 #import "LVKBHomeReceiptWebViewController.h"
+
+#import "LVKBHomeCardsModel.h"
+
 @interface LVKBHomeReceiptViewController ()
 <
 UITextFieldDelegate
@@ -23,6 +26,9 @@ UITextFieldDelegate
 @property(nonatomic       )NSInteger savingID;
 @property(nonatomic       )BOOL      haveBankCard;
 @property(nonatomic       )NSInteger noOverRangeMoney;//实时计算状态  -2正在请求 -1未初始化  0数据错误  1正确
+
+@property (nonatomic, strong)NSMutableArray *dataArray;  //信用卡列表数组
+
 @end
 
 @implementation LVKBHomeReceiptViewController
@@ -36,15 +42,23 @@ UITextFieldDelegate
     [self initUI];
     [self adjustUI];
     [self request];
+    [self requestDefaultCard];  //请求信用卡列表, 默认显示第一个
 }
 
 -(void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
+    
+    //玉玲的需求,输入的金额要返回要显示
     UITextField        *centerBankTextField=[self.centerView viewWithTag:20008];
-    centerBankTextField.text=@"";
-    UILabel *centerTipLabel=[self.centerView viewWithTag:20010];
-    centerTipLabel.text=[NSString stringWithFormat:@"到账金额 ￥--.--"];
-    self.noOverRangeMoney=-1;
+    //    centerBankTextField.text=@"";
+    //    UILabel *centerTipLabel=[self.centerView viewWithTag:20010];
+    //    centerTipLabel.text=[NSString stringWithFormat:@"到账金额 ￥--.--"];
+    //    self.noOverRangeMoney=-1;
+    
+    //选卡返回后输入的金额还在,重新请求到账金额
+    if (centerBankTextField.text.length>0) {
+        [self performSelector:@selector(requestWithMoney:) withObject:centerBankTextField.text afterDelay:0.0f];
+    }
 }
 
 -(void)initUI{
@@ -78,14 +92,50 @@ UITextFieldDelegate
             if (amount) {
                 centerBankTextField.placeholder=[NSString stringWithFormat:@"每笔最高%.2f元",[amount floatValue]];
             }
-           
+            
             NSNumber *bank_card_id=data[@"id"];
             if (bank_card_id) {
                 self.savingID=[bank_card_id integerValue];
             }
         }
         
-      
+        
+    } failure:^(NSError *error) {
+        
+    }];
+}
+
+#pragma mark - 请求信用卡数据,默认显示第一个
+-(void)requestDefaultCard {
+    NSDictionary * paramsDict = @{@"card_type":@"CREDIT"};
+    [LVKBHttp get:cardListRequest params:paramsDict success:^(id json) {
+        [self.dataArray removeAllObjects];
+        NSArray *cardArray=[NSArray yy_modelArrayWithClass:[LVKBHomeCardsModel class] json:json];
+        [self.dataArray addObjectsFromArray:cardArray];
+        
+        if (cardArray.count > 0) {
+            UILabel *topTitleLabel = [self.topView viewWithTag:10004];
+            UILabel *topContentLabel = [self.topView viewWithTag:10005];
+            UIButton *topChangeBtn = [self.topView viewWithTag:10006];
+            UIButton *topAddBtn = [self.topView viewWithTag:10003];
+            
+            //已绑定信用卡
+            LVKBHomeCardsModel *model = cardArray.firstObject;
+            
+            topTitleLabel.text = model.bank_name;
+            
+            NSString *tailNum = [model.card_num substringFromIndex:(model.card_num.length-4>0?model.card_num.length-4:0)];
+            topContentLabel.text = [NSString stringWithFormat:@"尾号 %@",tailNum];
+            
+            topChangeBtn.hidden = NO;
+            [topAddBtn sd_setImageWithURL:[NSURL URLWithString:model.bank_icon] forState:UIControlStateNormal placeholderImage:[UIImage imageNamed:@"bank_icon_blue"]];
+            topAddBtn.layer.cornerRadius = 24;
+            topAddBtn.layer.masksToBounds = YES;
+            topAddBtn.userInteractionEnabled = NO;
+            self.creditID = [model.ID integerValue];
+            [self requestCreditcardamountRequestByCreditId:[model.ID integerValue]];
+        }
+        
     } failure:^(NSError *error) {
         
     }];
@@ -119,7 +169,7 @@ UITextFieldDelegate
     
     self.noOverRangeMoney=-2;
     [LVKBHttp post:creditcardamountRequest params:dic success:^(id json) {
-         UILabel *centerTipLabel=[self.centerView viewWithTag:20010];
+        UILabel *centerTipLabel=[self.centerView viewWithTag:20010];
         NSNumber *amount=json[@"amount"];
         if ([amount floatValue]>0) {
             self.noOverRangeMoney=1;
@@ -253,7 +303,7 @@ UITextFieldDelegate
         make.top.equalTo(centerBankY.mas_bottom);
     }];
     [centerTipLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-       make.left.equalTo(centerBankTitle1.mas_left);
+        make.left.equalTo(centerBankTitle1.mas_left);
         make.top.equalTo(centerLine2.mas_bottom).offset(18);
     }];
     
@@ -303,7 +353,7 @@ UITextFieldDelegate
         return;
     }
     [self performSelector:@selector(requestWithMoney:) withObject:textField.text afterDelay:0.4f];
-//    [self  requestWithMoney:[textField.text floatValue]];
+    //    [self  requestWithMoney:[textField.text floatValue]];
     
 }
 
@@ -347,6 +397,16 @@ UITextFieldDelegate
             [self addCreditCard];
             LVKBHomeCreditCardViewController *vc=[[LVKBHomeCreditCardViewController alloc]init];
             vc.creditCardBlock = ^(NSString *creditBankName, NSString *creditBankCode,NSInteger creditID,NSString *bankBlueIcon) {
+                
+                LVKBHomeCardsModel *model = [[LVKBHomeCardsModel alloc] init];
+                model.ID = [NSNumber numberWithInteger:creditID];
+                model.bank_name = creditBankName;
+                model.bank_icon = bankBlueIcon;
+                model.is_main = self.dataArray.count>0 ? @"0" : @"1";
+                model.card_num = creditBankCode;
+                model.user_name = @"";
+                [self. dataArray addObject:model];
+                
                 topTitleLabel.text=creditBankName;
                 topContentLabel.text=[NSString stringWithFormat:@"尾号 %@",creditBankCode];
                 topChangeBtn.hidden=NO;
@@ -377,8 +437,24 @@ UITextFieldDelegate
         [[topChangeBtn rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(id x) {
             [self addCreditCard];
             LVKBHomeCreditCardViewController *vc=[[LVKBHomeCreditCardViewController alloc]init];
+            
+            if (self.dataArray.count > 1) {  //大于1张卡跳进信用卡列表
+                vc.sourceFlag = 1;
+            }
+            
             vc.creditCardBlock = ^(NSString *creditBankName, NSString *creditBankCode,NSInteger creditID,NSString *bankBlueIcon) {
                 
+                if (self.dataArray.count == 1) {  //之前只有一张卡,更换跳进新增,新增成功后添加到信用卡列表数组
+                    LVKBHomeCardsModel *model = [[LVKBHomeCardsModel alloc] init];
+                    model.ID = [NSNumber numberWithInteger:creditID];
+                    model.bank_name = creditBankName;
+                    model.bank_icon = bankBlueIcon;
+                    model.is_main = self.dataArray.count>0 ? @"0" : @"1";
+                    model.card_num = creditBankCode;
+                    model.user_name = @"";
+                    [self. dataArray addObject:model];
+                }
+                
                 topTitleLabel.text=creditBankName;
                 topContentLabel.text=[NSString stringWithFormat:@"尾号 %@",creditBankCode];
                 topChangeBtn.hidden=NO;
@@ -407,7 +483,7 @@ UITextFieldDelegate
         UITextField        *centerBankTextField=[[UITextField alloc]init];
         UIView             *centerLine2=[[UIView alloc]init];
         UILabel            *centerTipLabel=[[UILabel alloc]init];
-         UILabel            *rightTipLabel=[[UILabel alloc]init];
+        UILabel            *rightTipLabel=[[UILabel alloc]init];
         centerBankTitle1.tag   =20001;
         centerBankImageView.tag=20002;
         centerBankName.tag     =20003;
@@ -533,6 +609,13 @@ UITextFieldDelegate
     return _scrollView;
 }
 
+- (NSMutableArray *)dataArray {
+    if (!_dataArray) {
+        _dataArray = [NSMutableArray array];
+    }
+    return _dataArray;
+}
+
 
 
 @end

KXCardHelp/Main/Home/Receipt/creditCard/VC/LVKBHomeCreditCardViewController.h

@@ -11,5 +11,9 @@ typedef void(^CreditCardBlock)(NSString *creditBankName,NSString *creditBankCode
 
 
 @interface LVKBHomeCreditCardViewController : LVKBBaseViewController
+
+@property (nonatomic, assign)int sourceFlag;  //新增进来 0 更换是1
+
 @property(nonatomic,copy)CreditCardBlock creditCardBlock;
+
 @end

KXCardHelp/Main/Home/Receipt/creditCard/VC/LVKBHomeCreditCardViewController.m

@@ -62,6 +62,11 @@ CHHomeCreditCardViewChild2ControllerDelegate
     self.titleView.showIndex = 0;
     self.titleView.selectColor = [UIColor CHColorWithHex:0x222222];
     self.titleView.deSelectColor = [UIColor CHColorWithHex:0x222222];
+    
+    if (self.sourceFlag == 1) {  //更换
+        self.segScroll.showIndex = 1;  //
+    }
+    
     [MLMSegmentManager associateHead:self.titleView withScroll:self.segScroll completion:^{
         [self.view addSubview:self.titleView];
         [self.view addSubview:self.segScroll];
@@ -70,8 +75,6 @@ CHHomeCreditCardViewChild2ControllerDelegate
         [self.titleView addSubview:self.backBtn];
         [self.titleView bringSubviewToFront:self.backBtn];
     }];
-    
-    
 }
 
 -(void)jcy_cardViewChild1BankName:(NSString *)bankName bankCode:(NSString *)bankCode bankID:(NSInteger)bankID  bankBlueIcon:(NSString *)bankBlueIcon{
@@ -85,7 +88,7 @@ CHHomeCreditCardViewChild2ControllerDelegate
     if (self.creditCardBlock) {
         self.creditCardBlock(bankName, bankCode,bankID,bankBlueIcon);
     }
-     [self.navigationController popViewControllerAnimated:YES];
+    [self.navigationController popViewControllerAnimated:YES];
 }
 
 - (void)scrollOffsetScale:(CGFloat)scale{