From 3683e1475e8d74f690172a468518d88d91a69ccc Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 20 八月 2020 20:15:48 +0800 Subject: [PATCH] 2020-08-20 --- src/api/index.js | 41 +++++++++++++++++++++++++++-------------- 1 files changed, 27 insertions(+), 14 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index 130f012..ac8f0f2 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -302,6 +302,10 @@ url: `/webapi/dostars${param.func ? '/' + param.func : ''}`, data: param }).then(res => { + if (!res.status) { + reject() + return + } let version = res.app_version || '1.00' appVersion.newVersion = version appVersion.oldVersion = appVersion.oldVersion || version @@ -358,6 +362,25 @@ resolve({status: true}) }, () => { resolve({status: false}) + }) + }) + }) + } + + /** + * @description 鍒犻櫎鏌愪釜鑿滃崟閰嶇疆淇℃伅 + */ + deleteMenuStorage (menuId) { + return new Promise(resolve => { + if (!mkDataBase) { + resolve() + return + } + mkDataBase.transaction(tx => { + tx.executeSql(`DELETE FROM CONFIGS where menuid='${menuId}'`, [], () => { + resolve() + }, () => { + mkDataBase = null }) }) }) @@ -608,22 +631,12 @@ * @param {Object} param 璇锋眰鍙傛暟 * @param {Boolean} SSO 鏄惁涓哄崟鐐圭櫥褰曞湴鍧� */ - getSystemCacheConfig (param, SSO = true) { - param.userid = sessionStorage.getItem('UserID') || '' + getSystemCacheConfig (param) { + param.userid = param.userid || sessionStorage.getItem('UserID') || '' param.lang = localStorage.getItem('lang') || '' param.SessionUid = localStorage.getItem('SessionUid') || '' - param.LoginUID = sessionStorage.getItem('LoginUID') || '' + param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || '' param.appkey = window.GLOB.appkey || '' - - if (sessionStorage.getItem('isEditState') === 'true' && SSO) { // 缂栬緫鐘舵�侊紝鍗曠偣鐧诲綍鏈嶅姟鍣ㄤ负浜戠 - if (options.cloudServiceApi) { // 瀛樺湪浜戠鍦板潃鏃讹紝浣跨敤浜戠绯荤粺鍙傛暟 - param.rduri = options.cloudServiceApi - param.userid = sessionStorage.getItem('CloudUserID') || '' - param.LoginUID = sessionStorage.getItem('CloudLoginUID') || '' - } - } else if (window.GLOB.mainSystemApi && SSO) { - param.rduri = window.GLOB.mainSystemApi - } let _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍¢獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃 delete _param.timestamp @@ -647,7 +660,7 @@ values += key + param[key] } }) - param.sign = md5(values) + param.sign = md5(values) param.t = new Date().getTime() return new Promise(resolve => { -- Gitblit v1.8.0