Bladeren bron

bug自发布页面bug修改

15555599100 6 jaren geleden
bovenliggende
commit
57ab6e78c6
26 gewijzigde bestanden met toevoegingen van 358 en 166 verwijderingen
  1. 19 1
      HappyJob/HappyJob/BClass/BHome_首页/ViewController/BHomeResumeDetailViewController.m
  2. 13 2
      HappyJob/HappyJob/BClass/BHome_首页/ViewController/BHomeViewController.m
  3. 6 6
      HappyJob/HappyJob/BClass/BHome_首页/Views/Cell/BHomeListCell.m
  4. 5 11
      HappyJob/HappyJob/BClass/BHome_首页/企业认证/ViewController/BHomeCertificationEnterprisePictureVC.m
  5. 2 0
      HappyJob/HappyJob/BClass/BHome_首页/企业认证/ViewController/BHomeCertificationEnterpriseVC.m
  6. 1 0
      HappyJob/HappyJob/BClass/BHome_首页/企业认证/ViewController/BHomeCertificationingEnterpriseVC.m
  7. 9 1
      HappyJob/HappyJob/BClass/BHome_首页/面试邀请/ViewController/BHomeInvitationViewController.m
  8. 11 49
      HappyJob/HappyJob/BClass/BPosition_职位/APIManager/BPositionDataBox.m
  9. 10 4
      HappyJob/HappyJob/BClass/BPosition_职位/View/BPositionCell.m
  10. 36 12
      HappyJob/HappyJob/BClass/BPosition_职位/ViewController/BPositionViewController.m
  11. 1 1
      HappyJob/HappyJob/CClass/DataCenter/Model/Position/HJPositionModel.h
  12. 12 1
      HappyJob/HappyJob/CClass/JobList_工作列表信息/FullTime_全职工作/HJFullTimeDetailViewController.m
  13. 14 2
      HappyJob/HappyJob/CClass/JobList_工作列表信息/PartTime_兼职工作/HJPartTimeDetailViewController.m
  14. 4 1
      HappyJob/HappyJob/CClass/JobList_工作列表信息/PositionDetail_岗位详情/PositionDetailAPIManager/HJPositionDetailDataBox.m
  15. 5 0
      HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/View/HJResumeNaviView.h
  16. 82 6
      HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/View/HJResumeNaviView.m
  17. 32 22
      HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/ViewController/HJResumeViewController.m
  18. 2 3
      HappyJob/HappyJob/CClass/Me_我/View/Header_头视图/HJMeProfileView.m
  19. 3 1
      HappyJob/HappyJob/CClass/Me_我/View/NavBar_我的导航栏/HJMeNavBarView.h
  20. 20 8
      HappyJob/HappyJob/CClass/Me_我/View/NavBar_我的导航栏/HJMeNavBarView.m
  21. 69 28
      HappyJob/HappyJob/CClass/Me_我/ViewController/HJMeViewController.m
  22. 1 0
      HappyJob/HappyJob/Custom/Components/CustomControl/UIView/JobDetail_职位详情/HJJobDetailForwardView.h
  23. 0 1
      HappyJob/HappyJob/Custom/Components/CustomControl/UIView/JobDetail_职位详情/HJJobDetailForwardView.m
  24. 1 3
      HappyJob/HappyJob/Custom/HeaderViewSelectButton/HeaderSelectView.m
  25. 0 2
      HappyJob/HappyJob/Custom/HeaderViewSelectButton/HeaderViewSelectButton.m
  26. 0 1
      HappyJob/HappyJob/ViewController.m

+ 19 - 1
HappyJob/HappyJob/BClass/BHome_首页/ViewController/BHomeResumeDetailViewController.m

@@ -19,7 +19,9 @@
 <
 FBAPIManagerDelegate,
 FBAPIManagerInterceptor,
-FBScrollLayoutViewDelegate
+FBScrollLayoutViewDelegate,
+UINavigationControllerDelegate,
+UIGestureRecognizerDelegate
 >
 @property (nonatomic, strong) FBScrollLayoutView           *scrollLayoutView;
 @property (nonatomic, strong) BHomeResumeBasicInformation   *basicInfoView;
@@ -35,6 +37,14 @@ FBScrollLayoutViewDelegate
 
 @implementation BHomeResumeDetailViewController
 
+- (void)viewWillAppear:(BOOL)animated {
+    
+    [super viewWillAppear:animated];
+    [self.navigationController setNavigationBarHidden:NO animated:YES];
+    self.navigationController.delegate = self;
+    self.navigationController.interactivePopGestureRecognizer.delegate = self;
+    
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     
@@ -47,6 +57,14 @@ FBScrollLayoutViewDelegate
     [self.view.errorView.refreshButton addTarget:self action:@selector(refreshButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
 
 }
+#pragma mark - 导航栏的代理
+
+- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
+    // 判断要显示的控制器是否是自己
+    //    BOOL isPushSelfClass = [viewController isKindOfClass:[self class]];
+    [self.navigationController setNavigationBarHidden:NO animated:animated];
+    
+}
 #pragma mark - event response
 /* 错误页面刷新事件 */
 - (void)refreshButtonClicked:(UIButton *)btn {

+ 13 - 2
HappyJob/HappyJob/BClass/BHome_首页/ViewController/BHomeViewController.m

@@ -24,7 +24,9 @@
 UITableViewDelegate,
 UITextFieldDelegate,
 FBAPIManagerDelegate,
-FBAPIManagerInterceptor
+FBAPIManagerInterceptor,
+UINavigationControllerDelegate,
+UIGestureRecognizerDelegate
 >
 
 @property (nonatomic, strong) BHomeNoCertificationView *certificationView;
@@ -49,7 +51,9 @@ FBAPIManagerInterceptor
     
     [super viewWillAppear:animated];
     
-    [self.navigationController setNavigationBarHidden:YES animated:YES];
+//    [self.navigationController setNavigationBarHidden:YES animated:YES];
+    self.navigationController.delegate = self;
+    self.navigationController.interactivePopGestureRecognizer.delegate = self;
 
 }
 
@@ -65,7 +69,14 @@ FBAPIManagerInterceptor
     
     [self.authAPI start];
 }
+#pragma mark - 导航栏的代理
 
+- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
+    // 判断要显示的控制器是否是自己
+    //    BOOL isPushSelfClass = [viewController isKindOfClass:[self class]];
+    [self.navigationController setNavigationBarHidden:YES animated:animated];
+    
+}
 #pragma mark - event response
 
 /* 认证成功回调(只有提交里信息) */

+ 6 - 6
HappyJob/HappyJob/BClass/BHome_首页/Views/Cell/BHomeListCell.m

