From 0fb7413df54760ac6bd15b90b738e0706de1629e Mon Sep 17 00:00:00 2001
From: 杨锴 <841720330@qq.com>
Date: 星期二, 05 十一月 2024 19:03:09 +0800
Subject: [PATCH] fix bug
---
XQMuse/Root/Login/VC/RegisterVC.swift | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/XQMuse/Root/Login/VC/RegisterVC.swift b/XQMuse/Root/Login/VC/RegisterVC.swift
index 69f4423..b344c86 100644
--- a/XQMuse/Root/Login/VC/RegisterVC.swift
+++ b/XQMuse/Root/Login/VC/RegisterVC.swift
@@ -91,7 +91,7 @@
Services.sendCode(phone:viewModel.phone.value,type: .register).subscribe(onNext: {data in
if data.code == 200{
- sender.jq_openCountDown(60, defultTitle: "发送验证码") {
+ sender.jq_openCountDown(60, defultTitle: "获取验证码") {
sender.titleLabel?.font = UIFont.systemFont(ofSize: 12)
sender.setTitleColor(.black.withAlphaComponent(0.3), for: .normal)
} completeClouse: {
@@ -107,8 +107,11 @@
view.endEditing(true)
guard viewModel.checkSafe() else {return}
guard btn_isRead.isSelected else {
- alertError(msg: "请阅读并同意《用户注册协议》和《用户隐私协议》");return
+ alert(msg: "请阅读并同意《用户注册协议》和《用户隐私协议》");return
}
+
+ guard viewModel.pwd.value.count >= 8 else {alertError(msg: "密码至少8个字符，不能全是字母或数字");return}
+ guard viewModel.pwd.value.jq_isComplexPassword else {alertError(msg: "密码至少8个字符，不能全是字母或数字");return}
Services.register(cellPhone: viewModel.phone.value, captcha: viewModel.code.value, password: viewModel.pwd.value).subscribe(onNext: {data in
if let model = data.data{
@@ -116,9 +119,13 @@
UserViewModel.saveLoginInfo(model)
Services.getUserInfo().subscribe(onNext: {data in
if let model = data.data{
- sceneDelegate?.loginSuccess()
UserViewModel.saveAvatarInfo(model)
- self.dismiss(animated: true)
+ self.dismiss(animated: true) {
+ JQ_currentViewController().navigationController?.tabBarController?.selectedIndex = 0
+ DispatchQueue.main.asyncAfter(delay: 0.5) {
+ sceneDelegate?.loginSuccess()
+ }
+ }
}
}).disposed(by: self.disposeBag)
}
--
Gitblit v1.7.1