bug修改

HappyJob/HappyJob.xcodeproj/xcshareddata/xcschemes/HappyJob.xcscheme

@@ -59,6 +59,13 @@
             ReferencedContainer = "container:HappyJob.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "OS_ACTIVITY_MODE"
+            value = "disable"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

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

@@ -79,9 +79,8 @@ UIGestureRecognizerDelegate
     
     BHomeResumeDetailModel *model = [BHomeResumeDetailModel yy_modelWithJSON:self.dataDict];
     NSMutableString* str=[[NSMutableString alloc] initWithFormat:@"tel:%@",model.phone];
-    UIWebView * callWebview = [[UIWebView alloc] init];
-    [callWebview loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:str]]];
-    [self.view addSubview:callWebview];
+    NSURL *url = [NSURL URLWithString:str];
+    [[UIApplication sharedApplication] openURL:url];
 }
 /* 复制微信号 */
 - (void)WeChatBUttonClick:(UIButton *)btn {

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

@@ -315,6 +315,7 @@ NSString *const HJJoinApplySuccessNotification = @"HJJoinApplySuccessNotificatio
         {
             [self.view fb_showInfoWithStatus:@"请先完善简历后再申请" completion:^{
                 HJBasicInfoViewController *infoVC = [[HJBasicInfoViewController alloc] init];
+                infoVC.isPop = YES;
                 [self.navigationController pushViewController:infoVC animated:YES];
             }];
         }

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

@@ -303,6 +303,7 @@ FBAPIManagerDelegate
         {
             [self.view fb_showInfoWithStatus:@"请先完善简历后再申请" completion:^{
                 HJBasicInfoViewController *infoVC = [[HJBasicInfoViewController alloc] init];
+                infoVC.isPop = YES;
                 [self.navigationController pushViewController:infoVC animated:YES];
             }];
         }

HappyJob/HappyJob/CClass/Me_我/Auth_实名认证/ViewController/HJAuthingViewController.m

@@ -89,6 +89,7 @@
     }
     return _bgView;
 }
+
 - (UIImageView *)imageV {
     
     if (_imageV == nil)
@@ -98,6 +99,7 @@
     }
     return _imageV;
 }
+
 - (UILabel *)label {
     
     if (_label == nil)

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

@@ -112,11 +112,6 @@ static NSString * const HJMeCellIdentifier = @"HJMeCustomCell";
             cell.iconImageV.image = [UIImage imageNamed:@"Identity_change"];
             cell.titleLabel.text = @"我要招人";
         }
-//        else
-//        {
-//            cell.iconImageV.image = [UIImage imageNamed:@"b_my_set"];
-//            cell.titleLabel.text = @"设置";
-//        }
     }
     return cell;
 }

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

