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

src/components/SelectButton/BuildSelect2.jsx

@@ -30,9 +30,9 @@ const BuildingSelect2 = props => {
 
   const getBuildList = e => {
     request({ ...apis.building.buildingSelect, params: { cityId: props.cityId, pageNum: 1, pageSize: 999 } }).then(data => {
-        setData(data)
-        checkValue(data)
-        // 默认选中第一个
+      setData(data)
+      checkValue(data)
+      // 默认选中第一个
     })
   }
 
@@ -46,20 +46,32 @@ const BuildingSelect2 = props => {
     }
   }
 
+  const onChange = (buildingId) => {
+    const building = data.filter(x => buildingId === x.buildingId)[0]
+
+    props.onChange(buildingId, building)
+    // if (props.value) {
+    //   const tempData = data.filter(f => f.buildingId == props.value)
+    //   const va = (tempData.length > 0) ? props.value : '项目已下线，请重新选择项目'
+    //   props.onChange(va)
+
+    // }={props.onChange}building.buildingId
+  }
+
   return (
-      <Select
+    <Select
       showSearch
       value={props.value}
       style={{ width: '300px' }}
       placeholder="请选择项目"
-      onChange={props.onChange}
+      onChange={ onChange}
       filterOption={(input, option) =>
         option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
       }>
-          {data.map(building => (
-            <Option key={building.buildingId} value={building.buildingId}>{building.buildingName}</Option>
-          ))}
-      </Select>
+      {data.map(building => (
+        <Option key={building.buildingId} value={building.buildingId}>{building.buildingName}</Option>
+      ))}
+    </Select>
   )
 }
 export default BuildingSelect2

src/components/SelectButton/QrcodeType.jsx

