From db8bd77ac3efba767d44186a77aef3cd6f9b9d6e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 09 十二月 2024 15:38:57 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/api/index.js | 181 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 173 insertions(+), 8 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index b24fd12..531e7b7 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -175,12 +175,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 +301,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 +353,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 +464,7 @@
CacheUtils.delIndexDBConfig(list)
this.delCacheConfig('all')
- if (reHome) {
+ if (reHome && reload !== 'home_page_id') {
MKEmitter.emit('reloadMenuView', 'home_page_id')
}
}
@@ -671,8 +701,68 @@
param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
param.appkey = window.GLOB.appkey || ''
+ if (param.$backend) {
+ delete param.$backend
+
+ let id = ''
+ if (cache) {
+ id = param.data[0].id
+
+ if (window.GLOB.CacheMap.has(id)) {
+ return Promise.resolve(window.GLOB.CacheMap.get(id))
+ }
+ }
+
+ param.username = sessionStorage.getItem('User_Name') || ''
+ param.fullname = sessionStorage.getItem('Full_Name') || ''
+ param.s_debug = window.GLOB.debugger ? 'Y' : ''
+ param.data_md5 = param.data_md5 || ''
+ param.time_limit = param.time_limit || 0
+
+ let url = '/webapi/exstars'
+ if (param.rduri) {
+ param.rduri = param.rduri.replace(/dostars/ig, 'exstars')
+ if (!window.GLOB.transfer) {
+ url = param.rduri
+ delete param.rduri
+ }
+ }
+
+ if (param.$type) {
+ url += '/' + param.$type
+ }
+
+ delete param.$type
+
+ param = this.encryptParam(param)
+
+ return new Promise((resolve) => {
+ axios({
+ url: url,
+ method: 'post',
+ data: JSON.stringify(param)
+ }).then(res => {
+ if (res.mksqls) {
+ res.mksqls.forEach(n => {
+ n = n.replace(/(UNION ALL\s+)?SELECT obj_name='[\S\s]+sub_field=''\s+/ig, '')
+ window.mkInfo(n)
+ })
+ }
+ delete res.mksqls
+ if (res.ErrCode === 'version_error') {
+ res.ErrCode = '-2'
+ MKEmitter.emit('reloadTabs')
+ }
+ if (res.status && id) {
+ window.GLOB.CacheMap.set(id, res)
+ }
+ resolve(res)
+ })
+ })
+ }
+
let url = '/webapi/dostars'
- if (param.rduri && !window.GLOB.transfer) {
+ if (param.rduri && !window.GLOB.transfer) { // positecgroup
url = param.rduri
delete param.rduri
}
@@ -938,6 +1028,58 @@
}
})
})
+ } else if (param.$backend) {
+ delete param.$backend
+
+ let url = '/webapi/exstars'
+ if (param.rduri) {
+ param.rduri = param.rduri.replace(/dostars/ig, 'exstars')
+ if (!window.GLOB.transfer) {
+ url = param.rduri
+ delete param.rduri
+ }
+ }
+
+ 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' : ''
+ param.data_md5 = param.data_md5 || ''
+ param.time_limit = param.time_limit || 0
+
+ param = this.encryptParam(param)
+
+ return new Promise((resolve) => {
+ axios({
+ url: url,
+ method: 'post',
+ data: JSON.stringify(param),
+ requestId
+ }).then(res => {
+ if (res.mksqls) {
+ res.mksqls.forEach(n => {
+ n = n.replace(/(UNION ALL\s+)?SELECT obj_name='[\S\s]+sub_field=''\s+/ig, '')
+ window.mkInfo(n)
+ })
+ }
+ 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)
+ })
+ })
} else {
let url = '/webapi/dostars'
if (param.rduri && (!window.GLOB.transfer || /https:\/\/sso.mk9h.cn/.test(param.rduri)) && /\/dostars/.test(param.rduri) && param.func !== 'webapi_ChangeUser') {
@@ -957,6 +1099,29 @@
}
/**
+ * @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),
+ })
+ }
+
+ /**
* @description 涓婁紶base64
* @param {String} base64 base64鍥剧墖缂栫爜
*/
--
Gitblit v1.8.0