@@ -276,11 +276,11 @@ UIGestureRecognizerDelegate
             [self.view fb_showSuccessWithStatus:fetchData completion:^{
                 
                 if (self.isPop)
-                {
+                {//返回到上个页面
                     [self.navigationController popViewControllerAnimated:YES];
                 }
                 else
-                {
+                {//不返回
                     HJExpectationViewController *vc = [[HJExpectationViewController alloc] init];
                     vc.isPopToRoot = YES;
                     [self.navigationController pushViewController:vc animated:YES];

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

@@ -106,7 +106,7 @@ static NSString * const HJSettingCellIdentifier = @"HJSettingCell";
     {
         cell.contentLabel.text = [NSString stringWithFormat:@"%.2lfMB",[self folderSize]];
     }
-    if (indexPath.row == 2)
+    if (indexPath.row == 1)
     {
         cell.contentLabel.text = [NSString stringWithFormat:@"V%@", APP_VERSION];
     }
@@ -258,6 +258,9 @@ static NSString * const HJSettingCellIdentifier = @"HJSettingCell";
         _tableView.backgroundColor = [UIColor whiteColor];
         _tableView.separatorStyle = NO;
         _tableView.scrollEnabled = NO;
+        _tableView.estimatedRowHeight = 10.0;
+        _tableView.rowHeight = UITableViewAutomaticDimension;
+
     }
     return _tableView;
 }

HappyJob/HappyJob/CClass/Me_我/ViewController/HJMeViewController.m

@@ -210,6 +210,7 @@ FBAPIManagerDelegate
         {//我的积分
             HJMyIntegralViewController *vc = [[HJMyIntegralViewController alloc]init];
             vc.hidesBottomBarWhenPushed = YES;
+            vc.meDataBox = self.dataBox;
             [self.navigationController pushViewController:vc animated:YES];
         }
         if (indexPath.row == 2)

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/APIManager/HJMyIntegralDataBox.m

@@ -69,6 +69,7 @@
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     
+    /*--- 积分明细 ------*/
     if ([self.manager isKindOfClass:[HJMyIntegralDetailListAPI class]])
     {
         static NSString *cellID = @"cellID";
@@ -92,23 +93,27 @@
             cell.moneylabel.text = [NSString stringWithFormat:@"+%@",model.points];
             cell.moneylabel.textColor = COLOR_READFF;
         }
+        
         return cell;
     }
     else
     {
+        /*--- 好礼和活动的 ----*/
         static NSString *exchangeListCell = @"exchangeListCell";
         HJMyIntegralExchangeListCell *cell = [tableView dequeueReusableCellWithIdentifier:exchangeListCell];
         if (cell == nil)
         {
             cell = [[HJMyIntegralExchangeListCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:exchangeListCell];
         }
-        
-        if ([self.manager isKindOfClass:[HJMyIntegralExchangeActivityListAPI class]])
+        /*---- 好礼的   ---*/
+        if ([self.manager isKindOfClass:[HJMyIntegralExchangeGiftListAPI class]])
         {
             NSDictionary *dict = [self.dataSource objectAtIndex:indexPath.row];
-            HJMyIntegralExchangeActivityListModel *model = [HJMyIntegralExchangeActivityListModel yy_modelWithJSON:dict];
-            [cell.leftImageV sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",model.activityPic]]];
-            cell.titleLabel.text = model.activityName;
+            HJMyIntergralExchangeGiftListModel *model = [HJMyIntergralExchangeGiftListModel yy_modelWithJSON:dict];
+            
+            [cell.leftImageV sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",model.rewardPic]]];
+            cell.titleLabel.text = model.rewardName;
+            
             if (model.money)
             {
                 cell.integralLabel.text = [NSString stringWithFormat:@"%@积分 + %@元",model.points,model.money];
@@ -123,9 +128,10 @@
             [formatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
             NSString *time_now = [formatter stringFromDate:date];
             
-            if ([model.attendActivityNum isEqualToString: model.activityNumber])
+            if ([model.rewardNumber isEqualToString: model.exchangeRewardNum])
             {
-                cell.timeLabel.text = @"名额已满";
+                cell.timeLabel.text = @"已兑完";
+                cell.exchangeBtn.hidden = YES;
             }
             else
             {
@@ -137,20 +143,25 @@
                 else if ([HJAppService timeSwitchTimestamp:time_now] > [HJAppService timeSwitchTimestamp:model.exchangeEndDate])
                 {
                     cell.timeLabel.text = @"兑换结束";
+                    cell.exchangeBtn.hidden = YES;
                 }
                 else
                 {
-                    [cell.exchangeBtn setTitle:@"立即报名" forState:UIControlStateNormal];
+                    [cell.exchangeBtn setTitle:@"立即兑换" forState:UIControlStateNormal];
                     cell.exchangeBtn.hidden = NO;
+                    cell.timeLabel.text = @"";
                 }
             }
         }
+        
+        /* -- 活动的 -- */
         if ([self.manager isKindOfClass:[HJMyIntegralExchangeActivityListAPI class]])
         {
             NSDictionary *dict = [self.dataSource objectAtIndex:indexPath.row];
-            HJMyIntergralExchangeGiftListModel *model = [HJMyIntergralExchangeGiftListModel yy_modelWithJSON:dict];
-            [cell.leftImageV sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",model.rewardPic]]];
-            cell.titleLabel.text = model.rewardName;
+            HJMyIntegralExchangeActivityListModel *model = [HJMyIntegralExchangeActivityListModel yy_modelWithJSON:dict];
+            
+            [cell.leftImageV sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",model.activityPic]]];
+            cell.titleLabel.text = model.activityName;
             if (model.money)
             {
                 cell.integralLabel.text = [NSString stringWithFormat:@"%@积分 + %@元",model.points,model.money];
@@ -159,30 +170,34 @@
             {
                 cell.integralLabel.text = [NSString stringWithFormat:@"%@积分",model.points];
             }
+            
             NSDate *date = [NSDate date];
             NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
             [formatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
             NSString *time_now = [formatter stringFromDate:date];
             
-            if ([model.rewardNumber isEqualToString: model.exchangeRewardNum])
+            if ([model.attendActivityNum isEqualToString: model.activityNumber])
             {
                 cell.timeLabel.text = @"名额已满";
+                cell.exchangeBtn.hidden = YES;
             }
             else
             {
                 if ([HJAppService timeSwitchTimestamp:time_now] < [HJAppService timeSwitchTimestamp:model.exchangeStartDate])
                 {
                     cell.exchangeBtn.hidden = YES;
-                    cell.timeLabel.text = [NSString stringWithFormat:@"%@开始",[HJAppService compareCurrentTimeDayAndMonth:[NSString stringWithFormat:@"%ld",(long)[HJAppService timeSwitchTimestamp:model.exchangeStartDate]]]];
+                    cell.timeLabel.text = [NSString stringWithFormat:@"%@开始",[HJAppService compareCurrentTimeDayAndMonth:[NSString stringWithFormat:@"%ld",[HJAppService timeSwitchTimestamp:model.exchangeStartDate]]]];
                 }
                 else if ([HJAppService timeSwitchTimestamp:time_now] > [HJAppService timeSwitchTimestamp:model.exchangeEndDate])
                 {
                     cell.timeLabel.text = @"兑换结束";
+                    cell.exchangeBtn.hidden = YES;
                 }
                 else
                 {
-                    [cell.exchangeBtn setTitle:@"立即兑换" forState:UIControlStateNormal];
+                    [cell.exchangeBtn setTitle:@"立即报名" forState:UIControlStateNormal];
                     cell.exchangeBtn.hidden = NO;
+                    cell.timeLabel.text = @"";
                 }
             }
         }
@@ -205,7 +220,9 @@
     {
         [self.dataSource addObjectsFromArray:array];
     }
+    
 }
+
 - (NSMutableArray *)typeArray {
     
     if (_typeArray == nil)

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/View/HJMyIntegralSigninCell.m

@@ -98,6 +98,7 @@
     for (int i = 0; i < 7; i ++)
     {//创建7个imagev
         UIImageView *imageV = [[UIImageView alloc]init];
+        imageV.contentMode = UIViewContentModeScaleAspectFit;
         imageV.tag = i;
         imageV.image = [UIImage imageNamed:@"no_signin"];
         [self.bgView addSubview:imageV];

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/View/HJMyIntegralTaskListCell.m

@@ -118,12 +118,30 @@
     
     self.titleLabel.text = dayTaskModel.taskSetting.taskName;
     self.integralLabel.text = [NSString stringWithFormat:@"+%@",dayTaskModel.taskSetting.points];
-    self.progressLabel.text = [NSString stringWithFormat:@"%lu/%ld",(unsigned long)browerArray.count,(long)taskNumber];
     
-    [self.progressView mas_updateConstraints:^(MASConstraintMaker *make) {
-       
-        make.width.mas_equalTo(50*browerArray.count/taskNumber);
-    }];
+    if (browerArray.count > taskNumber )
+    {
+        self.progressLabel.text = [NSString stringWithFormat:@"%lu/%ld",(long)taskNumber,(long)taskNumber];
+    }
+    else
+    {
+        self.progressLabel.text = [NSString stringWithFormat:@"%lu/%ld",(unsigned long)browerArray.count,(long)taskNumber];
+    }
+    
+    if (browerArray.count)
+    {
+        [self.progressView mas_updateConstraints:^(MASConstraintMaker *make) {
+           
+            make.width.mas_equalTo(50*browerArray.count/taskNumber);
+        }];
+    }
+    else
+    {
+        [self.progressView mas_updateConstraints:^(MASConstraintMaker *make) {
+           
+            make.width.mas_equalTo(0);
+        }];
+    }
     
     if ([dayTaskModel.is_get integerValue] == 0)
     {

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/ViewController/HJMyIntegralDetailViewController.m

@@ -74,8 +74,6 @@ FBAPIManagerInterceptor
 
 - (void)managerCallAPIDidSuccess:(FBBaseAPIManager *)manager {
     
-    [self.view dismissErrorView];
-
     if (manager == self.listAPI)
     {
         [self.tableView managerCallAPIDidSuccess:manager];
@@ -83,7 +81,6 @@ FBAPIManagerInterceptor
 }
 - (void)managerCallAPIDidFailed:(FBBaseAPIManager *)manager {
     
-    [self.view showErrorView];
     id fetchData = [manager fetchDataWithBox:self.dataBox];
     if ([fetchData isKindOfClass:[NSString class]])
     {

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/ViewController/HJMyIntegralExchangeGiftActivityVC.m

@@ -15,12 +15,12 @@
 #import "HJMyIntegralDataBox.h"
 
 
-
 @interface HJMyIntegralExchangeGiftActivityVC ()
 <
 UITableViewDelegate,
 UIGestureRecognizerDelegate,
-FBAPIManagerDelegate
+FBAPIManagerDelegate,
+HJMyIntegralExchangeRecordViewControllerDelegate
 >
 
 @property (nonatomic, strong) UIButton       *recordBtn;
@@ -82,16 +82,18 @@ FBAPIManagerDelegate
 
 - (void)managerCallAPIDidSuccess:(FBBaseAPIManager *)manager {
     
-    [self.view dismissErrorView];
-
     if (manager == self.giftListAPI)
     {
         [self.tableView managerCallAPIDidSuccess:manager];
     }
+    if (manager == self.activityListAPI)
+    {
+        [self.tableView managerCallAPIDidSuccess:manager];
+    }
 }
+
 - (void)managerCallAPIDidFailed:(FBBaseAPIManager *)manager {
     
-    [self.view showErrorView];
     id fetchData = [manager fetchDataWithBox:self.dataBox];
     if ([fetchData isKindOfClass:[NSString class]])
     {
@@ -121,6 +123,21 @@ FBAPIManagerDelegate
     }
 }
 
+#pragma mark - HJMyIntegralExchangeRecordViewControllerDelegate
+
+- (void)requestDataForGiftHJExchangeOrActivity:(NSInteger)type {
+    
+    if (type == self.type)
+    {
+        return;
+    }
+    else
+    {
+        self.type = type;
+        [self requestListData];
+    }
+}
+
 #pragma mark - event response
 
 - (void)recordButtonClick:(UIButton *)btn {
@@ -134,6 +151,7 @@ FBAPIManagerDelegate
     {
         vc.selectIndex = 1;
     }
+    vc.delegate = self;
     [self.navigationController pushViewController:vc animated:YES];
 }
 

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/ViewController/HJMyIntegralTaskViewController.h

@@ -7,12 +7,13 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "HJMeDataBox.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface HJMyIntegralTaskViewController : UIViewController
 
-
+@property (nonatomic, strong) HJMeDataBox *meDataBox;
 
 @end
 

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/ViewController/HJMyIntegralTaskViewController.m

@@ -17,6 +17,8 @@
 #import "HJFullTimeViewController.h"//全职列表
 #import "HJAuthViewController.h"//实名认证
 #import "HJResumeViewController.h"//简历
+#import "HJBasicInfoViewController.h"//个人信息
+
 
 @interface HJMyIntegralTaskViewController ()
 <
@@ -32,7 +34,7 @@ FBAPIManagerInterceptor
 @property (nonatomic, strong) HJMyIntegralTaskListAPI *listAPI;
 @property (nonatomic, strong) HJMyIntegralReceiveRewardAPI *receiveRewardAPI;//领取奖励
 @property (nonatomic, strong) NSDictionary                 *dataDict;
-
+  
 @end
 
 @implementation HJMyIntegralTaskViewController
@@ -53,6 +55,7 @@ FBAPIManagerInterceptor
     self.navigationItem.title = @"做任务赚积分";
     [self hj_setupNavBar];
     [self initSubViews];
+//    NSLog(@":::::%f",self.meDataBox.headerView.resumeView.percent);
 }
 
 #pragma mark - init
@@ -197,8 +200,19 @@ FBAPIManagerInterceptor
                 }
                 if ([newtaskModel.taskSetting.taskName containsString:@"简历完成度"])
                 {  //简历
-                    HJResumeViewController *resumeVC = [[HJResumeViewController alloc]init];
-                    [weakSelf.navigationController pushViewController:resumeVC animated:YES];
+                    if (self.meDataBox.headerView.resumeView.percent > 0)
+                    {
+                        HJResumeViewController *resumeVC = [[HJResumeViewController alloc] init];
+                        resumeVC.hidesBottomBarWhenPushed = YES;
+                        [self.navigationController pushViewController:resumeVC animated:YES];
+                    }
+                    else
+                    {
+                        HJBasicInfoViewController *profileVC = [[HJBasicInfoViewController alloc] init];
+                        profileVC.isPop = NO;
+                        profileVC.hidesBottomBarWhenPushed = YES;
+                        [self.navigationController pushViewController:profileVC animated:YES];
+                    }
                 }
                 if ([newtaskModel.taskSetting.taskName containsString:@"一次"])
                 {   //全职列表
@@ -315,6 +329,7 @@ FBAPIManagerInterceptor
     }
     return _receiveRewardAPI;
 }
+
 /*
 #pragma mark - Navigation
 

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/ViewController/HJMyIntegralViewController.h

@@ -7,11 +7,14 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "HJMeDataBox.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface HJMyIntegralViewController : UIViewController
 
+@property (nonatomic, strong) HJMeDataBox *meDataBox;
+
 @end
 
 NS_ASSUME_NONNULL_END

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/ViewController/HJMyIntegralViewController.m

@@ -52,7 +52,7 @@ FBAPIManagerInterceptor
 - (void)dealloc {
     //移除
     [[NSNotificationCenter defaultCenter] removeObserver:self name:HJIntegralChangeNotification object:nil];
-//    NSLog(@"-----deallocdeallocdeallocdealloc-----");
+
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -70,6 +70,11 @@ FBAPIManagerInterceptor
     
     //积分改变通知
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(integralChange:) name:HJIntegralChangeNotification object:nil];
+    // 错误页面刷新事件
+    [self.view.errorView.refreshButton addTarget:self
+                                     action:@selector(refreshButtonClicked:)
+                           forControlEvents:UIControlEventTouchUpInside];
+    
 }
 
 #pragma mark - init
@@ -112,6 +117,7 @@ FBAPIManagerInterceptor
     
     if (manager == self.integralAPI)
     {
+        [self.view dismissErrorView];
         self.dataDict = [manager fetchDataWithBox:nil];
         [self.tableView reloadData];
     }
@@ -140,7 +146,10 @@ FBAPIManagerInterceptor
 - (void)managerCallAPIDidFailed:(FBBaseAPIManager *)manager {
     
     FBAPIManagerErrorType type = manager.errorType;
-    
+    if (manager == self.integralAPI)
+    {
+        [self.view showErrorView];
+    }
     if (type == FBAPIManagerErrorTypeNoContent)
     {
         id fetchData = [manager fetchDataWithBox:nil];
@@ -268,6 +277,11 @@ FBAPIManagerInterceptor
 
 #pragma mark - event response
 
+/* 错误页面刷新 */
+- (void)refreshButtonClicked:(UIButton *)btn {
+    
+    [self.integralAPI start];
+}
 /* 积分改变 */
 - (void)integralChange:(NSNotification *)notification {
     
@@ -295,7 +309,12 @@ FBAPIManagerInterceptor
     {   //isSign（是否签到）,isSupSign（是否补签）,supplementarySignin(是否可以补签)
         if ([model.supplementarySignin integerValue] == 0 && [model.isSupSign integerValue] == 0 && [model.noSign integerValue] > 0)
         {
-            [self.view fb_showInfoWithStatus:@"完成今天全部的每日任务可以获得一次补签机会~"];
+            HJConfirmPanelSingleView *vc = [[HJConfirmPanelSingleView alloc]init];
+            vc.titleLabel.text = @"完成今天全部的每日任务可以获得一次补签机会~";
+            [vc.confirmButton setTitle:@"好的" forState:UIControlStateNormal];
+            [vc.confirmButton addTarget:self action:@selector(moreTaskButtonClock:) forControlEvents:UIControlEventTouchUpInside];
+            [vc ShowConfirmPanelSingleView];
+            
         }
         else
         {
@@ -315,21 +334,28 @@ FBAPIManagerInterceptor
 /* 兑好礼 */
 - (void)exchangeButtonClick:(UIButton *)btn {
     
-    HJMyIntegralExchangeGiftVC *vc = [[HJMyIntegralExchangeGiftVC alloc]init];
+//    HJMyIntegralExchangeGiftVC *vc = [[HJMyIntegralExchangeGiftVC alloc]init];
+//    [self.navigationController pushViewController:vc animated:YES];
+    
+    HJMyIntegralExchangeGiftActivityVC *vc = [[HJMyIntegralExchangeGiftActivityVC alloc]init];
+    vc.type = HJExchangeTypeGift;
     [self.navigationController pushViewController:vc animated:YES];
 }
 /* 兑活动 */
 - (void)activityButtonClick:(UIButton *)btn {
     
-    HJMyIntegralExchangeActivityVC *vc = [[HJMyIntegralExchangeActivityVC alloc]init];
+//    HJMyIntegralExchangeActivityVC *vc = [[HJMyIntegralExchangeActivityVC alloc]init];
+//    [self.navigationController pushViewController:vc animated:YES];
+    HJMyIntegralExchangeGiftActivityVC *vc = [[HJMyIntegralExchangeGiftActivityVC alloc]init];
+    vc.type = HJExchangeTypeActivity;
     [self.navigationController pushViewController:vc animated:YES];
 }
 /* 更多任务 */
 - (void)moreTaskButtonClock:(UIButton *)btn {
     
     HJMyIntegralTaskViewController *vc = [[HJMyIntegralTaskViewController alloc]init];
+    vc.meDataBox = self.meDataBox;
     [self.navigationController pushViewController:vc animated:YES];
-    
 }
 /* 领取奖励*/
 - (void)receiveRewaedTaskId:(NSString *)taskId andTaskType:(NSString *)taskType{

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑好礼/APIManager/HJMyIntergralExchangeGiftDataBox.m

@@ -56,11 +56,12 @@
         cell = [[HJMyIntegralExchangeListCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:exchangeListCell];
     }
     
-
     NSDictionary *dict = [self.dataSource objectAtIndex:indexPath.row];
     HJMyIntergralExchangeGiftListModel *model = [HJMyIntergralExchangeGiftListModel yy_modelWithJSON:dict];
+    
     [cell.leftImageV sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",model.rewardPic]]];
     cell.titleLabel.text = model.rewardName;
+    
     if (model.money)
     {
         cell.integralLabel.text = [NSString stringWithFormat:@"%@积分 + %@元",model.points,model.money];
@@ -69,15 +70,16 @@
     {
         cell.integralLabel.text = [NSString stringWithFormat:@"%@积分",model.points];
     }
+    
     NSDate *date = [NSDate date];
     NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
     [formatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
     NSString *time_now = [formatter stringFromDate:date];
     
-    
     if ([model.rewardNumber isEqualToString: model.exchangeRewardNum])
     {
-        cell.timeLabel.text = @"名额已满";
+        cell.timeLabel.text = @"已兑完";
+        cell.exchangeBtn.hidden = YES;
     }
     else
     {
@@ -89,11 +91,13 @@
         else if ([HJAppService timeSwitchTimestamp:time_now] > [HJAppService timeSwitchTimestamp:model.exchangeEndDate])
         {
             cell.timeLabel.text = @"兑换结束";
+            cell.exchangeBtn.hidden = YES;
         }
         else
         {
             [cell.exchangeBtn setTitle:@"立即兑换" forState:UIControlStateNormal];
             cell.exchangeBtn.hidden = NO;
+            cell.timeLabel.text = @"";
         }
     }
 

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑好礼/View/HJMyIntegralExchangeGiftDetailHeaderView.m

@@ -82,12 +82,32 @@
         self.IntegralLabel.text = [NSString stringWithFormat:@"%@积分",model.mpCompaignsRewardSettingAPI.points];
     }
     
-    self.conditionsLabel.text = model.mpCompaignsRewardSettingAPI.exchangeNumber;
+    if (model.mpCompaignsRewardSettingAPI.exchangeNumber)
+    {
+        self.conditionsLabel.text = [NSString stringWithFormat:@"每人限领%@份",model.mpCompaignsRewardSettingAPI.exchangeNumber];
+    }
     
-    self.inventoryLabel.text = [NSString stringWithFormat:@"库存:%ld 已领:%@",[model.mpCompaignsRewardSettingAPI.rewardNumber integerValue] - [model.mpCompaignsRewardSettingAPI.exchangeRewardNum integerValue],model.mpCompaignsRewardSettingAPI.exchangeRewardNum];
+    //库存
+    if (model.mpCompaignsRewardSettingAPI.rewardNumber)
+    {
+        self.inventoryLabel.text = [NSString stringWithFormat:@"库存:%ld 已领:%@",[model.mpCompaignsRewardSettingAPI.rewardNumber integerValue] - [model.mpCompaignsRewardSettingAPI.exchangeRewardNum integerValue],model.mpCompaignsRewardSettingAPI.exchangeRewardNum];
+    }
+    else
+    {
+        self.inventoryLabel.text = [NSString stringWithFormat:@"库存:不限 已领:%@",model.mpCompaignsRewardSettingAPI.exchangeRewardNum];
+    }
     
+    //兑换时间
     self.timeLabel.text = [NSString stringWithFormat:@"兑换时间:%@ - %@",[HJAppService time_timestampToString:[NSString stringWithFormat:@"%ld",(long)[HJAppService timeSwitchTimestamp:model.mpCompaignsRewardSettingAPI.exchangeStartDate]] withType:kTimeStampDateOnlyHorizonLine] ,[HJAppService time_timestampToString:[NSString stringWithFormat:@"%ld",(long)[HJAppService timeSwitchTimestamp:model.mpCompaignsRewardSettingAPI.exchangeEndDate]] withType:kTimeStampDateOnlyHorizonLine]];
+    
+    if ([self.timeLabel.text isEqualToString:@"兑换时间:1900-01-01 - 2100-01-01"])
+    {
+        self.timeLabel.text = @"兑换时间:不限";
+    }
+    
+    
 }
+
 #pragma mark - setter and getter
 
 - (UIView *)bgView {

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑好礼/View/HJMyIntegralExchangeGiftRecordDetailHeaderView.h

@@ -14,9 +14,16 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong) UIView *bgView;
 @property (nonatomic, strong) UILabel *titleLabel;
+
+@property (nonatomic, strong) UILabel *exchangeTimeTitle;
 @property (nonatomic, strong) UILabel *exchangeTimelabel;
+
+@property (nonatomic, strong) UILabel *integralTitle;
 @property (nonatomic, strong) UILabel *integralLabel;
+
 @property (nonatomic, strong) UILabel *stateLabel;
+
+@property (nonatomic, strong) UILabel *phoneTitle;
 @property (nonatomic, strong) UILabel *phoneLabel;
 
 - (void)configureHJMyIntegralExchangeGiftRecordDetailHeaderViewDict:(NSDictionary *)dict;

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑好礼/View/HJMyIntegralExchangeGiftRecordDetailHeaderView.m

@@ -24,9 +24,12 @@
     
     [self addSubview:self.bgView];
     [self.bgView addSubview:self.titleLabel];
+    [self.bgView addSubview:self.exchangeTimeTitle];
     [self.bgView addSubview:self.exchangeTimelabel];
     [self.bgView addSubview:self.stateLabel];
+    [self.bgView addSubview:self.integralTitle];
     [self.bgView addSubview:self.integralLabel];
+    [self.bgView addSubview:self.phoneTitle];
     [self.bgView addSubview:self.phoneLabel];
     
     [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -41,24 +44,42 @@
         make.left.equalTo(self.bgView.mas_left).offset(15);
         make.top.equalTo(self.bgView.mas_top).offset(15);
     }];
-    [self.exchangeTimelabel mas_makeConstraints:^(MASConstraintMaker *make) {
+    [self.exchangeTimeTitle mas_makeConstraints:^(MASConstraintMaker *make) {
         
         make.left.equalTo(self.bgView.mas_left).offset(15);
         make.top.equalTo(self.titleLabel.mas_bottom).offset(25);
     }];
+    [self.exchangeTimelabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.left.equalTo(self.exchangeTimeTitle.mas_right).offset(5);
+        make.top.equalTo(self.titleLabel.mas_bottom).offset(25);
+        make.centerY.equalTo(self.exchangeTimeTitle);
+    }];
     [self.stateLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.equalTo(self.bgView.mas_right).offset(-15);
         make.centerY.equalTo(self.exchangeTimelabel);
     }];
-    [self.integralLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+    
+    [self.integralTitle mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.bgView.mas_left).offset(15);
         make.top.equalTo(self.exchangeTimelabel.mas_bottom).offset(5);
     }];
-    [self.phoneLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+    [self.integralLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.integralTitle.mas_right).offset(5);
+        make.top.equalTo(self.exchangeTimelabel.mas_bottom).offset(5);
+        make.centerY.equalTo(self.integralTitle);
+    }];
+    
+    [self.phoneTitle mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.bgView.mas_left).offset(15);
         make.top.equalTo(self.integralLabel.mas_bottom).offset(5);
         make.bottom.equalTo(self.bgView.mas_bottom).offset(-20);
     }];
+    [self.phoneLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.phoneTitle.mas_right).offset(5);
+        make.top.equalTo(self.integralLabel.mas_bottom).offset(5);
+        make.centerY.equalTo(self.phoneTitle);
+    }];
 }
 - (void)configureHJMyIntegralExchangeGiftRecordDetailHeaderViewDict:(NSDictionary *)dict {
     
@@ -66,32 +87,53 @@
     
     self.titleLabel.text = model.mpCompaignsRewardSettingAPI.rewardName;
     
-    self.exchangeTimelabel.text = [NSString stringWithFormat:@"兑换时间:    %@",model.mpMemberCompaigns.joinTime];
+    //兑换时间
+    self.exchangeTimelabel.text = [NSString stringWithFormat:@"%@",model.mpMemberCompaigns.joinTime];
     
-    NSMutableArray *giftTypeArray = [NSMutableArray arrayWithObjects:@"已取消",@"处理中",@"待发货" ,@"待领取" @"待收货",@"已领取", nil];
-    self.stateLabel.text = giftTypeArray[[model.mpMemberCompaignsRewardAction.memberCampaignsStatus integerValue]];
+    //状态
+    NSArray *giftTypeArray = @[@"已取消",@"处理中",@"待发货",@"待领取",@"待收货",@"已领取"];
+    
+    if (model.mpMemberCompaignsRewardAction.memberCampaignsStatus)
+    {
+        int index = [model.mpMemberCompaignsRewardAction.memberCampaignsStatus intValue];
+        self.stateLabel.text = giftTypeArray[index];
+        
+        if ([model.mpMemberCompaignsRewardAction.memberCampaignsStatus intValue] == 0 || [model.mpMemberCompaignsRewardAction.memberCampaignsStatus intValue] == 5)
+        {
+            self.stateLabel.textColor = COLOR_GRAY9;
+        }
+        else
+        {
+            self.stateLabel.textColor = [UIColor colorFromHexString:@"FF7D0B"];
+        }
+    }
     
-    if ([model.mpMemberCompaignsRewardAction.memberCampaignsStatus integerValue] == 0 || [model.mpMemberCompaignsRewardAction.memberCampaignsStatus integerValue] == 5)
+    //兑换积分
+    NSString *returnSuccess = @"";
+   
+    if (model.mpMemberCompaignsRewardAction.invalidBackType)
     {
-        self.stateLabel.textColor = COLOR_GRAY9;
+        returnSuccess = @"（退还成功）";
     }
     else
     {
-        self.stateLabel.textColor = [UIColor colorFromHexString:@"FF7D0B"];
+        returnSuccess = @"";
     }
     
     if (model.mpCompaignsRewardSettingAPI.money)
     {
-        self.integralLabel.text = [NSString stringWithFormat:@"兑换消耗:    %@积分 + %@元",model.mpCompaignsRewardSettingAPI.points,model.mpCompaignsRewardSettingAPI.money];
+        self.integralLabel.text = [NSString stringWithFormat:@"%@积分 + %@元 %@",model.mpCompaignsRewardSettingAPI.points,model.mpCompaignsRewardSettingAPI.money,returnSuccess];
     }
     else
     {
-        self.integralLabel.text = [NSString stringWithFormat:@"兑换消耗:    %@积分",model.mpCompaignsRewardSettingAPI.points];
+        self.integralLabel.text = [NSString stringWithFormat:@"%@积分 %@",model.mpCompaignsRewardSettingAPI.points,returnSuccess];
     }
     
-    self.phoneLabel.text = [NSString stringWithFormat:@"预留号码:   %@",model.mpMemberCompaigns.contactPhone];
-    
+    //预留号码
+    self.phoneLabel.text = [NSString stringWithFormat:@"%@",model.mpMemberCompaigns.contactPhone];
+
 }
+
 #pragma mark - setter and getter
 
 - (UIView *)bgView {
@@ -113,6 +155,18 @@
     }
     return _titleLabel;
 }
+
+- (UILabel *)exchangeTimeTitle {
+    
+    if (_exchangeTimeTitle == nil)
+    {
+        _exchangeTimeTitle = [[UILabel alloc]init];
+        _exchangeTimeTitle.font = [UIFont systemFontOfSize:14];
+        _exchangeTimeTitle.textColor = COLOR_BACK6;
+        _exchangeTimeTitle.text = @"兑换时间:";
+    }
+    return _exchangeTimeTitle;
+}
 - (UILabel *)exchangeTimelabel {
     
     if (_exchangeTimelabel == nil)
@@ -123,6 +177,7 @@
     }
     return _exchangeTimelabel;
 }
+
 - (UILabel *)stateLabel {
     
     if (_stateLabel == nil)
@@ -133,6 +188,18 @@
     }
     return _stateLabel;
 }
+
+- (UILabel *)integralTitle{
+    
+    if (_integralTitle == nil)
+    {
+        _integralTitle = [[UILabel alloc]init];
+        _integralTitle.font = [UIFont systemFontOfSize:14];
+        _integralTitle.textColor = COLOR_BACK6;
+        _integralTitle.text = @"兑换消耗:";
+    }
+    return _integralTitle;
+}
 - (UILabel *)integralLabel {
     
     if (_integralLabel == nil)
@@ -144,6 +211,17 @@
     return _integralLabel;
 }
 
+- (UILabel *)phoneTitle {
+    
+    if (_phoneTitle == nil)
+    {
+        _phoneTitle = [[UILabel alloc]init];
+        _phoneTitle.font = [UIFont systemFontOfSize:14];
+        _phoneTitle.textColor = COLOR_BACK6;
+        _phoneTitle.text = @"预留号码:";
+    }
+    return _phoneTitle;
+}
 - (UILabel *)phoneLabel {
     
     if (_phoneLabel == nil)

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑好礼/View/HJMyIntegralExchangeListCell.m

@@ -53,6 +53,7 @@
         
         make.left.equalTo(self.leftImageV.mas_right).offset(10);
         make.top.equalTo(self.leftImageV.mas_top).offset(5);
+        make.right.equalTo(self.bgView.mas_right).offset(-15);
     }];
     [self.iconImageV mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.leftImageV.mas_right).offset(10);

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑好礼/ViewComtroller/HJMyIntegralExchangeGiftDetailVC.m

@@ -13,7 +13,7 @@
 #import "HJMyIntegralExchangePayViewController.h"//支付
 #import "HJMyIntegralExchangeGiftDetailAPI.h"
 #import "HJMyIntegralExchangeGiftAPI.h"
-#import "HJMyIntergralExchangeGiftListModel.h"
+#import "HJMyIntergralExchangeGiftDetailModel.h"
 
 @interface HJMyIntegralExchangeGiftDetailVC ()
 <
@@ -37,12 +37,15 @@ FBAPIManagerInterceptor
 
 @implementation HJMyIntegralExchangeGiftDetailVC
 
+- (void)dealloc {
+    
+    [self.detailView.webView removeObserver:self forKeyPath:@"estimatedProgress"];
+}
 - (void)viewWillAppear:(BOOL)animated {
     
     [super viewWillAppear:animated];
     [self.navigationController setNavigationBarHidden:NO animated:animated];
     self.navigationController.interactivePopGestureRecognizer.delegate = self;
-    
 }
 - (void)viewDidLoad {
     [super viewDidLoad];
@@ -58,10 +61,11 @@ FBAPIManagerInterceptor
     self.detailAPI.mpCompaignsRewardSettingId = self.ID;
     [self.detailAPI start];
     
-    
     self.detailView.webView.navigationDelegate = self;
     [self.detailView.webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionNew context:nil];
     [self.detailView.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",@"https://hpjobtest.oss-cn-shanghai.aliyuncs.com/uploadfiles/banner/test/2019/6/8819934777436913/66c3e0eb86081e65ee416e0d6042584c.jpg"]]]];
+    
+//    DDLogDebug(@"--------------------");
    
 }
 
@@ -101,6 +105,7 @@ FBAPIManagerInterceptor
         make.edges.equalTo(footerView).with.insets(UIEdgeInsetsMake(10, 15, 10, 15));
     }];
 }
+
 #pragma mark - FBAPIManagerInterceptor
 
 - (BOOL)manager:(FBBaseAPIManager *)manager shouldStartCallAPIWithParams:(NSDictionary *)params {
@@ -121,15 +126,21 @@ FBAPIManagerInterceptor
     if (manager == self.detailAPI)
     {
         self.detailDict = [manager fetchDataWithBox:nil];
-//        [self.detailView.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",@"https://hpjobtest.oss-cn-shanghai.aliyuncs.com/uploadfiles/mpmanager/mpCompaignsRewardSetting/admin/2019/10/18666617874499038/4bcab912712367c7a72588b9415196e9.png"]]]];
         [self.headerView configureHJMyIntegralExchangeGiftDetailHeaderViewDict:self.detailDict];
+        HJMyIntergralExchangeGiftDetailModel *model = [HJMyIntergralExchangeGiftDetailModel yy_modelWithDictionary:self.detailDict[@"data"]];
+        if ([model.mpCompaignsRewardSettingAPI.rewardNumber isEqualToString:model.mpCompaignsRewardSettingAPI.exchangeRewardNum])
+        {
+            self.exchangeBtn.enabled = NO;
+        }
     }
     if (manager == self.exchangeGiftAPI)
     {
+
         [self.view fb_showSuccessWithStatus:@"兑换成功"];
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5*NSEC_PER_SEC)),dispatch_get_main_queue(), ^{
+        
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1*NSEC_PER_SEC)),dispatch_get_main_queue(), ^{
             
-            [self.detailAPI start];
+            [self.navigationController popViewControllerAnimated:YES];
             [[NSNotificationCenter defaultCenter] postNotificationName:HJIntegralChangeNotification object:nil];
         });
     }
@@ -152,6 +163,7 @@ FBAPIManagerInterceptor
         [self.view fb_showFailureWithStatus:manager.errorMessage];
     }
 }
