From d26ecdf69db28f9e3ac71834658e0fade6fcf5ca Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 27 十月 2023 09:50:58 +0800
Subject: [PATCH] Merge branch 'positec' into dms

---
 src/api/index.js |   67 ++++++++++++++++++++++++++++++---
 1 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 80bf911..291e306 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -46,6 +46,18 @@
         okText: '鐭ラ亾浜�',
         onOk: () => {
           window.GLOB.$error = false
+
+          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('mk_user_type')
+
           sessionStorage.clear()
           if (!!(window.history && window.history.pushState)) {
             window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
@@ -94,6 +106,25 @@
   }
 
   /**
+   * @description 浣跨敤dostar鎺ュ彛锛岃烦杩囬獙璇�
+   * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
+   */
+  loginAndRedirect (param) {
+    let url = ''
+    if (process.env.NODE_ENV === 'production') {
+      url = document.location.origin + '/zh-CN/Home/LoginAndRedirect'
+    } else {
+      url = window.GLOB.location + '/zh-CN/Home/LoginAndRedirect'
+    }
+
+    return axios({
+      url: url,
+      method: 'post',
+      data: qs.stringify(param)
+    })
+  }
+
+  /* @description 鐩存帴璇锋眰
    * @description 寰俊涓氬姟璇锋眰
    */
   wxAccessToken (domain = '') {
@@ -359,7 +390,6 @@
   }
 
   /**
-<<<<<<< HEAD
    * @description 鐧诲綍浜屾楠岃瘉 // positecgroup
    */
   verifycode (verify) {
@@ -391,9 +421,6 @@
 
   /**
    * @description 鑾峰彇绯荤粺鐗堟湰淇℃伅锛屽惎鐢ㄦ垨鏇存柊websql
-=======
-   * @description 鑾峰彇绯荤粺鐗堟湰淇℃伅
->>>>>>> master
    */
   getAppVersion (reload) {
     if (!window.GLOB.IndexDB) {
@@ -743,7 +770,7 @@
     }
   }
 
-  visitOuterSystem (param, _resolve) {
+  visitOuterSystem (param, _resolve, _reject) {
     let token = param.$token
     delete param.$token
 
@@ -799,6 +826,8 @@
         data: JSON.stringify(param)
       }).then(res => {
         _resolve(res)
+      }, () => {
+        _reject()
       })
     } else {
       let _param = {
@@ -846,9 +875,22 @@
             data: JSON.stringify(param)
           }).then(res => {
             _resolve(res)
+          }, () => {
+            _reject()
           })
         } else {
           _resolve(result)
+        }
+      }, (e) => {
+        if (!e || !e.status) {
+          let msg = '缃戠粶杩炴帴涓嶆甯搞��'
+
+          if (/^http:/.test(token.interface) && /https:/.test(window.location.protocol)) {
+            msg = '缃戠粶杩炴帴涓嶆甯革紝鎺ュ彛鍦板潃鍙兘涓嶆敮鎸乭ttps銆�'
+          }
+          _resolve({status: false, ErrCode: 'E', message: msg})
+        } else {
+          _reject()
         }
       })
     }
@@ -868,7 +910,7 @@
     if (param.$token === '') {
       return Promise.resolve({status: false, ErrCode: 'token_error', message: '鎺ュ彛鍦板潃灏氭湭璁剧疆锛�'})
     } else if (param.$token) {
-      return new Promise(resolve => this.visitOuterSystem(param, resolve))
+      return new Promise((resolve, reject) => this.visitOuterSystem(param, resolve, reject))
     }
 
     if (['sPC_TableData_InUpDe', 'sPC_TableData_InUpDe_debug'].includes(param.func)) {
@@ -927,6 +969,17 @@
             })
           } else {
             resolve(res)
+          }
+        }, (e) => {
+          if (!e || !e.status) {
+            let msg = '缃戠粶杩炴帴涓嶆甯搞��'
+
+            if (/^http:/.test(rduri) && /https:/.test(window.location.protocol)) {
+              msg = '缃戠粶杩炴帴涓嶆甯革紝鎺ュ彛鍦板潃鍙兘涓嶆敮鎸乭ttps銆�'
+            }
+            resolve({status: false, ErrCode: 'E', message: msg})
+          } else {
+            reject()
           }
         })
       })
@@ -1112,6 +1165,8 @@
         clearTimeout(timer)
         if (/Shared Memory Provider|浼氳瘽澶勪簬缁堟鐘舵�亅褰撳墠鍛戒护鍙戠敓浜嗕弗閲嶉敊璇�/.test(res.message)) {
           res.message = '楠岃瘉澶辫触锛岃妫�鏌QL涓槸鍚﹀瓨鍦ㄦ寰幆銆�'
+        } else if (res.message.indexOf('EXECUTE 鍚庣殑浜嬪姟璁℃暟鎸囩ず BEGIN 鍜� COMMIT 璇彞鐨勬暟鐩笉鍖归厤銆備笂涓�璁℃暟 = 1锛屽綋鍓嶈鏁� = 0') > -1) {
+          res.ErrCode = '-2'
         }
         resolve(res)
       }, () => {

--
Gitblit v1.8.0