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

src/components/SelectButton/QrcodeType.jsx

@@ -52,7 +52,7 @@ const qrcodeType = props => {
         },
         {
             name: '在线选房',
-            value: 'salesBatch',
+            value: 'house',
             visible,
         },
     ]

src/pages/carouselFigure/advertisingList.jsx

@@ -68,8 +68,8 @@ const header = (props) => {
       dataIndex: 'contentType',
       key: 'contentType',
       align: 'center',
-      render: (contentType) => <span>{contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' :
-        contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : contentType === 'salesBatch' ? '销售批次详情' : contentType === 'live' ? '直播活动详情' : '无'}</span>
+      render: (contentType) => <span>{contentType === 'project' ? '项目' : contentType === 'activity' ? '报名活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' :
+        contentType === 'help' ? '助力活动' : contentType === 'group' ? '拼团活动' : contentType === 'h5' ? 'H5活动' : contentType === 'salesBatch' ? '在线选房' : contentType === 'live' ? '直播活动' : '无'}</span>
     },
     {
       title: '发布位置',
@@ -232,12 +232,14 @@ const header = (props) => {
         <Form.Item>
           {getFieldDecorator('contentType')(
             <Select style={{ width: '180px' }} placeholder="类型">
-              <Option value="activity">活动</Option>
               <Option value="project">项目</Option>
               <Option value="news">资讯</Option>
-              <Option value="help">助力</Option>
-              <Option value="group">拼团</Option>
-              <Option value="h5">H5</Option>
+              <Option value="activity">报名活动</Option>
+              <Option value="help">助力活动</Option>
+              <Option value="group">拼团活动</Option>
+              <Option value="h5">H5活动</Option>
+              <Option value="live">直播活动</Option>
+              <Option value="salesBatch">在线选房</Option>
               <Option value="nothing">无</Option>
             </Select>,
           )}

src/pages/channel/newCustomer/index.jsx

@@ -119,7 +119,7 @@ const qrcodelist = props => {
             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>,
+        : text == 'h5' ? 'H5活动' : text == 'live' ? '直播活动': text == 'news' ? '资讯' : text == 'house' ? '在线选房' : ''}</span>,
         },
         {
             title: '内容',