From 3ddb7987b031a152309c58dabd949e23d3419a72 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 01 八月 2025 15:33:50 +0800
Subject: [PATCH] test

---
 pages/modal/3200_view.vue |   88 +++++++++++++++++++++++++++-----------------
 1 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/pages/modal/3200_view.vue b/pages/modal/3200_view.vue
index 8eb16dd..f845360 100644
--- a/pages/modal/3200_view.vue
+++ b/pages/modal/3200_view.vue
@@ -67,7 +67,7 @@
 		},
 		data() {
 			return {
-					largeMode: getApp().globalData.largeMode || false,
+				largeMode: getApp().globalData.largeMode || false,
 				title: this.translateSys('add2'),
 				param: {},
 				styleDef: {
@@ -485,50 +485,70 @@
 					} else {
 						var tip = result.info ? typeof result.info == 'string' ? result.info : result
 							.info.join('<br/>') : '';
+						tip = tip || result.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
+						if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+							if (result.result_type == 2) {
 
-						if (result.result_type == 0 && result.action) {
-							result.action.forEach(item => {
-								if (item.action_type == "goback_to_pre_page") { //杩斿洖涓婁竴椤�-									var value = item.value;
-									// const eventChannel = this.getOpenerEventChannel();
-									// // const eventChannel = this.getOpenerEventChannel();
-									// eventChannel.emit('ExitViewEvent',"");
-									uni.navigateBack({
-										delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+							} else if (typeof result.result == 'string') {
+								if (result.result) {
+									uni.showModal({
+										title: this.translateSys('tip'),
+										content: result.result,
+										showCancel: false,
+										confirmText: this.translateSys('close')
 									});
-								} else if (item.action_type == "hidden_button") { //闅愯棌鎸夐挳
-									var value = item.value;
-									value.forEach(btn => {
-										var index = $this.param.ViewPage.Page_Button
-											.findIndex(button => button.ShowName ==
-												btn)
-										if (index > -1)
-											$this.param.ViewPage.Page_Button.splice(
-												index, 1)
-									})
-								} else if (item.action_type == "set_panel_html") { //鏄剧ずHtml椤甸潰
-									// var value = item.value;
-									$this.ViewHtml_Panel = item.value;
-
 								}
+							}
+							try {
+								var actionList = result.action || []
+								actionList.forEach(item => {
+									if (item.action_type == "goback_to_pre_page") { //杩斿洖涓婁竴椤�+										var value = item.value;
+										// const eventChannel = this.getOpenerEventChannel();
+										// // const eventChannel = this.getOpenerEventChannel();
+										// eventChannel.emit('ExitViewEvent',"");
+										uni.navigateBack({
+											delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+										});
+									} else if (item.action_type == "hidden_button") { //闅愯棌鎸夐挳
+										var value = item.value;
+										value.forEach(btn => {
+											var index = $this.param.ViewPage.Page_Button
+												.findIndex(button => button.ShowName ==
+													btn)
+											if (index > -1)
+												$this.param.ViewPage.Page_Button.splice(
+													index, 1)
+										})
+									} else if (item.action_type == "set_panel_html") { //鏄剧ずHtml椤甸潰
+										// var value = item.value;
+										$this.ViewHtml_Panel = item.value;
 
-							});
-						} else {
-							var tip = result.info ? typeof result.info == 'string' ? result.info :
-								result.info.join('<br/>') : '';
-							if (tip) uni.showModal({
-								title: this.translateSys("tip"),
-								content: tip,
-								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) {

--
Gitblit v1.9.1