From 78db2a9b5e94b8a95f0735596e38410c24f990ea Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 08 四月 2025 17:46:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/api/index.js | 62 +++++++++----------------------
1 files changed, 18 insertions(+), 44 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index e43c5bd..9ef82f6 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -48,10 +48,12 @@
okText: '鐭ラ亾浜�',
onOk: () => {
window.GLOB.$error = false
- sessionStorage.clear()
- if (!!(window.history && window.history.pushState)) {
- window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
- window.location.reload()
+ if (!/#\/login/.test(window.location.href)) {
+ sessionStorage.clear()
+ if (!!(window.history && window.history.pushState)) {
+ window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
+ window.location.reload()
+ }
}
}
})
@@ -59,6 +61,10 @@
return Promise.reject(response.data)
} else {
+ if (response.data.ErrCode === 'E' && /姝婚攣/.test(response.data.message)) {
+ response.data.message = '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇曪紒'
+ response.data.ErrMesg = '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇曪紒'
+ }
if (response.config.requestId) {
response.data.$requestId = response.config.requestId
}
@@ -138,36 +144,12 @@
// }
/**
- * @description 寰俊涓氬姟璇锋眰
- * 39涓� qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn
+ * @description 蹇�掓煡璇�
*/
- wxNginxRequest (url, method, param) {
- let _url = url
-
- if (!/^http/.test(url)) {
- _url = window.GLOB.location + '/' + url
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + '/' + url
- }
- }
- if (/qingqiumarket.cn|cloud.mk9h.cn/.test(_url)) {
- _url = _url.replace('http://qingqiumarket.cn/', 'http://qingqiumarket.cn:8080/')
- _url = _url.replace('http://cloud.mk9h.cn/', 'http://cloud.mk9h.cn:8080/')
- _url = _url.replace('https://qingqiumarket.cn/', 'https://qingqiumarket.cn:8443/')
- _url = _url.replace('https://cloud.mk9h.cn/', 'https://cloud.mk9h.cn:8443/')
- }
-
- if (param) {
- return axios({
- url: _url,
- method,
- data: param
- })
- }
-
+ expressRequest (url) {
return axios({
- url: _url,
- method
+ url: window.GLOB.location + '/' + url,
+ method: 'get'
})
}
@@ -238,6 +220,9 @@
} else {
param.linkurl = window.GLOB.linkurl
}
+ } else if (binding_type === 'cloud') { // 鐧诲綍浜戠
+ delete param.rduri
+ url = window.atob('aHR0cHM6Ly9jbG91$mkZC5tazloLmNu'.replace('$mk', '')) + '/webapi/dologon/s_visitor_login'
}
param.LText = md5(window.btoa(_SessionUid + param.timestamp + (param.linkurl || '')))
@@ -1206,19 +1191,8 @@
* @description oss鏂囦欢涓婁紶
*/
fileOssUpload (param) {
- let _url = window.GLOB.location + '/file/oss/upload'
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + '/file/oss/upload'
- }
- if (/qingqiumarket.cn|cloud.mk9h.cn/.test(_url)) {
- _url = _url.replace('http://qingqiumarket.cn/', 'http://qingqiumarket.cn:8080/')
- _url = _url.replace('http://cloud.mk9h.cn/', 'http://cloud.mk9h.cn:8080/')
- _url = _url.replace('https://qingqiumarket.cn/', 'https://qingqiumarket.cn:8443/')
- _url = _url.replace('https://cloud.mk9h.cn/', 'https://cloud.mk9h.cn:8443/')
- }
-
return axios({
- url: _url,
+ url: window.GLOB.location + '/file/oss/upload',
method: 'post',
headers: { 'Content-Type': 'multipart/form-data' },
data: param
--
Gitblit v1.8.0