Commit e9d3d67e by yangzhi

Merge branch 'dev'

parents c5a887e2 8a05eddc
...@@ -7,6 +7,7 @@ const axios = Axios.create({ ...@@ -7,6 +7,7 @@ const axios = Axios.create({
baseURL: window.apiHostSetting.VUE_APP_BASE_URL + '/api', baseURL: window.apiHostSetting.VUE_APP_BASE_URL + '/api',
timeout: 30 * 1000, timeout: 30 * 1000,
}) })
let HTTPNUM = 0
axios.interceptors.request.use((config) => { axios.interceptors.request.use((config) => {
if (config.data && typeof config.data === 'object') { if (config.data && typeof config.data === 'object') {
const data = config.data const data = config.data
...@@ -45,25 +46,27 @@ axios.interceptors.response.use( ...@@ -45,25 +46,27 @@ axios.interceptors.response.use(
}) })
return Promise.reject(res.data) return Promise.reject(res.data)
} else if (res.data.code === 403) { } else if (res.data.code === 403) {
console.log(Vue)
// token过期 // token过期
Vue.prototype.$message({ if (HTTPNUM === 0) {
type: 'error', HTTPNUM++
message: res.data.message, Vue.prototype.$message({
}) type: 'error',
router message: res.data.message,
.replace({
name: 'login',
})
.catch((err) => {
console.log(err)
}) })
router
.replace({
name: 'login',
})
.catch((err) => {
console.log(err)
})
}
return Promise.reject(res.data) return Promise.reject(res.data)
} else if (res.data.code === 500) { } else if (res.data.code === 500) {
Vue.prototype.$alert( Vue.prototype.$alert(
'<div style="max-height:500px;overflow:auto">' + '<div style="max-height:500px;overflow:auto">' +
res.data.message + res.data.message +
'</div>', '</div>',
'错误提示', '错误提示',
{ {
dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,
...@@ -75,23 +78,26 @@ axios.interceptors.response.use( ...@@ -75,23 +78,26 @@ axios.interceptors.response.use(
if (res.data) { if (res.data) {
const fileReader = new FileReader() const fileReader = new FileReader()
fileReader.readAsText(res.data) fileReader.readAsText(res.data)
fileReader.onload = function (ev) { fileReader.onload = function(ev) {
console.log(ev.target.result) console.log(ev.target.result)
Vue.prototype.$alert(ev.target.result, '提示', { Vue.prototype.$alert(ev.target.result, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
callback: () => {}, callback: () => {
},
}) })
} }
} else { } else {
Vue.prototype.$alert('请求参数有误', '提示', { Vue.prototype.$alert('请求参数有误', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
callback: () => {}, callback: () => {
},
}) })
} }
} else if (res.status === 404) { } else if (res.status === 404) {
Vue.prototype.$alert('请求不存在', '提示', { Vue.prototype.$alert('请求不存在', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
callback: () => {}, callback: () => {
},
}) })
} }
} }
...@@ -101,11 +107,13 @@ axios.interceptors.response.use( ...@@ -101,11 +107,13 @@ axios.interceptors.response.use(
(error) => { (error) => {
Vue.prototype.$alert(error.message, 'Error', { Vue.prototype.$alert(error.message, 'Error', {
confirmButtonText: '确定', confirmButtonText: '确定',
callback: () => {}, callback: () => {
},
}) })
return Promise.reject(error) return Promise.reject(error)
}, },
) )
export function get(url, params) { export function get(url, params) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
axios.get(url, { params }) axios.get(url, { params })
...@@ -121,6 +129,7 @@ export function get(url, params) { ...@@ -121,6 +129,7 @@ export function get(url, params) {
}) })
}) })
} }
export function post(url, params, headers) { export function post(url, params, headers) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
axios.post(url, params, headers) axios.post(url, params, headers)
...@@ -136,4 +145,5 @@ export function post(url, params, headers) { ...@@ -136,4 +145,5 @@ export function post(url, params, headers) {
}) })
}) })
} }
export default axios export default axios
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment