提交添加相册选择

梁星国
1 parent c1c64c09
Showing 24 changed files with 572 additions and 95 deletions
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_return@2x.png
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_return@3x.png
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_selectedImageL@2x.png
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_selectedImageL@3x.png
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_selectedImageS@2x.png
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_selectedImageS@3x.png
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_selectedTipImage@2x.png
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_selectedTipImage@3x.png
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_selectedtip@2x.png
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_selectedtip@3x.png
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOrganizationValidattionController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Other/CNLiveBOrganizationButton.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Other/CNLiveBOrganizationButton.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Other/CNLiveBOrganizationPopCell.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Other/CNLiveBOrganizationPopCell.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Other/CNLiveBOrganizationPopSelectedView.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Other/CNLiveBOrganizationPopSelectedView.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationContentCell.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationContentCell.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationValidationHeaderView.m
@@ -11,6 +11,7 @@
 #import "CNLiveBOrganizationValidationHeaderView.h"
 #import "CNLiveBOrganizationContentCell.h"
 #import "CNLiveBAgreementCommitFinishController.h"
+#import "CNLiveBOrganizationPopSelectedView.h"
  
 @interface CNLiveBOrganizationValidattionController ()<UITableViewDataSource,UITableViewDelegate,UITextFieldDelegate,UITextViewDelegate>{
     CGPoint   contentoffset;
@@ -24,6 +25,9 @@
 /** 列表 */
 @property (nonatomic , strong) UITableView *tableView;
  
+/** 弹出视图*/
+@property (nonatomic , strong) CNLiveBOrganizationPopSelectedView *popSelectedView;
+
  
 @end
  
@@ -174,6 +178,10 @@
         }else if (indexPath.row == 6) {
             CNLiveBOrganizationSelectedCell *selectedCell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBOrganizationSelectedCell forIndexPath:indexPath];
             [selectedCell editUIWithIndexPath:indexPath];
+            __weak typeof(self) weakSelf = self;
+            selectedCell.clickSelectedCellBlock = ^(CNLiveBOrganizationSelectedCell * _Nonnull selectedCell, CNLiveBOrganizationButton * _Nonnull selectedBtn) {
+                [weakSelf popView];
+            };
             return selectedCell;
  
         }else if (indexPath.row == 1 || indexPath.row == 12) {
@@ -229,7 +237,7 @@
         }else if (indexPath.row == 4){
             return 100;
         }else if (indexPath.row == 12){
-            return 200;
+            return 231;
         }else {
             return 44;
         }
@@ -276,6 +284,18 @@
     [self.navigationController pushViewController:commitVC animated:YES];
 }
  
+                 
+- (void)popView {
+    
+    [self.popSelectedView popViewForView:self.view];
+    self.popSelectedView.clickCellBlock = ^(CNLiveBOrganizationPopSelectedView * _Nonnull view, NSString * _Nonnull text) {
+        NSLog(@"选择结束返回");
+        
+        
+    };
+                    
+               
+}
  
  
  
@@ -294,7 +314,6 @@
         [_tableView registerClass:[CNLiveBOrganizationTViewCell class] forCellReuseIdentifier:kCNLiveBOrganizationTViewCell];
         [_tableView registerClass:[CNLiveBOrganizationSelectedCell class] forCellReuseIdentifier:kCNLiveBOrganizationSelectedCell];
         [_tableView registerClass:[CNLiveBOrganizationImageVSelectedCell class] forCellReuseIdentifier:kCNLiveBOrganizationImageVSelectedCell];
-    
         [_tableView registerClass:[CNLiveBOrganizationTVHeaderView class] forHeaderFooterViewReuseIdentifier:kCNLiveBOrganizationTVHeaderView];
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         _tableView.dataSource = self;
@@ -315,10 +334,18 @@
 - (UIView *)footerView {
     if (!_footerView) {
         _footerView = [[CNLiveBOrganizationTVFooteriew alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, 106)];
+        [_footerView setBackgroundColor:RGBOF(0xf9f9f9)];
     }
     return _footerView;
 }
  
