From db942b44e0755ee1ce4bc8912be2cb1ca5f89c95 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 七月 2024 17:04:41 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/api/index.js | 127 ++++++++++++++++++++++++++----------------
1 files changed, 78 insertions(+), 49 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 42bb5d4..aab9485 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)
@@ -97,28 +98,24 @@
}
/**
- * @description 寰俊涓氬姟璇锋眰
+ * @description 寰俊涓氬姟璇锋眰 鍘熸帴鍙� 'wxpay/getaccesstoken'
*/
- wxAccessToken (domain = '') {
- let _url = window.GLOB.baseurl + 'wxpay/getaccesstoken'
-
- if (domain) {
- _url = domain + 'wxpay/getaccesstoken'
- }
+ wxAccessToken (appId, domain = '') {
+ let _url = domain || window.GLOB.baseurl
return new Promise(resolve => {
- if (window.GLOB.accessToken.domain === domain && window.GLOB.accessToken.accessTime && (parseInt(new Date().getTime() / 1000) - window.GLOB.accessToken.accessTime < 30)) {
+ if (window.GLOB.accessToken.appId === appId && window.GLOB.accessToken.accessTime && (parseInt(new Date().getTime() / 1000) - window.GLOB.accessToken.accessTime < 30)) {
resolve(window.GLOB.accessToken)
} else {
- window.GLOB.accessToken = {domain}
+ window.GLOB.accessToken = {appId}
axios({
- url: _url,
- method: 'get'
+ url: _url + 'wechat/getaccesstoken',
+ method: 'post',
+ data: JSON.stringify({app_id: appId})
}).then(res => {
- if (res.oa_access_token || res.mini_access_token) {
+ if (res.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.access_token = res.access_token
}
resolve(res)
})
@@ -128,6 +125,7 @@
/**
* @description 寰俊涓氬姟璇锋眰
+ * 39涓� qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn
*/
wxNginxRequest (url, method, param) {
let _url = url
@@ -137,17 +135,12 @@
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/')
}
if (param) {
@@ -306,6 +299,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 +351,36 @@
resolve({data: null, valid: false})
}
})
+ })
+ }
+
+ /**
+ * @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
})
}
@@ -672,7 +700,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
}
@@ -865,8 +893,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
@@ -1028,16 +1056,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({
@@ -1049,15 +1072,24 @@
}
/**
- * @description 鑾峰彇寰俊鏀粯浜岀淮鐮�
+ * @description 鑾峰彇寰俊鏀粯浜岀淮鐮� 鍘熸帴鍙xpay/wxNativePay
*/
getWxNativePay (param) {
- let _url = window.GLOB.baseurl + 'wxpay/wxNativePay'
-
return axios({
- url: _url,
+ url: window.GLOB.baseurl + 'wechat/native',
method: 'post',
- data: qs.stringify(param)
+ data: JSON.stringify(param)
+ })
+ }
+
+ /**
+ * @description 寰俊鏀粯閫�娆� 鍘熸帴鍙xpay/wxRefund
+ */
+ setRefund (param) {
+ return axios({
+ url: window.GLOB.baseurl + 'wechat/wxRefund',
+ method: 'post',
+ data: JSON.stringify(param)
})
}
@@ -1072,7 +1104,7 @@
/**
* @description sql妫�楠�
*/
- sDebug (sql, rduri = null) {
+ sDebug (sql) {
let param = {
func: 's_debug_sql',
exec_type: window.GLOB.execType || 'y',
@@ -1091,6 +1123,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) {
@@ -1107,10 +1140,6 @@
param = this.encryptParam(param)
let url = '/webapi/dostars'
-
- if (rduri) {
- url = rduri
- }
let timer = setTimeout(() => {
let _param = {
--
Gitblit v1.8.0