|
@@ -50,40 +50,43 @@ service.interceptors.response.use(
|
|
|
const { msg, code = 'Error' } = response.data
|
|
const { msg, code = 'Error' } = response.data
|
|
|
if (code !== 200) {
|
|
if (code !== 200) {
|
|
|
if (code === 403) {
|
|
if (code === 403) {
|
|
|
- Message({
|
|
|
|
|
|
|
+ return Message({
|
|
|
message: 'Insufficient permissions, please contact your administrator',
|
|
message: 'Insufficient permissions, please contact your administrator',
|
|
|
type: 'error',
|
|
type: 'error',
|
|
|
duration: 5 * 1000
|
|
duration: 5 * 1000
|
|
|
|
|
+ }).then(() => {
|
|
|
|
|
+ return Promise.reject(new Error(msg))
|
|
|
})
|
|
})
|
|
|
} else if (code === 401) {
|
|
} else if (code === 401) {
|
|
|
- MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', {
|
|
|
|
|
|
|
+ return MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', {
|
|
|
confirmButtonText: 'Re-Login',
|
|
confirmButtonText: 'Re-Login',
|
|
|
cancelButtonText: 'Cancel',
|
|
cancelButtonText: 'Cancel',
|
|
|
type: 'warning'
|
|
type: 'warning'
|
|
|
}).then(() => {
|
|
}).then(() => {
|
|
|
- store.dispatch('user/resetToken').then(() => {
|
|
|
|
|
|
|
+ return store.dispatch('user/resetToken').then(() => {
|
|
|
location.reload()
|
|
location.reload()
|
|
|
})
|
|
})
|
|
|
})
|
|
})
|
|
|
} else {
|
|
} else {
|
|
|
- Message({
|
|
|
|
|
|
|
+ return Message({
|
|
|
message: msg,
|
|
message: msg,
|
|
|
type: 'error',
|
|
type: 'error',
|
|
|
duration: 5 * 1000
|
|
duration: 5 * 1000
|
|
|
|
|
+ }).then(() => {
|
|
|
|
|
+ return Promise.reject(new Error(msg))
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
- return Promise.reject(new Error(msg))
|
|
|
|
|
}
|
|
}
|
|
|
return response.data
|
|
return response.data
|
|
|
},
|
|
},
|
|
|
error => {
|
|
error => {
|
|
|
- console.log(error)
|
|
|
|
|
Message({
|
|
Message({
|
|
|
message: error.message,
|
|
message: error.message,
|
|
|
type: 'error',
|
|
type: 'error',
|
|
|
duration: 5 * 1000
|
|
duration: 5 * 1000
|
|
|
|
|
+ }).then(() => {
|
|
|
|
|
+ return Promise.reject(error)
|
|
|
})
|
|
})
|
|
|
- return Promise.reject(error)
|
|
|
|
|
}
|
|
}
|
|
|
)
|
|
)
|
|
|
|
|
|