diff --git a/app/src/main/java/com/project/survey/logic/viewmodel/LoginViewModel.kt b/app/src/main/java/com/project/survey/logic/viewmodel/LoginViewModel.kt index 62a442b..102325f 100644 --- a/app/src/main/java/com/project/survey/logic/viewmodel/LoginViewModel.kt +++ b/app/src/main/java/com/project/survey/logic/viewmodel/LoginViewModel.kt @@ -86,6 +86,7 @@ class LoginViewModel : BaseViewModel() { // 登录成功,进入工程列表页面 ProjectListActivity.start() ActivityUtils.finishActivity(LoginActivity::class.java) + ActivityUtils.finishActivity(LoginInputCodeActivity::class.java) } catch (e: Exception) { errorResponse.postValue(res.message) return@launch diff --git a/app/src/main/java/com/project/survey/ui/login/LoginActivity.kt b/app/src/main/java/com/project/survey/ui/login/LoginActivity.kt index 654f54f..8342625 100644 --- a/app/src/main/java/com/project/survey/ui/login/LoginActivity.kt +++ b/app/src/main/java/com/project/survey/ui/login/LoginActivity.kt @@ -66,8 +66,8 @@ class LoginActivity : BaseBindingActivity() { toast("账号或密码不能为空") return@setOnClickNoRepeatListener } - viewModel.externalPersonLogin(isOutLogin, account, password, "123") -// viewModel.fetchLoginSMSCode(isOutLogin, account, password) +// viewModel.externalPersonLogin(isOutLogin, account, password, "123") + viewModel.fetchLoginSMSCode(isOutLogin, account, password) } //忘记密码