提交更改

梁星国
1 parent 0e7e3e71
Showing 11 changed files with 408 additions and 119 deletions
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_must@2x.png
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_must@3x.png
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_tip@2x.png
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_tip@3x.png
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBAgreementCommitFinishController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOrganizationValidattionController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationContentCell.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationContentCell.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationDetailCell.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationValidationHeaderView.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationValidationHeaderView.m
@@ -6,9 +6,31 @@
 //
 #import "CNLiveBAgreementCommitFinishController.h"
+#import <Masonry/Masonry.h>
+#import "UIImage+OrganizationValidation.h"
+#import <CNLiveBaseKit/CNLiveBaseKit.h>
+#import "CNLiveBOrganizationTextField.h"
+
+
 @interface CNLiveBAgreementCommitFinishController ()
+@property (strong, nonatomic) UIImageView *imageVeiw;
+
+@property (strong, nonatomic) UILabel *contentL;
+
+@property (strong, nonatomic) UIView *leftTipV;
+
+@property (strong, nonatomic) UILabel *tipL;
+
+@property (strong, nonatomic) UIView *rightTipV;
+
+@property (strong, nonatomic) UILabel *tipContentL;
+
+@property (strong, nonatomic) UIButton *returnBtn;
+
+
+
 @end
 @implementation CNLiveBAgreementCommitFinishController
@@ -16,16 +38,188 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
+    [self setupUI];
+    [self layoutUI];
 }
