From e5a92d6bee2b8d47d5c145ed92485fd19b663b0f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 27 十二月 2024 12:26:21 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/api/index.js | 126 +++++++++++++++++++++++++++++++++++++----
1 files changed, 113 insertions(+), 13 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 48de454..af248f7 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -74,6 +74,32 @@
placement: 'bottomRight',
duration: 15
})
+ if ([500, 504].includes(response.status) && error.config && error.config.url && error.config.data) {
+ window.mkInfo(error.config.url)
+ window.mkInfo(error.config.data)
+ if (window.GLOB.errorLog && !sessionStorage.getItem('local_error')) {
+ let urlReg = new RegExp('^(' + window.GLOB.baseurl + '|/)webapi/(exstars|dostars)', 'ig')
+ if (urlReg.test(error.config.url) && !/s_special_error_note_log/.test(error.config.url)) {
+ let res = null
+ try {
+ let data = JSON.parse(error.config.data)
+ if (!data.rduri) {
+ res = {
+ api_url: error.config.url,
+ error_code: response.status,
+ error_time: moment().format('YYYY-MM-DD HH:mm:ss'),
+ api_param: error.config.data
+ }
+ }
+ } catch (e) {
+ res = null
+ }
+ if (res) {
+ sessionStorage.setItem('local_error', JSON.stringify(res))
+ }
+ }
+ }
+ }
}
return Promise.reject(response)
@@ -175,12 +201,7 @@
* @description 娓稿鐧诲綍
*/
getTouristMsg (binding_type, appid, openid, memberid, scanId) {
- let _SessionUid = localStorage.getItem('SessionUid')
-
- if (!_SessionUid) { // 鎵嬪姩娓呴櫎SessionUid鏃讹紝瀹炴椂鐢熸垚
- _SessionUid = Utils.getuuid()
- localStorage.setItem('SessionUid', _SessionUid)
- }
+ let _SessionUid = localStorage.getItem('SessionUid') || ''
let param = {
func: 's_visitor_login',
@@ -306,6 +327,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 +379,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
})
}
@@ -434,7 +490,7 @@
CacheUtils.delIndexDBConfig(list)
this.delCacheConfig('all')
- if (reHome) {
+ if (reHome && reload !== 'home_page_id') {
MKEmitter.emit('reloadMenuView', 'home_page_id')
}
}
@@ -698,6 +754,12 @@
}
}
+ if (param.$type) {
+ url += '/' + param.$type
+ }
+
+ delete param.$type
+
param = this.encryptParam(param)
return new Promise((resolve) => {
@@ -712,11 +774,12 @@
window.mkInfo(n)
})
}
+ delete res.mksqls
if (res.ErrCode === 'version_error') {
res.ErrCode = '-2'
MKEmitter.emit('reloadTabs')
}
- if (res.status) {
+ if (res.status && id) {
window.GLOB.CacheMap.set(id, res)
}
resolve(res)
@@ -725,7 +788,7 @@
}
let url = '/webapi/dostars'
- if (param.rduri && !window.GLOB.transfer) {
+ if (param.rduri && !window.GLOB.transfer) { // positecgroup
url = param.rduri
delete param.rduri
}
@@ -1003,6 +1066,12 @@
}
}
+ if (param.$type) {
+ url += '/' + param.$type
+ }
+
+ delete param.$type
+
param.username = sessionStorage.getItem('User_Name') || ''
param.fullname = sessionStorage.getItem('Full_Name') || ''
param.s_debug = window.GLOB.debugger ? 'Y' : ''
@@ -1024,9 +1093,15 @@
window.mkInfo(n)
})
}
- if (res.ErrCode === 'version_error') {
- res.ErrCode = '-2'
- MKEmitter.emit('reloadTabs')
+ delete res.mksqls
+ if (!res.status) {
+ if (res.ErrCode === 'version_error') {
+ res.ErrCode = '-2'
+ MKEmitter.emit('reloadTabs')
+ } else if (res.message === 'permission deny') {
+ res.message = window.GLOB.dict['permission_deny'] || '鏃犲綋鍓嶈彍鍗曟垨鎸夐挳鐨勮闂潈闄愶紝璇疯仈绯荤鐞嗗憳锛�'
+ res.ErrMesg = window.GLOB.dict['permission_deny'] || '鏃犲綋鍓嶈彍鍗曟垨鎸夐挳鐨勮闂潈闄愶紝璇疯仈绯荤鐞嗗憳锛�'
+ }
}
resolve(res)
})
@@ -1047,6 +1122,29 @@
requestId
})
}
+ }
+
+ /**
+ * @description 娓呯┖鍚庣缂撳瓨
+ */
+ cacheInterface (param) {
+ param.appkey = window.GLOB.appkey || ''
+ param.userid = param.userid || sessionStorage.getItem('UserID') || ''
+ param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
+
+ let url = '/webapi/excache'
+ if (param.rduri && !window.GLOB.transfer) {
+ url = param.rduri
+ delete param.rduri
+ }
+
+ param = this.encryptParam(param)
+
+ return axios({
+ url: url,
+ method: 'post',
+ data: JSON.stringify(param),
+ })
}
/**
@@ -1188,7 +1286,7 @@
/**
* @description sql妫�楠�
*/
- sDebug (sql) {
+ sDebug (sql, skip = false) {
let param = {
func: 's_debug_sql',
exec_type: window.GLOB.execType || 'y',
@@ -1216,6 +1314,8 @@
window.mkInfo(`/* sql 楠岃瘉 */\n${sql.replace(/\n\s{6,20}/ig, '\n')}`)
+ if (skip) return
+
sql = sql.replace(/\n/ig, ' ')
param.LText = Utils.formatOptions(sql, param.exec_type)
--
Gitblit v1.8.0