bug

src/pages/activity/drainage/components/Basic.jsx

@@ -1,57 +1,34 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Slider, Row, Col, Checkbox, Input, Button, InputNumber, message } from 'antd';
+import { Form, Slider, Row, Col, Button, InputNumber, message } from 'antd';
 import router from 'umi/router';
 import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
 import ImageUploader from './ImageUpload';
 import Styles from './styles.less';
-import Navigate from '@/components/Navigate';
 import BuildSelect from '../../../../components/SelectButton/BuildSelect2'
+import CheckboxGroup from './CheckboxGroup';
 
 function Basic(props) {
 
     const { id, name } = props
 
-    const [registrationInputValue, setRegistrationInputValue] = useState()
-
-    const [viewProperty, setViewProperty] = useState(['index'])
-    const [productionPoster, setProductionPoster] = useState(['index'])
-    // const [registrationForm, setRegistrationForm] = useState([])
-    const [inputVisible, setInputVisible] = useState(false)
-    // const [registrationFormOption, setregistrationFormOption] = useState([
-    //     { label: '姓名', value: 'name' },
-    //     { label: '电话', value: 'tel' },
-    //     { label: '自定义', value: 'abc' },
-    // ])
-
     const [data, setData] = useState({})
     useEffect(() => {
         getList();
-        console.log(props.id, '2341')
     }, [])
     // 查询列表
 
     const getList = () => {
         request({ ...apis.redPacket.detail, urlData: { id } }).then(data => {
-            console.log(data, '2341')
-            // s.split("==");
-            data.buildingShowPos = data.buildingShowPos.split(',')
-
-            data.buildingSposterShowPoshowPos = (data.posterShowPos).split(',')
-            setViewProperty(data.buildingShowPos)
-            setProductionPoster(data.posterShowPos)
-            console.log(data, '2341')
             setData(data)
         })
     }
 
     const updateRedPacket = data => {
-        console.log('123123')
         request({ ...apis.redPacket.update, data: { ...data } }).then(data => {
             // setData(data)
-            console.log('123123')
             message.success('操作成功')
-        }).catch((e) => {
+        }).catch(() => {
             message.error('操作失败')
         })
     }
@@ -61,57 +38,13 @@ function Basic(props) {
         e.preventDefault();
         props.form.validateFields((err, values) => {
             if (!err) {
-                console.log(values, '------222-------')
                 values.activityId = id
-                // values.name = name
-                values.buildingShowPos = values.buildingShowPos.toString()
-                values.posterShowPos = values.posterShowPos.toString()
-                console.log(values, '------222-------')
                 updateRedPacket(values)
             }
         },
         )
     }
 
-    function onViewPropertyChange(checkedValues) {
-        console.log('checked = ', checkedValues);
-        setViewProperty(checkedValues)
-    }
-
-    function onProductionPoster(checkedValues) {
-        console.log('checked = ', checkedValues);
-        setProductionPoster(checkedValues)
-    }
-
-    function onRegistrationForm(checkedValues) {
-        console.log('checked = ', checkedValues);
-        setRegistrationForm(checkedValues)
-    }
-    // registrationForm
-    // function  (value, list) {
-    //     return list.filter(f => f == value)
-    // }
-    function showInput() {
-        setInputVisible(!inputVisible)
-    }
-
-    const handleInputChange = e => {
-        setRegistrationInputValue(e.target.value)
-        // this.setState({ inputValue: e.target.value });
-
-    };
-
-    // const handleInputConfirm = () => {
-    //     setregistrationFormOption([
-    //         { label: '姓名', value: 'name' },
-    //         { label: '电话', value: 'tel' },
-    //         { label: registrationInputValue, value: 'abc' },
-    //     ])
-
-
-    //     setInputVisible(!inputVisible)
-    // }
-
     const { getFieldDecorator } = props.form
 
     return (
@@ -174,24 +107,19 @@ function Basic(props) {
                                     <Slider
                                         min={5}
                                         max={100}
-                                        // value={typeof inputValue === 'number' ? inputValue : 0}
                                         step={1}
-                                    // width="100px"
-                                    // style={{ width: '100px' }}
                                     />,
                                 )}
                         </Col>
                         <Col span={6}>
                             {getFieldDecorator('topLimitPersons',
                                 {
-                                    // initialValue: data.topLimitPersons,
                                 })(
                                     <InputNumber
                                         min={5}
                                         max={100}
                                         style={{ marginLeft: 16 }}
-                                    // value={inputValue}
-                                    // onChange={this.onChange}
+
                                     />,
                                 )}
                         </Col>
@@ -200,23 +128,8 @@ function Basic(props) {
                 <Form.Item label="查看楼盘按钮">
                     {getFieldDecorator('buildingShowPos',
                         {
-                            initialValue: viewProperty,
-                        })(
-                            // <Checkbox.Group options={ViewProperty} defaultValue={['Apple']} onChange={onChange} />,style={viewProperty.indexOf('home') == -1 ? {} : { color: '#EF273A' }}
-                            <Checkbox.Group name={Styles.Checkboxs} onChange={onViewPropertyChange} style={{ width: '100%' }}>
-                                <Row>
-                                    <Col span={6}>
-                                        <Checkbox className={viewProperty.indexOf('index') === -1 ? {} : Styles.CheckboxStytle} value="index" >首页</Checkbox>
-                                    </Col>
-                                    <Col span={6}>
-                                        <Checkbox className={viewProperty.indexOf('help') === -1 ? {} : Styles.CheckboxStytle} value="help">助力页</Checkbox>
-                                    </Col>
-                                    <Col span={6}>
-                                        <Checkbox className={viewProperty.indexOf('rule') === -1 ? {} : Styles.CheckboxStytle} value="rule">活动规则页</Checkbox>
-                                    </Col>
-                                </Row>
-                            </Checkbox.Group>,
-                        )}
+                            initialValue: data.buildingShowPos || 'index',
+                        })(<CheckboxGroup />)}
                 </Form.Item>
                 <Form.Item label="关联楼盘">
                     {getFieldDecorator('buildingId',
@@ -228,62 +141,12 @@ function Basic(props) {
                 </Form.Item>
                 <Form.Item label="生成海报按钮">
                     {getFieldDecorator('posterShowPos', {
-                        initialValue: productionPoster,
-                    })(
-                        <Checkbox.Group name={Styles.Checkboxs} onChange={onProductionPoster} style={{ width: '100%' }}>
-                            <Row>
-                                <Col span={6}>
-                                    <Checkbox className={productionPoster.indexOf('index') === -1 ? {} : Styles.CheckboxStytle} value="index" >首页</Checkbox>
-                                </Col>
-                                <Col span={6}>
-                                    <Checkbox className={productionPoster.indexOf('help') === -1 ? {} : Styles.CheckboxStytle} value="help">助力页</Checkbox>
-                                </Col>
-                                <Col span={6}>
-                                    <Checkbox className={productionPoster.indexOf('rule') === -1 ? {} : Styles.CheckboxStytle} value="rule">活动规则页</Checkbox>
-                                </Col>
-                            </Row>
-                        </Checkbox.Group>,
-                    )}
+                        initialValue: data.posterShowPos || 'index',
+                    })(<CheckboxGroup />)}
                 </Form.Item>