@@ -12,7 +12,6 @@
 @interface BHomeListCell ()
 
 @property (nonatomic, strong) UIView      *bgView;
-
 @property (nonatomic, strong) UIView      *lineView;
 
 @end
@@ -75,7 +74,7 @@
         make.size.mas_offset(CGSizeMake(12, 12));
     }];
     [_nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.equalTo(weakSelf.headerImageV.mas_trailing).offset(25);
+        make.leading.equalTo(weakSelf.headerImageV.mas_trailing).offset(20);
         make.top.equalTo(weakSelf.bgView.mas_top).offset(20);
     }];
     
@@ -83,14 +82,15 @@
         make.leading.equalTo(weakSelf.nameLabel.mas_trailing).offset(0);
         make.bottom.equalTo(weakSelf.nameLabel.mas_bottom).offset(0);
     }];
+
+    [_timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.trailing.equalTo(weakSelf.bgView.mas_trailing).offset(-15);
+        make.centerY.equalTo(weakSelf.nameLabel);
+    }];
     [_positionLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.leading.equalTo(weakSelf.headerImageV.mas_trailing).offset(20);
         make.bottom.equalTo(weakSelf.bgView.mas_bottom).offset(-20);
-        make.trailing.equalTo(weakSelf.timeLabel.mas_leading).offset(-5);
-    }];
-    [_timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.trailing.equalTo(weakSelf.bgView.mas_trailing).offset(-15);
-        make.centerY.equalTo(weakSelf.nameLabel);
     }];
     [_lineView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.trailing.equalTo(weakSelf.bgView.mas_trailing).offset(0);

+ 5 - 11
HappyJob/HappyJob/BClass/BHome_首页/企业认证/ViewController/BHomeCertificationEnterprisePictureVC.m

@@ -32,7 +32,7 @@ FBAPIManagerInterceptor>
     self.navigationItem.title = @"企业认证";
     [self initSubViews];
     
-    NSLog(@"infoDict:::::%@",self.infoDict);
+//    NSLog(@"infoDict:::::%@",self.infoDict);
 }
 - (void)initSubViews {
     
@@ -159,20 +159,14 @@ FBAPIManagerInterceptor>
             [self.businessLicenseView.picBtn setImage:photos[0] forState:UIControlStateNormal];
             self.enterpriseAPI.businessLicenseImage = photos[0];
             self.businessLicenseView.titleLabel.text = @"点击修改营业执照";
-            self.businessLicenseView.deleteBtn.hidden = NO;
+//            self.businessLicenseView.deleteBtn.hidden = YES;
         }
         
     };
     [self presentViewController:imagePickerVc animated:YES completion:nil];
     
 }
-- (void)businessLicenseDeleteButtonClick:(UIButton *)btn {
-    
-    [self.businessLicenseView.picBtn setImage:[UIImage imageNamed:@"enterprise_Certification_background"] forState:UIControlStateNormal];
-    self.businessLicenseView.deleteBtn.hidden = YES;
-    self.businessLicenseView.titleLabel.text = @"点击上传营业执照";
-    
-}
+
 - (void)otherPicButtonClick:(UIButton *)btn {
     
     TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:nil];
@@ -191,6 +185,7 @@ FBAPIManagerInterceptor>
 - (void)otherPicDeleteButtonClick:(UIButton *)btn {
     
     [self.otherPicView.picBtn setImage:[UIImage imageNamed:@"enterprise_Certification_background"] forState:UIControlStateNormal];
+    self.enterpriseAPI.otherImage = [UIImage imageNamed:@""];
     self.otherPicView.deleteBtn.hidden = YES;
     self.otherPicView.titleLabel.text = @"点击上传其他资质(选填)";
     
@@ -231,7 +226,6 @@ FBAPIManagerInterceptor>
         _businessLicenseView.titleLabel.text = @"点击上传营业执照";
         [_businessLicenseView.picBtn addTarget:self action:@selector(businessLicenseButtonClick:) forControlEvents:UIControlEventTouchUpInside];
         [_businessLicenseView.addBtn addTarget:self action:@selector(businessLicenseButtonClick:) forControlEvents:UIControlEventTouchUpInside];
-        [_businessLicenseView.deleteBtn addTarget:self action:@selector(businessLicenseDeleteButtonClick:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _businessLicenseView;
 }
@@ -263,7 +257,7 @@ FBAPIManagerInterceptor>
     if (_nextBtn == nil)
     {
         _nextBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_nextBtn setTitle:@"下一步" forState:UIControlStateNormal];
+        [_nextBtn setTitle:@"提 交" forState:UIControlStateNormal];
         _nextBtn.titleLabel.font = [UIFont systemFontOfSize:17];
         _nextBtn.layer.cornerRadius = 5;
         _nextBtn.layer.masksToBounds = YES;

+ 2 - 0
HappyJob/HappyJob/BClass/BHome_首页/企业认证/ViewController/BHomeCertificationEnterpriseVC.m

@@ -47,6 +47,8 @@ ZHDatePickerViewDelegate
 
     self.paramDict = [NSMutableDictionary dictionary];
     self.view.backgroundColor = [UIColor whiteColor];
+    self.navigationItem.title = @"企业认证";
+    [self hj_setupNavBar];
     [self autoLayOutViews];
     
 }

+ 1 - 0
HappyJob/HappyJob/BClass/BHome_首页/企业认证/ViewController/BHomeCertificationingEnterpriseVC.m

@@ -72,6 +72,7 @@
     }];
     [_detailLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(weakSelf.view).offset(46);
+        make.right.equalTo(weakSelf.view).offset(-15);
         make.top.equalTo(weakSelf.titleLabel.mas_bottom).offset(HJHorizontalScale(90));
         make.bottom.equalTo(weakSelf.bgView.mas_bottom).offset(0);
     }];

+ 9 - 1
HappyJob/HappyJob/BClass/BHome_首页/面试邀请/ViewController/BHomeInvitationViewController.m

@@ -15,7 +15,12 @@
 #import "CalendarDateView.h"
 #import "AddressPickViewView.h"
 
-@interface BHomeInvitationViewController ()<FBScrollLayoutViewDelegate,FBAPIManagerInterceptor,FBAPIManagerDelegate>
+@interface BHomeInvitationViewController ()
+<
+FBScrollLayoutViewDelegate,
+FBAPIManagerInterceptor,
+FBAPIManagerDelegate
+>
 
 @property (nonatomic, strong) FBScrollLayoutView               *scrollLayoutView;
 @property (nonatomic, strong) BHomeInvitationCompanyView       *companyView;
