From c56dd9479e4c44af4b58c5a14c6f0f3f3cc20d85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 05 三月 2025 15:37:20 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/api/index.js | 85 ++++++++++++++++++++++--------------------
1 files changed, 44 insertions(+), 41 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index e43c5bd..37f14a6 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -138,36 +138,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 +214,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 || '')))
@@ -328,6 +307,11 @@
// Type: 'X' 鏃�
// param.Password = Utils.formatOptions(password)
+ // positecgroup
+ if (window.GLOB.appkey === '202011021844144334E823A3011414082AD77') {
+ param.svccode = 'oms'
+ }
+
let url = '/webapi/dologon'
if (isCloud) {
@@ -375,6 +359,36 @@
resolve({data: null, valid: false})
}
})
+ })
+ }
+
+ /**
+ * @description 鐧诲綍浜屾楠岃瘉 // positecgroup
+ */
+ verifycode (verify) {
+ let param = {
+ certificate: 'certificate',
+ captcha: verify.code,
+ token: verify.token,
+ ati: verify.ati,
+ vid: verify.vid,
+ uid: verify.uid,
+ shopId: verify.shopId,
+ loginId: verify.loginId,
+ phone: verify.phone,
+ sellerNick: verify.sellerNick,
+ isRisk: verify.isRisk,
+ requestId: verify.requestId,
+ riskNum: verify.riskNum,
+ username: verify.username
+ }
+
+ let url = '/webapi/dologon'
+
+ return axios({
+ url,
+ method: 'post',
+ data: param
})
}
@@ -757,7 +771,7 @@
}
let url = '/webapi/dostars'
- if (param.rduri && !window.GLOB.transfer) {
+ if (param.rduri && !window.GLOB.transfer) { // positecgroup
url = param.rduri
delete param.rduri
}
@@ -1206,19 +1220,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