15555599100 il y a 6 ans
Parent
commit
144978dc20

+ 6 - 0
HappyJob/HappyJob.xcodeproj/project.pbxproj

@@ -57,6 +57,7 @@
 		71327B42232102EE0047CD3D /* HJMyWalletViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71327B41232102EE0047CD3D /* HJMyWalletViewController.m */; };
 		71327B452321030B0047CD3D /* HJMyIntegralViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71327B442321030B0047CD3D /* HJMyIntegralViewController.m */; };
 		71327B482321044D0047CD3D /* HJMyWalletView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71327B472321044D0047CD3D /* HJMyWalletView.m */; };
+		71327B4B2321DE170047CD3D /* HJMyWalletDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71327B4A2321DE170047CD3D /* HJMyWalletDetailViewController.m */; };
 		71331B8D22DC3F96000F9782 /* HJAppUserType.m in Sources */ = {isa = PBXBuildFile; fileRef = 71331B8C22DC3F96000F9782 /* HJAppUserType.m */; };
 		71331B9022DC6390000F9782 /* ZHDatePickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71331B8F22DC6390000F9782 /* ZHDatePickerView.m */; };
 		71331BA122E03373000F9782 /* BPositionDropDownView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71331BA022E03373000F9782 /* BPositionDropDownView.m */; };
@@ -476,6 +477,8 @@
 		71327B442321030B0047CD3D /* HJMyIntegralViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJMyIntegralViewController.m; sourceTree = "<group>"; };
 		71327B462321044D0047CD3D /* HJMyWalletView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJMyWalletView.h; sourceTree = "<group>"; };
 		71327B472321044D0047CD3D /* HJMyWalletView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJMyWalletView.m; sourceTree = "<group>"; };
+		71327B492321DE170047CD3D /* HJMyWalletDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJMyWalletDetailViewController.h; sourceTree = "<group>"; };
+		71327B4A2321DE170047CD3D /* HJMyWalletDetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJMyWalletDetailViewController.m; sourceTree = "<group>"; };
 		71331B8B22DC3F96000F9782 /* HJAppUserType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJAppUserType.h; sourceTree = "<group>"; };
 		71331B8C22DC3F96000F9782 /* HJAppUserType.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJAppUserType.m; sourceTree = "<group>"; };
 		71331B8E22DC638F000F9782 /* ZHDatePickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZHDatePickerView.h; sourceTree = "<group>"; };
@@ -1566,6 +1569,8 @@
 			children = (
 				71327B40232102EE0047CD3D /* HJMyWalletViewController.h */,
 				71327B41232102EE0047CD3D /* HJMyWalletViewController.m */,
+				71327B492321DE170047CD3D /* HJMyWalletDetailViewController.h */,
+				71327B4A2321DE170047CD3D /* HJMyWalletDetailViewController.m */,
 			);
 			path = ViewController;
 			sourceTree = "<group>";
@@ -3605,6 +3610,7 @@
 				715E5CD222D16E3A00AAFA24 /* BHomeCertificationEnterpriseAPI.m in Sources */,
 				7133294B231378CA002CF6DB /* BReleaseJobsTitleView.m in Sources */,
 				7132695C22CB075A00DEB10B /* BMessageCell.m in Sources */,
+				71327B4B2321DE170047CD3D /* HJMyWalletDetailViewController.m in Sources */,
 				7133295D2313B364002CF6DB /* BReleaseWelfareView.m in Sources */,
 				C40FF24B223F86F4008868BF /* HJNavBarView.m in Sources */,
 				C4129F0F224B197D00E762D5 /* HJCityPickerLocationView.m in Sources */,

+ 17 - 0
HappyJob/HappyJob/CClass/Me_我/wallet_我的钱包/ViewController/HJMyWalletDetailViewController.h

@@ -0,0 +1,17 @@
+//
+//  HJMyWalletDetailViewController.h
+//  HappyJob
+//
+//  Created by 张晓光 on 2019/9/6.
+//  Copyright © 2019 Bob. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface HJMyWalletDetailViewController : UIViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 48 - 0
HappyJob/HappyJob/CClass/Me_我/wallet_我的钱包/ViewController/HJMyWalletDetailViewController.m

@@ -0,0 +1,48 @@
+//
+//  HJMyWalletDetailViewController.m
+//  HappyJob
+//
+//  Created by 张晓光 on 2019/9/6.
+//  Copyright © 2019 Bob. All rights reserved.
+//
+
+#import "HJMyWalletDetailViewController.h"
+
+@interface HJMyWalletDetailViewController ()<UIGestureRecognizerDelegate,UINavigationControllerDelegate>
+
+@end
+
+@implementation HJMyWalletDetailViewController
+
+- (void)viewWillAppear:(BOOL)animated {
+    
+    [super viewWillAppear:animated];
+    [self.navigationController setNavigationBarHidden:NO animated:YES];
+    self.navigationController.delegate = self;
+    self.navigationController.interactivePopGestureRecognizer.delegate = self;
+    [self hj_setupNavBar];
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    
+}
+#pragma mark - 导航栏的代理
+
+- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
+    
+    [self.navigationController setNavigationBarHidden:NO animated:animated];
+    
+}
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

+ 14 - 3
HappyJob/HappyJob/CClass/Me_我/wallet_我的钱包/ViewController/HJMyWalletViewController.m

@@ -7,9 +7,10 @@
 //
 
 #import "HJMyWalletViewController.h"
+#import "HJMyWalletDetailViewController.h"
 #import "HJMyWalletView.h"
 
-@interface HJMyWalletViewController ()<UIGestureRecognizerDelegate>
+@interface HJMyWalletViewController ()<UIGestureRecognizerDelegate,UINavigationControllerDelegate>
 
 @property (nonatomic, strong) HJMyWalletView *walletView;
 
@@ -19,11 +20,13 @@
 
 - (void)viewWillAppear:(BOOL)animated {
     
+    [super viewWillAppear:animated];
+    self.navigationController.delegate = self;
     self.navigationController.interactivePopGestureRecognizer.delegate = self;
 }
 - (void)viewDidLoad {
     [super viewDidLoad];
-    // Do any additional setup after loading the view.
+    
     
     [self initSubViews];
     
@@ -38,7 +41,13 @@
     }];
     
 }
+#pragma mark - 导航栏的代理
 
+- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
+    
+    [self.navigationController setNavigationBarHidden:YES animated:animated];
+    
+}
 #pragma event response
 /* 返回 */
 - (void)backButtonClick:(UIButton *)btn {
@@ -48,6 +57,8 @@
 /* 明细 */
 - (void)detailButtonClick:(UIButton *)btn {
     
+    HJMyWalletDetailViewController *vc = [[HJMyWalletDetailViewController alloc]init];
+    [self.navigationController pushViewController:vc animated:YES];
     
 }
 /* 提现 */
@@ -62,7 +73,7 @@
     {
         _walletView = [[HJMyWalletView alloc]init];
         [_walletView.backBtn addTarget:self action:@selector(backButtonClick:) forControlEvents:UIControlEventTouchUpInside];
-        [_walletView.detailBtn addTarget:self action:@selector(backButtonClick:) forControlEvents:UIControlEventTouchUpInside];
+        [_walletView.detailBtn addTarget:self action:@selector(detailButtonClick:) forControlEvents:UIControlEventTouchUpInside];
         [_walletView.withdrawalBtn addTarget:self action:@selector(withdrawalButtonClick:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _walletView;