@@ -39,10 +44,12 @@
 
 @implementation BHomeInvitationViewController
 
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     
     self.title = @"邀请面试";
+    [self hj_setupNavBar];
     [self.view addSubview:self.scrollLayoutView];
     [self.scrollLayoutView.contentView addSubview:self.companyView];
     [self.scrollLayoutView.contentView addSubview:self.positionView];
@@ -54,6 +61,7 @@
     [self.scrollLayoutView.footerView addSubview:self.sendBtn];
     [self.scrollLayoutView makeConstraints];
 }
+
 #pragma mark - FBAPIManagerInterceptor
 
 - (BOOL)manager:(FBBaseAPIManager *)manager shouldStartCallAPIWithParams:(NSDictionary *)params {

+ 11 - 49
HappyJob/HappyJob/BClass/BPosition_职位/APIManager/BPositionDataBox.m

@@ -9,6 +9,7 @@
 #import "BPositionDataBox.h"
 #import "BPositionListAPI.h"//列表API
 #import "BHomeEnterpriseAuthAPI.h"//企业认证
+#import "BHomeChangeIdentityAPI.h"
 #import "BPositionChangeIsPauseAPI.h"//暂停开启API
 #import "BPositionChangeUpdateTimeAPI.h"//刷新API
 #import "BPositionChangeIsOnStatusAPI.h"//结束下架
@@ -24,11 +25,6 @@
 
 @interface BPositionDataBox ()
 
-@property (nonatomic, strong) UILabel *titleLabel;
-@property (nonatomic, strong) UILabel *salaryLabel;
-@property (nonatomic, strong) UILabel *timeLabel;
-@property (nonatomic, strong) UILabel *peopleDateLabel;
-
 @end
 
 @implementation BPositionDataBox
@@ -48,6 +44,11 @@
         {//企业认证
             return data;
         }
+        if ([manager isKindOfClass:[BHomeChangeIdentityAPI class]])
+        {
+            [self saveCompanyInfo:data];
+            return data;
+        }
         if ([manager isKindOfClass:[BPositionChangeIsPauseAPI class]])
         {//暂停开启API
             return data;
@@ -181,50 +182,11 @@
     
 }
 
-#pragma mark - getters and setters
-
-- (UILabel *)titleLabel {
-    
-    if (_titleLabel == nil)
-    {
-        _titleLabel = [[UILabel alloc] init];
-        _titleLabel.textColor = COLOR_BACK3;
-        _titleLabel.font = [UIFont systemFontOfSize:21];
-    }
-    return _titleLabel;
-}
-- (UILabel *)salaryLabel {
-    
-    if (_salaryLabel == nil)
-    {
-        _salaryLabel = [[UILabel alloc] init];
-        _salaryLabel.textColor = [UIColor colorFromHexString:@"FF4E25"];
-        _salaryLabel.font = [UIFont systemFontOfSize:21];
-        _salaryLabel.textAlignment = NSTextAlignmentRight;
-    }
-    return _salaryLabel;
-}
-- (UILabel *)peopleDateLabel {
-    
-    if (_peopleDateLabel == nil)
-    {
-        _peopleDateLabel = [[UILabel alloc] init];
-        _peopleDateLabel.textColor = COLOR_BACK6;
-        _peopleDateLabel.textAlignment = NSTextAlignmentLeft;
-        _peopleDateLabel.font = [UIFont systemFontOfSize:14];
-        [_peopleDateLabel setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal];
-    }
-    return _peopleDateLabel;
-}
-- (UILabel *)timeLabel {
+/* 存储公司信息 */
+- (void)saveCompanyInfo:(NSDictionary *)dict {
     
-    if (_timeLabel == nil)
-    {
-        _timeLabel = [[UILabel alloc] init];
-        _timeLabel.textColor = COLOR_GRAY9;
-        _timeLabel.textAlignment = NSTextAlignmentRight;
-        _timeLabel.font = [UIFont systemFontOfSize:12];
-    }
-    return _timeLabel;
+    HJCompanyInfoModel *userInfo = [HJCompanyInfoModel yy_modelWithJSON:[dict valueForKeyPath:@"data.dpEnterpriseAuthentication"]];
+    [HJCompanyInfoModel setCompanyInfo:userInfo];
 }
+
 @end

+ 10 - 4
HappyJob/HappyJob/BClass/BPosition_职位/View/BPositionCell.m

@@ -119,7 +119,7 @@
     //职位审核状态
     if ([model.authenticationStatus integerValue] == 1)
     {//审核中
-        _stateBtn.hidden = NO;
+        self.stateBtn.hidden = NO;
         self.updateTimelabel.hidden = YES;
         [_stateBtn setTitle:@"审核中" forState:UIControlStateNormal];
         [_stateBtn setImage:[UIImage imageNamed:@"b_position_ing"] forState:UIControlStateNormal];
@@ -127,7 +127,7 @@
     }
     else if ([model.authenticationStatus integerValue] == 2)
     {//审核驳回
-        _stateBtn.hidden = NO;
+        self.stateBtn.hidden = NO;
         self.updateTimelabel.hidden = YES;
         [_stateBtn setTitle:@"审核驳回" forState:UIControlStateNormal];
         [_stateBtn setImage:[UIImage imageNamed:@"position_audit_rejected"] forState:UIControlStateNormal];
@@ -135,7 +135,7 @@
     }
     else
     {
-        _stateBtn.hidden = YES;
+        self.stateBtn.hidden = YES;
         self.updateTimelabel.hidden = NO;
     }
     
@@ -153,6 +153,8 @@
     if ([model.isOn boolValue])
     {//未下架
         self.editBtn.selected = YES;
+        self.endBtn.selected = YES;
+       
         if ([self isTimeEnd:model.endDate])
         {//时间结束
             if ([model.isPause boolValue])
@@ -169,7 +171,6 @@
         }
         else
         {//时间未结束
-
             self.refreshBtn.selected = YES;
             self.stopBtn.selected = YES;
             self.resumeBtn.selected = YES;
@@ -203,6 +204,7 @@
         self.editBtn.selected = NO;
         self.resumeBtn.selected = NO;
         self.stateBtn.hidden = YES;
+        self.updateTimelabel.hidden = NO;
     }
 }
 
@@ -252,6 +254,7 @@
     [_nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.leading.equalTo(weakSelf.bgView.mas_leading).offset(15);
         make.top.equalTo(weakSelf.bgView.mas_top).offset(20);
+        make.trailing.equalTo(weakSelf.updateTimelabel.mas_leading).offset(-5);
     }];
     [_updateTimelabel mas_makeConstraints:^(MASConstraintMaker *make) {
         
@@ -364,6 +367,8 @@
         _updateTimelabel = [[UILabel alloc]init];
         _updateTimelabel.textColor = COLOR_GRAY9;
         _updateTimelabel.font = [UIFont systemFontOfSize:12];
+        _updateTimelabel.textAlignment = NSTextAlignmentRight;
+        [_updateTimelabel setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal];
     }
     return _updateTimelabel;
 }
@@ -374,6 +379,7 @@
         _nameLabel = [[UILabel alloc]init];
         _nameLabel.textColor = COLOR_BACK3;
         _nameLabel.font = [UIFont systemFontOfSize:17];
+        
     }
     return _nameLabel;
 }

