登录流程bug修改

HappyJob/HappyJob/BClass/BHome_首页/APIManager/BHomeDataBox.m

@@ -163,7 +163,11 @@
     if (manager.isFirstPage)
     {
         // 如果请求返回的数据是第一页，就重新加载数据源
-        self.dataSource = [NSMutableArray arrayWithArray:array];
+        if ([array isKindOfClass:[NSArray class]])
+        {
+            self.dataSource = [NSMutableArray arrayWithArray:array];
+        }
+        
     }
     else
     {

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

@@ -117,7 +117,8 @@
     if (_headerImageV == nil)
     {
         _headerImageV = [[UIImageView alloc]init];
-        _headerImageV.contentMode = UIViewContentModeScaleAspectFit;
+        _headerImageV.contentMode = UIViewContentModeScaleAspectFill;
+        _headerImageV.clipsToBounds = YES;
     }
     return _headerImageV;
 }

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

@@ -167,7 +167,8 @@
     if (_headerImageV == nil)
     {
         _headerImageV = [[UIImageView alloc]init];
-        _headerImageV.contentMode = UIViewContentModeScaleAspectFit;
+        _headerImageV.contentMode = UIViewContentModeScaleAspectFill;
+        _headerImageV.clipsToBounds = YES;
     }
     return _headerImageV;
 }

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

@@ -293,7 +293,7 @@ BPositionDataBoxDelegate
     vc.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
     vc.modalPresentationStyle = UIModalPresentationOverCurrentContext;
     self.navigationController.definesPresentationContext = NO;
-    vc.titleLabel.text = @"岗位下架后不能对其进行任何操作，\n也无法查看该岗位的报名和面试信息。";
+    vc.titleLabel.text = @"岗位下架后不能对其进行任何操作，也无法查看该岗位的报名和面试信息。";
     vc.titleIcon.image = nil;
     [vc.cancelButton setTitle:@"取消" forState:UIControlStateNormal];
     [vc.confirmButton setTitle:@"确定下架" forState:UIControlStateNormal];

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

@@ -154,7 +154,7 @@ NSString * const HJPositionListRefreshNotification = @"HJPositionListRefreshNoti
     //返费
     if (model.position.maleReward > 0 )
     {
-        self.maleReturnMoneyLabel.text = [NSString stringWithFormat:@"男返费%@元,", @(model.position.maleReward)];
+        self.maleReturnMoneyLabel.text = [NSString stringWithFormat:@"男返费%@元", @(model.position.maleReward)];
     }
     else
     {
@@ -162,7 +162,7 @@ NSString * const HJPositionListRefreshNotification = @"HJPositionListRefreshNoti
     }
     if (model.position.femaleReward > 0)
     {
-        self.femaleReturnMoneyLabel.text = [NSString stringWithFormat:@"女返费%@元", @(model.position.femaleReward)];
+        self.femaleReturnMoneyLabel.text = [NSString stringWithFormat:@"女返费%@元,", @(model.position.femaleReward)];
     }
     else
     {

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

@@ -107,8 +107,8 @@
     }
     self.peopleDateLabel.text = [NSString stringWithFormat:@"招聘人数：%@", people];
     
-    self.returnFeeLabel.text = [NSString stringWithFormat:@"男返费%@元，女返费%@元",data[@"femaleReward"],data[@"maleReward"]];
-    
+    self.returnFeeLabel.text = [NSString stringWithFormat:@"男返费%@元，女返费%@元",data[@"maleReward"],data[@"femaleReward"]];
+    //femaleReward
 }
 
 #pragma mark - CustomDelegate

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

@@ -81,27 +81,26 @@
 
 - (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]])
     {
         
-        NSString *name = [[NSString alloc] initWithString:[names firstObject]];
+//        NSString *name = [[NSString alloc] initWithString:[names firstObject]];
     
         NSString *string;
         
         if (self.type == HJJoinApplyContentViewTypeSuccess)
         {
-            string = [NSString stringWithFormat:@"共有%@人加入了%@的拼工，获得拼工奖励金为",num,name];
+            string = [NSString stringWithFormat:@"共有%@人加入了拼工，额外奖励",num];//name
         }
         else
         {
-            string = [NSString stringWithFormat:@"共有%@人加入了%@的拼工，获得基础奖励：",num,name];
+            string = [NSString stringWithFormat:@"共有%@人加入了拼工，获得基础奖励：",num];//name
         }
         
-        NSMutableString *cash = [[NSMutableString alloc] initWithString:@"0元"];
+        NSMutableString *cash = [[NSMutableString alloc] initWithString:@""];
         //基础返现根据性别判断，1是男，2是女
         HJResumeModel *resume = [HJResumeModel resume];
         if (resume.gender == 1)
@@ -130,7 +129,11 @@
                 id fiveGroupCashback = [data valueForKeyPath:@"position.fiveGroupCashback"];
                 if (![fiveGroupCashback isEqual:[NSNull null]])
                 {
-                    [cash appendString:[NSString stringWithFormat:@"+%@元", fiveGroupCashback]];
+                    if (self.type == HJJoinApplyContentViewTypeSuccess)
+                    {
+                        cash = [[NSMutableString alloc] initWithString:[NSString stringWithFormat:@"%@元", fiveGroupCashback]];
+                      
+                    }
                 }
             }
             else if ([num integerValue] > 2)
@@ -139,7 +142,11 @@
                 id threeGroupCashback = [data valueForKeyPath:@"position.threeGroupCashback"];
                 if (![threeGroupCashback isEqual:[NSNull null]])
                 {
-                    [cash appendString:[NSString stringWithFormat:@"+%@元", threeGroupCashback]];
+                    if (self.type == HJJoinApplyContentViewTypeSuccess)
+                    {
+                        cash = [[NSMutableString alloc] initWithString:[NSString stringWithFormat:@"%@元", threeGroupCashback]];
+                    }
+                   
                 }
             }
         }

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

@@ -50,6 +50,8 @@
     [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.titleIcon.mas_bottom).with.offset(22);
         make.centerX.equalTo(self.contentView);
+        make.left.equalTo(self.contentView).offset(10);
+        make.right.equalTo(self.contentView).offset(-10);
     }];
     [self.lineH mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.titleLabel.mas_bottom).with.offset(40);