薪资修改

HappyJob/HappyJob.xcodeproj/project.pbxproj

@@ -300,6 +300,7 @@
 		71AC1A5D22F982AC00569CB5 /* HJPositionDetailCompanyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71AC1A5C22F982AC00569CB5 /* HJPositionDetailCompanyView.m */; };
 		71AC1A6022F9CEA000569CB5 /* HJPositionDetailCompanyInfoVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 71AC1A5F22F9CEA000569CB5 /* HJPositionDetailCompanyInfoVC.m */; };
 		71AC1A6922FBBE3300569CB5 /* HJExperienceListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71AC1A6822FBBE3300569CB5 /* HJExperienceListViewController.m */; };
+		71AD64A225CFE56400F9DE94 /* HJLabelRightContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71AD64A125CFE56400F9DE94 /* HJLabelRightContentView.m */; };
 		71C9A076232DCB96004DADB1 /* HJConfirmPanelInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71C9A073232DCB94004DADB1 /* HJConfirmPanelInputView.m */; };
 		71C9A077232DCB96004DADB1 /* HJConfirmPanelSingleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71C9A074232DCB95004DADB1 /* HJConfirmPanelSingleView.m */; };
 		71CB9BA82447061700FCA117 /* HJExpectAddressCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 71CB9B9E2447061700FCA117 /* HJExpectAddressCell.m */; };
@@ -1118,6 +1119,8 @@
 		71AC1A5F22F9CEA000569CB5 /* HJPositionDetailCompanyInfoVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJPositionDetailCompanyInfoVC.m; sourceTree = "<group>"; };
 		71AC1A6722FBBE3300569CB5 /* HJExperienceListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJExperienceListViewController.h; sourceTree = "<group>"; };
 		71AC1A6822FBBE3300569CB5 /* HJExperienceListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJExperienceListViewController.m; sourceTree = "<group>"; };
+		71AD64A025CFE56400F9DE94 /* HJLabelRightContentView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJLabelRightContentView.h; sourceTree = "<group>"; };
+		71AD64A125CFE56400F9DE94 /* HJLabelRightContentView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJLabelRightContentView.m; sourceTree = "<group>"; };
 		71C9A072232DCB93004DADB1 /* HJConfirmPanelSingleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HJConfirmPanelSingleView.h; sourceTree = "<group>"; };
 		71C9A073232DCB94004DADB1 /* HJConfirmPanelInputView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HJConfirmPanelInputView.m; sourceTree = "<group>"; };
 		71C9A074232DCB95004DADB1 /* HJConfirmPanelSingleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HJConfirmPanelSingleView.m; sourceTree = "<group>"; };
@@ -2380,6 +2383,8 @@
 				C49612BD2264955D00898E55 /* HJLabelTextFieldView.m */,
 				7133FFD42399F9B40027F750 /* HJLabelContentView.h */,
 				7133FFD52399F9B40027F750 /* HJLabelContentView.m */,
+				71AD64A025CFE56400F9DE94 /* HJLabelRightContentView.h */,
+				71AD64A125CFE56400F9DE94 /* HJLabelRightContentView.m */,
 			);
 			path = "左右Label布局";
 			sourceTree = "<group>";
@@ -5125,6 +5130,7 @@
 				C4109666229FA57200231BB6 /* HJSalaryAuthAPIManager.m in Sources */,
 				714C8F1E2398E05600379F1E /* HJReturnFeeCodeViewController.m in Sources */,
 				C412BD912277DC4F0098893C /* HJMessageAPIManager.m in Sources */,
+				71AD64A225CFE56400F9DE94 /* HJLabelRightContentView.m in Sources */,
 				C4147EE02255A58C00F13FD6 /* HJLeftRightLabelView.m in Sources */,
 				C4132C372281791A00E053B4 /* UIViewController+FBImagePicker.m in Sources */,
 				71714E2822C99E6B009984B6 /* NSSet+HYBUnicodeReadable.m in Sources */,
@@ -5543,7 +5549,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = HappyJob/HappyJob.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 6TLH64Q4Z4;
@@ -5554,7 +5560,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.4.0;
+				MARKETING_VERSION = 3.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.huijiabo.kaixing;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -5569,7 +5575,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = HappyJob/HappyJob.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 6TLH64Q4Z4;
@@ -5580,7 +5586,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.4.0;
+				MARKETING_VERSION = 3.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.huijiabo.kaixing;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

HappyJob/HappyJob/Assets.xcassets/Common/Contents.json

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

HappyJob/HappyJob/Assets.xcassets/Common/right_arrows_black.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "箭头 右侧.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "箭头 右侧@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "箭头 右侧@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

HappyJob/HappyJob/CClass/Home_首页/Agreement_协议/HJStartAgreementView.m

@@ -43,7 +43,7 @@
     [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         
         make.left.equalTo(self.bgView).offset(20);
-        make.top.equalTo(self.bgView.mas_top).offset(20);
+        make.top.equalTo(self.bgView.mas_top).offset(30);
     }];
     
     [self.agreementTextView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -113,7 +113,7 @@
     {
         _bgView = [[UIView alloc] init];
         _bgView.backgroundColor = [UIColor whiteColor];
-        _bgView.layer.cornerRadius = 5;
+        _bgView.layer.cornerRadius = 15;
         _bgView.layer.masksToBounds = YES;
     }
     return _bgView;

HappyJob/HappyJob/CClass/Home_首页/HJHomeViewController.m

@@ -50,7 +50,7 @@ HJPageListViewDelegate
 @property (nonatomic, strong) HJHomeDataBox                *homeDataBox;
 @property (nonatomic, strong) AMapLocationManager          *locationManager;//高德定位
 @property (nonatomic, strong) HJCheckVersionAPIManager     *checkAPIManager;//版本更新
-@property (nonatomic, strong) UIButton                     *customerServiceBtn;//客服
+@property (nonatomic, strong) UIButton                     *customerServiceBtn;//客服,
 
 @end
 

HappyJob/HappyJob/CClass/Home_首页/Header_头视图/HJHomeHeaderView.m

@@ -46,7 +46,7 @@
     }];
     
     [self.sectionView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.jobSortView.mas_bottom).offset(1);