+- (CNLiveBOrganizationPopSelectedView *)popSelectedView {
+    if (!_popSelectedView) {
+        _popSelectedView = [[CNLiveBOrganizationPopSelectedView alloc]initWithFrame:CGRectZero];
+    }
+    return _popSelectedView;;
+}
+
  
 /*
  #pragma mark - Navigation
@@ -15,6 +15,8 @@ NS_ASSUME_NONNULL_BEGIN
  
 @property (nonatomic, strong) UIImageView *tipImageV;
  
+@property (nonatomic, assign) BOOL isSelectedStatus;
+
 @end
  
 NS_ASSUME_NONNULL_END
@@ -6,6 +6,9 @@
 //
  
 #import "CNLiveBOrganizationButton.h"
+#import <Masonry/Masonry.h>
+#import "UIImage+OrganizationValidation.h"
+#import <CNLiveBaseKit/CNLiveBaseKit.h>
  
 @implementation CNLiveBOrganizationButton
  
@@ -27,13 +30,73 @@
     [self setUpUI];
 }
  
+#pragma mark - setter
+- (void)setIsSelectedStatus:(BOOL)isSelectedStatus {
+    _isSelectedStatus = isSelectedStatus;
+    if (!_isSelectedStatus) {
+        self.textL.textColor = RGBOF(0xb9b9b9);
+    }else{
+        self.textL.textColor = RGBOF(0x333333);
+    }
+    
+}
+
  
  
 - (void)setUpUI
 {
  
+    [self addSubview:self.textL];
+    [self addSubview:self.tipImageV];
+    self.textL.text = @"请选择企业类型";
+    self.isSelectedStatus = NO;
+    self.textL.frame = CGRectMake(6, 8, KScreenWidth - 200, 12);
+    self.tipImageV.frame = CGRectMake(self.frame.size.width -14.5, 8, 6.5, 12);
+    
  
 }
  
  
+#pragma mark - ***layoutUI***
+- (void)layoutUI {
+
+    
+}
+
+#pragma mark - editUI
+
+
+
+#pragma mark - ***事件实现***
+
+
+
+
+#pragma mark - ***私有方法***
+#pragma mark - ***懒加载***
+
+- (UIImageView *)tipImageV {
+    if (!_tipImageV) {
+        _tipImageV = [[UIImageView alloc]init];
+        _tipImageV.image = [UIImage imageNamedFromOrganization:@"organization_selectedtip"];
+    }
+    return _tipImageV;
+}
+
+
+/***  头部 ***/
+- (UILabel *)textL {
+    
+    if (!_textL) {
+        _textL = [[UILabel alloc]init];
+        _textL.font = [UIFont systemFontOfSize:12];
+        _textL.numberOfLines = 1;
+    }
+    return _textL;
+    
+}
+
+
+
+
 @end