-/*
-#pragma mark - Navigation
+#pragma mark -
+#pragma mark - *** setupUI ***
+
+- (void)setupUI {
+    
+    [self.view setBackgroundColor:[UIColor whiteColor]];
+    [self.view addSubview:self.imageVeiw];
+    [self.view addSubview:self.contentL];
+    [self.view addSubview:self.leftTipV];
+    [self.view addSubview:self.tipL];
+    [self.view addSubview:self.rightTipV];
+    [self.view addSubview:self.tipContentL];
+    [self.view addSubview:self.returnBtn];
+    
+    [_returnBtn addTarget:self action:@selector(returnBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    
+    [self.imageVeiw setBackgroundColor:[UIColor yellowColor]];
+    [self.contentL setBackgroundColor:[UIColor yellowColor]];
-// 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.
+    
 }
-*/
+
+#pragma mark -
+#pragma mark - *** layoutUI ***
+- (void)layoutUI {
+    __weak typeof(self) weakSelf = self;
+    [self.imageVeiw mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(weakSelf.view.mas_top).offset(107.5);
+        make.centerX.equalTo(weakSelf.view.mas_centerX);
+        make.width.mas_equalTo(182);
+        make.height.mas_equalTo(116.5);
+    }];
+    
+    [self.contentL mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(weakSelf.imageVeiw.mas_bottom).offset(27);
+        make.centerX.equalTo(weakSelf.view.mas_centerX);
+        make.width.mas_equalTo(375);
+        make.height.mas_equalTo(130);
+    }];
+    
+    [self.leftTipV mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.bottom.equalTo(weakSelf.view.mas_bottom).offset(-189);
+        make.left.equalTo(weakSelf.view.mas_left).offset(67);
+        make.width.mas_equalTo(78);
+        make.height.mas_equalTo(0.5);
+    }];
+    
+    [self.rightTipV mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.bottom.equalTo(weakSelf.view.mas_bottom).offset(-189);
+        make.right.equalTo(weakSelf.view.mas_right).offset(-67);
+        make.width.mas_equalTo(78);
+        make.height.mas_equalTo(0.5);
+    }];
+    
+    [self.tipL mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.equalTo(weakSelf.rightTipV.mas_centerY).offset(0);
+        make.left.equalTo(weakSelf.leftTipV.mas_right).offset(10);
+        make.right.equalTo(weakSelf.rightTipV.mas_left).offset(-10);
+        make.height.mas_equalTo(12);
+    }];
+    
+    [self.tipContentL mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(weakSelf.tipL.mas_bottom).offset(15);
+        make.left.equalTo(weakSelf.view.mas_left).offset(10);
+        make.right.equalTo(weakSelf.view.mas_right).offset(-10);
+        make.height.mas_equalTo(51);
+    }];
+    
+    [self.returnBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.bottom.equalTo(weakSelf.view.mas_bottom).offset(-64.5);
+        make.left.equalTo(weakSelf.view.mas_left).offset(23);
+        make.right.equalTo(weakSelf.view.mas_right).offset(-23);
+        make.height.mas_equalTo(45);
+    }];
+
+    
+}
+
+
+#pragma mark -
+#pragma mark - *** delegate ***
+
+
+
+#pragma mark - TODO:
+#pragma mark - *** 事件实现 ***
+- (void)returnBtnAction:(UIButton *)button {
+    
+    
+    [self.navigationController popViewControllerAnimated:YES];
+}
+
+
+
+#pragma mark -
+#pragma mark - *** 接口 ***
+
+#pragma mark -
+#pragma mark - *** 属性 ***
+
+- (UIImageView *)imageVeiw {
+    if (!_imageVeiw) {
+        _imageVeiw = [[UIImageView alloc] initWithFrame:CGRectZero];
+        _imageVeiw.image = [UIImage imageNamedFromOrganization:@"organization_tip"];
+    }
+    return _imageVeiw;;
+}
+
+
+- (UILabel *)contentL {
+    if (!_contentL) {
+        _contentL = [[UILabel alloc]initWithFrame:CGRectZero];
+        _contentL.textColor = RGBOF(0x999999);
+        _contentL.text = @"您提交资料已完成，查询审核状态需登录PC端操作\n\n请复制链接：http://open.cnlive.com\n\n到电脑浏览器打开查询";
+        _contentL.font = [UIFont systemFontOfSize:14];
+        _contentL.numberOfLines = 0;
+        _contentL.textAlignment = NSTextAlignmentCenter;
+        
+    }
+    return _contentL;
+}
+
+
+- (UIView *)leftTipV {
+    if (!_leftTipV) {
+        _leftTipV = [[UIView alloc]initWithFrame:CGRectZero];
+        [_leftTipV setBackgroundColor:RGBOF(0xF56950)];
+    }
+    return _leftTipV;
+}
+
+- (UILabel *)tipL {
+    if (!_tipL) {
+        _tipL = [[UILabel alloc] initWithFrame:CGRectZero];
+        _tipL.text = @"查询须知:";
+        _tipL.textColor = RGBOF(0xF56950);
+        _tipL.font = [UIFont systemFontOfSize:11.5];
+        _tipL.numberOfLines = 1;
+        _tipL.textAlignment = NSTextAlignmentCenter;
+    }
+    return _tipL;
+}
+
+
+
+- (UIView *)rightTipV {
+    if (!_rightTipV) {
+        _rightTipV = [[UIView alloc]initWithFrame:CGRectZero];
+        [_rightTipV setBackgroundColor:RGBOF(0xF56950)];
+    }
+    return _rightTipV;
+}
+
+- (UILabel *)tipContentL {
+    if (!_tipContentL) {
+        _tipContentL = [[UILabel alloc]initWithFrame:CGRectZero];
+        _tipContentL.text = @"若您在PC端从未注册登录，注册时填写的手机号与\n网家家企业端的手机号保持一致，否则无法查询";
+        _tipContentL.numberOfLines = 0;
+        _tipContentL.font = [UIFont systemFontOfSize:11.5];
+        _tipContentL.textColor = RGBOF(0xF56950);
+        _tipContentL.textAlignment = NSTextAlignmentCenter;
+    }
+    return _tipContentL;
+}
+
+- (UIButton *)returnBtn {
+    if (!_returnBtn) {
+        _returnBtn = [UIButton buttonWithType:UIButtonTypeSystem];
+        [_returnBtn setTitle:@"返回" forState:UIControlStateNormal];
+        _returnBtn.titleLabel.textColor = [UIColor whiteColor];
+        [_returnBtn setBackgroundColor:RGBOF(0x4CAAFC)];
+        [_returnBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        _returnBtn.layer.masksToBounds = YES;
+        _returnBtn.layer.cornerRadius = 22.5;
+    }
+    return _returnBtn;;
+}
+
+
 @end
@@ -10,6 +10,7 @@
 #import "CNLiveBOrganizationValidattionController.h"
 #import "CNLiveBOrganizationValidationHeaderView.h"
 #import "CNLiveBOrganizationContentCell.h"
+#import "CNLiveBAgreementCommitFinishController.h"
 @interface CNLiveBOrganizationValidattionController ()<UITableViewDataSource,UITableViewDelegate,UITextFieldDelegate,UITextViewDelegate>{
     CGPoint   contentoffset;
@@ -75,6 +76,11 @@
     self.tableView.tableHeaderView = self.headerView;
     self.tableView.tableFooterView = self.footerView;
+    __weak typeof(self) weakSelf = self;
+    self.footerView.clickCommitButtonBlock = ^(CNLiveBOrganizationTVFooteriew * _Nonnull footerView, UIButton * _Nonnull commitBtn) {
+        [weakSelf jumpCommitVC];
+    };
+    
 }
 #pragma mark -
@@ -167,11 +173,12 @@
         }else if (indexPath.row == 6) {
             CNLiveBOrganizationSelectedCell *selectedCell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBOrganizationSelectedCell forIndexPath:indexPath];