+ 36 - 12
HappyJob/HappyJob/BClass/BPosition_职位/ViewController/BPositionViewController.m

@@ -14,6 +14,7 @@
 #import "BHomeCertificationEnterpriseVC.h"//企业认证
 #import "BCheckPeopleViewController.h"//查看人员
 #import "BHomeEnterpriseAuthAPI.h"//企业认证
+#import "BHomeChangeIdentityAPI.h"
 #import "BPositionListAPI.h"//列表API
 #import "BPositionChangeIsPauseAPI.h"//暂停开启API
 #import "BPositionChangeUpdateTimeAPI.h"//刷新API
@@ -40,7 +41,8 @@ UIGestureRecognizerDelegate
 @property (nonatomic, strong) HeaderSelectView       *headerView;
 @property (nonatomic, strong) HJPageListView         *tableView;
 @property (nonatomic, strong) NSIndexPath            *selectIndexPath;
-@property (nonatomic, strong) BHomeEnterpriseAuthAPI *authAPI;//查询企业认证结果
+@property (nonatomic, strong) BHomeEnterpriseAuthAPI *authAPI;//查询企业是否认证结果
+@property (nonatomic, strong) BHomeChangeIdentityAPI *IDAPI;//查询企业认证结果
 @property (nonatomic, strong) BPositionListAPI       *listAPI;//列表API
 @property (nonatomic, strong) BPositionChangeIsPauseAPI    *pauseAPI;//暂停开启api
 @property (nonatomic, strong) BPositionChangeUpdateTimeAPI *updateTimeAPI;//刷新API
@@ -78,7 +80,8 @@ UIGestureRecognizerDelegate
     [self.view.errorView.refreshButton addTarget:self action:@selector(refreshButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
     //认证成功通知回调
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshEnterpriseAuthResult:) name:HJEnterpriseAuthResultNotification object:nil];
-    //认证成功通知回调
+    
+    //发布职位通知回调
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(releaseSuccessfulRefreshNotification:) name:HJReleaseSuccessfulRefreshNotification object:nil];
    
 }
@@ -166,7 +169,6 @@ UIGestureRecognizerDelegate
     self.isOnStatus.ID = model.ID;
     self.isOnStatus.isOn = @"0";
     [self endRecruitment];
