投递简历加二次弹框

HappyJob/HappyJob/CClass/Integral_我的积分/兑好礼/ViewComtroller/HJIntegralExchangeGiftDetailVC.m

@@ -179,28 +179,33 @@ FBAPIManagerInterceptor
 }
 - (void)confirmButtonClick:(UIButton *)btn {
     
+    if (self.inputPhoneView.inputTF.text.length == 0)
+    {
+        [self.view fb_showInfoWithStatus:@"请输入手机号码"];
+        return;
+    }
+    if (self.inputPhoneView.inputTF.text.length != 11)
+    {
+        [self.view fb_showInfoWithStatus:@"请输入正确手机号码"];
+        return;
+    }
+    
     HJMyIntergralExchangeGiftListModel *model = [HJMyIntergralExchangeGiftListModel yy_modelWithDictionary:self.detailDict[@"data"][@"mpCompaignsRewardSettingAPI"]];
     if ([model.exchangeType floatValue] == 0)
     {//不需要支付的
-        if (self.inputPhoneView.inputTF.text.length > 0)
-        {
-            self.exchangeGiftAPI.phone = self.inputPhoneView.inputTF.text;
-            self.exchangeGiftAPI.mpCompaignsRewardSettingId = model.ID;
-            self.exchangeGiftAPI.withdrawType = @"0";
-            [self.exchangeGiftAPI start];
-        }
+        self.exchangeGiftAPI.phone = self.inputPhoneView.inputTF.text;
+        self.exchangeGiftAPI.mpCompaignsRewardSettingId = model.ID;
+        self.exchangeGiftAPI.withdrawType = @"0";
+        [self.exchangeGiftAPI start];
     }
     else
     {
-        if (self.inputPhoneView.inputTF.text.length > 0)
-        {
-            HJIntegralExchangePayViewController *vc = [[HJIntegralExchangePayViewController alloc]init];
-            vc.phone = self.inputPhoneView.inputTF.text;
-            vc.compaignssettingId = model.ID;
-            vc.compaigns_type = @"1";
-            vc.money = model.money;
-            [self.navigationController pushViewController:vc animated:YES];
-        }
+        HJIntegralExchangePayViewController *vc = [[HJIntegralExchangePayViewController alloc]init];
+        vc.phone = self.inputPhoneView.inputTF.text;
+        vc.compaignssettingId = model.ID;
+        vc.compaigns_type = @"1";
+        vc.money = model.money;
+        [self.navigationController pushViewController:vc animated:YES];
     }
 }
 

HappyJob/HappyJob/CClass/Integral_我的积分/兑活动/ViewController/HJIntegralExchangeActivityDetailVC.m

@@ -180,28 +180,32 @@ FBAPIManagerInterceptor
 }
 - (void)confirmButtonClick:(UIButton *)btn {
     
+    if (self.inputPhoneView.inputTF.text.length == 0)
+    {
+        [self.view fb_showInfoWithStatus:@"请输入手机号码"];
+        return;
+    }
+    if (self.inputPhoneView.inputTF.text.length != 11)
+    {
+        [self.view fb_showInfoWithStatus:@"请输入正确手机号码"];
+        return;
+    }
     HJMyIntegralExchangeActivityListModel *model = [HJMyIntegralExchangeActivityListModel yy_modelWithDictionary:self.detailDict[@"data"][@"mpCompaignsActivitySettingAPI"]];
     if ([model.exchangeType integerValue] == 0)
     {//不需要支付的
-        if (self.inputPhoneView.inputTF.text.length > 0)
-        {
-            self.exchangeActivityAPI.mpCompaignsActivitySettingId = model.ID;
-            self.exchangeActivityAPI.phone = self.inputPhoneView.inputTF.text;
-            self.exchangeActivityAPI.withdrawType = @"0";
-            [self.exchangeActivityAPI start];
-        }
+        self.exchangeActivityAPI.mpCompaignsActivitySettingId = model.ID;
+        self.exchangeActivityAPI.phone = self.inputPhoneView.inputTF.text;
+        self.exchangeActivityAPI.withdrawType = @"0";
+        [self.exchangeActivityAPI start];
     }
     else
     {
-        if (self.inputPhoneView.inputTF.text.length > 0)
-        {
-            HJIntegralExchangePayViewController *vc = [[HJIntegralExchangePayViewController alloc]init];
-            vc.phone = self.inputPhoneView.inputTF.text;
-            vc.compaignssettingId = model.ID;
-            vc.compaigns_type = @"2";
-            vc.money = model.money;
-            [self.navigationController pushViewController:vc animated:YES];
-        }
+        HJIntegralExchangePayViewController *vc = [[HJIntegralExchangePayViewController alloc]init];
+        vc.phone = self.inputPhoneView.inputTF.text;
+        vc.compaignssettingId = model.ID;
+        vc.compaigns_type = @"2";
+        vc.money = model.money;
+        [self.navigationController pushViewController:vc animated:YES];
     }
 }
 

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

