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

src/pages/house/edit/components/shareRecord.jsx

@@ -14,10 +14,11 @@ const { TextArea } = Input;
 
 const header = (props) => {
   const [ data, setData ] = useState({})
-//   const [page, changePage] = useState({})
+  const [page, changePage] = useState({})
+  const {salesBatchId} = props.salesBatchId
 
   useEffect(() => {
-    getList({ pageNum: 1, pageSize: 10, salesBatchId : 1});
+    getList({ pageNum: 1, pageSize: 10, salesBatchId : props.salesBatchId});
   },[])
 
   // 查询列表
@@ -71,7 +72,7 @@ const header = (props) => {
       dataIndex: 'shareType',
       key: 'shareType',
       align: 'center',
-      render: (x, row) => <span></span>
+      render: (x, row) => <span>{ row.shareType === 'housePoster' ? '海报分享' : '小程序分享' }</span>
     },
     {
       title: '分享内容',
@@ -83,7 +84,7 @@ const header = (props) => {
   ];
   
   const changePageNum = (pageNumber) => {
-      getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+      getList({ pageNum: pageNumber, pageSize: 10, salesBatchId : props.salesBatchId, ...props.form.getFieldsValue() })
   }
 
   // 提交事件
@@ -116,7 +117,7 @@ const handleSubmit = (e, props) => {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('showPosition')(
+          {getFieldDecorator('personType')(
             <Select style={{ width: '180px' }} placeholder="身份">
               <Option value="Realty Consultant">置业顾问</Option>
               <Option value="customer">用户</Option>

src/pages/house/edit/components/visitRecord.jsx

@@ -1,15 +1,153 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload, Table, Pagination } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import moment from 'moment';
 import router from 'umi/router';
 import apis from '../../../../services/apis';
+import BuildSelect from '../../../../components/SelectButton/BuildSelect';
+import AuthButton from '@/components/AuthButton';
+import styles from './style.less';
+import request from '../../../../utils/request';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const { TextArea } = Input;
 
-const VisitRecord = props => {
-  return <div><span>访问记录</span></div>
-}
+const header = (props) => {
+  const [ data, setData ] = useState({})
+  // const [page, changePage] = useState({})
+  const {salesBatchId} = props.salesBatchId
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10, salesBatchId : salesBatchId});
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.house.taHouseVisit, salesBatchId : salesBatchId, params: { ...params },}).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+  
+  const columns = [
+    {
+      title: '头像',
+      align: 'center',
+      render: (text, records) => <img src={records.photoOravatar} width={50} height={50} />,
+    },
+    {
+      title: '昵称',
+      dataIndex: 'nameOrnick',
+      key: 'nameOrnick',
+      align: 'center',
+    },
+    {
+      title: '姓名',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '身份',
+      dataIndex: 'personType',
+      key: 'personType',
+      align: 'center',
+      render: (personType) => <span>{ personType === 'Realty Consultant' ? '置业顾问' : personType === 'customer' ? '用户' : '游客' }</span>
+    },
+    {
+      title: '访问时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (x, row) => <><span>{moment(row.createDate).format('YYYY-MM-DD')}</span></>
+    },
+    {
+      title: '进入场景',
+      dataIndex: 'sceneName',
+      key: 'sceneName',
+      align: 'center',
+      render: (x, row) => <span>{ row.sceneName === 'mini_program_code' ? '扫码进入' : row.sceneName === 'search' ? '自主进入' : '小程序分享进入' }</span>
+    },
+    {
+      title: '分享内容',
+      dataIndex: 'salesBatchName',
+      key: 'salesBatchName',
+      align: 'center',
+      render: (x, row) => <span>{ row.salesBatchName }的房源列表</span>
+    },
+  ];
+  
+  const changePageNum = (pageNumber) => {
+      getList({ pageNum: pageNumber, pageSize: 10, salesBatchId : props.salesBatchId, ...props.form.getFieldsValue() })
+  }
+
+  // 提交事件
+const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values})
+      }
+    });
+  }
 
+   //重置搜索
+   function handleReset() {
+    props.form.resetFields();
+  }
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('shareType')(
+            <Select style={{ width: '180px' }} placeholder="进入场景">
+              <Option value="mini_program_code">扫码进入</Option>
+              <Option value="buddy_share">小程序分享进入</Option>
+              <Option value="search">自主进入</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('showPosition')(
+            <Select style={{ width: '180px' }} placeholder="身份">
+              <Option value="Realty Consultant">置业顾问</Option>
+              <Option value="customer">用户</Option>
+              <Option value="drift">游客</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('phone')(
+            <Input placeholder="手机号"/>
+          )}
+        </Form.Item>
+        <Form.Item>
+        <AuthButton name="admin.extendContent.search" noRight={null}>
+          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+            搜索
+          </Button>
+          </AuthButton>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
+      </div>
+    </>
+  )
+}
+const VisitRecord = Form.create({ name: 'header' })(header);
 export default VisitRecord

src/pages/house/edit/index.jsx

@@ -71,8 +71,8 @@ function EditHouse(props) {
         { (tab === 'share' && <Share salesBatchId={{ salesBatchId: salesBatchData.salesBatchId || (props.location.query && props.location.query.id) }}/>)}
         { (tab === 'preselectionImg' && <PreselectionImg />)}
         { (tab === 'preselectionRecord' && <PreselectionRecord />)}
-        { (tab === 'shareRecord' && <ShareRecord />)}
-        { (tab === 'visitRecord' && <VisitRecord />)}
+        { (tab === 'shareRecord' && <ShareRecord salesBatchId={{ salesBatchId: salesBatchData.salesBatchId || (props.location.query && props.location.query.id) }}/>)}
+        { (tab === 'visitRecord' && <VisitRecord salesBatchId={{ salesBatchId: salesBatchData.salesBatchId || (props.location.query && props.location.query.id) }}/>)}
       </div>
     </>
   )

src/services/apis.js

@@ -1099,6 +1099,11 @@ export default {
     method: 'GET',
     action: 'admin.taHouseShare.get',
   },
+  taHouseVisit:{
+    url: `${prefix}/taHouseVisit`,
+    method: 'GET',
+    action: 'admin.taHouseVisit.get',
+  },
   getTaSalesBatch:{
     url: `${prefix}/taSalesBatch/:id`,
     method: 'get',