登录流程修改

HappyJob/HappyJob/BClass/BHome_首页/ViewController/BHomeResumeDetailViewController.m

@@ -250,7 +250,7 @@ FBAPIManagerInterceptor
         _invitationBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_invitationBtn setTitle:@"邀请面试" forState:UIControlStateNormal];
         _invitationBtn.titleLabel.font = [UIFont systemFontOfSize:14];
-        _invitationBtn.backgroundColor = COLOR_DEFAULT;
+        _invitationBtn.backgroundColor = COLOR_BLUE_4183E1;
         [_invitationBtn addTarget:self action:@selector(invitationButtonClick) forControlEvents:UIControlEventTouchUpInside];
     }
     return _invitationBtn;
@@ -262,7 +262,7 @@ FBAPIManagerInterceptor
         _phoneBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_phoneBtn setTitle:@"电话沟通" forState:UIControlStateNormal];
         _phoneBtn.titleLabel.font = [UIFont systemFontOfSize:14];
-        _phoneBtn.backgroundColor = COLOR_DEFAULT;
+        _phoneBtn.backgroundColor = COLOR_BLUE_4183E1;
         [_phoneBtn addTarget:self action:@selector(phoneButtonClick) forControlEvents:UIControlEventTouchUpInside];
     }
     return _phoneBtn;

HappyJob/HappyJob/BClass/BHome_首页/ViewController/BHomeViewController.m

@@ -111,7 +111,6 @@ FBAPIManagerInterceptor
         
         [self.searchView.searchTF becomeFirstResponder];
     }];
-    
 }
 
 #pragma mark - UITextFieldDelegate
@@ -248,7 +247,8 @@ FBAPIManagerInterceptor
         [weakSelf.navigationController pushViewController:enterpriseVC animated:YES];
     };
 }
-#pragma mark - setter & getter
+
+#pragma mark - setter and getter
 
 - (BHomeDataBox *)dataBox {
     

HappyJob/HappyJob/BClass/BHome_首页/Views/Cell/BHomeResumeDetailIntentionCell.m

@@ -90,9 +90,8 @@
         }
         else
         {
-            self.salaryLabel.text = @"";
+            self.salaryLabel.text = @"不限";
         }
-        
     }
 }
 

HappyJob/HappyJob/BClass/BHome_首页/Views/View/BHomeSearchView.m

@@ -91,7 +91,7 @@
     if (_lineView == nil)
     {
         _lineView = [[UIView alloc]init];
-        _lineView.backgroundColor = COLOR_DEFAULT;
+        _lineView.backgroundColor = COLOR_BLUE_4183E1;
     }
     return _lineView;
 }

HappyJob/HappyJob/BClass/BHome_首页/企业认证/View/BHomeCertificationEnterpriseCell.m

@@ -554,7 +554,7 @@
         _submitBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_submitBtn setTitle:@"提交审核" forState:UIControlStateNormal];
         _submitBtn.titleLabel.font = [UIFont systemFontOfSize:13];
-        _submitBtn.backgroundColor = COLOR_DEFAULT;
+        _submitBtn.backgroundColor = COLOR_BLUE_4183E1;
         [_submitBtn addTarget:self action:@selector(submitButtonClick) forControlEvents:UIControlEventTouchUpInside];
     }
     return _submitBtn;

HappyJob/HappyJob/BClass/BHome_首页/企业认证/ViewController/BHomeCertificationFailVC.m

@@ -148,7 +148,7 @@
         _certificationBtn.backgroundColor = [UIColor whiteColor];
         [_certificationBtn setTitle:@"重新认证" forState:UIControlStateNormal];
         _certificationBtn.titleLabel.font = [UIFont systemFontOfSize:17];
-        [_certificationBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [_certificationBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
     }
     return _certificationBtn;
 }

HappyJob/HappyJob/BClass/BHome_首页/面试邀请/View/BHomeInvitationCompanyBottomView.m

@@ -204,7 +204,7 @@
         {
             [view removeFromSuperview];
         }
