From c5b925431860e7d4194bfe550e86866b11e4f7a4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 31 八月 2023 11:40:42 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/tabviews/zshare/actionList/funcMegvii/index.jsx | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/tabviews/zshare/actionList/funcMegvii/index.jsx b/src/tabviews/zshare/actionList/funcMegvii/index.jsx
index 6da5dc4..e826bcf 100644
--- a/src/tabviews/zshare/actionList/funcMegvii/index.jsx
+++ b/src/tabviews/zshare/actionList/funcMegvii/index.jsx
@@ -292,7 +292,7 @@
}
if (error) {
- this.execError({ErrCode: 'E', ErrMesg: error})
+ this.execError({ErrCode: 'E', message: error})
return
}
@@ -312,7 +312,7 @@
if (datas.length > 0) {
this.addUser(ip, datas, sessionId)
} else {
- this.execSuccess({ErrCode: 'S', ErrMesg: '鎵ц鎴愬姛銆�'})
+ this.execSuccess({ErrCode: 'S', message: '鎵ц鎴愬姛銆�'})
}
}, (err) => {
this.execPreError(err, data)
@@ -327,18 +327,18 @@
* 4銆佹ā鎬佹鎵ц鎴愬姛鍚庢槸鍚﹀叧闂�
* 5銆侀�氱煡涓诲垪琛ㄥ埛鏂�
*/
- execSuccess = (res) => {
+ execSuccess = (res = {}) => {
const { btn } = this.props
- if (res && (res.ErrCode === 'S' || !res.ErrCode)) { // 鎵ц鎴愬姛
+ if (res.ErrCode === 'S' || !res.ErrCode) { // 鎵ц鎴愬姛
notification.success({
top: 92,
- message: res.ErrMesg || '鎵ц鎴愬姛',
+ message: res.message || '鎵ц鎴愬姛',
duration: btn.verify && btn.verify.stime ? btn.verify.stime : 2
})
} else if (res && res.ErrCode === 'Y') { // 鎵ц鎴愬姛
Modal.success({
- title: res.ErrMesg || '鎵ц鎴愬姛'
+ title: res.message || '鎵ц鎴愬姛'
})
} else if (res && res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
@@ -409,23 +409,23 @@
if (res.ErrCode === 'E') {
Modal.error({
- title: res.message || res.ErrMesg,
+ title: res.message || '鎵ц澶辫触锛�',
})
} else if (res.ErrCode === 'N') {
notification.error({
top: 92,
- message: res.message || res.ErrMesg,
+ message: res.message || '鎵ц澶辫触锛�',
duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 10
})
} else if (res.ErrCode === 'F') {
notification.error({
className: 'notification-custom-error',
top: 92,
- message: res.message || res.ErrMesg,
+ message: res.message || '鎵ц澶辫触锛�',
duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 10
})
} else if (res.ErrCode === 'NM') {
- message.error(res.message || res.ErrMesg)
+ message.error(res.message || '鎵ц澶辫触锛�')
}
this.setState({
--
Gitblit v1.8.0