bug修改

HappyWork/HappyWork.xcodeproj/project.pbxproj

@@ -73,8 +73,8 @@
 		7138289B23385161007256F4 /* TaxCertificateView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7138289A23385161007256F4 /* TaxCertificateView.m */; };
 		713828BD2338AE07007256F4 /* HJBlankView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713828B02338AE07007256F4 /* HJBlankView.m */; };
 		713828BE2338AE07007256F4 /* HJErrorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713828B32338AE07007256F4 /* HJErrorView.m */; };
-		713828BF2338AE07007256F4 /* HJRefreshHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713828B62338AE07007256F4 /* HJRefreshHeaderView.m */; };
-		713828C02338AE07007256F4 /* HJRefreshFooterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713828B92338AE07007256F4 /* HJRefreshFooterView.m */; };
+		713828BF2338AE07007256F4 /* HWRefreshHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713828B62338AE07007256F4 /* HWRefreshHeaderView.m */; };
+		713828C02338AE07007256F4 /* HWRefreshFooterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713828B92338AE07007256F4 /* HWRefreshFooterView.m */; };
 		713828C12338AE07007256F4 /* HJLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713828BC2338AE07007256F4 /* HJLoadingView.m */; };
 		713828C42338B704007256F4 /* UIView+HJLoadingViewAndErrorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713828C32338B704007256F4 /* UIView+HJLoadingViewAndErrorView.m */; };
 		713828C72338BA63007256F4 /* DemanHallBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713828C62338BA63007256F4 /* DemanHallBannerView.m */; };
@@ -94,8 +94,9 @@
 		7138290C2339F324007256F4 /* HWAppUserProfile.m in Sources */ = {isa = PBXBuildFile; fileRef = 7138290B2339F324007256F4 /* HWAppUserProfile.m */; };
 		71382910233A1B09007256F4 /* HWAFHttpTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 7138290F233A1B09007256F4 /* HWAFHttpTool.m */; };
 		71382916233A1E30007256F4 /* HWProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 71382915233A1E30007256F4 /* HWProgressHUD.m */; };
+		713DE88323715A3200E0E5EA /* DemanHallEmptyCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 713DE88223715A3200E0E5EA /* DemanHallEmptyCell.m */; };
 		71A3B090234C135E004D73A5 /* MySignUpDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71A3B08F234C135E004D73A5 /* MySignUpDetailViewController.m */; };
-		71A3B094234D6CB4004D73A5 /* DemanHallHighlightsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71A3B093234D6CB4004D73A5 /* DemanHallHighlightsView.m */; };
+		71A3B094234D6CB4004D73A5 /* DemanHallDetailSignUpView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71A3B093234D6CB4004D73A5 /* DemanHallDetailSignUpView.m */; };
 		71A3B097234D94F6004D73A5 /* DemanHallModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 71A3B096234D94F6004D73A5 /* DemanHallModel.m */; };
 		71A3B09A234D9D3B004D73A5 /* PersonalCenterModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 71A3B099234D9D3B004D73A5 /* PersonalCenterModel.m */; };
 		71A3B09D234DC6B7004D73A5 /* MyOrderDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71A3B09C234DC6B7004D73A5 /* MyOrderDetailViewController.m */; };
@@ -258,10 +259,10 @@
 		713828B12338AE07007256F4 /* HJBlankView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HJBlankView.h; sourceTree = "<group>"; };
 		713828B32338AE07007256F4 /* HJErrorView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HJErrorView.m; sourceTree = "<group>"; };
 		713828B42338AE07007256F4 /* HJErrorView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HJErrorView.h; sourceTree = "<group>"; };
-		713828B62338AE07007256F4 /* HJRefreshHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HJRefreshHeaderView.m; sourceTree = "<group>"; };
-		713828B72338AE07007256F4 /* HJRefreshFooterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HJRefreshFooterView.h; sourceTree = "<group>"; };
-		713828B82338AE07007256F4 /* HJRefreshHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HJRefreshHeaderView.h; sourceTree = "<group>"; };
-		713828B92338AE07007256F4 /* HJRefreshFooterView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HJRefreshFooterView.m; sourceTree = "<group>"; };
+		713828B62338AE07007256F4 /* HWRefreshHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HWRefreshHeaderView.m; sourceTree = "<group>"; };
+		713828B72338AE07007256F4 /* HWRefreshFooterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HWRefreshFooterView.h; sourceTree = "<group>"; };
+		713828B82338AE07007256F4 /* HWRefreshHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HWRefreshHeaderView.h; sourceTree = "<group>"; };
+		713828B92338AE07007256F4 /* HWRefreshFooterView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HWRefreshFooterView.m; sourceTree = "<group>"; };
 		713828BB2338AE07007256F4 /* HJLoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HJLoadingView.h; sourceTree = "<group>"; };
 		713828BC2338AE07007256F4 /* HJLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HJLoadingView.m; sourceTree = "<group>"; };
 		713828C22338B704007256F4 /* UIView+HJLoadingViewAndErrorView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+HJLoadingViewAndErrorView.h"; sourceTree = "<group>"; };
@@ -301,11 +302,13 @@
 		7138290F233A1B09007256F4 /* HWAFHttpTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HWAFHttpTool.m; sourceTree = "<group>"; };
 		71382914233A1E30007256F4 /* HWProgressHUD.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HWProgressHUD.h; sourceTree = "<group>"; };
 		71382915233A1E30007256F4 /* HWProgressHUD.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HWProgressHUD.m; sourceTree = "<group>"; };
+		713DE88123715A3200E0E5EA /* DemanHallEmptyCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DemanHallEmptyCell.h; sourceTree = "<group>"; };
+		713DE88223715A3200E0E5EA /* DemanHallEmptyCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DemanHallEmptyCell.m; sourceTree = "<group>"; };
 		71A3B08E234C135E004D73A5 /* MySignUpDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MySignUpDetailViewController.h; sourceTree = "<group>"; };
 		71A3B08F234C135E004D73A5 /* MySignUpDetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MySignUpDetailViewController.m; sourceTree = "<group>"; };
 		71A3B091234D62C9004D73A5 /* HWAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HWAPI.h; sourceTree = "<group>"; };
-		71A3B092234D6CB4004D73A5 /* DemanHallHighlightsView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DemanHallHighlightsView.h; sourceTree = "<group>"; };
-		71A3B093234D6CB4004D73A5 /* DemanHallHighlightsView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DemanHallHighlightsView.m; sourceTree = "<group>"; };
+		71A3B092234D6CB4004D73A5 /* DemanHallDetailSignUpView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DemanHallDetailSignUpView.h; sourceTree = "<group>"; };
+		71A3B093234D6CB4004D73A5 /* DemanHallDetailSignUpView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DemanHallDetailSignUpView.m; sourceTree = "<group>"; };
 		71A3B095234D94F6004D73A5 /* DemanHallModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DemanHallModel.h; sourceTree = "<group>"; };
 		71A3B096234D94F6004D73A5 /* DemanHallModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DemanHallModel.m; sourceTree = "<group>"; };
 		71A3B098234D9D3B004D73A5 /* PersonalCenterModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PersonalCenterModel.h; sourceTree = "<group>"; };
@@ -599,6 +602,8 @@
 				713828362336065F007256F4 /* DemanHallBannerCell.m */,
 				712AF7162333567C00EBD542 /* DemanHallCell.h */,
 				712AF7172333567C00EBD542 /* DemanHallCell.m */,
+				713DE88123715A3200E0E5EA /* DemanHallEmptyCell.h */,
+				713DE88223715A3200E0E5EA /* DemanHallEmptyCell.m */,
 				712AF71B2333579300EBD542 /* DemanHallTagView.h */,
 				712AF71C2333579300EBD542 /* DemanHallTagView.m */,
 			);
@@ -897,8 +902,8 @@
 				712AF7602334740300EBD542 /* DemanHallDetailCompanyView.m */,
 				712AF7622334747200EBD542 /* DemanHallDetailPositionView.h */,
 				712AF7632334747200EBD542 /* DemanHallDetailPositionView.m */,
