From 2bccb9ec7bdefe23292a22bc153463cfa1479a49 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 六月 2024 16:25:42 +0800
Subject: [PATCH] 2024-06-21
---
src/api/index.js | 93 ++++++++++++++++++++++++++--------------------
1 files changed, 53 insertions(+), 40 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 27f1e1f..50f5937 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -15,7 +15,8 @@
window.GLOB.$error = false
let service = window.GLOB.service ? '-' + window.GLOB.service.replace('/', '') : ''
-let db = `mkdb${service}`
+let lang = sessionStorage.getItem('lang') !== 'zh-CN' ? sessionStorage.getItem('lang') : ''
+let db = `mkdb${service + lang}`
if (window.indexedDB) {
CacheUtils.openIndexDB(db)
@@ -57,6 +58,9 @@
return Promise.reject(response.data)
} else {
+ if (response.config.requestId) {
+ response.data.$requestId = response.config.requestId
+ }
return Promise.resolve(response.data)
}
}, (error) => {
@@ -94,13 +98,16 @@
}
/**
- * @description 寰俊涓氬姟璇锋眰
+ * @description 寰俊涓氬姟璇锋眰 鍘熸帴鍙� 'wxpay/getaccesstoken'
*/
wxAccessToken (domain = '') {
- let _url = window.GLOB.baseurl + 'wxpay/getaccesstoken'
+ let _url = domain || window.GLOB.baseurl
- if (domain) {
- _url = domain + 'wxpay/getaccesstoken'
+ 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 new Promise(resolve => {
@@ -109,13 +116,15 @@
} else {
window.GLOB.accessToken = {domain}
axios({
- url: _url,
- method: 'get'
+ url: _url + 'wechat/jsapi/getaccesstoken',
+ method: 'post',
+ headers: { 'Content-Type': 'application/json' },
+ data: JSON.stringify({appId: 'wx4d8a34c8d4494872'})
}).then(res => {
- if (res.oa_access_token || res.mini_access_token) {
+ if (res.oa_access_token) {
window.GLOB.accessToken.accessTime = parseInt(new Date().getTime() / 1000)
window.GLOB.accessToken.oa_access_token = res.oa_access_token
- window.GLOB.accessToken.mini_access_token = res.mini_access_token
+ // window.GLOB.accessToken.mini_access_token = res.mini_access_token
}
resolve(res)
})
@@ -125,6 +134,7 @@
/**
* @description 寰俊涓氬姟璇锋眰
+ * 39涓� qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn
*/
wxNginxRequest (url, method, param) {
let _url = url
@@ -134,16 +144,11 @@
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
- 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
- }
+ 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')
}
}
@@ -398,7 +403,7 @@
this.getSystemConfig(param).then(res => {
if (!res.status) {
- reject()
+ reject(res.message)
return
}
@@ -438,7 +443,7 @@
CacheUtils.updateIndexDBversion({version: res.app_version || '1.00', createDate: curTime})
- resolve()
+ resolve(list)
})
}, () => {
reject()
@@ -834,7 +839,7 @@
* @description 鑾峰彇涓氬姟閫氱敤鎺ュ彛
* 璁块棶 'https://sso.mk9h.cn/webapi/dostars'鎴栦簯绔椂锛屼紶鍏serid銆丩oginUID
*/
- genericInterface (param, script = '', position) {
+ genericInterface (param, script = '', position, requestId = '') {
param.userid = param.userid || sessionStorage.getItem('UserID') || ''
param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
@@ -862,8 +867,8 @@
if (script) {
try {
// eslint-disable-next-line
- let func = new Function('axios', 'Api', 'param', 'position', 'systemType', script)
- let promise = func(axios, this, param, position, window.GLOB.systemType)
+ let func = new Function('axios', 'Api', 'param', 'position', 'systemType', 'notification', script)
+ let promise = func(axios, this, param, position, window.GLOB.systemType, notification)
if (promise instanceof Promise) {
return promise
@@ -947,7 +952,8 @@
return axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: JSON.stringify(param)
+ data: JSON.stringify(param),
+ requestId
})
}
}
@@ -1024,16 +1030,11 @@
if (process.env.NODE_ENV === 'production') {
_url = document.location.origin + '/file/oss/upload'
}
- if (/^http:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
- _url = window.GLOB.location + ':8080/file/oss/upload'
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + ':8080/file/oss/upload'
- }
- } else if (/^https:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
- _url = window.GLOB.location + ':8443/file/oss/upload'
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + ':8443/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({
@@ -1057,6 +1058,21 @@
})
}
+ /**
+ * @description 寰俊鏀粯閫�娆�
+ */
+ setRefund (orderId) {
+ let _param = new FormData()
+ _param.append('out_biz_no', orderId)
+
+ return axios({
+ url: '/wxpay/wxRefund',
+ headers: { 'Content-Type': 'multipart/form-data' },
+ method: 'post',
+ data: _param
+ })
+ }
+
postekPrint (data) {
return axios({
url: 'http://127.0.0.1:888/postek/print',
@@ -1068,7 +1084,7 @@
/**
* @description sql妫�楠�
*/
- sDebug (sql, rduri = null) {
+ sDebug (sql) {
let param = {
func: 's_debug_sql',
exec_type: window.GLOB.execType || 'y',
@@ -1087,6 +1103,7 @@
sql = sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid')}'`)
sql = sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID')}'`)
sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey}'`)
+ sql = sql.replace(/@lang@/ig, `'${sessionStorage.getItem('lang')}'`)
// sql = sql.replace(/@datam@/ig, `''`)
if (window.GLOB.externalDatabase !== null) {
@@ -1103,10 +1120,6 @@
param = this.encryptParam(param)
let url = '/webapi/dostars'
-
- if (rduri) {
- url = rduri
- }
let timer = setTimeout(() => {
let _param = {
--
Gitblit v1.8.0