From f1a4a2e83a5a3a3f8636c0d85a3a02471c5b07e7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 05 三月 2025 15:39:52 +0800
Subject: [PATCH] Merge branch 'positec' into dms

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

diff --git a/src/api/index.js b/src/api/index.js
index 2b9e9c6..2b7208c 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -48,6 +48,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')
@@ -125,6 +137,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 寰俊涓氬姟璇锋眰 鍘熸帴鍙� 'wxpay/getaccesstoken'
    */
   // wxAccessToken (appId, domain = '') {
@@ -138,36 +169,12 @@
   // }
 
   /**
-   * @description 寰俊涓氬姟璇锋眰
-   * 39涓� qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn
+   * @description 蹇�掓煡璇�
    */
-  wxNginxRequest (url, method, param) {
-    let _url = url
-
-    if (!/^http/.test(url)) {
-      _url = window.GLOB.location + '/' + url
-      if (process.env.NODE_ENV === 'production') {
-        _url = document.location.origin + '/' + url
-      }
-    }
-    if (/qingqiumarket.cn|cloud.mk9h.cn/.test(_url)) {
-      _url = _url.replace('http://qingqiumarket.cn/', 'http://qingqiumarket.cn:8080/')
-      _url = _url.replace('http://cloud.mk9h.cn/', 'http://cloud.mk9h.cn:8080/')
-      _url = _url.replace('https://qingqiumarket.cn/', 'https://qingqiumarket.cn:8443/')
-      _url = _url.replace('https://cloud.mk9h.cn/', 'https://cloud.mk9h.cn:8443/')
-    }
-    
-    if (param) {
-      return axios({
-        url: _url,
-        method,
-        data: param
-      })
-    }
-
+  expressRequest (url) {
     return axios({
-      url: _url,
-      method
+      url: window.GLOB.location + '/' + url,
+      method: 'get'
     })
   }
 
@@ -238,6 +245,9 @@
       } else {
         param.linkurl = window.GLOB.linkurl
       }
+    } else if (binding_type === 'cloud') { // 鐧诲綍浜戠
+      delete param.rduri
+      url = window.atob('aHR0cHM6Ly9jbG91$mkZC5tazloLmNu'.replace('$mk', '')) + '/webapi/dologon/s_visitor_login'
     }
     
     param.LText = md5(window.btoa(_SessionUid + param.timestamp + (param.linkurl || '')))
@@ -1241,19 +1251,8 @@
    * @description oss鏂囦欢涓婁紶
    */
   fileOssUpload (param) {
-    let _url = window.GLOB.location + '/file/oss/upload'
-    if (process.env.NODE_ENV === 'production') {
-      _url = document.location.origin + '/file/oss/upload'
-    }
-    if (/qingqiumarket.cn|cloud.mk9h.cn/.test(_url)) {
-      _url = _url.replace('http://qingqiumarket.cn/', 'http://qingqiumarket.cn:8080/')
-      _url = _url.replace('http://cloud.mk9h.cn/', 'http://cloud.mk9h.cn:8080/')
-      _url = _url.replace('https://qingqiumarket.cn/', 'https://qingqiumarket.cn:8443/')
-      _url = _url.replace('https://cloud.mk9h.cn/', 'https://cloud.mk9h.cn:8443/')
-    }
-    
     return axios({
-      url: _url,
+      url: window.GLOB.location + '/file/oss/upload',
       method: 'post',
       headers: { 'Content-Type': 'multipart/form-data' },
       data: param

--
Gitblit v1.8.0