+//
+//  CNLiveBOrganizationPopCell.h
+//  CNLiveOrganizationValidationModule
+//
+//  Created by 梁星国 on 2020/4/14.
+//
+
+#import <UIKit/UIKit.h>
+
+
+///选着类型cell
+#define kCNLiveBOrganizationPopCell @"CNLiveBOrganizationPopCell"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveBOrganizationPopCell : UITableViewCell
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveBOrganizationPopCell.m
+//  CNLiveOrganizationValidationModule
+//
+//  Created by 梁星国 on 2020/4/14.
+//
+
+#import "CNLiveBOrganizationPopCell.h"
+#import <Masonry/Masonry.h>
+#import "UIImage+OrganizationValidation.h"
+#import <CNLiveBaseKit/CNLiveBaseKit.h>
+
+@interface CNLiveBOrganizationPopCell()
+/** 必须标记*/
+@property (nonatomic, strong) UIImageView *tipImageV;
+/** 头部*/
+@property (nonatomic, strong) UILabel *titleL;
+
+
+@end
+
+@implementation CNLiveBOrganizationPopCell
+
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if (self) {
+        [self setupUI];
+    }
+    return self;
+}
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    [self setupUI];
+    
+}
+
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    
+    [self layoutUI];
+}
+
+
+#pragma mark - ***setupUI***
+- (void)setupUI {
+    
+    [self setBackgroundColor:[UIColor whiteColor]];
+    [self addSubview:self.titleL];
+    [self addSubview:self.tipImageV];
+    
+    self.tipImageV.frame = CGRectMake(KScreenWidth - 35, 17 ,20, 15);
+    self.titleL.frame = CGRectMake(14.5, 16, KScreenWidth - 35 - 14.5, 12);
+
+    
+}
+
+#pragma mark - ***layoutUI***
+- (void)layoutUI {
+
+    
+    
+}
+
+#pragma mark - editUI
+
+- (void)editUIWithIndexPath:(NSIndexPath *)indexPath {
+    
+ 
+    
+}
+
+
+#pragma mark - ***事件实现***
+
+#pragma mark - ***监听实现***
+
+
+
+#pragma mark - ***私有方法***
+#pragma mark - ***懒加载***
+- (UIImageView *)tipImageV {
+    if (!_tipImageV) {
+        _tipImageV = [[UIImageView alloc]init];
+        _tipImageV.image = [UIImage imageNamedFromOrganization:@"organization_selectedTipImage"];
+    }
+    return _tipImageV;
+}
+
+
+/***  头部 ***/
+- (UILabel *)titleL {
+    
+    if (!_titleL) {
+        _titleL = [[UILabel alloc]init];
+        _titleL.font = [UIFont systemFontOfSize:14];
+        _titleL.textColor = RGBOF(0x282828);
+        _titleL.numberOfLines = 1;
+    }
+    return _titleL;
+    
+}
+
+
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+    
+    // Configure the view for the selected state
+}
+@end
+//
+//  CNPlayDetailAllView.h
+//  CNLiveNetAdd
+//
+//  Created by 梁星国 on 2018/12/14.
+//  Copyright © 2018年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveBOrganizationPopSelectedView : UIView
+
+/** 数据数组 */
+@property (strong , nonatomic) NSMutableArray *dataSourceArr;
+
+
+/** 点击Cell回调 */
+@property (nonatomic, copy) void(^clickCellBlock)(CNLiveBOrganizationPopSelectedView *view,NSString *text);
+
+-(void)popViewForView:(UIView *)view;
+
+-(void)dismissView;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNPlayDetailAllView.m
+//  CNLiveNetAdd
+//
+//  Created by 梁星国 on 2018/12/14.
+//  Copyright © 2018年 cnlive. All rights reserved.
+//
+
+#import "CNLiveBOrganizationPopSelectedView.h"
+#import <Masonry/Masonry.h>
+#import "UIImage+OrganizationValidation.h"
+#import <CNLiveBaseKit/CNLiveBaseKit.h>
+#import "CNLiveBOrganizationPopCell.h"
+
+@interface CNLiveBOrganizationPopSelectedView ()<UITableViewDelegate,UITableViewDataSource>
+{
+
+}
+
+@property (strong ,nonatomic) UIView *headerView;
+@property (strong ,nonatomic) UILabel *headerL;//头名
+@property (strong ,nonatomic) UIButton *returnBtn;//提示
+@property (strong ,nonatomic) UITableView *tableView;//列表
+
+
+@end
+
+
+@implementation CNLiveBOrganizationPopSelectedView
+
+- (instancetype)initWithFrame:(CGRect)frame 
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        
+        [self setupUI];
+        [self editUI];
+        
+    }
+    return self;
+}
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    [self setupUI];
+
+}
+
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    
+    [self layoutUI];
+}
+
+#pragma mark - getter,setter
+
+
+#pragma mark - setupUI
+- (void)setupUI {
+    self. dataSourceArr  = [NSMutableArray array];
+    
+    [self.headerView addSubview:self.headerL];
+    [self.headerView addSubview:self.returnBtn];
+    self.headerView.frame = CGRectMake(0, 0, KScreenWidth, 50);
+    UIBezierPath *fieldPath = [UIBezierPath bezierPathWithRoundedRect:self.headerView.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(15 , 15)];
+    CAShapeLayer *fieldLayer = [[CAShapeLayer alloc] init];
+    fieldLayer.frame = self.headerView.bounds;
+    fieldLayer.path = fieldPath.CGPath;
+    self.headerView.layer.mask = fieldLayer;
+    self.headerL.frame = CGRectMake(44, 0, KScreenWidth - 88, 50);
+    self.headerL.text = @"请选择企业类型";
+    self.returnBtn.frame = CGRectMake(KScreenWidth - 54, 0, 44, 44);
+    self.tableView.tableHeaderView = self.headerView;
+    UIView *footerView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, kVerticalBottomSafeHeight)];
+    self.tableView.tableFooterView = footerView;
+    [self.tableView setBackgroundColor:[UIColor clearColor]];
+
+    
+    [self addSubview:self.tableView];
+    /** tableView */
+    self.tableView.delegate = self;
+    self.tableView.dataSource = self;
+    [self.tableView registerClass:[CNLiveBOrganizationPopCell class] forCellReuseIdentifier:kCNLiveBOrganizationPopCell];
+    [self.tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:@"Cell"];
+    [self.tableView registerClass:[UITableViewHeaderFooterView class] forHeaderFooterViewReuseIdentifier:@"HeaderFooter"];
+    
+    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(viewTapAction:)];
+    [self addGestureRecognizer:tap];
+    
+}
+
+#pragma mark - layoutUI
+- (void)layoutUI {
+    __weak typeof(self) weakSelf = self;
+    
+    [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(weakSelf.mas_left);
+        make.top.equalTo(weakSelf.mas_top).offset(KScreenHeight/2);
+        make.right.equalTo(weakSelf.mas_right);
+        make.height.mas_equalTo(KScreenHeight/2);
+    }];
+
+}
+
+#pragma mark - editUI
+- (void)editUI {
+    
+}
+
+
+
+#pragma mark - delegate
+#pragma mark - <UITableViewDelegate,UITableViewDataSource>
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return 13;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+   CNLiveBOrganizationPopCell *cell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBOrganizationPopCell forIndexPath:indexPath];
+
+    return cell;
+}
+
+- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
+    UITableViewHeaderFooterView *headerVeiw = [tableView dequeueReusableHeaderFooterViewWithIdentifier:@"HeaderFooter"];
+    return headerVeiw;
+    
+}
+
+- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {
+    UITableViewHeaderFooterView *footerView = [tableView dequeueReusableHeaderFooterViewWithIdentifier:@"HeaderFooter"];
+    return footerView;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    return 49.5;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+    return 0.01;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+    return 0.01;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    
+    if (self.clickCellBlock) {
+        self.clickCellBlock(self, @"影视");
+        __weak typeof(self) weakSelf = self;
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            if (weakSelf) {
+                [weakSelf dismissView];
+            }
+        });
+    }
+    
+}
+
+#pragma mark - 事件实现
+- (void)viewTapAction:(UITapGestureRecognizer *)tap {
+    
+    [self dismissView];
+}
+
+#pragma mark - 私有方法
+
+#pragma mark - 弹出
+-(void)popViewForView:(UIView *)view{
+    
+    self.frame = CGRectMake(0, KScreenHeight/2, KScreenWidth, KScreenHeight);
+    [self setBackgroundColor:RGBA(0, 0, 0, 0.5)];
+    [view addSubview:self];
+    [view bringSubviewToFront:self];
+
+    [UIView animateWithDuration:0.25 animations:^{
+        
+        self.frame = CGRectMake(0,KScreenHeight - CGRectGetHeight(self.frame), KScreenWidth, CGRectGetHeight(self.frame));
+        
+    }];
+}
+
+-(void)dismissView{
+    
+    [UIView animateWithDuration:0.25 animations:^{
+        self.frame = CGRectMake(0, KScreenHeight, KScreenWidth,CGRectGetHeight(self.frame));
+    } completion:^(BOOL finished) {
+        self.dataSourceArr = [NSMutableArray array];
+        [self removeFromSuperview];
+        
+    }];
+}
+
+
+
+#pragma mark - 接口
+- (void)getAllList{
+    
+
+    
+}
+
+#pragma mark - 懒加载
+/** 列表 */
+- (UITableView *)tableView {
+    if (!_tableView) {
+        _tableView = [[UITableView alloc]initWithFrame:CGRectZero style:UITableViewStylePlain];
+        _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+    }
+    return _tableView;
+}
+/** 头部视图 */
+- (UIView *)headerView {
+    if (!_headerView) {
+        _headerView = [[UIView alloc]init];
+        [_headerView setBackgroundColor:kWhiteColor];
+    }
+    return _headerView;
+}
+
+/** 头名 */
+- (UILabel *)headerL {
+    if (!_headerL) {
+        _headerL = [[UILabel alloc]init];
+        _headerL.textColor = RGB(40, 40, 40);
+        _headerL.textAlignment = NSTextAlignmentCenter;
+        _headerL.font = [UIFont CNBoldFontOfSize:15];
+        
+    }
+    return _headerL;
+}
+
+/** 提示视图 */
+- (UIButton *)returnBtn {
+
+    if (!_returnBtn) {
+        _returnBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_returnBtn setImage:[UIImage imageNamedFromOrganization:@"organization_return"] forState:UIControlStateNormal];
+    }
+    return _returnBtn;
+}
+
+
+
+@end
@@ -8,6 +8,7 @@
 #import <UIKit/UIKit.h>
 #import "CNLiveBOrganizationTextField.h"
 #import "CNLiveBOrganizationTextView.h"