-				71A3B092234D6CB4004D73A5 /* DemanHallHighlightsView.h */,
-				71A3B093234D6CB4004D73A5 /* DemanHallHighlightsView.m */,
+				71A3B092234D6CB4004D73A5 /* DemanHallDetailSignUpView.h */,
+				71A3B093234D6CB4004D73A5 /* DemanHallDetailSignUpView.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -954,10 +959,10 @@
 		713828B52338AE07007256F4 /* Refresh_上拉下拉刷新 */ = {
 			isa = PBXGroup;
 			children = (
-				713828B82338AE07007256F4 /* HJRefreshHeaderView.h */,
-				713828B62338AE07007256F4 /* HJRefreshHeaderView.m */,
-				713828B72338AE07007256F4 /* HJRefreshFooterView.h */,
-				713828B92338AE07007256F4 /* HJRefreshFooterView.m */,
+				713828B82338AE07007256F4 /* HWRefreshHeaderView.h */,
+				713828B62338AE07007256F4 /* HWRefreshHeaderView.m */,
+				713828B72338AE07007256F4 /* HWRefreshFooterView.h */,
+				713828B92338AE07007256F4 /* HWRefreshFooterView.m */,
 			);
 			path = "Refresh_上拉下拉刷新";
 			sourceTree = "<group>";
@@ -1454,10 +1459,11 @@
 				7137309B233CA9C100AF5F8E /* PageBaseViewModel.m in Sources */,
 				712AF6F92333124400EBD542 /* UIImage+FitSize.m in Sources */,
 				712AF705233312FA00EBD542 /* UIView+FBProgressHUD.m in Sources */,
+				713DE88323715A3200E0E5EA /* DemanHallEmptyCell.m in Sources */,
 				712AF6F52333124400EBD542 /* NSSet+HYBUnicodeReadable.m in Sources */,
 				7138287F23366600007256F4 /* RegisterUserViewController.m in Sources */,
 				713828EC2339C1C9007256F4 /* DemanHallMenuFilterView.m in Sources */,
-				71A3B094234D6CB4004D73A5 /* DemanHallHighlightsView.m in Sources */,
+				71A3B094234D6CB4004D73A5 /* DemanHallDetailSignUpView.m in Sources */,
 				712AF7722334A35000EBD542 /* SetViewController.m in Sources */,
 				712AF7332333739A00EBD542 /* DemanhallAddressAreaView.m in Sources */,
 				712AF706233312FA00EBD542 /* UIView+AZGradient.m in Sources */,
@@ -1473,7 +1479,7 @@
 				713828C42338B704007256F4 /* UIView+HJLoadingViewAndErrorView.m in Sources */,
 				712AF7752334A40400EBD542 /* SetCell.m in Sources */,
 				713828C72338BA63007256F4 /* DemanHallBannerView.m in Sources */,
-				713828BF2338AE07007256F4 /* HJRefreshHeaderView.m in Sources */,
+				713828BF2338AE07007256F4 /* HWRefreshHeaderView.m in Sources */,
 				713828D92339B9C1007256F4 /* MySignUpViewModel.m in Sources */,
 				713828F42339E443007256F4 /* PersonalCenterViewModel.m in Sources */,
 				712AF7A02335B3FA00EBD542 /* PaymentRecordDetailView.m in Sources */,
@@ -1506,7 +1512,7 @@
 				712AF7472334660B00EBD542 /* DemanHallPriceCell.m in Sources */,
 				71A3B0A7234DD9F0004D73A5 /* PaymentRecordModel.m in Sources */,
 				712AF6F62333124400EBD542 /* MyLog.m in Sources */,
-				713828C02338AE07007256F4 /* HJRefreshFooterView.m in Sources */,
+				713828C02338AE07007256F4 /* HWRefreshFooterView.m in Sources */,
 				713829022339E964007256F4 /* ValuePickerView.m in Sources */,
 				71FA53E52330C6780007094A /* main.m in Sources */,
 				712AF6FA2333124400EBD542 /* UIColor+Palette.m in Sources */,

HappyWork/HappyWork/Assets.xcassets/DemanHall/demanhall_empty.imageset/Contents.json

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

HappyWork/HappyWork/Base/PageListViewController.h

@@ -7,8 +7,8 @@
 //
 
 #import "BaseViewController.h"
-#import "HJRefreshHeaderView.h"
-#import "HJRefreshFooterView.h"
+#import "HWRefreshHeaderView.h"
+#import "HWRefreshFooterView.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -17,8 +17,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, assign) NSInteger   currentPage;//页数
 @property (nonatomic, strong) NSMutableDictionary *parametersDict;//参数字典
-@property (nonatomic, strong) HJRefreshHeaderView *refreshHeader;//头部刷新
-@property (nonatomic, strong) HJRefreshFooterView *refreshFooter;//尾部刷新
+@property (nonatomic, strong) HWRefreshHeaderView *refreshHeader;//头部刷新
+@property (nonatomic, strong) HWRefreshFooterView *refreshFooter;//尾部刷新
 @property (nonatomic, assign) BOOL  firstLoading;//是否是第一次加载
 @property (nonatomic, assign) BOOL  lastPage;//是否是最后一页
 

HappyWork/HappyWork/Base/PageListViewController.m

@@ -138,20 +138,20 @@
     return _tableView;
 }
 
-- (HJRefreshHeaderView *)refreshHeader {
+- (HWRefreshHeaderView *)refreshHeader {
     
     if (_refreshHeader == nil)
     {
-        _refreshHeader = [HJRefreshHeaderView headerWithRefreshingTarget:self refreshingAction:@selector(loadNewData)];
+        _refreshHeader = [HWRefreshHeaderView headerWithRefreshingTarget:self refreshingAction:@selector(loadNewData)];
     }
     return _refreshHeader;
 }
 
-- (HJRefreshFooterView *)refreshFooter {
+- (HWRefreshFooterView *)refreshFooter {
     
     if (_refreshFooter == nil)
     {
-        _refreshFooter = [HJRefreshFooterView footerWithRefreshingTarget:self refreshingAction:@selector(loadMoreData)];
+        _refreshFooter = [HWRefreshFooterView footerWithRefreshingTarget:self refreshingAction:@selector(loadMoreData)];
     }
     return _refreshFooter;
 }

HappyWork/HappyWork/Class/DemandHall/DemanHall_详情/View/DemanHallDetailCompanyView.m

@@ -14,7 +14,8 @@
 @property (nonatomic, strong) UIView      *bgView;
 @property (nonatomic, strong) UIImageView *iconImageV;
 @property (nonatomic, strong) UILabel     *companyLabel;
-@property (nonatomic, strong) UIButton    *addressBtn;
+@property (nonatomic, strong) UIImageView *addressIcon;
+@property (nonatomic, strong) UILabel     *addressLabel;
 
 @end
 
@@ -34,7 +35,8 @@
     [self addSubview:self.bgView];
     [self.bgView addSubview:self.companyLabel];
     [self.bgView addSubview:self.iconImageV];
-    [self.bgView addSubview:self.addressBtn];
+    [self.bgView addSubview:self.addressIcon];
+    [self.bgView addSubview:self.addressLabel];
     
     [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.mas_top).offset(0);
@@ -45,19 +47,27 @@
     [self.iconImageV mas_makeConstraints:^(MASConstraintMaker *make) {
         
         make.left.equalTo(self.bgView.mas_left).offset(20);
-        make.top.equalTo(self.bgView.mas_top).offset(17);
-        make.bottom.equalTo(self.bgView.mas_bottom).offset(-17);
-//        make.size.mas_offset(CGSizeMake(40, 40));
+        make.centerY.equalTo(self.bgView);
+        make.size.mas_offset(CGSizeMake(40, 40));
     }];
     [self.companyLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        
         make.left.equalTo(self.iconImageV.mas_right).offset(20);
-        make.top.equalTo(self.iconImageV.mas_top).offset(0);
-//        make.right.equalTo(self.bgView.mas_right).offset(-10);
+        make.top.equalTo(self.bgView.mas_top).offset(15);
+        make.right.equalTo(self.bgView.mas_right).offset(-10);
     }];
-    [self.addressBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+    [self.addressIcon mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.iconImageV.mas_right).offset(20);
-        make.bottom.equalTo(self.iconImageV.mas_bottom).offset(0);
-//        make.right.equalTo(self.bgView.mas_right).offset(-10);
+        make.top.equalTo(self.companyLabel.mas_bottom).offset(8);
+        make.size.mas_offset(CGSizeMake(9, 11));
+    }];
+    
+    [self.addressLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.left.equalTo(self.addressIcon.mas_right).offset(5);
+        make.top.equalTo(self.addressIcon.mas_top).offset(-2);
+        make.right.equalTo(self.bgView.mas_right).offset(-10);
+        make.bottom.equalTo(self.bgView.mas_bottom).offset(-15);
     }];
 
 }
@@ -65,9 +75,10 @@
     
     DemanHallModel *model = [DemanHallModel mj_objectWithKeyValues:dict];
     self.companyLabel.text = model.companyName;
-    [self.addressBtn setTitle:[NSString stringWithFormat:@"%@ %@",model.provinceCityCountry,model.address] forState:UIControlStateNormal];
-    
+    self.addressLabel.text = [NSString stringWithFormat:@"%@ %@",model.provinceCityCountry,model.address ? model.address :@""];
+
 }
+
 #pragma mark - setter and getter
 
 - (UIView *)bgView {
@@ -98,18 +109,25 @@
     }
     return _companyLabel;
 }
-
-- (UIButton *)addressBtn {
+- (UIImageView *)addressIcon {
+    
+    if (_addressIcon == nil)
+    {
+        _addressIcon = [[UIImageView alloc]init];
+        _addressIcon.image = [UIImage imageNamed:@"demanHall_detail_address"];
+    }
+    return _addressIcon;
+}
+- (UILabel *)addressLabel {
     
-    if (_addressBtn == nil)
+    if (_addressLabel == nil)
     {
-        _addressBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        _addressBtn.titleLabel.font = [UIFont systemFontOfSize:13];
-        [_addressBtn setTitleColor:COLOR_GRAY_88 forState:UIControlStateNormal];
-        [_addressBtn setImage:[UIImage imageNamed:@"demanHall_detail_address"] forState:UIControlStateNormal];
-        [_addressBtn layoutButtonWithEdgeInsetsStyle:MKButtonEdgeInsetsStyleLeft imageTitleSpace:5];
+        _addressLabel = [[UILabel alloc]init];
+        _addressLabel.font = [UIFont systemFontOfSize:13];
+        _addressLabel.textColor = COLOR_GRAY_88;
+        _addressLabel.numberOfLines = 0;
     }
-    return _addressBtn;
+    return _addressLabel;
 }
 
 @end

HappyWork/HappyWork/Class/DemandHall/DemanHall_详情/View/DemanHallDetailHeaderView.m

@@ -11,7 +11,7 @@
 
 @interface DemanHallDetailHeaderView ()
 
-@property (nonatomic, strong) UIView  *bgView;
+@property (nonatomic, strong) UIView   *bgView;
 @property (nonatomic, strong) UILabel  *titleLabel;
 @property (nonatomic, strong) UILabel  *moneylabel;
 @property (nonatomic, strong) UIButton *timeBtn;
@@ -96,6 +96,7 @@
 }
 
 #pragma mark - setter and getter
