diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 893f761..a0c0ad1 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -79,11 +79,15 @@ const user = { return new Promise((resolve, reject) => { login(username, password, code, uuid).then(res => { let data = res.data - setToken(data.access_token) - commit('SET_TOKEN', data.access_token) - setExpiresIn(data.expires_in) - commit('SET_EXPIRES_IN', data.expires_in) - resolve() + if(data.code && data.code===500){ + reject(data); + }else { + setToken(data.access_token) + commit('SET_TOKEN', data.access_token) + setExpiresIn(data.expires_in) + commit('SET_EXPIRES_IN', data.expires_in) + resolve() + } }).catch(error => { reject(error) }) diff --git a/src/views/proMaterialManagement/upload/index.vue b/src/views/proMaterialManagement/upload/index.vue index f8d891a..08c2f91 100644 --- a/src/views/proMaterialManagement/upload/index.vue +++ b/src/views/proMaterialManagement/upload/index.vue @@ -35,17 +35,17 @@ - - 导出数据 - - + + + + + + + + + + +