4

keyBoard/Class/Login/VC/KBEmailLoginVC.m

@@ -6,6 +6,7 @@
 //
 
 #import "KBEmailLoginVC.h"
+#import "KBEmailRegistVC.h"
 
 @interface KBEmailLoginVC () <UITextViewDelegate, UITextFieldDelegate>
 
@@ -225,6 +226,13 @@
 
 - (void)onTapSignUp {
     KBLOG(@"KBEmailLoginVC onTapSignUp");
+    KBEmailRegistVC *vc = [[KBEmailRegistVC alloc] init];
+    UINavigationController *nav = KB_CURRENT_NAV;
+    if ([nav isKindOfClass:[BaseNavigationController class]]) {
+        [(BaseNavigationController *)nav kb_pushViewControllerRemovingSameClass:vc animated:YES];
+    } else {
+        [nav pushViewController:vc animated:YES];
+    }
 }
 
 - (void)onTapTogglePassword:(UIButton *)sender {

keyBoard/Class/Login/VC/KBEmailRegistVC.m

@@ -324,8 +324,12 @@
 - (void)onTapEmailLogin {
     KBLOG(@"onTapEmailLogin in KBEmailRegistVC");
     KBEmailLoginVC *vc = [[KBEmailLoginVC alloc] init];
-    [KB_CURRENT_NAV pushViewController:vc animated:true];
-
+    UINavigationController *nav = KB_CURRENT_NAV;
+    if ([nav isKindOfClass:[BaseNavigationController class]]) {
+        [(BaseNavigationController *)nav kb_pushViewControllerRemovingSameClass:vc animated:YES];
+    } else {
+        [nav pushViewController:vc animated:YES];
+    }
 }
 
 #pragma mark - Agreement Tap

keyBoard/Class/Login/VC/KBForgetPwdVC.h

@@ -0,0 +1,16 @@
+//
+//  KBForgetPwdVC.h
+//  keyBoard
+//
+//  Created by Mac on 2025/12/3.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface KBForgetPwdVC : UIViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

keyBoard/Class/Login/VC/KBForgetPwdVC.m

@@ -0,0 +1,31 @@
+//
+//  KBForgetPwdVC.m
+//  keyBoard
+//
+//  Created by Mac on 2025/12/3.
+//
+
+#import "KBForgetPwdVC.h"
+
+@interface KBForgetPwdVC ()
+
+@end
+
+@implementation KBForgetPwdVC
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+}
+
+/*
+#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

keyBoard/Class/Login/VC/KBLoginVC.m

@@ -190,7 +190,12 @@
     // 后续接入邮箱登录逻辑
     KBLOG(@"onTapEmailLogin");
     KBEmailLoginVC *vc = [[KBEmailLoginVC alloc] init];
-    [KB_CURRENT_NAV pushViewController:vc animated:true];
+    UINavigationController *nav = KB_CURRENT_NAV;
+    if ([nav isKindOfClass:[BaseNavigationController class]]) {
+        [(BaseNavigationController *)nav kb_pushViewControllerRemovingSameClass:vc animated:YES];
+    } else {
+        [nav pushViewController:vc animated:YES];
+    }
 }
 
 - (void)onTapPolicy {
@@ -202,7 +207,12 @@
     // 打开注册页
     KBLOG(@"onTapSignUp");
     KBEmailRegistVC *vc = [[KBEmailRegistVC alloc] init];
-    [KB_CURRENT_NAV pushViewController:vc animated:true];
+    UINavigationController *nav = KB_CURRENT_NAV;
+    if ([nav isKindOfClass:[BaseNavigationController class]]) {
+        [(BaseNavigationController *)nav kb_pushViewControllerRemovingSameClass:vc animated:YES];
+    } else {
+        [nav pushViewController:vc animated:YES];
+    }
 }
 
 - (void)onTapForgotPassword {