+
 #pragma mark - WKwebVIew代理
 
 -(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
@@ -199,12 +211,6 @@ FBAPIManagerInterceptor
         HJMyIntegralExchangePayViewController *vc = [[HJMyIntegralExchangePayViewController alloc]init];
         [self.navigationController pushViewController:vc animated:YES];
     }
-
-//    HJConfirmPanelSingleView *vc = [[HJConfirmPanelSingleView alloc]init];
-//    vc.titleLabel.text = @"兑换失败： 您慢了一步，已经被抢完了";
-//    [vc.confirmButton setTitle:@"好的" forState:UIControlStateNormal];
-//    [vc.confirmButton addTarget:self action:@selector(confirmButtonClick:) forControlEvents:UIControlEventTouchUpInside];
-//    [vc ShowConfirmPanelSingleView];
 }
 - (void)confirmButtonClick:(UIButton *)btn {
     
@@ -258,7 +264,9 @@ FBAPIManagerInterceptor
         _exchangeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         _exchangeBtn.titleLabel.font = [UIFont boldSystemFontOfSize:17];
         [_exchangeBtn setBackgroundImage:[UIImage imageNamed:@"button_bg"] forState:UIControlStateNormal];
+        [_exchangeBtn setBackgroundImage:[UIImage imageNamed:@"button_bg_gray"] forState:UIControlStateDisabled];
         [_exchangeBtn setTitle:@"立即兑换" forState:UIControlStateNormal];
+        [_exchangeBtn setTitle:@"已兑完" forState:UIControlStateDisabled];
         [_exchangeBtn addTarget:self action:@selector(exchangeButtonClick:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _exchangeBtn;

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑好礼/ViewComtroller/HJMyIntegralExchangeGiftRecordDetailVC.m

@@ -30,6 +30,11 @@ FBAPIManagerInterceptor
 
 @implementation HJMyIntegralExchangeGiftRecordDetailVC
 
+- (void)dealloc {
+    
+    [self.detailView.webView removeObserver:self forKeyPath:@"estimatedProgress"];
+}
+
 - (void)viewDidLoad {
     
     [super viewDidLoad];

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑好礼/ViewComtroller/HJMyIntegralExchangeGiftVC.m

@@ -11,6 +11,7 @@
 #import "HJMyIntegralExchangeGiftDetailVC.h"//好礼详情
 #import "HJMyIntegralExchangeGiftListAPI.h"
 #import "HJMyIntergralExchangeGiftDataBox.h"
+#import "HJMyIntergralExchangeGiftListModel.h"
 
 @interface HJMyIntegralExchangeGiftVC ()
 <
@@ -34,16 +35,16 @@ FBAPIManagerDelegate
     [self.navigationController setNavigationBarHidden:NO animated:animated];
     self.navigationController.interactivePopGestureRecognizer.delegate = self;
     [self hj_setupNavBar];
-    
 }
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     
     self.navigationItem.title = @"兑好礼";
     [self initSubViews];
     [self.listAPI start];
-    
 }
+
 - (void)initSubViews {
     
     [self.view addSubview:self.tableView];
@@ -57,17 +58,15 @@ FBAPIManagerDelegate
 #pragma mark - FBPageableAPIManager
 
 - (void)managerCallAPIDidSuccess:(FBBaseAPIManager *)manager {
-    
-    [self.view dismissErrorView];
-
+   
     if (manager == self.listAPI)
     {
         [self.tableView managerCallAPIDidSuccess:manager];
     }
 }
+
 - (void)managerCallAPIDidFailed:(FBBaseAPIManager *)manager {
     
-    [self.view showErrorView];
     id fetchData = [manager fetchDataWithBox:self.dataBox];
     if ([fetchData isKindOfClass:[NSString class]])
     {
@@ -78,6 +77,7 @@ FBAPIManagerDelegate
         [self.tableView managerCallAPIDidFailed:manager];
     }
 }
+
 #pragma mark - UITableViewDelegate
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
@@ -87,6 +87,7 @@ FBAPIManagerDelegate
     [self.navigationController pushViewController:vc animated:YES];
     
 }
+
 #pragma mark - event response
 
 - (void)recordButtonClick:(UIButton *)btn {
@@ -94,8 +95,8 @@ FBAPIManagerDelegate
     HJMyIntegralExchangeRecordViewController *vc = [[HJMyIntegralExchangeRecordViewController alloc]init];
     vc.selectIndex = 0;
     [self.navigationController pushViewController:vc animated:YES];
-    
 }
+
 #pragma mark - setter and getter
 
 - (HJPageListView *)tableView {
@@ -110,7 +111,6 @@ FBAPIManagerDelegate
         _tableView.dataBox = self.dataBox;
         //自定义空白页
         _tableView.blankView.imageView.image = [UIImage imageNamed:@"b_home_empty"];
-        
     }
     return _tableView;
 }

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑换记录支付/APIManager/HJMyIntegralExchangeRecordDataBox.m

@@ -72,7 +72,7 @@
     
     NSDictionary *dict = [self.dataSource objectAtIndex:indexPath.row];
     HJMyIntegralExchangeRecordModel *model = [HJMyIntegralExchangeRecordModel yy_modelWithJSON:dict];
-   
+
     if ([self.manager isKindOfClass:[HJMyIntegralExchangeGiftRecordListAPI class]])
     {
         /*
@@ -80,7 +80,7 @@
         */
         [cell.leftImageV sd_setImageWithURL:[NSURL URLWithString:model.mpCompaignsRewardSettingAPI.rewardPic]];
         cell.titleLabel.text = model.mpCompaignsRewardSettingAPI.rewardName;
-        
+
         if (model.mpCompaignsRewardSettingAPI.money)
         {
             cell.integralLabel.text = [NSString stringWithFormat:@"%@积分 + %@元",model.mpCompaignsRewardSettingAPI.points,model.mpCompaignsRewardSettingAPI.money];
@@ -89,15 +89,24 @@
         {
             cell.integralLabel.text = [NSString stringWithFormat:@"%@积分",model.mpCompaignsRewardSettingAPI.points];
         }
-        cell.stateLabel.text = self.giftTypeArray[[model.mpMemberCompaignsRewardAction.memberCampaignsStatus integerValue]];
         
-        if ([model.mpMemberCompaignsRewardAction.memberCampaignsStatus integerValue] == 0 || [model.mpMemberCompaignsRewardAction.memberCampaignsStatus integerValue] == 5)
+        if (model.mpMemberCompaignsRewardAction.memberCampaignsStatus)
         {
-            cell.stateLabel.textColor = COLOR_GRAY9;
+            int index = [model.mpMemberCompaignsRewardAction.memberCampaignsStatus intValue];
+            cell.stateLabel.text = self.giftTypeArray[index];
+            
+            if ([model.mpMemberCompaignsRewardAction.memberCampaignsStatus intValue] == 0 || [model.mpMemberCompaignsRewardAction.memberCampaignsStatus intValue] == 5)
+            {
+                cell.stateLabel.textColor = COLOR_GRAY9;
+            }
+            else
+            {
+                cell.stateLabel.textColor = [UIColor colorFromHexString:@"FF7D0B"];
+            }
         }
         else
         {
-            cell.stateLabel.textColor = [UIColor colorFromHexString:@"FF7D0B"];
+            cell.stateLabel.text = @"";
         }
     }
     else
@@ -115,7 +124,16 @@
         {
             cell.integralLabel.text = [NSString stringWithFormat:@"%@积分",model.mpCompaignsActivitySettingAPI.points];
         }
-        cell.stateLabel.text = self.activityTypeArray[[model.mpCompaignsActivitySettingAPI.activityStatus integerValue] - 1];
+        
+        if ([model.mpCompaignsActivitySettingAPI.activityStatus integerValue] == 2)
+        {
+            cell.stateLabel.text = @"活动取消";
+        }
+        else
+        {
+            cell.stateLabel.text = @"";
+        }
+       
     }
     
     return cell;
@@ -142,16 +160,9 @@
     
     if (_giftTypeArray == nil)
     {
-        _giftTypeArray = [NSMutableArray arrayWithObjects:@"已取消",@"处理中",@"待发货" ,@"待领取" @"待收货",@"已领取", nil];
+        _giftTypeArray = [NSMutableArray arrayWithObjects:@"已取消",@"处理中",@"待发货",@"待领取",@"待收货",@"已领取", nil];
     }
     return _giftTypeArray;
 }
