Bob hace 6 años
padre
commit
b8147b8c52

BIN
HappyJob/HappyJob.xcworkspace/xcuserdata/Bob.xcuserdatad/UserInterfaceState.xcuserstate


+ 1 - 15
HappyJob/HappyJob/Join_拼工/HJJoinDetailViewController.m

@@ -39,7 +39,6 @@
 @property (nonatomic, strong) UIView *companyInfoView;
 @property (nonatomic, strong) UIView *otherInfoView;
 @property (nonatomic, strong) HJJoinDetailJoinView *joinView;
-@property (nonatomic, strong) UIButton *applyGroupButton;
 @property (nonatomic, strong) HJJoinApplyGroupAPIManager *applyGroupAPIManager;
 @end
 
@@ -242,7 +241,7 @@
     [detailView.scrollLayoutView.contentView addSubview:self.otherInfoView];
     [detailView.scrollLayoutView.contentView addSubview:self.trafficView];
     [detailView.scrollLayoutView.contentView addSubview:self.companyInfoView];
-    [detailView.scrollLayoutView.footerView addSubview:self.applyGroupButton];
+    [detailView.scrollLayoutView.footerView addSubview:self.detailView.applyButton];
     [detailView.scrollLayoutView makeConstraints];
 }
 
@@ -258,10 +257,6 @@
 
 #pragma mark - event response
 
-- (void)applyGroupButtonClicked:(UIButton *)sender {
-    
-}
-
 #pragma mark - private methods
 
 #pragma mark - getters and setters
@@ -335,13 +330,4 @@
     return _joinView;
 }
 
-- (UIButton *)applyGroupButton {
-    if (_applyGroupButton == nil) {
-        _applyGroupButton = [[UIButton alloc] init];
-        _applyGroupButton = [UIButton hj_createGradientButtonWithTitle:@"申请岗位"];
-        [_applyGroupButton addTarget:self action:@selector(applyGroupButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
-    }
-    return _applyGroupButton;
-}
-
 @end

+ 2 - 0
HappyJob/HappyJob/Join_拼工/HJJoinViewController.m

@@ -13,6 +13,7 @@
 #import "HJGetGroupPositionAPIManager.h"
 #import "UIViewController+FBNavBarRightButtonItems.h"
 #import "HJJoinAgreementViewController.h"
+#import "HJCityPickerCity.h"
 
 @interface HJJoinViewController () <UITableViewDelegate>
 @property (nonatomic, strong) UIButton *agreementButton;
@@ -32,6 +33,7 @@
     [self.view addSubview:self.pageListView];
     [self makeConstraints];
     
+    self.getGroupPositionAPIManager.cityCode = [HJCityPickerCity locationCity].adcode;
     [self.getGroupPositionAPIManager start];
 }
 

+ 2 - 1
HappyJob/HappyJob/Join_拼工/JoinAPIManager/HJGetGroupPositionAPIManager.h

@@ -11,7 +11,8 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface HJGetGroupPositionAPIManager : HJPageableAPIManager
-
+/** 城市编码 */
+@property (nonatomic, copy, nullable) NSString *cityCode;
 @end
 
 NS_ASSUME_NONNULL_END

+ 9 - 0
HappyJob/HappyJob/Join_拼工/JoinAPIManager/HJGetGroupPositionAPIManager.m

@@ -14,4 +14,13 @@
     return @"hpposition/groupPosition";
 }
 
+- (NSDictionary *)parameters {
+    NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithDictionary:[super parameters]];
+    if (self.cityCode.length > 0) {
+        [dict setObject:self.cityCode forKey:@"cityCode"];
+    }
+    
+    return [dict copy];
+}
+
 @end

+ 6 - 4
HappyJob/HappyJob/Join_拼工/JoinAPIManager/HJJoinApplyGroupAPIManager.m

@@ -25,7 +25,7 @@
 }
 
 - (FBAPIManagerErrorType)manager:(FBBaseAPIManager *)manager validWithCallParamsData:(NSDictionary *)data {
-    if (self.userID == nil || self.userToken == nil) {
+    if (self.userID == nil || self.userToken == nil || self.positionID < 0 || self.positionType < 0) {
         return FBAPIManagerErrorTypeParamsError;
     }
     
@@ -49,10 +49,12 @@
         @"user_id": self.userID,
         @"user_token": self.userToken,
         @"positionCategory": @(self.positionType),
-        @"positionId": @(self.positionID),
-        @"groupId": @(self.groupID)
+        @"positionId": @(self.positionID)
     }];
-    if (self.inviterID != 0) {
+    if (self.groupID > 0) {
+        [dict setObject:@(self.groupID) forKey:@"groupId"];
+    }
+    if (self.inviterID > 0) {
         [dict setObject:@(self.inviterID) forKey:@"inviteUser_id"];
     }
     return dict;