bug修改，集成支付

HappyJob/HappyJob.xcodeproj/project.pbxproj

@@ -82,6 +82,8 @@
 		713D344423066D43007DCBB6 /* HJFullTimeDetailHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713D344323066D43007DCBB6 /* HJFullTimeDetailHeaderView.m */; };
 		713D344723066DC6007DCBB6 /* HJPartTimeDetailHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713D344623066DC6007DCBB6 /* HJPartTimeDetailHeaderView.m */; };
 		713D344A2306F16D007DCBB6 /* BMessageDataBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 713D34492306F16D007DCBB6 /* BMessageDataBox.m */; };
+		714396AE236A6A5C00EA1789 /* WechatPay.m in Sources */ = {isa = PBXBuildFile; fileRef = 714396AD236A6A5C00EA1789 /* WechatPay.m */; };
+		714396B1236A6BDA00EA1789 /* AlipayPay.m in Sources */ = {isa = PBXBuildFile; fileRef = 714396B0236A6BDA00EA1789 /* AlipayPay.m */; };
 		714A00CE2356D97A0090EBB6 /* HJMyWalletAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 714A00CD2356D97A0090EBB6 /* HJMyWalletAPI.m */; };
 		714A00D12356DB0D0090EBB6 /* HJMyWalletDetailListAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 714A00D02356DB0D0090EBB6 /* HJMyWalletDetailListAPI.m */; };
 		714A00D42356DBA20090EBB6 /* HJMyWalletDataBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 714A00D32356DBA20090EBB6 /* HJMyWalletDataBox.m */; };
@@ -593,6 +595,10 @@
 		713D344623066DC6007DCBB6 /* HJPartTimeDetailHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJPartTimeDetailHeaderView.m; sourceTree = "<group>"; };
 		713D34482306F16D007DCBB6 /* BMessageDataBox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BMessageDataBox.h; sourceTree = "<group>"; };
 		713D34492306F16D007DCBB6 /* BMessageDataBox.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BMessageDataBox.m; sourceTree = "<group>"; };
+		714396AC236A6A5C00EA1789 /* WechatPay.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WechatPay.h; sourceTree = "<group>"; };
+		714396AD236A6A5C00EA1789 /* WechatPay.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WechatPay.m; sourceTree = "<group>"; };
+		714396AF236A6BDA00EA1789 /* AlipayPay.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AlipayPay.h; sourceTree = "<group>"; };
+		714396B0236A6BDA00EA1789 /* AlipayPay.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AlipayPay.m; sourceTree = "<group>"; };
 		714A00CC2356D97A0090EBB6 /* HJMyWalletAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJMyWalletAPI.h; sourceTree = "<group>"; };
 		714A00CD2356D97A0090EBB6 /* HJMyWalletAPI.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJMyWalletAPI.m; sourceTree = "<group>"; };
 		714A00CF2356DB0D0090EBB6 /* HJMyWalletDetailListAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJMyWalletDetailListAPI.h; sourceTree = "<group>"; };
@@ -1326,6 +1332,7 @@
 		71019C3922F1A15E007CD2B4 /* Resource */ = {
 			isa = PBXGroup;
 			children = (
+				C41393E822534136009F61FE /* 开心工作用户协议-版1(1).docx */,
 				C40AEC4F22411FA500A9EA23 /* HJCityPickerViewControllerSource.bundle */,
 				71019C3A22F1A184007CD2B4 /* plistFile */,
 			);
@@ -1648,7 +1655,7 @@
 			path = View;
 			sourceTree = "<group>";
 		};
