|
|
@@ -13,10 +13,7 @@ import Vue from 'vue'
|
|
|
* @param {object} payload 其他选项
|
|
|
* @param {object} promise 返回一个 promise
|
|
|
*/
|
|
|
-const get = async (path, data, payload) => {
|
|
|
- let result = await request('get', path, data, payload)
|
|
|
- return result
|
|
|
-}
|
|
|
+const get = async (path, data, payload = {}) => await request('get', path, data, payload)
|
|
|
|
|
|
/**
|
|
|
*
|
|
|
@@ -25,7 +22,7 @@ const get = async (path, data, payload) => {
|
|
|
* @param {object} payload 其他选项
|
|
|
* @param {object} promise 返回一个 promise
|
|
|
*/
|
|
|
-const post = async (path, data = {}, payload) => {
|
|
|
+const post = async (path, data = {}, payload = { config: {} }) => {
|
|
|
let formData = ''
|
|
|
for(const key in data) {
|
|
|
if(data.hasOwnProperty(key)) {
|
|
|
@@ -34,10 +31,13 @@ const post = async (path, data = {}, payload) => {
|
|
|
}
|
|
|
}
|
|
|
formData = formData.slice(0, formData.length - 1)
|
|
|
+ let config = { headers: { 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }
|
|
|
+ if(payload.config.headers) config.headers = {
|
|
|
+ ...config.headers,
|
|
|
+ ...payload.config.headers,
|
|
|
+ }
|
|
|
|
|
|
- let result = await request('post', path, formData, { config: { headers: { 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } } })
|
|
|
-
|
|
|
- return result
|
|
|
+ return await request('post', path, formData, { config })
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -71,11 +71,11 @@ const request = async (method, path, data, payload = {}) => {
|
|
|
if(typeof rData !== 'object') rData = JSON.parse(rData)
|
|
|
// consoleFormat({ rData })
|
|
|
if(rData.status === 1) return rData
|
|
|
- else if(rData.status === -99 && !data.neverLogout) {
|
|
|
+ else if(rData.status === -99 && !payload.neverLogout) {
|
|
|
location.href = '/login'
|
|
|
return
|
|
|
} else {
|
|
|
- if(!data.neverLogout) Vue.prototype.$message.error(rData.info)
|
|
|
+ if(!payload.neverLogout) Vue.prototype.$message.error(rData.info)
|
|
|
return
|
|
|
}
|
|
|
}
|