From d8de196a5311f9ad7a01dbb988e0ad12b50f87e8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 07 三月 2025 21:24:48 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/appmanage/submutilform/index.jsx | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/src/views/appmanage/submutilform/index.jsx b/src/views/appmanage/submutilform/index.jsx
index 14976ea..f6c26a1 100644
--- a/src/views/appmanage/submutilform/index.jsx
+++ b/src/views/appmanage/submutilform/index.jsx
@@ -126,7 +126,7 @@
}
render() {
- const { card, type } = this.props
+ const { card, type, selectApp } = this.props
const { getFieldDecorator } = this.props.form
const { typename, adapters, exts, langs, WXApps, WXMerchs } = this.state
const formItemLayout = {
@@ -201,6 +201,27 @@
<Select.Option value="bg_black_style_deep_red"><span className="color-block" style={{background: '#c32539'}}></span>娣辩孩鑹诧紙#c32539锛�</Select.Option>
<Select.Option value="bg_black_style_deep_blue"><span className="color-block" style={{background: '#1d3661'}}></span>娣辫摑鑹诧紙#1d3661锛�</Select.Option>
</Select>
+ )}
+ </Form.Item>
+ </Col>
+ <Col span={12}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="褰撳墠瀛愬簲鐢ㄧ殑鍚嶇О銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 搴旂敤鍚嶇О
+ </Tooltip>
+ }>
+ {getFieldDecorator('app_name', {
+ initialValue: card ? card.app_name || selectApp.remark || '' : selectApp.remark || '',
+ })(<Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />)}
+ </Form.Item>
+ </Col>
+ <Col span={12}>
+ <Form.Item label="LOGO">
+ {getFieldDecorator('app_icon', {
+ initialValue: card ? card.app_icon : ''
+ })(
+ <SourceComponent type="picture" placement="right"/>
)}
</Form.Item>
</Col>
@@ -281,11 +302,10 @@
</Col> : null} */}
<Col span={12}>
<Form.Item label={
- exts.includes('share') ?
- <Tooltip placement="topLeft" title="瀛愬簲鐢ㄥ強鍒嗕韩鏃剁殑鏍囬銆�">
+ <Tooltip placement="topLeft" title={`瀛愬簲鐢�${exts.includes('share') ? '鍙婂垎浜椂' : ''}鐨勬爣棰樸�俙}>
<QuestionCircleOutlined className="mk-form-tip" />
鏍囬
- </Tooltip> : '鏍囬'
+ </Tooltip>
}>
{getFieldDecorator('title', {
initialValue: card ? card.title || '' : '',
@@ -360,6 +380,23 @@
)}
</Form.Item>
</Col> : null}
+ <Col span={12}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="鏄惁鍏佽鍦ㄥ叾浠栧簲鐢ㄤ腑鎵撳紑銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 璁㈤槄
+ </Tooltip>
+ }>
+ {getFieldDecorator('allow_subscribe', {
+ initialValue: card ? card.allow_subscribe || '' : ''
+ })(
+ <Radio.Group>
+ <Radio value="">鍏抽棴</Radio>
+ <Radio value="Y">寮�鍚�</Radio>
+ </Radio.Group>
+ )}
+ </Form.Item>
+ </Col>
{typename !== 'pc' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍦ㄤ娇鐢ㄥ皬绋嬪簭鎴栨槑绉戜簯APP鏃讹紙app妯″紡涓級鏃犳晥">
--
Gitblit v1.8.0