-		7132699722CC8DFD00DEB10B /* PickViewOne */ = {
+		7132699722CC8DFD00DEB10B /* PickView */ = {
 			isa = PBXGroup;
 			children = (
 				7133296B2313CD92002CF6DB /* ValuePickerView.h */,
@@ -1662,7 +1669,7 @@
 				7133297C231427E4002CF6DB /* AddressPickViewView.h */,
 				7133297D231427E4002CF6DB /* AddressPickViewView.m */,
 			);
-			path = PickViewOne;
+			path = PickView;
 			sourceTree = "<group>";
 		};
 		713269C822CCFBEB00DEB10B /* Cell */ = {
@@ -1968,6 +1975,17 @@
 			path = "工作经验";
 			sourceTree = "<group>";
 		};
+		714396AB236A69EA00EA1789 /* Pay_支付 */ = {
+			isa = PBXGroup;
+			children = (
+				714396AC236A6A5C00EA1789 /* WechatPay.h */,
+				714396AD236A6A5C00EA1789 /* WechatPay.m */,
+				714396AF236A6BDA00EA1789 /* AlipayPay.h */,
+				714396B0236A6BDA00EA1789 /* AlipayPay.m */,
+			);
+			path = "Pay_支付";
+			sourceTree = "<group>";
+		};
 		714A00C72356B9FC0090EBB6 /* View */ = {
 			isa = PBXGroup;
 			children = (
@@ -2529,10 +2547,11 @@
 		71714E0E22C99E0F009984B6 /* Custom */ = {
 			isa = PBXGroup;
 			children = (
+				714396AB236A69EA00EA1789 /* Pay_支付 */,
 				C40C4EF0228AA5C2004C9391 /* Welcome_引导页面 */,
 				C4109C442251E8BA007A2FC1 /* WeiXin */,
 				713269F522CDBEA700DEB10B /* Calendar日历 */,
-				7132699722CC8DFD00DEB10B /* PickViewOne */,
+				7132699722CC8DFD00DEB10B /* PickView */,
 				7132690022C9AFFD00DEB10B /* HeaderViewSelectButton */,
 				71714E0F22C99E6B009984B6 /* Utility */,
 				C413FCB12254529B00BEE4F0 /* Components */,
@@ -3063,7 +3082,6 @@
 		C40FF23D223F86F4008868BF /* Login_登录 */ = {
 			isa = PBXGroup;
 			children = (
-				C41393E822534136009F61FE /* 开心工作用户协议-版1(1).docx */,
 				71AC1A0D22F3BBE100569CB5 /* 信息合并 */,
 				C4F657B5224E0EA700E1E625 /* LoginAPIManager */,
 				71A2B01A22F2946700B4FACF /* View */,
@@ -4322,6 +4340,7 @@
 				7133295123139EB6002CF6DB /* BReleasePartTimeBasicInfoViewController.m in Sources */,
 				C411A4C622A7F2A200E7C10A /* HJGetInterviewDetailAPIManager.m in Sources */,
 				71590CF62355517B00F3C099 /* HJMyWalletWithdrawalView.m in Sources */,
+				714396B1236A6BDA00EA1789 /* AlipayPay.m in Sources */,
 				7132690C22C9B1BD00DEB10B /* BReleaseJobsCategoryView.m in Sources */,
 				C40B4CE922953C100081FA4E /* HJGetGroupPositionDetailAPIManager.m in Sources */,
 				C412BDA12278202C0098893C /* HJGetPartTimePositionAPIManager.m in Sources */,
@@ -4384,6 +4403,7 @@
 				713269B522CCDCAD00DEB10B /* BHomeInvitationViewController.m in Sources */,
 				C410F07A2272CFEE002A397C /* FBLabel.m in Sources */,
 				71714E3222C9A27C009984B6 /* BMainViewController.m in Sources */,
+				714396AE236A6A5C00EA1789 /* WechatPay.m in Sources */,
 				71590CE22355517B00F3C099 /* HJMyIntegralExchangePayViewController.m in Sources */,
 				C49612C822655F8900898E55 /* HJTextFieldPopMenuView.m in Sources */,
 				7132699D22CCA62B00DEB10B /* BHomeResumeDetailViewController.m in Sources */,
@@ -4660,6 +4680,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 6TLH64Q4Z4;
 				GCC_PREFIX_HEADER = "HappyJob/HappyJob-Prefix.pch";
 				INFOPLIST_FILE = HappyJob/Info.plist;
@@ -4668,6 +4689,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 3.1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.huijiabo.kaixing;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -4683,6 +4705,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 6TLH64Q4Z4;
 				GCC_PREFIX_HEADER = "HappyJob/HappyJob-Prefix.pch";
 				INFOPLIST_FILE = HappyJob/Info.plist;
@@ -4691,6 +4714,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 3.1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.huijiabo.kaixing;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

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

@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:HappyJob.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:HappyJob.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

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

@@ -17,7 +17,6 @@
 #import "BHomeListAPI.h"//简历列表
 #import "BHomeDataBox.h"
 
-
 @interface BHomeViewController ()
 <
 UITableViewDelegate,
@@ -35,7 +34,6 @@ UIGestureRecognizerDelegate
 @property (nonatomic, strong) BHomeChangeIdentityAPI *IDAPI;//自发布切换身份
 @property (nonatomic, strong) BHomeListAPI           *listAPI;//简历列表
 
-
 @end
 
 @implementation BHomeViewController

HappyJob/HappyJob/CClass/Home_首页/HJHomeViewController.m

@@ -125,6 +125,7 @@ HJPageListViewDelegate
     
     //添加城市选择通知
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(cityPickerViewSelectCity:) name:HJCityPickerCitySelectedNotification object:nil];
+        
 }
 
 #pragma mark - UITableViewDelegate

HappyJob/HappyJob/CClass/Home_首页/HJWebViewController.m

@@ -7,10 +7,11 @@
 //
 
 #import "HJWebViewController.h"
+#import <WebKit/WebKit.h>
 
 @interface HJWebViewController ()
 
-@property (nonatomic, strong) UIWebView *webView;
+@property (nonatomic, strong) WKWebView *webView;
 
 @end
 
@@ -28,19 +29,16 @@
     
     self.navigationItem.title = self.titleStr;
     [self hj_setupNavBar];
-    self.webView  = [[UIWebView alloc]init];
-    
+
+    self.webView  = [[WKWebView alloc]init];
     [self.view addSubview:self.webView];
     [self.webView mas_makeConstraints:^(MASConstraintMaker *make) {
-       
         make.left.equalTo(self.view.mas_left).offset(0);
         make.right.equalTo(self.view.mas_right).offset(0);
         make.top.bottom.equalTo(self.view).offset(0);
     }];
-     [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",self.webUrl]]]];
-    self.webView.scalesPageToFit = YES;
-    
-    
+    [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",self.webUrl]]]];
+//    self.webView.scalesPageToFit = YES;
 }
 
 /*

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

@@ -127,7 +127,6 @@ FBScrollLayoutViewDelegate
     {
         _nameView = [[HJLabelTextFieldView alloc] init];
         _nameView.titleLabel.text = @"姓名：";
-        
         NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] initWithString:@"点击输入真实姓名" attributes:@{NSForegroundColorAttributeName:COLOR_BACKC}];
         _nameView.contentTextField.attributedPlaceholder = attrString;
         [_nameView.contentTextField addTarget:self action:@selector(contentTextFieldClick) forControlEvents:UIControlEventEditingChanged];
@@ -141,7 +140,6 @@ FBScrollLayoutViewDelegate
     {
         _IDView = [[HJLabelTextFieldView alloc] init];
         _IDView.titleLabel.text = @"证件号码：";
-        
         NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] initWithString:@"点击输入身份证件号码" attributes:@{NSForegroundColorAttributeName:COLOR_BACKC}];
         _IDView.contentTextField.attributedPlaceholder = attrString;
         [_IDView.contentTextField addTarget:self action:@selector(contentTextFieldClick) forControlEvents:UIControlEventEditingChanged];

HappyJob/HappyJob/CClass/Me_我/Salary_薪资查询/HJSalaryDetailViewController.m

@@ -245,10 +245,7 @@ FBAPIManagerDelegate
         _timeView.titleLabel.text = @"查询范围：";
         _timeView.contentTextField.inputView = self.datePickerView;
         _timeView.contentTextField.delegate = self;
-        
-        NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] initWithString:@"点击选择薪资查询时间范围" attributes:@{NSForegroundColorAttributeName:COLOR_BACKC}];
-        _timeView.contentTextField.attributedPlaceholder = attrString;
-        
+        _timeView.contentTextField.placeholder = @"点击选择薪资查询时间范围";
     }
     return _timeView;
 }

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-----");
+//    NSLog(@"-----deallocdeallocdeallocdealloc-----");
 }
 
 - (void)viewWillAppear:(BOOL)animated {

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

@@ -184,21 +184,21 @@ FBAPIManagerInterceptor
     
     HJMyIntergralExchangeGiftListModel *model = [HJMyIntergralExchangeGiftListModel yy_modelWithDictionary:self.detailDict[@"data"][@"mpCompaignsRewardSettingAPI"]];
     
-    if ([model.money integerValue] == 0)
-    {//不需要支付的
-        self.inputPhoneView = [[HJConfirmPanelInputView alloc]init];
-        self.inputPhoneView.titleLabel.text = @"请留下您的联系方式";
-        self.inputPhoneView.inputTF.keyboardType = UIKeyboardTypeNumberPad;
-        [self.inputPhoneView.confirmButton setTitle:@"好的" forState:UIControlStateNormal];
-        [self.inputPhoneView.confirmButton addTarget:self action:@selector(confirmButtonClick:) forControlEvents:UIControlEventTouchUpInside];
-        [self.inputPhoneView ShowConfirmPanelInputView];
-        self.exchangeGiftAPI.mpCompaignsRewardSettingId = model.ID;
-    }
-    else
-    {
+//    if ([model.money integerValue] == 0)
+//    {//不需要支付的
+//        self.inputPhoneView = [[HJConfirmPanelInputView alloc]init];
+//        self.inputPhoneView.titleLabel.text = @"请留下您的联系方式";
+//        self.inputPhoneView.inputTF.keyboardType = UIKeyboardTypeNumberPad;
+//        [self.inputPhoneView.confirmButton setTitle:@"好的" forState:UIControlStateNormal];
+//        [self.inputPhoneView.confirmButton addTarget:self action:@selector(confirmButtonClick:) forControlEvents:UIControlEventTouchUpInside];
+//        [self.inputPhoneView ShowConfirmPanelInputView];
+//        self.exchangeGiftAPI.mpCompaignsRewardSettingId = model.ID;
+//    }
+//    else
+//    {
         HJMyIntegralExchangePayViewController *vc = [[HJMyIntegralExchangePayViewController alloc]init];
         [self.navigationController pushViewController:vc animated:YES];
-    }
+//    }
 
 //    HJConfirmPanelSingleView *vc = [[HJConfirmPanelSingleView alloc]init];
 //    vc.titleLabel.text = @"兑换失败： 您慢了一步，已经被抢完了";

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

@@ -9,6 +9,8 @@
 #import "HJMyIntegralExchangePayViewController.h"
 #import "HJMyIntegralExchangePayHeaderView.h"
 #import "HJMyIntegralExchangePayTypeView.h"
+#import "WechatPay.h"
+#import "AlipayPay.h"
 
 @interface HJMyIntegralExchangePayViewController ()<FBScrollLayoutViewDelegate,UIGestureRecognizerDelegate>
 
@@ -117,6 +119,25 @@
     self.AliPayView.selectBtn.selected = YES;
     [self.makeSureBtn az_setGradientBackgroundWithColors:@[COLOR_GRADIENT_START,COLOR_GRADIENT_END] locations:@[@(0.0),@(1.0f)] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
 }
+
+- (void)payClick:(UIButton *)btn {
+    
+    if (self.WeChatPayView.selectBtn.selected)
+    {
+        [[WechatPay shareWeChatPay] weixinPayOrderDict:@{} andPayResult:^(PayReultType reslutType) {
+           
+            
+        }];
+        
+    }
+    else if (self.AliPayView.selectBtn.selected)
+    {
+        [[AlipayPay shareAliPay] aliProductInfo:@"xjixsijjijijxsijisaija" andPayResult:^(PayReultType reslutType) {
+            
+        }];
+    }
+}
+
 #pragma mark - setter and getter
 
 - (FBScrollLayoutView *)scrollLayoutView {
@@ -193,6 +214,7 @@
         _makeSureBtn.backgroundColor = COLOR_BACKD8;
         _makeSureBtn.layer.cornerRadius = 5;
         _makeSureBtn.layer.masksToBounds = YES;
+        [_makeSureBtn addTarget:self action:@selector(payClick:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _makeSureBtn;
 }

HappyJob/HappyJob/Custom/Components/CustomControl/UIButton/UIButton+HJGradientButton.m

@@ -19,7 +19,6 @@
     [button setTitle:title forState:UIControlStateNormal];
     [button setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
     // 设置背景色渐变
-    
     [button az_setGradientBackgroundWithColors:@[COLOR_GRADIENT_START,
                                                        COLOR_GRADIENT_END]
                                            locations:@[@(0.0),@(1.0f)]

HappyJob/HappyJob/Custom/Components/CustomControl/UIView/Refresh_上拉下拉刷新/HJRefreshFooterView.m

@@ -11,6 +11,7 @@
 @implementation HJRefreshFooterView
 
 - (void)setState:(MJRefreshState)state {
+    
     MJRefreshCheckState;
     
     switch (state) {

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

@@ -0,0 +1,25 @@
+//
+//  AlipayPay.h
+//  HappyJob
+//
+//  Created by 张晓光 on 2019/10/31.
+//  Copyright © 2019 Bob. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface AlipayPay : NSObject
+
+//支付结果回调block
+@property (nonatomic,copy)UnionPayResult resultBlock;
+
++ (AlipayPay *)shareAliPay;
+
+- (BOOL)aliProductInfo:(NSString *)productSubject andPayResult:(UnionPayResult)resultBlock;
+
+
+@end
+
+NS_ASSUME_NONNULL_END

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

@@ -0,0 +1,97 @@
+//
+//  AlipayPay.m
+//  HappyJob
+//
+//  Created by 张晓光 on 2019/10/31.
+//  Copyright © 2019 Bob. All rights reserved.
+//
+
+#import "AlipayPay.h"
+#import <AlipaySDK/AlipaySDK.h>
+
+static AlipayPay *_staticInterface = nil;
+
+@implementation AlipayPay
+
++ (AlipayPay *)shareAliPay
+{
+    if(_staticInterface == nil)
+    {
+        _staticInterface = [[AlipayPay alloc] init];
+    }
+    return _staticInterface;
+}
+
+- (instancetype)init
+{
+    if(self = [super init])
+    {
+        //注册 支付 成功/取消/失败 的通知
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(paySucceed) name:kNotifiAliPaySucceed object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(payFailed) name:kNotifiAliPayFailed object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(payCanceled) name:kNotifiAliPayCancel object:nil];
+    }
+    return self;
+}
+- (BOOL)aliProductInfo:(NSString *)productSubject andPayResult:(UnionPayResult)resultBlock {
+    
+    // NOTE: 调用支付结果开始支付
+    [[AlipaySDK defaultService] payOrder:productSubject fromScheme:@"AlipayHappyJob" callback:^(NSDictionary *resultDic) {
+        
+        NSLog(@"reslut = %@",resultDic);
+        
+        if([resultDic[@"resultStatus"] intValue] == 9000)
+        {
+            NSLog(@"支付宝：：：%@",resultDic);
+            if(resultBlock)
+            {
+                resultBlock(Pay_result_type_succeed);
+            }
+        }
+        else if([resultDic[@"resultStatus"] intValue] == 6001)
+        {
+            if(resultBlock)
+            {
+                resultBlock(Pay_result_type_cancel);
+            }
+        }
+        else
+        {
+            if(resultBlock)
+            {
+                resultBlock(Pay_result_type_failed);
+            }
+        }
+        
+    }];
+    
+    return YES;
+}
+#pragma mark - 支付结果通知
+
+- (void)paySucceed
+{
+    if(_resultBlock)
+    {
+        _resultBlock(Pay_result_type_succeed);
+    }
+}
+
+- (void)payFailed
+{
+    if(_resultBlock)
+    {
+        _resultBlock(Pay_result_type_failed);
+    }
+}
+
+- (void)payCanceled
+{
+    if(_resultBlock)
+    {
+        _resultBlock(Pay_result_type_cancel);
+    }
+}
+
+
+@end

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

@@ -0,0 +1,30 @@
+//
+//  WechatPay.h
+//  HappyJob
+//
+//  Created by 张晓光 on 2019/10/31.
+//  Copyright © 2019 Bob. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface WechatPay : NSObject
+
+//支付结果回调block
+@property (nonatomic,copy)UnionPayResult resultBlock;
+
+/*
+在AppDelegate里面需要注册回调监听通知
+ */
+
++ (WechatPay *)shareWeChatPay;
+
+
+-(void)weixinPayOrderDict:(NSDictionary *)orderDic andPayResult:(UnionPayResult)payResult;
+
+
+@end
+
+NS_ASSUME_NONNULL_END

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

@@ -0,0 +1,103 @@
+//
+//  WechatPay.m
+//  HappyJob
+//
+//  Created by 张晓光 on 2019/10/31.
+//  Copyright © 2019 Bob. All rights reserved.
+//
+
+#import "WechatPay.h"
+
+#import "WXApi.h"//微信SDK头文件
+
+static WechatPay *_staticInterface = nil;
+
+@implementation WechatPay
+
++ (WechatPay *)shareWeChatPay
+{
+    if(_staticInterface == nil)
+    {
+        _staticInterface = [[WechatPay alloc] init];
+    }
+    return _staticInterface;
+    
+}
+- (instancetype)init
+{
+    if(self = [super init])
+    {
+        //注册 支付 成功/取消/失败 的通知
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(paySucceed) name:kNotifiWeChatPaySucceed object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(payFailed) name:kNotifiWeChatPayFailed object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(payCanceled) name:kNotifiWeChatPayCancel object:nil];
+    }
+    return self;
+}
+-(void)weixinPayOrderDict:(NSDictionary *)orderDic andPayResult:(UnionPayResult)payResult {
+    
+    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"];
+    
+    
+    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];
+    
+    if(isSucceed)
+    {
+        NSLog(@"发起微信支付成功");
+    }else
+    {
+        NSLog(@"发起微信支付失败");
+        if(self->_resultBlock)
+        {
+            self->_resultBlock(Pay_result_type_failed);
+        }
+    }
+
+}
+
+#pragma mark - 支付结果通知
+
+- (void)paySucceed
+{
+    if(_resultBlock)
+    {
+        _resultBlock(Pay_result_type_succeed);
+    }
+}
+
+- (void)payFailed
+{
+    if(_resultBlock)
+    {
+        _resultBlock(Pay_result_type_failed);
+    }
+}
+
+- (void)payCanceled
+{
+    if(_resultBlock)
+    {
+        _resultBlock(Pay_result_type_cancel);
+    }
+}
+
+@end

HappyJob/HappyJob/Custom/WeiXin/HJWeiXinAPIManager.m

@@ -71,6 +71,23 @@
             }
         }
     }
+
+    //支付的
+    if ([resp isKindOfClass:[PayResp class]])
+    {
+        if (resp.errCode == 0)
+        {//成功
+            [[NSNotificationCenter defaultCenter] postNotificationName:kNotifiWeChatPaySucceed object:nil];
+        }
+        else if (resp.errCode == -1)
+        {//错误
+            [[NSNotificationCenter defaultCenter] postNotificationName:kNotifiWeChatPayFailed object:nil];
+        }
+        else
+        {//用户取消
+            [[NSNotificationCenter defaultCenter] postNotificationName:kNotifiWeChatPayCancel object:nil];
+        }
+    }
 }
 
 @end

