bug

src/components/SelectButton/QrcodeType.jsx

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

src/pages/carouselFigure/LiveGroup.jsx

@@ -89,7 +89,7 @@ export default props => {
 
   return (
     <div>
-      <div onClick={() => setVisible(true)}>{group.groupName}</div>
+             <div ><Navigate onClick={() => setVisible(true)}>{group.groupName}</Navigate></div>
       <Modal
         title="请选择"
         visible={visible}

src/pages/carouselFigure/SalesBatchGroup.jsx

@@ -89,7 +89,7 @@ export default props => {
 
   return (
     <div>
-      <div onClick={() => setVisible(true)}>{group.groupName}</div>
+       <div ><Navigate onClick={() => setVisible(true)}>{group.groupName}</Navigate></div>
       <Modal
         title="请选择"
         visible={visible}

src/pages/carouselFigure/SelectActivity.jsx

@@ -92,7 +92,7 @@ export default (props) => {
   return (
 
     <div>
-      <div onClick={() => setVisible(true)}>{activity.title}</div>
+      <div ><Navigate onClick={() => setVisible(true)}>{activity.title}</Navigate></div>
       <Modal
         title="请选择"
         visible={visible}

src/pages/carouselFigure/SelectGroup.jsx

@@ -89,7 +89,7 @@ export default props => {
 
   return (
     <div>
-      <div onClick={() => setVisible(true)}>{group.groupName}</div>
+      <div><Navigate onClick={() => setVisible(true)} >{group.groupName}</Navigate></div>
       <Modal
         title="请选择"
         visible={visible}

src/pages/carouselFigure/SelectH5.1.jsx

@@ -65,7 +65,7 @@ export default props => {
 
   return (
     <div>
-      <div onClick={() => setVisible(true)}>{group.groupName}</div>
+      <div onClick={() => setVisible(true)} style={{ color: 'red' }}>{group.groupName}</div>
       <Modal
         title="请选择"
         visible={visible}

src/pages/carouselFigure/SelectH5.jsx

@@ -94,7 +94,7 @@ export default props => {
 
   return (
     <div>
-      <div onClick={() => setVisible(true)}>{group.groupName}</div>
+      <div ><Navigate onClick={() => setVisible(true)}>{group.groupName}</Navigate></div>
       <Modal
         title="请选择"
         visible={visible}

src/pages/carouselFigure/SelectHelp.jsx

@@ -90,7 +90,7 @@ export default props => {
 
   return (
     <div>
-      <div onClick={() => setVisible(true)}>{help.helpName}</div>
+      <div ><Navigate onClick={() => setVisible(true)}>{help.helpName}</Navigate></div>
       <Modal
         title="请选择"
         visible={visible}

src/pages/carouselFigure/SelectNews.jsx

@@ -85,7 +85,7 @@ export default props => {
 
   return (
     <div>
-      <div onClick={() => setVisible(true)}>{news.newsName}</div>
+      <div ><Navigate onClick={() => setVisible(true)}>{news.newsName}</Navigate></div>
       <Modal
         title="请选择"
         visible={visible}

src/pages/carouselFigure/editAdvertising.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { Modal, message } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
@@ -23,7 +23,7 @@ import LiveGroup from './LiveGroup';
  * @param {*} props
  * @returns
  */
- const createEditor = () => {
+const createEditor = () => {
   let contentVisible = false
   let activityVisible = false
   let newsVisible = false
@@ -34,22 +34,22 @@ import LiveGroup from './LiveGroup';
   let h5Visible = false
   let buildingId = ''
   let cityId = ''
-  let isHaveActive=false
-  let isCanChoose=true
+  let isHaveActive = false
+  let isCanChoose = true
   let isHavePosition = false
 
   const setExtraData = (data) => {
-    if(data.isHaveActive!=undefined){
-      isHaveActive=data.isHaveActive
-      if(!isHaveActive) {
+    if (data.isHaveActive != undefined) {
+      isHaveActive = data.isHaveActive
+      if (!isHaveActive) {
         // data.contentType=null
-        data.buildingId=null
+        data.buildingId = null
       }
     }
 
-    if (data.showPosition == 'index'){
+    if (data.showPosition == 'index') {
       isHavePosition = true;
-    }else{
+    } else {
       isHavePosition = false;
     }
 
@@ -62,16 +62,16 @@ import LiveGroup from './LiveGroup';
     liveVisible = data.contentType === 'live';
     h5Visible = data.contentType === 'h5';
 
-    cityId=data.cityId
+    cityId = data.cityId
     buildingId = data.buildingId
   }
 
   const setExtraData1 = (data) => {
-    console.log(data.buildingId,"data.buildingIddata.buildingId2")
-    if((data.contentType=='h5'  && data.buildingId == null) || data.contentType==''||data.contentType=='nothing' || (data.contentType=='live' && data.buildingId == null)){
-       isHaveActive=false
-    }else{
-       isHaveActive=true
+    console.log(data.buildingId, "data.buildingIddata.buildingId2")
+    if ((data.contentType == 'h5' && data.buildingId == null) || data.contentType == '' || data.contentType == 'nothing' || (data.contentType == 'live' && data.buildingId == null)) {
+      isHaveActive = false
+    } else {
+      isHaveActive = true
     }
 
     contentVisible = data.contentType === 'other';
@@ -86,34 +86,34 @@ import LiveGroup from './LiveGroup';
   }
 
   const handleFormValueChange = (props, changedValues, allValues) => {
-      setExtraData(allValues)
+    setExtraData(allValues)
   }
 
   const XForm = createForm({ onValuesChange: handleFormValueChange })
 
   return (props) => {
-    const [ tab, changeTab ] = useState('basic')
+    const [tab, changeTab] = useState('basic')
     const contentId = props.location.query.contentId
-    const [ data, setData ] = useState({})
+    const [data, setData] = useState({})
+    const formRef = useRef(null);
 
-    if(contentId){
-      isCanChoose=false
-      useEffect(() => {
+    // 查询列表
+    const getDetail = contentId => {
+      request({ ...apis.carsuseFigure.getExtendContent, urlData: { id: contentId } }).then((data) => {
+        setExtraData1(data)
+        setData(data)
+      })
+    }
+    useEffect(() => {
+      if (contentId) {
+        isCanChoose = false
         getDetail(contentId);
-      },[])
-
-      // 查询列表
-      const getDetail = (contentId) => {
-        request({ ...apis.carsuseFigure.getExtendContent,urlData:{id: contentId}}).then((data) => {
-          setExtraData1(data)
-          setData(data)
-        })
+      } else {
+        isCanChoose = true
       }
-    }else{
-      isCanChoose=true
-    }
+    }, [])
 
-    const cancelPage = () =>{
+    const cancelPage = () => {
       router.push({
         pathname: '/carouselFigure/advertisingList',
       });
@@ -124,17 +124,26 @@ import LiveGroup from './LiveGroup';
         label: '是否关联项目',
         name: 'isHaveActive',
         type: FieldTypes.Switch,
-        value:isHaveActive,
+        value: isHaveActive,
         hidden: () => !isCanChoose,
+        props: {
+          onChange: () => {
+            const type = formRef.current.props.form.getFieldValue('contentType')
+            if (formRef.current && (type !== 'live' && type !== 'h5' )) {
+              console.log(formRef.current.props.form.getFieldValue('contentType'), '2222')
+              formRef.current.props.form.resetFields(['contentType', []]);
+            }
+          },
+        },
         rules: [
-          { required: true,message: '是否城市活动' },
+          { required: true, message: '是否城市活动' },
         ],
       },
       {
         label: '发布位置',
         name: 'showPosition',
         type: FieldTypes.Select,
-        value:isHaveActive,
+        value: isHaveActive,
         dict: [{
           label: '首页',
           value: 'index',
@@ -249,13 +258,13 @@ import LiveGroup from './LiveGroup';
         ],
       },
       {
-        label: '是否发布H5',
+        label: '是否发布H5活动',
         name: 'targetId',
         render: <SelectH5 buildingId={() => buildingId} />,
         hidden: () => !h5Visible,
         value: data.targetId,
         rules: [
-          { required: false, message: '请选择发布H5' },
+          { required: true, message: '请选择发布H5' },
         ],
       },
       {
@@ -346,22 +355,22 @@ import LiveGroup from './LiveGroup';
 
     const handleSubmit = val => {
       val.showType = 'screen'
-      if(!isHaveActive&&val.targetId) {
-          if(!val.contentType){
-            val.contentType='h5'
-          }
+      if (!isHaveActive && val.targetId) {
+        if (!val.contentType) {
+          val.contentType = 'h5'
+        }
       }
-      if(!isHaveActive&&!val.targetId){
-        val.contentType=''
+      if (!isHaveActive && !val.targetId) {
+        val.contentType = ''
       }
-      if(contentId){
-        request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: contentId}, data: val,}).then((data) => {
+      if (contentId) {
+        request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: contentId }, data: val, }).then((data) => {
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
-      }else{
-        request({ ...apis.carsuseFigure.addExtendContent, data: val,}).then((data) => {
+      } else {
+        request({ ...apis.carsuseFigure.addExtendContent, data: val, }).then((data) => {
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
@@ -371,9 +380,9 @@ import LiveGroup from './LiveGroup';
 
 
     return (
-      <XForm onSubmit={handleSubmit} onCancel={cancelPage} onValuesChange={handleFormValueChange} fields={fields}></XForm>
+      <XForm wrappedComponentRef={formRef} onSubmit={handleSubmit} onCancel={cancelPage} onValuesChange={handleFormValueChange} fields={fields}></XForm>
     );
-   }
- }
+  }
+}
 
 export default createEditor()

src/pages/channel/newCustomer/index.jsx

@@ -52,6 +52,8 @@ const qrcodelist = props => {
                 targetType: record.targetType,
                 buildingId: record.buildingId,
                 newCustomers: record.newCustomers,
+                startDate,
+                endDate,
             },
         });
     }
@@ -66,6 +68,8 @@ const qrcodelist = props => {
                 targetType: record.targetType,
                 buildingId: record.buildingId,
                 visitNum: record.visitNum,
+                startDate,
+                endDate,
             },
         });
     }
@@ -80,6 +84,8 @@ const qrcodelist = props => {
                 targetType: record.targetType,
                 buildingId: record.buildingId,
                 visitPersons: record.visitPersons,
+                startDate,
+                endDate,
             },
         });
     }
@@ -89,7 +95,7 @@ const qrcodelist = props => {
      */
     const exportExcel = () => {
         // console.log('fieldsValue', ...props.form.getFieldsValue())
-        request({ ...apis.channelList.getIntroductionListExport, params: { channelId: id } })
+        request({ ...apis.channelList.getIntroductionListExport, params: { channelId: id, ...props.form.getFieldsValue(), startDate, endDate } })
             .then(data => {
                 if (!data) {
                     return
@@ -106,6 +112,21 @@ const qrcodelist = props => {
             })
     }
 
+    // 排序
+    const handleTableChange = (pagination, filters, sorter) => {
+        console.log(pagination, filters, sorter)
+        // if (sorter.order === 'ascend') { 
+        //     getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue(), startDate, endDate, asc: sorter.columnKey })
+        // } else if (sorter.order === 'descend') {
+        //     getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue(), startDate, endDate, desc: sorter.columnKey })
+        // } else {
+        //     getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue(), startDate, endDate });
+        // }
+        // sortField, sortOrder
+        // getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue(), startDate, endDate, sorter.columnKey, sorter.order })
+        getList({ channelId: id, ...props.form.getFieldsValue(), startDate, endDate, sortField: sorter.columnKey, sortOrder: sorter.order })
+    };
+
     /**
      *
      *
@@ -118,8 +139,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 == 'house' ? '在线选房' : ''}</span>,
+            render: (text, record) => <span>{text == 'project' ? '项目' : text == 'activity' ? '常规活动' : text == 'help' ? '助力活动' : text == 'group' ? '拼团活动'
+                : text == 'h5' ? 'H5活动' : text == 'live' ? '直播活动' : text == 'news' ? '资讯' : text == 'salesBatch' ? '在线选房' : ''}</span>,
         },
         {
             title: '内容',
@@ -140,6 +161,7 @@ const qrcodelist = props => {
             dataIndex: 'newCustomers',
             key: 'newCustomers',
             align: 'center',
+            sorter: true,
             render: (text, record) => <Navigate onClick={() => toNewuser(record)}>{text}</Navigate>,
 
         },
@@ -148,6 +170,7 @@ const qrcodelist = props => {
             dataIndex: 'visitPersons',
             key: 'visitPersons',
             align: 'center',
+            sorter: true,
             render: (text, record) => <Navigate onClick={() => toPersonNum(record)}>{text}</Navigate>,
 
         },
@@ -156,6 +179,7 @@ const qrcodelist = props => {
             dataIndex: 'visitNum',
             key: 'visitNum',
             align: 'center',
+            sorter: true,
             render: (text, record) => <Navigate onClick={() => toVisitNum(record)}>{text}</Navigate>,
         },
     ];
@@ -277,9 +301,9 @@ const qrcodelist = props => {
                 </Form.Item>
             </Form>
             <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportExcel}>导出</Button>
-            <Table dataSource={data.records} columns={columns} pagination={false} rowKey={r => r.serialNo} />
+            <Table dataSource={data.records} columns={columns} pagination={false} rowKey={r => r.serialNo} onChange={handleTableChange} />
             <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-                <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current} />
+                <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current} scroll={{ y: 500 }} />
             </div>
         </>
     )

src/pages/qrcode/qrcodelist/index.jsx

@@ -18,13 +18,13 @@ const typeName = targetType => {
     // eslint-disable-next-line default-case
     switch (targetType) {
         case 'project': return '项目';
-        case 'activity': return '常规活动';
+        case 'activity': return '报名活动';
         case 'help': return '助力活动';
         case 'group': return '拼团活动';
         case 'h5': return 'H5活动';
         case 'live': return '直播活动';
         case 'news': return '资讯';
-        case 'salesBatch': return '销售批次';
+        case 'salesBatch': return '在线选房';
     }
 }