From 5b166dd93003adb0749002d74109a519f746e204 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 八月 2024 16:49:15 +0800
Subject: [PATCH] 2024-08-03
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 9a27fcb..d730f6e 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -444,7 +444,7 @@
} else if (this.record.pageTemplate === 'pay') {
reOptions.Ot = requireOptions.filter(op => op.value === 'requiredSgl')
- shows.push('payMode', 'wxApp')
+ shows.push('payMode', 'wxApp', 'wxMerch')
if (this.record.payMode === 'inner') {
reRequired.innerFunc = true
shows.push('innerFunc')
@@ -492,7 +492,9 @@
shows.push('position')
}
} else if (_funcType === 'mkBinding' || _funcType === 'mkUnBinding') {
- shows.push('execSuccess', 'execError')
+ shows.push('execSuccess', 'execError', 'tipTitle')
+ } else if (_funcType === 'mkUnsubscribe' || _funcType === 'reAuth') {
+ shows.push('tipTitle')
} else if (_funcType === 'closetab') {
shows.push('refreshTab')
} else if (_funcType === 'scan') {
@@ -520,7 +522,7 @@
shows.push('innerFunc', 'Ot', 'execSuccess', 'execError', 'urlkey')
} else if (_funcType === 'pay') {
- shows.push('payType', 'wxApp', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
+ shows.push('payType', 'wxApp', 'wxMerch', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
if (this.record.openmenu && this.record.openmenu !== 'goback') {
shows.push('open')
}
@@ -547,6 +549,11 @@
}
} else if (_funcType === 'shareLink') {
shows.push('shortUrl', 'shareUrl', 'shareProUrl', 'shareTip')
+ } else if (_funcType === 'openLocation') {
+ shows.push('Ot')
+ if (Ot === 'requiredSgl') {
+ shows.push('nameField', 'addressField')
+ }
// } else if (_funcType === 'expPdf') {
// shows.push('exportType')
}
@@ -882,7 +889,7 @@
{ max: 512, message: '鏈�澶�512涓瓧绗�' }
)
} else if (item.key === 'output') {
- if (['pop', 'prompt', 'exec'].includes(this.record.openType)) {
+ if (['pop', 'prompt', 'exec'].includes(this.record.OpenType)) {
if (this.record.intertype === 'system' || ((this.record.intertype === 'outer' || this.record.intertype === 'custom') && this.record.callbackType === 'script')) {
rules = [{
pattern: /^@[0-9a-zA-Z_]+@?$/,
--
Gitblit v1.8.0