-                {/* <Form.Item label="报名表单">
-                    {getFieldDecorator('registrationForm')(
-                        <Checkbox.Group name={Styles.Checkboxs} onChange={onRegistrationForm} style={{ width: '100%' }}>
-                            <Row>
-                                {registrationFormOption.map((x, index) => {
-                                    return <Col span={6}>
-                                        {index !== 2 && (<Checkbox className={registrationForm.indexOf(x.value) === -1 ? {} : Styles.CheckboxStytle} value={x.value} >{x.label} </Checkbox>)}
-
-                                        {inputVisible && index === 2 && (
-                                            <Input
-                                                // ref={this.saveInputRef}
-                                                type="text"
-                                                size="small"
-                                                style={{ width: 78 }}
-                                                // value={inputValue}
-                                                onChange={handleInputChange}
-                                                onBlur={handleInputConfirm}
-                                                onPressEnter={handleInputConfirm}
-                                            />
-                                        )}
-                                        {!inputVisible && index === 2 && (
-                                            <Checkbox className={registrationForm.indexOf(x.value) === -1 ? {} : Styles.CheckboxStytle} value={x.value} >{x.label} </Checkbox>
-                                        )}
-                                        {!inputVisible && index === 2 && x.label === '自定义' && (
-                                            <Navigate onClick={showInput} >
-                                                修改
-                                            </Navigate>
-                                        )}
-                                    </Col>
-                                })}
-                            </Row>
-                          
-                        </Checkbox.Group>,
-                    )}
-                </Form.Item> */}
                 <Form.Item wrapperCol={{ span: 15, offset: 8 }}>
                     <div style={{ width: '190px' }}>
                         <Button type="primary" style={{ marginRight: '20px' }} htmlType="submit">保存</Button>
