bug修改

HappyWork/HappyWork.xcodeproj/project.pbxproj

@@ -1707,7 +1707,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 6TLH64Q4Z4;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/HappyWork/Support/HappyWork.pch";
 				INFOPLIST_FILE = HappyWork/Info.plist;
@@ -1729,7 +1729,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 6TLH64Q4Z4;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/HappyWork/Support/HappyWork.pch";
 				INFOPLIST_FILE = HappyWork/Info.plist;

HappyWork/HappyWork/API/AFHttpTool/HWAFHttpTool.m

@@ -112,7 +112,7 @@ static AFHTTPSessionManager *Photomanager;
         NSDictionary *jsonDic = [NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves error:nil];
         if (success)
         {
-            NSLog(@"参数:%@\nURL:%@ \ndata:%@",params,newPath,jsonDic);
+//            NSLog(@"参数:%@\nURL:%@ \ndata:%@",params,newPath,jsonDic);
             success(jsonDic);
         }
 
@@ -252,8 +252,6 @@ static AFHTTPSessionManager *Photomanager;
     UIImage * compressImg = [self imageWithImageSimple:successImage scaledToSize:CGSizeMake(imgWidth, imgHieght)];
     
     NSLog(@"原本尺寸:(%f,%f)   裁剪尺寸:(%f,%f)",successImage.size.width,successImage.size.height,imgWidth,imgHieght);
-    
-    
     NSData *data;
     if(UIImagePNGRepresentation(compressImg) == nil)
     {

HappyWork/HappyWork/Class/DemandHall/Menu_筛选视图/DemanHallMenuFilterView.m

@@ -60,8 +60,7 @@ DemanHallPriceViewDelegate
     [self.addressBtn mas_makeConstraints:^(MASConstraintMaker *make) {
 
         make.left.equalTo(self.mas_left).offset(20);
-        make.top.equalTo(self.mas_top).offset(15);
-        make.bottom.equalTo(self.mas_bottom).offset(-15);
+        make.centerY.equalTo(self);
         make.width.mas_lessThanOrEqualTo(SCREEN_WIDTH/2);
     }];
     [self.industryBtn mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -74,6 +73,16 @@ DemanHallPriceViewDelegate
         make.right.equalTo(self.mas_right).offset(-20);
         make.centerY.equalTo(self.addressBtn);
     }];
+    
+    
+    self.addressBtn.contentEdgeInsets = UIEdgeInsetsMake(5, 10, 5, 10);
+    self.industryBtn.contentEdgeInsets = UIEdgeInsetsMake(5, 10, 5, 10);
+    self.priceBtn.contentEdgeInsets = UIEdgeInsetsMake(5, 10, 5, 10);
+    
+    [self.addressBtn layoutButtonWithEdgeInsetsStyle:MKButtonEdgeInsetsStyleRight imageTitleSpace:5];
+    [self.industryBtn layoutButtonWithEdgeInsetsStyle:MKButtonEdgeInsetsStyleRight imageTitleSpace:5];
+    [self.priceBtn layoutButtonWithEdgeInsetsStyle:MKButtonEdgeInsetsStyleRight imageTitleSpace:5];
+    
 }
 
 #pragma mark - DemanHallAddressViewControllerDelegate
@@ -239,8 +248,6 @@ DemanHallPriceViewDelegate
         [_addressBtn addTarget:self action:@selector(addressButtonClick:) forControlEvents:UIControlEventTouchUpInside];
         [_addressBtn setTitle:@"全部区域" forState:UIControlStateNormal];
         [_addressBtn setImage:[UIImage imageNamed:@"fill_black_top"] forState:UIControlStateNormal];
-        [_addressBtn layoutButtonWithEdgeInsetsStyle:MKButtonEdgeInsetsStyleRight imageTitleSpace:15];
-        _addressBtn.contentEdgeInsets = UIEdgeInsetsMake(5, 10, 5, 10);
     }
     return _addressBtn;
 }
@@ -259,8 +266,6 @@ DemanHallPriceViewDelegate
         _industryBtn.layer.masksToBounds = YES;
         [_industryBtn setImage:[UIImage imageNamed:@"empty_black_top"] forState:UIControlStateNormal];
         [_industryBtn setImage:[UIImage imageNamed:@"empty_blue_down"]  forState:UIControlStateSelected];