-    
 }
 /* 编辑 */
 - (void)positionEdit:(BPositionDataBox *)dataBox positionModel:(BPositonModel *)model {
@@ -197,16 +199,27 @@ UIGestureRecognizerDelegate
     if (manager == self.authAPI)
     {
         if ([[dict valueForKeyPath:@"data.isAuth"] boolValue] == NO)
-        {//没有提交企业认证
+        {   //没有提交企业认证
             [self createCertificationView];
         }
         else if ([[dict valueForKeyPath:@"data.isAuth"] boolValue] == YES)
         {//有提交企业认证
             [self autoLayOutViews];
+            [self.IDAPI start];
             [self.listAPI start];
         }
     }
-    
+    if (manager == self.IDAPI)
+    {
+        if ([[HJCompanyInfoModel companyInfo].authenticationStatus integerValue] == 1)
+        {//认证中
+            [self.certificationBtn setTitle:@"您已提交企业认证,正在审核中,点击查看 >>" forState:UIControlStateNormal];
+        }
+        else if ([[HJCompanyInfoModel companyInfo].authenticationStatus integerValue] == 2)
+        {//认证失败
+            [self.certificationBtn setTitle:@"您已提交企业认证,审核未通过,点击认证 >>" forState:UIControlStateNormal];
+        }
+    }
     if (manager == self.listAPI)
     {
         [self.tableView managerCallAPIDidSuccess:manager];
@@ -224,7 +237,6 @@ UIGestureRecognizerDelegate
         [listDict setValue:@(![listDict[@"isPause"] boolValue]) forKey:@"isPause"];
         [self.dataBox.dataSource setObject:listDict atIndexedSubscript:self.selectIndexPath.row];
         [self refreshCellForRow];
-       
     }
     if (manager == self.isOnStatus)
     {//结束
@@ -420,8 +432,7 @@ UIGestureRecognizerDelegate
             weakSelf.listAPI.isPause = @"1";
         }
         if (index == 3)
-        {//结束
-            //下架
+        {//下架
             weakSelf.listAPI.isOn = @"0";
         }
         if (index == 4)
@@ -429,11 +440,15 @@ UIGestureRecognizerDelegate
             weakSelf.listAPI.endDate = @"1";
         }
         if (index == 5)
-        {//审核状态
-            weakSelf.listAPI.authenticationStatus = @"1";
+        {//全部审核
+            weakSelf.listAPI.authenticationStatus = @"0";
         }
         if (index == 6)
-        {
+        {//审核通过
+            weakSelf.listAPI.authenticationStatus = @"1";
+        }
+        if (index == 7)
+        {//审核驳回
             weakSelf.listAPI.authenticationStatus = @"2";
         }
         [weakSelf.listAPI start];
@@ -477,7 +492,7 @@ UIGestureRecognizerDelegate
     if (_headerView == nil)
     {
         _headerView = [[HeaderSelectView alloc]init];
-        [_headerView showHeaderSelectViewArray:@[@"全部",@"正在招聘",@"暂停招聘",@"已下架",@"已结束",@"正在审核",@"审核驳回"] andIndex:0 andShowLineView:YES andNumber:4];
+        [_headerView showHeaderSelectViewArray:@[@"全部",@"正在招聘",@"暂停招聘",@"已下架",@"已结束",@"全部审核",@"正在审核",@"审核驳回"] andIndex:0 andShowLineView:YES andNumber:4];
     }
     return _headerView;
 }
@@ -507,6 +522,15 @@ UIGestureRecognizerDelegate
     }
     return _authAPI;
 }
+- (BHomeChangeIdentityAPI *)IDAPI {
+    
+    if (_IDAPI == nil)
+    {
+        _IDAPI = [[BHomeChangeIdentityAPI alloc]init];
+        _IDAPI.APIManagerDelegate = self;
+    }
+    return _IDAPI;
+}
 - (BPositionListAPI *)listAPI {
     
     if (_listAPI == nil)

+ 1 - 1
HappyJob/HappyJob/CClass/DataCenter/Model/Position/HJPositionModel.h

@@ -82,7 +82,7 @@ typedef NS_ENUM(NSUInteger, HJPositionType) {
 /**岗位要求专业技能*/
 @property (nonatomic, copy) NSString *profressionSkill;
 /**岗位要求体检(0:不需要,1:需要)*/
-@property (nonatomic, assign) NSInteger isPhysical;
+@property (nonatomic, copy) NSString *isPhysical;
 /**其他岗位要求*/
 @property (nonatomic, copy) NSString *otherRequirement;
 /**其他薪资*/

+ 12 - 1
HappyJob/HappyJob/CClass/JobList_工作列表信息/FullTime_全职工作/HJFullTimeDetailViewController.m

@@ -221,7 +221,18 @@
         [detailView.scrollLayoutView.contentView addSubview:self.addressView];
         NSArray *addressArray = data[kHJPositionKeyAddress][kHJPositionKeyInnerValue];
         self.addressView.titleLabel.text = [NSString stringWithFormat:@"%@",addressArray[0][@"kHJWorkplaceKeyAddress"]];
-        self.addressView.allLabel.text = [NSString stringWithFormat:@"全部(%@)",@(addressArray.count)];
+        
+        if (addressArray.count <= 1)
+        {//如果地址数量为一个的时候隐藏
+            self.addressView.allLabel.hidden = YES;
+            self.addressView.lineView.hidden = YES;
+        }
+        else
+        {
+            self.addressView.allLabel.hidden = NO;
+            self.addressView.lineView.hidden = NO;
+            self.addressView.allLabel.text = [NSString stringWithFormat:@"全部(%@)",@(addressArray.count)];
+        }
         self.addressView.citylabel.text = [NSString stringWithFormat:@"%@",addressArray[0][@"kHJWorkplaceKeyArea"]];
     }
     

+ 14 - 2
HappyJob/HappyJob/CClass/JobList_工作列表信息/PartTime_兼职工作/HJPartTimeDetailViewController.m

@@ -45,7 +45,7 @@ UIScrollViewDelegate
 @property (nonatomic, strong) HJLeftRightLabelView   *workTimeLabel;
 @property (nonatomic, strong) UIView   *baseInfoView;
 @property (nonatomic, strong) UIView   *requireInfoView;
-@property (nonatomic, strong) HJPositionDetailCompanyView   *companyInfoView;
+@property (nonatomic, strong) HJPositionDetailCompanyView *companyInfoView;
 @property (nonatomic, copy)   NSArray  *welfareTagArray;
 
 @end
@@ -253,9 +253,21 @@ UIScrollViewDelegate
     {
         NSArray *addressArray = data[kHJPositionKeyAddress][kHJPositionKeyInnerValue];
         self.addressView.titleLabel.text = [NSString stringWithFormat:@"%@",addressArray[0][@"kHJWorkplaceKeyAddress"]];
-        self.addressView.allLabel.text = [NSString stringWithFormat:@"全部(%@)",@(addressArray.count)];
+        if (addressArray.count <= 1)
+        {
+            //如果地址数量为一个的时候隐藏
+            self.addressView.allLabel.hidden = YES;
+            self.addressView.lineView.hidden = YES;
+        }
+        else
+        {
+            self.addressView.allLabel.hidden = NO;
+            self.addressView.lineView.hidden = NO;
+            self.addressView.allLabel.text = [NSString stringWithFormat:@"全部(%@)",@(addressArray.count)];
+        }
         self.addressView.citylabel.text = [NSString stringWithFormat:@"%@",addressArray[0][@"kHJWorkplaceKeyArea"]];
         [self.addressBgView addSubview:self.addressView];
+        
     }
     //福利
     HJPositionDetailModel *model = data[kHJPositionKeyDetailModel];

+ 4 - 1
HappyJob/HappyJob/CClass/JobList_工作列表信息/PositionDetail_岗位详情/PositionDetailAPIManager/HJPositionDetailDataBox.m

@@ -309,7 +309,10 @@ NSString * const HJPositionListRefreshNotification = @"HJPositionListRefreshNoti
     }
     else
     {
-        [requireInfoArray addObject:@{kHJLeftLabelText: @"体检:", kHJRightLabelText: (model.position.isPhysical ? @"需要" : @"不需要")}];
+        if ([model.position.isPhysical isEqualToString:@"1"] || [model.position.isPhysical isEqualToString:@"0"])
+        {
+            [requireInfoArray addObject:@{kHJLeftLabelText: @"体检:", kHJRightLabelText: ([model.position.isPhysical intValue] == 1? @"需要" : @"不需要")}];
+        }
     }
     if (model.position.profressionSkill.length > 0)
     {

+ 5 - 0
HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/View/HJResumeNaviView.h

@@ -12,6 +12,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface HJResumeNaviView : UIView
 
+@property (nonatomic, strong) UILabel  *titleLabel;
+@property (nonatomic, strong) UIButton *backButton;
+
+- (void)shadeBackgroundColorWithContentOffset:(CGPoint)contentOffset;
+
 @end
 
 NS_ASSUME_NONNULL_END

+ 82 - 6
HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/View/HJResumeNaviView.m

@@ -8,14 +8,90 @@
 
 #import "HJResumeNaviView.h"
 
+@interface HJResumeNaviView ()
+
+@property (nonatomic, strong) UIView *bgView;
+
+@end
+
 @implementation HJResumeNaviView
 
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
+- (instancetype)initWithFrame:(CGRect)frame {
+    
+    if (self = [super initWithFrame:frame])
+    {
+        [self addSubview:self.bgView];
+        [self addSubview:self.titleLabel];
+        [self addSubview:self.backButton];
+        [self initSubViews];
+    }
+    return self;
+}
+- (void)initSubViews {
+    
+    [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.left.equalTo(self.mas_left).offset(0);
+        make.right.equalTo(self.mas_right).offset(0);
+        make.top.equalTo(self.mas_top).offset(0);
+        make.bottom.equalTo(self.mas_bottom).offset(0);
+    }];
+    [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.equalTo(self);
+        make.top.equalTo(self.mas_top).offset(STATUS_H);
+        make.height.mas_equalTo(40);
+    }];
+    [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self).with.offset(15);
+        make.centerY.equalTo(self.titleLabel);
+    }];
+}
+- (void)shadeBackgroundColorWithContentOffset:(CGPoint)contentOffset {
+    
+    CGFloat contentYoffset = contentOffset.y;
+    // contentOffset在Y轴的偏移量是负数,则隐藏导航栏
+    self.hidden = (contentYoffset < -STATUS_H) ? YES : NO;
+    // 让导航条背景色的透明度变化 100是范围 越大渐变越慢
+    CGFloat alpha = contentYoffset / 100;
+    [self shadeBackgroundColorWithAlpha:alpha];
+   
 }