HappyJob/HappyJob/HappyJob-Prefix.pch

@@ -133,7 +133,28 @@ self.navigationItem.backBarButtonItem = barItem;
 /* 企业认证结果通知 */
 #define HJEnterpriseAuthResultNotification      @"enterpriseAuthResultNotification"
 
-
+/*
+ *支付的
+ */
+/* 支付宝支付回调通知 */
+#define kNotifiAliPaySucceed     @"HCNOTIAliPaySucceed"
+#define kNotifiAliPayFailed      @"HCNOTIAliPayFailed"
+#define kNotifiAliPayCancel      @"HCNOTIAliPayCancel"
+/* 微信支付回调通知 */
+#define kNotifiWeChatPaySucceed  @"HCNOTIWeChatPaySucceed"
+#define kNotifiWeChatPayFailed   @"HCNOTIWeChatPayFailed"
+#define kNotifiWeChatPayCancel   @"HCNOTIWeChatPayCancel"
+
+/* 支付结果枚举类 */
+typedef enum
+{
+    Pay_result_type_failed = 0, //支付失败
+    Pay_result_type_cancel, //支付取消
+    Pay_result_type_succeed, //支付成功
+    
+}PayReultType;
+/* 支付回调block */
+typedef void(^UnionPayResult)(PayReultType reslutType);
 
 
 #endif /* HappyJob_Prefix_pch */