-            
+            [selectedCell editUIWithIndexPath:indexPath];
             return selectedCell;
         }else if (indexPath.row == 1 || indexPath.row == 12) {
             CNLiveBOrganizationImageVSelectedCell *imageVCell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBOrganizationImageVSelectedCell forIndexPath:indexPath];
+            [imageVCell editUIWithIndexPath:indexPath];
             return imageVCell;
         }else {
             CNLiveBOrganizationTFCell *tfCell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBOrganizationTFCell forIndexPath:indexPath];
@@ -264,6 +271,11 @@
 #pragma mark - TODO:
 #pragma mark - *** 事件实现 ***
+- (void)jumpCommitVC {
+    CNLiveBAgreementCommitFinishController *commitVC = [[CNLiveBAgreementCommitFinishController alloc]init];
+    [self.navigationController pushViewController:commitVC animated:YES];
+}
+
@@ -57,6 +57,9 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveBOrganizationSelectedCell : UITableViewCell
+/** 点击item实现*/
+@property (nonatomic, copy) void(^clickSelectedCellBlock)(CNLiveBOrganizationSelectedCell *selectedCell, UIButton *selectedBtn);
+
 @property (strong, nonatomic) NSIndexPath *indexPath;
 - (void)editUIWithIndexPath:(NSIndexPath *)indexPath;
@@ -73,6 +76,10 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveBOrganizationImageVSelectedCell : UITableViewCell
+@property (strong, nonatomic) NSIndexPath *indexPath;
+
+- (void)editUIWithIndexPath:(NSIndexPath *)indexPath;
+
 @end
 NS_ASSUME_NONNULL_END
@@ -15,7 +15,8 @@
 #pragma mark - UITextField 类型
 @interface CNLiveBOrganizationTFCell()
-
+/** 必须标记*/
+@property (nonatomic, strong) UIImageView *tipImageV;
 /** 头部*/
 @property (nonatomic, strong) UILabel *titleL;
 /** 内容*/
