From 072de941dc14eca12ffa90f2630bbbaeca542f98 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 14 四月 2025 17:19:50 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/api/index.js | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index e7e03b7..a49a84a 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -48,6 +48,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')
+
if (!/#\/login/.test(window.location.href)) {
sessionStorage.clear()
if (!!(window.history && window.history.pushState)) {
@@ -62,8 +74,8 @@
return Promise.reject(response.data)
} else {
if (response.data.ErrCode === 'E' && /姝婚攣/.test(response.data.message)) {
- response.data.message = '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇曪紒'
- response.data.ErrMesg = '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇曪紒'
+ response.data.message = window.GLOB.dict['server_busy'] || '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇曪紒'
+ response.data.ErrMesg = response.data.message
}
if (response.config.requestId) {
response.data.$requestId = response.config.requestId
@@ -73,11 +85,11 @@
}, (error) => {
let response = error.response || ''
- if (!response && (error.message.includes('Network Error') || error.message.includes('CORS'))) {
+ if (!response) {
notification.error({
className: 'notification-custom-error',
bottom: 0,
- message: '缃戠粶杩炴帴澶辫触锛�',
+ message: error.message.includes('Network Error') && sessionStorage.getItem('lang') === 'zh-CN' ? '缃戠粶杩炴帴澶辫触锛�' : error.message,
placement: 'bottomRight',
duration: 15
})
@@ -139,6 +151,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 寰俊涓氬姟璇锋眰 鍘熸帴鍙� 'wxpay/getaccesstoken'
*/
// wxAccessToken (appId, domain = '') {
--
Gitblit v1.8.0