+#import "CNLiveBOrganizationButton.h"
  
 ///UITextField 类型
 #define kCNLiveBOrganizationTFCell @"CNLiveBOrganizationTFCell"
@@ -56,9 +57,11 @@ NS_ASSUME_NONNULL_END
 NS_ASSUME_NONNULL_BEGIN
  
 @interface CNLiveBOrganizationSelectedCell : UITableViewCell
+/** 认证*/
+@property (nonatomic, strong) CNLiveBOrganizationButton *selectedBtn;
  
 /** 点击item实现*/
-@property (nonatomic, copy) void(^clickSelectedCellBlock)(CNLiveBOrganizationSelectedCell *selectedCell, UIButton *selectedBtn);
+@property (nonatomic, copy) void(^clickSelectedCellBlock)(CNLiveBOrganizationSelectedCell *selectedCell, CNLiveBOrganizationButton *selectedBtn);
  
 @property (strong, nonatomic) NSIndexPath *indexPath;
  
@@ -10,6 +10,7 @@
 #import "UIImage+OrganizationValidation.h"
 #import <CNLiveBaseKit/CNLiveBaseKit.h>
 #import "CNLiveBOrganizationTextField.h"
+#import "CNLiveBOrganizationButton.h"
  
 #pragma mark -
 #pragma mark - UITextField 类型
