From 93b205e8e9ebfd2c1e8e8f2fde4ebc5eccedade9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 16 九月 2022 17:46:08 +0800
Subject: [PATCH] 2022-09-16
---
src/api/index.js | 84 ++++++++++++++++++++++++++++++++----------
1 files changed, 64 insertions(+), 20 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 7f1d3c0..9921ebc 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -42,11 +42,6 @@
const setCurrentUrl = (res) => {
if (!!(window.history && window.history.pushState)) {
- if (window.location.href.indexOf('paramsmain') > -1) {
- let _href = window.location.href.split('#')
- localStorage.setItem(_href[0] + 'paramsmain', _href[1])
- }
-
sessionStorage.clear()
sessionStorage.setItem('loginError', JSON.stringify({url: res.config ? res.config.url : '', request: res.config ? res.config.data : '', response: JSON.stringify(res.data)}))
window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
@@ -86,11 +81,7 @@
class Api {
constructor() {
- if (process.env.NODE_ENV === 'production') {
- axios.defaults.baseURL = document.location.origin + '/' + window.GLOB.service
- } else {
- axios.defaults.baseURL = window.GLOB.location + '/' + window.GLOB.service
- }
+ axios.defaults.baseURL = window.GLOB.baseurl
}
/**
@@ -111,7 +102,7 @@
* @description 寰俊涓氬姟璇锋眰
*/
wxAccessToken () {
- let _url = document.location.origin + '/' + window.GLOB.service + 'wxpay/getaccesstoken'
+ let _url = window.GLOB.baseurl + 'wxpay/getaccesstoken'
if (process.env.NODE_ENV !== 'production') {
_url = document.location.origin + '/wxpay/getaccesstoken'
}
@@ -331,6 +322,11 @@
// Type: 'X' 鏃�
// param.Password = Utils.formatOptions(password)
+ // positecgroup
+ if (window.GLOB.appkey === '202011021844144334E823A3011414082AD77') {
+ param.svccode = 'oms'
+ }
+
param.appkey = window.GLOB.appkey || ''
let url = '/webapi/dologon'
@@ -347,6 +343,36 @@
// url = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
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,
@@ -666,11 +692,10 @@
/**
* @description 鑾峰彇鏈湴绯荤粺閰嶇疆
- * @param {Object} param 璇锋眰鍙傛暟
*/
getLocalCacheConfig (param) {
param.userid = sessionStorage.getItem('UserID') || ''
- param.lang = param.lang || sessionStorage.getItem('lang') || ''
+ param.lang = sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
param.LoginUID = sessionStorage.getItem('LoginUID') || ''
param.appkey = window.GLOB.appkey || ''
@@ -737,10 +762,10 @@
param.appkey = window.GLOB.appkey || ''
let url = '/webapi/dostars'
- if (param.rduri) {
- url = param.rduri
- delete param.rduri
- }
+ // if (param.rduri) { // positecgroup
+ // url = param.rduri
+ // delete param.rduri
+ // }
let _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍￠獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
delete _param.timestamp
@@ -781,7 +806,15 @@
param.appkey = window.GLOB.appkey || ''
let url = '/webapi/dostars'
- if (param.rduri && /\/dostars/.test(param.rduri) && param.func !== 'webapi_ChangeUser') { // 鍒囨崲鐢ㄦ埛闇�瑕侀�氳繃鏈湴
+
+ if (param.rduri && /\s|\n/.test(param.rduri)) {
+ param.rduri = param.rduri.replace(/\s|\n/g, '')
+ if (!param.rduri) {
+ delete param.rduri
+ }
+ }
+
+ if (param.rduri && !window.GLOB.transfer && /\/dostars/.test(param.rduri) && param.func !== 'webapi_ChangeUser') { // 鍒囨崲鐢ㄦ埛闇�瑕侀�氳繃鏈湴
url = param.rduri
delete param.rduri
}
@@ -863,8 +896,19 @@
param = this.encryptParam(param)
let url = '/webapi/SaveBase64Image'
+
if (param.rduri) {
- url = param.rduri.replace(/webapi(.*)$/, 'webapi/SaveBase64Image')
+ param.rduri = param.rduri.replace(/webapi(.*)$/, 'webapi/SaveBase64Image')
+ if (/\s|\n/.test(param.rduri)) {
+ param.rduri = param.rduri.replace(/\s|\n/g, '')
+ if (!param.rduri) {
+ delete param.rduri
+ }
+ }
+ }
+
+ if (param.rduri && !window.GLOB.transfer) {
+ url = param.rduri
delete param.rduri
}
@@ -928,7 +972,7 @@
* @description 鑾峰彇寰俊鏀粯浜岀淮鐮�
*/
getWxNativePay (param) {
- let _url = document.location.origin + '/' + window.GLOB.service + 'wxpay/wxNativePay'
+ let _url = window.GLOB.baseurl + 'wxpay/wxNativePay'
if (process.env.NODE_ENV !== 'production') {
_url = document.location.origin + '/wxpay/wxNativePay'
}
--
Gitblit v1.8.0