-        [weakSelf.positionBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [weakSelf.positionBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         [weakSelf.positionBtn setTitle:name forState:UIControlStateNormal];
         [weakSelf.positionPV mas_remakeConstraints:^(MASConstraintMaker *make) {
             
@@ -224,7 +224,7 @@
         {
             [view removeFromSuperview];
         }
-        [weakSelf.dateBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [weakSelf.dateBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         [weakSelf.dateBtn setTitle:[NSString stringWithFormat:@"%@年%@月%@日",year,month,day] forState:UIControlStateNormal];
         [weakSelf.dateView mas_remakeConstraints:^(MASConstraintMaker *make) {
             make.leading.equalTo(weakSelf.mas_leading).offset(15);
@@ -243,7 +243,7 @@
         {
             [view removeFromSuperview];
         }
-        [weakSelf.timeBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [weakSelf.timeBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         [weakSelf.timeBtn setTitle:name forState:UIControlStateNormal];
         [weakSelf.timePV mas_remakeConstraints:^(MASConstraintMaker *make) {
             make.leading.equalTo(weakSelf.mas_leading).offset(15);
@@ -258,7 +258,7 @@
     /* 地址 */
     _addressView.selectAddressBlock = ^(NSString * _Nonnull pName, NSString * _Nonnull cName, NSString * _Nonnull aName, NSString * _Nonnull pCode, NSString * _Nonnull cCode, NSString * _Nonnull aCode, NSString * _Nonnull address) {
       
-        [weakSelf.addressBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [weakSelf.addressBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         [weakSelf.addressBtn setTitle:[NSString stringWithFormat:@"%@%@%@%@",pName,cName,aName,address] forState:UIControlStateNormal];
         weakSelf.addressBlock(weakSelf.addressBtn.titleLabel.text);
         
@@ -436,7 +436,7 @@
     if (_positionBtn == nil)
     {
         _positionBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_positionBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [_positionBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         _positionBtn.titleLabel.font = [UIFont systemFontOfSize:11];
 //        [_positionBtn addTarget:self action:@selector(positionButtonClick) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -566,7 +566,7 @@
         _contactTF = [[UITextField alloc]init];
         _contactTF.placeholder = @"点击输入面试联系人";
         _contactTF.font = [UIFont systemFontOfSize:11];
-        _contactTF.textColor = COLOR_DEFAULT;
+        _contactTF.textColor = COLOR_BLUE_4183E1;
         _contactTF.textAlignment = NSTextAlignmentRight;
         _contactTF.delegate = self;
         [_contactTF addTarget:self action:@selector(contactTFClick) forControlEvents:UIControlEventEditingChanged];
@@ -591,7 +591,7 @@
         _phoneTF = [[UITextField alloc]init];
         _phoneTF.placeholder = @"点击输入面试联系人的联系方式";
         _phoneTF.font = [UIFont systemFontOfSize:11];
-        _phoneTF.textColor = COLOR_DEFAULT;
+        _phoneTF.textColor = COLOR_BLUE_4183E1;
         _phoneTF.textAlignment = NSTextAlignmentRight;
 //        _phoneTF.keyboardType = UIKeyboardTypeNumberPad;
         _phoneTF.delegate = self;

HappyJob/HappyJob/BClass/BHome_首页/面试邀请/View/BHomeInvitationCompanyView.m

@@ -108,8 +108,8 @@
         _sendBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_sendBtn setTitle:@"发送" forState:UIControlStateNormal];
         _sendBtn.layer.borderWidth = 1;
-        _sendBtn.layer.borderColor = COLOR_DEFAULT.CGColor;
-        [_sendBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        _sendBtn.layer.borderColor = COLOR_BLUE_4183E1.CGColor;
+        [_sendBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         _sendBtn.titleLabel.font = [UIFont systemFontOfSize:12];
         [_sendBtn addTarget:self action:@selector(sendButtonClick) forControlEvents:UIControlEventTouchUpInside];
         

HappyJob/HappyJob/BClass/BMessage_消息/View/BMessageCell.m

@@ -107,7 +107,7 @@
     {
         _stateLabel = [[UILabel alloc]init];
         _stateLabel.font = [UIFont systemFontOfSize:13];
-        _stateLabel.textColor = COLOR_DEFAULT;
+        _stateLabel.textColor = COLOR_BLUE_4183E1;
     }
     return _stateLabel;
 }

HappyJob/HappyJob/BClass/BMy_我的/ViewController/BMyViewController.m

@@ -82,6 +82,10 @@
     {
         if (indexPath.row == 0)
         {
+            if ([[HJCompanyInfoModel companyInfo].authenticationStatus integerValue] == 3)
+            {
+                return;
+            }
             UIViewController *vc =  [self.dataBox certificationResultViewController];
             vc.hidesBottomBarWhenPushed = YES;
             [self.navigationController pushViewController:vc animated:YES];

HappyJob/HappyJob/BClass/BMy_我的/设置/ViewControlletr/BSetViewController.m

@@ -201,7 +201,6 @@
         _exitBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_exitBtn setTitle:@"退出登录" forState:UIControlStateNormal];
         _exitBtn.titleLabel.font = [UIFont systemFontOfSize:17];
-        _exitBtn.backgroundColor = COLOR_DEFAULT;
         [_exitBtn addTarget:self action:@selector(exitButtonClick) forControlEvents:UIControlEventTouchUpInside];
         [_exitBtn az_setGradientBackgroundWithColors:@[[UIColor colorFromHexString:@"219BEE"],[UIColor colorFromHexString:@"2BB0F5"]] locations:@[@(0.0),@(1.0f)] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
     }

HappyJob/HappyJob/BClass/BPosition_职位/View/BCheckPeopleCell.m

@@ -76,7 +76,7 @@
         
         if ([model.select boolValue] == 1)
         {
-            self.lineView.backgroundColor = COLOR_DEFAULT;
+            self.lineView.backgroundColor = COLOR_BLUE_4183E1;
         }
         else
         {
@@ -208,7 +208,7 @@
         _checkBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_checkBtn setTitle:@"查看简历" forState:UIControlStateNormal];
         _checkBtn.titleLabel.font = [UIFont systemFontOfSize:11];
-        _checkBtn.backgroundColor = COLOR_DEFAULT;
+        _checkBtn.backgroundColor = COLOR_BLUE_4183E1;
         [_checkBtn addTarget:self action:@selector(checkButtonClick) forControlEvents:UIControlEventTouchUpInside];
     }
     return _checkBtn;

HappyJob/HappyJob/BClass/BPosition_职位/View/BPositionCell.m

@@ -438,7 +438,7 @@
     if (_updateTimelabel == nil)
     {
         _updateTimelabel = [[UILabel alloc]init];
-        _updateTimelabel.textColor = COLOR_DEFAULT;
+        _updateTimelabel.textColor = COLOR_BLUE_4183E1;
         _updateTimelabel.font = [UIFont systemFontOfSize:10];
     }
     return _updateTimelabel;

HappyJob/HappyJob/BClass/BPosition_职位/View/BPositionDetailDescribeAddressCell.m

@@ -115,7 +115,7 @@
     if (_describeBtn == nil)
     {
         _describeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_describeBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [_describeBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         _describeBtn.titleLabel.font = [UIFont systemFontOfSize:12];
         [_describeBtn setTitle:@"职位描述：" forState:UIControlStateNormal];
         [_describeBtn setImage:[UIImage imageNamed:@"b_position_describe"] forState:UIControlStateNormal];
@@ -151,7 +151,7 @@
     if (_addressBtn == nil)
     {
         _addressBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_addressBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [_addressBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         _addressBtn.titleLabel.font = [UIFont systemFontOfSize:12];
         [_addressBtn setTitle:@"工作地点：" forState:UIControlStateNormal];
         [_addressBtn setImage:[UIImage imageNamed:@"b_position_address"] forState:UIControlStateNormal];

HappyJob/HappyJob/BClass/BPosition_职位/View/BPositionDropDownView.m

@@ -34,7 +34,7 @@
         _btn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_btn setTitle:titleArray[i] forState:UIControlStateNormal];
         _btn.titleLabel.font = [UIFont systemFontOfSize:11];
-        _btn.backgroundColor = COLOR_DEFAULT;
+        _btn.backgroundColor = COLOR_BLUE_4183E1;
         _btn.tag = 100 + i;
         [_btn addTarget:self action:@selector(btnClick:) forControlEvents:UIControlEventTouchUpInside];
         [self addSubview:_btn];

HappyJob/HappyJob/BClass/BPosition_职位/ViewController/BPositionDetailViewController.m

@@ -259,7 +259,7 @@ FBAPIManagerInterceptor
         [_moreBtn setTitle:@"点击收起全部岗位信息" forState:UIControlStateSelected];
         [_moreBtn setImage:[UIImage imageNamed:@"b_release_add"] forState:UIControlStateNormal];
         [_moreBtn setImage:[UIImage imageNamed:@"b_releasejob_reduce"] forState:UIControlStateSelected];
-        _moreBtn.backgroundColor = COLOR_DEFAULT;
+        _moreBtn.backgroundColor = COLOR_BLUE_4183E1;
         _moreBtn.titleLabel.font = [UIFont systemFontOfSize:11];
         _moreBtn.layer.cornerRadius = 5;
         _moreBtn.selected = NO;

HappyJob/HappyJob/BClass/BRelease_发布/View/BReleaseJobsCategoryCCell.m

@@ -60,7 +60,7 @@
         {
             _bgView.backgroundColor = [UIColor colorFromHexString:@"81CAFF"];
             _titleLabel.textColor = [UIColor whiteColor];
-            _bgView.layer.borderColor = COLOR_DEFAULT.CGColor;
+            _bgView.layer.borderColor = COLOR_BLUE_4183E1.CGColor;
         }
         else
         {

HappyJob/HappyJob/BClass/BRelease_发布/ViewController/BReleaseJobsViewController.m

@@ -22,6 +22,15 @@
 
 @implementation BReleaseJobsViewController
 
+- (void)dealloc {
+    
+    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault animated:NO];
+}
+- (void)viewWillAppear:(BOOL)animated {
+    
+    [super viewWillAppear:animated];
+    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO];
+}
 
 - (void)viewDidLoad {
     [super viewDidLoad];

HappyJob/HappyJob/BClass/BRelease_发布/ViewController/BReleaseSelectTypeView.m

@@ -73,7 +73,6 @@
     [_parttimeBtn setImage:[[UIImage imageNamed:@"B_release_select_parttime"] imageScaledToSize:CGSizeMake(18, 17)] forState:UIControlStateSelected];
     [_parttimeBtn layoutButtonWithEdgeInsetsStyle:MKButtonEdgeInsetsStyleTop imageTitleSpace:5];
     
-    
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(exitView)];
     [self addGestureRecognizer:tap];
     
@@ -151,7 +150,7 @@
         _fullTimeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_fullTimeBtn setTitle:@"全职工作" forState:UIControlStateNormal];
         _fullTimeBtn.titleLabel.font = [UIFont systemFontOfSize:12];
-        [_fullTimeBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [_fullTimeBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         [_fullTimeBtn setImage:[UIImage imageNamed:@"B_release_select_fulltime"] forState:UIControlStateNormal];
         [_fullTimeBtn addTarget:self action:@selector(fullTimeBtnClick) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -164,7 +163,7 @@
         _parttimeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_parttimeBtn setTitle:@"兼职工作" forState:UIControlStateNormal];
         _parttimeBtn.titleLabel.font = [UIFont systemFontOfSize:12];
-        [_parttimeBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [_parttimeBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         [_parttimeBtn setImage:[UIImage imageNamed:@"B_release_select_parttime"] forState:UIControlStateNormal];
         [_parttimeBtn addTarget:self action:@selector(parttimeBtnClick) forControlEvents:UIControlEventTouchUpInside];
     }

HappyJob/HappyJob/BClass/BRelease_发布/全职/ViewController/BReleaseFullTimeBasicInfoViewController.m

@@ -42,15 +42,10 @@
 @property (nonatomic, strong) NSArray             *addressArray;
 @property (nonatomic, strong) BPositonModel       *model;
 
-
 @end
 
 @implementation BReleaseFullTimeBasicInfoViewController
 
-- (UIStatusBarStyle)preferredStatusBarStyle {
-    
-    return UIStatusBarStyleLightContent;
-}
 
 - (void)viewDidLoad {
     [super viewDidLoad];

HappyJob/HappyJob/BClass/BRelease_发布/全职/ViewController/BReleaseFullTimeMoreInfoViewController.m

@@ -50,10 +50,6 @@ FBAPIManagerInterceptor
 
 @implementation BReleaseFullTimeMoreInfoViewController
 
-- (UIStatusBarStyle)preferredStatusBarStyle {
-    
-    return UIStatusBarStyleLightContent;
-}
 
 - (void)viewDidLoad {
     [super viewDidLoad];

HappyJob/HappyJob/BClass/BRelease_发布/兼职/View/BReleaseAddAddressView.m

@@ -110,21 +110,7 @@
     {
         self.isDelete = YES;
     }
-    
-    [self addButtonClick];
-    
-}
-#pragma mark - event response
-
-- (void)addButtonClick {
-    
-    __weak typeof(self) weakSelf = self;
-    [_plLabel removeFromSuperview];
-    for (UIView *sbuView in self.addressBgView.subviews)
-    {
-        [sbuView removeFromSuperview];
-    }
-    if (!self.isDelete)
+    else
     {
         NSMutableDictionary *initialDict = [NSMutableDictionary dictionary];
         [initialDict setValue:@"全国" forKey:@"adname"];
@@ -132,13 +118,55 @@
         [initialDict setValue:@"1" forKey:@"isThisAreaPublish"];
         [initialDict setValue:@(self.addressArray.count) forKey:@"have"];
         [self.addressArray addObject:initialDict];
+        
     }
+     self.addressBlock(self.addressArray);
+    [self AddAddress];
+    
+}
+#pragma mark - event response
+
+- (void)addButtonClick {
+    
+    __weak typeof(self) weakSelf = self;
+    NSMutableDictionary *initialDict = [NSMutableDictionary dictionary];
+    [initialDict setValue:@"320000" forKey:@"provinceId"];
+    [initialDict setValue:@"320200" forKey:@"cityId"];
+    [initialDict setValue:@"320214" forKey:@"countryId"];
+    [initialDict setValue:@"江苏省-无锡市-新吴区" forKey:@"adname"];
+    [initialDict setValue:@"" forKey:@"address"];
+    [initialDict setValue:@"1" forKey:@"isThisAreaPublish"];
+    [initialDict setValue:@(self.addressArray.count) forKey:@"have"];
     
-    dispatch_async(dispatch_get_main_queue(), ^{
+    self.addressPickView = [[AddressPickViewView alloc]init];
+    self.addressPickView.addressDict = initialDict;
+    [self.addressPickView showAddressPickView];
+    
+    self.addressPickView.selectAddressBlock = ^(NSString * _Nonnull pName, NSString * _Nonnull cName, NSString * _Nonnull aName, NSString * _Nonnull pCode, NSString * _Nonnull cCode, NSString * _Nonnull aCode, NSString * _Nonnull address) {
         
+        [initialDict setValue:pCode forKey:@"provinceId"];
+        [initialDict setValue:cCode forKey:@"cityId"];
+        [initialDict setValue:aCode forKey:@"countryId"];
+        [initialDict setValue:[NSString stringWithFormat:@"%@-%@-%@",pName,cName,aName] forKey:@"adname"];
+        [initialDict setValue:address forKey:@"address"];
+        [initialDict setValue:@"1" forKey:@"isThisAreaPublish"];
+        [initialDict setValue:@(weakSelf.addressArray.count) forKey:@"have"];
+        [weakSelf.addressArray addObject:initialDict];
         weakSelf.addressBlock(weakSelf.addressArray);
         
-    });
+        [weakSelf AddAddress];
+    };
+    
+}
+
+- (void)AddAddress {
+    
+    __weak typeof(self) weakSelf = self;
+    [_plLabel removeFromSuperview];
+    for (UIView *sbuView in self.addressBgView.subviews)
+    {
+        [sbuView removeFromSuperview];
+    }
     
     for (int i = 0; i < self.addressArray.count; i ++ )
     {
@@ -152,17 +180,19 @@
         }
         else
         {
+            
             NSArray *nameArray = [addressDict[@"adname"] componentsSeparatedByString:@"-"];
             addressView.cityLabel.text = [NSString stringWithFormat:@"%@\n%@",[nameArray componentsJoinedByString:@""],addressDict[@"address"]];
+            addressView.cityLabel.text = [addressView.cityLabel.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
             
         }
-        
         [addressView mas_makeConstraints:^(MASConstraintMaker *make) {
+            
             make.left.right.equalTo(self.addressBgView).offset(0);
+            
             if (i == 0)
             {
                 make.top.equalTo(self.addressBgView.mas_top).offset(0);
-                addressView.deleteBtn.hidden = YES;
             }
             else
             {
@@ -173,14 +203,22 @@
                 make.bottom.equalTo(self.addressBgView.mas_bottom).offset(0);
             }
         }];
+        
+        if (self.addressArray.count == 1)
+        {
+            addressView.deleteBtn.hidden = YES;
+        }
+        
         __weak typeof(addressView) addressWeakSelf = addressView;
+        
         addressView.editButtonBlock = ^{
             
             weakSelf.addressPickView = [[AddressPickViewView alloc]init];
             weakSelf.addressPickView.addressDict = weakSelf.addressArray[i];
             [weakSelf.addressPickView showAddressPickView];
+            
             weakSelf.addressPickView.selectAddressBlock = ^(NSString * _Nonnull pName, NSString * _Nonnull cName, NSString * _Nonnull aName, NSString * _Nonnull pCode, NSString * _Nonnull cCode, NSString * _Nonnull aCode, NSString * _Nonnull address) {
-              
+                
                 [addressDict setValue:pCode forKey:@"provinceId"];
                 [addressDict setValue:cCode forKey:@"cityId"];
                 [addressDict setValue:aCode forKey:@"countryId"];
@@ -191,20 +229,21 @@
                 [weakSelf.addressArray setObject:addressDict atIndexedSubscript:i];
                 
                 addressWeakSelf.cityLabel.text = [NSString stringWithFormat:@"%@%@%@\n%@",pName,cName,aName,addressDict[@"address"]];
+                addressWeakSelf.cityLabel.text = [addressWeakSelf.cityLabel.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
                 weakSelf.addressBlock(weakSelf.addressArray);
             };
             
         };
         addressView.deleteButtonBlock = ^{
-          
+            
             self.isDelete = YES;
             [self.addressArray removeObjectAtIndex:i];
-            [self addButtonClick];
-            
+            [self AddAddress];
         };
         self.lastAddressView = addressView;
-        self.isDelete = NO;
+        
     }
+    self.isDelete = NO;
     
 }
 
@@ -248,7 +287,7 @@
     {
         _addBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_addBtn setTitle:@"添加地点" forState:UIControlStateNormal];
-        [_addBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [_addBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         _addBtn.titleLabel.font = [UIFont systemFontOfSize:14];
         [_addBtn addTarget:self action:@selector(addButtonClick) forControlEvents:UIControlEventTouchUpInside];
     }

HappyJob/HappyJob/BClass/BRelease_发布/兼职/View/BReleaseAddressView.m

@@ -74,6 +74,7 @@
 }
 
 #pragma mark - event response
+
 - (void)deleteButtonClick {
     
     self.deleteButtonBlock();

HappyJob/HappyJob/BClass/BRelease_发布/兼职/View/BReleaseWelfareView.m

@@ -64,9 +64,7 @@
                 make.bottom.equalTo(self.mas_bottom).offset(-15);
             }
         }];
-        
     }
-    
 }
 - (void)configurationPartTimeWelfareViewModel:(BPositonModel *)model {
     

HappyJob/HappyJob/BClass/BRelease_发布/兼职/ViewController/BReleasePartTimeBasicInfoViewController.m

@@ -52,10 +52,6 @@
 
 @implementation BReleasePartTimeBasicInfoViewController
 
-- (UIStatusBarStyle)preferredStatusBarStyle {
-    
-    return UIStatusBarStyleLightContent;
-}
 
 - (void)viewDidLoad {
     [super viewDidLoad];
@@ -256,7 +252,7 @@
         [weakSelf.basicInfoDict setValue:salary forKey:@"salary"];
         //结算方式
         [weakSelf.basicInfoDict setValue:[NSString stringWithFormat:@"%ld",(long)index] forKey:@"salaryPeriod"];
-        weakSelf.salaryView.contentTF.text = [NSString stringWithFormat:@"%@%@",salary,name];
+        weakSelf.salaryView.contentTF.text = [NSString stringWithFormat:@"%@ %@",salary,name];
     };    
 }
 
@@ -596,7 +592,7 @@
     
     if (_salaryCycleArray == nil)
     {
-        _salaryCycleArray = @[@"元/天",@"元/周",@"元/次",@"元/时"];
+        _salaryCycleArray = @[@"元/天",@"元/周",@"元/月",@"元/次",@"元/时"];
     }
     return _salaryCycleArray;
 }

HappyJob/HappyJob/BClass/BRelease_发布/兼职/ViewController/BReleasePartTimeMoreInfoViewController.m

@@ -50,10 +50,7 @@ FBAPIManagerInterceptor
 
 @implementation BReleasePartTimeMoreInfoViewController
 
-- (UIStatusBarStyle)preferredStatusBarStyle {
-    
-    return UIStatusBarStyleLightContent;
-}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     

HappyJob/HappyJob/CClass/JobList_工作列表信息/FullTime_全职工作/HJFullTimeDetailHeaderView.m

@@ -47,14 +47,15 @@
     self.timeView = data[kHJPositionKeyTime];
     
     [self addSubview:self.topView];
-    if (!self.femaleView.hidden)
-    {
-        [self.topView addSubview:self.femaleView];
-    }
     if (!self.maleView.hidden)
     {
         [self.topView addSubview:self.maleView];
     }
+    if (!self.femaleView.hidden)
+    {
+        [self.topView addSubview:self.femaleView];
+    }
+    
     [self.topView addSubview:self.titleView];
     [self.topView addSubview:self.salaryView];
     [self.topView addSubview:self.peopleView];
@@ -85,7 +86,7 @@
         make.right.equalTo(self.salaryView);
         make.centerY.equalTo(self.peopleView);
     }];
-    if ([self.topView.subviews indexOfObject:self.femaleView] != NSNotFound)
+    if ([self.topView.subviews indexOfObject:self.maleView] != NSNotFound)
     {
         [self.topView addSubview:self.feeLabel];
         
@@ -95,24 +96,24 @@
             make.size.mas_offset(CGSizeMake(35, 20));
             make.bottom.equalTo(self.topView.mas_bottom).offset(-15);
         }];
-        [self.femaleView mas_makeConstraints:^(MASConstraintMaker *make) {
+        [self.maleView mas_makeConstraints:^(MASConstraintMaker *make) {
             
             make.centerY.equalTo(self.feeLabel);
             make.left.equalTo(self.feeLabel.mas_right).offset(10);
         }];
         
-        if ([self.topView.subviews indexOfObject:self.maleView] != NSNotFound)
+        if ([self.topView.subviews indexOfObject:self.femaleView] != NSNotFound)
         {
-            [self.maleView mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.top.equalTo(self.femaleView);
-                make.left.equalTo(self.femaleView.mas_right).with.offset(5);
+            [self.femaleView mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.top.equalTo(self.maleView);
+                make.left.equalTo(self.maleView.mas_right).with.offset(5);
             }];
         }
         
     }
     else
     {
-        if ([self.topView.subviews indexOfObject:self.maleView] != NSNotFound)
+        if ([self.topView.subviews indexOfObject:self.femaleView] != NSNotFound)
         {
             [self.topView addSubview:self.feeLabel];
             
@@ -122,7 +123,7 @@
                 make.size.mas_offset(CGSizeMake(35, 20));
                 make.bottom.equalTo(self.topView.mas_bottom).offset(-15);
             }];
-            [self.maleView mas_makeConstraints:^(MASConstraintMaker *make) {
+            [self.femaleView mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.centerY.equalTo(self.feeLabel);
                 make.left.equalTo(self.feeLabel.mas_right).offset(10);
             }];

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

@@ -90,7 +90,7 @@
         [self.addressView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.top.equalTo(self.headerView.mas_bottom).offset(0);
             make.left.right.equalTo(contentView);
-            make.height.mas_equalTo(97);
+            make.height.mas_equalTo(HJHorizontalScale(97));
         }];
         [self.baseInfoView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.top.equalTo(self.addressView.mas_bottom).with.offset(10);
@@ -118,7 +118,7 @@
         [self.trafficView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.top.equalTo(self.otherInfoView.mas_bottom);
             make.left.right.equalTo(contentView);
-            make.height.mas_equalTo(65);
+            make.height.mas_equalTo(HJHorizontalScale(65));
         }];
         [self.companyInfoView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.top.equalTo(self.trafficView.mas_bottom).with.offset(10);

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

@@ -105,7 +105,7 @@ UIScrollViewDelegate
             make.top.equalTo(self.addressBgView.mas_top).offset(0);
             make.bottom.equalTo(self.addressBgView.mas_bottom).offset(0);
             make.left.right.equalTo(self.addressBgView);
-            make.height.mas_equalTo(97);
+            make.height.mas_equalTo(HJHorizontalScale(97));
         }];
     }
     
@@ -180,7 +180,7 @@ UIScrollViewDelegate
 
 - (CGFloat)estimateWidthInFlowLayoutView:(FBFlowLayoutView *)flowLayoutView {
     
-    return (SCREEN_WIDTH - HJHorizontalScale(120));
+    return (SCREEN_WIDTH - HJHorizontalScale(125));
 }
 
 - (CGFloat)subviewHorizontalSpacingInFlowLayoutView:(FBFlowLayoutView *)flowLayoutView {
@@ -247,7 +247,7 @@ UIScrollViewDelegate
     }
     
     //工作时间
-    if (model.position.workDay)
+    if (model.position.workDay.length > 0)
     {
         NSDictionary *workTimeDict = @{kHJLeftLabelText: @"工作时间：", kHJRightLabelText: [NSString stringWithFormat:@"%@\n%@", model.position.workDay, model.position.workTime ? model.position.workTime:@""]};
         self.workTimeLabel = [[HJLeftRightLabelView alloc] initWithTextArray:@[workTimeDict]];

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

@@ -152,25 +152,25 @@ NSString * const HJPositionListRefreshNotification = @"HJPositionListRefreshNoti
     [dict setObject:self.salaryLabel forKey:kHJPositionKeySalary];
     
     //返费
-    if (model.position.femaleReward > 0 )
+    if (model.position.maleReward > 0 )
     {
-        self.femaleReturnMoneyLabel.text = [NSString stringWithFormat:@"男返费%@元,", @(model.position.femaleReward)];
+        self.maleReturnMoneyLabel.text = [NSString stringWithFormat:@"男返费%@元,", @(model.position.maleReward)];
     }
     else
     {
-        self.femaleReturnMoneyLabel.hidden = YES;
+        self.maleReturnMoneyLabel.hidden = YES;
     }
-    if (model.position.maleReward > 0)
+    if (model.position.femaleReward > 0)
     {
-        self.maleReturnMoneyLabel.text = [NSString stringWithFormat:@"女返费%@元", @(model.position.maleReward)];
+        self.femaleReturnMoneyLabel.text = [NSString stringWithFormat:@"女返费%@元", @(model.position.femaleReward)];
     }
     else
     {
-        self.maleReturnMoneyLabel.hidden = YES;
+        self.femaleReturnMoneyLabel.hidden = YES;
     }
     
-    [dict setObject:self.femaleReturnMoneyLabel forKey:kHJPositionKeyFemaleReward];
     [dict setObject:self.maleReturnMoneyLabel forKey:kHJPositionKeyMaleReward];
+    [dict setObject:self.femaleReturnMoneyLabel forKey:kHJPositionKeyFemaleReward];
     
     //招聘人数和发布时间
     NSString *people = (model.position.recruitNumber > 0) ? [NSString stringWithFormat:@"%@人", @(model.position.recruitNumber)] : @"若干";

HappyJob/HappyJob/CClass/Join_拼工/All_所有拼工/HJJoinAllJoinPanelViewController.m

@@ -93,6 +93,7 @@ HJJoinAllJoinTableViewCellDelegate
     cell.accountLabel.text = [NSString stringWithFormat:@"已有 %@ 人加入，还差 %@ 人",@([group count]),@(count)];
     
     [cell.portraitView1.imageView sd_setImageWithURL:[NSURL URLWithString:model.resume.photoURLString] placeholderImage:[UIImage imageNamed:@"portrait_default"]];
+    
     //满足三个人就可以成团，计算还差几个人成团
     if (count == 1)
     {

HappyJob/HappyJob/CClass/Join_拼工/Apply_申请拼工/HJJoinApplyContentView.m

@@ -72,6 +72,7 @@
         
         make.bottom.equalTo(self.bgView.mas_bottom).with.offset(-20);
         make.left.equalTo(self.iconImageV.mas_right).with.offset(20);
+        make.right.equalTo(self.bgView.mas_right).with.offset(-15);
         
     }];
     
@@ -213,6 +214,7 @@
     {
         _clockLabel = [[UILabel alloc] init];
         _clockLabel.font = [UIFont systemFontOfSize:14];
+        _clockLabel.numberOfLines = 2;
         _clockLabel.textColor = COLOR_BACK6;
     }
     return _clockLabel;

HappyJob/HappyJob/CClass/Join_拼工/Apply_申请拼工/HJJoinApplySuccessContentView.h

@@ -11,8 +11,9 @@
 NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_ENUM(NSInteger, HJJoinApplyContentViewType) {
-    HJJoinApplyContentViewTypeSuccess,
-    HJJoinApplyContentViewTypeFailed
+    
+    HJJoinApplyContentViewTypeSuccess,//拼团成功
+    HJJoinApplyContentViewTypeFailed//拼团失败
 };
 
 @interface HJJoinApplySuccessContentView : UIView

HappyJob/HappyJob/CClass/Join_拼工/Apply_申请拼工/HJJoinApplySuccessContentView.m

@@ -81,6 +81,8 @@
 
 - (void)configData:(NSDictionary *)data {
     
+    NSLog(@"data:::::::%@",data);
+    
     id num = [data valueForKey:@"groupNumber"];
     id names = [data valueForKeyPath:@"myGroupList.hpResumeAPI.realName"];
     if ([names isKindOfClass:[NSArray class]] && [num isKindOfClass:[NSNumber class]])

HappyJob/HappyJob/CClass/Join_拼工/Apply_申请拼工/HJJoinApplyViewController.m

@@ -116,31 +116,41 @@ NSString *const HJJoinApplySuccessNotification = @"HJJoinApplySuccessNotificatio
         make.left.right.equalTo(contentView);
     }];
     [contentView mas_makeConstraints:^(MASConstraintMaker *make) {
+        
         make.bottom.equalTo(self.companyNameView.mas_bottom);
     }];
 }
 - (void)subviewsMakeConstraintsInScrollLayoutView:(FBScrollLayoutView *)scrollLayoutView footerView:(UIView *)footerView {
     
-    [footerView mas_makeConstraints:^(MASConstraintMaker *make) {
-        
-        make.height.mas_equalTo(60);
-    }];
-    
-    if ([footerView.subviews indexOfObject:self.joinBtn] != NSNotFound)
+    if ([footerView.subviews indexOfObject:self.joinBtn] == NSNotFound && [footerView.subviews indexOfObject:self.shareBtn] == NSNotFound)
     {
-        [self.joinBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.edges.equalTo(footerView).with.insets(UIEdgeInsetsMake(9, 15, 9, 15));
+        [footerView mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.height.mas_equalTo(CGFLOAT_MIN);
         }];
     }
-    if ([footerView.subviews indexOfObject:self.shareBtn] != NSNotFound)
+    else
     {
-        [self.invitationBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.edges.equalTo(footerView).with.insets(UIEdgeInsetsMake(9, 15, 9, HJHorizontalScale(250)));
-        }];
-        [self.shareBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.edges.equalTo(footerView).with.insets(UIEdgeInsetsMake(9, HJHorizontalScale(135), 9, 15));
+        [footerView mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.height.mas_equalTo(60);
         }];
         
+        if ([footerView.subviews indexOfObject:self.joinBtn] != NSNotFound)
+        {
+            [self.joinBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.edges.equalTo(footerView).with.insets(UIEdgeInsetsMake(9, 15, 9, 15));
+            }];
+        }
+        if ([footerView.subviews indexOfObject:self.shareBtn] != NSNotFound)
+        {
+            [self.invitationBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.edges.equalTo(footerView).with.insets(UIEdgeInsetsMake(9, 15, 9, HJHorizontalScale(250)));
+            }];
+            [self.shareBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.edges.equalTo(footerView).with.insets(UIEdgeInsetsMake(9, HJHorizontalScale(135), 9, 15));
+            }];
+        }
     }
 }
 
@@ -187,6 +197,9 @@ NSString *const HJJoinApplySuccessNotification = @"HJJoinApplySuccessNotificatio
         }
         [self.headerView removeFromSuperview];
         [self.contentView removeFromSuperview];
+        [self.joinBtn removeFromSuperview];
+        [self.invitationBtn removeFromSuperview];
+        [self.shareBtn removeFromSuperview];
 
         id fetchData = [manager fetchDataWithBox:nil];
         id isExist = [fetchData valueForKeyPath:@"data.isExist"];
@@ -215,7 +228,7 @@ NSString *const HJJoinApplySuccessNotification = @"HJJoinApplySuccessNotificatio
             
             __weak typeof(self) weakSelf = self;
             self.companyNameView.IntroductionButtonBlock = ^{
-                
+                //公司简介
                 HJPositionDetailCompanyInfoViewController *vc = [[HJPositionDetailCompanyInfoViewController alloc]init];
                 vc.infoArray = companyInfoArray;
                 [weakSelf.navigationController pushViewController:vc animated:YES];
@@ -238,8 +251,7 @@ NSString *const HJJoinApplySuccessNotification = @"HJJoinApplySuccessNotificatio
                         make.bottom.equalTo(self.applyingView.mas_bottom);
                     }];
                     if ([self.dataDict[@"isShare"] boolValue])
-                    {
-                        [self.joinBtn removeFromSuperview];
+                    {//只有在拼工中才有邀请和分享
                         [self.scrollLayoutView.footerView addSubview:self.invitationBtn];
                         [self.scrollLayoutView.footerView addSubview:self.shareBtn];
                     }
@@ -254,6 +266,7 @@ NSString *const HJJoinApplySuccessNotification = @"HJJoinApplySuccessNotificatio
                     [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) {
                         make.bottom.equalTo(self.applySuccessView.mas_bottom);
                     }];
+                    
                 }
                 else if ([isEnd integerValue] == 2)
                 {
@@ -277,9 +290,7 @@ NSString *const HJJoinApplySuccessNotification = @"HJJoinApplySuccessNotificatio
                 [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) {
                     make.bottom.equalTo(self.applyView.mas_bottom);
                 }];
-
-                [self.invitationBtn removeFromSuperview];
-                [self.shareBtn removeFromSuperview];
+               //没有加入拼团出现拼团按钮
                 [self.scrollLayoutView.footerView addSubview:self.joinBtn];
             }
 
@@ -288,9 +299,7 @@ NSString *const HJJoinApplySuccessNotification = @"HJJoinApplySuccessNotificatio
             [self.scrollLayoutView.contentView addSubview:self.contentView];
             [self.scrollLayoutView.contentView addSubview:self.companyNameView];
             [self.scrollLayoutView makeConstraints];
-            
         }
-        
     }
 
     if (manager == self.resumeAPIManager)
@@ -320,7 +329,6 @@ NSString *const HJJoinApplySuccessNotification = @"HJJoinApplySuccessNotificatio
         self.detailAPIManager.groupID = self.groupID;
         [self.detailAPIManager start];
     }
-    
 }
 
 - (void)managerCallAPIDidFailed:(FBBaseAPIManager *)manager {
@@ -447,6 +455,14 @@ NSString *const HJJoinApplySuccessNotification = @"HJJoinApplySuccessNotificatio
     {
         _scrollLayoutView = [[FBScrollLayoutView alloc] init];
         _scrollLayoutView.delegate = self;
+//        if (@available(iOS 11.0, *))
+//        {
+//            _scrollLayoutView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+//        }
+//        else
+//        {
+//            self.automaticallyAdjustsScrollViewInsets = NO;
+//        }
     }
     return _scrollLayoutView;
 }

