From 4366981fbe7d406e90487fd94450fab6eb31120d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 29 八月 2023 17:19:35 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/api/index.js | 356 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 187 insertions(+), 169 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index a4dd5b9..3cd4414 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,16 +1,18 @@
import axios from 'axios'
import qs from 'qs'
-import { notification } from 'antd'
+import { notification, Modal } from 'antd'
import md5 from 'md5'
import CryptoJS from 'crypto-js'
import jsSHA from 'jssha'
import moment from 'moment'
+
import Utils from '@/utils/utils.js'
+import MKEmitter from '@/utils/events.js'
import CacheUtils from './cacheutils'
-import options from '@/store/options.js'
window.GLOB.IndexDB = null
window.GLOB.OuterToken = {}
+window.GLOB.$error = false
let service = window.GLOB.service ? '-' + window.GLOB.service.replace('/', '') : ''
let db = `mkdb${service}`
@@ -23,57 +25,54 @@
axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
axios.defaults.withCredentials = false
-axios.interceptors.request.use((config) => {
- if (/LoginAndRedirect|getjsonresult|wxNativePay|postek/ig.test(config.url)) {
- config.data = qs.stringify(config.data)
- } else if (/\/doupload|\/dopreload|\/upload/.test(config.url)) {
- config.headers = { 'Content-Type': 'multipart/form-data' }
- } else if (config.method === 'post' && config.data) {
- config.data = JSON.stringify(config.data)
- }
-
- return config
-}, (error) => {
- return Promise.reject(error)
-})
-
-const setCurrentUrl = (res) => {
- if (!!(window.history && window.history.pushState)) {
- 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')
- window.location.reload()
- }
-}
-
axios.interceptors.response.use((response) => {
if (response.data.ErrCode === 'LoginError') {
- if (window.debugger === true) {
+ if (window.GLOB.developing) {
+ sessionStorage.setItem('devError', 'true')
response.data.ErrCode = 'E'
return Promise.resolve(response.data)
- } else if (!sessionStorage.getItem('loginError')) {
- setCurrentUrl(response)
+ } else if (response.config.url.indexOf('https://sso.mk9h.cn/webapi/dostars') > -1) {
+ return Promise.reject(response.data)
+ } else if (response.config.url.indexOf('https://epc.mk9h.cn/webapi/dostars') > -1) {
+ return Promise.reject(response.data)
}
+
+ if (!window.GLOB.$error) {
+ window.GLOB.$error = true
+
+ Modal.destroyAll()
+ Modal.error({
+ title: response.data.message,
+ 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()
+ }
+ }
+ })
+ }
+
+ return Promise.reject(response.data)
} else {
return Promise.resolve(response.data)
}
}, (error) => {
- let response = error.response
+ let response = error.response || ''
- if (response) {
- if (!response.data || !response.data.errors) { // 杩囨护鏃疯鎶ラ敊淇℃伅
- notification.error({
- className: 'notification-custom-error',
- bottom: 0,
- message: '鐘舵�佺爜-' + response.status + '锛岃鑱旂郴绠＄悊鍛�',
- placement: 'bottomRight',
- duration: 15
- })
- }
- return Promise.reject(response)
- } else {
- return Promise.reject()
+ if (response && response.status) {
+ notification.error({
+ className: 'notification-custom-error',
+ bottom: 0,
+ message: '鐘舵�佺爜-' + response.status + '锛岃鑱旂郴绠＄悊鍛�',
+ placement: 'bottomRight',
+ duration: 15
+ })
}
+
+ return Promise.reject(response)
})
class Api {
@@ -91,24 +90,25 @@
return axios({
url: `/webapi/dostar${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
/**
* @description 寰俊涓氬姟璇锋眰
*/
- wxAccessToken () {
+ wxAccessToken (domain = '') {
let _url = window.GLOB.baseurl + 'wxpay/getaccesstoken'
- if (process.env.NODE_ENV !== 'production') {
- _url = document.location.origin + '/wxpay/getaccesstoken'
+
+ if (domain) {
+ _url = domain + 'wxpay/getaccesstoken'
}
return new Promise(resolve => {
- if (window.GLOB.accessToken.accessTime && (parseInt(new Date().getTime() / 1000) - window.GLOB.accessToken.accessTime < 30)) {
+ if (window.GLOB.accessToken.domain === domain && window.GLOB.accessToken.accessTime && (parseInt(new Date().getTime() / 1000) - window.GLOB.accessToken.accessTime < 30)) {
resolve(window.GLOB.accessToken)
} else {
- window.GLOB.accessToken = {}
+ window.GLOB.accessToken = {domain}
axios({
url: _url,
method: 'get'
@@ -128,19 +128,23 @@
* @description 寰俊涓氬姟璇锋眰
*/
wxNginxRequest (url, method, param) {
- let _url = window.GLOB.location + '/' + url
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + '/' + url
- }
- if (/^http:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
- _url = window.GLOB.location + ':8080/' + url
+ let _url = url
+
+ if (!/^http/.test(url)) {
+ _url = window.GLOB.location + '/' + url
if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + ':8080/' + url
+ _url = document.location.origin + '/' + url
}
- } else if (/^https:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
- _url = window.GLOB.location + ':8443/' + url
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + ':8443/' + url
+ if (/^http:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
+ _url = window.GLOB.location + ':8080/' + url
+ if (process.env.NODE_ENV === 'production') {
+ _url = document.location.origin + ':8080/' + url
+ }
+ } else if (/^https:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
+ _url = window.GLOB.location + ':8443/' + url
+ if (process.env.NODE_ENV === 'production') {
+ _url = document.location.origin + ':8443/' + url
+ }
}
}
@@ -160,38 +164,8 @@
/**
* @description 鐩存帴璇锋眰
- * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
*/
- directRequest (url, method = 'post', param, cross) {
- if (cross === 'true' && param) {
- return axios({
- url,
- method,
- data: param
- })
- } else if (cross === 'true') {
- return axios({
- url,
- method
- })
- }
-
- let params = { method: 'post' }
- let _url = url
-
- if (method === 'get' && param) {
- let keys = Object.keys(param).map(key => `${key}=${param[key]}`)
- keys = keys.join('&')
- if (keys) {
- _url = _url + '?' + keys
- }
- } else if (method === 'post' && param) {
- params.data = param
- }
-
- _url = _url.replace(/&/ig, '%26')
- params.url = '/trans/redirect?rd=' + _url + '&method=' + method
-
+ directRequest (params) {
return axios(params)
}
@@ -226,16 +200,20 @@
param.thd_party_openid = openid
param.thd_party_appid = appid
param.id = scanId
- } else if (binding_type === 'login_check') { // appid 姝ゆ椂涓虹洰鏍�
+ } else if (binding_type === 'login_check') { // appid 姝ゆ椂涓虹洰鏍囧湴鍧�
param.v_type = 'login_check'
param.LoginUID = sessionStorage.getItem('LoginUID') || ''
- url = appid.replace(/\/webapi(.*)/, '/webapi/dologon/s_visitor_login')
-
+
if (!param.rduri) {
param.rduri = window.GLOB.baseurl + 'webapi/dologon/s_visitor_login'
}
-
- param.linkurl = appid.replace(/\/webapi(.*)/, '/index.html')
+
+ if (appid) {
+ url = appid.replace(/\/webapi(.*)/, '/webapi/dologon/s_visitor_login')
+ param.linkurl = appid.replace(/\/webapi(.*)/, '/index.html')
+ } else {
+ param.linkurl = window.GLOB.linkurl
+ }
}
param.LText = md5(window.btoa(_SessionUid + param.timestamp + (param.linkurl || '')))
@@ -249,7 +227,7 @@
return axios({
url: url,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -264,7 +242,7 @@
Password: '',
check_code: checkcode,
way_no: 'sms_vcode',
- systemType: options.sysType,
+ systemType: window.GLOB.sysType,
login_city: sessionStorage.getItem('city') || '',
login_id_address: sessionStorage.getItem('ipAddress') || '',
kei_id: window.btoa(window.encodeURIComponent(window.GLOB.host)),
@@ -275,11 +253,11 @@
let url = '/webapi/dologon'
if (isCloud) {
param.debug = 'Y'
- if (options.cloudServiceApi) {
- param.rduri = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
+ if (window.GLOB.cloudServiceApi) {
+ param.rduri = window.GLOB.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
}
} else if (window.GLOB.mainSystemApi) {
- if (options.sysType !== 'cloud' && window.GLOB.systemType !== 'production') {
+ if (window.GLOB.sysType !== 'cloud' && window.GLOB.systemType !== 'production') {
param.linkurl = window.GLOB.linkurl
}
param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
@@ -288,7 +266,7 @@
return axios({
url,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -300,7 +278,7 @@
let param = {
// func: 'webapi_login',
UserName: username,
- systemType: options.sysType,
+ systemType: window.GLOB.sysType,
Type: 'S',
login_city: sessionStorage.getItem('city') || '',
login_id_address: sessionStorage.getItem('ipAddress') || '',
@@ -326,15 +304,20 @@
// Type: 'X' 鏃�
// param.Password = Utils.formatOptions(password)
+ // positecgroup
+ if (window.GLOB.appkey === '202011021844144334E823A3011414082AD77') {
+ param.svccode = 'oms'
+ }
+
let url = '/webapi/dologon'
if (isCloud) {
param.debug = 'Y'
- if (options.cloudServiceApi) {
- param.rduri = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
+ if (window.GLOB.cloudServiceApi) {
+ param.rduri = window.GLOB.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
}
} else if (window.GLOB.mainSystemApi) {
- if (options.sysType !== 'cloud' && window.GLOB.systemType !== 'production') {
+ if (window.GLOB.sysType !== 'cloud' && window.GLOB.systemType !== 'production') {
param.linkurl = window.GLOB.linkurl
}
param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
@@ -343,46 +326,75 @@
return axios({
url,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
delCacheConfig (type = '') {
- let date = moment().subtract(7, 'days').format('YYYY-MM-DD')
+ let date = moment().subtract(7, 'days').format('YYYY-MM-DD HH:mm:ss')
CacheUtils.delIndexDBCacheConfig(date, type)
}
- writeCacheConfig (menuid, data) {
+ writeCacheConfig (menuid, data, BID = '', id = '') {
if (!menuid) return
- let date = moment().format('YYYY-MM-DD')
+ let date = moment().format('YYYY-MM-DD HH:mm:ss')
let _data = data ? JSON.stringify(data) : ''
+ let userid = sessionStorage.getItem('UserID') || ''
- CacheUtils.writeCacheInIndexDB({menuid, CreateDate: date, LongParam: _data})
+ CacheUtils.writeCacheInIndexDB({menuid: md5(menuid + userid + BID + id), BID: BID, id: id, CreateDate: date, LongParam: _data})
}
- getLCacheConfig (menuid) {
+ getLCacheConfig (menuid, minutes, BID = '', id = '') {
return new Promise((resolve, reject) => {
- if (window.GLOB.IndexDB) {
- CacheUtils.getIndexDBCacheConfig(menuid).then(res => {
- if (res && res.LongParam) {
- let _data = JSON.parse(res.LongParam)
- if (_data.length === 0) {
- resolve()
- } else {
- resolve(_data)
- }
- } else {
- resolve()
- }
- })
- } else {
- resolve()
- }
+ let limit = minutes ? moment().subtract(minutes, 'minutes').format('YYYY-MM-DD HH:mm:ss') : ''
+ let userid = sessionStorage.getItem('UserID') || ''
+
+ CacheUtils.getIndexDBCacheConfig(md5(menuid + userid + BID + id)).then(res => {
+ if (res && res.LongParam) {
+ resolve({data: JSON.parse(res.LongParam), valid: !limit || res.CreateDate > limit})
+ } else {
+ resolve({data: null, valid: false})
+ }
+ })
})
}
/**
+<<<<<<< HEAD
+ * @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
+ })
+ }
+
+ /**
+ * @description 鑾峰彇绯荤粺鐗堟湰淇℃伅锛屽惎鐢ㄦ垨鏇存柊websql
+=======
* @description 鑾峰彇绯荤粺鐗堟湰淇℃伅
+>>>>>>> master
*/
getAppVersion (reload) {
if (!window.GLOB.IndexDB) {
@@ -397,6 +409,11 @@
let param = {
func: 's_get_app_version',
modifydate: msg.createDate
+ }
+
+ if (window.GLOB.initVersion && sessionStorage.getItem('visitorUserID')) {
+ param.userid = sessionStorage.getItem('visitorUserID')
+ param.LoginUID = sessionStorage.getItem('visitorLoginUID')
}
param.TypeCharOne = ''
@@ -440,7 +457,8 @@
if (list.length > 0) {
let clear = false
let _appkey = window.GLOB.appkey.substr(-10)
- let reg = new RegExp(_appkey + '$', 'ig')
+ let reg = new RegExp(_appkey + '$', 'i')
+ let reHome = list.includes('home_page_id')
list.forEach(mid => {
if (reg.test(mid)) {
@@ -451,6 +469,11 @@
list = ''
}
CacheUtils.delIndexDBConfig(list)
+ this.delCacheConfig('all')
+
+ if (reHome) {
+ MKEmitter.emit('reloadMenuView', 'home_page_id')
+ }
}
CacheUtils.updateIndexDBversion({version: res.app_version || '1.00', createDate: curTime})
@@ -484,14 +507,14 @@
*/
getCloudConfig (param) {
param.lang = param.lang || sessionStorage.getItem('lang') || ''
- param.appkey = window.GLOB.appkey || ''
+ param.appkey = param.appkey || window.GLOB.appkey || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
- param.userid = sessionStorage.getItem('CloudUserID') || ''
- param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
+ param.userid = param.userid || sessionStorage.getItem('CloudUserID') || ''
+ param.LoginUID = param.LoginUID || sessionStorage.getItem('CloudLoginUID') || ''
param = this.encryptParam(param)
- let url = options.cloudServiceApi ? options.cloudServiceApi : '/webapi/dostars'
+ let url = window.GLOB.cloudServiceApi ? window.GLOB.cloudServiceApi : '/webapi/dostars'
if (param.func) {
url = url + '/' + param.func
}
@@ -499,7 +522,7 @@
return axios({
url,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -523,7 +546,7 @@
return axios({
url: `${url}/${param.func}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -538,8 +561,8 @@
param.appkey = param.appkey || window.GLOB.appkey
let url = '/webapi/dostars'
- if (sessionStorage.getItem('isEditState') === 'true' && options.cloudServiceApi) { // 缂栬緫鐘舵�侊紝涓斿瓨鍦ㄤ簯绔湴鍧�
- url = options.cloudServiceApi
+ if (window.GLOB.mkHS && window.GLOB.cloudServiceApi) { // HS涓嬶紝涓斿瓨鍦ㄤ簯绔湴鍧�
+ url = window.GLOB.cloudServiceApi
param.userid = sessionStorage.getItem('CloudUserID') || ''
param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
} else if (window.GLOB.mainSystemApi) {
@@ -555,7 +578,7 @@
return axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -567,12 +590,12 @@
param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
param.LoginUID = sessionStorage.getItem('LoginUID') || ''
- param.appkey = window.GLOB.appkey || ''
+ param.appkey = param.appkey || window.GLOB.appkey || ''
let url = '/webapi/dostars'
- if (sessionStorage.getItem('isEditState') === 'true') { // 缂栬緫鐘舵�侊紝鍗曠偣鐧诲綍鏈嶅姟鍣ㄤ负浜戠
- if (options.cloudServiceApi) { // 瀛樺湪浜戠鍦板潃鏃讹紝浣跨敤浜戠绯荤粺鍙傛暟
- url = options.cloudServiceApi
+ if (window.GLOB.mkHS) { // HS涓嬶紝鍗曠偣鐧诲綍鏈嶅姟鍣ㄤ负浜戠
+ if (window.GLOB.cloudServiceApi) { // 瀛樺湪浜戠鍦板潃鏃讹紝浣跨敤浜戠绯荤粺鍙傛暟
+ url = window.GLOB.cloudServiceApi
param.userid = sessionStorage.getItem('CloudUserID') || ''
param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
}
@@ -595,7 +618,7 @@
axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
}).then(res => {
if (res.status && window.GLOB.IndexDB) {
let msg = {
@@ -621,7 +644,7 @@
axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
}).then(res => {
if (res.status) {
window.GLOB.CacheMap.set(key, res)
@@ -647,7 +670,7 @@
if (window.GLOB.CacheMap.has(_param)) {
return Promise.resolve(window.GLOB.CacheMap.get(_param))
} else {
- return Promise.resolve({ErrCode: 'S', ErrMesg: '', LongParam: '', message: '', status: false})
+ return Promise.resolve({ErrCode: 'S', LongParam: '', message: '', status: false})
}
}
@@ -696,7 +719,7 @@
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
}
@@ -720,7 +743,7 @@
axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
}).then(res => {
if (res.status) {
window.GLOB.CacheMap.set(_param, res)
@@ -751,7 +774,7 @@
token = JSON.parse(window.decodeURIComponent(window.atob(token)))
} catch (e) {
token = null
- _resolve({status: false, ErrCode: 'E', message: '鎺ュ彛淇℃伅瑙ｆ瀽澶辫触锛�'})
+ _resolve({status: false, ErrCode: 'token_error', message: '鎺ュ彛淇℃伅瑙ｆ瀽澶辫触锛�'})
}
if (!token) return
@@ -784,14 +807,14 @@
axios({
url: token.interface,
method: 'post',
- data: param
+ data: JSON.stringify(param)
}).then(res => {
_resolve(res)
})
} else {
let _param = {
UserName: token.username,
- systemType: options.sysType,
+ systemType: window.GLOB.sysType,
login_city: sessionStorage.getItem('city') || '',
device_id: token.appkey || '',
timestamp: moment().format('YYYY-MM-DD HH:mm:ss'),
@@ -813,7 +836,7 @@
axios({
url,
method: 'post',
- data: _param
+ data: JSON.stringify(_param)
}).then(result => {
if (result.status) {
window.GLOB.OuterToken[token.interface] = {
@@ -831,7 +854,7 @@
axios({
url: token.interface,
method: 'post',
- data: param
+ data: JSON.stringify(param)
}).then(res => {
_resolve(res)
})
@@ -854,19 +877,14 @@
param.appkey = window.GLOB.appkey || ''
if (param.$token === '') {
- return Promise.resolve({status: false, ErrCode: 'E', message: '鎺ュ彛鍦板潃灏氭湭璁剧疆锛�'})
+ return Promise.resolve({status: false, ErrCode: 'token_error', message: '鎺ュ彛鍦板潃灏氭湭璁剧疆锛�'})
} else if (param.$token) {
return new Promise(resolve => this.visitOuterSystem(param, resolve))
}
- if (['sPC_Get_TableData', 'sPC_Get_TableData_debug', 'sPC_TableData_InUpDe', 'sPC_TableData_InUpDe_debug', 'sPC_Get_structured_data'].includes(param.func)) {
- if (sessionStorage.getItem('isEditState') === 'true') {
- param.username = sessionStorage.getItem('CloudUserName') || ''
- param.fullname = sessionStorage.getItem('CloudFullName') || ''
- } else {
- param.username = sessionStorage.getItem('User_Name') || ''
- param.fullname = sessionStorage.getItem('Full_Name') || ''
- }
+ if (['sPC_TableData_InUpDe', 'sPC_TableData_InUpDe_debug'].includes(param.func)) {
+ param.username = sessionStorage.getItem('User_Name') || ''
+ param.fullname = sessionStorage.getItem('Full_Name') || ''
}
let login = false
@@ -903,7 +921,7 @@
return axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -914,7 +932,7 @@
axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
}).then(result => {
resolve(result)
})
@@ -927,7 +945,7 @@
return axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
}
@@ -968,7 +986,7 @@
return axios({
url,
method: 'post',
- data: param
+ data: JSON.stringify(param)
})
}
@@ -979,6 +997,7 @@
return axios({
url: '/webapi/doupload',
method: 'post',
+ headers: { 'Content-Type': 'multipart/form-data' },
data: param
})
}
@@ -990,6 +1009,7 @@
return axios({
url: '/webapi/dopreload',
method: 'post',
+ headers: { 'Content-Type': 'multipart/form-data' },
data: param
})
}
@@ -1017,6 +1037,7 @@
return axios({
url: _url,
method: 'post',
+ headers: { 'Content-Type': 'multipart/form-data' },
data: param
})
}
@@ -1026,14 +1047,11 @@
*/
getWxNativePay (param) {
let _url = window.GLOB.baseurl + 'wxpay/wxNativePay'
- if (process.env.NODE_ENV !== 'production') {
- _url = document.location.origin + '/wxpay/wxNativePay'
- }
return axios({
url: _url,
method: 'post',
- data: param
+ data: qs.stringify(param)
})
}
@@ -1041,7 +1059,7 @@
return axios({
url: 'http://127.0.0.1:888/postek/print',
method: 'post',
- data: data
+ data: qs.stringify(data)
})
}
}
--
Gitblit v1.8.0