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 | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index afec16a..9921ebc 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -81,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
}
/**
@@ -106,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'
}
@@ -810,11 +806,18 @@
param.appkey = window.GLOB.appkey || ''
let url = '/webapi/dostars'
- // positecgroup
- // if (param.rduri && /\/dostars/.test(param.rduri) && param.func !== 'webapi_ChangeUser') { // 鍒囨崲鐢ㄦ埛闇�瑕侀�氳繃鏈湴
- // url = param.rduri
- // delete param.rduri
- // }
+
+ 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
+ }
param = this.encryptParam(param)
@@ -893,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
}
@@ -958,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