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 | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index fa691dd..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',
@@ -469,7 +464,7 @@
CacheUtils.delIndexDBConfig(list)
this.delCacheConfig('all')
- if (reHome) {
+ if (reHome && reload !== 'home_page_id') {
MKEmitter.emit('reloadMenuView', 'home_page_id')
}
}
@@ -733,6 +728,12 @@
}
}
+ if (param.$type) {
+ url += '/' + param.$type
+ }
+
+ delete param.$type
+
param = this.encryptParam(param)
return new Promise((resolve) => {
@@ -747,11 +748,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)
@@ -1038,6 +1040,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' : ''
@@ -1059,9 +1067,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)
})
@@ -1088,9 +1102,9 @@
* @description 娓呯┖鍚庣缂撳瓨
*/
cacheInterface (param) {
- param.userid = sessionStorage.getItem('UserID') || ''
- param.LoginUID = sessionStorage.getItem('LoginUID') || ''
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) {
--
Gitblit v1.8.0