+        make.top.equalTo(self.jobSortView.mas_bottom).offset(5);
         make.right.left.equalTo(self).offset(0);
         make.height.mas_equalTo(44);
     }];
@@ -57,7 +57,7 @@
     }];
     [self mas_makeConstraints:^(MASConstraintMaker *make) {
         
-        make.bottom.equalTo(self.sectionView).offset(10);
+        make.bottom.equalTo(self.sectionView).offset(1);
     }];
 }
 

HappyJob/HappyJob/CClass/JobList_工作列表信息/Benefit_福利岗位/HJBenefitViewController.m

@@ -50,7 +50,7 @@
     [self.colorView mas_makeConstraints:^(MASConstraintMaker *make) {
        
         make.top.width.equalTo(self.pageListView.tableView);
-        make.height.mas_equalTo(10);
+        make.height.mas_equalTo(5);
     }];
     [self.pageListView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.bottom.equalTo(self.view);

HappyJob/HappyJob/CClass/JobList_工作列表信息/FatSalary_高薪急聘/HJFatSalaryViewController.m

@@ -52,7 +52,7 @@
     [self.colorView mas_makeConstraints:^(MASConstraintMaker *make) {
        
         make.top.width.equalTo(self.pageListView.tableView);
-        make.height.mas_equalTo(10);
+        make.height.mas_equalTo(5);
     }];
     [self.pageListView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.bottom.equalTo(self.view);

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

@@ -100,7 +100,7 @@ UIScrollViewDelegate
     
     [self.headerView mas_makeConstraints:^(MASConstraintMaker *make) {
         
-        make.top.equalTo(contentView).offset(10);
+        make.top.equalTo(contentView).offset(5);
         make.left.right.equalTo(contentView);
     }];
     
@@ -112,24 +112,24 @@ UIScrollViewDelegate
             make.height.mas_equalTo(75);
         }];
         [self.baseInfoView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.top.equalTo(self.addressView.mas_bottom).with.offset(10);
+            make.top.equalTo(self.addressView.mas_bottom).with.offset(5);
             make.left.right.equalTo(contentView);
         }];
     }
     else
     {
         [self.baseInfoView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.top.equalTo(self.headerView.mas_bottom).with.offset(10);
+            make.top.equalTo(self.headerView.mas_bottom).with.offset(5);
             make.left.right.equalTo(contentView);
         }];
     }
 
     [self.requireInfoView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.baseInfoView.mas_bottom).with.offset(10);
+        make.top.equalTo(self.baseInfoView.mas_bottom).with.offset(5);
         make.left.right.equalTo(contentView);
     }];
     [self.otherInfoView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.requireInfoView.mas_bottom).with.offset(10);
+        make.top.equalTo(self.requireInfoView.mas_bottom).with.offset(5);
         make.left.right.equalTo(contentView);
     }];
     
@@ -150,14 +150,14 @@ UIScrollViewDelegate
             }];
             
             [self.companyInfoView mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.top.equalTo(self.trafficView.mas_bottom).with.offset(10);
+                make.top.equalTo(self.trafficView.mas_bottom).with.offset(5);
                 make.left.right.equalTo(contentView);
             }];
         }
         else
         {
             [self.companyInfoView mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.top.equalTo(self.otherInfoView.mas_bottom).with.offset(10);
+                make.top.equalTo(self.otherInfoView.mas_bottom).with.offset(5);
                 make.left.right.equalTo(contentView);
             }];
         }

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

@@ -24,7 +24,7 @@
     {
         self.selectionStyle = UITableViewCellSelectionStyleNone;
         self.backgroundColor = COLOR_F5F5F5;
-        _edgeInsets = UIEdgeInsetsMake(0, 0, 10, 0);
+        _edgeInsets = UIEdgeInsetsMake(0, 0, 5, 0);
         
         [self.contentView addSubview:self.bgView];
         [self.contentView addSubview:self.titleLabel];

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

@@ -62,7 +62,7 @@ HJMenuFilterDelegate
     [self.colorView mas_makeConstraints:^(MASConstraintMaker *make) {
        
         make.top.width.equalTo(self.pageListView.tableView);
-        make.height.mas_equalTo(10);
+        make.height.mas_equalTo(5);
     }];
     [self.pageListView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.bottom.equalTo(self.view);

HappyJob/HappyJob/CClass/JobList_工作列表信息/HJPositionDataBox.m

@@ -314,13 +314,13 @@ static NSString * const HJJoinTableViewCellIdentifier = @"HJJoinTableViewCell";
         }
         
         //底部距离（热门岗位数据为10其他为1）
-        if (![self.manager isKindOfClass:[HJGetHotPositionAPIManager class]])
-        {
-            cell.edgeInsets = UIEdgeInsetsMake(0, 0, 1, 0);
-            [cell.bgView mas_updateConstraints:^(MASConstraintMaker *make) {
-                make.edges.equalTo(cell.contentView).with.insets(cell.edgeInsets);
-            }];
-        }
+//        if (![self.manager isKindOfClass:[HJGetHotPositionAPIManager class]])
+//        {
+//            cell.edgeInsets = UIEdgeInsetsMake(0, 0, 1, 0);
+//            [cell.bgView mas_updateConstraints:^(MASConstraintMaker *make) {
+//                make.edges.equalTo(cell.contentView).with.insets(cell.edgeInsets);
+//            }];
+//        }
 
         return cell;
     }
@@ -398,12 +398,12 @@ static NSString * const HJJoinTableViewCellIdentifier = @"HJJoinTableViewCell";
         }
         
         //底部距离（热门岗位数据为10其他为1）