-- (NSMutableArray *)activityTypeArray {
-    
-    if (_activityTypeArray == nil)
-    {// 1：上架 2：下架 3：终止(取消) 4：删除）
-        _activityTypeArray = [NSMutableArray arrayWithObjects:@"",@"",@"活动取消",@"", nil];
-    }
-    return _activityTypeArray;
-}
+
 @end

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑换记录支付/View/HJMyIntegralExchangeRecordCell.m

@@ -67,7 +67,7 @@
     
     self.titleLabel.text = @"开心小白抱枕L号 40*40cm";
     self.integralLabel.text = @"900积分";
-    self.stateLabel.text = @"已领取";
+//    self.stateLabel.text = @"已领取";
     
 }
 #pragma mark - setter and getter

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑换记录支付/ViewController/HJMyIntegralExchangePayViewController.m

@@ -36,7 +36,6 @@ FBAPIManagerInterceptor
 @property (nonatomic, strong) HJMyIntegralAlipayPayAPI *AlipayPayAPI;
 
 
-
 @end
 
 @implementation HJMyIntegralExchangePayViewController
@@ -95,8 +94,23 @@ FBAPIManagerInterceptor
     if (manager == self.WechatPayAPI)
     {
         id WechatPayData = [manager fetchDataWithBox:nil];
-        NSLog(@"%@",WechatPayData);
         
+        NSData *JSONData = [WechatPayData[@"data"][@"resultStr"] dataUsingEncoding:NSUTF8StringEncoding];
+        NSError *error = nil;
+        id jsonObject = [NSJSONSerialization JSONObjectWithData:JSONData options:NSJSONReadingAllowFragments error:&error];
+        
+        NSArray *jsonArray;
+        if ([jsonObject isKindOfClass:[NSArray class]])
+        {
+            jsonArray = (NSArray *)jsonObject;
+        }
+        if ([jsonArray[0] isKindOfClass:[NSDictionary class]])
+        {
+            NSDictionary *temDict = (NSDictionary *)jsonArray[0];
+            DDLogDebug(@"::::%@",temDict);
+            DDLogDebug(@"nonceStr::::%@",temDict[@"nonceStr"]);
+            [self WechatPay:temDict];
+        }
     }
     if (manager == self.AlipayPayAPI)
     {
@@ -217,7 +231,7 @@ FBAPIManagerInterceptor
 /* 微信支付 */
 - (void)WechatPay:(NSDictionary *)dict{
     
-    [[WechatPay shareWeChatPay] weixinPayOrderDict:@{} andPayResult:^(PayReultType reslutType) {
+    [[WechatPay shareWeChatPay] weixinPayOrderDict:dict andPayResult:^(PayReultType reslutType) {
 
         switch (reslutType)
         {

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑换记录支付/ViewController/HJMyIntegralExchangeRecordViewController.h

@@ -10,11 +10,18 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+@protocol HJMyIntegralExchangeRecordViewControllerDelegate <NSObject>
+
+- (void)requestDataForGiftHJExchangeOrActivity:(NSInteger)type;
+
+
+@end
 
 @interface HJMyIntegralExchangeRecordViewController : UIViewController
 
-//@property (nonatomic, copy)
-@property (nonatomic, assign) NSInteger        selectIndex;
+@property (nonatomic, weak) id<HJMyIntegralExchangeRecordViewControllerDelegate>delegate;
+
+@property (nonatomic, assign) NSInteger        selectIndex;//（0:好礼，1:活动的）
 
 @end
 

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑换记录支付/ViewController/HJMyIntegralExchangeRecordViewController.m

@@ -25,8 +25,7 @@ FBAPIManagerDelegate
 @property (nonatomic, strong) UIButton                *goSeeBtn;
 @property (nonatomic, strong) HJMyIntegralExchangeGiftRecordListAPI     *giftAPI;
 @property (nonatomic, strong) HJMyIntegralExchangeActivityRecordListAPI *activityAPI;
-@property (nonatomic, strong) HJMyIntegralExchangeRecordDataBox *dataBox;
-
+@property (nonatomic, strong) HJMyIntegralExchangeRecordDataBox         *dataBox;
 
 @end
 
@@ -38,8 +37,8 @@ FBAPIManagerDelegate
     self.navigationItem.title = @"兑换记录";
     [self initSubViews];
     [self requestDataForRecord];
-    
 }
+
 - (void)initSubViews {
     
     [self.view addSubview:self.headerView];
@@ -50,7 +49,6 @@ FBAPIManagerDelegate
        
         make.left.top.right.equalTo(self.view).offset(0);
         make.height.mas_equalTo(44);
-    
     }];
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
         
@@ -92,7 +90,6 @@ FBAPIManagerDelegate
 
 - (void)managerCallAPIDidSuccess:(FBBaseAPIManager *)manager {
     
-    [self.view dismissErrorView];
     NSArray *fechDataArray = [[manager fetchDataWithBox:nil] valueForKeyPath:@"data.mpMemberCompaignsAPIList"];
     if (fechDataArray.count == 0)
     {
@@ -104,17 +101,18 @@ FBAPIManagerDelegate
     }
     [self.tableView managerCallAPIDidSuccess:manager];
 }
+
 - (void)managerCallAPIDidFailed:(FBBaseAPIManager *)manager {
     
-    [self.view showErrorView];
     id fetchData = [manager fetchDataWithBox:self.dataBox];
+    
     if ([fetchData isKindOfClass:[NSString class]])
     {
         [self.view fb_showFailureWithStatus:fetchData];
     }
     [self.tableView managerCallAPIDidFailed:manager];
-
 }
+
 #pragma mark - UITableViewDelegate
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
@@ -137,7 +135,9 @@ FBAPIManagerDelegate
 
 - (void)goSeeButtonClicked:(UIButton *)btn {
     
+    [self.delegate requestDataForGiftHJExchangeOrActivity:self.selectIndex];
     [self.navigationController popViewControllerAnimated:YES];
+    
 }
 
 #pragma mark - setter and getter
@@ -166,7 +166,6 @@ FBAPIManagerDelegate
         //自定义空白页
         _tableView.blankView.imageView.image = [UIImage imageNamed:@"empty_Integralrecord"];
         _tableView.blankView.label.text = @"您还没有进行过积分兑换哦，\n 快去看看有什么好东西吧！";
-
     }
     return _tableView;
 }
@@ -179,12 +178,11 @@ FBAPIManagerDelegate
         _goSeeBtn.titleLabel.font = [UIFont systemFontOfSize:18];
         _goSeeBtn.layer.cornerRadius = 5;
         _goSeeBtn.layer.masksToBounds = YES;
+        _goSeeBtn.hidden = YES;
         [_goSeeBtn az_setGradientBackgroundWithColors:@[COLOR_GRADIENT_START,COLOR_GRADIENT_END] locations:@[@(0.0),@(1.0f)] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
         [_goSeeBtn addTarget:self action:@selector(goSeeButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
-               
     }
     return _goSeeBtn;
-    
 }
 - (HJMyIntegralExchangeGiftRecordListAPI *)giftAPI {
     

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑活动/APIManager/HJMyIntegralExchangeActivityDataBox.m

@@ -56,8 +56,10 @@
         cell = [[HJMyIntegralExchangeListCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:exchangeListCell];
     }
     [cell.exchangeBtn setTitle:@"立即兑换" forState:UIControlStateNormal];
+    
     NSDictionary *dict = [self.dataSource objectAtIndex:indexPath.row];
     HJMyIntegralExchangeActivityListModel *model = [HJMyIntegralExchangeActivityListModel yy_modelWithJSON:dict];
+    
     [cell.leftImageV sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",model.activityPic]]];
     cell.titleLabel.text = model.activityName;
     if (model.money)
@@ -77,6 +79,7 @@
     if ([model.attendActivityNum isEqualToString: model.activityNumber])
     {
         cell.timeLabel.text = @"名额已满";
+        cell.exchangeBtn.hidden = YES;
     }
     else
     {
@@ -88,11 +91,13 @@
         else if ([HJAppService timeSwitchTimestamp:time_now] > [HJAppService timeSwitchTimestamp:model.exchangeEndDate])
         {
             cell.timeLabel.text = @"兑换结束";
+            cell.exchangeBtn.hidden = YES;
         }
         else
         {
             [cell.exchangeBtn setTitle:@"立即报名" forState:UIControlStateNormal];
             cell.exchangeBtn.hidden = NO;
+            cell.timeLabel.text = @"";
         }
     }
 

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑活动/View/HJMyIntegralExchangeActivityDetailHeaderView.h

@@ -16,11 +16,20 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) UILabel *titleLabel;
 @property (nonatomic, strong) UILabel *integralLabel;
 @property (nonatomic, strong) UIView  *lineView;
+
+@property (nonatomic, strong) UILabel *peopleNumberTitle;
 @property (nonatomic, strong) UILabel *peopleNumberLabel;
+
+@property (nonatomic, strong) UILabel *exchangeTimeTitle;
 @property (nonatomic, strong) UILabel *exchangeTimeLabel;
+
+@property (nonatomic, strong) UILabel *activityTimeTitle;
 @property (nonatomic, strong) UILabel *activityTimeLabel;
+
+@property (nonatomic, strong) UILabel *activityAddressTitle;
 @property (nonatomic, strong) UILabel *activityAddressLabel;
 
+
 - (void)configureHJMyIntegralExchangeActivityDetailHeaderViewDict:(NSDictionary *)dict;
 
 @end

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑活动/View/HJMyIntegralExchangeActivityRecordDetailHeaderView.h

@@ -14,11 +14,24 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong) UIView  *bgView;
 @property (nonatomic, strong) UILabel *titleLabel;
+
+
+@property (nonatomic, strong) UILabel *exchangeTimeTitle;
 @property (nonatomic, strong) UILabel *exchangeTimeLabel;
+
 @property (nonatomic, strong) UILabel *stateLabel;
+
+@property (nonatomic, strong) UILabel *integralTitle;
 @property (nonatomic, strong) UILabel *integralLabel;
+
+@property (nonatomic, strong) UILabel *phoneTitle;
 @property (nonatomic, strong) UILabel *phoneLabel;
+
+@property (nonatomic, strong) UILabel *activityTimeTitle;
 @property (nonatomic, strong) UILabel *activityTimeLabel;
+
+
+@property (nonatomic, strong) UILabel *activityAddressTitle;
 @property (nonatomic, strong) UILabel *activityAddressLabel;
 
 - (void)configureHJMyIntegralExchangeActivityRecordDetailHeaderViewDict:(NSDictionary *)dict;

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑活动/ViewController/HJMyIntegralExchangeActivityDetailVC.m

@@ -13,7 +13,7 @@
 #import <WebKit/WebKit.h>
 #import "HJMyIntegralExchangeActivityDetailAPI.h"
 #import "HJMyIntegralExchangeActivityAPI.h"
-#import "HJMyIntegralExchangeActivityListModel.h"
+#import "HJMyIntegralExchangeActivityDetailModel.h"
 
 @interface HJMyIntegralExchangeActivityDetailVC ()
 <
@@ -37,6 +37,11 @@ FBAPIManagerInterceptor
 
 @implementation HJMyIntegralExchangeActivityDetailVC
 
+- (void)dealloc {
+    
+    [self.detailView.webView removeObserver:self forKeyPath:@"estimatedProgress"];
+}
+
 - (void)viewWillAppear:(BOOL)animated {
     
     [super viewWillAppear:animated];
@@ -120,13 +125,19 @@ FBAPIManagerInterceptor
     {
         self.detailDict = [manager fetchDataWithBox:nil];
         [self.headerView configureHJMyIntegralExchangeActivityDetailHeaderViewDict:self.detailDict];
+        HJMyIntegralExchangeActivityDetailModel *model = [HJMyIntegralExchangeActivityDetailModel yy_modelWithDictionary:self.detailDict[@"data"]];
+        if ([model.mpCompaignsActivitySettingAPI.activityNumber isEqualToString:model.mpCompaignsActivitySettingAPI.attendActivityNum])
+        {
+            self.exchangeBtn.enabled = NO;
+        }
+        
     }
     if (manager == self.exchangeActivityAPI)
     {
-        [self.view fb_showSuccessWithStatus:@"兑换成功"];
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5*NSEC_PER_SEC)),dispatch_get_main_queue(), ^{
+        [self.view fb_showSuccessWithStatus:@"报名成功"];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1*NSEC_PER_SEC)),dispatch_get_main_queue(), ^{
 
-            [self.detailAPI start];
+            [self.navigationController popViewControllerAnimated:YES];
             [[NSNotificationCenter defaultCenter] postNotificationName:HJIntegralChangeNotification object:nil];
         
         });
@@ -150,6 +161,7 @@ FBAPIManagerInterceptor
         [self.view fb_showFailureWithStatus:manager.errorMessage];
     }
 }