-*/
+- (void)shadeBackgroundColorWithAlpha:(CGFloat)alpha {
+    
+    _titleLabel.textColor = [UIColor colorFromHexString:@"ffffff" Alpha:alpha];
+    _bgView.alpha = alpha;
+    
+}
+#pragma mark - setter and getter
 
+- (UIView *)bgView {
+    
+    if (_bgView == nil)
+    {
+        _bgView = [[UIView alloc]init];
+        _bgView.alpha = 0;
+        [_bgView az_setGradientBackgroundWithColors:@[COLOR_GRADIENT_START,COLOR_GRADIENT_END] locations:@[@(0.0),@(1.0f)] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
+    }
+    return _bgView;
+}
+- (UILabel *)titleLabel {
+    
+    if (_titleLabel == nil)
+    {
+        _titleLabel = [[UILabel alloc] init];
+        _titleLabel.textColor = [UIColor clearColor];
+        _titleLabel.font = [UIFont boldSystemFontOfSize:19];
+    }
+    return _titleLabel;
+}
+
+- (UIButton *)backButton {
+    
+    if (_backButton == nil)
+    {
+        _backButton = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_backButton setImage:[UIImage imageNamed:@"navbar_back_white"] forState:UIControlStateNormal];
+    }
+    return _backButton;
+}
 @end

+ 32 - 22
HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/ViewController/HJResumeViewController.m

@@ -22,6 +22,8 @@
 #import "HJGetResumeAPIManager.h"
 #import "HJResumeDataBox.h"
 
+#import "HJResumeNaviView.h"
+
 @interface HJResumeViewController ()
 <
 FBScrollLayoutViewDelegate,
@@ -31,17 +33,18 @@ HJBasicInfoViewDelegate,
 HJExpectationViewDelegate,
 HJExperienceViewDelegate,
 UINavigationControllerDelegate,
-UIGestureRecognizerDelegate
+UIGestureRecognizerDelegate,
+UIScrollViewDelegate
 
 >
 
-@property (nonatomic, strong) UIButton                     *backBtn;
-@property (nonatomic, strong) FBScrollLayoutView           *scrollLayoutView;
-@property (nonatomic, strong) HJBasicInfoView              *basicInfoView;//个人资料
-@property (nonatomic, strong) HJExpectationView            *expectationView;//求职意向
-@property (nonatomic, strong) HJExperienceView             *experienceView;//工作经验
-@property (nonatomic, strong) HJResumeDataBox              *resumeDataBox;
-@property (nonatomic, strong) HJGetResumeAPIManager        *getResumeAPIManager;//简历API
+@property (nonatomic, strong) FBScrollLayoutView      *scrollLayoutView;
+@property (nonatomic, strong) HJBasicInfoView         *basicInfoView;//个人资料
+@property (nonatomic, strong) HJExpectationView       *expectationView;//求职意向
+@property (nonatomic, strong) HJExperienceView        *experienceView;//工作经验
+@property (nonatomic, strong) HJResumeDataBox         *resumeDataBox;
+@property (nonatomic, strong) HJGetResumeAPIManager   *getResumeAPIManager;//简历API
+@property (nonatomic, strong) HJResumeNaviView        *naviView;
 
 @end
 
@@ -57,7 +60,6 @@ UIGestureRecognizerDelegate
     [super viewWillAppear:animated];
     self.navigationController.delegate = self;
     self.navigationController.interactivePopGestureRecognizer.delegate = self;
-    
 }
 
 - (void)viewDidLoad {
@@ -79,13 +81,14 @@ UIGestureRecognizerDelegate
     [self.scrollLayoutView.contentView addSubview:self.expectationView];
     [self.scrollLayoutView.contentView addSubview:self.experienceView];
     [self.scrollLayoutView makeConstraints];
-    [self.view addSubview:self.backBtn];
-    [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+    [self.view addSubview:self.naviView];
+    [self.naviView mas_makeConstraints:^(MASConstraintMaker *make) {
+       
+        make.left.top.right.offset(0);
+        make.height.mas_equalTo(STATUS_H + NAVIGATION_H);
         
-        make.left.offset(20);
-        make.top.offset(STATUS_H + 11);
-        make.size.mas_offset(CGSizeMake(11, 19));
     }];
+
 }
 #pragma mark - 导航栏的代理
 
@@ -121,7 +124,13 @@ UIGestureRecognizerDelegate
         make.bottom.equalTo(self.experienceView.mas_bottom).with.offset(40);
     }];
 }
+#pragma mark - UIScrollViewDelegate
 
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+    
+    //导航栏的渐变
+    [self.naviView shadeBackgroundColorWithContentOffset:scrollView.contentOffset];
+}
 
 #pragma mark - FBAPIManagerInterceptor
 
@@ -187,29 +196,29 @@ UIGestureRecognizerDelegate
 
 #pragma mark - event response
 
-- (void)backButtonClick {
+- (void)backButtonClick:(UIButton *)btn {
     
     [self.navigationController popViewControllerAnimated:YES];
 }
 - (void)updateResume:(NSNotification *)notification {
-    
+   
     NSDictionary *data = self.resumeDataBox.resume;
     [self.basicInfoView configWithData:data];
     [self.expectationView configWithData:data];
     [self.experienceView configWithData:data];
+    self.naviView.titleLabel.text = data[kHJResumeKeyName];
 }
 
 #pragma mark - getters and setters
 
-- (UIButton *)backBtn {
+- (HJResumeNaviView *)naviView {
     
-    if (_backBtn == nil)
+    if (_naviView == nil)
     {
-        _backBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_backBtn setImage:[UIImage imageNamed:@"navbar_back_white"] forState:UIControlStateNormal];
-        [_backBtn addTarget:self action:@selector(backButtonClick) forControlEvents:UIControlEventTouchUpInside];
+        _naviView = [[HJResumeNaviView alloc]init];
+        [_naviView.backButton addTarget:self action:@selector(backButtonClick:) forControlEvents:UIControlEventTouchUpInside];
     }
-    return _backBtn;
+    return _naviView;
 }
 - (HJResumeDataBox *)resumeDataBox {
     
@@ -272,6 +281,7 @@ UIGestureRecognizerDelegate
         _scrollLayoutView.delegate = self;
         _scrollLayoutView.backgroundColor = [UIColor clearColor];
         _scrollLayoutView.contentView.backgroundColor = [UIColor clearColor];
+        _scrollLayoutView.scrollView.delegate = self;
     }
     return _scrollLayoutView;
 }

