From 9a11e62adeb8d435b52a361eb62d5b59e1deef2a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 23 五月 2024 21:14:50 +0800
Subject: [PATCH] 2024-05-23

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

diff --git a/src/api/index.js b/src/api/index.js
index 1c2f745..f1c531d 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -57,6 +57,9 @@
 
     return Promise.reject(response.data)
   } else {
+    if (response.config.requestId) {
+      response.data.$requestId = response.config.requestId
+    }
     return Promise.resolve(response.data)
   }
 }, (error) => {
@@ -398,7 +401,7 @@
 
         this.getSystemConfig(param).then(res => {
           if (!res.status) {
-            reject()
+            reject(res.message)
             return
           }
 
@@ -438,7 +441,7 @@
 
           CacheUtils.updateIndexDBversion({version: res.app_version || '1.00', createDate: curTime})
 
-          resolve()
+          resolve(list)
         })
       }, () => {
         reject()
@@ -645,7 +648,7 @@
     param.sign = md5(values)
     param.t = new Date().getTime();
 
-    ['arr_field', 'LText_field', 'custom_script', 'LText1', 'LText', 'LText2', 'DateCount'].forEach(key => {
+    ['arr_field', 'custom_script', 'LText', 'DateCount'].forEach(key => {
       if (param[key]) {
         let val = param[key]
         delete param[key]
@@ -755,7 +758,7 @@
       param = this.encryptParam(param)
 
       axios({
-        url: token.interface,
+        url: `${token.interface}${param.func ? '/' + param.func : ''}`,
         method: 'post',
         data: JSON.stringify(param)
       }).then(res => {
@@ -804,7 +807,7 @@
           param = this.encryptParam(param)
 
           axios({
-            url: token.interface,
+            url: `${token.interface}${param.func ? '/' + param.func : ''}`,
             method: 'post',
             data: JSON.stringify(param)
           }).then(res => {
@@ -834,7 +837,7 @@
    * @description 鑾峰彇涓氬姟閫氱敤鎺ュ彛
    * 璁块棶 'https://sso.mk9h.cn/webapi/dostars'鎴栦簯绔椂锛屼紶鍏serid銆丩oginUID
    */
-  genericInterface (param, script = '', position) {
+  genericInterface (param, script = '', position, requestId = '') {
     param.userid = param.userid || sessionStorage.getItem('UserID') || ''
     param.lang = param.lang || sessionStorage.getItem('lang') || ''
     param.SessionUid = localStorage.getItem('SessionUid') || ''
@@ -862,8 +865,8 @@
     if (script) {
       try {
         // eslint-disable-next-line
-        let func = new Function('axios', 'Api', 'param', 'position', 'systemType', script)
-        let promise = func(axios, this, param, position, window.GLOB.systemType)
+        let func = new Function('axios', 'Api', 'param', 'position', 'systemType', 'notification', script)
+        let promise = func(axios, this, param, position, window.GLOB.systemType, notification)
 
         if (promise instanceof Promise) {
           return promise
@@ -947,7 +950,8 @@
       return axios({
         url: `${url}${param.func ? '/' + param.func : ''}`,
         method: 'post',
-        data: JSON.stringify(param)
+        data: JSON.stringify(param),
+        requestId
       })
     }
   }
@@ -1057,6 +1061,21 @@
     })
   }
 
+  /**
+   * @description 寰俊鏀粯閫�娆�
+   */
+  setRefund (orderId) {
+    let _param = new FormData()
+    _param.append('out_biz_no', orderId)
+
+    return axios({
+      url: '/wxpay/wxRefund',
+      headers: { 'Content-Type': 'multipart/form-data' },
+      method: 'post',
+      data: _param
+    })
+  }
+
   postekPrint (data) {
     return axios({
       url: 'http://127.0.0.1:888/postek/print',
@@ -1071,7 +1090,7 @@
   sDebug (sql, rduri = null) {
     let param = {
       func: 's_debug_sql',
-      exec_type: 'y',
+      exec_type: window.GLOB.execType || 'y',
       timestamp: moment().format('YYYY-MM-DD HH:mm:ss'),
       userid: sessionStorage.getItem('UserID') || '',
       lang: sessionStorage.getItem('lang') || '',
@@ -1080,8 +1099,15 @@
       appkey: window.GLOB.appkey || ''
     }
 
-    let id = Utils.getuuid()
-    sql = sql.replace(/@time_id@/ig, `'${id}'`)
+    sql = sql.replace(/@time_id@/ig, `'${Utils.getuuid()}'`)
+    sql = sql.replace(/@ID@/ig, `'${Utils.getuuid()}'`)
+    sql = sql.replace(/@BID@/ig, `'${Utils.getuuid()}'`)
+    sql = sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID')}'`)
+    sql = sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid')}'`)
+    sql = sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID')}'`)
+    sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey}'`)
+    // sql = sql.replace(/@datam@/ig, `''`)
+
     if (window.GLOB.externalDatabase !== null) {
       sql = sql.replace(/@db@/ig, window.GLOB.externalDatabase)
     }
@@ -1090,7 +1116,7 @@
 
     sql = sql.replace(/\n/ig, ' ')
 
-    param.LText = Utils.formatOptions(sql)
+    param.LText = Utils.formatOptions(sql, param.exec_type)
     param.secretkey = Utils.encrypt('', param.timestamp)
 
     param = this.encryptParam(param)

--
Gitblit v1.8.0