@@ -52,41 +53,26 @@
 - (void)setupUI {
     [self setBackgroundColor:[UIColor whiteColor]];
+    [self addSubview:self.tipImageV];
     [self addSubview:self.contentTF];
     [self addSubview:self.titleL];
     [self addSubview:self.contentL];
     [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(textFieldTextChange:) name:UITextFieldTextDidChangeNotification object:nil];
+    self.tipImageV.frame = CGRectMake(10, 18 , 7, 8);
+    self.tipImageV.image = [UIImage imageNamedFromOrganization:@"organization_must"];
+    self.titleL.frame = CGRectMake(21.5, 16, 72, 12);
+    self.contentTF.frame = CGRectMake(104.5, 10, KScreenWidth - 104.5 - 30.5 , 28);
+    self.contentTF.centerY = self.titleL.centerY;
+    self.contentL.frame = CGRectMake(104.5, self.contentTF.bottom + 6, KScreenWidth - 104.5 - 30.5, 10.5);
+    
 }
 #pragma mark - ***layoutUI***
 - (void)layoutUI {
-    __weak typeof(self) weakSelf = self;
-    [self.titleL mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(weakSelf.mas_left).offset(10);
-        make.top.equalTo(weakSelf.mas_top).offset(8);
-        make.width.mas_equalTo(72);
-        make.height.mas_equalTo(28);
-    }];
-    
-    [self.contentTF mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(weakSelf.titleL.mas_right).offset(15);
-        make.centerY.equalTo(weakSelf.titleL.mas_centerY);
-        make.right.equalTo(weakSelf.mas_right).offset(-30.5);
-        make.height.mas_equalTo(28);
-    }];
-    
-    [self.contentL mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(weakSelf.contentTF.mas_left);
-        make.top.equalTo(weakSelf.contentTF.mas_bottom).offset(6);
-        make.width.mas_equalTo(weakSelf.contentTF.mas_width);
-        make.height.mas_equalTo(11);
-    }];
-    
-    
-    
+
 }
 #pragma mark - editUI
@@ -102,11 +88,8 @@
     if (indexPath.section == 0) {
         if (indexPath.row == 0) {
-            NSString *titleStr = @"* 公司全称";
-            NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:titleStr attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12],NSForegroundColorAttributeName:RGBOF(0x333333)}];
-            NSRange range = [titleStr rangeOfString:@"*"];
-            [string addAttributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12], NSForegroundColorAttributeName: RGBOF(0xf3565f)} range:range];
-            self.titleL.attributedText = string;
+            [self contentType:CNLiveBOrganizationTFCellTypeAll];
+            self.titleL.text = @"公司全称";
             self.contentL.text = @"公司注册全称与营业执照一致";
             self.contentTF.placeholder = @"请输入公司全称";
             self.contentTF.tfIndexPath = indexPath;
