From fc5c58dba3e3524e3bfb75ee91e8ac892e96c598 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 24 六月 2023 11:58:27 +0800
Subject: [PATCH] 2023-06-24
---
src/api/index.js | 105 ++++++++++++++++++----------------------------------
1 files changed, 37 insertions(+), 68 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index b502ec1..7cd5074 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -23,19 +23,11 @@
axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
axios.defaults.withCredentials = false
-axios.interceptors.request.use((config) => {
- if (/LoginAndRedirect|getjsonresult|wxNativePay|postek/ig.test(config.url)) {
- config.data = qs.stringify(config.data)
- } else if (/\/doupload|\/dopreload|\/upload/.test(config.url)) {
- config.headers = { 'Content-Type': 'multipart/form-data' }
- } else if (config.method === 'post' && config.data) {
- config.data = JSON.stringify(config.data)
- }
-
- return config
-}, (error) => {
- return Promise.reject(error)
-})
+// axios.interceptors.request.use((config) => {
+// return config
+// }, (error) => {
+// return Promise.reject(error)
+// })
const setCurrentUrl = (res) => {
if (!!(window.history && window.history.pushState)) {
@@ -95,7 +87,7 @@
return axios({
url: `/webapi/dostar${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -169,38 +161,8 @@
/**
* @description 鐩存帴璇锋眰
- * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
*/
- directRequest (url, method = 'post', param, cross) {
- if (cross === 'true' && param) {
- return axios({
- url,
- method,
- data: param
- })
- } else if (cross === 'true') {
- return axios({
- url,
- method
- })
- }
-
- let params = { method: 'post' }
- let _url = url
-
- if (method === 'get' && param) {
- let keys = Object.keys(param).map(key => `${key}=${param[key]}`)
- keys = keys.join('&')
- if (keys) {
- _url = _url + '?' + keys
- }
- } else if (method === 'post' && param) {
- params.data = param
- }
-
- _url = _url.replace(/&/ig, '%26')
- params.url = '/trans/redirect?rd=' + _url + '&method=' + method
-
+ directRequest (params) {
return axios(params)
}
@@ -235,16 +197,20 @@
param.thd_party_openid = openid
param.thd_party_appid = appid
param.id = scanId
- } else if (binding_type === 'login_check') { // appid 姝ゆ椂涓虹洰鏍�
+ } else if (binding_type === 'login_check') { // appid 姝ゆ椂涓虹洰鏍囧湴鍧�
param.v_type = 'login_check'
param.LoginUID = sessionStorage.getItem('LoginUID') || ''
- url = appid.replace(/\/webapi(.*)/, '/webapi/dologon/s_visitor_login')
-
+
if (!param.rduri) {
param.rduri = window.GLOB.baseurl + 'webapi/dologon/s_visitor_login'
}
-
- param.linkurl = appid.replace(/\/webapi(.*)/, '/index.html')
+
+ if (appid) {
+ url = appid.replace(/\/webapi(.*)/, '/webapi/dologon/s_visitor_login')
+ param.linkurl = appid.replace(/\/webapi(.*)/, '/index.html')
+ } else {
+ param.linkurl = window.GLOB.linkurl
+ }
}
param.LText = md5(window.btoa(_SessionUid + param.timestamp + (param.linkurl || '')))
@@ -258,7 +224,7 @@
return axios({
url: url,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -297,7 +263,7 @@
return axios({
url,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -352,7 +318,7 @@
return axios({
url,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -508,7 +474,7 @@
return axios({
url,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -532,7 +498,7 @@
return axios({
url: `${url}/${param.func}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -564,7 +530,7 @@
return axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -604,7 +570,7 @@
axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
}).then(res => {
if (res.status && window.GLOB.IndexDB) {
let msg = {
@@ -630,7 +596,7 @@
axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
}).then(res => {
if (res.status) {
window.GLOB.CacheMap.set(key, res)
@@ -729,7 +695,7 @@
axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
}).then(res => {
if (res.status) {
window.GLOB.CacheMap.set(_param, res)
@@ -793,7 +759,7 @@
axios({
url: token.interface,
method: 'post',
- data: param
+ data: JSON.stringify(param)
}).then(res => {
_resolve(res)
})
@@ -822,7 +788,7 @@
axios({
url,
method: 'post',
- data: _param
+ data: JSON.stringify(_param)
}).then(result => {
if (result.status) {
window.GLOB.OuterToken[token.interface] = {
@@ -840,7 +806,7 @@
axios({
url: token.interface,
method: 'post',
- data: param
+ data: JSON.stringify(param)
}).then(res => {
_resolve(res)
})
@@ -912,7 +878,7 @@
return axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -923,7 +889,7 @@
axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
}).then(result => {
resolve(result)
})
@@ -936,7 +902,7 @@
return axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
}
@@ -977,7 +943,7 @@
return axios({
url,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -988,6 +954,7 @@
return axios({
url: '/webapi/doupload',
method: 'post',
+ headers: { 'Content-Type': 'multipart/form-data' },
data: param
})
}
@@ -999,6 +966,7 @@
return axios({
url: '/webapi/dopreload',
method: 'post',
+ headers: { 'Content-Type': 'multipart/form-data' },
data: param
})
}
@@ -1026,6 +994,7 @@
return axios({
url: _url,
method: 'post',
+ headers: { 'Content-Type': 'multipart/form-data' },
data: param
})
}
@@ -1039,7 +1008,7 @@
return axios({
url: _url,
method: 'post',
- data: param
+ data: qs.stringify(param)
})
}
@@ -1047,7 +1016,7 @@
return axios({
url: 'http://127.0.0.1:888/postek/print',
method: 'post',
- data: data
+ data: qs.stringify(data)
})
}
}
--
Gitblit v1.8.0