bug修改

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

@@ -149,12 +149,21 @@
         self.countlabel.hidden = YES;
     }
     
-    //是否结束 0下架 1未下架
+    //是否下架 0下架 1未下架
     if ([model.isOn boolValue])
     {//未下架
         self.editBtn.selected = YES;
         self.endBtn.selected = YES;
-       
+        
+        if ([[HJCompanyInfoModel companyInfo].authenticationStatus integerValue] == 1 || [[HJCompanyInfoModel companyInfo].authenticationStatus integerValue] == 2)
+        {//认证中,认证失败（简历无法点击）
+            self.resumeBtn.selected = NO;
+        }
+        else
+        {
+            self.resumeBtn.selected = YES;
+        }
+        
         if ([self isTimeEnd:model.endDate])
         {//时间结束
             if ([model.isPause boolValue])
@@ -167,14 +176,11 @@
             }
             self.refreshBtn.selected = NO;
             self.stopBtn.selected = NO;
-            self.resumeBtn.selected = NO;
         }
         else
         {//时间未结束
             self.refreshBtn.selected = YES;
             self.stopBtn.selected = YES;
-            self.resumeBtn.selected = YES;
-            
             //是否暂停  1:暂停
             if ([model.isPause boolValue])
             {
@@ -185,6 +191,7 @@
                 [self.stopBtn setTitle:@"暂停" forState:UIControlStateNormal];
             }
         }
+        
     }
     else
     {//下架
@@ -206,6 +213,7 @@
         self.stateBtn.hidden = YES;
         self.updateTimelabel.hidden = NO;
     }
+    
 }
 
 /* 判断时间是否结束 */
@@ -379,7 +387,6 @@
         _nameLabel = [[UILabel alloc]init];
         _nameLabel.textColor = COLOR_BACK3;
         _nameLabel.font = [UIFont systemFontOfSize:17];
-        
     }
     return _nameLabel;
 }

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

@@ -213,11 +213,11 @@ UIGestureRecognizerDelegate
     {
         if ([[HJCompanyInfoModel companyInfo].authenticationStatus integerValue] == 1)
         {//认证中
-            [self.certificationBtn setTitle:@"您已提交企业认证，正在审核中，点击查看 >>" forState:UIControlStateNormal];
+            [self.certificationBtn setTitle:@"您的企业信息已提交认证，请耐心等待 >>" forState:UIControlStateNormal];
         }
         else if ([[HJCompanyInfoModel companyInfo].authenticationStatus integerValue] == 2)
         {//认证失败
-            [self.certificationBtn setTitle:@"您已提交企业认证，审核未通过，点击认证 >>" forState:UIControlStateNormal];
+            [self.certificationBtn setTitle:@"您的企业信息认证未通过，点击修改重新认证 >>" forState:UIControlStateNormal];
         }
     }
     if (manager == self.listAPI)
@@ -378,7 +378,7 @@ UIGestureRecognizerDelegate
     }];
     if ([[HJCompanyInfoModel companyInfo].authenticationStatus integerValue] == 1)
     {//认证中
-        [self.certificationBtn setTitle:@"您已提交企业认证，正在审核中，点击查看 >>" forState:UIControlStateNormal];
+        [self.certificationBtn setTitle:@"您的企业信息已提交认证，请耐心等待 >>" forState:UIControlStateNormal];
         [self.certificationBtn mas_makeConstraints:^(MASConstraintMaker *make) {
             
             make.left.right.offset(0);
@@ -388,7 +388,7 @@ UIGestureRecognizerDelegate
     }
     else if ([[HJCompanyInfoModel companyInfo].authenticationStatus integerValue] == 2)
     {//认证失败
-        [self.certificationBtn setTitle:@"您已提交企业认证，审核未通过，点击认证 >>" forState:UIControlStateNormal];
+        [self.certificationBtn setTitle:@"您的企业信息认证未通过，点击修改重新认证 >>" forState:UIControlStateNormal];
         [self.certificationBtn mas_makeConstraints:^(MASConstraintMaker *make) {
             
             make.left.right.offset(0);

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

@@ -208,8 +208,8 @@
     
     if (_agreementButton == nil)
     {
-        _agreementButton = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_agreementButton setImage:[UIImage imageNamed:@"join_agreement"] forState:UIControlStateNormal];
+        _agreementButton = [UIButton buttonWithType:UIButtonTypeCustom];//salary_logo，join_agreement
+        [_agreementButton setImage:[UIImage imageNamed:@"salary_logo"] forState:UIControlStateNormal];
         [_agreementButton addTarget:self action:@selector(agreementButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _agreementButton;

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

@@ -126,14 +126,14 @@
     if (type == HJAuthStatusTypeAuthFailed)
     {
         self.tagLabel.text = @"认证失败";
-        [_authBtn setTitle:@"您实名认证失败，点击查看>>" forState:UIControlStateNormal];
+        [_authBtn setTitle:@"您的实名信息认证未通过，点击修改重新认证>>" forState:UIControlStateNormal];
         self.tagLabel.backgroundColor = COLOR_BACKB;
         
     }
     if (type == HJAuthStatusTypeAuthing)
     {
         self.tagLabel.text = @"认证中";
-        [_authBtn setTitle:@"您已实名认证，通过后简历可以获得更多曝光，点击查看>>" forState:UIControlStateNormal];
+        [_authBtn setTitle:@"您的实名信息已提交认证，请耐心等待>>" forState:UIControlStateNormal];
         self.tagLabel.backgroundColor = COLOR_BACKB;
     }
     if (type == HJAuthStatusTypeNoAuth)

HappyJob/HappyJob/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.0</string>
+	<string>3.1.2</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -27,12 +27,12 @@
 			<string>weixin</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>wx9c053f7126db0b28</string>
+				<string>wxeb8c2418a8ace030</string>
 			</array>
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>2</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>iosamap</string>

HappyJob/HappyJob/Login_登录/ViewController/HJLoginViewController.m

@@ -141,6 +141,7 @@
 }
 - (void)loginFieldViewPhoneAndCode:(HJLoginFieldView *)loginFieldView {
     
+    
 }
 #pragma mark - HJLoginAgreementDelegate
 /* 登录协议 */