Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

src/pages/channel/newCustomer/index.jsx

@@ -118,6 +118,8 @@ const qrcodelist = props => {
             dataIndex: 'targetType',
             key: 'targetType',
             align: 'center',
+        render: (text, record) => <span>{text == 'project' ? '项目' : text == 'activity' ? '常规活动'  : text == 'help' ? '助力活动'  : text == 'group' ? '拼团活动'
+        : text == 'h5' ? 'H5活动' : text == 'live' ? '直播活动': text == 'news' ? '资讯' : text == 'salesBatch' ? '销售批次' : ''}</span>,
         },
         {
             title: '内容',
@@ -256,7 +258,7 @@ const qrcodelist = props => {
                         value={dateRange}
                         onChange={(_dates, dateStrings) => onChangetime(_dates, dateStrings)}
                         allowClear={false}
-                    />,
+                    />
 
                 </Form.Item>
                 <Form.Item>