From 2d3f82c3e07e6acaedbeae8b4ce0849dd588abc6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 29 七月 2020 10:09:32 +0800
Subject: [PATCH] 2020-07-29

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

diff --git a/src/api/index.js b/src/api/index.js
index 1867953..48e0840 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,6 +1,6 @@
 import axios from 'axios'
 import qs from 'qs'
-import {notification } from 'antd'
+import { notification } from 'antd'
 import md5 from 'md5'
 import Utils from '@/utils/utils.js'
 import options from '@/store/options.js'
@@ -11,9 +11,9 @@
 
 axios.interceptors.request.use((config) => {
   config.method = 'post'
-  if (config.url.includes('LoginAndRedirect') || config.url.includes('getjsonresult')) {
+  if (config.url.includes('LoginAndRedirect') || config.url.includes('getjsonresult') || config.url.includes('wxNativePay')) {
     config.data = qs.stringify(config.data)
-  } else if (config.url.includes('Upload') || config.url.includes('doupload')) {
+  } else if (config.url.includes('Upload') || config.url.includes('doupload') || config.url.includes('dopreload')) {
     config.headers = { 'Content-Type': 'multipart/form-data' }
   } else {
     // config.headers.token = sessionStorage.getItem('TOKEN') || ''
@@ -82,7 +82,7 @@
       // func: 'webapi_login',
       UserName: username,
       Password: password,
-      systemType: options.systemType,
+      systemType: options.sysType,
       Type: 'X'
     }
 
@@ -91,8 +91,8 @@
 
     if (isCloud) {
       param.debug = 'Y'
-      if (options.cloudLoginApi) {
-        param.rduri = options.cloudLoginApi
+      if (options.cloudServiceApi) {
+        param.rduri = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
       }
     } else if (!isCloud && window.GLOB.mainSystemApi) {
       param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
@@ -110,20 +110,18 @@
   getCloudConfig (param) {
     param.lang = localStorage.getItem('lang') || ''
     param.appkey = window.GLOB.appkey || ''
+    param.SessionUid = localStorage.getItem('SessionUid') || ''
 
     if (sessionStorage.getItem('CloudUserID') && options.cloudServiceApi) { // 瀛樺湪浜戠鐧诲綍淇℃伅锛屼笖瀛樺湪浜戠鍦板潃
       param.rduri = options.cloudServiceApi
       param.userid = sessionStorage.getItem('CloudUserID')
-      param.SessionUid = sessionStorage.getItem('CloudSessionUid') || ''
       param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
     } else if (window.GLOB.mainSystemApi) {
       param.rduri = window.GLOB.mainSystemApi
       param.userid = sessionStorage.getItem('UserID')
-      param.SessionUid = sessionStorage.getItem('SessionUid') || ''
       param.LoginUID = sessionStorage.getItem('LoginUID') || ''
     } else {
       param.userid = sessionStorage.getItem('UserID')
-      param.SessionUid = sessionStorage.getItem('SessionUid') || ''
       param.LoginUID = sessionStorage.getItem('LoginUID') || ''
     }
 
@@ -143,7 +141,7 @@
     param.t = new Date().getTime()
 
     return axios({
-      url: '/webapi/dostars',
+      url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
       data: param
     })
   }
@@ -154,14 +152,13 @@
   getSystemConfig (param) {
     param.userid = sessionStorage.getItem('UserID')
     param.lang = localStorage.getItem('lang') || ''
-    param.SessionUid = sessionStorage.getItem('SessionUid') || ''
+    param.SessionUid = localStorage.getItem('SessionUid') || ''
     param.LoginUID = sessionStorage.getItem('LoginUID') || ''
     param.appkey = window.GLOB.appkey || ''
 
     if (sessionStorage.getItem('isEditState') === 'true' && options.cloudServiceApi) { // 缂栬緫鐘舵�侊紝涓斿瓨鍦ㄤ簯绔湴鍧�
       param.rduri = options.cloudServiceApi
       param.userid = sessionStorage.getItem('CloudUserID')
-      param.SessionUid = sessionStorage.getItem('CloudSessionUid') || ''
       param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
     } else if (window.GLOB.mainSystemApi) {
       param.rduri = window.GLOB.mainSystemApi
@@ -183,7 +180,7 @@
     param.t = new Date().getTime()
 
     return axios({
-      url: '/webapi/dostars',
+      url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
       data: param
     })
   }
@@ -194,7 +191,7 @@
   getLocalConfig (param) {
     param.userid = sessionStorage.getItem('UserID')
     param.lang = localStorage.getItem('lang') || ''
-    param.SessionUid = sessionStorage.getItem('SessionUid') || ''
+    param.SessionUid = localStorage.getItem('SessionUid') || ''
     param.LoginUID = sessionStorage.getItem('LoginUID') || ''
     param.appkey = window.GLOB.appkey || ''
 
@@ -214,7 +211,7 @@
     param.t = new Date().getTime()
 
     return axios({
-      url: '/webapi/dostars',
+      url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
       data: param
     })
   }
@@ -227,7 +224,7 @@
   getSystemCacheConfig (param, SSO = true) {
     param.userid = sessionStorage.getItem('UserID') || ''
     param.lang = localStorage.getItem('lang') || ''
-    param.SessionUid = sessionStorage.getItem('SessionUid') || ''
+    param.SessionUid = localStorage.getItem('SessionUid') || ''
     param.LoginUID = sessionStorage.getItem('LoginUID') || ''
     param.appkey = window.GLOB.appkey || ''
 
@@ -235,7 +232,6 @@
       if (options.cloudServiceApi) { // 瀛樺湪浜戠鍦板潃鏃讹紝浣跨敤浜戠绯荤粺鍙傛暟
         param.rduri = options.cloudServiceApi
         param.userid = sessionStorage.getItem('CloudUserID') || ''
-        param.SessionUid = sessionStorage.getItem('CloudSessionUid') || ''
         param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
       }
     } else if (window.GLOB.mainSystemApi && SSO) {
@@ -268,7 +264,7 @@
 
       return new Promise(resolve => {
         axios({
-          url: '/webapi/dostars',
+          url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
           data: param
         }).then(res => {
           if (res.status) {
@@ -286,13 +282,12 @@
   genericInterface (param) {
     param.userid = sessionStorage.getItem('UserID')
     param.lang = localStorage.getItem('lang') || ''
-    param.SessionUid = sessionStorage.getItem('SessionUid') || ''
+    param.SessionUid = localStorage.getItem('SessionUid') || ''
     param.LoginUID = sessionStorage.getItem('LoginUID') || ''
     param.appkey = window.GLOB.appkey || ''
 
     if (sessionStorage.getItem('isEditState') === 'true') { // HS涓嬭彍鍗�
       param.userid = sessionStorage.getItem('CloudUserID')
-      param.SessionUid = sessionStorage.getItem('CloudSessionUid') || ''
       param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
     }
 
@@ -312,7 +307,7 @@
     param.t = new Date().getTime()
 
     return axios({
-      url: '/webapi/dostars',
+      url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
       data: param
     })
   }
@@ -323,7 +318,7 @@
   getExcelOut (param, name) {
     param.userid = sessionStorage.getItem('UserID')
     param.lang = localStorage.getItem('lang') || ''
-    param.SessionUid = sessionStorage.getItem('SessionUid') || ''
+    param.SessionUid = localStorage.getItem('SessionUid') || ''
     param.LoginUID = sessionStorage.getItem('LoginUID') || ''
     param.appkey = window.GLOB.appkey || ''
     
@@ -380,20 +375,18 @@
       appkey: window.GLOB.appkey || '',
       Base64Img: base64
     }
+    param.SessionUid = localStorage.getItem('SessionUid') || ''
 
     if (service === 'sso' && window.GLOB.mainSystemApi) {
       param.rduri = window.GLOB.mainSystemApi
       param.userid = sessionStorage.getItem('UserID')
-      param.SessionUid = sessionStorage.getItem('SessionUid') || ''
       param.LoginUID = sessionStorage.getItem('LoginUID') || ''
     } else if (service === 'cloud' && options.cloudServiceApi) {
       param.rduri = options.cloudServiceApi
       param.userid = sessionStorage.getItem('CloudUserID')
-      param.SessionUid = sessionStorage.getItem('CloudSessionUid') || ''
       param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
     } else {
       param.userid = sessionStorage.getItem('UserID')
-      param.SessionUid = sessionStorage.getItem('SessionUid') || ''
       param.LoginUID = sessionStorage.getItem('LoginUID') || ''
     }
 
@@ -438,6 +431,26 @@
   }
 
   /**
+   * @description 鏌ヨ鏂囦欢鏄惁宸蹭笂浼�
+   */
+  getFilePreUpload (param) {
+    return axios({
+      url: '/webapi/dopreload',
+      data: param
+    })
+  }
+
+  /**
+   * @description 鑾峰彇寰俊鏀粯浜岀淮鐮�
+   */
+  getWxNativePay (param) {
+    return axios({
+      url: '/wxpay/wxNativePay',
+      data: param
+    })
+  }
+
+  /**
    * @description 鏂囦欢涓婁紶
    */
   getFileUpload (param) {
@@ -454,7 +467,7 @@
   commonInterface (param) {
     param.userid = sessionStorage.getItem('UserID')
     param.lang = localStorage.getItem('lang') || ''
-    param.SessionUid = sessionStorage.getItem('SessionUid') || ''
+    param.SessionUid = localStorage.getItem('SessionUid') || ''
     param.LoginUID = sessionStorage.getItem('LoginUID') || ''
     param.BID = param.BID || ''
     param.debug = param.debug || ''
@@ -472,7 +485,7 @@
   submitInterface (param) {
     param.userid = sessionStorage.getItem('UserID')
     param.lang = localStorage.getItem('lang') || ''
-    param.SessionUid = sessionStorage.getItem('SessionUid') || ''
+    param.SessionUid = localStorage.getItem('SessionUid') || ''
     param.LoginUID = sessionStorage.getItem('LoginUID') || ''
 
     return axios({

--
Gitblit v1.8.0