-        if (![self.manager isKindOfClass:[HJGetHotPositionAPIManager class]])
-        {
-            [cell.baseView mas_updateConstraints:^(MASConstraintMaker *make) {
-                make.edges.equalTo(cell.contentView).with.insets(UIEdgeInsetsMake(0, 0, 1, 0));
-            }];
-        }
+//        if (![self.manager isKindOfClass:[HJGetHotPositionAPIManager class]])
+//        {
+//            [cell.baseView mas_updateConstraints:^(MASConstraintMaker *make) {
+//                make.edges.equalTo(cell.contentView).with.insets(UIEdgeInsetsMake(0, 0, 1, 0));
+//            }];
+//        }
         
         return cell;
     }

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

@@ -106,7 +106,7 @@ UIScrollViewDelegate
 - (void)subviewsMakeConstraintsInScrollLayoutView:(FBScrollLayoutView *)scrollLayoutView contentView:(UIView *)contentView {
     
     [self.headerView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(contentView).offset(10);
+        make.top.equalTo(contentView).offset(5);
         make.left.right.equalTo(contentView);
     }];
     
@@ -162,11 +162,11 @@ UIScrollViewDelegate
     }
 
     [self.baseInfoView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.workTimeBgView.mas_bottom).with.offset(10);
+        make.top.equalTo(self.workTimeBgView.mas_bottom).with.offset(5);
         make.left.right.equalTo(contentView);
     }];
     [self.requireInfoView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.baseInfoView.mas_bottom).with.offset(10);
+        make.top.equalTo(self.baseInfoView.mas_bottom).with.offset(5);
         make.left.right.equalTo(contentView);
     }];
     
@@ -180,7 +180,7 @@ UIScrollViewDelegate
     else
     {
         [self.companyInfoView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.top.equalTo(self.requireInfoView.mas_bottom).with.offset(10);
+            make.top.equalTo(self.requireInfoView.mas_bottom).with.offset(5);
             make.left.right.equalTo(contentView);
         }];
         [contentView mas_makeConstraints:^(MASConstraintMaker *make) {

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

@@ -24,7 +24,7 @@
         
         [self.baseView mas_makeConstraints:^(MASConstraintMaker *make) {
             
-            make.edges.equalTo(self.contentView).with.insets(UIEdgeInsetsMake(0, 0, 10, 0));
+            make.edges.equalTo(self.contentView).with.insets(UIEdgeInsetsMake(0, 0, 5, 0));
         }];
     }
     return self;

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

@@ -52,7 +52,7 @@
     [self.colorView mas_makeConstraints:^(MASConstraintMaker *make) {
        
         make.top.width.equalTo(self.pageListView.tableView);
-        make.height.mas_equalTo(10);
+        make.height.mas_equalTo(5);
     }];
     [self.pageListView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.bottom.equalTo(self.view);

HappyJob/HappyJob/CClass/JobList_工作列表信息/Reward_入职奖励/HJRewardViewController.m

@@ -53,7 +53,7 @@
     [self.colorView mas_makeConstraints:^(MASConstraintMaker *make) {
        
         make.top.width.equalTo(self.pageListView.tableView);
-        make.height.mas_equalTo(10);
+        make.height.mas_equalTo(5);
     }];
     [self.pageListView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.bottom.equalTo(self.view);

HappyJob/HappyJob/CClass/Me_我/Interview_面试邀请/HJInterviewDetailViewController.m

@@ -35,7 +35,7 @@
     [self.view addSubview:self.lineH];
     [self.view addSubview:self.textView];
     [self makeConstraints];
-    
+//    NSLog(@"interviewID:::::::::::%lu",(unsigned long)self.interviewID);
     self.detailAPIManager.interviewID = self.interviewID;
     [self.detailAPIManager start];
 }
@@ -78,6 +78,7 @@
 - (void)managerCallAPIDidSuccess:(FBBaseAPIManager *)manager {
     if (manager == self.detailAPIManager) {
         id fetchData = [manager fetchDataWithBox:nil];
+        NSLog(@"fetchData::::%@",fetchData);
         [self configData:[fetchData valueForKeyPath:@"data.hpInterviewInvite"]];
     }
 }

HappyJob/HappyJob/CClass/Me_我/Interview_面试邀请/HJMyInterviewViewController.m

@@ -58,7 +58,6 @@
         
         id fetchData = [manager fetchDataWithBox:nil];
         self.interviewIDs = [fetchData valueForKeyPath:@"data.myInterView.id"];
-        
     }
 }
 

HappyJob/HappyJob/CClass/Me_我/Interview_面试邀请/MyInterviewAPIManager/HJGetInterviewDetailAPIManager.m

@@ -57,7 +57,8 @@
     return @{
         @"user_id": [HJUserInfoModel userInfo].userID,
         @"user_token": [HJUserInfoModel userInfo].userToken,
-        @"member_id":[HJMemberInfoModel memberInfo].memberId
+        @"member_id":[HJMemberInfoModel memberInfo].memberId,
+        @"interviewId": @(self.interviewID)
     };
 }
 

HappyJob/HappyJob/CClass/Me_我/Resume_个人简历/Model/HJResumeModel.m