+
 - (UIView *)bgView {
     
     if (_bgView == nil)

HappyWork/HappyWork/Class/DemandHall/DemanHall_详情/View/DemanHallDetailPositionView.m

@@ -36,6 +36,7 @@
 - (void)demanHallDetailPositionViewDict:(NSDictionary *)dict {
     
     DemanHallModel *model = [DemanHallModel mj_objectWithKeyValues:dict];
+    
     NSString *str;
     if (model.descriptionStr)
     {

HappyWork/HappyWork/Class/DemandHall/DemanHall_详情/View/DemanHallHighlightsView.h

@@ -10,12 +10,12 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface DemanHallHighlightsView : UIView
+@interface DemanHallDetailSignUpView : UIView
 
 @property (nonatomic, strong) UITextView *textView;
 @property (nonatomic, strong) UIButton   *doneBtn;
 
-- (void)showDemanHallHighlightsView;
+- (void)showDemanHallDetailSignUpView;
 
 @end
 

HappyWork/HappyWork/Class/DemandHall/DemanHall_详情/View/DemanHallHighlightsView.m

@@ -6,9 +6,9 @@
 //  Copyright © 2019 张晓光. All rights reserved.
 //
 
-#import "DemanHallHighlightsView.h"
+#import "DemanHallDetailSignUpView.h"
 
-@interface DemanHallHighlightsView ()<UITextViewDelegate>
+@interface DemanHallDetailSignUpView ()<UITextViewDelegate>
 
 @property (nonatomic, strong) UIView     *bgView;
 @property (nonatomic, strong) UILabel    *titleLabel;
@@ -20,7 +20,7 @@
 
 @end
 
-@implementation DemanHallHighlightsView
+@implementation DemanHallDetailSignUpView
 
 - (instancetype)initWithFrame:(CGRect)frame {
     
@@ -32,7 +32,7 @@
     }
     return self;
 }
-- (void)showDemanHallHighlightsView {
+- (void)showDemanHallDetailSignUpView {
     
     [self initSubViews];
 }
@@ -107,6 +107,7 @@
     }];
     
 }
+
 #pragma mark - UITextViewDelegate
 
 - (void)textViewDidChange:(UITextView *)textView {
@@ -131,6 +132,7 @@
     
     [self removeFromSuperview];
 }
+
 #pragma mark - setter and getter
 
 - (UIView *)bgView {

HappyWork/HappyWork/Class/DemandHall/DemanHall_详情/ViewController/DemanHallDetailViewController.m

@@ -11,12 +11,11 @@
 #import "DemanHallDetailHeaderView.h"
 #import "DemanHallDetailCompanyView.h"
 #import "DemanHallDetailPositionView.h"
-#import "DemanHallHighlightsView.h"
+#import "DemanHallDetailSignUpView.h"
 
 @interface DemanHallDetailViewController ()
 <
 FBScrollLayoutViewDelegate,
-UINavigationControllerDelegate,
 HWConfirmPanelViewDelegate
 >
 
@@ -24,7 +23,7 @@ HWConfirmPanelViewDelegate
 @property (nonatomic, strong) DemanHallDetailHeaderView   *headerView;
 @property (nonatomic, strong) DemanHallDetailCompanyView  *companyView;
 @property (nonatomic, strong) DemanHallDetailPositionView *positionView;
-@property (nonatomic, strong) DemanHallHighlightsView     *highlightsView;
+@property (nonatomic, strong) DemanHallDetailSignUpView   *signUpViewView;
 @property (nonatomic, strong) UIButton                    *signupBtn;
 @property (nonatomic, strong) NSDictionary                *detailDict;
 
@@ -33,11 +32,11 @@ HWConfirmPanelViewDelegate
 
 @implementation DemanHallDetailViewController
 
+
 - (void)viewWillAppear:(BOOL)animated {
     
     [super viewWillAppear:animated];
-    self.navigationController.delegate = self;
-   
+    [self.navigationController setNavigationBarHidden:NO animated:animated];
 }
 
 - (void)viewDidLoad {
@@ -48,7 +47,6 @@ HWConfirmPanelViewDelegate
     [self requestDetailData];
     [self initSubViews];
     [self.view.errorView.refreshButton addTarget:self action:@selector(refreshButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
-    
 }
 
 #pragma mark - init
@@ -64,12 +62,6 @@ HWConfirmPanelViewDelegate
     
 }
 
-#pragma mark - 导航栏的代理
-
-- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
-    
-    [self.navigationController setNavigationBarHidden:NO animated:animated];
-}
 #pragma mark - FBScrollLayoutViewDelegate
 
 - (void)scrollLayoutViewMakeConstraints:(FBScrollLayoutView *)scrollLayoutView {
@@ -127,9 +119,9 @@ HWConfirmPanelViewDelegate
 }
 - (void)signupButtonClick:(UIButton *)btn {
     
-    _highlightsView = [[DemanHallHighlightsView alloc]init];
-    [_highlightsView.doneBtn addTarget:self action:@selector(doneButtonClick:) forControlEvents:UIControlEventTouchUpInside];
-    [_highlightsView showDemanHallHighlightsView];
+    _signUpViewView = [[DemanHallDetailSignUpView alloc]init];
+    [_signUpViewView.doneBtn addTarget:self action:@selector(doneButtonClick:) forControlEvents:UIControlEventTouchUpInside];
+    [_signUpViewView showDemanHallDetailSignUpView];
     
 }
 - (void)doneButtonClick:(UIButton *)btn {
@@ -138,13 +130,14 @@ HWConfirmPanelViewDelegate
     [parameter setValue:[HWAppUserProfile sharedInstance].userId forKey:@"user_id"];
     [parameter setValue:[HWAppUserProfile sharedInstance].oauthToken forKey:@"user_token"];
     [parameter setValue:self.hwRequirementId forKey:@"requirement_id"];
-    [parameter setValue:self.highlightsView.textView.text forKey:@"bright_points"];
+    [parameter setValue:self.signUpViewView.textView.text forKey:@"bright_points"];
     [parameter setValue:@"2" forKey:@"enroll_from"];
     
     [HWProgressHUD fb_showLoading];
     [HWAFHttpTool postJSONRequestWithURLStr:enrollment_Require params:parameter success:^(NSDictionary *responseDic) {
         
         [HWProgressHUD fb_dismiss];
+        
         if ([responseDic[@"errcode"] integerValue] == 0)
         {
             [HWProgressHUD fb_showSuccessWithStatus:@"报名成功"];
@@ -164,6 +157,7 @@ HWConfirmPanelViewDelegate
 }
 
 #pragma mark - private method
+
 /* 网络请求 */
 - (void)requestDetailData {
     

HappyWork/HappyWork/Class/DemandHall/Model/DemanHallModel.h

@@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface DemanHallModel : NSObject
 
+@property (nonatomic, copy) NSString *serviceFeeRate;
 @property (nonatomic, copy) NSString *ID;
 @property (nonatomic, copy) NSString *cityCode;
 @property (nonatomic, copy) NSString *createTime1;

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

@@ -14,9 +14,9 @@
 #import "DemanHallViewModel.h"
 
 @interface DemanHallViewController ()
-<UITableViewDelegate,
-DemanHallMenuFilterViewDelegate,
-UINavigationControllerDelegate
+<
+UITableViewDelegate,
+DemanHallMenuFilterViewDelegate
 >
 
 @property (nonatomic, strong) DemanHallMenuFilterView *menuFilterView;
@@ -30,14 +30,13 @@ UINavigationControllerDelegate
 - (void)viewWillAppear:(BOOL)animated {
     
     [super viewWillAppear:animated];
-    self.navigationController.delegate = self;
+    [self.navigationController setNavigationBarHidden:YES animated:animated];
 }
 
 - (void)viewDidLoad {
     
     [super viewDidLoad];
     [self dealWithRequestResult];
-    
 }
 
 #pragma mark – init
@@ -61,8 +60,45 @@ UINavigationControllerDelegate
         make.bottom.equalTo(self.view.mas_bottom).offset(0);
     }];
 }
+#pragma mark - private metnod
 
+/* 处理请求结果 */
+- (void)dealWithRequestResult {
+    
+    [self.view showLoadingView];
+    [self.viewModel bannerRequirement];
+    
+    __weak typeof(self) weakSelf = self;
+    
+    self.viewModel.bannerDataBlock = ^{
+      
+        [weakSelf.tableView reloadData];
+    };
+    [self.viewModel initWithResponseDataBlock:^(id  _Nonnull data) {
+        
+        [weakSelf successfulRefreshOperation];
+        
+        weakSelf.lastPage = [data[@"data"][@"isLast"] boolValue];
+        
+        if (weakSelf.viewModel.listArray.count == 0)
+        {
+            weakSelf.refreshFooter.noText = YES;
+        }
+        else
+        {
+            weakSelf.refreshFooter.noText = NO;
+        }
+        
+    } fail:^(id  _Nonnull data) {
+        
+        [weakSelf failRefreshOperation];
+        [HWProgressHUD fb_showFailureWithStatus:data];
+        
+    }];
+    
+}
 #pragma maek - super method
+
 /* 请求数据 */
 - (void)requestListData {
     
@@ -83,14 +119,6 @@ UINavigationControllerDelegate
     [super loadMoreData];
 }
 
-#pragma mark - 导航栏的代理
-
-- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
-    // 判断要显示的控制器是否是自己
-    //    BOOL isPushSelfClass = [viewController isKindOfClass:[self class]];
-    [self.navigationController setNavigationBarHidden:YES animated:animated];
-}
-
 #pragma mark - UITableViewDelegate
 
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
@@ -176,39 +204,15 @@ UINavigationControllerDelegate
     [self requestListData];
     
 }
