diff --git a/keyBoard/Class/Login/VC/KBEmailRegistVC.m b/keyBoard/Class/Login/VC/KBEmailRegistVC.m index cc224d3..ef78556 100644 --- a/keyBoard/Class/Login/VC/KBEmailRegistVC.m +++ b/keyBoard/Class/Login/VC/KBEmailRegistVC.m @@ -216,6 +216,8 @@ // 协议文案 [self.scrollContentView addSubview:self.agreementTextView]; [self.agreementTextView mas_makeConstraints:^(MASConstraintMaker *make) { + // 顶部挂在邮箱登录按钮下方,底部挂到 scrollContentView,既保证布局又撑开滚动区域 + make.top.equalTo(self.emailLoginButton.mas_bottom).offset(16); make.bottom.equalTo(self.scrollContentView).offset(-KB_SAFE_BOTTOM - 16); make.left.equalTo(self.scrollContentView).offset(30); make.right.equalTo(self.scrollContentView).offset(-30); @@ -266,12 +268,11 @@ KBLOG(@"onTapForgotPassword in KBEmailRegistVC"); } -- (void)onTapSwitchAccount { - // 注册页/登录页互跳逻辑后续接入 - KBLOG(@"onTapSwitchAccount"); - KBEmailLoginVC *vc = [[KBEmailLoginVC alloc] init]; - [KB_CURRENT_NAV pushViewController:vc animated:true]; -} +//- (void)onTapSwitchAccount { +// // 注册页/登录页互跳逻辑后续接入 +// KBLOG(@"onTapSwitchAccount"); +// +//} - (void)onTapTogglePassword:(UIButton *)sender { sender.selected = !sender.selected; @@ -322,6 +323,8 @@ - (void)onTapEmailLogin { KBLOG(@"onTapEmailLogin in KBEmailRegistVC"); + KBEmailLoginVC *vc = [[KBEmailLoginVC alloc] init]; + [KB_CURRENT_NAV pushViewController:vc animated:true]; } diff --git a/keyBoard/Class/Login/VC/KBLoginVC.m b/keyBoard/Class/Login/VC/KBLoginVC.m index cef2545..17270b3 100644 --- a/keyBoard/Class/Login/VC/KBLoginVC.m +++ b/keyBoard/Class/Login/VC/KBLoginVC.m @@ -10,6 +10,7 @@ #import "KBLoginVM.h" #import "AppDelegate.h" #import "KBEmailRegistVC.h" +#import "KBEmailLoginVC.h" @interface KBLoginVC () @@ -188,6 +189,8 @@ - (void)onTapEmailLogin { // 后续接入邮箱登录逻辑 KBLOG(@"onTapEmailLogin"); + KBEmailLoginVC *vc = [[KBEmailLoginVC alloc] init]; + [KB_CURRENT_NAV pushViewController:vc animated:true]; } - (void)onTapPolicy {