diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index 83a7d625..e6439e02 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -1,3 +1,4 @@
+import store from '@/store'
 import router from '@/router'
 import { MessageBox, } from 'element-ui'
 import { login, logout, getInfo } from '@/api/login'
@@ -51,6 +52,7 @@ const user = {
         login(username, password, code, uuid).then(res => {
           setToken(res.token)
           commit('SET_TOKEN', res.token)
+          store.dispatch('lock/unlockScreen')
           resolve()
         }).catch(error => {
           reject(error)
diff --git a/ruoyi-ui/src/views/lock.vue b/ruoyi-ui/src/views/lock.vue
index 17c98c67..d6abf085 100644
--- a/ruoyi-ui/src/views/lock.vue
+++ b/ruoyi-ui/src/views/lock.vue
@@ -97,7 +97,7 @@ export default {
         await this.$store.dispatch('lock/unlockScreen')
         this.$router.replace(lockPath)
       } catch (err) {
-        const msg = (err.response && err.response.data && err.response.data.msg) || err.msg || '密码错误，请重新输入'
+        const msg = err.message || err.toString()
         this.showError(msg)
         this.password = ''
         this.$refs.passwordInput && this.$refs.passwordInput.focus()