diff --git a/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate b/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate index 5d77ce7..25fba33 100644 Binary files a/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate and b/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ManagerDemo/Common/ManagerUtil.h b/ManagerDemo/Common/ManagerUtil.h index 63839ae..68a9d91 100644 --- a/ManagerDemo/Common/ManagerUtil.h +++ b/ManagerDemo/Common/ManagerUtil.h @@ -18,7 +18,6 @@ * @param type type description */ +(void)presentLoginView; - //获取view的viewcontroller +(UIViewController*)getCurrentViewControllerWithView:(UIView*)view; //获取当前viewcontroller diff --git a/ManagerDemo/Common/ManagerUtil.m b/ManagerDemo/Common/ManagerUtil.m index 965b88f..9782c74 100644 --- a/ManagerDemo/Common/ManagerUtil.m +++ b/ManagerDemo/Common/ManagerUtil.m @@ -9,6 +9,7 @@ #import "ManagerUtil.h" #import "LoginViewController.h" #import "AppDelegate.h" +#import "ModifyPassWordViewController.h" #import "DottedLineView.h" #import @implementation ManagerUtil @@ -23,7 +24,6 @@ [app.mainViewController presentViewController:nav animated:YES completion:^{ }]; - } +(void)SetSubViewExternNone:(UIViewController *)viewController { diff --git a/ManagerDemo/MainView/LoginView/LoginViewController.xib b/ManagerDemo/MainView/LoginView/LoginViewController.xib index 9518145..beea413 100644 --- a/ManagerDemo/MainView/LoginView/LoginViewController.xib +++ b/ManagerDemo/MainView/LoginView/LoginViewController.xib @@ -20,13 +20,13 @@ - + - + - diff --git a/ManagerDemo/MainView/LoginView/ModifyPassWordViewController.m b/ManagerDemo/MainView/LoginView/ModifyPassWordViewController.m index 0ee9bb7..ec52b88 100644 --- a/ManagerDemo/MainView/LoginView/ModifyPassWordViewController.m +++ b/ManagerDemo/MainView/LoginView/ModifyPassWordViewController.m @@ -31,6 +31,9 @@ { [super viewDidLoad]; // Do any additional setup after loading the view from its nib. + + self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"取消" style:UIBarButtonItemStyleBordered target:self action:@selector(popViewController)]; + self.navigationItem.title = @"身份验证"; _isRealName = YES; _timeSecond = 60; _cmsBtn.enabled = NO; @@ -67,6 +70,11 @@ [self realNameCheck]; } + +-(void)popViewController +{ + [self.navigationController dismissViewControllerAnimated:YES completion:nil]; +} -(void)reGetCodeTime { if (_timeSecond > 0 && !_cmsBtn.enabled) { @@ -81,6 +89,7 @@ [_timer invalidate]; } } + -(void)realNameCheck { DaiDaiTongTestApi* daiDaiTongTestApi = [DaiDaiTongTestApi shareInstance]; diff --git a/ManagerDemo/MainView/LoginView/ModifyPassWordViewController.xib b/ManagerDemo/MainView/LoginView/ModifyPassWordViewController.xib index db6e25e..aef375e 100644 --- a/ManagerDemo/MainView/LoginView/ModifyPassWordViewController.xib +++ b/ManagerDemo/MainView/LoginView/ModifyPassWordViewController.xib @@ -1,5 +1,5 @@ - + @@ -21,35 +21,35 @@ - - + + - + - + - + - + - + - -