@@ -15,7 +15,9 @@ static NSString * const kUserResume = @"UserResumeArchivedData";
 - (CGFloat)percent {
     
     CGFloat p = 0;
-    if (self.realName.length > 0 && self.gender > 0 && self.phone.length > 0 &&
+    //self.realName.length > 0 && self.gender > 0 && self.phone.length > 0 &&
+   // self.birthYear.length > 0 && self.education > 0
+    if (self.realName.length > 0 && self.gender > 0  &&
         self.birthYear.length > 0 && self.education > 0)
     {
         p += 40;

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

@@ -36,6 +36,23 @@
     {
         return;
     }
+   
+//    if ([data[kHJResumeKeyPosition] length] > 0)
+//    {
+//        self.jobsView.contentLabel.text = data[kHJResumeKeyPosition];
+//    }
+//    else
+//    {
+//        self.jobsView.contentLabel.text = @"暂未填写";
+//    }
+//    if (data[kHJResumeKeyWorkPlace])
+//    {
+//        self.addressView.contentLabel.text = data[kHJResumeKeyWorkPlace];
+//    }
+//    else
+//    {
+//        self.addressView.contentLabel.text = @"暂未填写";
+//    }
     
     self.jobsView.contentLabel.text = data[kHJResumeKeyPosition];
     self.addressView.contentLabel.text = data[kHJResumeKeyWorkPlace];
@@ -43,7 +60,7 @@
     NSString *salaryStr = data[kHJResumeKeySalary];
     if (salaryStr.length == 0)
     {
-        salaryStr = @"不限";
+        salaryStr = @"暂未填写";
     }
     self.salaryView.contentLabel.text =  salaryStr;
 }

HappyJob/HappyJob/CClass/Me_我/Reward_入职奖励/View/HJReturnFeeListHeaderView.h

@@ -14,6 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface HJReturnFeeListHeaderView : UIView
 
 @property (nonatomic, strong) HJLabelContentView *nameView;
+@property (nonatomic, strong) HJLabelContentView *IDView;
 
 @end
 

HappyJob/HappyJob/CClass/Me_我/Reward_入职奖励/View/HJReturnFeeListHeaderView.m

@@ -10,7 +10,7 @@
 
 @interface HJReturnFeeListHeaderView ()
 
-@property (nonatomic, strong) HJLabelContentView *IDView;
+
 
 @end
 

HappyJob/HappyJob/CClass/Me_我/Salary_薪资查询/Model/HJSalaryListModel.h

@@ -27,6 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *idCardNumber;
 @property (nonatomic, copy) NSString *remarks;
 @property (nonatomic, copy) NSString *name;
+@property (nonatomic, copy) NSString *supplier;
 
 
 

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

@@ -18,6 +18,8 @@ NSString * const kHJSalaryKeyInnerKey = @"kHJSalaryKeyInnerKey";
 NSString * const kHJSalaryKeyInnerValue = @"kHJSalaryKeyInnerValue";
 NSString * const kHJSalaryKeyMonth = @"kHJSalaryKeyMonth";
 NSString * const kHJSalaryKeyCompanyName = @"kHJSalaryKeyCompanyName";
+NSString * const kHJSalaryKeySourceCompanyName = @"kHJSalaryKeySourceCompanyName";
+
 NSString * const kHJSalaryKeyEmployeeNumber = @"kHJSalaryKeyEmployeeNumber";
 NSString * const kHJSalaryKeyEmployeeName = @"kHJSalaryKeyEmployeeName";
 NSString * const kHJSalaryKeyPayrollDetail = @"kHJSalaryKeyPayrollDetail";
@@ -97,6 +99,9 @@ NSString * const kHJSalaryKeyCutPayment = @"kHJSalaryKeyCutPayment";
         [dict setObject:@{kHJSalaryKeyInnerKey: @"工资月份：", kHJSalaryKeyInnerValue: month} forKey:kHJSalaryKeyMonth];
         
         [dict setObject:@{kHJSalaryKeyInnerKey: @"公司名称：", kHJSalaryKeyInnerValue: data[@"companyName"]} forKey:kHJSalaryKeyCompanyName];
+        
+        [dict setObject:@{kHJSalaryKeyInnerKey: @"发放来源：", kHJSalaryKeyInnerValue: data[@"supplier"]} forKey:kHJSalaryKeySourceCompanyName];
+        
         [dict setObject:@{kHJSalaryKeyInnerKey: @"员工号码：", kHJSalaryKeyInnerValue: data[@"workNumber"]} forKey:kHJSalaryKeyEmployeeNumber];
         [dict setObject:@{kHJSalaryKeyInnerKey: @"员工姓名：", kHJSalaryKeyInnerValue: data[@"name"]} forKey:kHJSalaryKeyEmployeeName];
         [dict setObject:@{kHJSalaryKeyInnerKey: @"应发合计：", kHJSalaryKeyInnerValue: [NSString stringWithFormat:@"%@", data[@"grossPayment"]]} forKey:kHJSalaryKeyGrossPayment];

HappyJob/HappyJob/CClass/Me_我/Salary_薪资查询/SalaryAPIManager/HJSalaryKeys.h

@@ -13,6 +13,9 @@ extern NSString * const kHJSalaryKeyInnerKey;
 extern NSString * const kHJSalaryKeyInnerValue;
 /*公司*/
 extern NSString * const kHJSalaryKeyCompanyName;
+
+/*发放来源*/
+extern NSString * const kHJSalaryKeySourceCompanyName;
 /* 月份 */
 extern NSString * const kHJSalaryKeyMonth;
 /*员工号*/

HappyJob/HappyJob/CClass/Me_我/Salary_薪资查询/View/HJSalaryListCell.h

@@ -13,11 +13,12 @@ NS_ASSUME_NONNULL_BEGIN
 @interface HJSalaryListCell : UITableViewCell
 
 @property (nonatomic, strong) UIView  *bgView;
+@property (nonatomic, strong) UILabel *companyLabel;
 @property (nonatomic, strong) UILabel *moneylabel;
 @property (nonatomic, strong) UILabel *timeLabel;
-@property (nonatomic, strong) UIView  *lineView;
-@property (nonatomic, strong) UILabel *companyLabel;
-@property (nonatomic, strong) UILabel *lookLabel;
+@property (nonatomic, strong) UIImageView *rightImageV;
+
+
 
 
 - (void)HJSalaryListCellArray:(NSArray *)array andIndexPath:(NSIndexPath *)indexpath;

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

@@ -32,9 +32,9 @@
     [self.contentView addSubview:self.bgView];
     [self.bgView addSubview:self.moneylabel];
     [self.bgView addSubview:self.timeLabel];
-    [self.bgView addSubview:self.lineView];
     [self.bgView addSubview:self.companyLabel];
-    [self.bgView addSubview:self.lookLabel];
+    [self.bgView addSubview:self.rightImageV];
+    
     
     [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
         
@@ -43,36 +43,30 @@
         make.right.equalTo(self.contentView.mas_right).offset(0);
         make.bottom.equalTo(self.contentView.mas_bottom).offset(0);
     }];
-    [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self.bgView.mas_left).offset(15);
-        make.top.equalTo(self.bgView.mas_top).offset(11);
-        
-    }];
+    
     [self.companyLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.equalTo(self.bgView.mas_right).offset(-15);
-        make.centerY.equalTo(self.timeLabel);
+        make.left.equalTo(self.bgView.mas_left).offset(15);
+        make.top.equalTo(self.bgView.mas_top).offset(26);
     }];