+ 2 - 3
HappyJob/HappyJob/CClass/Me_我/View/Header_头视图/HJMeProfileView.m

@@ -122,19 +122,18 @@
         self.tagLabel.text = @"已认证";
         self.tagLabel.backgroundColor = [UIColor clearColor];
         [self.tagLabel az_setGradientBackgroundWithColors:@[[UIColor colorFromHexString:@"FFCE2D"],[UIColor colorFromHexString:@"EAAA1F"]] locations:@[@(0.0),@(1.0f)] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
-       
     }
     if (type == HJAuthStatusTypeAuthFailed)
     {
         self.tagLabel.text = @"认证失败";
-        [_authBtn setTitle:@"您已经实名认证,认证失败,点击查看>>" forState:UIControlStateNormal];
+        [_authBtn setTitle:@"您实名认证失败,点击查看>>" forState:UIControlStateNormal];
         self.tagLabel.backgroundColor = COLOR_BACKB;
         
     }
     if (type == HJAuthStatusTypeAuthing)
     {
         self.tagLabel.text = @"认证中";
-        [_authBtn setTitle:@"您已经实名认证,认证后简历可以获得更多曝光,点击查看>>" forState:UIControlStateNormal];
+        [_authBtn setTitle:@"您已实名认证,通过后简历可以获得更多曝光,点击查看>>" forState:UIControlStateNormal];
         self.tagLabel.backgroundColor = COLOR_BACKB;
     }
     if (type == HJAuthStatusTypeNoAuth)

+ 3 - 1
HappyJob/HappyJob/CClass/Me_我/View/NavBar_我的导航栏/HJMeNavBarView.h

@@ -11,8 +11,10 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface HJMeNavBarView : FBNavigationBar
-@property (nonatomic, strong) UILabel *titleLabel;
+
+@property (nonatomic, strong) UILabel  *titleLabel;
 @property (nonatomic, strong) UIButton *setingButton;
+
 @end
 
 NS_ASSUME_NONNULL_END

+ 20 - 8
HappyJob/HappyJob/CClass/Me_我/View/NavBar_我的导航栏/HJMeNavBarView.m