@@ -114,80 +97,62 @@
         }else if (indexPath.row == 2) {
-            NSString *titleStr = @"* 企业简称";
-            NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:titleStr attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12],NSForegroundColorAttributeName:RGBOF(0x333333)}];
-            NSRange range = [titleStr rangeOfString:@"*"];
-            [string addAttributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12], NSForegroundColorAttributeName: RGBOF(0xf3565f)} range:range];
-            self.titleL.attributedText = string;
+            [self contentType:CNLiveBOrganizationTFCellTypeMust];
+            self.titleL.text = @"企业简称";
             self.contentL.text = @"";
             self.contentTF.placeholder = @"请输入企业简称";
             self.contentTF.tfIndexPath = indexPath;
         }else if (indexPath.row == 3) {
-            NSString *titleStr = @"* 企业代码";
-            NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:titleStr attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12],NSForegroundColorAttributeName:RGBOF(0x333333)}];
-            NSRange range = [titleStr rangeOfString:@"*"];
-            [string addAttributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12], NSForegroundColorAttributeName: RGBOF(0xf3565f)} range:range];
-            self.titleL.attributedText = string;
+            [self contentType:CNLiveBOrganizationTFCellTypeMust];
+            self.titleL.text = @"企业代码";
             self.contentL.text = @"";
             self.contentTF.placeholder = @"请输入企业代码";
             self.contentTF.tfIndexPath = indexPath;
         }else if (indexPath.row == 5) {
-            NSString *titleStr = @"企业地址";
-            NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:titleStr attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12],NSForegroundColorAttributeName:RGBOF(0x333333)}];
-            self.titleL.attributedText = string;
+            [self contentType:CNLiveBOrganizationTFCellTypeNormal];
+            self.titleL.text = @"企业地址";
             self.contentL.text = @"";
             self.contentTF.placeholder = @"请输入企业地址";
             self.contentTF.tfIndexPath = indexPath;
         }else if (indexPath.row == 7) {
-            NSString *titleStr = @"* 网站";
-            NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:titleStr attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12],NSForegroundColorAttributeName:RGBOF(0x333333)}];
-            NSRange range = [titleStr rangeOfString:@"*"];
-            [string addAttributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12], NSForegroundColorAttributeName: RGBOF(0xf3565f)} range:range];
-            self.titleL.attributedText = string;
+            [self contentType:CNLiveBOrganizationTFCellTypeMust];
+            self.titleL.text = @"网站";
             self.contentL.text = @"";
             self.contentTF.placeholder = @"请输入企业网站访问链接";
             self.contentTF.tfIndexPath = indexPath;
         }else if (indexPath.row == 8) {
-            NSString *titleStr = @"* 企业法人";
-            NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:titleStr attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12],NSForegroundColorAttributeName:RGBOF(0x333333)}];
-            NSRange range = [titleStr rangeOfString:@"*"];
-            [string addAttributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12], NSForegroundColorAttributeName: RGBOF(0xf3565f)} range:range];
-            self.titleL.attributedText = string;
+            
+            [self contentType:CNLiveBOrganizationTFCellTypeMust];
+            self.titleL.text = @"企业法人";
             self.contentL.text = @"";
             self.contentTF.placeholder = @"请输入企业法人姓名";
             self.contentTF.tfIndexPath = indexPath;
         }else if (indexPath.row == 9) {
-            NSString *titleStr = @"* 联系人";
-            NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:titleStr attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12],NSForegroundColorAttributeName:RGBOF(0x333333)}];
-            NSRange range = [titleStr rangeOfString:@"*"];
-            [string addAttributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12], NSForegroundColorAttributeName: RGBOF(0xf3565f)} range:range];
-            self.titleL.attributedText = string;
+
+            [self contentType:CNLiveBOrganizationTFCellTypeMust];
+            self.titleL.text = @"联系人";
             self.contentL.text = @"";
             self.contentTF.placeholder = @"请输入企业联系人姓名";
             self.contentTF.tfIndexPath = indexPath;
         }else if (indexPath.row == 10) {
-            NSString *titleStr = @"合同编号";
-            NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:titleStr attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12],NSForegroundColorAttributeName:RGBOF(0x333333)}];
-            self.titleL.attributedText = string;
+            [self contentType:CNLiveBOrganizationTFCellTypeNormal];
+            self.titleL.text = @"合同编号";
             self.contentL.text = @"";
             self.contentTF.placeholder = @"请输入合同编号";
             self.contentTF.tfIndexPath = indexPath;
         }else if (indexPath.row == 11) {
-            NSString *titleStr = @"* 营业执照号";
-            NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:titleStr attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12],NSForegroundColorAttributeName:RGBOF(0x333333)}];
-            NSRange range = [titleStr rangeOfString:@"*"];
-            [string addAttributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12], NSForegroundColorAttributeName: RGBOF(0xf3565f)} range:range];
-            self.titleL.attributedText = string;
+            [self contentType:CNLiveBOrganizationTFCellTypeMust];
+            self.titleL.text = @"营业执照号";
             self.contentL.text = @"";
             self.contentTF.placeholder = @"请输入营业执照号";
             self.contentTF.tfIndexPath = indexPath;
@@ -227,8 +192,37 @@
 }
 #pragma mark - ***私有方法***
+- (void)contentType:(CNLiveBOrganizationTFCellType) type{
+
+    if (type == CNLiveBOrganizationTFCellTypeMust) {
+        self.tipImageV.hidden = NO;
+        self.tipImageV.frame = CGRectMake(10, 18 , 7, 8);
+        self.titleL.frame = CGRectMake(21.5, 16, 72, 12);
+        self.contentL.hidden = YES;
+    }else if (type == CNLiveBOrganizationTFCellTypeNormal) {
+        self.tipImageV.hidden = YES;
+        self.tipImageV.frame = CGRectMake(10, 18 , 7, 8);
+        self.titleL.frame = CGRectMake(10, 16, 72, 12);
+        self.contentL.hidden = YES;
+       
+    }else {
+        self.tipImageV.hidden = NO;
+        self.tipImageV.frame = CGRectMake(10, 18, 7, 8);
+        self.titleL.frame = CGRectMake(21.5,16, 72, 12);
+        self.contentL.hidden = NO;
+    }
+    
+}
+
 #pragma mark - ***懒加载***