-                        {/* <Button onClick={() => router.go(-1)} >取消</Button> */}
                     </div>
                 </Form.Item>
             </Form>

src/pages/activity/drainage/components/CheckboxGroup.jsx

@@ -0,0 +1,46 @@
+import React from 'react'
+import { Checkbox, Row, Col } from 'antd'
+import classNames from 'classnames'
+
+import Styles from './styles.less';
+
+const DataDict = [
+    {
+        label: '首页',
+        value: 'index',
+    },
+    {
+        label: '助力页',
+        value: 'help',
+    },
+    {
+        label: '活动规则页',
+        value: 'rule',
+    },
+]
+
+export default props => {
+    const { value, onChange } = props;
+    const vals = (value || '').split(',');
+    const handleChange = e => {
+        onChange(e.join(','));
+    }
+
+    return (
+        <Checkbox.Group className={Styles.Checkboxs} onChange={handleChange} style={{ width: '100%' }} value={vals}>
+            <Row>
+                {
+                    DataDict.map(item => {
+                        const key = item.value;
+                        return (
+                            <Col span={6} key={key}>
+                                <Checkbox className={classNames({ [Styles.CheckboxStytle]: vals.indexOf(item.value) > -1 })} value={item.value} >{item.label}</Checkbox>
+                            </Col>
+                        );
+                    })
+                }
+            </Row>
+        </Checkbox.Group>
+    );
+
+}

src/pages/activity/drainage/components/CustomerData.jsx

