From 6d61c46fd0a9a2e967a604519d9a6361694280dc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 01 四月 2021 17:09:16 +0800
Subject: [PATCH] 2021-04-01
---
src/api/index.js | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 6e85dc6..a584f47 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -31,7 +31,7 @@
config.data = qs.stringify(config.data)
} else if (config.url.includes('Upload') || config.url.includes('doupload') || config.url.includes('dopreload')) {
config.headers = { 'Content-Type': 'multipart/form-data' }
- } else if (config.method === 'post') {
+ } else if (config.method === 'post' && config.data) {
config.data = JSON.stringify(config.data)
}
@@ -106,11 +106,16 @@
* @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
*/
directRequest (url, method = 'post', param, cross) {
- if (cross === 'true') {
+ if (cross === 'true' && param) {
return axios({
url,
method,
data: param
+ })
+ } else if (cross === 'true') {
+ return axios({
+ url,
+ method
})
}
@@ -409,10 +414,10 @@
* @description 鑾峰彇鎴栦慨鏀圭郴缁熼厤缃紝澧炲姞appkey
*/
getSystemConfig (param) {
- param.userid = sessionStorage.getItem('UserID') || ''
+ param.userid = param.userid || sessionStorage.getItem('UserID') || ''
param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
- param.LoginUID = sessionStorage.getItem('LoginUID') || ''
+ param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
param.appkey = window.GLOB.appkey || ''
let url = '/webapi/dostars'
@@ -437,10 +442,10 @@
* @description 鑾峰彇鎴栦慨鏀规湰鍦伴厤缃紝澧炲姞appkey
*/
getLocalConfig (param) {
- param.userid = sessionStorage.getItem('UserID') || ''
+ param.userid = param.userid || sessionStorage.getItem('UserID') || ''
param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
- param.LoginUID = sessionStorage.getItem('LoginUID') || ''
+ param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
param.appkey = window.GLOB.appkey || ''
let url = '/webapi/dostars'
--
Gitblit v1.8.0