-#pragma mark - event response
 
+#pragma mark - event response
+//个人中心
 - (void)headerButtonClick:(UIButton *)btn {
     
     PersonalCenterViewController *vc = [[PersonalCenterViewController alloc]init];
     [self.navigationController pushViewController:vc animated:YES];
 }
 
-#pragma mark - private metnod
-
-/* 处理请求结果 */
-- (void)dealWithRequestResult {
-    
-    [self.view showLoadingView];
-    [self.viewModel bannerRequirement];
-    __weak typeof(self) weakSelf = self;
-    self.viewModel.bannerDataBlock = ^{
-      
-        [weakSelf.tableView reloadData];
-    };
-    [self.viewModel initWithResponseDataBlock:^(id  _Nonnull data) {
-        
-        [self successfulRefreshOperation];
-        self.lastPage = [data[@"data"][@"isLast"] boolValue];
-        
-    } fail:^(id  _Nonnull data) {
-        
-        [self failRefreshOperation];
-        [HWProgressHUD fb_showFailureWithStatus:data];
-        
-    }];
-    
-}
 
 #pragma mark - setter and getter
 

HappyWork/HappyWork/Class/DemandHall/ViewModel/DemanHallViewModel.m

@@ -9,6 +9,7 @@
 #import "DemanHallViewModel.h"
 #import "DemanHallBannerCell.h"
 #import "DemanHallCell.h"
+#import "DemanHallEmptyCell.h"
 #import "DemanHallModel.h"
 
 @interface DemanHallViewModel ()
@@ -80,7 +81,14 @@
 }
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     
-    return section == 0 ? 1 : self.listArray.count;
+    if (section == 0)
+    {
+        return 1;
+    }
+    else
+    {
+        return self.listArray.count == 0 ? 1 : self.listArray.count;
+    }
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     
@@ -97,43 +105,56 @@
     }
     else
     {
-        static NSString *cellID = @"cellID";
-        DemanHallCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
-        if (cell == nil)
-        {
-            cell = [[DemanHallCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID];
-        }
-        
-        NSDictionary *dict = self.listArray[indexPath.row];
-        DemanHallModel *model = [DemanHallModel mj_objectWithKeyValues:dict];
-        
-        cell.companyLabel.text = model.companyName;
-        cell.titleLabel.text = model.name;
-        cell.timeLabel.text = model.createTime;
-        cell.addressView.taglabel.text = model.provinceCityCountry;
-        if (model.number)
-        {
-            cell.numberView.hidden = NO;
-            cell.numberView.taglabel.text = [NSString stringWithFormat:@"任务数：%@",model.number];
-        }
-        else
-        {
-            cell.numberView.hidden = YES;
-        }
-        
-        if ([model.stage integerValue] == 0)
+        if (self.listArray.count)
         {
-            cell.moneyLabel.text = [NSString stringWithFormat:@"%@元*1次",model.price];
+            static NSString *cellID = @"cellID";
+            DemanHallCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
+            if (cell == nil)
+            {
+                cell = [[DemanHallCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID];
+            }
+            
+            NSDictionary *dict = self.listArray[indexPath.row];
+            DemanHallModel *model = [DemanHallModel mj_objectWithKeyValues:dict];
+            
+            cell.companyLabel.text = model.companyName;
+            cell.titleLabel.text = model.name;
+            cell.timeLabel.text = model.createTime;
+            cell.addressView.taglabel.text = model.provinceCityCountry;
+            if (model.number)
+            {
+                cell.numberView.hidden = NO;
+                cell.numberView.taglabel.text = [NSString stringWithFormat:@"任务数：%@",model.number];
+            }
+            else
+            {
+                cell.numberView.hidden = YES;
+            }
+            
+            if ([model.stage integerValue] == 0)
+            {
+                cell.moneyLabel.text = [NSString stringWithFormat:@"%@元*1次",model.price];
+            }
+            else
+            {
+                cell.moneyLabel.text = [NSString stringWithFormat:@"%@元*%@期",model.price,model.stage];
+            }
+            NSMutableAttributedString *countAtt1 = [[NSMutableAttributedString alloc]initWithString:cell.moneyLabel.text];
+               [countAtt1 addAttribute:NSFontAttributeName value:[UIFont boldSystemFontOfSize:17] range:NSMakeRange(0, model.price.length + 1)];
+            cell.moneyLabel.attributedText = countAtt1;
+            
+            return cell;
         }
         else
         {
-            cell.moneyLabel.text = [NSString stringWithFormat:@"%@元*%@期",model.price,model.stage];
+            static NSString *emptyCell = @"emptyCell";
+            DemanHallEmptyCell *cell = [tableView dequeueReusableCellWithIdentifier:emptyCell];
+            if (cell == nil)
+            {
+                cell = [[DemanHallEmptyCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:emptyCell];
+            }
+            return cell;
         }
-        NSMutableAttributedString *countAtt1 = [[NSMutableAttributedString alloc]initWithString:cell.moneyLabel.text];
-           [countAtt1 addAttribute:NSFontAttributeName value:[UIFont boldSystemFontOfSize:17] range:NSMakeRange(0, model.price.length + 1)];
-        cell.moneyLabel.attributedText = countAtt1;
-        
-        return cell;
     }
 }
 

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

@@ -0,0 +1,17 @@
+//
+//  DemanHallEmptyCell.h
+//  HappyWork
+//
+//  Created by 张晓光 on 2019/11/5.
+//  Copyright © 2019 张晓光. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DemanHallEmptyCell : UITableViewCell
+
+@end
+
+NS_ASSUME_NONNULL_END

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

@@ -0,0 +1,72 @@
+//
+//  DemanHallEmptyCell.m
+//  HappyWork
+//
+//  Created by 张晓光 on 2019/11/5.
+//  Copyright © 2019 张晓光. All rights reserved.
+//
+
+#import "DemanHallEmptyCell.h"
+
+@interface DemanHallEmptyCell ()
+
+@property (nonatomic, strong) UIImageView *iconImageV;
+@property (nonatomic, strong) UILabel     *detalLabel;
+
+@end
+
+@implementation DemanHallEmptyCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
+    
+    if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])
+    {
+        self.contentView.backgroundColor = COLOR_GRAY_F5;
+        [self.contentView addSubview:self.iconImageV];
+        [self.contentView addSubview:self.detalLabel];
+        [self.iconImageV mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.centerX.equalTo(self);
+            make.top.equalTo(self.contentView.mas_top).offset(HJHorizontalScale(70));
+        }];
+        [self.detalLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.centerX.equalTo(self);
+            make.top.equalTo(self.iconImageV.mas_bottom).offset(10);
+        }];
+    }
+    return self;
+}
+#pragma mark - setter and getter
+
+- (UIImageView *)iconImageV {
+    
+    if (_iconImageV == nil)
+    {
+        _iconImageV = [[UIImageView alloc]init];
+        _iconImageV.image = [UIImage imageNamed:@"demanhall_empty"];
+    }
+    return _iconImageV;
+}
+- (UILabel *)detalLabel {
+    
+    if (_detalLabel == nil)
+    {
+        _detalLabel = [[UILabel alloc]init];
+        _detalLabel.text = @"暂无需求";
+        _detalLabel.textColor = [UIColor colorFromHexString:@"CDCFD3"];
+        _detalLabel.font = [UIFont boldSystemFontOfSize:14];
+    }
+    return _detalLabel;
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+
+    // Configure the view for the selected state
+}
+
+@end

HappyWork/HappyWork/Class/LoginRegister/View/LoginRegisterView.m

@@ -59,6 +59,7 @@
         make.height.mas_equalTo(44);
     }];
 }
+
 #pragma mark - UITextViewDelegate
 
 - (BOOL)textView:(UITextView *)textView shouldInteractWithURL:(NSURL *)URL inRange:(NSRange)characterRange {
@@ -121,6 +122,7 @@
     if (_agreementLabel == nil)
     {
         _agreementLabel = [[UITextView alloc]init];
+        _agreementLabel.backgroundColor = [UIColor whiteColor];
         _agreementLabel.textColor = COLOR_GRAY_8B;
         _agreementLabel.font = [UIFont systemFontOfSize:12];
         _agreementLabel.delegate = self;

HappyWork/HappyWork/Class/LoginRegister/View/PhoneAndCodeView.m

@@ -69,7 +69,9 @@
     if (_phoneTF == nil)
     {
         _phoneTF = [[UITextField alloc]init];
-        _phoneTF.placeholder = @"请输入手机号码";
+        
+        NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] initWithString:@"请输入手机号码" attributes:@{NSForegroundColorAttributeName:COLOR_BACK_C}];
+        _phoneTF.attributedPlaceholder = attrString;
         _phoneTF.font = [UIFont systemFontOfSize:15];
         _phoneTF.textColor = COLOR_BACK_31;
         _phoneTF.keyboardType = UIKeyboardTypeNumberPad;
@@ -90,7 +92,9 @@
     if (_codeTF == nil)
     {
         _codeTF = [[UITextField alloc]init];
-        _codeTF.placeholder = @"请输入短信验证码";
+        
+        NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] initWithString:@"请输入短信验证码" attributes:@{NSForegroundColorAttributeName:COLOR_BACK_C}];
+        _codeTF.attributedPlaceholder = attrString;
         _codeTF.font = [UIFont systemFontOfSize:15];
         _codeTF.textColor = COLOR_BACK_31;
         _codeTF.keyboardType = UIKeyboardTypeNumberPad;

