From df63ee5c72d218cc30fbb552b012c7ef5e793701 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 29 五月 2024 16:05:29 +0800
Subject: [PATCH] 2024-05-29
---
src/templates/zshare/verifycard/baseform/index.jsx | 48 +++++++++++++++++++++++++++---------------------
src/tabviews/zshare/actionList/normalbutton/index.jsx | 4 ++--
src/templates/zshare/verifycard/index.jsx | 2 --
3 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 492aad9..bcf9a4f 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -2596,9 +2596,9 @@
if (verify.wxNoteLink === 'url' && verify.wxNoteLinkUrl) {
_param.url = verify.wxNoteLinkUrl
- } else if (verify.wxNoteLink === 'miniProgram' && window.GLOB.WXminiAppID) {
+ } else if (verify.wxNoteLink === 'miniProgram' && (window.GLOB.WXminiAppID || verify.wxNoteMiniId)) {
_param.miniprogram = {
- appid: window.GLOB.WXminiAppID,
+ appid: verify.wxNoteMiniId || window.GLOB.WXminiAppID,
pagepath: '/pages/index/index'
}
diff --git a/src/templates/zshare/verifycard/baseform/index.jsx b/src/templates/zshare/verifycard/baseform/index.jsx
index 7b9cec0..d67515e 100644
--- a/src/templates/zshare/verifycard/baseform/index.jsx
+++ b/src/templates/zshare/verifycard/baseform/index.jsx
@@ -159,37 +159,38 @@
let _verify = {...verify, [key]: value}
if (_verify.noteEnable !== 'true') {
- _verify.noteCode = ''
- _verify.noteId = ''
+ delete _verify.noteCode
+ delete _verify.noteId
}
if (_verify.emailEnable !== 'true') {
- _verify.emailCode = ''
- _verify.emailId = ''
+ delete _verify.emailCode
+ delete _verify.emailId
}
if (_verify.printEnable !== 'true') {
- _verify.printTempId = ''
+ delete _verify.printTempId
}
if (_verify.linkEnable !== 'true') {
delete _verify.linkUrl
delete _verify.linkProUrl
}
if (_verify.accountdate !== 'true') {
- _verify.accountfield = ''
- _verify.voucherdate = ''
+ delete _verify.accountfield
+ delete _verify.voucherdate
}
if (_verify.preHandle !== 'true') {
- _verify.pre_func = ''
+ delete _verify.pre_func
}
if (_verify.wxNote !== 'true') {
- _verify.wxTemplateId = ''
- _verify.wxNoteLink = ''
- _verify.wxNoteLinkUrl = ''
- _verify.wxNoteLinkMenuId = ''
- _verify.wxNoteCallback = 'false'
- _verify.wxNoteKeys = null
-
+ delete _verify.wxTemplateId
+ delete _verify.wxNoteLink
+ delete _verify.wxNoteLinkUrl
+ delete _verify.wxNoteMiniId
+ delete _verify.wxNoteLinkMenuId
+ delete _verify.wxNoteCallback
delete _verify.wxCustomTempId
+ _verify.wxNoteKeys = null
+
if (this.state.selectTemp) {
this.setState({selectTemp: null})
}
@@ -342,12 +343,7 @@
<Form {...formItemLayout}>
<Row gutter={24}>
{card.sqlType !== 'custom' && card.intertype !== 'inner' ? <Col span={8}>
- <Form.Item label={
- <Tooltip placement="bottomLeft" title={'榛樿sql鎵ц椤哄簭涓鸿嚜瀹氫箟鑴氭湰涔嬪墠'}>
- <QuestionCircleOutlined className="mk-form-tip" />
- 榛樿sql
- </Tooltip>
- }>
+ <Form.Item label="榛樿sql">
<Radio.Group value={verify.default} onChange={(e) => {this.onOptionChange(e.target.value, 'default')}}>
<Radio value="true">鎵ц</Radio>
<Radio value="false">涓嶆墽琛�</Radio>
@@ -696,6 +692,16 @@
</Col> : null}
{verify.wxNoteLink === 'miniProgram' ? <Col span={8}>
<Form.Item label={
+ <Tooltip placement="top" title="鍙寚瀹氳烦杞皬绋嬪簭鐨処D锛屾湭璁剧疆鏃堕粯璁や娇鐢ㄩ厤缃枃浠朵腑鐨勫皬绋嬪簭ID銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 灏忕▼搴廔D
+ </Tooltip>
+ }>
+ <Input placeholder="" autoComplete="off" value={verify.wxNoteMiniId || ''} onChange={(e) => {this.onOptionChange(e.target.value, 'wxNoteMiniId')}}/>
+ </Form.Item>
+ </Col> : null}
+ {verify.wxNoteLink === 'miniProgram' ? <Col span={8}>
+ <Form.Item label={
<Tooltip placement="top" title="娣诲姞鑿滃崟ID鍙烦杞嚦灏忕▼搴忔寚瀹氶〉闈紝绌哄�奸粯璁よ烦杞嚦灏忕▼搴忛椤点�傛敞锛氭暟鎹噷涓鏋滄湁bid瀛楁锛堝�间笉涓虹┖锛夛紝鎵撳紑灏忕▼搴忔椂浼氬仛涓築ID浼犲叆椤甸潰涓��">
<QuestionCircleOutlined className="mk-form-tip" />
鑿滃崟ID
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index 98fa67f..9e50ea7 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -641,8 +641,6 @@
_verify.uniques = _verify.uniques || []
_verify.contrasts = _verify.contrasts || []
_verify.accountdate = _verify.accountdate || 'false'
- _verify.accountfield = _verify.accountfield || ''
- _verify.voucherdate = _verify.voucherdate || ''
_verify.customverifys = _verify.customverifys || []
_verify.billcodes = _verify.billcodes || []
_verify.voucher = _verify.voucher || {enabled: false}
--
Gitblit v1.8.0