@@ -69,8 +69,8 @@ function CustomerData(props) {
         },
         {
             title: '昵称',
-            dataIndex: 'nickName',
-            key: 'nickName',
+            dataIndex: 'nickname',
+            key: 'nickname',
             align: 'center',
         },
         {
@@ -94,8 +94,8 @@ function CustomerData(props) {
         },
         {
             title: '分享人昵称',
-            dataIndex: 'sharePersonNickName',
-            key: 'sharePersonNickName',
+            dataIndex: 'sharePersonName',
+            key: 'sharePersonName',
             align: 'center',
         },
         {

src/pages/activity/drainage/components/RedPacket.jsx

@@ -89,11 +89,11 @@ function RedPacket(props) {
                 <Form.Item label="本次红包预算/元">
                     {getFieldDecorator('budget', {
                         initialValue: data.budget / 100,
-                        // rules: [
-                        //     {
-                        //         type: 'number', message: '123'
-                        //     }
-                        // ],
+                        rules: [
+
+                            { required: true, message: '请设置本次红包预算' },
+
+                        ],
                     },
                     )(
                         <Input type="number" min={0} max={99999} />,
@@ -102,11 +102,17 @@ function RedPacket(props) {
                 <Form.Item label="单个红包金额范围/元">
                     {getFieldDecorator('minPacket', {
                         initialValue: data.minPacket / 100 || 3,
+                        rules: [
+                            { required: true, message: '请设置最小红包值' },
+                        ],
                     })(
                         <InputNumber min={1} max={199} />,
                     )}~
                      {getFieldDecorator('maxPacket', {
                         initialValue: data.maxPacket / 100 || 3,
+                        rules: [
+                            { required: true, message: '请设置最大红包值' },
+                        ],
                     })(
                         <InputNumber min={1} max={199} />,
                     )}
@@ -114,17 +120,23 @@ function RedPacket(props) {
                 <Form.Item label="发放红包个数上限">
                     {getFieldDecorator('limitPacketNum', {
                         initialValue: data.limitPacketNum === -1 ? 0 : data.limitPacketNum,
+                        rules: [
+                            { required: true, message: '请设置发放红包个数上限' },
+                        ],
                     })(
                         <Input type="number" />,
                     )}
                 </Form.Item>
-                <Form.Item label="余额或预算不足时提示文案">
+                {/* <Form.Item label="余额或预算不足时提示文案">
                     {getFieldDecorator('insufficientBalanceTip', {
                         initialValue: data.insufficientBalanceTip || '红包已发送完毕，谢谢您的参与',
+                        rules: [
+                            { required: true, message: '请设置余额或预算不足时提示文案' },
+                        ],
                     })(
                         <Input placeholder="红包已发送完毕，谢谢您的参与" />,
                     )}
-                </Form.Item>
+                </Form.Item> */}
                 {/* font-size:22px;
 font-family:PingFangSC-Medium,PingFang SC;
 font-weight:500;
@@ -132,9 +144,12 @@ color:rgba(102,102,102,1); */}
                 <Row>
                     <Col span={8} style={{ textAlign: 'end', fontSize: '0.13rem', fontWeight: '500', color: 'rgba(102,102,102,1)', padding: '0 0.076rem' }}>配置消息</Col>
                 </Row>
-                <Form.Item label="商品名称" >
+                <Form.Item label="商户名称" >
                     {getFieldDecorator('mchName', {
                         initialValue: data.mchName,
+                        rules: [
+                            { required: true, message: '请设置商户名称' },
+                        ],
                     })(
                         <Input placeholder="{小程序名}" />,
                     )}
@@ -142,6 +157,9 @@ color:rgba(102,102,102,1); */}
                 <Form.Item label="红包祝福语">
                     {getFieldDecorator('blessing', {
                         initialValue: data.blessing,
+                        rules: [
+                            { required: true, message: '请设置红包祝福语' },
+                        ],
                     })(
                         <Input placeholder="祝您中个大红包！" />,
                     )}
@@ -149,6 +167,9 @@ color:rgba(102,102,102,1); */}
                 <Form.Item label="活动名称">
                     {getFieldDecorator('activityName', {
                         initialValue: data.activityName,
+                        rules: [
+                            { required: true, message: '请设置活动名称' },
+                        ],
                     })(
                         <Input placeholder="{活动标题}" />,
                     )}
@@ -156,13 +177,13 @@ color:rgba(102,102,102,1); */}
                 <Form.Item label="备注">
                     {getFieldDecorator('remark', {
                         initialValue: data.remark,
+                        rules: [
+                            { required: true, message: '请设置remark' },
+                        ],
                     })(
                         <Input placeholder="点我拆红包" />,
                     )}
                 </Form.Item>
-
-
-
                 <Form.Item wrapperCol={{ span: 15, offset: 8 }}>
                     <div style={{ width: '190px' }}>
                         <Button type="primary" style={{ marginRight: '20px' }} htmlType="submit">保存</Button>

src/pages/funds/accountfunds/components/RefundOrder.jsx

@@ -84,7 +84,7 @@ function RechargeOrder(props) {
             dataIndex: 'amount',
             key: 'amount',
             align: 'center',
-        render: (x, row) => <><span>{`${row.amount/100}`}</span></>,
+            render: (x, row) => <><span>{`${row.amount / 100}`}</span></>,
         },
         {
             title: '退款创建时间',
@@ -98,6 +98,7 @@ function RechargeOrder(props) {
             dataIndex: 'auditStatus',
             key: 'auditStatus',
             align: 'center',
+            // width: '20%',
             render: (x, row) => <><span>{row.auditStatus == 'checking' ? '已申请' : (row.auditStatus == 'agree' ? '已退款' : '已驳回')}</span></>,
         },
         {
@@ -105,6 +106,7 @@ function RechargeOrder(props) {
             dataIndex: 'auditResult',
             key: 'auditResult',
             align: 'center',
+            width: '20%',
         },
 
         {
@@ -112,7 +114,7 @@ function RechargeOrder(props) {
             dataIndex: 'certificateUrlList',
             key: 'certificateUrlList',
             align: 'center',
-            render: (x, row) => <>{`${row.certificateUrlList == null ? '' :<Navigate onClick={() => openImg(x)}>查看</Navigate> }`}</>,
+            render: (x, row) => <>{row.certificateUrlList == null ? '' : <Navigate onClick={() => openImg(x)}>查看</Navigate>}</>,
         },
         {
             title: '操作',

src/pages/h5SampleManager/h5Sample/addH5.jsx

@@ -182,7 +182,7 @@ const header = props => {
                         ]
                     })(<ImageUploader />)}
                 </Form.Item>
-                <Form.Item label="活动分享语">
+                <Form.Item label="活动分享语" help="可使用{name}代表用户昵称。">
                     {getFieldDecorator('shareTitle', {
                         // initialValue: formsDate.shareTitle,
                         rules: [