+- (UIImageView *)tipImageV {
+    if (!_tipImageV) {
+        _tipImageV = [[UIImageView alloc]init];
+    }
+    return _tipImageV;
+}
+
 /***  头部 ***/
 - (UILabel *)titleL {
@@ -285,6 +279,8 @@
 @interface CNLiveBOrganizationTViewCell()
+/** 必须标记*/
+@property (nonatomic, strong) UIImageView *tipImageV;
 /** 头部*/
 @property (nonatomic, strong) UILabel *titleL;
@@ -322,6 +318,11 @@
     [self setBackgroundColor:[UIColor whiteColor]];
     [self addSubview:self.contentTV];
     [self addSubview:self.titleL];
+    [self addSubview:self.tipImageV];
+    
+    self.tipImageV.frame = CGRectMake(10, 18 , 7, 8);
+    self.titleL.frame = CGRectMake(21.5, 16, 72, 12);
+    self.contentTV.frame = CGRectMake(104.5, 10, KScreenWidth - 104.5 - 30.5, 78);
      [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(textViewTextChange:) name:UITextViewTextDidChangeNotification object:nil];
@@ -329,16 +330,7 @@
 #pragma mark - ***layoutUI***
 - (void)layoutUI {
-    
-    __weak typeof(self) weakSelf = self;
-    
-    [self.titleL mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(weakSelf.mas_left).offset(10);
-        make.top.equalTo(weakSelf.mas_top).offset(8);
-        make.width.mas_equalTo(72);
-        make.height.mas_equalTo(28);
-    }];
-    
+
 }
@@ -355,11 +347,7 @@
     if (indexPath.section == 0) {
         if (indexPath.row == 4) {
-            NSString *titleStr = @"* 企业简介";
-            NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:titleStr attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12],NSForegroundColorAttributeName:RGBOF(0x333333)}];
-            NSRange range = [titleStr rangeOfString:@"*"];
-            [string addAttributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12], NSForegroundColorAttributeName: RGBOF(0xf3565f)} range:range];
-            self.titleL.attributedText = string;
+            self.titleL.text = @"企业简介";
             self.contentTV.placeholder = @"请输入企业简介(400字以内)";
             self.contentTV.placeholderFont = [UIFont systemFontOfSize:12];
             self.contentTV.placeholderColor = RGBOF(0xB9B9B9);
@@ -394,6 +382,15 @@
 #pragma mark - ***私有方法***
 #pragma mark - ***懒加载***
+- (UIImageView *)tipImageV {
+    if (!_tipImageV) {
+        _tipImageV = [[UIImageView alloc]init];
+        _tipImageV.image = [UIImage imageNamedFromOrganization:@"organization_must"];
+    }
+    return _tipImageV;
+}
+
+
 /***  头部 ***/
 - (UILabel *)titleL {
@@ -435,11 +432,16 @@
 #pragma mark - CNLiveBOrganizationSelectedCell 类型
 @interface CNLiveBOrganizationSelectedCell()
+
+
+/** 必须标记*/
+@property (nonatomic, strong) UIImageView *tipImageV;
 /** 头部*/
 @property (nonatomic, strong) UILabel *titleL;
 /** 认证*/
 @property (nonatomic, strong) UIButton *selectedBtn;
+
 @end
 @implementation CNLiveBOrganizationSelectedCell
@@ -473,32 +475,22 @@
     [self setBackgroundColor:[UIColor whiteColor]];
     [self addSubview:self.titleL];
     [self addSubview:self.selectedBtn];
+    [self addSubview:self.tipImageV];
+    
+    
+    self.tipImageV.frame = CGRectMake(10, 18, 7, 8);
+    self.titleL.frame = CGRectMake(21.5, 16, 72, 12);
+    self.selectedBtn.frame = CGRectMake(104.5, 10, KScreenWidth - 104.5 - 30.5, 28);
-    self.titleL.text = @"* 企业类型";
-    [self.selectedBtn setBackgroundColor:[UIColor yellowColor]];
+    self.titleL.text = @"企业类型";
+  
+    [self.selectedBtn addTarget:self action:@selector(selectedBtnAction:) forControlEvents:UIControlEventTouchUpInside];
 }
 #pragma mark - ***layoutUI***
 - (void)layoutUI {
-    
-    __weak typeof(self) weakSelf = self;
-    
-    [self.selectedBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(weakSelf.titleL.mas_right).offset(16);
-        make.top.equalTo(weakSelf.mas_top).offset(8);
-        make.right.equalTo(weakSelf.mas_right).offset(-30.5);
-        make.height.mas_equalTo(28);
-    }];
-    
-    [self.titleL mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(weakSelf.mas_left).offset(10);
-        make.centerY.equalTo(weakSelf.selectedBtn.mas_centerY);
-        make.width.mas_equalTo(72);
-        make.height.mas_equalTo(28);
-    }];
-    
-    
+
 }
