Commit b358028c authored by Steven杜宇's avatar Steven杜宇

Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

parents 986e92fc 1792406c
...@@ -203,14 +203,8 @@ class YHCodeSueecssViewController: YHBaseViewController { ...@@ -203,14 +203,8 @@ class YHCodeSueecssViewController: YHBaseViewController {
} else { } else {
YHLoginManager.shared.loginSuccessActionBlock?() YHLoginManager.shared.loginSuccessActionBlock?()
YHHUD.flash(message: "登录成功") YHHUD.flash(message: "登录成功")
if YHLoginManager.shared.userModel?.is_first_login == 1 { TXCommonHandler.sharedInstance().cancelLoginVC(animated: true)
let vc = YHUserInfoSettingViewController() self.dismiss(animated: true)
vc.modalPresentationStyle = .fullScreen
self.navigationController?.pushViewController(vc)
} else {
TXCommonHandler.sharedInstance().cancelLoginVC(animated: true)
self.dismiss(animated: true)
}
} }
}) })
} }
...@@ -231,14 +225,9 @@ class YHCodeSueecssViewController: YHBaseViewController { ...@@ -231,14 +225,9 @@ class YHCodeSueecssViewController: YHBaseViewController {
} else { } else {
YHLoginManager.shared.loginSuccessActionBlock?() YHLoginManager.shared.loginSuccessActionBlock?()
YHHUD.flash(message: "登录成功") YHHUD.flash(message: "登录成功")
if YHLoginManager.shared.userModel?.is_first_login == 1 {
let vc = YHUserInfoSettingViewController() TXCommonHandler.sharedInstance().cancelLoginVC(animated: true)
vc.modalPresentationStyle = .fullScreen self?.dismiss(animated: true)
self?.navigationController?.pushViewController(vc)
} else {
TXCommonHandler.sharedInstance().cancelLoginVC(animated: true)
self?.dismiss(animated: true)
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment