From 8f1880cf13440b9cb57d15520ebc3b785f3dabb1 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 01 八月 2025 11:17:49 +0800
Subject: [PATCH] lua action处理

---
 pages/modal/3202.vue |  131 ++++++++++++++++++++++++++++---------------
 1 files changed, 85 insertions(+), 46 deletions(-)

diff --git a/pages/modal/3202.vue b/pages/modal/3202.vue
index ee5792e..8b09391 100644
--- a/pages/modal/3202.vue
+++ b/pages/modal/3202.vue
@@ -528,6 +528,7 @@
 							.info == 'string' ? result
 							.info :
 							result.info.join('<br/>') : '';
+						tip = tip || result.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys(
 								"tip"),
@@ -536,9 +537,21 @@
 							confirmText: this.translateSys(
 								'close')
 						});
+						if (result.result_type == 2) {
 
-						if (result.result_type == 0 && result.action) {
-							result.action.forEach(item => {
+						} else if (typeof result.result == 'string') {
+							if (result.result) {
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: result.result,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+							}
+						}
+						try {
+							var actionList = result.action || []
+							actionList.forEach(item => {
 								if (item.action_type == "jump_pda_page") {
 									// value = {"attr":"xxx", "value":"xxx"}
 									var data = item.value;
@@ -554,20 +567,20 @@
 									});
 								}
 							})
-						} else {
-							if (result.info) {
-								uni.showModal({
-									title: this
-										.translateSys(
-											"tip"),
-									content: result.info,
-									showCancel: false,
-									confirmText: this
-										.translateSys(
-											'close')
-								});
-							}
+						} catch (ex) {
+							let actionList = (result.action || []).map(a => a.action_type).join(';')
+							let tip = typeof ex == 'string' ? ex : ex.message
+							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
+							uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							console.log(ex)
+							return
 						}
+
 					}
 
 
@@ -590,8 +603,8 @@
 				// var $ele = e;
 				//console.log(e.target)
 				getApp().onScan((result) => {
-					console.log(result.decodedata);
-					item.value = result.decodedata;
+					console.log(result);
+					item.value = result;
 					uni.hideKeyboard();
 					var $this = this;
 					console.log(item);
@@ -731,6 +744,7 @@
 									.info == 'string' ? result
 									.info :
 									result.info.join('<br/>') : '';
+								tip = tip || result.err_info
 								if (tip) uni.showModal({
 									title: this.translateSys(
 										"tip"),
@@ -739,8 +753,20 @@
 									confirmText: this.translateSys(
 										'close')
 								});
+								if (result.result_type == 2) {
 
-								if (result.result_type == 0 && result.action) {
+								} else if (typeof result.result == 'string') {
+									if (result.result) {
+										uni.showModal({
+											title: this.translateSys('tip'),
+											content: result.result,
+											showCancel: false,
+											confirmText: this.translateSys('close')
+										});
+									}
+								}
+								try {
+									var actionlist = result.action || []
 									for (var j = 0; j < actionlist.length; j++) {
 										var action = actionlist[j];
 										var action_type = action.action_type;
@@ -778,20 +804,20 @@
 										}
 									}
 
-								} else {
-									if (result.info) {
-										uni.showModal({
-											title: this
-												.translateSys(
-													"tip"),
-											content: result.info,
-											showCancel: false,
-											confirmText: this
-												.translateSys(
-													'close')
-										});
-									}
+								} catch (ex) {
+									let actionList = (result.action || []).map(a => a.action_type).join(';')
+									let tip = typeof ex == 'string' ? ex : ex.message
+									tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
+									uni.showModal({
+										title: this.translateSys('tip'),
+										content: tip,
+										showCancel: false,
+										confirmText: this.translateSys('close')
+									});
+									console.log(ex)
+									return
 								}
+
 							}
 
 
@@ -1040,6 +1066,7 @@
 								.info == 'string' ? result
 								.info : result
 								.info.join('<br/>') : '';
+							tip = tip || result.err_info
 							if (tip) uni.showModal({
 								title: this.translateSys(
 									"tip"),
@@ -1048,9 +1075,21 @@
 								confirmText: this.translateSys(
 									'close')
 							});
+							if (result.result_type == 2) {
 
-							if (result.result_type == 0 && result.action) {
-								result.action.forEach(item => {
+							} else if (typeof result.result == 'string') {
+								if (result.result) {
+									uni.showModal({
+										title: this.translateSys('tip'),
+										content: result.result,
+										showCancel: false,
+										confirmText: this.translateSys('close')
+									});
+								}
+							}
+							try {
+								var actionList = result.action || []
+								actionList.forEach(item => {
 									if (item.action_type ==
 										"goback_to_pre_page") { //杩斿洖涓婁竴椤� 										var value = item.value;
@@ -1085,20 +1124,20 @@
 										});
 									}
 								});
-							} else {
-								if (result.info) {
-									uni.showModal({
-										title: this
-											.translateSys(
-												"tip"),
-										content: result.info,
-										showCancel: false,
-										confirmText: this
-											.translateSys(
-												'close')
-									});
-								}
+							} catch (ex) {
+								let actionList = (result.action || []).map(a => a.action_type).join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+								console.log(ex)
+								return
 							}
+
 						}
 					}).catch(ex => {
 						// console.log(ex);

--
Gitblit v1.9.1