@@ -513,11 +505,7 @@
        if (indexPath.section == 0) {
            if (indexPath.row == 6) {
-               NSString *titleStr = @"* 企业类型";
-               NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:titleStr attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12],NSForegroundColorAttributeName:RGBOF(0x333333)}];
-               NSRange range = [titleStr rangeOfString:@"*"];
-               [string addAttributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12], NSForegroundColorAttributeName: RGBOF(0xf3565f)} range:range];
-               self.titleL.attributedText = string;
+               self.titleL.text = @"企业类型";
            }else {
                return;
@@ -530,12 +518,29 @@
 #pragma mark - ***事件实现***
-
+- (void)selectedBtnAction:(UIButton *)button {
+    
+    if (self.clickSelectedCellBlock) {
+        self.clickSelectedCellBlock(self, button);
+    }
+    
+    
+}
 #pragma mark - ***私有方法***
 #pragma mark - ***懒加载***
+
+- (UIImageView *)tipImageV {
+    if (!_tipImageV) {
+        _tipImageV = [[UIImageView alloc]init];
+        _tipImageV.image = [UIImage imageNamedFromOrganization:@"organization_must"];
+    }
+    return _tipImageV;
+}
+
+
 /***  头部 ***/
 - (UILabel *)titleL {
@@ -558,6 +563,7 @@
         _selectedBtn.layer.cornerRadius = 5;
         _selectedBtn.layer.borderColor = RGBOF(0xc1c1c1).CGColor;
         _selectedBtn.layer.borderWidth = 0.5;
+        
     }
     return _selectedBtn;
 }
@@ -620,9 +626,8 @@
     [self addSubview:self.titleL];
     [self addSubview:self.contentL];
-    //测试
     self.titleL.text = @"* 企业logo";
-    self.contentL.text = @"请上传LOGO图片（尺寸100*100，图片大小5M以内";
+    
     [self.contentImageView setBackgroundColor:[UIColor yellowColor]];
 }
@@ -635,7 +640,7 @@
         make.left.equalTo(weakSelf.mas_left).offset(10);
         make.top.equalTo(weakSelf.mas_top).offset(8);
         make.width.mas_equalTo(72);
-        make.height.mas_equalTo(28);
+        make.height.mas_equalTo(12);
     }];
     [self.contentImageView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -656,6 +661,54 @@
 }
 #pragma mark - editUI