HappyWork/HappyWork/Class/LoginRegister/ViewController/LoginRegisterViewController.m

@@ -12,7 +12,7 @@
 #import "DemanHallViewController.h"//需求大厅
 #import "RegisterAgreementViewController.h"//注册协议
 
-@interface LoginRegisterViewController ()<UINavigationControllerDelegate>
+@interface LoginRegisterViewController ()
 
 @property (nonatomic, strong) LoginRegisterView *loginView;
 @property (nonatomic, assign) NSInteger   second;
@@ -25,7 +25,7 @@
 - (void)viewWillAppear:(BOOL)animated {
     
     [super viewWillAppear:animated];
-    self.navigationController.delegate = self;
+    [self.navigationController setNavigationBarHidden:YES animated:animated];
 }
 - (void)viewDidLoad {
     
@@ -53,13 +53,6 @@
         [weakSelf.navigationController pushViewController:agreement animated:YES];
     };
 }
-#pragma mark - 导航栏的代理
-
-- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
-    
-    [self.navigationController setNavigationBarHidden:YES animated:animated];
-    
-}
 
 #pragma event response
 
@@ -79,7 +72,7 @@
     
     btn.userInteractionEnabled = NO;
     
-    [HWAFHttpTool postJSONRequestWithURLStr:phone_Login params:@{@"phone":self.loginView.phoneView.phoneTF.text,@"code":self.loginView.phoneView.codeTF.text} success:^(NSDictionary *responseDic) {
+    [HWAFHttpTool postJSONRequestWithURLStr:phone_Login params:@{@"phone":self.loginView.phoneView.phoneTF.text,@"code":self.loginView.phoneView.codeTF.text,@"register_from":@"1"} success:^(NSDictionary *responseDic) {
     
         if ([responseDic[@"errcode"] integerValue] == 0)
         {
@@ -109,6 +102,7 @@
     
         btn.userInteractionEnabled = YES;
         [HWProgressHUD fb_showFailureWithStatus:error];
+        
     }];
     
 }

HappyWork/HappyWork/Class/LoginRegister/ViewController/RegisterAgreementViewController.m

@@ -8,7 +8,7 @@
 
 #import "RegisterAgreementViewController.h"
 
-@interface RegisterAgreementViewController ()<UINavigationControllerDelegate>
+@interface RegisterAgreementViewController ()
 
 @property (nonatomic, strong) UIWebView *webView;
 
@@ -19,7 +19,7 @@
 - (void)viewWillAppear:(BOOL)animated {
     
     [super viewWillAppear:animated];
-    self.navigationController.delegate = self;
+    [self.navigationController setNavigationBarHidden:NO animated:animated];
 
 }
 
@@ -39,14 +39,7 @@
     
     
 }
-#pragma mark - 导航栏的代理
 
-- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
-    // 判断要显示的控制器是否是自己
-    //    BOOL isPushSelfClass = [viewController isKindOfClass:[self class]];
-    [self.navigationController setNavigationBarHidden:NO animated:animated];
-    
-}
 
 /*
 #pragma mark - Navigation

HappyWork/HappyWork/Class/LoginRegister/ViewController/RegisterUserViewController.m

@@ -35,9 +35,8 @@
 - (void)phoneButtonClick:(UIButton *)btn {
     
     NSMutableString* str=[[NSMutableString alloc] initWithFormat:@"tel:400-692-0099"];
-    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];
 }
 
 #pragma mark - setter and getter

HappyWork/HappyWork/Class/PersonalCenter/Model/PersonalCenterModel.h

@@ -18,8 +18,19 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *gender;
 @property (nonatomic, copy) NSString *cardNumber;
 @property (nonatomic, copy) NSString *idcardNumber;
+@property (nonatomic, copy) NSString *platformCompanyId;
+@property (nonatomic, copy) NSString *registerTime_begin;
 @property (nonatomic, copy) NSString *authenticationStatus;
 
+@property (nonatomic, copy) NSString *sysOrgCode;
+@property (nonatomic, copy) NSString *type;
+@property (nonatomic, copy) NSString *registerTime_end ;
+@property (nonatomic, copy) NSString *userToken;
+@property (nonatomic, copy) NSString *registerTime;
+@property (nonatomic, copy) NSString *registerFrom ;
+
+
+
 @end
 
 NS_ASSUME_NONNULL_END

HappyWork/HappyWork/Class/PersonalCenter/ViewController/PersonalCenterViewController.m

@@ -18,7 +18,6 @@
 @interface PersonalCenterViewController ()
 <
 UITableViewDelegate,
-UINavigationControllerDelegate,
 HWConfirmPanelViewDelegate
 >
 
@@ -38,7 +37,7 @@ HWConfirmPanelViewDelegate
 - (void)viewWillAppear:(BOOL)animated {
     
     [super viewWillAppear:animated];
-    self.navigationController.delegate = self;
+    [self.navigationController setNavigationBarHidden:NO animated:animated];
 }
 
 - (void)viewDidLoad {
@@ -100,13 +99,6 @@ HWConfirmPanelViewDelegate
     
 }
 
-#pragma mark - 导航栏的代理
-
-- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
-    
-    [self.navigationController setNavigationBarHidden:NO animated:animated];
-    
-}
 #pragma mark - UITableViewDelegate 
 
 - (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {

HappyWork/HappyWork/Class/PersonalCenter/完税证明_tax/ViewController/TaxCertificateViewController.m

@@ -45,11 +45,11 @@
 - (void)phoneButtonClick:(UIButton *)btn {
     
     NSMutableString *str = [[NSMutableString alloc] initWithFormat:@"tel:400-692-0099"];
-    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];
 }
+
 #pragma mark - setter and getter
 
 - (TaxCertificateView *)taxView {

HappyWork/HappyWork/Class/PersonalCenter/我的报名_signup/Model/MySignUpModel.h

@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "DemanHallModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -22,6 +23,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *orderNumber;
 @property (nonatomic, copy) NSString *requirementId;
 @property (nonatomic, copy) NSString *enrollBy;
+@property (nonatomic, strong) DemanHallModel *hwRequirement;
+@property (nonatomic, strong) DemanHallModel *hwPlatformCompany;
+
 
 @end
 

HappyWork/HappyWork/Class/PersonalCenter/我的报名_signup/ViewController/MySignUpViewController.m

@@ -21,10 +21,9 @@
 @implementation MySignUpViewController
 
 - (void)viewDidLoad {
-    [super viewDidLoad];
     
+    [super viewDidLoad];
     self.navigationItem.title = @"我的报名";
-    
     self.tableView.delegate = self;
     self.tableView.dataSource = self.viewModel;
     [self dealWithRequestResult];
@@ -32,6 +31,7 @@
 }
 
 #pragma maek - super method
+
 /* 请求数据 */
 - (void)requestListData {
     
@@ -66,15 +66,17 @@
 /* 处理请求结果 */
 - (void)dealWithRequestResult {
     
+    __weak typeof(self) weakSelf = self;
+    
     [self.view showLoadingView];
     [self.viewModel initWithResponseDataBlock:^(id  _Nonnull data) {
         
-        [self successfulRefreshOperation];
-        self.lastPage = [data[@"data"][@"isLast"] boolValue];
+        [weakSelf successfulRefreshOperation];
+        weakSelf.lastPage = [data[@"data"][@"isLast"] boolValue];
         
     } fail:^(id  _Nonnull data) {
         
-        [self failRefreshOperation];
+        [weakSelf failRefreshOperation];
         [HWProgressHUD fb_showInfoWithStatus:data];
     
     }];

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

@@ -8,13 +8,11 @@
 
 #import "MySignUpViewModel.h"
 #import "MySignUpCell.h"
-#import "DemanHallModel.h"
 #import "MySignUpModel.h"
 
 @interface MySignUpViewModel ()
 
 
-
 @end
 
 @implementation MySignUpViewModel
@@ -71,27 +69,26 @@
     }
     
     NSDictionary *dict = self.listArray[indexPath.row];
-    MySignUpModel *model = [MySignUpModel mj_objectWithKeyValues:dict];
-    DemanHallModel *hwRequirementModel = [DemanHallModel mj_objectWithKeyValues:dict[@"hwRequirement"]];
-    DemanHallModel *hwPlatformModel = [DemanHallModel mj_objectWithKeyValues:dict[@"hwPlatformCompany"]];
     
-    cell.titleLabel.text = hwRequirementModel.name;
+    MySignUpModel *model = [MySignUpModel mj_objectWithKeyValues:dict];
+
+    cell.titleLabel.text = model.hwRequirement.name;
     cell.companyLabel.text = model.companyName;
-    if ([hwRequirementModel.stage integerValue] == 0)
+    if ([model.hwRequirement.stage integerValue] == 0)
     {
-        cell.moneylabel.text = [NSString stringWithFormat:@"%@元*1次",hwRequirementModel.price];
+        cell.moneylabel.text = [NSString stringWithFormat:@"%@元*1次",model.hwRequirement.price];
     }
     else
     {
-        cell.moneylabel.text = [NSString stringWithFormat:@"%@元*%@期",hwRequirementModel.price,hwRequirementModel.stage];
+        cell.moneylabel.text = [NSString stringWithFormat:@"%@元*%@期",model.hwRequirement.price,model.hwRequirement.stage];
     }
-    cell.addressView.taglabel.text = hwPlatformModel.provinceCityCountry;
+    cell.addressView.taglabel.text = model.hwPlatformCompany.provinceCityCountry;
     
     NSMutableAttributedString *countAtt1 = [[NSMutableAttributedString alloc]initWithString:cell.moneylabel.text];
-       [countAtt1 addAttribute:NSFontAttributeName value:[UIFont boldSystemFontOfSize:17] range:NSMakeRange(0, hwRequirementModel.price.length + 1)];
+       [countAtt1 addAttribute:NSFontAttributeName value:[UIFont boldSystemFontOfSize:17] range:NSMakeRange(0, model.hwRequirement.price.length + 1)];
     cell.moneylabel.attributedText = countAtt1;
     
-    if ([dict[@"isOn"] integerValue] == 0)
+    if ([model.hwRequirement.isOn integerValue] == 1)
     {
         if (model.orderNumber)
         {
@@ -112,6 +109,7 @@
     {
         cell.stateView.iconImageV.image = [UIImage imageNamed:@"my_signup_shelves"];
         cell.stateView.taglabel.text = @"已下架";
+        cell.stateView.taglabel.textColor = COLOR_GRAY_88;
         cell.stateView.backgroundColor = COLOR_GRAY_F5;
     }
     return cell;

HappyWork/HappyWork/Class/PersonalCenter/我的订单_order/Model/MyOrderModel.h

@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "DemanHallModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -33,6 +34,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *cardNumber;
 @property (nonatomic, copy) NSString *userId;
 
+@property (nonatomic, strong) DemanHallModel *hwPlatformCompany;
+@property (nonatomic, strong) DemanHallModel *hwRequirement;
+
 
 @end
 

HappyWork/HappyWork/Class/PersonalCenter/我的订单_order/ViewController/MyOrderDetailViewController.m

@@ -12,6 +12,7 @@
 #import "DemanHallDetailCompanyView.h"
 #import "DemanHallDetailPositionView.h"
 #import "MyOrderWebViewController.h"
+#import "MyOrderModel.h"
 
 @interface MyOrderDetailViewController ()
 <
@@ -38,7 +39,7 @@ FBScrollLayoutViewDelegate
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    self.navigationItem.title = @"需求详情";
+    self.navigationItem.title = @"订单详情";
     [self hj_setupNavBar];
     [self initSubViews];
     [self requestDetailData];
@@ -57,6 +58,7 @@ FBScrollLayoutViewDelegate
     [self.scrollLayoutView.footerView addSubview:self.makesureBtn];
     [self.scrollLayoutView.footerView addSubview:self.contractBtn];
     [self.scrollLayoutView makeConstraints];
+    
     if ([self.status integerValue] != 0)
     {
         self.makesureBtn.backgroundColor = [UIColor colorFromHexString:@"CDCFD3"];
@@ -64,7 +66,7 @@ FBScrollLayoutViewDelegate
     }
     else
     {
-        [_makesureBtn az_setGradientBackgroundWithColors:@[[UIColor colorFromHexString:@"5568F0"], [UIColor colorFromHexString:@"823BFF"]] locations:@[@(0.0),@(1.0f)] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
+        [self.makesureBtn az_setGradientBackgroundWithColors:@[[UIColor colorFromHexString:@"5568F0"], [UIColor colorFromHexString:@"823BFF"]] locations:@[@(0.0),@(1.0f)] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
     }
     
 }
@@ -120,33 +122,40 @@ FBScrollLayoutViewDelegate
     
     [self requestDetailData];
 }
+
+/*  查看合同 */
 - (void)contractButtonClick:(UIButton *)btn {
     
     MyOrderWebViewController *webView = [[MyOrderWebViewController alloc]init];
     webView.webUrl = self.detailDict[@"hwOrderAPI"][@"workContract"];
     [self.navigationController pushViewController:webView animated:YES];
-    
 }
+
+/* 确认订单 */
 - (void)makesureButtonClick:(UIButton *)btn {
 
+    __weak typeof(self) weakSelf = self;
     [HWProgressHUD fb_showLoading];
+
     [HWAFHttpTool postJSONRequestWithURLStr:confirm_Order params:@{@"user_id":[HWAppUserProfile sharedInstance].userId,@"user_token":[HWAppUserProfile sharedInstance].oauthToken,@"orderId":self.orderID} success:^(NSDictionary *responseDic) {
-        
+
         [HWProgressHUD fb_dismiss];
+
         if ([responseDic[@"errcode"] integerValue] == 0)
         {
             [HWProgressHUD fb_showSuccessWithStatus:@"确认订单成功"];
-            self.makesureBtn.backgroundColor = [UIColor colorFromHexString:@"CDCFD3"];
-            self.makesureBtn.userInteractionEnabled = NO;
-            [self requestDetailData];
+            [weakSelf.makesureBtn az_setGradientBackgroundWithColors:@[[UIColor colorFromHexString:@"CDCFD3"], [UIColor colorFromHexString:@"CDCFD3"]] locations:@[@(0.0),@(1.0f)] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
+            weakSelf.makesureBtn.userInteractionEnabled = NO;
+            //登录通知刷新
+            [[NSNotificationCenter defaultCenter] postNotificationName:confirmationOrderNotification object:nil];
         }
         else
         {
             [HWProgressHUD fb_showFailureWithStatus:responseDic[@"errmsg"]];
         }
-        
+
     } failure:^(NSString *error) {
-        
+
         [HWProgressHUD fb_dismiss];
         [HWProgressHUD fb_showFailureWithStatus:error];
     }];
@@ -157,33 +166,39 @@ FBScrollLayoutViewDelegate
 
 - (void)requestDetailData {
     
+    __weak typeof(self) weakSelf = self;
     [HWAFHttpTool getRequestWithURLStr:get_OrderDetail params:@{@"orderId":self.orderID,@"user_id":[HWAppUserProfile sharedInstance].userId,@"user_token":[HWAppUserProfile sharedInstance].oauthToken} success:^(NSDictionary *responseDic) {
         
         if ([responseDic[@"errcode"] integerValue] == 0)
         {
-            [self.view dismissErrorView];
-            self.detailDict = responseDic[@"data"];
-            if (![self.detailDict[@"hwOrderAPI"][@"workContract"] isKindOfClass:[NSNull class]] || self.detailDict[@"hwOrderAPI"][@"workContract".length > 0])
+            [weakSelf.view dismissErrorView];
+            weakSelf.detailDict = responseDic[@"data"];
+            MyOrderModel *model = [MyOrderModel mj_objectWithKeyValues:self.detailDict[@"hwOrderAPI"]];
+            if (model.workContract)
             {
-                self.contractBtn.hidden = NO;
+                weakSelf.contractBtn.hidden = NO;
             }
             else
             {
-                self.contractBtn.hidden = YES;
+                weakSelf.contractBtn.hidden = YES;
+                [weakSelf.makesureBtn mas_updateConstraints:^(MASConstraintMaker *make) {
+                    
+                    make.left.offset(15);
+                }];
             }
-            [self.headerView demanHallDetailHeaderViewDict:self.detailDict[@"hwRequirementAPI"]];
-            [self.companyView demanHallDetailCompanyViewDict:self.detailDict[@"hwRequirementAPI"]];
-            [self.positionView demanHallDetailPositionViewDict:self.detailDict[@"hwRequirementAPI"]];
+            [weakSelf.headerView demanHallDetailHeaderViewDict:self.detailDict[@"hwRequirementAPI"]];
+            [weakSelf.companyView demanHallDetailCompanyViewDict:self.detailDict[@"hwRequirementAPI"]];
+            [weakSelf.positionView demanHallDetailPositionViewDict:self.detailDict[@"hwRequirementAPI"]];
         }
         else
         {
-            [self.view showErrorView];
+            [weakSelf.view showErrorView];
             [HWProgressHUD fb_showFailureWithStatus:responseDic[@"errmsg"]];
         }
         
     } failure:^(NSString *error) {
         
-        [self.view showErrorView];
+        [weakSelf.view showErrorView];
         [HWProgressHUD fb_showFailureWithStatus:error];
     }];
 }
@@ -261,7 +276,6 @@ FBScrollLayoutViewDelegate
         _makesureBtn.layer.masksToBounds = YES;
         _makesureBtn.userInteractionEnabled = YES;
         [_makesureBtn addTarget:self action:@selector(makesureButtonClick:) forControlEvents:UIControlEventTouchUpInside];
-        
     }
     return _makesureBtn;
     

HappyWork/HappyWork/Class/PersonalCenter/我的订单_order/ViewController/MyOrderViewController.m

@@ -19,6 +19,11 @@
 
 @implementation MyOrderViewController
 
+- (void)dealloc {
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:confirmationOrderNotification object:nil];
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     
@@ -26,9 +31,21 @@
     self.tableView.delegate = self;
     self.tableView.dataSource = self.viewModel;
     [self dealWithRequestResult];
+    
+    //添加确认订单通知
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(confirmationOrderRefresh:) name:confirmationOrderNotification object:nil];
+}
+
+#pragma mark – Notification
+
+- (void)confirmationOrderRefresh:(NSNotification *)notification {
+    
+    [self requestListData];
+    
 }
 
 #pragma maek - super method
+
 /* 请求数据 */
 - (void)requestListData {
     
@@ -58,6 +75,7 @@
     [self.navigationController pushViewController:detail animated:YES];
    
 }
+
 #pragma mark - MyOrderViewModelDelegate
 
 - (void)contractIndexPath:(NSInteger)index {
@@ -78,15 +96,16 @@
 /* 处理请求结果*/
 - (void)dealWithRequestResult {
     
+    __weak typeof(self) weakSelf = self;
     [self.view showLoadingView];
     [self.viewModel initWithResponseDataBlock:^(id  _Nonnull data) {
         
-        [self successfulRefreshOperation];
-        self.lastPage = [data[@"data"][@"isLast"] boolValue];
+        [weakSelf successfulRefreshOperation];
+        weakSelf.lastPage = [data[@"data"][@"isLast"] boolValue];
         
     } fail:^(id  _Nonnull data) {
         
-        [self failRefreshOperation];
+        [weakSelf failRefreshOperation];
         [HWProgressHUD fb_showInfoWithStatus:data];
         
     }];

HappyWork/HappyWork/Class/PersonalCenter/我的订单_order/ViewController/MyOrderWebViewController.m

@@ -7,10 +7,11 @@
 //
 
 #import "MyOrderWebViewController.h"
+#import <WebKit/WebKit.h>
 
 @interface MyOrderWebViewController ()
 
-@property (nonatomic, strong) UIWebView *webView;
+@property (nonatomic, strong) WKWebView *webView;
 
 @end
 
@@ -21,8 +22,8 @@
     // Do any additional setup after loading the view.
     
     self.navigationItem.title = @"查看合同";
-    self.webView  = [[UIWebView alloc]init];
-    
+    self.webView  = [[WKWebView alloc]init];
+//    NSLog(@":::::%@",self.webUrl);
     [self.view addSubview:self.webView];
     [self.webView mas_makeConstraints:^(MASConstraintMaker *make) {
        

HappyWork/HappyWork/Class/PersonalCenter/我的订单_order/ViewModel/MyOrderViewModel.m

@@ -9,7 +9,7 @@
 #import "MyOrderViewModel.h"
 #import "MyOrderCell.h"
 #import "MyOrderModel.h"
-#import "DemanHallModel.h"
+//#import "DemanHallModel.h"
 
 @interface MyOrderViewModel ()
 
@@ -73,35 +73,31 @@
 
     NSDictionary *dict = self.listArray[indexPath.row];
     MyOrderModel *model = [MyOrderModel mj_objectWithKeyValues:dict];
-    DemanHallModel *hwRequirementModel = [DemanHallModel mj_objectWithKeyValues:dict[@"hwRequirement"]];
-    DemanHallModel *hwPlatformCompanyModel = [DemanHallModel mj_objectWithKeyValues:dict[@"hwPlatformCompany"]];
-    
+
     cell.orderLabel.text = [NSString stringWithFormat:@"%@ >",model.orderNumber];
-    cell.titleLabel.text = hwRequirementModel.name;
-    if ([hwRequirementModel.stage integerValue] == 0)
+    cell.titleLabel.text = model.hwRequirement.name;
+    if ([model.hwRequirement.stage integerValue] == 0)
     {
-        cell.moneyLabel.text = [NSString stringWithFormat:@"%@月*1次",hwRequirementModel.price];
+        cell.moneyLabel.text = [NSString stringWithFormat:@"%@月*1次",model.hwRequirement.price];
     }
     else
     {
-        cell.moneyLabel.text = [NSString stringWithFormat:@"%@月*%@期",hwRequirementModel.price,hwRequirementModel.stage];
+        cell.moneyLabel.text = [NSString stringWithFormat:@"%@月*%@期",model.hwRequirement.price,model.hwRequirement.stage];
     }
-    cell.addressView.taglabel.text = hwPlatformCompanyModel.provinceCityCountry;
+    cell.addressView.taglabel.text = model.hwPlatformCompany.provinceCityCountry;
     
     NSMutableAttributedString *countAtt1 = [[NSMutableAttributedString alloc]initWithString:cell.moneyLabel.text];
-          [countAtt1 addAttribute:NSFontAttributeName value:[UIFont boldSystemFontOfSize:17] range:NSMakeRange(0, hwRequirementModel.price.length + 1)];
+          [countAtt1 addAttribute:NSFontAttributeName value:[UIFont boldSystemFontOfSize:17] range:NSMakeRange(0, model.hwRequirement.price.length + 1)];
     cell.moneyLabel.attributedText = countAtt1;
-    __weak typeof(cell) weakCell = cell;
+
     cell.lookBtnBlock = ^{
         
         [self.delegate contractIndexPath:indexPath.row];
     };
+    
     cell.makeSureBtnBlock = ^{
         
-        if (weakCell.makeSureBtn.selected)
-        {
-            [self makeSureOrderIndexpath:indexPath];
-        }
+        [self makeSureOrderIndexpath:indexPath];
     };
     
     if ([model.status integerValue] == 0)
@@ -111,7 +107,6 @@
     if ([model.status integerValue] == 1)
     {
         cell.stateLabel.text = @"订单关闭";
-        
     }
     if ([model.status integerValue] == 2)
     {
@@ -129,13 +124,16 @@
     if ([model.status integerValue] == 0 )
     {
         cell.hiddenButton = NO;
+        
         if (model.workContract)
         {
             cell.lookBtn.hidden = NO;
+            cell.verticalView.hidden = NO;
         }
         else
         {
             cell.lookBtn.hidden = YES;
+            cell.verticalView.hidden = YES;
         }
         cell.titleLabel.textColor = COLOR_BACK_31;
         cell.moneyLabel.textColor = COLOR_BLUE_32;

HappyWork/HappyWork/Class/PersonalCenter/收款记录_record/Model/PaymentRecordModel.h

@@ -32,6 +32,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *createTime;
 @property (nonatomic, copy) NSString *orderId;
 @property (nonatomic, copy) NSString *userId;
+@property (nonatomic, copy) NSString *taxFee;
+
 @property (nonatomic, copy) NSString *bnkflg;
 @property (nonatomic, copy) NSString *eacbnk;
 

HappyWork/HappyWork/Class/PersonalCenter/收款记录_record/View/PaymentRecordCell.h

@@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) UILabel *orderLabel;
 @property (nonatomic, strong) UILabel *timeLabel;
 @property (nonatomic, strong) UILabel *moneyLabel;
+@property (nonatomic, strong) UILabel *taxLabel;
 
 @end
 

HappyWork/HappyWork/Class/PersonalCenter/收款记录_record/View/PaymentRecordCell.m

@@ -37,6 +37,7 @@
     [self.bgView addSubview:self.orderLabel];
     [self.bgView addSubview:self.timeLabel];
     [self.bgView addSubview:self.moneyLabel];
+    [self.bgView addSubview:self.taxLabel];
     
     [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
         
@@ -55,17 +56,19 @@
     }];
     [self.moneyLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         
-        make.centerY.equalTo(self.bgView);
+        make.centerY.equalTo(self.orderLabel);
+        make.right.equalTo(self.bgView.mas_right).offset(-15);
+        
+    }];
+    [self.taxLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.centerY.equalTo(self.timeLabel);
         make.right.equalTo(self.bgView.mas_right).offset(-15);
         
     }];
-    
     self.orderLabel.text = @"DD201911110001";
     self.timeLabel.text = @"2019.12.12 13:13:21";
     self.moneyLabel.text = @"￥500,000";
-    
-    
-    
 }
 
 #pragma mark - setter and getter
@@ -103,12 +106,23 @@
     if (_moneyLabel == nil)
     {
         _moneyLabel = [[UILabel alloc]init];
-        _moneyLabel.font = [UIFont boldSystemFontOfSize:21];
+//        _moneyLabel.font = [UIFont boldSystemFontOfSize:21];
+        _moneyLabel.font = [UIFont systemFontOfSize:17];
         _moneyLabel.textColor = COLOR_BACK_31;
     }
     return _moneyLabel;
 }
-
+- (UILabel *)taxLabel {
+    
+    if (_taxLabel == nil)
+    {
+        _taxLabel = [[UILabel alloc]init];
+        _taxLabel.font = [UIFont systemFontOfSize:12];
+        _taxLabel.textColor = COLOR_GRAY_88;
+    }
+    return _taxLabel;
+    
+}
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];
 

HappyWork/HappyWork/Class/PersonalCenter/收款记录_record/ViewController/PaymentRecordDetailViewController.m

@@ -15,6 +15,7 @@
 
 @property (nonatomic, strong) FBScrollLayoutView      *scrollLayoutView;
 @property (nonatomic, strong) PaymentRecordDetailView *collectedAmountView;
+@property (nonatomic, strong) PaymentRecordDetailView *taxView;
 @property (nonatomic, strong) PaymentRecordDetailView *orderView;
 @property (nonatomic, strong) PaymentRecordDetailView *collectedPeopleView;
 @property (nonatomic, strong) PaymentRecordDetailView *collectedBankView;
@@ -26,13 +27,13 @@
 
 @implementation PaymentRecordDetailViewController
 
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     
     self.navigationItem.title = @"收款详情";
     self.view.backgroundColor = COLOR_GRAY_F5;
     [self requestDetailData];
-    
 }
 
 #pragma mark - init