-    [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) {
+    
+    [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.bgView.mas_left).offset(15);
-        make.right.equalTo(self.bgView.mas_right).offset(-15);
-        make.top.equalTo(self.timeLabel.mas_bottom).offset(11);
-        make.height.mas_equalTo(1);
+        make.top.equalTo(self.companyLabel.mas_bottom).offset(7);
+        make.bottom.equalTo(self.bgView.mas_bottom).offset(-26);
     }];
-    [self.lookLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+    
+    [self.rightImageV mas_makeConstraints:^(MASConstraintMaker *make) {
+       
         make.right.equalTo(self.bgView.mas_right).offset(-15);
-        make.top.equalTo(self.lineView.mas_bottom).offset(22);
-        make.bottom.equalTo(self.bgView.mas_bottom).offset(-22);
-        make.size.mas_offset(CGSizeMake(90, 34));
+        make.centerY.equalTo(self.bgView);
     }];
     [self.moneylabel mas_makeConstraints:^(MASConstraintMaker *make) {
         
-        make.left.equalTo(self.bgView.mas_left).offset(15);
-        make.centerY.equalTo(self.lookLabel);
+        make.right.equalTo(self.rightImageV.mas_left).offset(-8);
+        make.centerY.equalTo(self.rightImageV);
+        make.left.greaterThanOrEqualTo(self.timeLabel.mas_right);
     }];
-    
-//    self.moneylabel.text = @"￥6903.00";
-//    self.companyLabel.text = @"安普锐斯（无锡）有限公司";
-//    self.timeLabel.text = @"2019年04月份";
+
 }
 - (void)HJSalaryListCellArray:(NSArray *)array andIndexPath:(NSIndexPath *)indexpath {
     
@@ -81,14 +75,22 @@
 
     self.moneylabel.text = [NSString stringWithFormat:@"¥%.2f",[model.netPayment floatValue]];
     self.companyLabel.text = model.companyName;
-    
+
     NSMutableAttributedString *countAtt1 = [[NSMutableAttributedString alloc]initWithString:self.moneylabel.text];
        [countAtt1 addAttribute:NSFontAttributeName value:[UIFont boldSystemFontOfSize:19] range:NSMakeRange(0, 1)];
     self.moneylabel.attributedText = countAtt1;
-    
+
     //时间处理
-    NSArray *timeArray = [model.payrollDate componentsSeparatedByString:@"-"];
-    self.timeLabel.text = [NSString stringWithFormat:@"%@年%@月工资",timeArray.firstObject,timeArray.lastObject];
+    NSString *tempStr;
+    if (model.supplier.length > 0)
+    {
+        tempStr = [NSString stringWithFormat:@"%@   发放：%@",model.payrollDate,model.supplier];
+    }
+    else
+    {
+        tempStr = model.payrollDate;
+    }
+    self.timeLabel.text = tempStr;
 }
 
 #pragma mark - lazy
@@ -102,22 +104,24 @@
     }
     return _bgView;
 }
-- (UIView *)lineView {
+- (UILabel *)companyLabel {
     
-    if (_lineView == nil)
+    if (_companyLabel == nil)
     {
-        _lineView = [[UIView alloc]init];
-        _lineView.backgroundColor = COLOR_EEEEEE;
+        _companyLabel = [[UILabel alloc]init];
+        _companyLabel.font = [UIFont systemFontOfSize:15];
+        _companyLabel.textColor = COLOR_000000;
     }
-    return _lineView;
+    return _companyLabel;
 }
 - (UILabel *)moneylabel {
     
     if (_moneylabel == nil)
     {
         _moneylabel = [[UILabel alloc]init];
-        _moneylabel.font = [UIFont boldSystemFontOfSize:31];
+        _moneylabel.font = [UIFont boldSystemFontOfSize:18];
         _moneylabel.textColor = COLOR_000000;
+       [_moneylabel setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal];
     }
     return _moneylabel;
 }
@@ -126,36 +130,21 @@
     if (_timeLabel == nil)
     {
         _timeLabel = [[UILabel alloc]init];
-        _timeLabel.font = [UIFont systemFontOfSize:12];
+        _timeLabel.font = [UIFont systemFontOfSize:13];
         _timeLabel.textColor = COLOR_666666;
     }
     return _timeLabel;
 }