+- (void)editUIWithIndexPath:(NSIndexPath *)indexPath {
+    
+    self.indexPath = indexPath;
+    
+    __weak typeof(self) weakSelf = self;
+    if (indexPath.section == 0) {
+        if (indexPath.row == 1) {
+            NSString *titleStr = @"* 企业logo";
+            NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:titleStr attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12],NSForegroundColorAttributeName:RGBOF(0x333333)}];
+            NSRange range = [titleStr rangeOfString:@"*"];
+            [string addAttributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12], NSForegroundColorAttributeName: RGBOF(0xf3565f)} range:range];
+            self.titleL.attributedText = string;
+            self.contentL.text = @"请上传LOGO图片（尺寸100*100，图片大小5M以内";
+            
+            [self.contentImageView mas_updateConstraints:^(MASConstraintMaker *make) {
+                make.left.equalTo(weakSelf.titleL.mas_right).offset(23);
+                make.top.equalTo(weakSelf.mas_top).offset(8);
+                make.width.mas_offset(60);
+                make.height.mas_equalTo(60);
+            }];
+
+            
+        }else if (indexPath.row == 12){
+            NSString *titleStr = @"* 营业执照:";
+            NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:titleStr attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12],NSForegroundColorAttributeName:RGBOF(0x333333)}];
+            NSRange range = [titleStr rangeOfString:@"*"];
+            [string addAttributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12], NSForegroundColorAttributeName: RGBOF(0xf3565f)} range:range];
+            self.titleL.attributedText = string;
+            
+            self.contentL.text = @"请上传营业执照图片，格式为JPG，PNG（图片大小不超过5M）";
+            
+            [self.contentImageView mas_updateConstraints:^(MASConstraintMaker *make) {
+                make.left.equalTo(weakSelf.titleL.mas_right).offset(23);
+                make.top.equalTo(weakSelf.mas_top).offset(8);
+                make.width.mas_offset(100);
+                make.height.mas_equalTo(137);
+            }];
+        
+            
+        }else {
+            return;
+            
+        }
+    }else {
+        return;
+    }
+    
+}
 #pragma mark - ***事件实现***
@@ -664,6 +717,16 @@
 #pragma mark - ***私有方法***
+- (NSMutableAttributedString *)returnAllContentWithTitle:(NSString *)title content:(NSString *)content {
+    NSString *titleStr = [NSString stringWithFormat:@"%@",title ? title : @""];
+    NSString *contentStr = [NSString stringWithFormat:@"%@ %@",title ? title : @"",content ? content : @""];
+    NSMutableAttributedString *allStr = [[NSMutableAttributedString alloc] initWithString:contentStr attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:12],NSForegroundColorAttributeName: RGBOF(0xB9B9B9)}];
+    NSRange rang = [contentStr rangeOfString:titleStr];
+    [allStr addAttributes:@{NSForegroundColorAttributeName: RGBOF(0x333333)} range:rang];
+    return allStr;
+    
+}
+
 #pragma mark - ***懒加载***
 /***  头部 ***/
 - (UILabel *)titleL {
@@ -250,7 +250,7 @@
         make.left.equalTo(weakSelf.mas_left).offset(10);
         make.top.equalTo(weakSelf.mas_top).offset(10);
         make.width.mas_equalTo(72);
-        make.height.mas_equalTo(28);
+        make.height.mas_equalTo(12);
     }];
@@ -35,6 +35,9 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveBOrganizationTVFooteriew : UIView
+/** 点击item实现*/
+@property (nonatomic, copy) void(^clickCommitButtonBlock)(CNLiveBOrganizationTVFooteriew *footerView, UIButton *commitBtn);
+
 /** 协议按钮*/
 @property (nonatomic, strong) UIButton *agreementBtn;
 /** 协议文字*/
@@ -318,6 +318,8 @@
     [string addAttributes:@{NSFontAttributeName: [UIFont systemFontOfSize:11], NSForegroundColorAttributeName: [UIColor colorWithRed:72/255.0 green:167/255.0 blue:249/255.0 alpha:1.0]} range:range];
     _agreementL.attributedText = string;
+    [self.commitBtn addTarget:self action:@selector(commitBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    
 }
 #pragma mark - ***layoutUI***
@@ -350,6 +352,14 @@
 #pragma mark - editUI
 #pragma mark - ***事件实现***
+- (void)commitBtnAction:(UIButton *)btn {
+    
+    if (self.clickCommitButtonBlock) {
+        self.clickCommitButtonBlock(self, btn);
+    }
+    
+    
+}
 #pragma mark - ***私有方法***