@@ -41,6 +42,7 @@
     
     [self.view addSubview:self.scrollLayoutView];
     [self.scrollLayoutView.contentView addSubview:self.collectedAmountView];
+    [self.scrollLayoutView.contentView addSubview:self.taxView];
     [self.scrollLayoutView.contentView addSubview:self.orderView];
     [self.scrollLayoutView.contentView addSubview:self.collectedPeopleView];
     [self.scrollLayoutView.contentView addSubview:self.collectedBankView];
@@ -65,11 +67,16 @@
         make.top.equalTo(contentView).offset(10);
         make.left.right.equalTo(contentView);
     }];
-    [self.orderView mas_makeConstraints:^(MASConstraintMaker *make) {
+    [self.taxView mas_makeConstraints:^(MASConstraintMaker *make) {
         
         make.left.right.equalTo(contentView);
         make.top.equalTo(self.collectedAmountView.mas_bottom).offset(0);
     }];
+    [self.orderView mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.left.right.equalTo(contentView);
+        make.top.equalTo(self.taxView.mas_bottom).offset(0);
+    }];
     [self.collectedPeopleView mas_makeConstraints:^(MASConstraintMaker *make) {
         
         make.left.right.equalTo(contentView);
@@ -157,6 +164,16 @@
     }
     return _collectedAmountView;
 }
+- (PaymentRecordDetailView *)taxView {
+    
+    if (_taxView == nil)
+    {
+        _taxView = [[PaymentRecordDetailView alloc]init];
+        _taxView.titleLabel.text = @"已扣税额";
+        _taxView.contentLabel.text = self.model.taxFee;
+    }
+    return _taxView;
+}
 - (PaymentRecordDetailView *)orderView {
     
     if (_orderView == nil)

HappyWork/HappyWork/Class/PersonalCenter/收款记录_record/ViewController/PaymentRecordViewController.m

@@ -18,9 +18,10 @@
 
 @implementation PaymentRecordViewController
 
+
 - (void)viewDidLoad {
+    
     [super viewDidLoad];
-    // Do any additional setup after loading the view.
     
     self.navigationItem.title = @"收款记录";
     [self dealWithRequestResult];
@@ -39,11 +40,11 @@
         
         make.top.equalTo(self.view.mas_top).offset(10);
         make.left.bottom.right.offset(0);
-        
     }];
 }
 
 #pragma maek - super method