+
 #pragma mark - WKwebVIew代理
 
 -(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
@@ -255,7 +267,9 @@ FBAPIManagerInterceptor
         _exchangeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         _exchangeBtn.titleLabel.font = [UIFont boldSystemFontOfSize:17];
         [_exchangeBtn setBackgroundImage:[UIImage imageNamed:@"button_bg"] forState:UIControlStateNormal];
+        [_exchangeBtn setBackgroundImage:[UIImage imageNamed:@"button_bg_gray"] forState:UIControlStateDisabled];
         [_exchangeBtn setTitle:@"立即兑换" forState:UIControlStateNormal];
+        [_exchangeBtn setTitle:@"名额已满" forState:UIControlStateDisabled];
         [_exchangeBtn addTarget:self action:@selector(exchangeButtonClick:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _exchangeBtn;

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑活动/ViewController/HJMyIntegralExchangeActivityRecordDetailVC.m

@@ -30,6 +30,11 @@ FBAPIManagerInterceptor
 
 @implementation HJMyIntegralExchangeActivityRecordDetailVC
 
+- (void)dealloc {
+    
+    [self.detailView.webView removeObserver:self forKeyPath:@"estimatedProgress"];
+}
+
 - (void)viewDidLoad {
     
     [super viewDidLoad];

HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑活动/ViewController/HJMyIntegralExchangeActivityVC.m

@@ -11,6 +11,7 @@
 #import "HJMyIntegralExchangeActivityDetailVC.h"//活动详情
 #import "HJMyIntegralExchangeActivityListAPI.h"
 #import "HJMyIntegralExchangeActivityDataBox.h"
+#import "HJMyIntegralExchangeActivityListModel.h"
 
 
 @interface HJMyIntegralExchangeActivityVC ()
@@ -54,11 +55,10 @@ FBAPIManagerDelegate
         make.left.top.right.bottom.offset(0);
     }];
 }
+
 #pragma mark - FBPageableAPIManager
 
 - (void)managerCallAPIDidSuccess:(FBBaseAPIManager *)manager {
-    
-    [self.view dismissErrorView];
 
     if (manager == self.listAPI)
     {
@@ -66,8 +66,7 @@ FBAPIManagerDelegate
     }
 }
 - (void)managerCallAPIDidFailed:(FBBaseAPIManager *)manager {
-    
-    [self.view showErrorView];
+
     id fetchData = [manager fetchDataWithBox:self.dataBox];
     if ([fetchData isKindOfClass:[NSString class]])
     {

HappyJob/HappyJob/CClass/Me_我/wallet_我的钱包/View/HJMyWalletDetailCell.m

@@ -19,6 +19,7 @@
     
     if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])
     {
+        self.selectionStyle = UITableViewCellSelectionStyleNone;
         self.backgroundColor = [UIColor whiteColor];
         [self initSubViews];
     }

HappyJob/HappyJob/CClass/Me_我/wallet_我的钱包/ViewController/HJMyWalletDetailViewController.m

@@ -20,7 +20,6 @@ FBAPIManagerInterceptor
 >
 
 @property (nonatomic, strong) HJPageListView *tableView;
-
 @property (nonatomic, strong) HJMyWalletDetailListAPI *listAPI;
 @property (nonatomic, strong) HJMyWalletDataBox       *dataBox;
 
@@ -76,8 +75,6 @@ FBAPIManagerInterceptor
 
 - (void)managerCallAPIDidSuccess:(FBBaseAPIManager *)manager {
     
-    [self.view dismissErrorView];
-
     if (manager == self.listAPI)
     {
         [self.tableView managerCallAPIDidSuccess:manager];
@@ -85,7 +82,6 @@ FBAPIManagerInterceptor
 }
 - (void)managerCallAPIDidFailed:(FBBaseAPIManager *)manager {
     
-    [self.view showErrorView];
     id fetchData = [manager fetchDataWithBox:self.dataBox];
     if ([fetchData isKindOfClass:[NSString class]])
     {

HappyJob/HappyJob/CClass/Me_我/wallet_我的钱包/ViewController/HJMyWalletViewController.m

@@ -41,6 +41,9 @@ FBAPIManagerInterceptor
     [super viewWillAppear:animated];
     [self.navigationController setNavigationBarHidden:YES animated:animated];
     self.navigationController.interactivePopGestureRecognizer.delegate = self;
+    [self.view.errorView.refreshButton addTarget:self
+                                          action:@selector(refreshButtonClicked:)
+                                forControlEvents:UIControlEventTouchUpInside];
 }
 
 - (void)viewDidLoad {
@@ -80,6 +83,7 @@ FBAPIManagerInterceptor
     
     if (manager == self.walletAPI)
     {
+        [self.view dismissErrorView];
         id fetchData = [manager fetchDataWithBox:nil];
         if ([fetchData isKindOfClass:[NSDictionary class]])
         {
@@ -117,6 +121,11 @@ FBAPIManagerInterceptor
     
     FBAPIManagerErrorType type = manager.errorType;
     
+    if (manager == self.walletAPI)
+    {
+        NSLog(@"------------------");
+        [self.view showErrorView];
+    }
     if (type == FBAPIManagerErrorTypeNoContent)
     {
         id fetchData = [manager fetchDataWithBox:nil];
@@ -132,6 +141,11 @@ FBAPIManagerInterceptor
 }
 
 #pragma mark - event response
+/* 错误刷新 */
+- (void)refreshButtonClicked:(UIButton *)btn {
+    
+    [self.walletAPI start];
+}
 /* 返回 */
 - (void)backButtonClick:(UIButton *)btn {
     
@@ -147,8 +161,6 @@ FBAPIManagerInterceptor
 - (void)withdrawalButtonClick:(UIButton *)btn {
     
     [self.approveStatusAPI start];
-//    HJMyWalletWithdrawalViewController *vc = [[HJMyWalletWithdrawalViewController alloc]init];
-//    [self.navigationController pushViewController:vc animated:YES];
 }
 
 /* 好的*/

HappyJob/HappyJob/CClass/Me_我/wallet_我的钱包/ViewController/HJMyWalletWithdrawalViewController.m

@@ -45,7 +45,6 @@
        
         make.left.top.right.bottom.offset(0);
     }];
-    
 }
 
 #pragma mark - event response

HappyJob/HappyJob/Custom/Components/CustomControl/UIView/控制板/HJConfirmPanelInputView.m

@@ -23,6 +23,8 @@
         self.frame = [UIScreen mainScreen].bounds;
         self.backgroundColor = [UIColor colorFromHexString:@"000000" Alpha:0.5];
         [[[[UIApplication sharedApplication] delegate] window] addSubview:self];
+        UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(exitView)];
+        [self addGestureRecognizer:tap];
     }
     return self;
 }
@@ -70,7 +72,10 @@
     
 }
 #pragma mark - event response