-- (UILabel *)companyLabel {
-    
-    if (_companyLabel == nil)
-    {
-        _companyLabel = [[UILabel alloc]init];
-        _companyLabel.font = [UIFont systemFontOfSize:12];
-        _companyLabel.textColor = COLOR_666666;
-    }
-    return _companyLabel;
-}
-- (UILabel *)lookLabel {
+
+- (UIImageView *)rightImageV {
     
-    if (_lookLabel == nil)
+    if (_rightImageV == nil)
     {
-        _lookLabel = [[UILabel alloc]init];
-        _lookLabel.text = @"查看明细";
-        _lookLabel.font = [UIFont boldSystemFontOfSize:14];
-        _lookLabel.textColor = COLOR_0177FF;
-        _lookLabel.layer.borderWidth = 1;
-        _lookLabel.layer.borderColor = COLOR_0177FF.CGColor;
-        _lookLabel.layer.cornerRadius = 17;
-        _lookLabel.layer.masksToBounds = YES;
-        _lookLabel.textAlignment = NSTextAlignmentCenter;
+        _rightImageV = [[UIImageView alloc] init];
+        _rightImageV.image = [UIImage imageNamed:@"right_arrows_black"];
+        _rightImageV.contentMode = UIViewContentModeScaleAspectFit;
     }
-    return _lookLabel;
+    return  _rightImageV;
 }
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];

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

@@ -8,21 +8,23 @@
 
 #import "HJSalarySheetView.h"
 #import "HJSalaryKeys.h"
-#import "HJLabelContentView.h"
+//#import "HJLabelContentView.h"
 
 @interface HJSalarySheetView ()
 
-@property (nonatomic, strong) HJLabelContentView *monthView;
-@property (nonatomic, strong) HJLabelContentView *companyView;
-@property (nonatomic, strong) HJLabelContentView *workNumberView;
-@property (nonatomic, strong) HJLabelContentView *nameView;
+@property (nonatomic, strong) HJLabelRightContentView *monthView;//月份
+@property (nonatomic, strong) HJLabelRightContentView *companyView;//公司
+@property (nonatomic, strong) HJLabelRightContentView *workNumberView;//
+@property (nonatomic, strong) HJLabelRightContentView *nameView;//姓名
 
-@property (nonatomic, strong) HJLabelContentView *grossPaymentView;//应发合计
-@property (nonatomic, strong) HJLabelContentView *totalChargebackView;//扣款合计
-@property (nonatomic, strong) HJLabelContentView *netPaymentView;//实发工资
+@property (nonatomic, strong) HJLabelRightContentView *sourceView;//姓名
 
+@property (nonatomic, strong) HJLabelRightContentView *grossPaymentView;//应发合计
+@property (nonatomic, strong) HJLabelRightContentView *totalChargebackView;//扣款合计
+@property (nonatomic, strong) HJLabelRightContentView *netPaymentView;//实发工资
 
-@property (nonatomic, strong) HJLabelContentView *lastListView;
+
+@property (nonatomic, strong) HJLabelRightContentView *lastListView;
 
 @end
 
@@ -56,7 +58,7 @@
             make.left.right.equalTo(self).offset(0);
             make.height.mas_equalTo(58);
         }];
-        [self autoLayOutHJLabelContentView:self.monthView];
+        
         
         
         [self.companyView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -64,15 +66,43 @@
             make.left.right.equalTo(self).offset(0);
             make.height.mas_equalTo(58);
         }];
-        [self autoLayOutHJLabelContentView:self.companyView];
         
-        [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        //判断是否添加发放来源
+        if (data[kHJSalaryKeySourceCompanyName][kHJSalaryKeyInnerValue]) {
             
-            make.top.equalTo(self.companyView.mas_bottom).offset(0);
-            make.left.right.equalTo(self).offset(0);
-            make.height.mas_equalTo(58);
-        }];
-        [self autoLayOutHJLabelContentView:self.nameView];
+            [self addSubview:self.sourceView];
+            
+            [self.sourceView mas_makeConstraints:^(MASConstraintMaker *make) {
+                
+                make.top.equalTo(self.companyView.mas_bottom).offset(0);
+                make.left.right.equalTo(self).offset(0);
+                make.height.mas_equalTo(58);
+            }];
+            
+            
+            [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) {
+                
+                make.top.equalTo(self.sourceView.mas_bottom).offset(0);
+                make.left.right.equalTo(self).offset(0);
+                make.height.mas_equalTo(58);
+            }];
+            
+            self.sourceView.contentLabel.text = data[kHJSalaryKeySourceCompanyName][kHJSalaryKeyInnerValue];
+            
+        }
+        else
+        {
+            
+            [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) {
+
+                make.top.equalTo(self.companyView.mas_bottom).offset(0);
+                make.left.right.equalTo(self).offset(0);
+                make.height.mas_equalTo(58);
+            }];
+        }
+        
+       
         
         [self.workNumberView mas_makeConstraints:^(MASConstraintMaker *make) {
             
@@ -80,8 +110,7 @@
             make.left.right.equalTo(self).offset(0);
             make.height.mas_equalTo(58);
         }];
-        [self autoLayOutHJLabelContentView:self.workNumberView];
-       
+        
         self.monthView.contentLabel.text = data[kHJSalaryKeyMonth][kHJSalaryKeyInnerValue];
         self.companyView.contentLabel.text = data[kHJSalaryKeyCompanyName][kHJSalaryKeyInnerValue];
         self.nameView.contentLabel.text = data[kHJSalaryKeyEmployeeName][kHJSalaryKeyInnerValue];
@@ -97,11 +126,7 @@
         
         for (int i = 0; i < listArray.count; i ++ )
         {
-            HJLabelContentView *listView = [[HJLabelContentView alloc]init];
-            [listView.contentLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
-                make.centerY.equalTo(listView);
-                make.left.equalTo(listView.mas_left).offset(120);
-            }];
+            HJLabelRightContentView *listView = [[HJLabelRightContentView alloc]init];
             listView.titleLabel.text = listArray[i][kHJSalaryKeyInnerKey];
             listView.contentLabel.text = listArray[i][kHJSalaryKeyInnerValue];
             
@@ -123,7 +148,7 @@
             make.left.right.equalTo(self).offset(0);
             make.height.mas_equalTo(58);
         }];
-        [self autoLayOutHJLabelContentView:self.grossPaymentView];
+       
         
         [self.totalChargebackView mas_makeConstraints:^(MASConstraintMaker *make) {
             
@@ -131,7 +156,7 @@
             make.left.right.equalTo(self).offset(0);
             make.height.mas_equalTo(58);
         }];
