From 78a727a5acfb9aac5094307f13e8c4dfa1f792cb Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 13 四月 2025 00:27:22 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/api/index.js |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 3d22d39..e3ac65c 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -62,8 +62,8 @@
     return Promise.reject(response.data)
   } else {
     if (response.data.ErrCode === 'E' && /姝婚攣/.test(response.data.message)) {
-      response.data.message = '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇曪紒'
-      response.data.ErrMesg = '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇曪紒'
+      response.data.message = window.GLOB.dict['server_busy'] || '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇曪紒'
+      response.data.ErrMesg = response.data.message
     }
     if (response.config.requestId) {
       response.data.$requestId = response.config.requestId
@@ -73,7 +73,15 @@
 }, (error) => {
   let response = error.response || ''
 
-  if (response && response.status) {
+  if (!response) {
+    notification.error({
+      className: 'notification-custom-error',
+      bottom: 0,
+      message: error.message.includes('Network Error') && lang === 'zh-CN' ? '缃戠粶杩炴帴澶辫触锛�' : error.message,
+      placement: 'bottomRight',
+      duration: 15
+    })
+  } else if (response && response.status) {
     notification.error({
       className: 'notification-custom-error',
       bottom: 0,
@@ -1067,6 +1075,14 @@
       param.data_md5 = param.data_md5 || ''
       param.time_limit = param.time_limit || 0
 
+      param.data.forEach(item => {
+        item.exps.forEach(cell => {
+          if (typeof(cell.value) === 'number') {
+            cell.value = cell.value + ''
+          }
+        })
+      })
+
       param = this.encryptParam(param)
 
       return new Promise((resolve) => {

--
Gitblit v1.8.0