-        [_industryBtn layoutButtonWithEdgeInsetsStyle:MKButtonEdgeInsetsStyleRight imageTitleSpace:15];
-        _industryBtn.contentEdgeInsets = UIEdgeInsetsMake(5, 10, 5, 10);
         [_industryBtn addTarget:self action:@selector(industryButtonClick:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _industryBtn;
@@ -280,8 +285,6 @@ DemanHallPriceViewDelegate
         _priceBtn.layer.masksToBounds = YES;
         [_priceBtn setImage:[UIImage imageNamed:@"empty_black_top"] forState:UIControlStateNormal];
         [_priceBtn setImage:[UIImage imageNamed:@"empty_blue_down"]  forState:UIControlStateSelected];
-        [_priceBtn layoutButtonWithEdgeInsetsStyle:MKButtonEdgeInsetsStyleRight imageTitleSpace:15];
-        _priceBtn.contentEdgeInsets = UIEdgeInsetsMake(5, 10, 5, 10);
         [_priceBtn addTarget:self action:@selector(priceButtonClick:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _priceBtn;

HappyWork/HappyWork/Class/DemandHall/ViewController/DemanHallViewController.m

@@ -166,10 +166,15 @@ DemanHallMenuFilterViewDelegate
 }
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     
-    DemanHallDetailViewController *detail = [[DemanHallDetailViewController alloc]init];
-    detail.hwRequirementId = self.viewModel.listArray[indexPath.row][@"id"];
-    [self.navigationController pushViewController:detail animated:YES];
-    
+    if (indexPath.section == 1)
+    {
+        if (self.viewModel.listArray.count > 0 )
+        {
+            DemanHallDetailViewController *detail = [[DemanHallDetailViewController alloc]init];
+            detail.hwRequirementId = self.viewModel.listArray[indexPath.row][@"id"];
+            [self.navigationController pushViewController:detail animated:YES];
+        }
+    }
 }
 
 #pragma mark - DemanHallMenuFilterViewDelegate

HappyWork/HappyWork/Class/DemandHall/Views/Cell/DemanHallEmptyCell.m

@@ -25,6 +25,7 @@
     
     if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])
     {
+        self.selectionStyle = UITableViewCellSelectionStyleNone;
         self.contentView.backgroundColor = COLOR_GRAY_F5;
         [self.contentView addSubview:self.iconImageV];
         [self.contentView addSubview:self.detalLabel];

HappyWork/HappyWork/Class/DemandHall/Views/View/HWUpdateView.m

@@ -139,9 +139,11 @@
     [self removeViewFromWindow];
 }
 - (void)doneButtonClick:(UIButton *)btn {
-    
+    //id1486993619，id1068849473，id1094134712
+    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"https://itunes.apple.com/cn/app/id1486993619?mt=8"]];
     
 }
+
 #pragma mark - setter and getter
 
 - (UIView *)bigView {

HappyWork/HappyWork/Class/PersonalCenter/View/PersonalCenterHeaderCell.m

@@ -74,7 +74,8 @@
     if (_headerBtn == nil)
     {
         _headerBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_headerBtn setBackgroundImage:[UIImage imageNamed:@"personalCenter_icon"] forState:UIControlStateNormal];
+//        [_headerBtn setBackgroundImage:[UIImage imageNamed:@"personalCenter_icon"] forState:UIControlStateNormal];
+        [_headerBtn setImage:[UIImage imageNamed:@"personalCenter_icon"] forState:UIControlStateNormal];
         _headerBtn.imageView.contentMode = UIViewContentModeScaleAspectFill;
         _headerBtn.imageView.clipsToBounds = YES;
     }

HappyWork/HappyWork/Class/PersonalCenter/ViewModel/PersonalCenterViewModel.m

@@ -109,7 +109,8 @@
         PersonalCenterModel *model = [PersonalCenterModel mj_objectWithKeyValues:self.userDict];
         
         cell.nameLabel.text = model.name;
-        [cell.headerBtn sd_setBackgroundImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",model.avatar]] forState:(UIControlState)UIControlStateNormal placeholderImage:[UIImage imageNamed:@"personalCenter_icon"]];
+//        [cell.headerBtn sd_setBackgroundImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",model.avatar]] forState:(UIControlState)UIControlStateNormal placeholderImage:[UIImage imageNamed:@"personalCenter_icon"]];
+        [cell.headerBtn sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",model.avatar]] forState:(UIControlState)UIControlStateNormal placeholderImage:[UIImage imageNamed:@"personalCenter_icon"]];
         return cell;
     }
     else

HappyWork/HappyWork/Class/PersonalCenter/我的报名_signup/ViewModel/MySignUpViewModel.m

@@ -90,6 +90,7 @@
     
     if ([model.hwRequirement.isOn integerValue] == 1)
     {
+        cell.moneylabel.textColor = COLOR_BLUE_32;
         if (model.orderNumber)
         {
             cell.stateView.iconImageV.image = [UIImage imageNamed:@"my_signup_generated"];
@@ -111,6 +112,7 @@
         cell.stateView.taglabel.text = @"已下架";
         cell.stateView.taglabel.textColor = COLOR_GRAY_88;
         cell.stateView.backgroundColor = COLOR_GRAY_F5;
+        cell.moneylabel.textColor = COLOR_BACK_31;
     }
     return cell;
 }

HappyWork/HappyWork/Support/HWConfig.h

@@ -10,11 +10,12 @@
 #ifndef HWConfig_h
 #define HWConfig_h
 
-/**  ******* 测试服接口地址 ***********/
-static NSString * const kHWBaseURL = @"https://hw.hap-job.com/happy-boot";
+/** ******* 测试服接口地址 *************/
+//static NSString * const kHWBaseURL = @"https://hw.hap-job.com/happy-boot";
 
 
 /** ******* 正试服接口地址 *******/
 
+static NSString * const kHWBaseURL = @"https://www.dal-pay.com/happy-boot";
 
 #endif /* HWConfig_h */