Commit bc65a5c9 authored by 郭欢's avatar 郭欢

'请求封装修改,'

parent 128fd00c
...@@ -34,35 +34,34 @@ service.interceptors.request.use( ...@@ -34,35 +34,34 @@ service.interceptors.request.use(
service.interceptors.response.use( service.interceptors.response.use(
response => { response => {
const { data, config } = response const { data, config } = response
console.log('添加响应拦截器', response)
if (data.meta.code === 400) {
console.log('===== token过期 =====')
const promisefresh = new Promise(function (resolve, reject) {
updateToken(() => {
config.headers.token = window.localStorage.getItem('token')
axios.request(response.config).then(res => {
const curData = res.data
if (curData.meta.code === 200) {
resolve(curData)
} else {
// window.localStorage.removeItem('token')
// window.localStorage.removeItem('status')
resolve(curData)
}
})
}, (err) => {
resolve(err)
window.localStorage.clear()
Toast('身份失效,请重新登录')
window.document.location = selfApi.WINDOWHREF_LOGIN // url-
console.log('错误--------', err)
})
})
return promisefresh
} else {
return data return data
// console.log('添加响应拦截器', response) }
// if (data.code === 400) {
// console.log('===== token过期 =====')
// const promisefresh = new Promise(function (resolve, reject) {
// updateToken(() => {
// config.headers.token = window.localStorage.getItem('token')
// axios.request(response.config).then(res => {
// const curData = res.data
// if (curData.code === 200) {
// resolve(curData)
// } else {
// // window.localStorage.removeItem('token')
// // window.localStorage.removeItem('status')
// resolve(curData)
// }
// })
// }, (err) => {
// resolve(err)
// window.localStorage.clear()
// Toast('身份失效,请重新登录')
// window.document.location = selfApi.WINDOWHREF_LOGIN // url-
// console.log('错误--------', err)
// })
// })
// return promisefresh
// } else {
// return data
// }
}, },
error => { error => {
let info = {} let info = {}
......
import axios from './axios' import axios from './axios'
import { import { Toast, Dialog } from 'vant'
Toast,
Dialog
} from 'vant'
import router from '../router/index' import router from '../router/index'
import selfApi from '@/api/apiList' import selfApi from '@/api/apiList'
const instance = axios() const instance = axios()
export default { export default {
get(url, params, headers, toast = true) { get (url, params, headers, toast = true) {
const options = {} const options = {}
options.headers = { options.headers = {
// token: window.localStorage.getItem('token'), token: window.localStorage.getItem('token')
token: 'sys' // token: 'sys'
// type: 1 // type: 1
} }
...@@ -42,20 +39,19 @@ export default { ...@@ -42,20 +39,19 @@ export default {
instance.get(url, options).then(res => { instance.get(url, options).then(res => {
const { const {
data, data,
message meta
} = res } = res
const code = res.meta.code
// console.log(code, typeof code, '11111111111111') // console.log(code, typeof code, '11111111111111')
toast && tipsToast.clear() toast && tipsToast.clear()
if (code === 200) { if (meta.code === 200) {
resolve(data) resolve(data)
} else if (code === -300) { } else if (meta.code === -300) {
window.localStorage.clear() window.localStorage.clear()
Toast('身份失效,请重新登录') Toast('身份失效,请重新登录')
window.document.location = selfApi.WINDOWHREF_LOGIN // url- window.document.location = selfApi.WINDOWHREF_LOGIN // url-
} else { } else {
reject(res) reject(res)
Toast(message) Toast(meta.message)
} }
}).catch(err => { }).catch(err => {
toast && tipsToast.clear() toast && tipsToast.clear()
...@@ -64,12 +60,12 @@ export default { ...@@ -64,12 +60,12 @@ export default {
}) })
}, },
post(url, data, headers, params, toast = true) { post (url, data, headers, params, toast = true) {
const options = {} const options = {}
options.headers = { options.headers = {
// token: window.localStorage.getItem('token'), token: window.localStorage.getItem('token')
token: 'sys' // token: 'sys'
// type: 1 // type: 1
} }
...@@ -96,19 +92,18 @@ export default { ...@@ -96,19 +92,18 @@ export default {
instance.post(url, data, options).then(res => { instance.post(url, data, options).then(res => {
const { const {
data, data,
message meta
} = res } = res
const code = res.meta.code
toast && tipsToast.clear() toast && tipsToast.clear()
if (code === 200) { if (meta.code === 200) {
resolve(data) resolve(data)
} else if (code === -300) { } else if (meta.code === -300) {
window.localStorage.clear() window.localStorage.clear()
Toast('身份失效,请重新登录') Toast('身份失效,请重新登录')
window.document.location = selfApi.WINDOWHREF_LOGIN // url- window.document.location = selfApi.WINDOWHREF_LOGIN // url-
} else { } else {
reject(res) reject(res)
Toast(message) Toast(meta.message)
} }
}).catch(err => { }).catch(err => {
toast && tipsToast.clear() toast && tipsToast.clear()
...@@ -117,7 +112,7 @@ export default { ...@@ -117,7 +112,7 @@ export default {
}) })
}, },
put(url, params, headers) { put (url, params, headers) {
const options = {} const options = {}
if (headers) { if (headers) {
...@@ -145,7 +140,7 @@ export default { ...@@ -145,7 +140,7 @@ export default {
}) })
}, },
delete(url, params, headers) { delete (url, params, headers) {
const options = {} const options = {}
if (params) { if (params) {
......
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