@@ -194,18 +194,29 @@
 /* 申请 */
 - (void)applyButtonClicked:(UIButton *)sender {
 
-    if (ISLOGIN)
-    {
-        self.applyButton.userInteractionEnabled = NO;
-        [self.resumeAPIManager start];
-    }
-    else
+    if (!ISLOGIN)
     {
         AppDelegate * appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
         [appDelegate pushLoginViewController];
+        return;
     }
+    HJConfirmPanelViewController *vc = [[HJConfirmPanelViewController alloc] init];
+    vc.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
+    vc.modalPresentationStyle = UIModalPresentationOverCurrentContext;
+    [self viewController].navigationController.definesPresentationContext = NO;
+    vc.titleLabel.text = @"确定投递简历吗？";
+    [vc title:vc.titleLabel.text cancelTitle:@"取消" confirmTitle:@"确定" singleTitle:@"" hiddenSingleButton:YES];
+    [vc.confirmButton addTarget:self action:@selector(doneButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
+    [[self viewController] presentViewController:vc animated:YES completion:nil];
+}
+- (void)doneButtonClicked:(UIButton *)btn {
+    
+    [[self viewController] dismissViewControllerAnimated:NO completion:^{
+        
+        self.applyButton.userInteractionEnabled = NO;
+        [self.resumeAPIManager start];
+    }];
 }
-
 /* 收藏 */
 - (void)favoriteButtonClicked:(UIButton *)sender {
     

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

@@ -389,10 +389,21 @@ NSString *const HJJoinApplySuccessNotification = @"HJJoinApplySuccessNotificatio
         [appDelegate pushLoginViewController];
         return;
     }
-
-    [self.resumeAPIManager start];
+    HJConfirmPanelViewController *vc = [[HJConfirmPanelViewController alloc] init];
+    vc.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
+    vc.modalPresentationStyle = UIModalPresentationOverCurrentContext;
+    self.navigationController.definesPresentationContext = NO;
+    vc.titleLabel.text = @"确定要加入拼工吗？";
+    [vc title:vc.titleLabel.text cancelTitle:@"取消" confirmTitle:@"确定" singleTitle:@"" hiddenSingleButton:YES];
+    [vc.confirmButton addTarget:self action:@selector(doneButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
+    [self presentViewController:vc animated:YES completion:nil];
+}
+- (void)doneButtonClicked:(UIButton *)btn {
+    
+    [self dismissViewControllerAnimated:YES completion:^{
+        [self.resumeAPIManager start];
+    }];
 }
-
 /* 邀请好友 */
 - (void)invitationButtonClick {
     

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

@@ -429,7 +429,21 @@ FBAPIManagerDelegate
         [self.navigationController pushViewController:vc animated:YES];
     }
     else
-    {   //未申请，先申请拼工，申请拼工前先判断活动是否结束，再判断有没有完善简历
+    {
+        HJConfirmPanelViewController *vc = [[HJConfirmPanelViewController alloc] init];
+        vc.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
+        vc.modalPresentationStyle = UIModalPresentationOverCurrentContext;
+        self.navigationController.definesPresentationContext = NO;
+        vc.titleLabel.text = @"确定提交开团申请吗？";
+        [vc title:vc.titleLabel.text cancelTitle:@"取消" confirmTitle:@"确定" singleTitle:@"" hiddenSingleButton:YES];
+        [vc.confirmButton addTarget:self action:@selector(doneButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
+        [self presentViewController:vc animated:YES completion:nil];
+    }
+}
+- (void)doneButtonClicked:(UIButton *)btn {
+    
+    [self dismissViewControllerAnimated:YES completion:^{
+        //未申请，先申请拼工，申请拼工前先判断活动是否结束，再判断有没有完善简历
         if (self.headerView.startTimeInterval > 0)
         {
             [self.resumeAPIManager start];
@@ -438,9 +452,9 @@ FBAPIManagerDelegate
         {
             [self.view fb_showFailureWithStatus:@"该拼工申请时间已结束，请选择其他拼工"];
         }
-    }
+    }];
+    
 }
-
 /* 客服 */
 - (void)customerServiceClick:(UIButton *)btn {
     

HappyJob/HappyJob/CClass/Me_我/MeAPIManager/HJMeDataBox.m

@@ -143,6 +143,10 @@ static NSString * const HJMeCellIdentifier = @"HJMeCustomCell";
                         cell.contentLabel.text = [NSString stringWithFormat:@"%@分",self.dataDict[@"data"][@"hpMember"][@"mpMemberAccountF"][@"pointsBalance"]];
                     }
                 }
+                if (indexPath.row == 2)
+                {
+                    cell.contentLabel.text = @"";
+                }
             }
         }
     }

HappyJob/HappyJob/CClass/Me_我/Reward_入职奖励/ViewController/HJReturnFeeDetailViewController.m

@@ -121,6 +121,7 @@ FBAPIManagerInterceptor
                 [rewardView ShowConfirmPanelSingleView];
                 [rewardView.confirmButton setTitle:@"好的" forState:UIControlStateNormal];
                 rewardView.titleLabel.text = [NSString stringWithFormat:@"恭喜！小白给你送了%@积分！",tempDict[@"data"][@"point"]];
+                [rewardView.confirmButton addTarget:self action:@selector(backPopVC:) forControlEvents:UIControlEventTouchUpInside];
             }
             else
             {
@@ -161,6 +162,10 @@ FBAPIManagerInterceptor
 
 #pragma mark - event reponse
 
+- (void)backPopVC:(UIButton *)btn {
+    
+    [self.navigationController popViewControllerAnimated:YES];
+}
 /* 错误页面刷新 */
 - (void)refreshButtonClicked:(UIButton *)btn {
     

HappyJob/HappyJob/CClass/Me_我/Reward_入职奖励/ViewController/HJReturnFeeListViewController.m

@@ -51,9 +51,12 @@ FBAPIManagerInterceptor
 /* 通知 */
 - (void)returnFeeConfirmNotification:(NSNotificationCenter *)noti {
     
+    [self.tableView.tableView beginUpdates];
     [self.dataBox.dataSource removeObjectAtIndex:self.deleteIndex.row];
     [self.tableView.tableView deleteRowsAtIndexPaths:[NSMutableArray arrayWithObject:self.deleteIndex] withRowAnimation:UITableViewRowAnimationAutomatic]; //删除对应数据的cell
+    [self.tableView.tableView endUpdates];
 }
+
 /* 销毁中间页控制器 */
 - (void)dismissMiddleVC
 {

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

@@ -64,7 +64,9 @@
         
         make.centerY.equalTo(self.titleLabel);
         make.leading.equalTo(self.titleLabel.mas_trailing).offset(10);
+        make.height.mas_equalTo(40);
     }];
+    
     [self.stateLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         
         make.top.equalTo(self.titleLabel.mas_bottom).offset(14);
@@ -161,8 +163,8 @@
         _titleIcon.titleLabel.font = [UIFont systemFontOfSize:12];
         [_titleIcon setTitleColor:COLOR_999999 forState:UIControlStateNormal];
         [_titleIcon setImage:[UIImage imageNamed:@"me_resume_icon"] forState:UIControlStateNormal];
+        [_titleIcon addTarget:self action:@selector(containerViewTapAction:) forControlEvents:UIControlEventTouchUpInside];
         [_titleIcon layoutButtonWithEdgeInsetsStyle:MKButtonEdgeInsetsStyleLeft imageTitleSpace:5];
-        
     }
     return _titleIcon;
 }

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