+
 /* 请求数据 */
 - (void)requestListData {
     
@@ -70,22 +71,23 @@
     PaymentRecordDetailViewController *detail = [[PaymentRecordDetailViewController alloc]init];
     detail.paymentDetailId = self.viewModel.listArray[indexPath.row][@"id"];
     [self.navigationController pushViewController:detail animated:YES];
-    
 }
 
 #pragma mark - private metnod
 /* 处理请求结果 */
 - (void)dealWithRequestResult {
     
+    __weak typeof(self) weakSelf = self;
+    
     [self.view showLoadingView];
     [self.viewModel initWithResponseDataBlock:^(id  _Nonnull data) {
         
-        [self successfulRefreshOperation];
-        self.lastPage = [data[@"data"][@"isLast"] boolValue];
+        [weakSelf successfulRefreshOperation];
+        weakSelf.lastPage = [data[@"data"][@"isLast"] boolValue];
         
     } fail:^(id  _Nonnull data) {
         
-        [self failRefreshOperation];
+        [weakSelf failRefreshOperation];
         [HWProgressHUD fb_showInfoWithStatus:data];
     }];
 }

HappyWork/HappyWork/Class/PersonalCenter/收款记录_record/ViewModel/PaymentRecordViewModel.m

@@ -75,6 +75,7 @@
     cell.orderLabel.text = model.orderNumber;
     cell.timeLabel.text = model.updateTime;
     cell.moneyLabel.text = [NSString stringWithFormat:@"¥%@",[HWAppService thousandSeparatorStringWithNumber:model.payment]];
