From 07c005cf28acf74e3afde82122e4c53e1000d70c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 六月 2023 12:06:18 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/api/index.js | 416 ++++++++++++++++++-----------------------------------------
1 files changed, 127 insertions(+), 289 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 2f88dfc..814b0dd 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -9,21 +9,12 @@
import CacheUtils from './cacheutils'
import options from '@/store/options.js'
-// window.GLOB.WebSql = null
window.GLOB.IndexDB = null
window.GLOB.OuterToken = {}
-const systemMenuKeys = `1581067625930haged11ieaivpavv77k,1581734956310scks442ul2d955g9tu5,1583991994144ndddg0bhh0is6shi0v1,1583979633842550imkchl4qt4qppsiv,
- 1585192949946f3et2ts8tn82krmumdf,15855615451212m12ip23vpcm79kloro,1587005717541lov40vg61q7l1rbveon,1590458676585agbbr63t6ihighg2i1g,1602315375262ikd33ii0nii34pt861o,1582771068837vsv54a089lgp45migbg,
- 1582777675954ifu05upurs465omoth7,158294809668898cklbv6c5bou8e1fpu,1584676379094iktph45fb8imhg96bql,1584695125339vo5g7iqgfn01qmrd6s2,1584699661372vhmpp9dn9foo0eob722,15848421131551gg04ie8sitsd3f7467,
- 1589782279158ngr675kk3oksin35sul,1589788042787ffdt9hle4s45k9r1nvs,1594095599055qicg2eb642v5qglhnuo,1577972969199lei1g0qkvlh4tkc908m,16044812935562g807p3p12huk8kokmb,
- 1578479100252lfbp29v1kafk4s4q4ig,1577971621421tg4v0i1ur8873k7e0ob,1577929944419lgc5h3hepum765e2k7u,1588493493409k9guqp067d31lu7blsv,15827879285193g85m3i2uprektpgmpf`
let service = window.GLOB.service ? '-' + window.GLOB.service.replace('/', '') : ''
let db = `mkdb${service}`
-// if (window.openDatabase) {
-// CacheUtils.openWebSql(db)
-// } else if (window.indexedDB) {
if (window.indexedDB) {
CacheUtils.openIndexDB(db)
}
@@ -57,7 +48,7 @@
axios.interceptors.response.use((response) => {
if (response.data.ErrCode === 'LoginError') {
- if (window.debugger === true) {
+ if (window.debugger === true || window.GLOB.saving) {
response.data.ErrCode = 'E'
return Promise.resolve(response.data)
} else if (!sessionStorage.getItem('loginError')) {
@@ -107,17 +98,18 @@
/**
* @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'
@@ -137,19 +129,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
+ }
}
}
@@ -335,6 +331,11 @@
// Type: 'X' 鏃�
// param.Password = Utils.formatOptions(password)
+ // positecgroup
+ if (window.GLOB.appkey === '202011021844144334E823A3011414082AD77') {
+ param.svccode = 'oms'
+ }
+
let url = '/webapi/dologon'
if (isCloud) {
@@ -358,7 +359,6 @@
delCacheConfig (type = '') {
let date = moment().subtract(7, 'days').format('YYYY-MM-DD')
- // CacheUtils.delWebSqlCacheConfig(date, type)
CacheUtils.delIndexDBCacheConfig(date, type)
}
@@ -367,26 +367,11 @@
let date = moment().format('YYYY-MM-DD')
let _data = data ? JSON.stringify(data) : ''
- // CacheUtils.writeCacheInWebSql([menuid, date, _data])
CacheUtils.writeCacheInIndexDB({menuid, CreateDate: date, LongParam: _data})
}
getLCacheConfig (menuid) {
return new Promise((resolve, reject) => {
- // if (window.GLOB.WebSql) {
- // CacheUtils.getWebSqlCacheConfig(menuid).then(res => {
- // if (res && res.LongParam) {
- // let _data = JSON.parse(res.LongParam)
- // if (_data.length === 0) {
- // resolve()
- // } else {
- // resolve(_data)
- // }
- // } else {
- // resolve()
- // }
- // })
- // }
if (window.GLOB.IndexDB) {
CacheUtils.getIndexDBCacheConfig(menuid).then(res => {
if (res && res.LongParam) {
@@ -407,7 +392,41 @@
}
/**
+<<<<<<< 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) {
@@ -417,157 +436,81 @@
let shim = +sessionStorage.getItem('sys_time_shim')
let curTime = moment().add(shim, 'seconds').format('YYYY-MM-DD HH:mm:ss') + '.000'
- // if (window.GLOB.WebSql) {
- // return new Promise((resolve, reject) => {
- // CacheUtils.getWebSqlVersion().then(msg => {
- // let param = {
- // func: 's_get_app_version',
- // modifydate: msg.createDate
- // }
+ return new Promise((resolve, reject) => {
+ CacheUtils.getIndexDBVersion().then(msg => {
+ let param = {
+ func: 's_get_app_version',
+ modifydate: msg.createDate
+ }
- // param.TypeCharOne = ''
- // param.typename = ''
+ param.TypeCharOne = ''
+ param.typename = ''
- // if (!msg.createDate && !msg.menuids) {
- // CacheUtils.updateWebSqlversion('1.00', curTime)
- // resolve()
- // return
- // } else if (!msg.createDate || reload === true) {
- // param.modifydate = curTime
- // param.menuids = window.btoa(msg.menuids)
- // } else if (msg.menuids) {
- // let d = localStorage.getItem(db)
+ if (!msg.createDate && !msg.menuids) {
+ CacheUtils.updateIndexDBversion({version: '1.00', createDate: curTime})
+ resolve()
+ return
+ } else if (!msg.createDate || reload === true) {
+ param.modifydate = curTime
+ param.menuids = window.btoa(msg.menuids)
+ } else if (msg.menuids) {
+ let d = localStorage.getItem(db)
- // if (!d || curTime.indexOf(d) === -1) {
- // param.menuids = window.btoa(msg.menuids)
- // }
-
- // localStorage.setItem(db, curTime.substr(0, 10))
- // }
-
- // this.getSystemConfig(param).then(res => {
- // if (!res.status) {
- // reject()
- // return
- // }
-
- // let list = res.menu_data || []
-
- // if (res.menu_del) {
- // list.push(...res.menu_del)
- // }
-
- // list = list.map(mid => mid.menuid)
-
- // if (typeof(reload) === 'string' && !list.includes(reload)) {
- // list.push(reload)
- // }
-
- // if (list.length > 0) {
- // let clear = false
- // let _appkey = window.GLOB.appkey.substr(-10)
- // let reg = new RegExp(_appkey + '$', 'ig')
-
- // list.forEach(mid => {
- // if (systemMenuKeys.indexOf(mid) > -1 || reg.test(mid)) {
- // clear = true
- // }
- // })
- // if (clear) {
- // list = ''
- // } else {
- // list = list.map(mid => `'${mid}'`).join(',')
- // }
- // CacheUtils.delWebSqlConfig(list)
- // }
-
- // CacheUtils.updateWebSqlversion(res.app_version || '1.00', curTime)
-
- // resolve()
- // })
- // }, () => {
- // reject()
- // })
- // })
- // } else {
- return new Promise((resolve, reject) => {
- CacheUtils.getIndexDBVersion().then(msg => {
- let param = {
- func: 's_get_app_version',
- modifydate: msg.createDate
- }
-
- param.TypeCharOne = ''
- param.typename = ''
-
- if (!msg.createDate && !msg.menuids) {
- CacheUtils.updateIndexDBversion({version: '1.00', createDate: curTime})
- resolve()
- return
- } else if (!msg.createDate || reload === true) {
- param.modifydate = curTime
+ if (!d || curTime.indexOf(d) === -1) {
param.menuids = window.btoa(msg.menuids)
- } else if (msg.menuids) {
- let d = localStorage.getItem(db)
-
- if (!d || curTime.indexOf(d) === -1) {
- param.menuids = window.btoa(msg.menuids)
- }
-
- localStorage.setItem(db, curTime.substr(0, 10))
}
- this.getSystemConfig(param).then(res => {
- if (!res.status) {
- reject()
- return
- }
-
- let list = res.menu_data || []
+ localStorage.setItem(db, curTime.substr(0, 10))
+ }
- if (res.menu_del) {
- list.push(...res.menu_del)
- }
+ this.getSystemConfig(param).then(res => {
+ if (!res.status) {
+ reject()
+ return
+ }
- list = list.map(mid => mid.menuid)
+ let list = res.menu_data || []
- if (typeof(reload) === 'string' && !list.includes(reload)) {
- list.push(reload)
- }
+ if (res.menu_del) {
+ list.push(...res.menu_del)
+ }
- if (list.length > 0) {
- let clear = false
- let _appkey = window.GLOB.appkey.substr(-10)
- let reg = new RegExp(_appkey + '$', 'ig')
+ list = list.map(mid => mid.menuid)
- list.forEach(mid => {
- if (systemMenuKeys.indexOf(mid) > -1 || reg.test(mid)) {
- clear = true
- }
- })
- if (clear) {
- list = ''
+ if (typeof(reload) === 'string' && !list.includes(reload)) {
+ list.push(reload)
+ }
+
+ if (list.length > 0) {
+ let clear = false
+ let _appkey = window.GLOB.appkey.substr(-10)
+ let reg = new RegExp(_appkey + '$', 'ig')
+
+ list.forEach(mid => {
+ if (reg.test(mid)) {
+ clear = true
}
- CacheUtils.delIndexDBConfig(list)
+ })
+ if (clear) {
+ list = ''
}
+ CacheUtils.delIndexDBConfig(list)
+ }
- CacheUtils.updateIndexDBversion({version: res.app_version || '1.00', createDate: curTime})
-
- resolve()
- })
- }, () => {
- reject()
+ CacheUtils.updateIndexDBversion({version: res.app_version || '1.00', createDate: curTime})
+
+ resolve()
})
+ }, () => {
+ reject()
})
- // }
+ })
}
/**
* @description 鏇存柊绯荤粺鐗堟湰淇℃伅锛屾竻绌洪厤缃俊鎭�
*/
updateAppVersion () {
- // CacheUtils.delWebSqlConfig()
- // CacheUtils.updateWebSqlversion()
CacheUtils.delIndexDBConfig()
CacheUtils.updateIndexDBversion()
// CacheUtils.clearFuncs()
@@ -577,12 +520,7 @@
* @description 鍒犻櫎鏌愪釜鑿滃崟閰嶇疆淇℃伅
*/
deleteMenuStorage (menuId) {
- if (window.GLOB.IndexDB) {
- let key = menuId + (sessionStorage.getItem('UserID') || '')
- return CacheUtils.delMenuIndexDBConfig(key)
- // } else {
- // return CacheUtils.delMenuWebSqlConfig(menuId)
- }
+ CacheUtils.delIndexDBConfig(menuId)
}
/**
@@ -666,7 +604,7 @@
}
/**
- * @description 鑾峰彇绯荤粺閰嶇疆锛屽彇鍊间紭鍏堢瓑绾ebsql銆佺紦瀛樸�佹湇鍔″櫒
+ * @description 鑾峰彇绯荤粺閰嶇疆锛屽彇鍊间紭鍏堢瓑绾ndexDB銆佺紦瀛樸�佹湇鍔″櫒
*/
getCacheConfig (param) {
param.userid = sessionStorage.getItem('UserID') || ''
@@ -690,37 +628,11 @@
}
}
- let _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍￠獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
- delete _param.timestamp
- delete _param.secretkey
- delete _param.open_key
- _param = JSON.stringify(_param)
- _param = md5(_param)
+ let key = md5(param.MenuID + param.userid)
- // if (window.GLOB.WebSql) {
- // return new Promise(resolve => {
- // CacheUtils.getWebSqlMenuConfig(param.MenuID, param.userid).then(res => {
- // resolve(res)
- // }, () => {
- // param = this.encryptParam(param)
- // axios({
- // url: `${url}${param.func ? '/' + param.func : ''}`,
- // method: 'post',
- // data: param
- // }).then(res => {
- // if (res.status && window.GLOB.WebSql) {
- // CacheUtils.writeInWebSql([param.MenuID, param.userid, res.open_edition, res.web_edition, res.LongParam, res.LongParamUser])
- // } else if (res.status) {
- // window.GLOB.CacheMap.set(_param, res)
- // }
- // resolve(res)
- // })
- // })
- // })
- // }
if (window.GLOB.IndexDB) {
return new Promise(resolve => {
- CacheUtils.getIndexDBMenuConfig(param.MenuID, param.userid).then(res => {
+ CacheUtils.getIndexDBMenuConfig(key).then(res => {
resolve(res)
}, () => {
param = this.encryptParam(param)
@@ -734,18 +646,18 @@
...res,
userid: param.userid,
menuid: param.MenuID,
- id: param.MenuID + param.userid
+ id: key
}
CacheUtils.writeInIndexDB(msg)
} else if (res.status) {
- window.GLOB.CacheMap.set(_param, res)
+ window.GLOB.CacheMap.set(key, res)
}
resolve(res)
})
})
})
- } else if (window.GLOB.CacheMap.has(_param)) {
- return Promise.resolve(window.GLOB.CacheMap.get(_param))
+ } else if (window.GLOB.CacheMap.has(key)) {
+ return Promise.resolve(window.GLOB.CacheMap.get(key))
} else {
param = this.encryptParam(param)
@@ -756,7 +668,7 @@
data: param
}).then(res => {
if (res.status) {
- window.GLOB.CacheMap.set(_param, res)
+ window.GLOB.CacheMap.set(key, res)
}
resolve(res)
})
@@ -775,16 +687,7 @@
param.appkey = window.GLOB.appkey || ''
let _param = md5(JSON.stringify(param))
-
- // if (window.GLOB.WebSql) {
- // return new Promise(resolve => {
- // CacheUtils.getWebSqlMenuConfig(param.MenuID, param.userid).then(res => {
- // resolve(res)
- // }, () => {
- // resolve({ ErrCode: 'S', ErrMesg: '', LongParam: '', message: '', status: false })
- // })
- // })
- // }
+
if (window.GLOB.CacheMap.has(_param)) {
return Promise.resolve(window.GLOB.CacheMap.get(_param))
} else {
@@ -837,7 +740,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
}
@@ -892,7 +795,7 @@
token = JSON.parse(window.decodeURIComponent(window.atob(token)))
} catch (e) {
token = null
- _resolve({status: false, ErrCode: 'E', message: '鎺ュ彛淇℃伅瑙ｆ瀽澶辫触锛�'})
+ _resolve({status: false, ErrCode: 'E', message: '鎺ュ彛淇℃伅瑙ｆ瀽澶辫触锛�', ErrMesg: 'token_error'})
}
if (!token) return
@@ -995,7 +898,7 @@
param.appkey = window.GLOB.appkey || ''
if (param.$token === '') {
- return Promise.resolve({status: false, ErrCode: 'E', message: '鎺ュ彛鍦板潃灏氭湭璁剧疆锛�'})
+ return Promise.resolve({status: false, ErrCode: 'E', message: '鎺ュ彛鍦板潃灏氭湭璁剧疆锛�', ErrMesg: 'token_error'})
} else if (param.$token) {
return new Promise(resolve => this.visitOuterSystem(param, resolve))
}
@@ -1072,57 +975,6 @@
})
}
}
-
- /**
- * @description 瀵煎嚭Excel锛屽悗鍙扮敓鎴愭枃浠�
- */
- // getExcelOut (param, name) {
- // param.userid = sessionStorage.getItem('UserID')
- // param.lang = sessionStorage.getItem('lang') || ''
- // param.SessionUid = localStorage.getItem('SessionUid') || ''
- // param.LoginUID = sessionStorage.getItem('LoginUID') || ''
- // param.appkey = window.GLOB.appkey || ''
-
- // return new Promise(resolve => {
- // axios({
- // url: '/webapi/doexcel',
- // responseType: 'blob',
- // method: 'post',
- // data: param
- // }).then(res => {
- // try {
- // const blob = new Blob([res])
-
- // if (res.type === 'application/json') {
- // const reader = new FileReader()
- // reader.onload = e => resolve(JSON.parse(e.target.result))
- // reader.readAsText(blob)
- // } else {
- // if ('download' in document.createElement('a')) { // 闈濱E涓嬭浇
- // const elink = document.createElement('a')
- // elink.download = name
- // elink.style.display = 'none'
- // elink.href = URL.createObjectURL(blob)
- // document.body.appendChild(elink)
- // elink.click()
- // URL.revokeObjectURL(elink.href) // 閲婃斁URL 瀵硅薄
- // document.body.removeChild(elink)
- // } else { // IE10+涓嬭浇
- // navigator.msSaveBlob(blob, name)
- // }
- // resolve()
- // }
- // } catch (e) {
- // resolve({
- // ErrCode: 'E',
- // ErrMesg: '鏂囦欢瑙ｆ瀽閿欒',
- // message: '',
- // status: false
- // })
- // }
- // })
- // })
- // }
/**
* @description 涓婁紶base64
@@ -1218,9 +1070,6 @@
*/
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,
@@ -1236,17 +1085,6 @@
data: data
})
}
-
- // /**
- // * @description 鏂囦欢涓婁紶
- // */
- // getFileUpload (param) {
- // return axios({
- // url: '/zh-CN/Home/Upload',
- // method: 'post',
- // data: param
- // })
- // }
}
export default new Api()
\ No newline at end of file
--
Gitblit v1.8.0