@@ -21,6 +21,8 @@
     if (self = [super init])
     {
         self.backgroundColor = [UIColor colorWithRed:81/255.0 green:145/255.0 blue:211/255.0 alpha:0];
+        
+        [self addSubview:self.bgView];
         [self addSubview:self.titleLabel];
         [self addSubview:self.setingButton];
         [self makeConstraints];
@@ -30,14 +32,13 @@
 
 - (void)makeConstraints {
     
-//    [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
-//        
-//        make.left.equalTo(self.mas_left).offset(0);
-//        make.right.equalTo(self.mas_right).offset(0);
-//        make.top.equalTo(self.mas_top).offset(0);
-//        make.bottom.equalTo(self.mas_bottom).offset(0);
-//        
-//    }];
+    [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.left.equalTo(self.mas_left).offset(0);
+        make.right.equalTo(self.mas_right).offset(0);
+        make.top.equalTo(self.mas_top).offset(0);
+        make.bottom.equalTo(self.mas_bottom).offset(0);
+    }];
     [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerX.equalTo(self);
         make.bottom.equalTo(self).with.offset(-10);
@@ -50,10 +51,21 @@
 - (void)shadeBackgroundColorWithAlpha:(CGFloat)alpha {
     
     _titleLabel.textColor = [UIColor colorFromHexString:@"ffffff" Alpha:alpha];
+    _bgView.alpha = alpha;
     
 }
 #pragma mark - getters and setters
 
+- (UIView *)bgView {
+    
+    if (_bgView == nil)
+    {
+        _bgView = [[UIView alloc]init];
+        _bgView.alpha = 0;
+        [_bgView az_setGradientBackgroundWithColors:@[COLOR_GRADIENT_START,COLOR_GRADIENT_END] locations:@[@(0.0),@(1.0f)] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
+    }
+    return _bgView;
+}
 - (UILabel *)titleLabel {
     
     if (_titleLabel == nil)

+ 69 - 28
HappyJob/HappyJob/CClass/Me_我/ViewController/HJMeViewController.m

@@ -46,6 +46,7 @@ FBAPIManagerDelegate
 @property (nonatomic, strong) HJApproveStatusAPIManager *approveStatusAPIManager;//认证状态的
 @property (nonatomic, strong) HJGetResumeAPIManager     *getResumeAPIManager;//简历的
 @property (nonatomic, strong) NSIndexPath               *selextIndexPath;
+@property (nonatomic, assign) HJAuthStatusType          authStatus;//实名认证状态
 
 
 @end
@@ -115,51 +116,51 @@ FBAPIManagerDelegate
         [manager fetchDataWithBox:self.dataBox];
         [self.refreshHeader endRefreshing];
     }
-    
     if (manager == self.approveStatusAPIManager)
     {
-        HJAuthStatusType status = (HJAuthStatusType)[[manager fetchDataWithBox:self.dataBox] integerValue];
-        if (status == HJAuthStatusTypeNoAuth)
-        {//没有认证
-            HJAuthViewController *authVC = [[HJAuthViewController alloc] init];
-            authVC.hidesBottomBarWhenPushed = YES;
-            [self.navigationController pushViewController:authVC animated:YES];
-        }
-        else if (status == HJAuthStatusTypeAuthing)
-        {//认证中
-            HJAuthingViewController *authingVC = [[HJAuthingViewController alloc] init];
-            authingVC.hidesBottomBarWhenPushed = YES;
-            [self.navigationController pushViewController:authingVC animated:YES];
-        }
-        else if (status == HJAuthStatusTypeAuthFailed)
-        {//失败
-            HJAuthFailedViewController *authFailedVC = [[HJAuthFailedViewController alloc] init];
-            authFailedVC.hidesBottomBarWhenPushed = YES;
-            [self.navigationController pushViewController:authFailedVC animated:YES];
-        }
-        else
+        self.authStatus = (HJAuthStatusType)[[manager fetchDataWithBox:self.dataBox] integerValue];
+        if (self.selextIndexPath)
         {
-            if (self.selextIndexPath.row == 1)
-            {
-                self.selextIndexPath = nil;
+            self.selextIndexPath = nil;
+            if (self.authStatus == HJAuthStatusTypeAuthSuccess)
+            {//认证成功
                 HJIdentitySwitchViewController *vc = [[HJIdentitySwitchViewController alloc]init];
                 vc.hidesBottomBarWhenPushed = YES;
                 [self.navigationController pushViewController:vc animated:YES];
             }
             else
             {
-                [self.view fb_showSuccessWithStatus:@"已认证"];
+                [self realnameAuthentication];
+            }
+        }
+        else
+        {
+            if (self.authStatus == HJAuthStatusTypeNoAuth)
+            {//没有认证
+                HJAuthViewController *authVC = [[HJAuthViewController alloc] init];
+                authVC.hidesBottomBarWhenPushed = YES;
+                [self.navigationController pushViewController:authVC animated:YES];
+            }
+            else if (self.authStatus == HJAuthStatusTypeAuthing)
+            {//认证中
+                HJAuthingViewController *authingVC = [[HJAuthingViewController alloc] init];
+                authingVC.hidesBottomBarWhenPushed = YES;
+                [self.navigationController pushViewController:authingVC animated:YES];
+            }
+            else if (self.authStatus == HJAuthStatusTypeAuthFailed)
+            {//失败
+                HJAuthFailedViewController *authFailedVC = [[HJAuthFailedViewController alloc] init];
+                authFailedVC.hidesBottomBarWhenPushed = YES;
+                [self.navigationController pushViewController:authFailedVC animated:YES];
             }
         }
     }
-    
     if (manager == self.getUserInfoAPIManager || manager == self.approveStatusAPIManager)
     {
         //在headerView布局修改后一定要先调用tableView layoutIfNeeded,然后再调用reloadData不然会有布局Bug
         [self.tableView layoutIfNeeded];
         [self.tableView reloadData];
     }
-    
     if (manager == self.getResumeAPIManager)
     {
         // 不需要根据返回值来处理视图,在DataBox类中做了封装
@@ -168,7 +169,6 @@ FBAPIManagerDelegate
         [self.refreshHeader endRefreshing];
     }
 }
-
 - (void)managerCallAPIDidFailed:(FBBaseAPIManager *)manager {
     
     [self.refreshHeader endRefreshing];
@@ -255,6 +255,47 @@ FBAPIManagerDelegate
         [self.navigationController pushViewController:profileVC animated:YES];
     }
 }
+/* 我要招人的实名认证状态 */
+- (void)realnameAuthentication{
+    
+    HJConfirmPanelViewController *vc = [[HJConfirmPanelViewController alloc] init];
+    vc.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
+    vc.modalPresentationStyle = UIModalPresentationOverCurrentContext;
+    self.navigationController.definesPresentationContext = NO;
+    vc.titleLabel.text = @"未经实名认证无法切换账号,是否现在进行实名认证?";
+    vc.titleIcon.image = nil;
+    [vc.cancelButton setTitle:@"以后再说" forState:UIControlStateNormal];
+    [vc.confirmButton setTitle:@"现在就去" forState:UIControlStateNormal];
+    [vc.confirmButton addTarget:self
+                         action:@selector(editButtonClicked:)
+               forControlEvents:UIControlEventTouchUpInside];
+    [self presentViewController:vc animated:YES completion:nil];
+    
+}
+- (void)editButtonClicked:(UIButton *)sender {
+    
+    [self dismissViewControllerAnimated:NO completion:^{
+        
+        if (self.authStatus == HJAuthStatusTypeNoAuth)
+        {//没有认证
+            HJAuthViewController *authVC = [[HJAuthViewController alloc] init];
+            authVC.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:authVC animated:YES];
+        }
+        else if (self.authStatus == HJAuthStatusTypeAuthing)
+        {//认证中
+            HJAuthingViewController *authingVC = [[HJAuthingViewController alloc] init];
+            authingVC.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:authingVC animated:YES];
+        }
+        else if (self.authStatus == HJAuthStatusTypeAuthFailed)
+        {//失败
+            HJAuthFailedViewController *authFailedVC = [[HJAuthFailedViewController alloc] init];
+            authFailedVC.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:authFailedVC animated:YES];
+        }
+    }];
+}
 
 #pragma mark - event response
 

+ 1 - 0
HappyJob/HappyJob/Custom/Components/CustomControl/UIView/JobDetail_职位详情/HJJobDetailForwardView.h

@@ -32,6 +32,7 @@ typedef NS_ENUM(NSInteger, HJDetailForwardStyle) {
 @property (nonatomic, strong) UILabel     *citylabel;
 @property (nonatomic, strong) UILabel     *allLabel;
 @property (nonatomic, strong) UIImageView *imageView;
+@property (nonatomic, strong) UIView      *lineView;
 
 - (instancetype)initWithTitle:(NSString *)title andType:(HJDetailForwardStyle)type;
 

+ 0 - 1
HappyJob/HappyJob/Custom/Components/CustomControl/UIView/JobDetail_职位详情/HJJobDetailForwardView.m

@@ -10,7 +10,6 @@
 
 @interface HJJobDetailForwardView ()
 
-@property (nonatomic, strong) UIView      *lineView;
 @property (nonatomic, assign) HJDetailForwardStyle type;
 
 @end

+ 1 - 3
HappyJob/HappyJob/Custom/HeaderViewSelectButton/HeaderSelectView.m

@@ -52,7 +52,6 @@
 
         make.left.bottom.right.top.offset(0);
     }];
-
 }
 
 /**
@@ -159,11 +158,10 @@
  */
 -(void)changeScrollOffset:(UIButton*)btn {
     
-    if (btn.tag > 1001 && btn.tag < (1000 + self.btnArr.count) - 2)
+    if (btn.tag > 1001 && btn.tag < (1000 + self.btnArr.count) - 1)
     {
         [self.smScrollV setContentOffset:CGPointMake(btn.frame.origin.x - btn.frame.size.width*2, 0) animated:YES];
     }
-    
 }
 
 @end

+ 0 - 2
HappyJob/HappyJob/Custom/HeaderViewSelectButton/HeaderViewSelectButton.m

@@ -54,7 +54,6 @@
         
         make.left.bottom.right.top.offset(0);
     }];
-    
 }
 
 /**
@@ -109,7 +108,6 @@
             // 改变btn的偏移量
             [self changeScrollOffset:btn];
         }
-        
     }
 }
 

+ 0 - 1
HappyJob/HappyJob/ViewController.m

@@ -11,7 +11,6 @@
 @interface ViewController ()
 
 
-
 @end
 
 @implementation ViewController