From 0f98a356b7886adee9097a418ae4b446401fe0fd Mon Sep 17 00:00:00 2001 From: anlicheng <244108715@qq.com> Date: Fri, 20 Mar 2026 11:52:11 +0800 Subject: [PATCH] fix --- punchnet/Views/Register/RegisterView.swift | 17 ++++++++++++----- .../Views/ResetPassword/ResetPasswordView.swift | 12 +++++++++++- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/punchnet/Views/Register/RegisterView.swift b/punchnet/Views/Register/RegisterView.swift index 4f4480d..67c2d10 100644 --- a/punchnet/Views/Register/RegisterView.swift +++ b/punchnet/Views/Register/RegisterView.swift @@ -250,7 +250,7 @@ struct RegisterSubmitVerifyCodeView: View { self.isProcessing = true Task { @MainActor in do { - let result = try await self.registerModel.submitVerifyCode(sessionId: sessionId, verifyCode: Int(self.code) ?? 0) + _ = try await self.registerModel.submitVerifyCode(sessionId: sessionId, verifyCode: Int(self.code) ?? 0) withAnimation(.spring(duration: 0.6, bounce: 0.2)) { self.registerModel.stage = .setPassword(sessionId: sessionId) self.registerModel.transitionEdge = .trailing @@ -273,8 +273,9 @@ struct RegisterSetPasswordView: View { @State private var isProcessing = false // 错误提示 - @State private var errorMessage: String? - + @State private var showAlert: Bool = false + @State private var errorMessage: String = "" + // 提示错误信息 var passwordError: String? { if password.isEmpty || confirm.isEmpty { @@ -326,15 +327,21 @@ struct RegisterSetPasswordView: View { Spacer() } .padding(40) + .alert(isPresented: $showAlert) { + Alert(title: Text("提示"), message: Text(self.errorMessage)) + } } private func handleRegister() { self.isProcessing = true Task { @MainActor in do { - let result = try await self.registerModel.register(sessionId: sessionId, password: self.password) + _ = try await self.registerModel.register(sessionId: sessionId, password: self.password) + self.showAlert = true + self.errorMessage = "注册成功" } catch { - self.errorMessage = error.localizedDescription + self.showAlert = true + self.errorMessage = "注册失败,重稍后重试" } self.isProcessing = false } diff --git a/punchnet/Views/ResetPassword/ResetPasswordView.swift b/punchnet/Views/ResetPassword/ResetPasswordView.swift index f526462..7def67f 100644 --- a/punchnet/Views/ResetPassword/ResetPasswordView.swift +++ b/punchnet/Views/ResetPassword/ResetPasswordView.swift @@ -207,6 +207,10 @@ struct ResetPasswordView: View { @State private var confirm = "" @State private var isProcessing = false + // 错误逻辑处理 + @State private var showAlert = false + @State private var errorMessage = "" + // 判断输入是否合法 var isInputValid: Bool { !password.isEmpty && password == confirm && password.count >= 8 @@ -261,6 +265,9 @@ struct ResetPasswordView: View { Spacer() } .padding(40) + .alert(isPresented: $showAlert) { + Alert(title: Text("提示"), message: Text(self.errorMessage)) + } } private func handleReset() { @@ -270,8 +277,11 @@ struct ResetPasswordView: View { let result = try await resetPasswordModel.resetPassword(sessionId: sessionId, newPassword: password) print("密码重置成功: \(result)") // 此处可添加重置成功后的跳转逻辑 + self.showAlert = true + self.errorMessage = "重置成功,重新登陆" } catch { - print("重置失败: \(error)") + self.showAlert = true + self.errorMessage = "重置失败, 请稍后重试" } self.isProcessing = false }