HappyJob/HappyJob/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.2</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -32,11 +32,14 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>iosamap</string>
 		<string>weixin</string>
+		<string>wechat</string>
+		<string>alipay</string>
+		<string>alipayshare</string>
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>

HappyJob/HappyJob/Login_登录/View/HJLoginFieldView.m

@@ -143,9 +143,7 @@
     {
         _phoneTextField = [[UITextField alloc] init];
         _phoneTextField.font = [UIFont systemFontOfSize:16];
-        NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] initWithString:@"请输入手机号" attributes:
-             @{NSForegroundColorAttributeName:COLOR_BACKC,NSFontAttributeName:[UIFont systemFontOfSize:16]}];
-        _phoneTextField.attributedPlaceholder = attrString;
+        _phoneTextField.placeholder = @"请输入手机号";
         _phoneTextField.borderStyle = UITextBorderStyleNone;
         _phoneTextField.keyboardType = UIKeyboardTypeNumberPad;
         _phoneTextField.clearButtonMode = UITextFieldViewModeWhileEditing;
@@ -165,9 +163,7 @@
         _codeTextField.borderStyle = UITextBorderStyleNone;
         _codeTextField.keyboardType = UIKeyboardTypeNumberPad;
         _codeTextField.clearButtonMode = UITextFieldViewModeWhileEditing;