@@ -72,7 +73,7 @@
 #pragma mark - ***layoutUI***
 - (void)layoutUI {
  
-
+    
 }
  
 #pragma mark - editUI
@@ -136,7 +137,7 @@
             self.contentTF.tfIndexPath = indexPath;
  
         }else if (indexPath.row == 9) {
-
+            
             [self contentType:CNLiveBOrganizationTFCellTypeMust];
             self.titleL.text = @"联系人";
             self.contentL.text = @"";
@@ -193,7 +194,7 @@
  
 #pragma mark - ***私有方法***
 - (void)contentType:(CNLiveBOrganizationTFCellType) type{
-
+    
     if (type == CNLiveBOrganizationTFCellTypeMust) {
         self.tipImageV.hidden = NO;
         self.tipImageV.frame = CGRectMake(10, 18 , 7, 8);
@@ -204,7 +205,7 @@
         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);
@@ -324,13 +325,13 @@
     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];
+    [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(textViewTextChange:) name:UITextViewTextDidChangeNotification object:nil];
  
 }
  
 #pragma mark - ***layoutUI***
 - (void)layoutUI {
-
+    
  
  
 }
@@ -340,9 +341,9 @@
 - (void)editUIWithIndexPath:(NSIndexPath *)indexPath {
  
     if (!indexPath) {
-          return;
-      }
-      
+        return;
+    }
+    
     self.indexPath = indexPath;
  
     if (indexPath.section == 0) {
@@ -407,7 +408,7 @@
 - (UITextView *)contentTV {
  
     if (!_contentTV) {
-        _contentTV = [[CNLiveBOrganizationTextView alloc]initWithFrame:CGRectMake(97, 8, KScreenWidth - 97 -29.5, 78)];
+        _contentTV = [[CNLiveBOrganizationTextView alloc]initWithFrame:CGRectMake(104.5, 10, KScreenWidth - 104.5 - 30.5, 78)];
         _contentTV.font = [UIFont systemFontOfSize:12];
         _contentTV.layer.masksToBounds = YES;
         _contentTV.layer.cornerRadius = 5;
@@ -438,8 +439,7 @@
 @property (nonatomic, strong) UIImageView *tipImageV;
 /** 头部*/
 @property (nonatomic, strong) UILabel *titleL;
-/** 认证*/
-@property (nonatomic, strong) UIButton *selectedBtn;
+
  
  
 @end
@@ -483,14 +483,14 @@
     self.selectedBtn.frame = CGRectMake(104.5, 10, KScreenWidth - 104.5 - 30.5, 28);
  
     self.titleL.text = @"企业类型";
-  
+    
     [self.selectedBtn addTarget:self action:@selector(selectedBtnAction:) forControlEvents:UIControlEventTouchUpInside];
  
 }
  
 #pragma mark - ***layoutUI***
 - (void)layoutUI {
-
+    
  
 }
  
@@ -498,27 +498,27 @@
 - (void)editUIWithIndexPath:(NSIndexPath *)indexPath {
  
     if (!indexPath) {
-             return;
-         }
-         
-       self.indexPath = indexPath;
-       
-       if (indexPath.section == 0) {
-           if (indexPath.row == 6) {
-               self.titleL.text = @"企业类型";
-               
-           }else {
-               return;
-           }
-       }else {
-           return;
-       }
+        return;
+    }
+    
+    self.indexPath = indexPath;
+    
+    if (indexPath.section == 0) {
+        if (indexPath.row == 6) {
+            self.titleL.text = @"企业类型";
+            
+        }else {
+            return;
+        }
+    }else {
+        return;
+    }
  
 }
  
  
 #pragma mark - ***事件实现***
-- (void)selectedBtnAction:(UIButton *)button {
+- (void)selectedBtnAction:(CNLiveBOrganizationButton *)button {
  
     if (self.clickSelectedCellBlock) {
         self.clickSelectedCellBlock(self, button);
@@ -557,7 +557,7 @@
 - (UIButton *)selectedBtn {
  
     if (!_selectedBtn) {
-        _selectedBtn = [[UIButton alloc]init];
+        _selectedBtn = [[CNLiveBOrganizationButton alloc]initWithFrame:CGRectMake(104.5, 10, KScreenWidth - 104.5 - 30.5, 28)];
         _selectedBtn.titleLabel.font = [UIFont systemFontOfSize:12];
         _selectedBtn.layer.masksToBounds = YES;
         _selectedBtn.layer.cornerRadius = 5;
@@ -583,6 +583,8 @@
 #pragma mark - CNLiveBOrganizationImageVSelectedCell 图片选择
  
 @interface CNLiveBOrganizationImageVSelectedCell()
+/** 必须标记*/
+@property (nonatomic, strong) UIImageView *tipImageV;
 /** 图片*/
 @property (nonatomic, strong) UIImageView *contentImageView;
 /** 头部*/
@@ -625,37 +627,22 @@
     [self addSubview:self.contentImageView];
     [self addSubview:self.titleL];
     [self addSubview:self.contentL];
+    [self addSubview:self.tipImageV];
+    
+    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.contentImageView.frame = CGRectMake(104.5, 10, 60, 60);
+    self.titleL.centerY = self.contentImageView.centerY;
+    self.tipImageV.centerY = self.contentImageView.centerY;
+    self.contentL.frame = CGRectMake(104.5, self.contentImageView.bottom + 6, KScreenWidth - 104.5 - 30.5, 30);
  
-    self.titleL.text = @"* 企业logo";
  
-    [self.contentImageView setBackgroundColor:[UIColor yellowColor]];
 }
  
 #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(12);
-    }];
-    
-    [self.contentImageView mas_makeConstraints:^(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);
-    }];
-    
-    [self.contentL mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(weakSelf.contentImageView.mas_left);
-        make.top.equalTo(weakSelf.contentImageView.mas_bottom).offset(6);
-        make.right.equalTo(weakSelf.mas_right).offset(-41);
-        make.bottom.equalTo(weakSelf.mas_bottom).offset(-8);
-    }];
  
  
 }