-
+- (void)exitView {
+    
+     [self removeFromSuperview];
+}
 - (void)confirmButtonClick:(UIButton *)btn {
     
     [self removeFromSuperview];

HappyJob/HappyJob/Custom/Components/FBKit/Category/UIView/UIView+AZGradient.m

@@ -13,6 +13,7 @@
 
 
 + (Class)layerClass {
+    
     return [CAGradientLayer class];
 }
 

HappyJob/HappyJob/Custom/Components/FBKit/Category/UIView/UIView+FBProgressHUD.m

@@ -32,7 +32,7 @@
     [SVProgressHUD setBorderColor:COLOR_BACK3];
     [SVProgressHUD setDefaultStyle:SVProgressHUDStyleDark];
     [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];
-    [SVProgressHUD setInfoImage:[UIImage imageNamed:@""]];
+    [SVProgressHUD setInfoImage:[UIImage imageNamed:@"噢噢噢噢噢"]];
     [SVProgressHUD showInfoWithStatus:status];
     [SVProgressHUD dismissWithDelay:1.5 completion:completion];
     

HappyJob/HappyJob/Custom/Pay_支付/AlipayPay.m

@@ -35,6 +35,7 @@ static AlipayPay *_staticInterface = nil;
 }
 - (BOOL)aliProductInfo:(NSString *)productSubject andPayResult:(UnionPayResult)resultBlock {
     
+    NSLog(@"productSubject:::::%@",productSubject);
     // NOTE: 调用支付结果开始支付
     [[AlipaySDK defaultService] payOrder:productSubject fromScheme:@"AlipayHappyJob" callback:^(NSDictionary *resultDic) {
         

HappyJob/HappyJob/Custom/Pay_支付/WechatPay.m

@@ -38,25 +38,25 @@ static WechatPay *_staticInterface = nil;
     
     NSLog(@"orderDic::::%@",orderDic);
     _resultBlock = payResult;
-//    NSMutableString *stamp = [orderDic objectForKey:@"timestamp"];
-//    PayReq *req = [[PayReq alloc] init];
-//    req.openID = [orderDic objectForKey:@"appid"];;
-//    req.partnerId = [orderDic objectForKey:@"partnerid"];
-//    req.prepayId = [orderDic objectForKey:@"prepayid"];
-//    req.nonceStr = [orderDic objectForKey:@"noncestr"];
-//    req.timeStamp = stamp.intValue;
-//    req.package = [orderDic objectForKey:@"package"];
-//    req.sign = [orderDic objectForKey:@"sign"];
+    NSMutableString *stamp = [orderDic objectForKey:@"timeStamp"];
+    PayReq *req = [[PayReq alloc] init];
+    req.openID = [orderDic objectForKey:@"appId"];;
+    req.partnerId = [orderDic objectForKey:@"partnerid"];
+    req.prepayId = [orderDic objectForKey:@"prepayid"];
+    req.nonceStr = [orderDic objectForKey:@"nonceStr"];
+    req.timeStamp = stamp.intValue;
+    req.package = [orderDic objectForKey:@"package"];
+    req.sign = [orderDic objectForKey:@"sign"];
     
     
-    PayReq *req = [[PayReq alloc] init];
-    req.openID = @"wxc387c75c26b61b2a";
-    req.partnerId = @"1488030972";
-    req.prepayId = @"wx0510445732898508cd34aca81526299100";
-    req.nonceStr = @"iv67z3jx7xhg7oofek2rksimg6o0evh4";
-    req.timeStamp = 1572921894;
-    req.package =@"Sign=WXPay";
-    req.sign = @"8146B2DAEE98FAE8D52D8C70054F3B3C";
+//    PayReq *req = [[PayReq alloc] init];
+//    req.openID = @"wxc387c75c26b61b2a";
+//    req.partnerId = @"1488030972";
+//    req.prepayId = @"wx0510445732898508cd34aca81526299100";
+//    req.nonceStr = @"iv67z3jx7xhg7oofek2rksimg6o0evh4";
+//    req.timeStamp = 1572921894;
+//    req.package =@"Sign=WXPay";
+//    req.sign = @"8146B2DAEE98FAE8D52D8C70054F3B3C";
     
     BOOL isSucceed = [WXApi sendReq:req];
     

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

@@ -13,7 +13,6 @@
 
 @interface HJLoginUserAgreementViewController ()<WKUIDelegate>
 
-//@property (nonatomic, strong) UIWebView *webView;
 @property (nonatomic, strong) WKWebView *webView;
 
 @end

HappyJob/HappyJob/Support/HJAppService.h

@@ -20,6 +20,7 @@ typedef enum _TimeStampType {
     kTimeStampDateOnlySlashLine,
     kTimeStampDateOnlyMonthDay,
     kTimeStampDateOnlyHMS,
+    kTimeStampDateOnlyyMdHM,
     
 }TimeStampType;
 

HappyJob/HappyJob/Support/HJAppService.m

@@ -104,6 +104,9 @@
             break;
             case kTimeStampDateOnlyHMS:
             [dateFormat setDateFormat:@"HH:mm:ss" ];
+            case kTimeStampDateOnlyyMdHM:
+            [dateFormat setDateFormat:@"yyyy-MM-dd HH:mm"];
+            
             break;
             
         default:
@@ -218,6 +221,7 @@
         return [string stringByAppendingString:@".00"];
     }
 }
+
 #pragma mark - 压缩图片
 + (void)compressedImageFiles:(UIImage *)image
                      imageKB:(CGFloat)fImageKBytes

HappyJob/HappyJob/Support/HJConfig.h

@@ -28,14 +28,12 @@
 //#endif
 
 
-/******** 测试服接口地址 ********/
+/* ---- 测试服接口地址 ------*/
 static NSString * const kHJBaseURL = @"https://kf.hap-job.com/happyjob/f/api/";
 static NSString * const kBuglyAppID = @"d3e4636207";
 static NSString * const kWeiXinAPIKey = @"wx9c053f7126db0b28";
-//static NSString * const kWeiXinAPIKey = @"wxc387c75c26b61b2a";
-// wxc387c75c26b61b2a
 
-/******** 正式服接口地址 ********/
+/* ------ 正式服接口地址 -------*/
 //static NSString * const kHJBaseURL = @"https://web.hap-job.com/happyjob/f/api/";
 // /* Bugly开放平台AppID，注册地址：https://bugly.qq.com */
 //static NSString * const kBuglyAppID = @"b532795704";