From bbcb3f45ad0ef4c808bf5a68ec10c0464c094e2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 27 十月 2021 11:51:40 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/api/index.js | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 50f0f42..badf754 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -46,6 +46,16 @@
let _href = window.location.href.split('#')
localStorage.setItem(_href[0] + 'paramsmain', _href[1])
}
+ localStorage.removeItem('UserID')
+ localStorage.removeItem('LoginUID')
+ localStorage.removeItem('User_Name')
+ localStorage.removeItem('Full_Name')
+ localStorage.removeItem('avatar')
+ localStorage.removeItem('dataM')
+ localStorage.removeItem('localDataM')
+ localStorage.removeItem('debug')
+ localStorage.removeItem('role_id')
+ localStorage.removeItem('localRole_id')
sessionStorage.clear()
sessionStorage.setItem('loginError', JSON.stringify({request: res.config ? res.config.data : '', response: JSON.stringify(res.data)}))
@@ -102,7 +112,25 @@
}
/**
- * @description 鐩存帴璇锋眰
+ * @description 浣跨敤dostar鎺ュ彛锛岃烦杩囬獙璇�
+ * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
+ */
+ loginAndRedirect (param) {
+ let url = ''
+ if (process.env.NODE_ENV === 'production') {
+ url = document.location.origin + '/Home/LoginAndRedirect'
+ } else {
+ url = '/Home/LoginAndRedirect'
+ }
+
+ return axios({
+ url: url,
+ method: 'post',
+ data: param
+ })
+ }
+
+ /* @description 鐩存帴璇锋眰
* @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
*/
directRequest (url, method = 'post', param, cross) {
@@ -479,7 +507,7 @@
param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
- param.appkey = window.GLOB.appkey || ''
+ param.appkey = param.appkey || window.GLOB.appkey
let url = '/webapi/dostars'
if (sessionStorage.getItem('isEditState') === 'true' && options.cloudServiceApi) { // 缂栬緫鐘舵�侊紝涓斿瓨鍦ㄤ簯绔湴鍧�
--
Gitblit v1.8.0