-        NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] initWithString:@"请输入短信验证码" attributes:
-             @{NSForegroundColorAttributeName:COLOR_GRAYPL,NSFontAttributeName:[UIFont systemFontOfSize:16]}];
-        _codeTextField.attributedPlaceholder = attrString;
+        _codeTextField.placeholder = @"请输入短信验证码";
         _codeTextField.textColor = COLOR_BACK3;
         // 如果系统是iOS12，添加自动填充短信验证码功能
         if (@available(iOS 12.0, *))

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

@@ -7,12 +7,14 @@
 //
 
 #import "HJLoginUserAgreementViewController.h"
+#import <WebKit/WebKit.h>
 #import "UIButton+HJGradientButton.h"
 #import "UIViewController+HJNavBar.h"
 
-@interface HJLoginUserAgreementViewController ()
+@interface HJLoginUserAgreementViewController ()<WKUIDelegate>
 
-@property (nonatomic, strong) UIWebView *webView;
+//@property (nonatomic, strong) UIWebView *webView;
+@property (nonatomic, strong) WKWebView *webView;
 
 @end
 
@@ -32,6 +34,17 @@
     [self.view addSubview:self.webView];
     
     [self makeConstraints];
+    
+    NSString *path = [[NSBundle mainBundle] pathForResource:@"开心工作用户协议-版1(1)" ofType:@"docx"];
+    NSURL *url = [NSURL fileURLWithPath:path];
+    [_webView loadRequest:[NSURLRequest requestWithURL:url]];
+    WKWebViewConfiguration *config = [[WKWebViewConfiguration alloc]init];
+    if (@available(iOS 10.0, *))
+    {
+        config.dataDetectorTypes = UIDataDetectorTypePhoneNumber;
+        
+    }
+    
 }
 
 - (void)makeConstraints {
@@ -43,19 +56,28 @@
     
 }
 
