From b45eed171519ffe4f95d0d10743e7b3a25fcd569 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 01 七月 2024 15:43:07 +0800
Subject: [PATCH] 2024-07-01

---
 src/menu/components/share/actioncomponent/actionform/index.jsx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 9a27fcb..0d1897c 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')
@@ -520,7 +520,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')
         }
@@ -882,7 +882,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