From af89cc791fc928578740a62917e9ee32a8a23d6b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 23:24:23 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/api/index.js | 118 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 83 insertions(+), 35 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index a695892..49a2c94 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -14,7 +14,7 @@
1585192949946f3et2ts8tn82krmumdf,15855615451212m12ip23vpcm79kloro,1587005717541lov40vg61q7l1rbveon,1590458676585agbbr63t6ihighg2i1g,1602315375262ikd33ii0nii34pt861o,1582771068837vsv54a089lgp45migbg,
1582777675954ifu05upurs465omoth7,158294809668898cklbv6c5bou8e1fpu,1584676379094iktph45fb8imhg96bql,1584695125339vo5g7iqgfn01qmrd6s2,1584699661372vhmpp9dn9foo0eob722,15848421131551gg04ie8sitsd3f7467,
1589782279158ngr675kk3oksin35sul,1589788042787ffdt9hle4s45k9r1nvs,15900310928174dro07ihfckghpb5h13,1594095599055qicg2eb642v5qglhnuo,1599613340050c8nu6rbst9d4emnnbsq,1577972969199lei1g0qkvlh4tkc908m,
- 1578479100252lfbp29v1kafk4s4q4ig,1577971621421tg4v0i1ur8873k7e0ob,1577929944419lgc5h3hepum765e2k7u,1588493493409k9guqp067d31lu7blsv`
+ 1578479100252lfbp29v1kafk4s4q4ig,1577971621421tg4v0i1ur8873k7e0ob,1577929944419lgc5h3hepum765e2k7u,1588493493409k9guqp067d31lu7blsv,15827879285193g85m3i2uprektpgmpf`
if (window.openDatabase) {
CacheUtils.openWebSql(options.sysType)
@@ -48,7 +48,7 @@
}
sessionStorage.clear()
- sessionStorage.setItem('loginError', JSON.stringify({request: res.config ? res.config.data : '', response: JSON.stringify(res.data)}))
+ 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()
}
@@ -59,23 +59,29 @@
if (window.debugger === true) {
response.data.ErrCode = 'E'
return Promise.resolve(response.data)
- } else {
+ } else if (!sessionStorage.getItem('loginError')) {
setCurrentUrl(response)
}
} else {
return Promise.resolve(response.data)
}
}, (error) => {
- if (error && error.response) {
- notification.error({
- className: 'notification-custom-error',
- bottom: 0,
- message: '鐘舵�佺爜-' + error.response.status + '锛岃鑱旂郴绠＄悊鍛�',
- placement: 'bottomRight',
- duration: 15
- })
+ 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()
}
- return Promise.reject(error.response)
})
class Api {
@@ -153,7 +159,8 @@
func: 's_visitor_login',
timestamp: moment().format('YYYY-MM-DD HH:mm:ss'),
SessionUid: _SessionUid,
- TypeCharOne: 'pc'
+ TypeCharOne: 'pc',
+ kei_id: window.btoa(window.encodeURIComponent(window.GLOB.host))
}
param.LText = md5(window.btoa(_SessionUid + param.timestamp))
@@ -195,7 +202,9 @@
way_no: 'sms_vcode',
systemType: options.sysType,
login_city: city,
- login_id_address: ipAddress
+ login_id_address: ipAddress,
+ kei_id: window.btoa(window.encodeURIComponent(window.GLOB.host)),
+ device_id: localStorage.getItem('SessionUid')
}
param.appkey = window.GLOB.appkey || ''
@@ -232,7 +241,9 @@
systemType: options.sysType,
Type: 'S',
login_city: city,
- login_id_address: ipAddress
+ login_id_address: ipAddress,
+ kei_id: window.btoa(window.encodeURIComponent(window.GLOB.host)),
+ device_id: localStorage.getItem('SessionUid')
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
@@ -260,6 +271,11 @@
// Type: 'X' 鏃�
// param.Password = Utils.formatOptions(password)
+ // positecgroup
+ if (window.GLOB.appkey === '202011021844144334E823A3011414082AD77') {
+ param.svccode = 'oms'
+ }
+
param.appkey = window.GLOB.appkey || ''
let url = '/webapi/dologon'
@@ -285,10 +301,39 @@
}
/**
+ * @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
*/
getAppVersion (_resolve, _reject) {
- let appVersion = {}
if (!window.GLOB.WebSql && !window.GLOB.IndexDB) {
return Promise.reject()
}
@@ -304,7 +349,6 @@
if (window.GLOB.WebSql) {
return new Promise((resolve, reject) => {
CacheUtils.getWebSqlVersion().then(msg => {
- appVersion.oldVersion = msg.version || ''
let modifydate = msg.createDate || curTime
if (modifydate.indexOf('Invalid date') > -1) {
modifydate = curTime
@@ -321,9 +365,7 @@
return
}
let clear = false
- let version = res.app_version || '1.00'
- appVersion.newVersion = version
- appVersion.oldVersion = appVersion.oldVersion || version
+ let version = '1.00'
if (res.menu_data && res.menu_data.length > 0) {
res.menu_data.forEach(mid => {
@@ -346,7 +388,7 @@
CacheUtils.createWebSqlversion(version, curTime)
}
- resolve(appVersion)
+ resolve()
})
}, () => {
reject()
@@ -355,7 +397,6 @@
} else {
return new Promise((resolve, reject) => {
CacheUtils.getIndexDBVersion().then(msg => {
- appVersion.oldVersion = msg.version || ''
let modifydate = msg.createDate || curTime
if (modifydate.indexOf('Invalid date') > -1) {
modifydate = curTime
@@ -371,9 +412,7 @@
return
}
let clear = false
- let version = res.app_version || '1.00'
- appVersion.newVersion = version
- appVersion.oldVersion = appVersion.oldVersion || version
+ let version = '1.00'
if (res.menu_data && res.menu_data.length > 0) {
res.menu_data.forEach(mid => {
@@ -390,9 +429,9 @@
}
}
- CacheUtils.updateIndexDBversion({version: appVersion.oldVersion, createDate: curTime})
+ CacheUtils.updateIndexDBversion({version: version, createDate: curTime})
- resolve(appVersion)
+ resolve()
})
}, () => {
reject()
@@ -404,12 +443,13 @@
/**
* @description 鏇存柊绯荤粺鐗堟湰淇℃伅锛屾竻绌洪厤缃俊鎭�
*/
- updateAppVersion (newVersion) {
+ updateAppVersion () {
let curTime = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
CacheUtils.clearWebSqlConfig()
- CacheUtils.updateWebSqlversion(newVersion, curTime)
+ CacheUtils.updateWebSqlversion('1.00', curTime)
CacheUtils.clearIndexDBConfig()
- CacheUtils.updateIndexDBversion({version: newVersion, createDate: curTime})
+ CacheUtils.updateIndexDBversion({version: '1.00', createDate: curTime})
+ CacheUtils.clearFuncs(options.sysType)
}
/**
@@ -485,7 +525,7 @@
param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
param.LoginUID = 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' && options.cloudServiceApi) { // 缂栬緫鐘舵�侊紝涓斿瓨鍦ㄤ簯绔湴鍧�
@@ -672,7 +712,15 @@
}
})
param.sign = md5(values)
- param.t = new Date().getTime()
+ param.t = new Date().getTime();
+
+ ['arr_field', 'LText_field', 'custom_script', 'LText1', 'LText', 'LText2', 'DateCount'].forEach(key => {
+ if (param[key]) {
+ let val = param[key]
+ delete param[key]
+ param[key] = val
+ }
+ })
return param
}
@@ -682,7 +730,7 @@
* @param {Object} param 璇锋眰鍙傛暟
* @param {Boolean} SSO 鏄惁涓哄崟鐐圭櫥褰曞湴鍧�
*/
- getSystemCacheConfig (param) {
+ getSystemCacheConfig (param, cache = true) {
param.userid = param.userid || sessionStorage.getItem('UserID') || ''
param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
@@ -702,7 +750,7 @@
_param = JSON.stringify(_param)
_param = md5(_param)
- if (window.GLOB.CacheMap.has(_param)) {
+ if (cache && window.GLOB.CacheMap.has(_param)) {
return Promise.resolve(window.GLOB.CacheMap.get(_param))
} else {
param = this.encryptParam(param)
@@ -792,7 +840,7 @@
}
resolve()
}
- } catch {
+ } catch (e) {
resolve({
ErrCode: 'E',
ErrMesg: '鏂囦欢瑙ｆ瀽閿欒',
--
Gitblit v1.8.0