diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 0d767f6..33d0346 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -177,14 +177,15 @@
                 val dataByPublicKey =
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
-                loginViewModel.enter(account, dataByPublicKey)
+                loginViewModel.enter(this, account, dataByPublicKey)
                 loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
+                        "登录成功".show(this)
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
                         userViewModel.getUserDetail()
                         //验证成功登录
-                        this.navigatePageTo<MainActivity>()
+                        navigatePageTo<MainActivity>()
                         finish()
                     }
                 }

diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 0d767f6..33d0346 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -177,14 +177,15 @@
                 val dataByPublicKey =
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
-                loginViewModel.enter(account, dataByPublicKey)
+                loginViewModel.enter(this, account, dataByPublicKey)
                 loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
+                        "登录成功".show(this)
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
                         userViewModel.getUserDetail()
                         //验证成功登录
-                        this.navigatePageTo<MainActivity>()
+                        navigatePageTo<MainActivity>()
                         finish()
                     }
                 }
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
index a417398..a33786d 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
@@ -1,12 +1,13 @@
 package com.casic.app.smartwell.vm
 
+import android.content.Context
 import androidx.lifecycle.MutableLiveData
-import com.casic.app.smartwell.base.BaseApplication
 import com.casic.app.smartwell.extensions.getResponseCode
 import com.casic.app.smartwell.model.CommonResultModel
 import com.casic.app.smartwell.model.LoginResultModel
 import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager
 import com.google.gson.Gson
+import com.google.gson.JsonParser
 import com.google.gson.reflect.TypeToken
 import com.pengxh.kt.lite.base.BaseViewModel
 import com.pengxh.kt.lite.extensions.launch
@@ -19,17 +20,26 @@
     val enterResultModel = MutableLiveData<LoginResultModel>()
     val outResultModel = MutableLiveData<CommonResultModel>()
 
-    fun enter(account: String, secretKey: String) = launch({
+    fun enter(context: Context, account: String, secretKey: String) = launch({
         val response = RetrofitServiceManager.login(account, secretKey)
-        val responseCode = response.getResponseCode()
-        if (responseCode == 200) {
-            loadState.value = LoadState.Success
-            enterResultModel.value = gson.fromJson<LoginResultModel>(
-                response, object : TypeToken<LoginResultModel>() {}.type
-            )
-            "登录成功".show(BaseApplication.get())
-        } else {
-            loadState.value = LoadState.Fail
+        when (response.getResponseCode()) {
+            200 -> {
+                loadState.value = LoadState.Success
+                enterResultModel.value = gson.fromJson<LoginResultModel>(
+                    response, object : TypeToken<LoginResultModel>() {}.type
+                )
+            }
+
+            2400 -> {
+                loadState.value = LoadState.Fail
+                val element = JsonParser.parseString(response)
+                val jsonObject = element.asJsonObject
+                jsonObject.get("message").asString.show(context)
+            }
+
+            else -> {
+                loadState.value = LoadState.Fail
+            }
         }
     }, {
         loadState.value = LoadState.Fail