From 3d71e181be80c0a1cbb03aff2afecb4351496d46 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 25 十一月 2022 11:19:21 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/api/index.js | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 5179db8..23bdeca 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -340,6 +340,11 @@
// Type: 'X' 鏃�
// param.Password = Utils.formatOptions(password)
+ // positecgroup
+ if (window.GLOB.appkey === '202011021844144334E823A3011414082AD77') {
+ param.svccode = 'oms'
+ }
+
let url = '/webapi/dologon'
if (isCloud) {
@@ -353,6 +358,36 @@
}
param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
}
+
+ return axios({
+ url,
+ method: 'post',
+ data: param
+ })
+ }
+
+ /**
+ * @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,
@@ -792,17 +827,20 @@
param.appkey = window.GLOB.appkey || ''
let url = '/webapi/dostars'
- if (param.rduri && !window.GLOB.transfer) {
+ if (param.rduri && !window.GLOB.transfer) { // positecgroup
url = param.rduri
delete param.rduri
}
- let _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍￠獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
- delete _param.timestamp
- delete _param.secretkey
- delete _param.open_key
- _param = JSON.stringify(_param)
- _param = md5(_param)
+ let _param = ''
+ if (cache) {
+ _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍￠獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
+ delete _param.timestamp
+ delete _param.secretkey
+ delete _param.open_key
+ _param = JSON.stringify(_param)
+ _param = md5(_param)
+ }
if (cache && window.GLOB.CacheMap.has(_param)) {
return Promise.resolve(window.GLOB.CacheMap.get(_param))
--
Gitblit v1.8.0