+#pragma mark - WKWebView代理
+
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void(^)(WKNavigationActionPolicy))decisionHandler
+{
+    NSString *URL = navigationAction.request.URL.absoluteString;
+    NSLog(@"%@", URL);
+    NSString *lowUrl = URL.lowercaseString;
+    NSLog(@"%@", lowUrl);
+    decisionHandler(WKNavigationActionPolicyAllow);
+}
 
 #pragma mark - getters and setters
 
-- (UIWebView *)webView {
+- (WKWebView *)webView {
     
     if (_webView == nil)
     {
-        NSString *path = [[NSBundle mainBundle] pathForResource:@"开心工作用户协议-版1(1)" ofType:@"docx"];
-        NSURL *url = [NSURL fileURLWithPath:path];
-        _webView = [[UIWebView alloc] init];
-        [_webView loadRequest:[NSURLRequest requestWithURL:url]];
-        _webView.scalesPageToFit = YES;
+        _webView = [[WKWebView alloc] init];
+//        _webView.scalesPageToFit = YES;
+        
         _webView.backgroundColor = [UIColor whiteColor];
+        _webView.UIDelegate = self;
     }
     return _webView;
 }

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

@@ -7,28 +7,28 @@
 //
 
 #import "AppDelegate.h"
-#import "HJLoginViewController.h"
-#import "HJMainViewController.h"
-#import "FBNetworkingConfig.h"
-#import "HJWeiXinAPIManager.h"
-#import "HJUserInfoModel.h"
-#import "UIButton+HJGradientButton.h"
-#import <IQKeyboardManager/IQKeyboardManager.h>
 #import <WXApi.h>
+#import <Bugly/Bugly.h>
+#import <AlipaySDK/AlipaySDK.h>
 #import <XHLaunchAd/XHLaunchAd.h>
-#import "HJWelcomeViewController.h"
+#import <IQKeyboardManager/IQKeyboardManager.h>
 #import <AMapFoundationKit/AMapFoundationKit.h>
-#import <Bugly/Bugly.h>
+#import "HJLoginViewController.h"//登录
 
+#import "HJMainViewController.h"//C端的
 #import "BMainViewController.h"//自发布的
+#import "HJWelcomeViewController.h"//引导页
 #import "BReleaseJobsViewController.h"//发布工作
-#import "BReleaseSelectTypeView.h"
-#import "HJLoginViewController.h"//登录
+#import "BReleaseSelectTypeView.h"//选择发布类型
+#import "FBNetworkingConfig.h"//网络配置
+#import "HJWeiXinAPIManager.h"
+#import "HJUserInfoModel.h"
+#import "UIButton+HJGradientButton.h"
 
 @interface AppDelegate () <HJWelcomeViewDelegate,UITabBarControllerDelegate>
 
 @property (nonatomic, strong) BMainViewController  *bTabBarC;//自发布
-@property (nonatomic, strong) HJMainViewController *CTabBarC;
+@property (nonatomic, strong) HJMainViewController *CTabBarC;//C端
 @property (nonatomic, assign) int                  lastIndex;//tabBar选中的上一个的视图索引
 
 @end
@@ -44,36 +44,6 @@
     //设置状态栏为白色的
     [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO];
     
-
-    if (@available(iOS 13.0, *))
-    {
-        self.window.overrideUserInterfaceStyle = UIUserInterfaceStyleLight;
-       
-    }
-    else
-    {
-        // Fallback on earlier versions
-        
-    }
-    
-    if (@available(iOS 13.0, *))
-    {
-        UIUserInterfaceStyle mode = UITraitCollection.currentTraitCollection.userInterfaceStyle;
-        
-        if (mode == UIUserInterfaceStyleDark)
-        {
-            NSLog(@"深色模式");
-        }
-        else if (mode == UIUserInterfaceStyleLight)
-        {
-            NSLog(@"浅色模式");
-        }
-        else
-        {
-            NSLog(@"未知模式");
-        }
-    }
-    
     //配置广告数据
     [self setupAd];
     
@@ -107,6 +77,7 @@
     {
         self.window.rootViewController = [self setupFirstViewController];
     }
+    
     [self.window makeKeyAndVisible];
     
     return YES;
@@ -115,17 +86,26 @@
 /* iOS 9 之前用 */
 - (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url {
     
-    return [WXApi handleOpenURL:url delegate:[HJWeiXinAPIManager sharedManager]];
+    [WXApi handleOpenURL:url delegate:[HJWeiXinAPIManager sharedManager]];
+    [self AlipayPayResult:url];
+    return YES;
 }
 
 - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation {
     
-    return [WXApi handleOpenURL:url delegate:[HJWeiXinAPIManager sharedManager]];
+    [WXApi handleOpenURL:url delegate:[HJWeiXinAPIManager sharedManager]];
+    [self AlipayPayResult:url];
+    
+    return YES;
 }
+
 /* iOS 9之后用 */
 - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
     
-    return [WXApi handleOpenURL:url delegate:[HJWeiXinAPIManager sharedManager]];
+    [WXApi handleOpenURL:url delegate:[HJWeiXinAPIManager sharedManager]];
+    [self AlipayPayResult:url];
+    
+    return YES;
 }
 
 #pragma mark - HJWelcomeViewDelegate
@@ -135,53 +115,6 @@
     self.window.rootViewController = [self setupFirstViewController];
 }
 
