From bbcb3f45ad0ef4c808bf5a68ec10c0464c094e2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 27 十月 2021 11:51:40 +0800
Subject: [PATCH] Merge branch 'master' into bms

---
 src/api/index.js |   58 ++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index eca6130..badf754 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -46,6 +46,16 @@
       let _href = window.location.href.split('#')
       localStorage.setItem(_href[0] + 'paramsmain', _href[1])
     }
+    localStorage.removeItem('UserID')
+    localStorage.removeItem('LoginUID')
+    localStorage.removeItem('User_Name')
+    localStorage.removeItem('Full_Name')
+    localStorage.removeItem('avatar')
+    localStorage.removeItem('dataM')
+    localStorage.removeItem('localDataM')
+    localStorage.removeItem('debug')
+    localStorage.removeItem('role_id')
+    localStorage.removeItem('localRole_id')
 
     sessionStorage.clear()
     sessionStorage.setItem('loginError', JSON.stringify({request: res.config ? res.config.data : '', response: JSON.stringify(res.data)}))
@@ -102,7 +112,25 @@
   }
 
   /**
-   * @description 鐩存帴璇锋眰
+   * @description 浣跨敤dostar鎺ュ彛锛岃烦杩囬獙璇�
+   * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
+   */
+  loginAndRedirect (param) {
+    let url = ''
+    if (process.env.NODE_ENV === 'production') {
+      url = document.location.origin + '/Home/LoginAndRedirect'
+    } else {
+      url = '/Home/LoginAndRedirect'
+    }
+
+    return axios({
+      url: url,
+      method: 'post',
+      data: param
+    })
+  }
+
+  /* @description 鐩存帴璇锋眰
    * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
    */
   directRequest (url, method = 'post', param, cross) {
@@ -288,7 +316,6 @@
    * @description 鑾峰彇绯荤粺鐗堟湰淇℃伅锛屽惎鐢ㄦ垨鏇存柊websql
    */
   getAppVersion (_resolve, _reject) {
-    let appVersion = {}
     if (!window.GLOB.WebSql && !window.GLOB.IndexDB) {
       return Promise.reject()
     }
@@ -304,7 +331,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 +347,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 +370,7 @@
               CacheUtils.createWebSqlversion(version, curTime)
             }
   
-            resolve(appVersion)
+            resolve()
           })
         }, () => {
           reject()
@@ -355,7 +379,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 +394,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 +411,9 @@
               }
             }
 
-            CacheUtils.updateIndexDBversion({version: appVersion.oldVersion, createDate: curTime})
+            CacheUtils.updateIndexDBversion({version: version, createDate: curTime})
   
-            resolve(appVersion)
+            resolve()
           })
         }, () => {
           reject()
@@ -404,12 +425,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 +507,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) { // 缂栬緫鐘舵�侊紝涓斿瓨鍦ㄤ簯绔湴鍧�
@@ -792,7 +814,7 @@
             }
             resolve()
           }
-        } catch {
+        } catch (e) {
           resolve({
             ErrCode: 'E',
             ErrMesg: '鏂囦欢瑙ｆ瀽閿欒',

--
Gitblit v1.8.0