From 00c011fc0571caad2bec578fe4ce2f101ab0500e Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 01 八月 2025 18:04:08 +0800
Subject: [PATCH] test
---
pages/modal/3018_2.vue | 12 +++---
pages/modal/3018.vue | 8 ++--
pages/modal/3200_view.vue | 2
pages/modal/5601.vue | 48 +++++++++++++++++------
pages/modal/3037_2.vue | 8 ++--
pages/modal/3202.vue | 6 +-
pages/modal/3037.vue | 12 +++---
pages/modal/3200.vue | 6 +-
pages/modal/3202_view.vue | 2
pages/modal/form/index.vue | 8 ++--
pages/modal/3201.vue | 2
11 files changed, 68 insertions(+), 46 deletions(-)
diff --git a/pages/modal/3018.vue b/pages/modal/3018.vue
index c4285b8..4857e76 100644
--- a/pages/modal/3018.vue
+++ b/pages/modal/3018.vue
@@ -1677,7 +1677,7 @@
console.log(dataInfo);
// return;
runCustomEvent(dataInfo).then(data => {
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data
.err_info :
data
@@ -1848,7 +1848,7 @@
// return;
runCustomEvent(dataInfo).then(data => {
console.log(data);
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data
.err_info :
data
@@ -2043,7 +2043,7 @@
// return;
runCustomEvent(dataInfo).then(data => {
console.log(data);
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data
.err_info :
data
@@ -2222,7 +2222,7 @@
// return;
runCustomEvent(dataInfo).then(data => {
console.log(data);
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data
.err_info :
data
diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index db401f7..3f7dda2 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -441,7 +441,7 @@
};
console.log(dataInfo);
var data = await runCustomEvent(dataInfo)
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data
.err_info : data
.err_info.join('<br/>') : '';
@@ -900,7 +900,7 @@
console.log(dataInfo);
// return;
runCustomEvent(dataInfo).then(data => {
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data
.err_info :
data
@@ -1091,7 +1091,7 @@
console.log(dataInfo);
// return;
runCustomEvent(dataInfo).then(data => {
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data
.err_info :
data
@@ -1418,7 +1418,7 @@
uni.hideLoading();
let data = res.lua_result
if (data) {
- if (data.ret != 0) {
+ if (data.ret != 0&& ret.ret != 1) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data
.err_info :
data
@@ -1714,7 +1714,7 @@
// return;
runCustomEvent(dataInfo).then(data => {
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data
.err_info :
data
@@ -1917,7 +1917,7 @@
};
console.log(dataInfo);
// return;
- runCustomEvent(dataInfo).then(data => {
+ runCustomEvent(dataInfo&& data.ret != 1).then(data => {
if (data.ret != 0) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data
.err_info :
diff --git a/pages/modal/3037.vue b/pages/modal/3037.vue
index a811383..cd8f6fa 100644
--- a/pages/modal/3037.vue
+++ b/pages/modal/3037.vue
@@ -2602,7 +2602,7 @@
runCustomEvent(
dataInfo).then(data => {
console.log(data);
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data
.err_info ?
typeof data
@@ -2885,7 +2885,7 @@
runCustomEvent(
dataInfo).then(data => {
console.log(data);
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data
.err_info ?
typeof data
@@ -3366,7 +3366,7 @@
runCustomEvent(dataInfo).then(data => {
console.log(data);
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data
.err_info ?
typeof data
@@ -3588,7 +3588,7 @@
// return;
runCustomEvent(dataInfo).then(data => {
console.log(data);
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data
.err_info ?
typeof data
@@ -4012,7 +4012,7 @@
// return;
runCustomEvent(dataInfo).then(data => {
console.log(data);
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data
.err_info ?
typeof data
@@ -4208,7 +4208,7 @@
// return;
runCustomEvent(dataInfo).then(data => {
console.log(data);
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data
.err_info ?
typeof data
diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index 3f49521..3d687a4 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -440,7 +440,7 @@
runCustomEvent(dataInfo).then(data => {
console.log(data);
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
.err_info.join('<br/>') : '';
if (data.ret == 801) {
@@ -854,7 +854,7 @@
console.log(dataInfo);
// return;
runCustomEvent(dataInfo).then(data => {
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data
.err_info :
data
@@ -1551,7 +1551,7 @@
// return;
runCustomEvent(dataInfo).then(data => {
console.log(data);
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
.err_info.join('<br/>') : '';
if (data.ret == 801) {
@@ -1837,7 +1837,7 @@
runCustomEvent(dataInfo).then(data => {
console.log(data);
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
.err_info.join('<br/>') : '';
if (data.ret == 801) {
diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index 49a8ae3..543fc25 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -508,7 +508,7 @@
var result = await runCustomEvent(dataInfo)
// console.log(result);
- if (result.ret != 0) {
+ if (result.ret != 0&& result.ret != 1) {
var tip = result.err_info ? typeof result.err_info == 'string' ? result
.err_info : result.err_info.join('<br/>') : '';
if (result.ret == 801) {
@@ -1353,7 +1353,7 @@
};
runCustomEvent(dataInfo).then(result => {
// console.log(result);
- if (result.ret != 0) {
+ if (result.ret != 0&& result.ret != 1) {
var tip = result.err_info ? typeof result
.err_info ==
'string' ?
@@ -1670,7 +1670,7 @@
runCustomEvent(dataInfo).then(result => {
console.log(result);
- if (result.ret != 0) {
+ if (result.ret != 0&& result.ret != 1) {
var tip = result.err_info ? typeof result
.err_info ==
'string' ?
diff --git a/pages/modal/3200_view.vue b/pages/modal/3200_view.vue
index f845360..b90f14e 100644
--- a/pages/modal/3200_view.vue
+++ b/pages/modal/3200_view.vue
@@ -466,7 +466,7 @@
var $this = this;
const result = await runCustomEvent(dataInfo)
console.log(result);
- if (result.ret != 0) {
+ if (result.ret != 0&& result.ret != 1) {
var tip = result.err_info ? typeof result.err_info == 'string' ? result
.err_info : result.err_info.join('<br/>') : '';
if (result.ret == 801) uni.showModal({
diff --git a/pages/modal/3201.vue b/pages/modal/3201.vue
index cf709cb..26e7bd7 100644
--- a/pages/modal/3201.vue
+++ b/pages/modal/3201.vue
@@ -221,7 +221,7 @@
runCustomEvent(dataInfo).then(result => {
console.log(result);
- if (result.ret != 0) {
+ if (result.ret != 0&& result.ret != 1) {
var tip = result.err_info ? typeof result.err_info == 'string' ? result
.err_info : result.err_info.join('<br/>') : '';
if (result.ret == 801) uni.showModal({
diff --git a/pages/modal/3202.vue b/pages/modal/3202.vue
index 1925510..967c3b5 100644
--- a/pages/modal/3202.vue
+++ b/pages/modal/3202.vue
@@ -489,7 +489,7 @@
data_json,
}).then(result => {
// console.log(result);
- if (result.ret != 0) {
+ if (result.ret != 0&& result.ret != 1) {
var tip = result.err_info ? typeof result
.err_info ==
'string' ?
@@ -707,7 +707,7 @@
};
runCustomEvent(dataInfo).then(result => {
// console.log(result);
- if (result.ret != 0) {
+ if (result.ret != 0&& result.ret != 1) {
var tip = result.err_info ? typeof result
.err_info ==
'string' ?
@@ -1034,7 +1034,7 @@
runCustomEvent(dataInfo).then(result => {
console.log(result);
- if (result.ret != 0) {
+ if (result.ret != 0&& result.ret != 1) {
var tip = result.err_info ? typeof result
.err_info ==
'string' ?
diff --git a/pages/modal/3202_view.vue b/pages/modal/3202_view.vue
index 2c8d702..f78d925 100644
--- a/pages/modal/3202_view.vue
+++ b/pages/modal/3202_view.vue
@@ -408,7 +408,7 @@
runCustomEvent(dataInfo).then(result => {
console.log(result);
- if (result.ret != 0) {
+ if (result.ret != 0&& result.ret != 1) {
var tip = result.err_info ? typeof result
.err_info ==
'string' ?
diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index 8442e27..7e61e90 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -522,9 +522,13 @@
} catch (ex) {
// console.log(ex);
+ let exStr = JSON.stringify(ex)
+ if (exStr == "{}")
+ exStr = ex
+ let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
uni.showModal({
title: this.translateSys("error") + "1",
- content: ex.errMsg,
+ content: tip,
showCancel: false,
confirmText: this.translateSys('close')
});
@@ -590,10 +594,14 @@
console.log("Detail_UIstyleGetInfo", detailstyledef);
return detailstyledef
} catch (ex) {
- // console.log(ex);
+ console.log(ex);
+ let exStr = JSON.stringify(ex)
+ if (exStr == "{}")
+ exStr = ex
+ let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
uni.showModal({
title: this.translateSys("error") + "2",
- content: ex.errMsg,
+ content: tip,
showCancel: false,
confirmText: this.translateSys('close')
});
@@ -629,10 +637,14 @@
}
formItem.dict = list;
} catch (ex) {
- // console.log(ex);
+ console.log(ex);
+ let exStr = JSON.stringify(ex)
+ if (exStr == "{}")
+ exStr = ex
+ let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
uni.showModal({
title: this.translateSys("error") + "3",
- content: ex.errMsg,
+ content: tip,
showCancel: false,
confirmText: this.translateSys('close')
});
@@ -853,7 +865,7 @@
};
const result = await runCustomEvent(dataInfo)
console.log(result)
- if (result.ret != 0) {
+ if (result.ret != 0&& result.ret != 1) {
var tip = result.err_info ? typeof result
.err_info == 'string' ? result
.err_info : result.err_info.join('<br/>') :
@@ -938,7 +950,10 @@
} catch (ex) {
console.log(ex)
- var tip = typeof ex == "string" ? ex : ex.message;
+ let exStr = JSON.stringify(ex)
+ if (exStr == "{}")
+ exStr = ex
+ let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
uni.showModal({
title: this.translateSys("error") + "6.1",
content: this.translate(
@@ -1075,7 +1090,7 @@
};
const result = await runCustomEvent(dataInfo)
console.log(result);
- if (result.ret != 0) {
+ if (result.ret != 0&& result.ret != 1) {
var tip = result.err_info ? typeof result
.err_info == 'string' ? result
.err_info : result.err_info.join('<br/>') :
@@ -1264,7 +1279,11 @@
}
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
+ console.log(ex);
+ let exStr = JSON.stringify(ex)
+ if (exStr == "{}")
+ exStr = ex
+ let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
uni.showModal({
title: this.translateSys("error") + "4.2",
content: this.translate(
@@ -2132,7 +2151,7 @@
console.log(dataInfo);
// return;
runCustomEvent(dataInfo).then(data => {
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data
.err_info :
data
@@ -2305,7 +2324,7 @@
console.log(dataInfo);
// return;
runCustomEvent(dataInfo).then(data => {
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data
.err_info :
data
@@ -2963,7 +2982,7 @@
console.log(dataInfo);
runCustomEvent(dataInfo).then(result => {
console.log(result);
- if (result.ret != 0) {
+ if (result.ret != 0&& result.ret != 1) {
var tip = result.err_info ? typeof result
.err_info == 'string' ? result.err_info :
result.err_info.join('<br/>') : '';
@@ -3205,7 +3224,10 @@
}).catch(ex => {
console.log(ex);
- let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
+ let exStr = JSON.stringify(ex)
+ if (exStr == "{}")
+ exStr = ex
+ let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
uni.showModal({
title: this.translateSys("error") + "8.1",
content: this.translate("execute_after_ok_event_failed") +
diff --git a/pages/modal/form/index.vue b/pages/modal/form/index.vue
index 18eb702..258f5f0 100644
--- a/pages/modal/form/index.vue
+++ b/pages/modal/form/index.vue
@@ -438,7 +438,7 @@
data_json,
ext_info
})
- if (result.ret != 0) {
+ if (result.ret != 0&& result.ret != 1) {
var tip = result.err_info ? typeof result
.err_info == 'string' ? result
.err_info : result.err_info.join('<br/>') :
@@ -762,7 +762,7 @@
runCustomEvent(dataInfo).then(result => {
console.log(result);
- if (result.ret != 0) {
+ if (result.ret != 0&& result.ret != 1) {
var tip = result.err_info ? typeof result
.err_info == 'string' ? result
.err_info : result.err_info.join('<br/>') :
@@ -1125,7 +1125,7 @@
console.log(dataInfo);
// return;
runCustomEvent(dataInfo).then(data => {
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data
.err_info :
data
@@ -1293,7 +1293,7 @@
console.log(dataInfo);
// return;
runCustomEvent(dataInfo).then(data => {
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data
.err_info :
data
--
Gitblit v1.9.1