@@ -18,43 +18,43 @@ const qrcodeType = props => {
     const data = [
         {
             name: '项目',
-            value: 'building',
-            visible: true,
+            value: 'project',
+            visible,
         },
         {
-            name: '报名活动',
+            name: '常规活动',
             value: 'activity',
-            visible: true,
+            visible,
         },
         {
             name: '助力活动',
             value: 'help',
-            visible: true,
+            visible,
         },
         {
             name: '拼团活动',
             value: 'group',
-            visible: true,
+            visible,
         },
         {
             name: 'H5活动',
             value: 'h5',
-            visible,
+            visible: true,
         },
         {
             name: '直播活动',
             value: 'live',
-            visible,
+            visible: true,
         },
         {
             name: '资讯',
             value: 'news',
-            visible: true,
+            visible,
         },
         {
-            name: '在线选房',
-            value: 'house',
-            visible: true,
+            name: '销售批次',
+            value: 'salesBatch',
+            visible,
         },
     ]
 

src/pages/customer/customerlist/index.jsx

@@ -77,7 +77,7 @@ function body(props) {
     if (localStorage.getItem("state")) {
       console.log(localStorage.getItem("state"), 'state')
       if (JSON.parse(localStorage.getItem("state")) == 'private') {
-        const localStorageValue = JSON.parse(localStorage.getItem("priPageParams"))
+        const localStorageValue = JSON.parse(localStorage.getItem('priPageParams'))
         localStorageValue.startCreateDate = localStorageDate(localStorageValue.startCreateDate)
         localStorageValue.endCreateDate = localStorageDate(localStorageValue.endCreateDate)
         props.form.setFieldsValue(localStorageValue);

src/pages/qrcode/qrcodelist/add.jsx

@@ -20,18 +20,24 @@ const header = props => {
 
     const [visible, setVisible] = useState(true)
 
+    const [targetType, setTargetType] = useState()
+
+    const [buildingId, setBuildingId] = useState()
+
+    const [targetName, setTargetName] = useState()
+
     useEffect(() => {
 
     }, [])
 
     function addQrcode(params) {
-        // request({ ...apis.qrcode.add, data: { ...params } }).then((data) => {
-        //     //   setData(data)
-        //     //   router.go(-1)
-        // }).catch((err) => {
-        //     console.log(err)
-        //     message.info(err.msg || err.message)
-        // })
+        request({ ...apis.qrcode.add, data: { ...params } }).then((data) => {
+            //   setData(data)
+            router.go(-1)
+        }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+        })
     }
 
     function handleSubmit(e) {
@@ -39,7 +45,14 @@ const header = props => {
         props.form.validateFields((err, values) => {
             if (!err) {
                 console.log(values)
-                // addQrcode(values)
+                if (targetType === 'project') {
+                    values.targetId = values.buildingId
+                    values.targetName = targetName
+                }else{
+                    values.targetId = values.targetName.id
+                    values.targetName = values.targetName.name
+                }
+                addQrcode(values)
             }
         },
         )
@@ -50,16 +63,38 @@ const header = props => {
         console.log(`switch to ${checked}`);
         setVisible(checked)
     }
-    // qrcode
+
+    // QrcodeType
+    function onTtypeChange(values) {
+        console.log(`onTtypeChange to ${values}`);
+        setTargetType(values)
+        // props.form.setFields({
+        //     targetiId: values.id,
+        // })
+    }
+
+    // BuildingChange
+    function onBuildingChange(values, data) {
+        console.log(`onBuildingChange to ${values}`, data);
+        setBuildingId(values)
+        setTargetName(data.buildingName)
+    }
+
+    // BuildingChange
+    function onTargetName(values, data) {
+        console.log(`onTargetName to ${values}`, data);
+
+    }
+
 
     const { getFieldDecorator } = props.form
 
     return (
 
         <>
-            <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+            <Form labelCol={{ span: 8 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
                 <Form.Item label="是否关联项目">
-                    {getFieldDecorator('12', {
+                    {getFieldDecorator('a', {
                         initialValue: true,
                         rules: [{ required: true, message: '' }],
                     })(<Switch onChange={onChange} defaultChecked />)}
@@ -67,18 +102,21 @@ const header = props => {
                 {visible && <Form.Item label="关联项目">
                     {getFieldDecorator('buildingId', {
                         rules: [{ required: true, message: '' }],
-                    })(<BuildSelect />)}
+                    })(<BuildSelect onChange={onBuildingChange} />)}
                 </Form.Item>}
                 <Form.Item label="二维码内容类型">
                     {getFieldDecorator('targetType', {
                         rules: [{ required: true, message: '' }],
-                    })(<QrcodeType visible={visible} ></QrcodeType>)}
+                    })(<QrcodeType visible={visible} onChange={onTtypeChange}></QrcodeType>)}
                 </Form.Item>
-                <Form.Item label="二维码内容">
+                {targetType !== 'project' && <Form.Item label="二维码内容">
                     {getFieldDecorator('targetName', {
                         rules: [{ required: true, message: '' }],
-                    })(<QrText />)}
-                </Form.Item>
+                    })(<QrText targetType={targetType} buildingId={buildingId} onChange={onTargetName}/>)}
+                </Form.Item>}
+                {targetType === 'project' && <div>
+                    {getFieldDecorator('targetName')}
+                </div>}
                 <Form.Item label="是否关联项目">
                     {getFieldDecorator('channelId')(
                         <ChannelSelect />,
@@ -87,7 +125,7 @@ const header = props => {
 
                 <Form.Item wrapperCol={{ span: 15, offset: 8 }}>
                     <div style={{ width: '190px' }}>
-                        <Button type="primary" htmlType="submit">保存</Button>
+                        <Button type="primary" style={{ marginRight: '20px' }} htmlType="submit">立即生成</Button>
                         <Button onClick={() => router.go(-1)} htmlType="submit">取消</Button>
                     </div>
                 </Form.Item>

src/pages/qrcode/qrcodelist/components/qrText.jsx

@@ -2,7 +2,15 @@ import React, { useState, useEffect, useMemo } from 'react';
 import { Button, Form, Modal, Pagination, Table, Input } from 'antd';
 import Navigate from '@/components/Navigate';
 import EditIcon from '@/components/EditIcon';
+import { apis, fetch } from '../../../../utils/request';
 
+const getH5List = fetch(apis.h5Activity.EffectiveList)
+const getActivities = fetch(apis.activity.listSelected)
+const getHelpList = fetch(apis.helpActivity.effectiveList)
+const getGroupList = fetch(apis.groupActivity.EffectiveList)
+const getLiveList = fetch(apis.taliveActivity.taLiveActivity)
+const getNewsList = fetch(apis.news.getList)
+const getSalesBatchList = fetch(apis.house.taSalesBatch)
 
 const name = '324'
 
@@ -16,21 +24,220 @@ const qrText = props => {
     const {
         value,
         onChange,
+        targetType,
+        buildingId,
         ...rest
-      } = props;
-    // const [data, setData] = useState([])
+    } = props;
+    const [data, setData] = useState([])
     const [visible, setVisible] = useState(false);
     const [info, setInfo] = useState({ title: value });
 
+    // activity
+    const getActivitiesData = e => getActivities({
+        params: {
+            buildingId,
+            pageNum: 1,
+            pageSize: 999,
+            activityStatus: 2,
+            name: e,
+        },
+    }).then(data => {
+        const list = []
+
+        let obj = {};
+        data.list.map(item => {
+            obj = item;
+            obj['name'] = item['title'];
+            obj['id'] = item['dynamicId'];
+            delete obj['title'];
+            delete obj['dynamicId'];
+            list.push(obj)
+        })
+        setData(list)
+    })
+
+    // help
+    const getHelpData = e => getHelpList({
+        params: {
+            buildingId,
+            pageNum: 1,
+            pageSize: 999,
+            status: 1,
+            name: e,
+        },
+    }).then(data => {
+        const list = []
+
+        let obj = {};
+        data.records.map(item => {
+            obj = item;
+            obj['name'] = item['title'];
+            obj['id'] = item['helpActivityId'];
+            delete obj['title'];
+            delete obj['helpActivityId'];
+            list.push(obj)
+        })
+        setData(list)
+
+    })
+
+    //  group
+    const getGroupData = e => getGroupList({
+        params: {
+            buildingId,
+            pageNum: 1,
+            pageSize: 999,
+            status: 1,
+            name: e,
+        },
+    }).then(data => {
+        const list = []
+
+        let obj = {};
+        data.records.map(item => {
+            obj = item;
+            obj['name'] = item['activityName'];
+            delete obj['activityName'];
+            obj['id'] = item['groupActivityId'];
+            delete obj['groupActivityId'];
+            
+            list.push(obj)
+        })
+        setData(list)
+    })
+
+    // h5
+    const getH5Data = e => getH5List({
+        params: {
+            pageNum: 1,
+            pageSize: 999,
+            isMiniapp: 1,
+            status: 1,
+            buildingId,
+            name: e,
+        },
+    }).then(data => {
+        const list = []
+
+        let obj = {};
+        data.records.map(item => {
+            obj = item;
+            obj['id'] = item['drainageId'];
+            delete obj['drainageId'];
+            
+            list.push(obj)
+        })
+        setData(list)
+        // updateGroup(buildingId ? undefined : value);
+    })
+
+    //  live
+    const getLiveData = e => getLiveList({
+        params: {
+            buildingId,
+            pageNum: 1,
+            pageSize: 999,
+            status: 1,
+            liveActivityTitle: e,
+        },
+    }).then(data => {
+        const list = []
+        let obj = {};
+        data.records.map(item => {
+            obj = item;
+            obj['name'] = item['liveActivityTitle'];
+            delete obj['liveActivityTitle'];
+            obj['id'] = item['liveActivityId'];
+            delete obj['liveActivityId'];
+            list.push(obj)
+        })
+
+        
+        setData(list)
+    })
+
+    // news
+    const getNewsData = e => getNewsList({
+        params: {
+            buildingId,
+            pageNum: 1,
+            pageSize: 999,
+            newsStatus: 0,
+            title: e,
+        },
+    }).then(data => {
+        const list = []
+
+        let obj = {};
+        data.records.map(item => {
+            obj = item;
+            obj['name'] = item['newsName'];
+            delete obj['newsName'];
+            obj['id'] = item['newsId'];
+            delete obj['newsId'];
+            list.push(obj)
+        })
+
+        
+        setData(list)
+    })
+
+    // salesBatch
+    const getSalesBatchData = e => getSalesBatchList({
+        params: {
+            buildingId,
+            pageNum: 1,
+            pageSize: 999,
+            status: 1,
+            salesBatchName: e,
+        },
+    }).then(data => {
+        const list = []
+
+        let obj = {};
+        data.records.map(item => {
+            obj = item;
+            obj['name'] = item['salesBatchName'];
+            delete obj['salesBatchName'];
+            obj['id'] = item['salesBatchId'];
+            delete obj['salesBatchId'];
+            list.push(obj)
+        })
+        setData(list)
+        // salesBatchNamesalesBatchId
+    })
+
+    // getNewsList
+
     useEffect(() => {
-        // value?useState
-    }, [])
+        console.log(targetType, buildingId, '234234')
+        // eslint-disable-next-line default-case
+
+        getData()
+    }, [targetType, buildingId])
+
+    const getData = e => {
+        // eslint-disable-next-line default-case
+        switch (targetType) {
+            // case 'project': { getActivitiesData(e); break; }
+            case 'activity': { getActivitiesData(e); break; }
+            case 'help': { getHelpData(e); break; }
+            case 'group': { getGroupData(e); break; }
+            case 'h5': { getH5Data(e); break; }
+            case 'live': { getLiveData(e); break; }
+            case 'news': { getNewsData(e); break; }
+            case 'salesBatch': { getSalesBatchData(e); break; }
+        }
+    }
+
 
     function handleSubmit(e) {
+
         e.preventDefault();
         props.form.validateFields((err, values) => {
             if (!err) {
                 console.log(values)
+                getData(values.name)
             }
         }
         )
@@ -39,19 +246,18 @@ const qrText = props => {
     const onChoice = e => {
         setInfo(e)
         setVisible(false)
-        onChange(e.id)
+        onChange(e)
     }
 
     const columns = [
 
         {
             title: '标题',
-            dataIndex: 'title',
-            key: 'title',
+            dataIndex: 'name',
+            key: 'name',
             align: 'center',
 
         },
-
         {
             title: '操作',
             dataIndex: '',
@@ -66,7 +272,7 @@ const qrText = props => {
 
     return (
         <>
-            <div>{info.title} <Navigate onClick={() => setVisible(true)}>请选择</Navigate></div>
+            <div onClick={() => setVisible(true)}>{info.name} {!info.name && <Navigate >请选择</Navigate>}</div>
 
             <Modal
                 title="请选择"
@@ -77,7 +283,7 @@ const qrText = props => {
             >
                 <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
                     <Form.Item>
-                        {getFieldDecorator('contractTemplateName')(
+                        {getFieldDecorator('name')(
                             <Input placeholder="请输入标题" />,
                         )}
                     </Form.Item>
@@ -86,7 +292,7 @@ const qrText = props => {
                         {/* <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button> */}
                     </Form.Item>
                 </Form>
-                <Table columns={columns} dataSource={data} pagination={false} />
+                <Table columns={columns} dataSource={data} />
                 {/* <Pagination defaultCurrent={1} total={dataInfo.total} onChange={e => changePageNum(e)} current={dataInfo.current} /> */}
             </Modal>
         </>

src/pages/qrcode/qrcodelist/dataRecord.jsx

@@ -3,9 +3,7 @@ import { Input, Menu, Dropdown, Button, Icon, Modal, message, Table, Divider, Ta
 import router from 'umi/router';
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
-import Visitors from './table/visitors'
-import VisitNum from './table/visitNum'
-import Newuser from './table/newuser'
+import Tables from './table'
 import moment from 'moment';
 
 const { TabPane } = Tabs;
@@ -14,22 +12,24 @@ const { TabPane } = Tabs;
 
 const DataRecord = props => {
 
+    const id = props.location.query.id
+
     const [tab, setTab] = useState('1')
     const [data, setData] = useState({})
     const [showHelp, setShowHelp] = useState(false)
 
     useEffect(() => {
 
-        // getData({ id: id, type: type })
+        getStatisticData({ qrCodeId: id })
 
     }, [])
 
-    const getData = (params) => {
+    const getStatisticData = (params) => {
 
-        // request({ ...apis.activityDataStatis.getStatisticData, params: { ...params, } }).then((data) => {
-        //     console.log(data)
-        //     setData(data || {})
-        // })
+        request({ ...apis.qrcode.getStatisticData, params: { ...params } }).then(data => {
+            console.log(data)
+            setData(data)
+        })
     }
 
     function tabsCallback(e) {
@@ -40,21 +40,21 @@ const DataRecord = props => {
     return <>
         <div>
             <div>
-            <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
-          <Modal
-            title="指标说明（数据会存在一定时间延迟）"
-            centered
-            visible={showHelp}
-            footer={null}
-            onCancel={() => setShowHelp(false)}
-          >
-              <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>新增注册用户：</p>
-            <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过当前二维码授权手机号的总人数</p>
-            <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问人数：</p>
-            <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过当前二维码访问小程序的总人数</p>
-            <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问次数：</p>
-            <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过当前二维码访问小程序的总次数</p>
-          </Modal>
+                <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
+                <Modal
+                    title="指标说明（数据会存在一定时间延迟）"
+                    centered
+                    visible={showHelp}
+                    footer={null}
+                    onCancel={() => setShowHelp(false)}
+                >
+                    <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>新增注册用户：</p>
+                    <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过当前二维码授权手机号的总人数</p>
+                    <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问人数：</p>
+                    <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过当前二维码访问小程序的总人数</p>
+                    <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问次数：</p>
+                    <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过当前二维码访问小程序的总次数</p>
+                </Modal>
                 <Button style={{ float: 'right', zIndex: 1 }} onClick={() => router.go(-1)}>
                     返回
                </Button>
@@ -89,17 +89,18 @@ const DataRecord = props => {
         </div>
         <div>
             <Tabs type="card" value={tab} buttonStyle="solid" onChange={e => tabsCallback(e)}>
-                <TabPane tab="访问人数" key="1" ></TabPane>
-                <TabPane tab="访问次数" key="2" ></TabPane>
-                <TabPane tab="新增注册用户" key="3" ></TabPane>
+                <TabPane tab="访问人数" key="visitors" ></TabPane>
+                <TabPane tab="访问次数" key="visitNum" ></TabPane>
+                <TabPane tab="新增注册用户" key="newuser" ></TabPane>
             </Tabs>
             <div style={{ marginTop: '20px' }}>
+                <Tables id={id} type={tab} />
                 {/* 访问人数 */}
-                {(tab === '1' && <Visitors />)}
+                {/* {(tab === '1' && <Tables id={id} type="visitors"/>)} */}
                 {/* 访问次数 */}
-                {(tab === '2' && <VisitNum />)}
+                {/* {(tab === '2' && <Tables id={id} type="visitors"/>)} */}
                 {/* 新增注册用户 */}
-                {(tab === '3' && <Newuser />)}
+                {/* {(tab === '3' && <Tables id={id} type="visitors"/>)} */}
 
             </div>
         </div>

src/pages/qrcode/qrcodelist/index.jsx

@@ -6,6 +6,8 @@ import AuthButton from '@/components/AuthButton';
 import withActions from '@/components/ActionList';
 import EditIcon from '@/components/EditIcon';
 import Navigate from '@/components/Navigate';
+import QrcodeType from '@/components/SelectButton/QrcodeType'
+import { ConfirmButton } from '@/components/ModalButton';
 import styles from '../../style/GoodsList.less';
 import BuildSelect from '@/components/SelectButton/BuildSelect'
 import ChannelSelect from '@/components/SelectButton/channelSelect'
@@ -13,27 +15,60 @@ import apis from '../../../services/apis';
 import request from '../../../utils/request';
 
 // import RaiseHelpDoc from '../edit/components/RaiseHelpDoc';
+const typeName = targetType => {
+    // eslint-disable-next-line default-case
+    switch (targetType) {
+        case 'project': return '项目';
+        case 'activity': return '常规活动';
+        case 'help': return '助力活动';
+        case 'group': return '拼团活动';
+        case 'h5': return 'H5活动';
+        case 'live': return '直播活动';
+        case 'news': return '资讯';
+        case 'salesBatch': return '销售批次';
+    }
+}
+// const typeName = {
+//     project: '项目',
+//     activity: '常规活动',
+//     help: '常规活动',
+//     group: '拼团活动',
+//     h5: 'H5活动',
+//     live: '直播活动',
+//     news: '资讯',
+//     salesBatch: '销售批次',
+// }
+
 
-const data = [{
-    id: '1',
-}]
 
 const qrcodelist = props => {
-    // const [data, setData] = useState([])
+    const [data, setData] = useState([])
     const [showHelp, setShowHelp] = useState(false)
+    const [qrcodeList, setQrcodeList] = useState([])
 
-    // 查询列表
-    //   const getList = params => {
-    //     request({ ...apis.taEcontract.listContractTemplate, params: { ...params } }).then(data => {
-    //       console.log(data)
-    //       setData(data)
-    //     })
-    //   }
 
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    //   useEffect(() => {
-    //     getList({ pageNum: 1, pageSize: 10 });
-    //   }, [])
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 });
+    }, [])
+
+    // 查询列表
+    const getList = params => {
+        request({ ...apis.qrcode.list, params: { ...params } }).then(data => {
+            console.log(data)
+            setData(data)
+        })
+    }
+
+    const batchDelete = () => {
+        request({ ...apis.qrcode.batchDelete, data: qrcodeList, }).then((data) => {
+            message.info("操作成功")
+            getList({ pageNum: 1, pageSize: 10 });
+        }).catch((err) => {
+            // message.info(err.msg)
+        })
+    }
+
 
     const toAdd = () => {
         router.push({
@@ -41,9 +76,11 @@ const qrcodelist = props => {
         });
     }
 
-    const toDataRecord = () => {
+    const toDataRecord = (id) => {
+        console.log(id)
         router.push({
             pathname: '/qrcode/qrcodelist/dataRecord',
+            query: { id, }
         });
     }
 
@@ -56,36 +93,36 @@ const qrcodelist = props => {
     const columns = [
         {
             title: '二维码',
-            dataIndex: 'contractTemplateName',
-            key: 'contractTemplateName',
+            dataIndex: 'qrCodeUrl',
+            key: 'qrCodeUrl',
             align: 'center',
-            render: (x, row) => <Navigate >{row.contractTemplateName}</Navigate>,
+            render: (x, row) => <img src={row.qrCodeUrl} alt="" width="100px"></img >,
         },
         {
             title: '二维码内容',
-            dataIndex: 'createDate',
-            key: 'createDate',
+            dataIndex: 'targetName',
+            key: 'targetName',
             align: 'center',
 
         },
         {
             title: '二维码类型',
-            dataIndex: 'createDate',
-            key: 'createDate',
+            dataIndex: 'targetType',
+            key: 'targetType',
             align: 'center',
-
+            render: (x, row) => <span >{typeName(row.targetType)}</span>,
         },
         {
             title: '关联项目',
-            dataIndex: 'createDate',
-            key: 'createDate',
+            dataIndex: 'buildingName',
+            key: 'buildingName',
             align: 'center',
 
         },
         {
             title: '关联渠道',
-            dataIndex: 'createDate',
-            key: 'createDate',
+            dataIndex: 'channelName',
+            key: 'channelName',
             align: 'center',
 
         },
@@ -94,7 +131,7 @@ const qrcodelist = props => {
             dataIndex: 'createDate',
             key: 'createDate',
             align: 'center',
-
+            render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
         },
         {
             title: '操作',
@@ -104,39 +141,50 @@ const qrcodelist = props => {
             render: withActions((text, record) => [
                 <EditIcon type="download" text="下载二维码" ></EditIcon>,
 
-                <EditIcon type="data" text="数据" onClick={() => toDataRecord(record.id)} ></EditIcon>,
+                <EditIcon type="data" text="数据" onClick={() => toDataRecord(record.qrCodeId)} ></EditIcon>,
 
             ]),
         },
     ];
 
 
-    //   const changePageNum = pageNumber => {
-    //     getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
-    //   }
+    const changePageNum = pageNumber => {
+        getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+    }
+
+
 
     const rowSelection = {
         onChange: (selectedRowKeys, selectedRows) => {
             console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
-            //   setContractList(selectedRows)
+            setQrcodeList(selectedRows)
         },
     };
 
     //   // 提交事件
-    //   const handleSubmit = e => {
-    //     e.preventDefault();
-    //     props.form.validateFields((err, values) => {
-    //       if (!err) {      
-    //         getList({ pageNum: 1, pageSize: 10, ...values })
-    //       }
-    //     });
-    //   }
+    const handleSubmit = e => {
+        e.preventDefault();
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                getList({ pageNum: 1, pageSize: 10, ...values })
+            }
+        });
+    }
 
     //   // 重置搜索
     function handleReset() {
         props.form.resetFields();
         // setTime('')
-        // getList({ pageNum: 1, pageSize: 10 })
+        getList({ pageNum: 1, pageSize: 10 })
+    }
+
+    function before() {
+        if (qrcodeList.length <= 0) {
+            message.info('请至少选择一条数据');
+            return true
+        }
+
+        return false
     }
 
     const { getFieldDecorator } = props.form
@@ -145,27 +193,25 @@ const qrcodelist = props => {
         <>
             <Form layout="inline" style={{ marginBottom: '10px' }} onSubmit={e => handleSubmit(e)}>
                 <Form.Item>
-                    {getFieldDecorator('qrcodetype')(
-                        <Input
-                            placeholder="二维码类型"
-                        />,
+                    {getFieldDecorator('targetType')(
+                        <QrcodeType all visible />,
                     )}
                 </Form.Item>
                 <Form.Item>
-                    {getFieldDecorator('qrcodename')(
+                    {getFieldDecorator('targetName')(
                         <Input
                             placeholder="二维码内容"
                         />,
                     )}
                 </Form.Item>
                 <Form.Item>
-                    {getFieldDecorator('channe')(
+                    {getFieldDecorator('channelId')(
                         <ChannelSelect all />,
                     )}
                 </Form.Item>
                 <Form.Item>
-                    {getFieldDecorator('build')(
-                        <BuildSelect />,
+                    {getFieldDecorator('buildingId')(
+                        <BuildSelect on />,
                     )}
                 </Form.Item>
                 <Form.Item>
@@ -173,10 +219,11 @@ const qrcodelist = props => {
                     <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
                 </Form.Item>
             </Form>
-
+            {/* title="确认删除？" */}
             <Button type="danger" onClick={() => toAdd()}>新增</Button>
-
-            <Button type="primary" style={{ marginLeft: '30px' }}>删除</Button>
+            <ConfirmButton type="link" title="确认删除选中数据？" before={before} onClick={() => batchDelete()}>
+                <Button type="primary" style={{ marginLeft: '30px' }}>删除</Button>
+            </ConfirmButton>
             <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
             <Modal
                 title="相关说明"
@@ -194,10 +241,10 @@ const qrcodelist = props => {
             </Modal>
 
             <Table rowSelection={rowSelection}
-                dataSource={data} columns={columns} pagination={false} rowKey={r => r.id} />
-            {/* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current}/>
-      </div> */}
+                dataSource={data.records} columns={columns} pagination={false} rowKey={r => r.qrCodeId} style={{ marginTop: '20px' }}/>
+            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current} />
+            </div>
         </>
     )
 }

src/pages/qrcode/qrcodelist/table/index.jsx

@@ -0,0 +1,121 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import router from 'umi/router';
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+import AuthButton from '../../../../components/AuthButton';
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
+import moment from 'moment';
+
+const table = props => {
+    const { id, type } = props
+    const [data, setData] = useState({})
+
+
+    useEffect(() => {
+        // console.log(activityId, activityType)
+        // getList({ pageNum: 1, pageSize: 10 })
+
+    }, [])
+
+    const getList = params => {
+        // console.log(params)
+        // request({ ...apis.activityDataStatis.activityVisitNum, params: { ...params, activityId: activityId, activityType: activityType, ...date } }).then(data => {
+        //   console.log(data)
+        //   props.getData()
+        //   setData(data)
+        // }).catch(e => {
+        //   console.log(e)
+        // })
+    }
+
+    const visitNum = {
+        title: '访问时间',
+        dataIndex: 'visitDate',
+        key: 'visitDate',
+        render: (x, row) => <><span>{`${moment(row.visitDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    }
+
+    const visitors = {
+        title: '访问次数',
+        dataIndex: 'visitNum',
+        key: 'visitNum',
+    }
+
+    const newuser = {
+        title: '注册时间',
+        dataIndex: 'visitDate',
+        key: 'visitDate',
+        render: (x, row) => <><span>{`${moment(row.visitDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    }
+
+    const columns = [
+        {
+            title: '姓名',
+            dataIndex: 'nickName',
+            key: 'nickName',
+        },
+        {
+            title: '电话',
+            dataIndex: 'phone',
+            key: 'phone',
+        },
+        {
+            title: '性别',
+            dataIndex: 'gender',
+            key: 'gender',
+        },
+        {
+            title: '归属地',
+            dataIndex: 'province',
+            key: 'province',
+        },
+        // eslint-disable-next-line no-nested-ternary
+        type === 'visitNum' ? visitNum : type === 'visitors' ? visitors : newuser,
+        // visitNum,
+        // visitors,
+        // newuser,
+    ]
+
+
+    const changePageNum = pageNumber => {
+        getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+    }
+
+
+
+    const exportActivityStats = () => {
+
+        // request({ ...apis.activityDataStatis.activityVisitNumExport, params: { activityId: activityId, activityType: activityType, ...props.form.getFieldsValue(), ...date } }).then(data => {
+        //   if (!data) {
+        //     return
+        //   }
+        //   const url = window.URL.createObjectURL(new Blob([data]))
+        //   const link = document.createElement('a')
+        //   link.style.display = 'none'
+        //   link.href = url
+        //   link.setAttribute('download', '访问统计.xlsx')
+        //   document.body.append(link)
+        //   link.click()
+        // }).catch()
+    }
+
+    return <>
+        <div>
+            <div>
+
+
+                <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats} >
+                    导出
+            </Button>
+
+            </div>
+            <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
+            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+            </div>
+        </div>
+    </>
+}
+
+export default table

src/pages/qrcode/qrcodelist/table/visitors.jsx

@@ -42,6 +42,12 @@ const visitors = props => {
   //   }).catch()
   // }
 
+  const visitorsa = {
+    title: '访问次数',
+    dataIndex: 'visitNum',
+    key: 'visitNum',
+  }
+
   const columns = [
     {
       title: '姓名',
@@ -63,13 +69,16 @@ const visitors = props => {
       dataIndex: 'province',
       key: 'province',
     },
-    {
-      title: '访问次数',
-      dataIndex: 'visitNum',
-      key: 'visitNum',
-    },
+    visitorsa,
   ]
 
+  // {
+  //   title: '访问时间',
+  //   dataIndex: 'visitDate',
+  //   key: 'visitDate',
+  //   render: (x, row) => <><span>{`${moment(row.visitDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+  // },
+
 
   const changePageNum = pageNumber => {
     getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })

src/services/apis.js

@@ -1818,15 +1818,23 @@ export default {
   qrcode: {
     list: {
       method: 'GET',
-      url: `${prefix}/activityStatistical/total`,
+      url: `${prefix}/listQrCode`,
       action: 'admin.contract.list.get',
     },
     add: {
       method: 'post',
-      url: `${prefix}/taQrcode/:id`,
+      url: `${prefix}/taQrcode`,
       action: 'admin.qrcode.add.post',
     },
-
-
+    batchDelete: {
+      method: 'DELETE',
+      url: `${prefix}/qrCode/batchDelete`,
+      action: 'admin.qrcode.batchDelete.DELETE',
+    },
+    getStatisticData: {
+      method: 'GET',
+      url: `${prefix}/qrCode/getStatisticData`,
+      action: 'admin.qrcode.getStatisticData.get',
+    },
   },
 }