-#pragma mark - event response
-
-- (void)launchStartButtonClicked:(UIButton *)sender {
-    
-    [XHLaunchAd removeAndAnimated:YES];
-}
-
-#pragma mark - private methods
-
-- (UIViewController *)setupFirstViewController {
-    
-    if ([HJMemberInfoModel memberInfo].memberId == nil || [[HJMemberInfoModel memberInfo].memberId isEqualToString: @""])
-    {   //c端
-        _CTabBarC = [[HJMainViewController alloc] init];
-        _CTabBarC.delegate = self;
-        return _CTabBarC;
-    }
-    else
-    {
-        if (USERTYPE)
-        {   //自发布
-            _bTabBarC = [[BMainViewController alloc]init];
-            _bTabBarC.delegate = self;
-            return _bTabBarC;
-        }
-        else
-        {   //c端
-            _CTabBarC = [[HJMainViewController alloc] init];
-            _CTabBarC.delegate = self;
-            return _CTabBarC;
-        }
-    }
-}
-
-/* 推出登录 */
--(void)pushLoginViewController {
-    
-    HJLoginViewController *loginVC=[[HJLoginViewController alloc]init];
-    UINavigationController *navi=[[UINavigationController alloc]initWithRootViewController:loginVC];
-    navi.modalPresentationStyle = UIModalPresentationFullScreen;
-    [self.window.rootViewController presentViewController:navi animated:YES completion:nil];
-}
-/* 切换身份 */
-- (void)switchTabBar {
-    
-    self.window.rootViewController = [self setupFirstViewController];
-}
 #pragma mark - UITabBarControllerDelegate 代理
 
 - (BOOL)tabBarController:(UITabBarController *)tabBarController shouldSelectViewController:(UIViewController *)viewController