-        [self autoLayOutHJLabelContentView:self.totalChargebackView];
+        
         
         [self.netPaymentView mas_makeConstraints:^(MASConstraintMaker *make) {
             
@@ -140,78 +165,82 @@
             make.height.mas_equalTo(58);
             make.bottom.equalTo(self.mas_bottom).offset(0);
         }];
-        [self autoLayOutHJLabelContentView:self.netPaymentView];
+        
         
     }
 }
-- (void)autoLayOutHJLabelContentView:(HJLabelContentView *)view {
-    
-    [view.contentLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
-        make.centerY.equalTo(view);
-        make.left.equalTo(view.mas_left).offset(120);
-    }];
-}
+
 #pragma mark - getters and setters
 
-- (HJLabelContentView *)monthView {
+- (HJLabelRightContentView *)monthView {
     
     if (_monthView == nil)
     {
-        _monthView = [[HJLabelContentView alloc]init];
+        _monthView = [[HJLabelRightContentView alloc]init];
         _monthView.titleLabel.text = @"工资月份：";
     }
     return _monthView;
 }
-- (HJLabelContentView *)companyView {
+- (HJLabelRightContentView *)companyView {
     
     if (_companyView == nil)
     {
-        _companyView = [[HJLabelContentView alloc]init];
+        _companyView = [[HJLabelRightContentView alloc]init];
         _companyView.titleLabel.text = @"公司名称：";
     }
     return _companyView;
 }
-- (HJLabelContentView *)workNumberView {
+- (HJLabelRightContentView *)sourceView {
+    
+    if (_sourceView == nil)
+    {
+        _sourceView = [[HJLabelRightContentView alloc]init];
+        _sourceView.titleLabel.text = @"发放来源：";
+    }
+    return _sourceView;
+}
+
+- (HJLabelRightContentView *)workNumberView {
     
     if (_workNumberView == nil)
     {
-        _workNumberView = [[HJLabelContentView alloc]init];
+        _workNumberView = [[HJLabelRightContentView alloc]init];
         _workNumberView.titleLabel.text = @"工号：";
     }
     return _workNumberView;
 }
-- (HJLabelContentView *)nameView {
+- (HJLabelRightContentView *)nameView {
     
     if (_nameView == nil)
     {
-        _nameView = [[HJLabelContentView alloc]init];
+        _nameView = [[HJLabelRightContentView alloc]init];
         _nameView.titleLabel.text = @"员工姓名：";
     }
     return _nameView;
 }
-- (HJLabelContentView *)grossPaymentView {
+- (HJLabelRightContentView *)grossPaymentView {
     
     if (_grossPaymentView == nil)
     {
-        _grossPaymentView = [[HJLabelContentView alloc]init];
+        _grossPaymentView = [[HJLabelRightContentView alloc]init];
         _grossPaymentView.titleLabel.text = @"应发合计：";
     }
     return _grossPaymentView;
 }
-- (HJLabelContentView *)totalChargebackView {
+- (HJLabelRightContentView *)totalChargebackView {
     
     if (_totalChargebackView == nil)
     {
-        _totalChargebackView = [[HJLabelContentView alloc]init];
+        _totalChargebackView = [[HJLabelRightContentView alloc]init];
         _totalChargebackView.titleLabel.text = @"扣款合计：";
     }
     return _totalChargebackView;
 }
-- (HJLabelContentView *)netPaymentView {
+- (HJLabelRightContentView *)netPaymentView {
     
     if (_netPaymentView == nil)
     {
-        _netPaymentView = [[HJLabelContentView alloc]init];
+        _netPaymentView = [[HJLabelRightContentView alloc]init];
         _netPaymentView.titleLabel.text = @"实发工资：";
     }
     return _netPaymentView;

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

@@ -69,10 +69,13 @@ FBAPIManagerDelegate
     }];
     
     __weak typeof(self) weakSelf = self;
+    
     self.codeView.codeBlock = ^(NSString * _Nonnull code) {
       
-        [weakSelf startVerificationCode:code];
-        
+//        [weakSelf startVerificationCode:code];
+        HJSalaryListViewController *list = [[HJSalaryListViewController alloc]init];
+        list.hidesBottomBarWhenPushed = YES;
+        [weakSelf.navigationController pushViewController:list animated:YES];
     };
 }
 
@@ -101,7 +104,6 @@ FBAPIManagerDelegate
         weakSelf.second = 60;
         weakSelf.timer = [NSTimer scheduledTimerWithTimeInterval:1 target:weakSelf selector:@selector(runTimer) userInfo:weakSelf repeats:YES];
     };
-       
 }
 
 - (void)runTimer {

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

@@ -24,7 +24,7 @@ FBAPIManagerDelegate,
 FBAPIManagerInterceptor
 >
 
-@property (nonatomic, strong) FBScrollLayoutView    *scrollLayoutView;
+@property (nonatomic, strong) FBScrollLayoutView       *scrollLayoutView;
 @property (nonatomic, strong) HJSalaryDetailPromptView *promptView;
 @property (nonatomic, strong) HJSalarySheetView     *salarySheetView;
 @property (nonatomic, copy)   NSArray               *dateDataSource;

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

@@ -76,7 +76,10 @@ FBAPIManagerInterceptor
     
     HJReturnFeeListHeaderView *headerView = [[HJReturnFeeListHeaderView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 58*2)];
     headerView.nameView.titleLabel.text = @"认证姓名：";
+    headerView.nameView.contentLabel.font = [UIFont systemFontOfSize:15];
+    headerView.IDView.contentLabel.font = [UIFont systemFontOfSize:15];
     self.tableView.tableHeaderView = headerView;
+    
 }
 
 #pragma mark - FBAPIManagerInterceptor

HappyJob/HappyJob/CClass/Me_我/Setting_设置/ViewController/HJAccountSafetyViewController.m

@@ -74,7 +74,12 @@
         vc.changePhoneSuccessBlock = ^(NSString * _Nonnull phone) {
           
             HJSettingCell *cell = [tableView cellForRowAtIndexPath:indexPath];
-            cell.contentLabel.text = phone;
+//            cell.contentLabel.text = phone;
+            if (phone.length == 11)
+            {
+                NSString *phoneStr = [phone stringByReplacingCharactersInRange:NSMakeRange(3, 4) withString:@"****"];
+                cell.contentLabel.text = phoneStr;
+            }
             [self.view fb_showInfoWithStatus:@"手机号修改已完成"];
         };
         [self.navigationController pushViewController:vc animated:YES];
@@ -108,7 +113,13 @@
     cell.titleLabel.text = self.dataSource[indexPath.row];
     if (indexPath.row == 0)
     {
-        cell.contentLabel.text = [HJMemberInfoModel memberInfo].phone;
+//        cell.contentLabel.text = [HJMemberInfoModel memberInfo].phone;
+        if ([HJMemberInfoModel memberInfo].phone.length == 11)
+        {
+            NSString *phone = [[HJMemberInfoModel memberInfo].phone stringByReplacingCharactersInRange:NSMakeRange(3, 4) withString:@"****"];
+            cell.contentLabel.text = phone;
+        }
+        
     }
     return cell;
 }
@@ -151,7 +162,7 @@
     
     if (_dataSource == nil)
     {
-        _dataSource = [NSMutableArray arrayWithArray:@[@"手机号", @"注销账户"]];
+        _dataSource = [NSMutableArray arrayWithArray:@[@"修改手机号", @"注销账户"]];
     }
     return _dataSource;
 }

HappyJob/HappyJob/Custom/Components/CustomControl/UIView/左右Label布局/HJLabelRightContentView.h

@@ -0,0 +1,21 @@
+//
+//  HJLabelRightContentView.h
+//  HappyJob
+//
+//  Created by 张晓光 on 2021/2/7.
+//  Copyright © 2021 Bob. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface HJLabelRightContentView : UIView
+
+@property (nonatomic, strong) UILabel     *titleLabel;
+@property (nonatomic, strong) UILabel     *contentLabel;
+@property (nonatomic, strong) UIView      *lineView;
+
+@end
+
+NS_ASSUME_NONNULL_END

HappyJob/HappyJob/Custom/Components/CustomControl/UIView/左右Label布局/HJLabelRightContentView.m

@@ -0,0 +1,84 @@
+//
+//  HJLabelRightContentView.m
+//  HappyJob
+//
+//  Created by 张晓光 on 2021/2/7.
+//  Copyright © 2021 Bob. All rights reserved.
+//
+
+#import "HJLabelRightContentView.h"
+
+@implementation HJLabelRightContentView
+
+- (instancetype)initWithFrame:(CGRect)frame {
+    
+    if (self = [super initWithFrame:frame])
+    {
+        [self addSubview:self.titleLabel];
+        [self addSubview:self.contentLabel];
+        [self addSubview:self.lineView];
+        [self makeConstraints];
+    }
+    return self;
+}
+
+- (void)makeConstraints {
+    
+    [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.mas_left).offset(15);
+        make.centerY.equalTo(self);
+    }];
+    
+    [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.equalTo(self);
+        make.left.equalTo(self.mas_left).offset(100);
+        make.right.equalTo(self.mas_right).offset(-15);
+    }];
+    [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.mas_left).offset(0);
+        make.right.equalTo(self.mas_right).offset(0);
+        make.bottom.equalTo(self.mas_bottom).offset(0);
+        make.height.mas_equalTo(1);
+    }];
+}
+
+#pragma mark - getters and setters
+
+- (UILabel *)titleLabel {
+    
+    if (_titleLabel == nil)
+    {
+        _titleLabel = [[UILabel alloc] init];
+        _titleLabel.font = [UIFont systemFontOfSize:15];
+        _titleLabel.textColor = COLOR_666666;
+        _titleLabel.textAlignment = NSTextAlignmentLeft;
+    }
+    return _titleLabel;
+}
+
+- (UILabel *)contentLabel {
+    
+    if (_contentLabel == nil)
+    {
+        _contentLabel = [[UILabel alloc] init];
+        _contentLabel.font = [UIFont systemFontOfSize:15];
+        _contentLabel.textColor = COLOR_000000;
+        _contentLabel.textAlignment = NSTextAlignmentRight;
+        _contentLabel.numberOfLines = 2;
+//        _contentLabel.backgroundColor = [UIColor yellowColor];
+    }
+    return _contentLabel;
+}
+
+- (UIView *)lineView {
+    
+    if (_lineView == nil)
+    {
+        _lineView = [[UIView alloc] init];
+        _lineView.backgroundColor = COLOR_EEEEEE;
+    }
+    return _lineView;
+}
+
+
+@end

HappyJob/HappyJob/HappyJob-Prefix.pch

@@ -30,6 +30,7 @@
 #import "HJUserInfoModel.h"//用户数据
 #import "HeaderSelectView.h"
 #import "FBFlowLayoutView.h"//布局
+#import "HJLabelRightContentView.h"
 #import "HJUserResumeModel.h"//用户简历
 #import "HJMemberInfoModel.h"//member信息
 #import "TableViewListView.h"//tableview

HappyJob/HappyJob/Support/HJConfig.h

@@ -10,6 +10,7 @@
 #define HJConfig_h
 
 /* ---- 测试服接口地址 ------*/
+
 static NSString * const kHJBaseURL = @"https://kf.hap-job.com/happyjob/f/api/";
 static NSString * const kHJWebBaseURL = @"https://kf.hap-job.com/";
 static NSString * const kBuglyAppID = @"d3e4636207";