From dd9af28934e9b34f74a58cf3f92a472b898d738e Mon Sep 17 00:00:00 2001 From: seatonwan9 <seatonwan9@163.com> Date: 星期五, 28 五月 2021 19:39:51 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/utils/axios.js | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/utils/axios.js b/src/utils/axios.js index 7f944e8..cca3604 100644 --- a/src/utils/axios.js +++ b/src/utils/axios.js @@ -83,8 +83,7 @@ // 鍒涘缓axios瀹炰緥 const Service = axios.create({ - timeout: 5000, - baseURL: 'http://10.246.162.140:8080/' + timeout: 1000 * 30 }) const CancelToken = axios.CancelToken @@ -140,14 +139,14 @@ // respone鎷︽埅鍣� Service.interceptors.response.use( response => { - // const res = response.data - // if (Number(res.code) !== 200 && Number(res.code) !== 0) { - // $T.warning(res.message) - // return Promise.reject(res.message) - // } else { - // return res - // } - return response.data + const res = response.data + /* if (Number(res.code) !== 200 && Number(res.code) !== 0) { + $T.warning(res.message) + return Promise.reject(res.message) + } else { + return res + } */ + return res }, error => { if (error.message && error.message.includes('timeout')) { @@ -192,11 +191,12 @@ params: $T.filterParams(params) }) } -$http.post = function (url, data = {}) { +$http.post = function (url, data = {}, setHeaders) { return Service({ url: url, method: 'post', - data: data + data: data, + headers: setHeaders || { 'Content-Type': 'application/json; charset=UTF-8' } }) } $http.put = function (url, data = {}) { -- Gitblit v1.8.0