HappyJob/HappyJob/CClass/Join_拼工/Apply_申请拼工/HJJoinApplyingContentView.m

@@ -68,6 +68,7 @@
     [self.clockLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.titleLabel.mas_bottom).with.offset(10);
         make.left.equalTo(self.iconImageV.mas_right).with.offset(20);
+        make.right.equalTo(self.bgView.mas_right).with.offset(-15);
     }];
     [self.lineH mas_makeConstraints:^(MASConstraintMaker *make) {
         
@@ -239,6 +240,7 @@
     {
         _clockLabel = [[UILabel alloc] init];
         _clockLabel.font = [UIFont systemFontOfSize:13];
+        _clockLabel.numberOfLines = 2;
         _clockLabel.textColor = [UIColor colorWithRed:102/255.0 green:102/255.0 blue:102/255.0 alpha:1.0];
     }
     return _clockLabel;

HappyJob/HappyJob/CClass/Join_拼工/HJJoinViewController.m

@@ -69,8 +69,6 @@
         
         make.edges.equalTo(self.view);
     }];
-  
-   
 }
 
 #pragma mark - UITableViewDelegate

HappyJob/HappyJob/CClass/Join_拼工/Scroll_拼工轮播/HJJoinDetailJoinView.m

@@ -173,7 +173,7 @@
         _allJoinButton = [UIButton buttonWithType:UIButtonTypeSystem];
         _allJoinButton.titleLabel.font = [UIFont systemFontOfSize:12];
         [_allJoinButton setTitle:@"查看更多 >" forState:UIControlStateNormal];
