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/3200_view.vue | 111 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 71 insertions(+), 40 deletions(-)
diff --git a/pages/modal/3200_view.vue b/pages/modal/3200_view.vue
index f9c889a..b90f14e 100644
--- a/pages/modal/3200_view.vue
+++ b/pages/modal/3200_view.vue
@@ -1,5 +1,5 @@
<template>
- <view class="uni-page-modal-3200-view">
+ <view class="uni-page-modal-3200-view" :class="largeMode?'large-mode':''">
<view class="v-content">
<view class="dv-panel dv-panel-bkcolor">
<div class="dv-panel-input">
@@ -36,7 +36,7 @@
<script>
import {
Base64
- } from '@/js/Base64.js';
+ } from '@/js/Base64.js';
import classUtils from "@/js/utils.js"
import {
appGetInfo,
@@ -49,7 +49,7 @@
} from "@/api/data.js"
import OIForm from '@/components/oi-form/index.vue'
import buttonClickMixin from '@/mixins/button-click.js';
-
+
export default {
mixins: [buttonClickMixin],
components: {
@@ -67,6 +67,7 @@
},
data() {
return {
+ largeMode: getApp().globalData.largeMode || false,
title: this.translateSys('add2'),
param: {},
styleDef: {
@@ -350,14 +351,14 @@
}
}
});
- } else{
+ } else {
this.handleButtonClick((done) => {
- that.onButtonClicked(btn);
+ that.onButtonClicked(btn);
setTimeout(() => {
done(); // 閲嶇疆鐘舵�
}, 1000);
});
-
+
}
},
//鐐瑰嚮鎸夐挳鍒楄〃
@@ -465,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({
@@ -484,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}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ console.log(ex)
+ return
+ }
}
+
}
} catch (ex) {
@@ -812,6 +833,16 @@
width: 100%;
display: inline-block;
text-align: left;
+
+ .uni-forms-item {
+ padding-bottom: 5rpx;
+ margin-bottom: 0;
+
+ .uni-forms-item__label {
+ height: 20px !important;
+ padding: 0 10rpx 0 0 !important;
+ }
+ }
}
.dv-panel-buticon {
--
Gitblit v1.9.1