diff --git a/punchnet/Views/Login/LoginView.swift b/punchnet/Views/Login/LoginView.swift index faf5dde..c46cf5e 100644 --- a/punchnet/Views/Login/LoginView.swift +++ b/punchnet/Views/Login/LoginView.swift @@ -51,12 +51,13 @@ struct LoginView: View { // 动态内容区 ZStack { - if authMethod == .token { - LoginTokenView() - .transition(.move(edge: .trailing).combined(with: .opacity)) - } else { + switch authMethod { + case .account: LoginAccountView(username: self.username ?? "") .transition(.move(edge: .leading).combined(with: .opacity)) + case .token: + LoginTokenView() + .transition(.move(edge: .trailing).combined(with: .opacity)) } } .animation(.spring(response: 0.3, dampingFraction: 0.8), value: authMethod) @@ -77,7 +78,6 @@ struct LoginView: View { .padding(.bottom, 20) } .frame(width: 380, height: 520) - .ignoresSafeArea() } }