-        [_allJoinButton setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [_allJoinButton setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         [_allJoinButton addTarget:self action:@selector(allJoinButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _allJoinButton;

HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/ViewController/HJResumeViewController.m

@@ -64,7 +64,6 @@ UIGestureRecognizerDelegate
     [super viewDidLoad];
     
     self.title = @"个人简历";
-    [self hj_setupNavBar];
     [self autoLayOutViews];
     [self.getResumeAPIManager start];
     

HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/个人资料/HJBasicInfoView.m

@@ -206,7 +206,7 @@
     {
         _changeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_changeBtn setTitle:@"点击修改 >" forState:UIControlStateNormal];
-        [_changeBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [_changeBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         _changeBtn.titleLabel.font = [UIFont systemFontOfSize:12];
         [_changeBtn addTarget:self action:@selector(changeButtonClick) forControlEvents:UIControlEventTouchUpInside];
     }

HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/工作经验/HJExperienceListViewController.m

@@ -45,6 +45,7 @@ UIGestureRecognizerDelegate>
         listView.tag = i;
         
         listView.contentTextField.userInteractionEnabled = NO;
+//        NSLog(@"listArray::::%@",self.listArray);
         listView.contentTextField.text = self.listArray[i][@"kHJResumeKeyWorkPosition"];
         listView.titleLabel.text = [NSString stringWithFormat:@"工作经验%@",@(i + 1)];
         [self.bgView addSubview:listView];

HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/工作经验/HJExperienceView.m

@@ -34,6 +34,12 @@
 
 - (void)configWithData:(NSDictionary *)data {
     
+    for (UIView *subView in self.bgView.subviews)
+    {
+        [subView removeFromSuperview];
+    }
+    [self.bgView removeFromSuperview];
+    
     if (data == nil || [data isEqual:[NSNull null]])
     {
         return;
@@ -176,7 +182,7 @@
     {
         _changeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_changeBtn setTitle:@"点击修改 >" forState:UIControlStateNormal];
-        [_changeBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [_changeBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         _changeBtn.titleLabel.font = [UIFont systemFontOfSize:12];
         [_changeBtn addTarget:self action:@selector(changeButtonClick:) forControlEvents:UIControlEventTouchUpInside];
     }

HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/工作经验/HJExperienceViewController.m

@@ -17,6 +17,7 @@
 #import "NSDate+XHCategory.h"
 #import <IQPreviousNextView.h>
 #import "UITextField+LimitLength.h"
+#import "HJResumeViewController.h"
 
 @interface HJExperienceViewController ()
 <
@@ -177,7 +178,9 @@ UIGestureRecognizerDelegate
         if ([fetchData isKindOfClass:[NSString class]])
         {
             [self.view fb_showSuccessWithStatus:fetchData completion:^{
-                [self.navigationController popViewControllerAnimated:YES];
+                
+                UIViewController *vc = self.navigationController.viewControllers[1] ;
+                [self.navigationController popToViewController:vc animated:YES] ;
             }];
         }
     }

HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/求职意向/HJExpectationView.m

@@ -44,7 +44,13 @@
     
     self.jobsView.rightLabel.text = data[kHJResumeKeyPosition];
     self.addressView.rightLabel.text = data[kHJResumeKeyWorkPlace];
-    self.salaryView.rightLabel.text = data[kHJResumeKeySalary];
+    
+    NSString *salaryStr = data[kHJResumeKeySalary];
+    if (salaryStr.length == 0)
+    {
+        salaryStr = @"不限";
+    }
+    self.salaryView.rightLabel.text =  salaryStr;
 }
 
 - (void)initViews {
@@ -165,7 +171,7 @@
         _changeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_changeBtn setTitle:@"点击修改 >" forState:UIControlStateNormal];
         _changeBtn.titleLabel.font = [UIFont systemFontOfSize:12];
-        [_changeBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [_changeBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         [_changeBtn addTarget:self action:@selector(changeButtonClick) forControlEvents:UIControlEventTouchUpInside];
     }
     return _changeBtn;

HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/求职意向/HJExpectationViewController.m

@@ -61,8 +61,8 @@ UIGestureRecognizerDelegate
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.title = @"求职意向";
     
+    self.title = @"求职意向";
     [self.view addSubview:self.scrollLayoutView];
     [self.scrollLayoutView.contentView addSubview:self.previousNextView];
     [self.previousNextView addSubview:self.postView];
@@ -85,6 +85,7 @@ UIGestureRecognizerDelegate
 #pragma mark - FBScrollLayoutViewDelegate
 
 - (void)scrollLayoutViewMakeConstraints:(FBScrollLayoutView *)scrollLayoutView {
+    
     [scrollLayoutView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.left.right.equalTo(self.view);
         make.bottom.equalTo(self.mas_bottomLayoutGuide);
@@ -141,7 +142,9 @@ UIGestureRecognizerDelegate
 }
 
 - (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component {
-    if (pickerView == self.salaryPickerView) {
+    
+    if (pickerView == self.salaryPickerView)
+    {
         return self.resumeDataBox.salaryDataSource[row];
     }
     
@@ -184,14 +187,17 @@ UIGestureRecognizerDelegate
 #pragma mark - FBFlowLayoutDelegate
 
 - (CGFloat)estimateWidthInFlowLayoutView:(FBFlowLayoutView *)flowLayoutView {
+    
     return SCREEN_WIDTH;
 }
 
 - (NSUInteger)numberInFlowLayoutView:(FBFlowLayoutView *)flowLayoutView {
+    
     return self.resumeDataBox.positionDataSource.count;
 }
 
 - (UIView *)flowLayoutView:(FBFlowLayoutView *)flowLayoutView subviewAtIndex:(NSUInteger)index {
+    
     NSString *title = self.resumeDataBox.positionDataSource[index];
     CGSize maxSize = CGSizeMake(flowLayoutView.contentWidth, MAXFLOAT);
     UIColor *color = [UIColor colorWithRed:81/255.0 green:145/255.0 blue:211/255.0 alpha:1.0];

HappyJob/HappyJob/CClass/Me_我/Salary_薪资查询/HJSalaryEmptyView.m

@@ -113,7 +113,7 @@
         _okBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_okBtn setTitle:@"好的" forState:UIControlStateNormal];
         _okBtn.titleLabel.font = [UIFont systemFontOfSize:18];
-        [_okBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [_okBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         [_okBtn addTarget:self action:@selector(okbuttonClick) forControlEvents:UIControlEventTouchUpInside];
     }
     return _okBtn;

HappyJob/HappyJob/CClass/Me_我/Salary_薪资查询/HJSalaryViewController.m

@@ -295,7 +295,7 @@ FBAPIManagerDelegate
         _salaryFieldView.delegate = self;
         _salaryFieldView.phoneTextField.text = [HJMemberInfoModel memberInfo].phone;
         _salaryFieldView.getCodeButton.userInteractionEnabled = YES;
-        [_salaryFieldView.getCodeButton setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [_salaryFieldView.getCodeButton setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
     }
     return _salaryFieldView;
 }

HappyJob/HappyJob/CClass/Me_我/View/Header_头视图/HJMeResumeView.m

@@ -189,9 +189,9 @@
         _editButton.layer.cornerRadius = 5;
         _editButton.layer.masksToBounds = YES;
         _editButton.layer.borderWidth = 1;
-        _editButton.layer.borderColor = COLOR_DEFAULT.CGColor;
+        _editButton.layer.borderColor = COLOR_BLUE_4183E1.CGColor;
         [_editButton setTitle:@"去完善" forState:UIControlStateNormal];
-        [_editButton setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [_editButton setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         [_editButton addTarget:self action:@selector(editButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _editButton;
@@ -211,7 +211,7 @@
     if (_progressLabel == nil)
     {
         _progressLabel = [[UILabel alloc] init];
-        _progressLabel.textColor = COLOR_DEFAULT;
+        _progressLabel.textColor = COLOR_BLUE_4183E1;
         _progressLabel.font = [UIFont systemFontOfSize:14];
     }
     return _progressLabel;

HappyJob/HappyJob/Custom/Components/CustomControl/UIView/HJToolbarView.m

@@ -62,7 +62,7 @@
     {
         _cancelBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_cancelBtn setTitle:@"取消" forState:UIControlStateNormal];
-        [_cancelBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [_cancelBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         _cancelBtn.titleLabel.font = [UIFont systemFontOfSize:17];
     }
     return _cancelBtn;
@@ -73,7 +73,7 @@
     {
         _doneBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_doneBtn setTitle:@"确定" forState:UIControlStateNormal];
-        [_doneBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [_doneBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         _doneBtn.titleLabel.font = [UIFont systemFontOfSize:17];
     }
     return _doneBtn;
@@ -84,7 +84,7 @@
     {
         _titleLabel = [[UILabel alloc]init];
         _titleLabel.font = [UIFont systemFontOfSize:17];
-        _titleLabel.textColor = COLOR_DEFAULT;
+        _titleLabel.textColor = COLOR_BLUE_4183E1;
     }
     return _titleLabel;
 }

HappyJob/HappyJob/Custom/Components/CustomControl/UIView/JobDetail_职位详情/HJJobDetailForwardView.m

@@ -54,12 +54,13 @@
         
         make.left.bottom.right.top.offset(0);
     }];
+    
     if (self.type == HJDetailForwardStyleStyleAddress)
     {
         [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.top.equalTo(self.imageView).offset(29);
             make.left.equalTo(self.imageView.mas_left).offset(30);
             make.right.equalTo(self.lineView.mas_right).offset(-10);
+            make.centerY.equalTo(self.imageView).offset(-10);
         }];
         self.lineView.hidden = NO;
     }
@@ -76,8 +77,7 @@
        
         make.left.equalTo(self.titleLabel);
         make.right.equalTo(self.lineView.mas_right).offset(-10);
-        make.bottom.equalTo(self.imageView).offset(-29);
-        
+        make.centerY.equalTo(self.imageView).offset(10);
     }];
     [self.allLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.equalTo(self.imageView);

HappyJob/HappyJob/Custom/Components/CustomControl/UIViewController/HJConfirmPanelViewController.m

@@ -165,7 +165,7 @@
         _confirmButton = [UIButton buttonWithType:UIButtonTypeSystem];
         _confirmButton.titleLabel.font = [UIFont systemFontOfSize:16];
         [_confirmButton setTitle:@"确认删除" forState:UIControlStateNormal];
-        [_confirmButton setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [_confirmButton setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
     }
     return _confirmButton;
 }

HappyJob/HappyJob/Custom/HeaderViewSelectButton/HeaderViewSelectButton.m

@@ -56,7 +56,7 @@
             height=self.center.y;
             _xianlab=[[UILabel alloc]init];
             _xianlab.frame=CGRectMake(0,self.frame.size.height-3, 35, 3);
-//            _xianlab.backgroundColor = COLOR_DEFAULT ;
+//            _xianlab.backgroundColor = COLOR_BLUE_4183E1 ;
             _xianlab.center=CGPointMake(bnt.center.x, self.frame.size.height-3/2);
             [self addSubview:_xianlab];
             bnt.titleLabel.font = [UIFont systemFontOfSize:15];

HappyJob/HappyJob/Custom/PickViewOne/ValuePickerView.m

@@ -73,7 +73,7 @@
     self.finishBtn.titleLabel.font = [UIFont systemFontOfSize:17];
     [self.finishBtn addTarget:self action:@selector(finishBtnClicked:) forControlEvents:UIControlEventTouchUpInside];
     [self.finishBtn setTitle:@"确认" forState:UIControlStateNormal];
-    [self.finishBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+    [self.finishBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
     [self.controllerToolBar addSubview:self.finishBtn];
     
     //取消按钮
@@ -82,7 +82,7 @@
     self.cancelBtn.titleLabel.font = [UIFont systemFontOfSize:17];
     [self.cancelBtn addTarget:self action:@selector(canceBtnClicked:) forControlEvents:UIControlEventTouchUpInside];
     [self.cancelBtn setTitle:@"取消" forState:UIControlStateNormal];
-    [self.cancelBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+    [self.cancelBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
     [self.controllerToolBar addSubview:self.cancelBtn];
     
     //标题

HappyJob/HappyJob/HappyJob-Prefix.pch

@@ -87,7 +87,6 @@ static const DDLogLevel ddLogLevel = DDLogLevelWarning;
 self.navigationItem.backBarButtonItem = barItem;
 
 /* 颜色 */
-#define COLOR_BLUEA7   [UIColor colorFromHexString:@"1E62A7"]
 
 #define COLOR_GRAY9    [UIColor colorFromHexString:@"999999"]
 
@@ -107,7 +106,7 @@ self.navigationItem.backBarButtonItem = barItem;
 
 #define COLOR_GRAYFA5  [UIColor colorFromHexString:@"F5F5F5"]
 
-#define COLOR_DEFAULT  [UIColor colorFromHexString:@"4183E1"]
+#define COLOR_BLUE_4183E1  [UIColor colorFromHexString:@"4183E1"]
 
 #define COLOR_READFF   [UIColor colorFromHexString:@"FF4E25"]
 

HappyJob/HappyJob/Login_登录/View/HJLoginAgreementView.m

@@ -48,7 +48,7 @@
     [attributedString addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12] range:NSMakeRange(0, attributedString.length)];
         
     _textLabel.attributedText = attributedString;
-    _textLabel.linkTextAttributes = @{NSForegroundColorAttributeName: COLOR_DEFAULT,
+    _textLabel.linkTextAttributes = @{NSForegroundColorAttributeName: COLOR_BLUE_4183E1,
                                            NSUnderlineColorAttributeName: [UIColor lightGrayColor],
                                            NSUnderlineStyleAttributeName: @(NSUnderlinePatternSolid)};
    

HappyJob/HappyJob/Login_登录/View/HJLoginFieldView.m

@@ -98,7 +98,7 @@
     if (_phoneTextField.text.length == 11)
     {
         _getCodeButton.userInteractionEnabled = YES;
-        [_getCodeButton setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [_getCodeButton setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
     }
     else
     {
@@ -211,14 +211,14 @@
             {
                 sender.userInteractionEnabled = NO;
                 [sender startCountDownWithSecond:60];
-                [sender setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+                [sender setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
                 [sender countDownChanging:^NSString *(JKCountDownButton *countDownButton,NSUInteger second) {
                     NSString *title = [NSString stringWithFormat:@"重新发送%zds",second];
                     return title;
                 }];
                 [sender countDownFinished:^NSString *(JKCountDownButton *countDownButton, NSUInteger second) {
                     countDownButton.userInteractionEnabled = YES;
-                    [countDownButton setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+                    [countDownButton setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
                     return @"获取验证码";
                 }];
                 

HappyJob/HappyJob/Login_登录/信息合并/View/HJLoginInfoMergePopupView.m

@@ -132,7 +132,7 @@
     {
         _okBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_okBtn setTitle:@"好的" forState:UIControlStateNormal];
-        [_okBtn setTitleColor:COLOR_DEFAULT forState:UIControlStateNormal];
+        [_okBtn setTitleColor:COLOR_BLUE_4183E1 forState:UIControlStateNormal];
         _okBtn.titleLabel.font = [UIFont systemFontOfSize:16];
         [_okBtn addTarget:self action:@selector(okButtonClick) forControlEvents:UIControlEventTouchUpInside];
     }

HappyJob/HappyJob/Main_标签栏控制器/BMainViewController.m

@@ -7,7 +7,6 @@
 //
 
 #import "BMainViewController.h"
-
 #import "BHomeViewController.h"
 #import "BPositionViewController.h"
 #import "BReleaseViewController.h"
@@ -76,6 +75,7 @@
         {
             vc.tabBarItem.imageInsets = UIEdgeInsetsMake(6, 0, -6,0);
         }
+        self.tabBarItem.tag = i + 10;
         
     }