代码更新

 import { login, logout, getInfo } from '@/api/login'
 import { login, logout, getInfo } from '@/api/login'
 import { changeCurrentPort } from "@/api/system/user.js";
 import { changeCurrentPort } from "@/api/system/user.js";
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import { getToken, setToken, removeToken } from '@/utils/auth'
+import { Message } from 'element-ui'
 
 
 const user = {
 const user = {
   state: {
   state: {
@@ -48,9 +49,11 @@ const user = {
 
 
       return new Promise((resolve, reject) => {
       return new Promise((resolve, reject) => {
         login(username, password, rememberMe).then(res => {
         login(username, password, rememberMe).then(res => {
-          setToken(res.data)
-          commit('SET_TOKEN', res.data)
-          resolve()
+          if(res.code === 200){
+            setToken(res.data)
+            commit('SET_TOKEN', res.data)
+          }
+          resolve(res)
         }).catch(error => {
         }).catch(error => {
           reject(error)
           reject(error)
         })
         })
@@ -63,7 +66,18 @@ const user = {
         getInfo().then(res => {
         getInfo().then(res => {
           const user = res.data.user
           const user = res.data.user
           const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
           const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
-          let ports = user.portName.split(',');
+          let ports = [];
+          if(user.portName){
+            ports = user.portName.split(',');
+            commit('SET_PORTNAMES',ports)
+            commit('SET_ACTIVEPORTNAME', sessionStorage.getItem('portName')?sessionStorage.getItem('portName'):state.portNames[0])
+          }else{
+            Message({
+              message: "未找到口岸信息！请确认后再登录",
+              type: 'error'
+            })
+            this.login()
+          }
           if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
           if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.data.roles)
             commit('SET_ROLES', res.data.roles)
             commit('SET_PERMISSIONS', res.data.permissions)
             commit('SET_PERMISSIONS', res.data.permissions)
@@ -72,14 +86,6 @@ const user = {
           }
           }
           commit('SET_NAME', user.userName)
           commit('SET_NAME', user.userName)
           commit('SET_AVATAR', avatar)
           commit('SET_AVATAR', avatar)
-          commit('SET_PORTNAMES',ports)
-          //口岸选择
-          if (sessionStorage.getItem('portName')) {
-            commit('SET_ACTIVEPORTNAME', sessionStorage.getItem('portName'))
-          } else {
-            commit('SET_ACTIVEPORTNAME', "PVG")
-          }
-
           resolve(res)
           resolve(res)
         }).catch(error => {
         }).catch(error => {
           reject(error)
           reject(error)

@@ -105,10 +105,21 @@ export default {
             localStorage.removeItem("password");
             localStorage.removeItem("password");
             localStorage.removeItem('rememberMe');
             localStorage.removeItem('rememberMe');
           }
           }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
+          this.$store.dispatch("Login", this.loginForm).then(res => {
+            this.loading = false;
+            if(res.code != 200){
+                this.$message({
+                  message: res.msg,
+                  type: "warning",
+                });
+              }
             this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
             this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
-          }).catch(() => {
+          }).catch(err => {
             this.loading = false;
             this.loading = false;
+            this.$message({
+              message: err,
+              type: "warning",
+            });
             //this.getCode();
             //this.getCode();
           });
           });
         }
         }

@@ -266,7 +266,9 @@ export default {
       getRoleList({ size: null, page: null })
       getRoleList({ size: null, page: null })
         .then((res) => {
         .then((res) => {
           if (res.code === 200) {
           if (res.code === 200) {
-            this.roleList = res.data.list;
+            if(item.valid == 1){
+              this.roleList.push(item)
+            }
           } else {
           } else {
             this.$message({
             this.$message({
               message: res.msg,
               message: res.msg,