+    cell.taxLabel.text = [NSString stringWithFormat:@"已扣税额：¥%@",[HWAppService thousandSeparatorStringWithNumber:model.taxFee]];
     return cell;
 }
 

HappyWork/HappyWork/Class/PersonalCenter/设置_set/ViewController/SetViewController.m

@@ -31,6 +31,7 @@
 - (void)initSubViews {
     
     [self.view addSubview:self.tableView];
+    
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
         
         make.left.right.top.bottom.offset(0);

HappyWork/HappyWork/Class/PersonalCenter/设置_set/ViewModel/SetViewModel.m

@@ -33,7 +33,9 @@
     {
         cell = [[SetCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:listCell];
     }
+    
     __weak typeof(cell) weakCell = cell;
+    
     if (indexPath.section == 0)
     {
         cell.rightIcon.hidden = NO;
@@ -81,9 +83,9 @@
         if (indexPath.row == 4)
         {
             cell.titleLabel.text = @"银行卡号";
-            if (![self.userDict[@"cardNumber"] isKindOfClass:[NSNull class]])
+            if (![self.userDict[@"hwBankAccount"] isKindOfClass:[NSNull class]])
             {
-                cell.contentLabel.text = [NSString stringWithFormat:@"%@",model.cardNumber];
+                cell.contentLabel.text = [NSString stringWithFormat:@"%@", [self.userDict valueForKeyPath:@"hwBankAccount.cardNumber"]];
             }
         }
     }

HappyWork/HappyWork/Custom/CustomView/Refresh_上拉下拉刷新/HJRefreshFooterView.h

@@ -10,7 +10,9 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface HJRefreshFooterView : MJRefreshAutoNormalFooter
+@interface HWRefreshFooterView : MJRefreshAutoNormalFooter
+
+@property (nonatomic, assign) BOOL noText;
 
 @end
 

HappyWork/HappyWork/Custom/CustomView/Refresh_上拉下拉刷新/HJRefreshFooterView.m

@@ -6,9 +6,9 @@
 //  Copyright © 2019 Bob. All rights reserved.
 //
 
-#import "HJRefreshFooterView.h"
+#import "HWRefreshFooterView.h"
 
-@implementation HJRefreshFooterView
+@implementation HWRefreshFooterView
 
 - (instancetype)initWithFrame:(CGRect)frame {
     
@@ -21,7 +21,7 @@
 }
 - (void)setState:(MJRefreshState)state {
     
-    MJRefreshCheckState;
+//    MJRefreshCheckState;
     
     switch (state) {
         case MJRefreshStateIdle:
@@ -34,8 +34,11 @@
             self.stateLabel.text = @"数据加载中...";
             break;
         case MJRefreshStateNoMoreData:
+        {
+//            NSLog(@":::::::::::%d",self.noText);
             // 第一次加载的时候没有数据，不显示更多文体提示
-            self.stateLabel.text = (self.scrollView.mj_totalDataCount > 0) ? @"没有更多了" : nil;
+            self.stateLabel.text = (self.scrollView.mj_totalDataCount > 0) ? (self.noText ? @"":@"没有更多了") : nil;
+        }
         default:
             break;
     }

HappyWork/HappyWork/Custom/CustomView/Refresh_上拉下拉刷新/HJRefreshHeaderView.h

@@ -10,7 +10,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface HJRefreshHeaderView : MJRefreshHeader
+@interface HWRefreshHeaderView : MJRefreshHeader
 
 @end
 

HappyWork/HappyWork/Custom/CustomView/Refresh_上拉下拉刷新/HJRefreshHeaderView.m

@@ -6,13 +6,15 @@
 //  Copyright © 2019 Bob. All rights reserved.
 //
 
-#import "HJRefreshHeaderView.h"
+#import "HWRefreshHeaderView.h"
+
+@interface HWRefreshHeaderView ()
 
-@interface HJRefreshHeaderView ()
 @property (nonatomic, strong) UIImageView *imageView;
+
 @end
 
-@implementation HJRefreshHeaderView
+@implementation HWRefreshHeaderView
 
 - (instancetype)init {
     

HappyWork/HappyWork/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>UIUserInterfaceStyle</key>
+	<string>Light</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>

HappyWork/HappyWork/Support/HWAPI.h

@@ -52,4 +52,7 @@
 /* 首页banner图 */
 #define banner [NSString stringWithFormat:@"%@/api/hwUser/banner",kHWBaseURL]
 
+
+
+
 #endif /* HWAPI_h */

HappyWork/HappyWork/Support/HWAppService.m

@@ -196,8 +196,8 @@
     NSNumberFormatter* numberFormatter = [[NSNumberFormatter alloc] init];
     [numberFormatter setFormatterBehavior: NSNumberFormatterBehavior10_4];
     [numberFormatter setNumberStyle:NSNumberFormatterDecimalStyle];
-    [numberFormatter setMaximumFractionDigits:0];
-    [numberFormatter setMinimumFractionDigits:0];
+    [numberFormatter setMaximumFractionDigits:2];
+    [numberFormatter setMinimumFractionDigits:2];
     
     NSMutableString * string = [[numberFormatter stringFromNumber:[NSNumber numberWithDouble:number]] mutableCopy];
     

HappyWork/HappyWork/Support/HWConfig.h

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

HappyWork/HappyWork/Support/HappyWork.pch

@@ -20,8 +20,8 @@
 #import "UIView+HJLoadingViewAndErrorView.h"
 #import "HWConfirmPanelView.h"
 #import "PageListViewController.h"
-#import "HJRefreshHeaderView.h"
-#import "HJRefreshFooterView.h"
+#import "HWRefreshHeaderView.h"
+#import "HWRefreshFooterView.h"
 #import "AddressPickViewView.h"
 #import "HWConfig.h"
 #import "AFNetworking.h"
@@ -67,6 +67,8 @@ self.navigationItem.backBarButtonItem = barItem;
 
 #define COLOR_BLUE_32    [UIColor colorFromHexString:@"3243BD"]
 
+#define COLOR_BACK_C     [UIColor colorFromHexString:@"CCCCCC"]
+
 
 /*
  *改变头像刷新
@@ -74,6 +76,7 @@ self.navigationItem.backBarButtonItem = barItem;
 /* 改变头像 */
 #define changeHeadPortrait               @"changeHeadPortraitNotification"
 
-
+/* 确认订单通知 */
+#define confirmationOrderNotification   @"ConfirmationoforderNotification"
 
 #endif /* HappyWork_pch */