Merge branch 'master' of http://120.26.64.82:10880/BFFE/dz2.1

src/store/modules/user.js

@@ -72,7 +72,7 @@ const actions = {
             setToken('userName', userInfo.account)
             setUserId(userid)
             setToken('userid', userid)
-            resolve(true)
+            resolve(userstatus)
           } else {
             reject(false)
           }

src/views/login/index.vue

@@ -141,7 +141,7 @@ export default {
       this.$store
         .dispatch("user/login", params)
         .then(async (res) => {
-          if (res) {
+          if (res==1) {
             this.dialogOpen()
           } else {
             this.userLogin()