From d26ecdf69db28f9e3ac71834658e0fade6fcf5ca Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 27 十月 2023 09:50:58 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/api/index.js | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 6bd3102..291e306 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -46,6 +46,18 @@
okText: '鐭ラ亾浜�',
onOk: () => {
window.GLOB.$error = false
+
+ 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('mk_user_type')
+
sessionStorage.clear()
if (!!(window.history && window.history.pushState)) {
window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
@@ -94,6 +106,25 @@
}
/**
+ * @description 浣跨敤dostar鎺ュ彛锛岃烦杩囬獙璇�
+ * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
+ */
+ loginAndRedirect (param) {
+ let url = ''
+ if (process.env.NODE_ENV === 'production') {
+ url = document.location.origin + '/zh-CN/Home/LoginAndRedirect'
+ } else {
+ url = window.GLOB.location + '/zh-CN/Home/LoginAndRedirect'
+ }
+
+ return axios({
+ url: url,
+ method: 'post',
+ data: qs.stringify(param)
+ })
+ }
+
+ /* @description 鐩存帴璇锋眰
* @description 寰俊涓氬姟璇锋眰
*/
wxAccessToken (domain = '') {
@@ -359,7 +390,6 @@
}
/**
-<<<<<<< HEAD
* @description 鐧诲綍浜屾楠岃瘉 // positecgroup
*/
verifycode (verify) {
@@ -391,9 +421,6 @@
/**
* @description 鑾峰彇绯荤粺鐗堟湰淇℃伅锛屽惎鐢ㄦ垨鏇存柊websql
-=======
- * @description 鑾峰彇绯荤粺鐗堟湰淇℃伅
->>>>>>> master
*/
getAppVersion (reload) {
if (!window.GLOB.IndexDB) {
@@ -1138,6 +1165,8 @@
clearTimeout(timer)
if (/Shared Memory Provider|浼氳瘽澶勪簬缁堟鐘舵�亅褰撳墠鍛戒护鍙戠敓浜嗕弗閲嶉敊璇�/.test(res.message)) {
res.message = '楠岃瘉澶辫触锛岃妫�鏌QL涓槸鍚﹀瓨鍦ㄦ寰幆銆�'
+ } else if (res.message.indexOf('EXECUTE 鍚庣殑浜嬪姟璁℃暟鎸囩ず BEGIN 鍜� COMMIT 璇彞鐨勬暟鐩笉鍖归厤銆備笂涓�璁℃暟 = 1锛屽綋鍓嶈鏁� = 0') > -1) {
+ res.ErrCode = '-2'
}
resolve(res)
}, () => {
--
Gitblit v1.8.0