@@ -668,37 +655,33 @@
     __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;
+            NSString *titleStr = @"企业logo";
+            self.titleL.text = titleStr;
             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);
-            }];
-
+            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.contentImageView.frame = CGRectMake(104.5, 10, 60, 60);
+            self.titleL.centerY = self.contentImageView.centerY;
+            self.tipImageV.centerY = self.contentImageView.centerY;
+            self.contentL.frame = CGRectMake(104.5, self.contentImageView.bottom + 6, KScreenWidth - 104.5 - 30.5, 30);
+            self.contentImageView.image = [UIImage imageNamedFromOrganization:@"organization_selectedImageS"];
+#pragma mark - TODO:判断是否有图
  
         }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;
-            
+            NSString *titleStr = @"营业执照:";
+            self.titleL.text = titleStr;
             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);
-            }];
-        
+            self.tipImageV.frame = CGRectMake(10, 18 , 7, 8);
+            self.tipImageV.image = [UIImage imageNamedFromOrganization:@"organization_must"];
+            self.titleL.frame = CGRectMake(21.5, 10, 72, 12);
+            self.contentImageView.frame = CGRectMake(104.5, 10, 100, 137);
+            self.tipImageV.centerY =  self.titleL.centerY;
+            self.contentL.frame = CGRectMake(104.5, self.contentImageView.bottom + 6, KScreenWidth - 104.5 - 30.5, 30);
+            self.contentImageView.image = [UIImage imageNamedFromOrganization:@"organization_selectedImageL"];
+#pragma mark - TODO:判断是否有图
  
         }else {
             return;
@@ -717,15 +700,7 @@
  
  
 #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 - ***懒加载***
 /***  头部 ***/
@@ -148,7 +148,7 @@
 {
     if (!_tipImageVFirst) {
         _tipImageVFirst = [[UIImageView alloc]init];
-        _tipImageVFirst.image = [UIImage imageNamedFromOrganization:@"organization_ information"];
+        _tipImageVFirst.image = [UIImage imageNamedFromOrganization:@"organization_information"];
  
     }
     return _tipImageVFirst;
@@ -370,8 +370,8 @@
  
     if (!_agreementBtn) {
         _agreementBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_agreementBtn setImage:[UIImage imageNamedFromOrganization:@"organization_ selected"] forState:UIControlStateNormal];
-        [_agreementBtn setImage:[UIImage imageNamedFromOrganization:@"organization_ selected"] forState:UIControlStateSelected];
+        [_agreementBtn setImage:[UIImage imageNamedFromOrganization:@"organization_selected"] forState:UIControlStateNormal];
+        [_agreementBtn setImage:[UIImage imageNamedFromOrganization:@"organization_selected"] forState:UIControlStateSelected];
     }
     return _agreementBtn;