@@ -242,6 +175,57 @@
         }
     }
 }
+
+#pragma mark - event response
+
+- (void)launchStartButtonClicked:(UIButton *)sender {
+    
+    [XHLaunchAd removeAndAnimated:YES];
+}
+
+#pragma mark - private methods
+
+/* 设置展示哪个端（C端和自发布端） */
+- (UIViewController *)setupFirstViewController {
+    
+    if ([HJMemberInfoModel memberInfo].memberId == nil || [[HJMemberInfoModel memberInfo].memberId isEqualToString: @""])
+    {   //c端
+        _CTabBarC = [[HJMainViewController alloc] init];
+        _CTabBarC.delegate = self;
+        return _CTabBarC;
+    }
+    else
+    {
+        if (USERTYPE)
+        {   //自发布
+            _bTabBarC = [[BMainViewController alloc]init];
+            _bTabBarC.delegate = self;
+            return _bTabBarC;
+        }
+        else
+        {   //c端
+            _CTabBarC = [[HJMainViewController alloc] init];
+            _CTabBarC.delegate = self;
+            return _CTabBarC;
+        }
+    }
+}
+
+/* 推出登录 */
+-(void)pushLoginViewController {
+    
+    HJLoginViewController *loginVC=[[HJLoginViewController alloc]init];
+    UINavigationController *navi=[[UINavigationController alloc]initWithRootViewController:loginVC];
+    navi.modalPresentationStyle = UIModalPresentationFullScreen;
+    [self.window.rootViewController presentViewController:navi animated:YES completion:nil];
+}
+
+/* 切换身份 */
+- (void)switchTabBar {
+    
+    self.window.rootViewController = [self setupFirstViewController];
+}
+
 /* 配置启动页 */
 - (void)setupAd {
     
@@ -268,6 +252,28 @@
     imageAdconfiguration.showFinishAnimate = ShowFinishAnimateLite;
     [XHLaunchAd imageAdWithImageAdConfiguration:imageAdconfiguration delegate:self];
 }
+
+/* 支付宝支付结果 */
+- (void)AlipayPayResult:(NSURL *)url {
+    
+    //跳转支付宝钱包进行支付，处理支付结果
+    [[AlipaySDK defaultService] processOrderWithPaymentResult:url standbyCallback:^(NSDictionary *resultDic) {
+        
+        if([resultDic[@"resultStatus"] intValue] == 9000)
+        {
+            [[NSNotificationCenter defaultCenter] postNotificationName:kNotifiAliPaySucceed object:nil];
+        }
+        else if([resultDic[@"resultStatus"] intValue] == 6001)
+        {
+            [[NSNotificationCenter defaultCenter] postNotificationName:kNotifiAliPayCancel object:nil];
+        }
+        else
+        {
+            [[NSNotificationCenter defaultCenter] postNotificationName:kNotifiAliPayFailed object:nil];
+        }
+        
+    }];
+}
 - (void)applicationWillResignActive:(UIApplication *)application {
     
 }
@@ -285,7 +291,7 @@
 }
 
 - (void)applicationWillTerminate:(UIApplication *)application {
-    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+    
 }
 
 

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

@@ -76,7 +76,6 @@
             vc.tabBarItem.imageInsets = UIEdgeInsetsMake(6, 0, -6,0);
         }
         self.tabBarItem.tag = i + 10;
-        
     }
     
     self.viewControllers = tabArray;

HappyJob/HappyJob/Support/HJConfig.h

@@ -32,6 +32,8 @@
 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/";