@@ -8,8 +8,6 @@
 
 #import "HJLoginUserAgreementViewController.h"
 #import <WebKit/WebKit.h>
-#import "UIButton+HJGradientButton.h"
-#import "UIViewController+HJNavBar.h"
 
 @interface HJLoginUserAgreementViewController ()<WKUIDelegate>
 

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

@@ -38,7 +38,6 @@
     self.bindingPhoneAPIManager.APIManagerDelegate = self;
     self.bindingPhoneAPIManager.APIManagerInterceptor = self;
     [self addSubViews];
-    
 }
 
 #pragma mark - 布局
@@ -120,7 +119,6 @@
     btn.userInteractionEnabled = NO;
     self.second = 60;
     self.timer = [NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(runTimer) userInfo:self repeats:YES];
-    
 }
 - (void)runTimer {
     

HappyJob/HappyJob/Login_登录/信息合并/ViewController/HJLoginInfoMergeViewController.m

@@ -147,7 +147,6 @@ FBAPIManagerInterceptor
     }];
 
     [self.promptView showHJLoginInformationMergeView];
-    
 }
 
 #pragma mark - event respone

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

@@ -270,7 +270,6 @@
         {
             [[NSNotificationCenter defaultCenter] postNotificationName:kNotifiAliPayFailed object:nil];
         }
-        
     }];
 }
 - (void)applicationWillResignActive:(UIApplication *)application {