manage

estateagents-admin-manager/src/pages/house/raise/edit/components/BasicHeat/index.jsx

@@ -0,0 +1,56 @@
+import React, { PureComponent, useState, useEffect } from 'react'
+import { Modal, Row, Col, Table, Pagination, Button, Form, Input, Select, message } from 'antd'
+import EnDash from '../EnDash'
+import AuthButton from '@/components/AuthButton';
+import request from '../../../../../../utils/request';
+import apis from '../../../../../../services/apis';
+import Style from './style.less'
+import { router } from 'umi';
+import HotBlock from '../HotBlock'
+
+const BasicHeat = props => {
+
+  const houseIdList = props.houseId;
+  const salesBatchId = props.salesBatchId;
+
+  function handleSubmit (e) {
+    console.log(houseIdList, salesBatchId)
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err){
+        request({ ...apis.house.batchUpdateRaiseHeat, data: { raiseHeat: values.raiseHeat, houseIdList , salesBatchId: salesBatchId},}).then((data) => {
+          message.info("修改成功")
+          props.onCancel(false)
+          props.onSuccess();
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Modal footer={null} title="批量修改基础热度" visible={props.visible} onCancel={props.onCancel} width={600}>
+        <span>将所选{houseIdList.length}条房源预选基础热度信息修改为</span>
+        <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+          <Form.Item label="基础热度值" labelAlign='left'>
+            {getFieldDecorator('raiseHeat')(<Input placeholder='填写预选基础热度，建议为0' label='left'/>)}
+          </Form.Item>
+          <Form.Item wrapperCol={{ span: 15, offset: 10 }}>
+            <Button type="primary" htmlType="submit" >
+              提交
+            </Button>
+          </Form.Item>
+        </Form>
+        
+      </Modal>
+    </>
+  );
+}
+
+const WrappedBase = Form.create({ name: 'BasicHeat' })(BasicHeat);
+
+export default WrappedBase

estateagents-admin-manager/src/pages/house/raise/edit/components/BasicHeat/style.less

@@ -0,0 +1,36 @@
+.article {
+    .section {
+        font-size: 16px;
+        line-height: 1.8em;
+        color: #666;
+
+        & + .section {
+            margin-top: 24px;
+        }
+    }
+
+    .title {
+        font-size: 18px;
+        line-height: 2em;
+        color: #333;
+    }
+
+    .subtitle {
+        font-size: 14px;
+        line-height: 1.6em;
+        color: #999;
+    }
+
+    .flex {
+        display: flex;
+        flex-wrap: wrap;
+
+        .flex-item {
+            margin-top: 16px;
+            margin-right: 8px;
+            flex: none;
+            width: 100px;
+            text-align: center;
+        }
+    }
+}

estateagents-admin-manager/src/pages/house/raise/edit/components/BatchRaise/BatchDel.jsx

@@ -0,0 +1,55 @@
+import React, { PureComponent, useState, useEffect } from 'react'
+import { Modal, Row, Col, Table, Pagination, Button, Form, Input,message } from 'antd'
+import EnDash from '../EnDash'
+import AuthButton from '@/components/AuthButton';
+
+import Style from './style.less'
+import HotBlock from '../HotBlock'
+import apis from '../../../../../../services/apis';
+import request from '../../../../../../utils/request';
+
+const BatchDel = props => {
+  const taRaiseRecords = props.houseIds;
+  function handleSubmit (e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err){
+        request({ ...apis.house.batchDeleteRaiseRecord, data: { ...values,taRaiseRecords }, }).then((data) => {
+          message.info("保存成功")
+          props.onSuccess(false);
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Modal footer={null} title="批量删除" visible={props.visible} onCancel={props.onCancel} width={600}>
+        <span style={{textAlign:'center'}}>将所选{taRaiseRecords.length}条认筹记录批量删除？</span>
+        <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+          <Form.Item wrapperCol={{ span: 15, offset: 10 }}>
+            <Button type="primary" htmlType="submit" >
+              提交
+            </Button>
+          </Form.Item>
+        </Form>
+        <div>
+          <font>警告：</font><br/>
+          <font>1.删除功能建议仅用于删除测试数据，正常业务数据使用作废功能。</font><br/>
+          <font>2.删除前请确认缴退费业务是否全部处理完成。</font><br/>
+          <font>3.若认筹单中含认筹人锁定的房源，删除认筹单后会解锁此房源。</font><br/>
+          <font>4.请优先使用作废操作。删除数据可能会导致关联业务异常。</font>
+        </div>
+        
+      </Modal>
+    </>
+  );
+}
+
+const WrappedBase = Form.create({ name: 'BatchDel' })(BatchDel);
+
+export default WrappedBase

estateagents-admin-manager/src/pages/house/raise/edit/components/BatchRaise/BatchInvalid.jsx

@@ -0,0 +1,59 @@
+import React, { PureComponent, useState, useEffect } from 'react'
+import { Modal, Row, Col, Table, Pagination, Button, Form, Input,message } from 'antd'
+import EnDash from '../EnDash'
+import AuthButton from '@/components/AuthButton';
+
+import Style from './style.less'
+import HotBlock from '../HotBlock'
+import apis from '../../../../../../services/apis';
+import request from '../../../../../../utils/request';
+
+const BatchInvalid = props => {
+  const taRaiseRecords = props.houseIds;
+  function handleSubmit (e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err){
+        request({ ...apis.house.batchInvalidRaiseRecord, data: { ...values,taRaiseRecords },}).then((data) => {
+          message.info("保存成功")
+          props.onSuccess(false);
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Modal footer={null} title="批量作废" visible={props.visible} onCancel={props.onCancel} width={600}>
+        <span>所选XX条数据中，符合作废条件的有YY条，不符合作废条件的有ZZ条。确认将YY条数据作废?</span>
+        <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+          <Form.Item label="作废原因" labelAlign='left'>
+            {getFieldDecorator('invalidReason', {
+              rules: [{ required: true, message: ' 请输入作废原因' }],
+            })(<Input label='left'/>)}
+          </Form.Item>
+          <Form.Item wrapperCol={{ span: 15, offset: 10 }}>
+            <Button type="primary" htmlType="submit" >
+              提交
+            </Button>
+          </Form.Item>
+        </Form>
+        <div>
+          <font style={{color:'#999'}}>作废条件：未作废的认筹单。</font><br/>
+          <font style={{color:'#999'}}>注意：</font><br/>
+          <font style={{color:'#999'}}>作废的认筹单不可继续缴费，如果需要退费，仍然可以点击退费或批量线下退费。</font><br/>
+          <font style={{color:'#999'}}>认筹单作废后，会释放已锁定的房源。</font>
+        </div>
+        
+      </Modal>
+    </>
+  );
+}
+
+const WrappedBase = Form.create({ name: 'BatchInvalid' })(BatchInvalid);
+
+export default WrappedBase

estateagents-admin-manager/src/pages/house/raise/edit/components/BatchRaise/BatchPay.jsx

@@ -0,0 +1,76 @@
+import React, { PureComponent, useState, useEffect } from 'react'
+import { Modal, Row, Col, Table, Pagination, Button, Form, Input, Select,message } from 'antd'
+import EnDash from '../EnDash'
+import AuthButton from '@/components/AuthButton';
+
+import Style from './style.less'
+import HotBlock from '../HotBlock'
+import apis from '../../../../../../services/apis';
+import request from '../../../../../../utils/request';
+
+const BatchPay = props => {
+  const taRaiseRecords = props.houseIds;
+
+  function handleSubmit (e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err){
+        request({ ...apis.house.batchPayOfflineRaiseRecord, data: { ...values, taRaiseRecords },}).then((data) => {
+          message.info("保存成功")
+          props.onSuccess(false)
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Modal footer={null} title="批量线下缴费" visible={props.visible} onCancel={props.onCancel} width={600}>
+        <span>所选XX条数据中，符合批量设置线下缴费条件的有YY条，不符合条件的有ZZ条。确认将YY条数据设置为：</span>
+        <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+          <Form.Item label="缴费状态" labelAlign='left'>
+            {getFieldDecorator('payStatus', {initialValue:'paid'})(
+                <Select style={{width: '120px'}} disabled>
+                <Option value="paid">已缴费</Option>
+              </Select>,
+              )}
+          </Form.Item>
+          <Form.Item label="缴费方式" labelAlign='left'>
+            {getFieldDecorator('payType', {initialValue:'offLine'})(
+                <Select style={{width: '120px'}} disabled>
+                <Option value="offLine">线下缴费</Option>
+              </Select>,
+              )}
+          </Form.Item>
+          <Form.Item label="线下缴费结果" labelAlign='left'>
+            {getFieldDecorator('payStatus', {initialValue:'paid'})(
+                <Select style={{width: '120px'}} disabled>
+                <Option value="paid">成功</Option>
+              </Select>,
+              )}
+          </Form.Item>
+          <Form.Item wrapperCol={{ span: 15, offset: 9 }}>
+            <Button type="primary" htmlType="submit" >
+              确定
+            </Button>
+          </Form.Item>
+        </Form>
+        <div>
+          <font style={{color:'#999'}}>可批量设置线下缴费的认筹单条件必须满足以下全部：</font><br/>
+          <font style={{color:'#999'}}>0.认筹单未作废。</font><br/>
+          <font style={{color:'#999'}}>1.当前销售批次缴费方式包含但不限于线下缴费。</font><br/>
+          <font style={{color:'#999'}}>2.认筹单缴费状态为未缴费。</font>
+        </div>
+        
+      </Modal>
+    </>
+  );
+}
+
+const WrappedBase = Form.create({ name: 'BatchPay' })(BatchPay);
+
+export default WrappedBase

estateagents-admin-manager/src/pages/house/raise/edit/components/BatchRaise/BatchRefund.jsx

@@ -0,0 +1,82 @@
+import React, { PureComponent, useState, useEffect } from 'react'
+import { Modal, Row, Col, Table, Pagination, Button, Form, Input, Select,message } from 'antd'
+import EnDash from '../EnDash'
+import AuthButton from '@/components/AuthButton';
+
+import Style from './style.less'
+import HotBlock from '../HotBlock'
+import apis from '../../../../../../services/apis';
+import request from '../../../../../../utils/request';
+
+const BatchRefund = props => {
+  const taRaiseRecords = props.houseIds;
+
+  function handleSubmit (e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err){
+        request({ ...apis.house.batchRefundOfflineRaiseRecord, data: { ...values,taRaiseRecords },}).then((data) => {
+          message.info("保存成功")
+          props.onSuccess(false);
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Modal footer={null} title="批量线下退费" visible={props.visible} onCancel={props.onCancel} width={600}>
+        <span>所选XX条数据中，符合批量设置线下缴费条件的有YY条，不符合条件的有ZZ条。确认将YY条数据设置为：</span>
+        <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+          <Form.Item label="退费状态" labelAlign='left'>
+            {getFieldDecorator('payStatus', {initialValue:'refunded'})(
+                <Select style={{width: '120px'}} disabled>
+                <Option value="refunded">已退费</Option>
+              </Select>,
+              )}
+          </Form.Item>
+          <Form.Item label="退费方式" labelAlign='left'>
+            {getFieldDecorator('payType', {initialValue:'offLine'})(
+                <Select style={{width: '120px'}} disabled>
+                <Option value="offLine">线下退费</Option>
+              </Select>,
+              )}
+          </Form.Item>
+          <Form.Item label="退费结果" labelAlign='left'>
+            {getFieldDecorator('payStatus', {initialValue:'refunded'})(
+                <Select style={{width: '120px'}} disabled>
+                <Option value="refunded">成功</Option>
+              </Select>,
+              )}
+          </Form.Item>
+          <Form.Item label="退费原因" labelAlign='left'>
+            {getFieldDecorator('refundReason',{
+              rules: [{ required: true, message: ' 请输入作废原因' }],
+              })(
+                <Input ></Input>
+              )}
+          </Form.Item>
+          <Form.Item wrapperCol={{ span: 15, offset: 9 }}>
+            <Button type="primary" htmlType="submit" >
+              确定
+            </Button>
+          </Form.Item>
+        </Form>
+        <div>
+          <font style={{color:'#999'}}>可批量设置线下退费的认筹单条件必须满足以下全部：</font><br/>
+          <font style={{color:'#999'}}>1.认筹单缴费状态为已缴费。</font><br/>
+          <font style={{color:'#999'}}>2.退费状态为未退费。</font><br/>
+        </div>
+        
+      </Modal>
+    </>
+  );
+}
+
+const WrappedBase = Form.create({ name: 'BatchRefund' })(BatchRefund);
+
+export default WrappedBase

estateagents-admin-manager/src/pages/house/raise/edit/components/BatchRaise/Refund.jsx

@@ -0,0 +1,114 @@
+import React, { PureComponent, useState, useEffect } from 'react'
+import { Modal, Row, Col, Table, Pagination, Button, Form, Input, message, Select } from 'antd'
+import EnDash from '../EnDash'
+import AuthButton from '@/components/AuthButton';
+
+import Style from './style.less'
+import HotBlock from '../HotBlock'
+import apis from '../../../../../../services/apis';
+import request from '../../../../../../utils/request';
+
+const Refund = props => {
+  const raiseRecordId = props.raiseRecordId;
+  const raiseId = props.raiseId;
+  const [data, setData] = useState([])
+
+  
+
+  useEffect(() => {
+    getList();
+  }, [props,raiseRecordId])
+
+  function getList(params) {
+    request({
+      ...apis.house.taRaiseById,
+      urlData: { id: raiseId }
+    }).then((data) => {
+      setData(data)
+    })
+  }
+
+  function toDecimal2 (x){
+    var f = parseFloat(x);
+    if (isNaN(f)) {
+      return false;
+    }
+    var f = Math.round(x * 100) / 100;
+    var s = f.toString();
+    var rs = s.indexOf('.');
+    if (rs < 0) {
+      rs = s.length;
+      s += '.';
+    }
+    while (s.length <= rs + 2) {
+      s += '0';
+    }
+    return s;
+  }
+  function regFenToYuan(fen){
+    var num = fen;
+    num = fen * 0.01;
+    num += '';
+    var reg = num.indexOf('.') > -1 ? /(\d{1,3})(?=(?:\d{3})+\.)/g : /(\d{1,3})(?=(?:\d{3})+$)/g;
+    num = num.replace(reg, '$1');
+    num = toDecimal2(num)
+    return num
+  }
+  
+  function handleSubmit (e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err){
+        request({ ...apis.house.refund, data: {targetId:raiseRecordId, targetType:"house", refundReason:values.refundReason}, }).then((data) => {
+          console.log('caozuochgegngong')
+            message.info("操作成功，微信退费会有延迟，请在稍后查询认筹单状态")
+            props.onSuccess(false);
+        }).catch((err) => {
+            // message.info(err.msg)
+        })        
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Modal footer={null} title="退款" visible={props.visible} onCancel={props.onCancel} width={600}>
+        <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+          <div><span>当前系统设置认筹金额：{regFenToYuan(data.raisePrice)}元</span></div>
+          <div><span>用户实付金额：{regFenToYuan(data.raisePrice)}元</span></div>
+          <div><span>即将退费金额：{regFenToYuan(data.raisePrice)}元</span></div>
+          <Form.Item label="退费方式" labelAlign='left'>
+              {getFieldDecorator('refundType', {
+                  rules: [{ required: true, message: ' 退款原因' }],initialValue:'onLine'
+                })(
+                <Select style={{width: '120px'}} disabled>
+                  <Option value="onLine">线上退费</Option>
+                </Select>,
+              )}
+          </Form.Item>
+          <Form.Item label="退款原因" labelAlign='left'>
+            {getFieldDecorator('refundReason', {
+              rules: [{ required: true, message: ' 退款原因' }],
+            })(<Input label='left'/>)}
+          </Form.Item>
+          <Form.Item wrapperCol={{ span: 15, offset: 10 }}>
+            <Button type="primary" htmlType="submit" >
+              提交
+            </Button>
+          </Form.Item>
+        </Form>
+        <div>
+          <font style={{color:'#999'}}>支持退费的认筹单：</font><br/>
+          <font style={{color:'#999'}}>1.认筹单缴费状态为已缴费且缴费结果为成功且退费状态为未退费的。</font><br/><br/>
+          <font style={{color:'#999'}}>注意：发起线上退费后需要微信和银行处理，退费是否成功结果请到退费记录中查看</font><br/>
+        </div>
+      </Modal>
+    </>
+  );
+}
+
+const WrappedBase = Form.create({ name: 'Refund' })(Refund);
+
+export default WrappedBase

estateagents-admin-manager/src/pages/house/raise/edit/components/BatchRaise/style.less

@@ -0,0 +1,240 @@
+.SubmitButton {
+    background: rgba(239,39,58,1);
+    border-radius: 7px;
+    border: 0px;
+  }
+  .text {
+    color: rgba(239,39,58,1);
+  }
+  .SelectFrom {
+    width: 180px;
+    background: #ffffff;
+    border-radius: 7px;
+    border: 1px solid #dbdbdb;
+  }
+  .addButton {
+    background: #50be00;
+    border-radius: 4px;
+    border: 0px;
+    margin: 10px 0px;
+  }
+  .cardText {
+    color: #333;
+    display: flex;
+    align-items: center;
+    position: relative;
+    line-height: 1.5;
+    font-size: 0.106rem;
+    margin-bottom: 0.08rem;
+  
+  }
+  .cardItem{
+    color: #666;
+    display: flex;
+    align-items: center; 
+    line-height: 1.5;
+    font-size: 0.106rem;
+    margin-bottom: 0.08rem; 
+  }
+  .ediText {
+    font-size: 0.106rem;
+    color: #ff925c;
+    line-height: 24px;
+    position: absolute;
+    right: 0;
+  }
+  .title{
+    display: inline-block;
+    width:  0.54rem;
+    justify-content: space-between;
+    text-align: justify;
+    text-align-last:justify
+  }
+  
+  .address { 
+    width: 400px;
+    height: 24px; 
+    text-overflow: ellipsis; 
+    white-space: nowrap;
+    overflow: hidden;
+  }
+  
+  .pitchButton { 
+    border-color: rgba(255,126,72,1);
+    background-color: rgba(255,126,72,1);
+    color: rgba(255,255,255,1); 
+  }
+  .noButton {
+    border-color: rgba(255,126,72,1);
+    color: rgba(255,126,72,1);
+  }
+  .displayS {
+    display: none;
+  }
+  
+  
+  // 客户详情样式
+  .cardBox{
+    display: flex;
+    .leftBox{
+      width:1000px;
+      min-width:350px;
+      height:1000px;
+      background:rgba(255,255,255,1);
+      box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+      border-radius:8px;
+      display: inline-block;
+      margin-right: 30px;
+      padding: 30px;
+      overflow: hidden;
+    }
+    .rightBox{
+      width:865px;
+      min-width:342px;
+      height:290px;
+      background:rgba(255,255,255,1);
+      // box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+      border-radius:8px;
+      display: inline-block;
+      margin-right: 30px;
+      padding: 30px;
+      overflow: hidden;
+    }
+    .rightBox{
+      width:-webkit-fill-available;
+      height:315px;
+      min-width: 100%;
+      background:rgba(255,255,255,1);
+      // box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+      border-radius:8px;
+      display: inline-block;
+      padding: 30px;
+      overflow: hidden;
+      // position: relative;
+    }
+    .rightBoxCentre{
+      width:865px;
+      height:345px;
+      min-width: 60%;
+      background:rgba(255,255,255,1);
+      box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+      border-radius:8px;
+      display: inline-block;
+      padding: 30px;
+      overflow: hidden;
+      position: relative;
+    }
+    .leftBoxCentre{
+      width:100%;
+      height:345px;
+      background:rgba(255,255,255,1);
+      box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+      border-radius:8px;
+      display: inline-block;
+      padding: 30px;
+      overflow: hidden;
+      position: relative;
+    }
+    .tit{
+      font-size:0.15rem;
+      font-weight:600;
+      color:#222;
+      margin: 10px 0 0 0;
+    }
+    .flexBox{
+      display: flex;
+      align-items: end;
+    }
+    .touxiang{
+      width: 120px;
+      width: 120px;
+      border-radius: 6px;
+      margin: 80px 0 20px 0;
+    }
+    .touxiangphoto{
+      width: 80px;
+      height: 80px;
+      margin: 38px 0 0px 0;
+    }
+    .infoItem{
+      color:#666;
+      font-size: 0.1rem;
+      margin: 0 0 30px 0;
+      
+    }
+    .rightItem{
+      color:#666;
+      font-size: 0.1rem;
+      margin: 0 0 15px 0;
+    }
+    .right{
+      width: 25%;
+      min-width: 1.3rem;
+      margin-left: 0.1rem;
+      padding-top: 0.3rem;
+      // position: absolute;
+      // top:108px;
+      // left:170px;
+    }
+    .rightphone{
+    
+      position: absolute;
+      top:108px;
+      left:170px;
+    }
+    .left{
+      position: absolute;
+      top:108px;
+      left:60%;
+    
+    }
+    .rightInfo{
+      width: 25%;
+      min-width: 1.3rem;
+      margin-right: 0.1rem;
+      padding-top: 0.3rem;
+      // position: absolute;
+      // top:108px;
+      // left:80%;
+    }
+  
+    .Centered{
+      width: 25%;
+      // position: absolute;
+      // top:108px;
+      // left:30%;
+      min-width: 1.3rem;
+      margin: 0 0 15px 0;
+      color:#666;
+      font-size: 0.1rem;
+      padding-top: 0.3rem;
+    }
+  
+    .rightCentered{
+      // position: absolute;
+      // top:108px;
+      // left:55%;
+      width: 25%;
+      min-width: 1.3rem;
+      margin: 0 0 15px 0;
+      padding-top: 0.3rem;
+      color:#666;
+      font-size: 0.1rem;
+    }
+    
+  }
+  .recordBox{
+    width:100%;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    margin-top: 30px;
+    padding: 30px;
+    .tableName{
+      font-size:24px;
+      font-weight:600;
+      color:#222;
+    }
+  }
+  
+  

estateagents-admin-manager/src/pages/house/raise/edit/components/BuildSelect/BuildSelect.jsx

@@ -0,0 +1,77 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { Select } from 'antd';
+import apis from '../../../../../../services/apis';
+import request from '../../../../../../utils/request'
+
+const { Option } = Select;
+
+function usePrevious(props) {
+  const ref = useRef();
+  useEffect(() => {
+    ref.current = props;
+  });
+  return ref.current;
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const BuildingSelect = props => {
+  const [data, setData] = useState([])
+  const [value, setValue] = useState([])
+  const type = props.type
+  const salesBatchId = props.salesBatchId
+
+  useEffect(() => {
+    getBuildList();
+  }, [props.salesBatchId])
+
+
+  const getBuildList = e => {
+    if (salesBatchId && salesBatchId != 'undefine'){
+      request({ ...apis.house.buildingIdBySalesBatchId, urlData:{id: salesBatchId}, params: { pageNum: 1, pageSize: 999 } }).then(data => {
+        setData(data)
+        checkValue(data)
+        // 默认选中第一个
+      })
+    }
+    else{
+      request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).then(data => {
+        setData(data)
+        checkValue(data)
+        // 默认选中第一个
+      })
+    }
+  }
+
+
+  const checkValue = (data) => {
+    if (props.value) {
+      const tempData = data.filter(f => f.buildingId == props.value)
+      const va = (tempData.length > 0) ? props.value : '项目已下线，请重新选择项目'
+      props.onChange(va)
+
+    }
+  }
+
+  return (
+      <Select
+      disabled={type == 'false'?false:true}
+      showSearch
+      value={props.value}
+      style={{ width: '300px' }}
+      placeholder="请选择项目"
+      onChange={props.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>
+  )
+}
+export default BuildingSelect

estateagents-admin-manager/src/pages/house/raise/edit/components/EnDash/index.jsx

@@ -0,0 +1,14 @@
+import React from 'react'
+
+export default function EnDash(props) {
+    const { size = 1, color = '#999', style = {}, ...left } = props
+
+    const newSt = { 
+        ...style,
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+    }
+
+    return <div style={newSt} { ...left }><hr style={{ border: 'none', borderBottom: `${size}px dashed ${color}`, width: '100%' }} /></div>
+}

estateagents-admin-manager/src/pages/house/raise/edit/components/HelpDoc/index.jsx

@@ -0,0 +1,109 @@
+import React, { PureComponent } from 'react'
+import { Modal, Row, Col } from 'antd'
+import EnDash from '../EnDash'
+
+import Style from './style.less'
+import HotBlock from '../HotBlock'
+
+const dataset = [
+  {
+    label: '(0)',
+    value: 0,
+  },
+  {
+    label: '(1)',
+    value: 1,
+  },
+  {
+    label: '(2)',
+    value: 2,
+  },
+  {
+    label: '(3)',
+    value: 3,
+  },
+  {
+    label: '(4)',
+    value: 4,
+  },
+  {
+    label: '(5)',
+    value: 5,
+  },
+  {
+    label: '(6~10)',
+    value: 8,
+  },
+  {
+    label: '(11~20)',
+    value: 15,
+  },
+  {
+    label: '(21~30)',
+    value: 25,
+  },
+  {
+    label: '(31~40)',
+    value: 35,
+  },
+  {
+    label: '(41~50)',
+    value: 45,
+  },
+  {
+    label: '(51~100)',
+    value: 80,
+  },
+  {
+    label: '(101~200)',
+    value: 150,
+  },
+  {
+    label: '(200以上)',
+    value: 201,
+  },
+]
+
+function Cell(props) {
+  return (
+    <Row type="flex" align="middle" gutter={20}>
+      <Col span={2}>{props.left}</Col>
+      <Col span={12}><EnDash /></Col>
+      <Col span={6}>{props.right}</Col>
+    </Row>
+  )
+}
+
+export default function HelpDoc(props) {
+  return (
+    <Modal footer={null} title="相关说明" visible={props.visible} onCancel={props.onCancel} width={800}>
+      <div className={Style.article}>
+        <div className={Style.section}>
+          <div className={Style.title}>1.图例解释：</div>
+          <div>
+            <Cell left="1号楼" right="楼栋/幢" />
+            <Cell left="2单元" right="单元" />
+            <Cell left="3楼" right="楼层" />
+            <Cell left="301" right="房号" />
+            <Cell left="1人" right="预选人数" />
+            <Cell left="234万" right="价格" />
+            <Cell left="A户型" right="户型名" />
+          </div>
+        </div>
+        <div className={Style.section}>
+          <div className={Style.title}>2.预选人数（热度）：</div>
+          <div>每有一位客户预选此房源，热度自动增加1，热度越大说明想购买此房源的用户越多，认筹摇号购买难度越大。</div>
+        </div>
+        <div className={Style.section}>
+          <div className={Style.title}>3.热度指标:</div>
+          <div className={Style.subtitle}>颜色越深代表热度越高。黑底白字代表房源未发布,未发布房源用户不会看到。</div>
+          <div className={Style.flex}>
+            {
+              dataset.map((block) => (<div className={Style['flex-item']} key={block.value}><HotBlock number={block.value}>{block.label}</HotBlock></div>))
+            }
+          </div>
+        </div>
+      </div>
+    </Modal>
+  );
+}

estateagents-admin-manager/src/pages/house/raise/edit/components/HelpDoc/style.less

@@ -0,0 +1,36 @@
+.article {
+    .section {
+        font-size: 16px;
+        line-height: 1.8em;
+        color: #666;
+
+        & + .section {
+            margin-top: 24px;
+        }
+    }
+
+    .title {
+        font-size: 18px;
+        line-height: 2em;
+        color: #333;
+    }
+
+    .subtitle {
+        font-size: 14px;
+        line-height: 1.6em;
+        color: #999;
+    }
+
+    .flex {
+        display: flex;
+        flex-wrap: wrap;
+
+        .flex-item {
+            margin-top: 16px;
+            margin-right: 8px;
+            flex: none;
+            width: 100px;
+            text-align: center;
+        }
+    }
+}

estateagents-admin-manager/src/pages/house/raise/edit/components/HotBlock/index.jsx

@@ -0,0 +1,40 @@
+import React from 'react'
+import classNames from 'classnames'
+
+import Style from './style.less'
+
+function computeLevel (num) {
+    switch (true) {
+      case num >= 200:
+        return 13;
+      case num > 100:
+        return 12;
+      case num > 50:
+        return 11;
+      case num > 40:
+        return 10;
+      case num > 30:
+        return 9;
+      case num > 20:
+        return 8;
+      case num > 20:
+        return 8;
+      case num > 10:
+        return 7;
+      case num >= 6:
+        return 6;
+      case num > 0:
+        return num;
+      default:
+        return 0;
+    }
+  }
+  
+  export default function HotBlock(props) {
+    const level = computeLevel(props.number)
+
+    const cls = classNames(Style.hotblock, Style[`bkg-${level}`])
+
+    return (<div className={cls}>{props.children}</div>)
+  }
+  

estateagents-admin-manager/src/pages/house/raise/edit/components/HotBlock/style.less

@@ -0,0 +1,46 @@
+
+.hotblock {
+    &.bkg-0 {
+      background:#F8F8F8;
+    }
+    &.bkg-1 {
+      background:#F9DED1;
+    }
+    &.bkg-2 {
+      background:#F6D4C3;
+    }
+    &.bkg-3 {
+      background:#F8C6AD;
+    }
+    &.bkg-4 {
+      background:#FDDBDB;
+    }
+    &.bkg-5 {
+      background:#F9CCCC;
+    }
+    &.bkg-6 {
+      background:#F9B7B7;
+    }
+    &.bkg-7 {
+      background:#FFADAD;
+    }
+    &.bkg-8 {
+      background:#F59683;
+    }
+    &.bkg-9 {
+      background:#F7836C;
+    }
+    &.bkg-10 {
+      background:#F97459;
+    }
+    &.bkg-11 {
+      background:#FC6749;
+    }
+    &.bkg-12 {
+      background:#FD4E2B;
+    }
+    &.bkg-13 {
+      background:#FE2E2E;
+    }
+  }
+  

estateagents-admin-manager/src/pages/house/raise/edit/components/HouseGrid/Floor.jsx

@@ -0,0 +1,21 @@
+import React from 'react'
+import Style from './style.less'
+
+export default function Floor(props) {
+  const { floorName, roomList = [] } = props.dataset || {}
+
+  return (
+    <div className={Style.floor}>
+      <div className={Style['floor-head']}>{floorName}</div>
+      <div className={Style['floor-body']}>
+        {roomList.map((room) => {
+          return (
+            <div className={Style.item} key={room.houseId} >
+              {props.render(room)}
+            </div>
+          )
+        })}
+      </div>
+    </div>
+  );
+}

estateagents-admin-manager/src/pages/house/raise/edit/components/HouseGrid/Room.jsx

@@ -0,0 +1,35 @@
+import React from 'react'
+import classNames from 'classnames'
+import HotBlock from "../HotBlock"
+import Style from './style.less'
+
+export default function Room(props) {
+  console.log(props.dataset, 'propsDataSet')
+  const { roomName, price, apartmentName, status, raiseHeat, raiseRealHeat } = props.dataset || {}
+  let personNum = props.hotType === 1 ? (raiseHeat || 0) : (raiseRealHeat || 0)
+  if (props.hotType === 2){
+    personNum = isNaN(raiseRealHeat) ? 0 : raiseRealHeat
+  }  
+  if (props.hotType === 3) {
+    personNum = !isNaN(raiseHeat) && !isNaN(raiseRealHeat) ?  raiseHeat+raiseRealHeat : isNaN(raiseHeat) && !isNaN(raiseRealHeat) ? raiseRealHeat : !isNaN(raiseHeat) && isNaN(raiseRealHeat) ? raiseHeat : 0
+  }
+
+  const handleClick = () => {
+    if (props.onClick) {
+      props.onClick(props.dataset || {})
+    }
+  }
+
+  const wanY = Number(price - 0)
+
+  return (
+    <HotBlock number={personNum}>
+      <div className={classNames(Style.room, { [`${Style.offline}`]: status !== 1 })} onClick={handleClick}>
+        <div className={Style.warn}>{roomName}</div>
+        <div className={Style.warn}>{`(${personNum === null ? 0 : personNum}人)`}</div>
+        <div className={Style.info}>{`${wanY} 万`}</div>
+        <div className={Style.info}>{apartmentName}</div>
+      </div>
+    </HotBlock>
+  )
+}

estateagents-admin-manager/src/pages/house/raise/edit/components/HouseGrid/Unit.jsx

@@ -0,0 +1,15 @@
+import React from 'react'
+import Style from './style.less'
+
+export default function Unit(props) {
+  const { unitName, floorList = [] } = props.dataset || {}
+
+  return (
+    <div className={Style.unit}>
+      <div className={Style['unit-head']}>{unitName}</div>
+      <div className={Style['unit-body']}>
+        {floorList.map(floor => props.render(floor))}
+      </div>
+    </div>
+  )
+}

estateagents-admin-manager/src/pages/house/raise/edit/components/HouseGrid/index.js

@@ -0,0 +1,37 @@
+import React from 'react'
+import { PageHeader, Card } from 'antd';
+import Floor from "./Floor";
+import Room from "./Room";
+import Unit from './Unit';
+
+
+export default function(props) {
+  const blockList = props.dataset || []
+  
+  // 仅仅是一个函数, 不是函数式组件
+  function renderRoom(room) {
+    return (<Room dataset={room} hotType={props.hotType} />)
+  }
+
+  // 仅仅是一个函数, 不是函数式组件
+  function renderFloor(floor) {
+    return (<Floor key={floor.floorId} dataset={floor} render={renderRoom} />)
+  }
+
+  return (
+    <div>
+      {
+        blockList.map((block) => (
+          <div key={block.blockId} style={{marginTop: '20px', overflowX: 'auto'}}>
+            <PageHeader title={`${block.termName} ${block.blockName}`} backIcon={false} />
+            <div style={{ display: 'flex', padding: '10px' }}>
+            {
+              (block.unitList || []).map((unit) => (<div key={unit.unitId} style={{ flex: 'auto', marginRight: '30px' }} ><Unit dataset={unit} render={renderFloor} /></div>))
+            }
+            </div>
+          </div>
+        ))
+      }
+    </div>
+  )
+}

estateagents-admin-manager/src/pages/house/raise/edit/components/HouseGrid/style.less

@@ -0,0 +1,72 @@
+.room {
+  text-align: center;
+  margin-bottom: 12px;
+  padding: 10px;
+  font-size: 16px;
+  line-height: 1.4em;
+
+  .info {
+    color: #333;
+  }
+
+  .warn {
+    color: #730000;
+  }
+
+  &.offline {
+    color: #fff;
+    background: #000;
+    
+    .info, .warn {
+      color: #fff;
+    }
+  }
+}
+
+.floor {
+  display: flex;
+
+  &-head {
+    font-size: 20px;
+    padding-top: 36px;
+    flex: none;
+    width: 14%;
+    min-width: 100px;
+    text-align: center;
+  }
+
+  &-body {
+    padding-top: 10px;
+    text-align: center;
+    flex: auto;
+    display: flex;
+    justify-content: flex-start;
+    overflow-x: auto;
+
+    .item {
+      flex: none;
+      width: 110px;
+
+      & + .item {
+          margin-left: 2%;
+      }
+    }
+  }
+}
+
+.unit {
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+  // max-width: 600px;
+
+  &-head {
+    padding-left: 40px;
+    font-size: 22px;
+    line-height: 44px;
+    color: #000;
+    background: #f8f8f8;
+  }
+
+  &-body {
+    // padding: 0 20px;
+  }
+}

estateagents-admin-manager/src/pages/house/raise/edit/components/HouseInfo/index.jsx

@@ -0,0 +1,141 @@
+import React, { PureComponent, useState, useEffect } from 'react'
+import { Modal, Row, Col, Table, Pagination, Button, Form, Input,message } from 'antd'
+import EnDash from '../EnDash'
+import moment from 'moment';
+import AuthButton from '@/components/AuthButton';
+
+import Style from './style.less'
+import HotBlock from '../HotBlock'
+import HouseListInfo from '../HouseListInfo'
+import request from '../../../../../../utils/request';
+import apis from '../../../../../../services/apis';
+
+const HouseInfo = props => {
+  const [data, setData] = useState({ list: [], total: 0 })
+  const [raiseData, setRaiseData ] = useState({})
+  const [house, setHouse] = useState({visable:false, salesBatchId:'',buildingId:'', raiseRecordId:''});
+  const raiseRecordId = props.raiseRecordId
+  const salesBatchId = props.salesBatchId
+  const buildingId = props.buildingId
+  const raiseId = props.raiseId
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+    getRaiseInfo();
+  }, [raiseRecordId])
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.house.listHouseByRaiseRecordId, params: { ...params,raiseRecordId: raiseRecordId} }).then(res => {
+      setData(res)
+    }).catch(err => {
+      // openNotificationWithIcon('error', err.message)
+    })
+  }
+
+  function getRaiseInfo(){
+    request({ ...apis.house.taRaiseById, urlData: {id: raiseId} }).then((data) => {
+      setRaiseData(data)
+      console.log(raiseData, 'raiseDataraiseDataraiseData')
+    })
+  }
+
+  function refreshList(e){
+    setHouse(e)
+    getList()
+  }
+
+  function infoOnCancel(e){
+    console.log(12321344)
+    props.onCancel();
+  }
+
+  //锁定和解锁
+  const updateLockingStatus = rowData => () => {
+    console.log(rowData,'12321323')
+    const type = rowData.houseLockingStatus === 'locked' ? "unlocked":"locked"
+    request({ ...apis.house.updateLockingStatus, params: {houseId:rowData.houseId, raiseHouseId:rowData.raiseHouseId, personId:rowData.lockingPersonId, type:type, raiseRecordId:raiseRecordId} }).then(res => {
+      message.info("操作成功")
+      props.onCancel(false)
+      getList();
+    }).catch(err => {
+    })
+  }
+
+
+  const columns = [
+    {
+      title: '房源编号',
+      dataIndex: 'houseId',
+      key: 'houseId',
+      align: 'center',
+    },
+    {
+      title: '房源',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+      render: (text, records) => <span>{records.termName}/{records.blockName}/{records.unitName}/{records.floorName}/{records.roomName}</span>,
+    },
+    {
+      title: '预选实际人数',
+      dataIndex: 'realHeat',
+      key: 'realHeat',
+      align: 'center',
+    },
+    {
+      title: '认筹实际人数',
+      dataIndex: 'raiseRealHeat',
+      key: 'raiseRealHeat',
+      align: 'center',
+    },
+    {
+      title: '锁定状态',
+      dataIndex: 'houseLockingStatus',
+      key: 'houseLockingStatus',
+      align: 'center',
+      render: (x, row) => <><span>{row.houseLockingStatus === 'locked'?'已锁定':'未锁定'}</span></>,
+    },
+    {
+      title: '锁定人',
+      dataIndex: 'lockingPersonName',
+      key: 'lockingPersonName',
+      align: 'center',
+      render: (x, row) => <><span>{row.houseLockingStatus === 'locked'? row.lockingPersonName :''}</span></>,
+    },
+    {
+      title: '操作',
+      dataIndex: '',
+      key: '',
+      align: 'center',
+      render: (text, record) => (
+        <AuthButton name="admin.salesBatch.detail.get" noRight={null}>
+          <a style={{ color: '#66B3FF' }} onClick={updateLockingStatus(record)} >{record.houseLockingStatus === 'locked' ? '解锁':'锁定'}</a>
+        </AuthButton>
+      ),
+    },
+  ];
+
+  return (
+    <>
+      <Modal footer={null} title="认筹单房源清单" visible={props.visible} onCancel={() => infoOnCancel()} width={800}>
+        <AuthButton noRight={null}>
+          {raiseData.houseLockingType === 'auto' ? null : <Button type="danger" style={{marginLeft:'663px'}} onClick={() => setHouse({visable:true, salesBatchId:salesBatchId, raiseRecordId:raiseRecordId, buildingId:buildingId})}>添加房源</Button>}
+        </AuthButton>
+        <Table 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={e => changePageNum(e)} current={data.current}/>
+        </div>
+      </Modal>
+      <HouseListInfo visible={house.visable} salesBatchId={house.salesBatchId} buildingId={house.buildingId} raiseRecordId = {house.raiseRecordId} onCancel={() => refreshList({visable:false, salesBatchId:salesBatchId, buildingId:''})}/>
+    </>
+  );
+}
+
+
+const WrappedBase = Form.create({ name: 'HouseInfo' })(HouseInfo);
+
+export default WrappedBase
+
+// export default function UserInfo(props) {
+// }

estateagents-admin-manager/src/pages/house/raise/edit/components/HouseInfo/style.less

@@ -0,0 +1,240 @@
+.SubmitButton {
+    background: rgba(239,39,58,1);
+    border-radius: 7px;
+    border: 0px;
+  }
+  .text {
+    color: rgba(239,39,58,1);
+  }
+  .SelectFrom {
+    width: 180px;
+    background: #ffffff;
+    border-radius: 7px;
+    border: 1px solid #dbdbdb;
+  }
+  .addButton {
+    background: #50be00;
+    border-radius: 4px;
+    border: 0px;
+    margin: 10px 0px;
+  }
+  .cardText {
+    color: #333;
+    display: flex;
+    align-items: center;
+    position: relative;
+    line-height: 1.5;
+    font-size: 0.106rem;
+    margin-bottom: 0.08rem;
+  
+  }
+  .cardItem{
+    color: #666;
+    display: flex;
+    align-items: center; 
+    line-height: 1.5;
+    font-size: 0.106rem;
+    margin-bottom: 0.08rem; 
+  }
+  .ediText {
+    font-size: 0.106rem;
+    color: #ff925c;
+    line-height: 24px;
+    position: absolute;
+    right: 0;
+  }
+  .title{
+    display: inline-block;
+    width:  0.54rem;
+    justify-content: space-between;
+    text-align: justify;
+    text-align-last:justify
+  }
+  
+  .address { 
+    width: 400px;
+    height: 24px; 
+    text-overflow: ellipsis; 
+    white-space: nowrap;
+    overflow: hidden;
+  }
+  
+  .pitchButton { 
+    border-color: rgba(255,126,72,1);
+    background-color: rgba(255,126,72,1);
+    color: rgba(255,255,255,1); 
+  }
+  .noButton {
+    border-color: rgba(255,126,72,1);
+    color: rgba(255,126,72,1);
+  }
+  .displayS {
+    display: none;
+  }
+  
+  
+  // 客户详情样式
+  .cardBox{
+    display: flex;
+    .leftBox{
+      width:1000px;
+      min-width:350px;
+      height:1000px;
+      background:rgba(255,255,255,1);
+      box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+      border-radius:8px;
+      display: inline-block;
+      margin-right: 30px;
+      padding: 30px;
+      overflow: hidden;
+    }
+    .rightBox{
+      width:865px;
+      min-width:342px;
+      height:290px;
+      background:rgba(255,255,255,1);
+      box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+      border-radius:8px;
+      display: inline-block;
+      margin-right: 30px;
+      padding: 30px;
+      overflow: hidden;
+    }
+    .rightBox{
+      width:-webkit-fill-available;
+      height:315px;
+      min-width: 100%;
+      background:rgba(255,255,255,1);
+      box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+      border-radius:8px;
+      display: inline-block;
+      padding: 30px;
+      overflow: hidden;
+      position: relative;
+    }
+    .rightBoxCentre{
+      width:865px;
+      height:345px;
+      min-width: 60%;
+      background:rgba(255,255,255,1);
+      box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+      border-radius:8px;
+      display: inline-block;
+      padding: 30px;
+      overflow: hidden;
+      position: relative;
+    }
+    .leftBoxCentre{
+      width:100%;
+      height:345px;
+      background:rgba(255,255,255,1);
+      box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+      border-radius:8px;
+      display: inline-block;
+      padding: 30px;
+      overflow: hidden;
+      position: relative;
+    }
+    .tit{
+      font-size:0.15rem;
+      font-weight:600;
+      color:#222;
+      margin: 10px 0 0 0;
+    }
+    .flexBox{
+      display: flex;
+      align-items: end;
+    }
+    .touxiang{
+      width: 120px;
+      width: 120px;
+      border-radius: 6px;
+      margin: 80px 0 20px 0;
+    }
+    .touxiangphoto{
+      width: 80px;
+      height: 80px;
+      margin: 38px 0 0px 0;
+    }
+    .infoItem{
+      color:#666;
+      font-size: 0.1rem;
+      margin: 0 0 30px 0;
+      
+    }
+    .rightItem{
+      color:#666;
+      font-size: 0.1rem;
+      margin: 0 0 15px 0;
+    }
+    .right{
+      width: 25%;
+      min-width: 1.3rem;
+      margin-left: 0.1rem;
+      padding-top: 0.3rem;
+      // position: absolute;
+      // top:108px;
+      // left:170px;
+    }
+    .rightphone{
+    
+      position: absolute;
+      top:108px;
+      left:170px;
+    }
+    .left{
+      position: absolute;
+      top:108px;
+      left:60%;
+    
+    }
+    .rightInfo{
+      width: 25%;
+      min-width: 1.3rem;
+      margin-right: 0.1rem;
+      padding-top: 0.3rem;
+      // position: absolute;
+      // top:108px;
+      // left:80%;
+    }
+  
+    .Centered{
+      width: 25%;
+      // position: absolute;
+      // top:108px;
+      // left:30%;
+      min-width: 1.3rem;
+      margin: 0 0 15px 0;
+      color:#666;
+      font-size: 0.1rem;
+      padding-top: 0.3rem;
+    }
+  
+    .rightCentered{
+      // position: absolute;
+      // top:108px;
+      // left:55%;
+      width: 25%;
+      min-width: 1.3rem;
+      margin: 0 0 15px 0;
+      padding-top: 0.3rem;
+      color:#666;
+      font-size: 0.1rem;
+    }
+    
+  }
+  .recordBox{
+    width:100%;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    margin-top: 30px;
+    padding: 30px;
+    .tableName{
+      font-size:24px;
+      font-weight:600;
+      color:#222;
+    }
+  }
+  
+  

estateagents-admin-manager/src/pages/house/raise/edit/components/HouseListInfo/index.jsx

@@ -0,0 +1,164 @@
+import React, { PureComponent, useState, useEffect } from 'react'
+import { Modal, Row, Col, Table, Pagination, Button, Form, Input,message } from 'antd'
+import EnDash from '../EnDash'
+
+import Style from './style.less'
+import HotBlock from '../HotBlock'
+import request from '../../../../../../utils/request';
+import apis from '../../../../../../services/apis';
+import AuthButton from '@/components/AuthButton';
+
+
+
+const HouseListInfo = props => {
+  const [data, setData] = useState([])
+  const raiseRecordId = props.raiseRecordId
+  useEffect(() => {
+    console.log('raiseRecordIdraiseRecordId',raiseRecordId)
+    getList({ pageNum: 1, pageSize: 10 });
+  }, [props.raiseRecordId])
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.house.taHousingResources, params: { ...params, salesBatchId:props.salesBatchId, lockingStatus:'unlocked', buildingId:props.buildingId} }).then(res => {
+      setData(res)
+    }).catch(err => {
+      // openNotificationWithIcon('error', err.message)
+    })
+  }
+
+  const toAddHouse = rowData => () =>{
+    console.log(rowData,'record');
+    request({ ...apis.house.addUnlockRaiseHouse, params: {houseId: rowData.houseId, raiseRecordId: raiseRecordId, lockingStatus:'unlocked'} }).then(res => {
+      message.info("添加成功");
+      props.onCancel();
+    }).catch(err => {
+      // openNotificationWithIcon('error', err.message)
+    })
+  }
+
+  const changePageNum = (pageNumber) => {
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
+
+
+  const columns = [
+    {
+      title: '房源编号',
+      dataIndex: 'houseId',
+      key: 'houseId',
+      align: 'center',
+    },
+    {
+      title: '房源',
+      dataIndex: 'room',
+      key: 'room',
+      align: 'center',
+      render: (text, records) => <span>{records.termname}/{records.blockName}/{records.unitName}/{records.floorName}/{records.roomName}</span>,
+    },
+    {
+      title: '价格(万元)',
+      dataIndex: 'price',
+      key: 'price',
+      align: 'center',
+    },
+    {
+      title: '对应户型',
+      dataIndex: 'apartmentName',
+      key: 'apartmentName',
+    },
+    {
+      title: '预选实际热度',
+      dataIndex: 'realHeat',
+      key: 'realHeat',
+    },
+    {
+      title: '认筹实际热度',
+      dataIndex: 'raiseRealHeat',
+      key: 'raiseRealHeat',
+    },
+    {
+      title: '操作',
+      dataIndex: '',
+      key: '',
+      align: 'center',
+      render: (text, record) => (
+        <AuthButton name="admin.salesBatch.detail.get" noRight={null}>
+          <a style={{ color: '#66B3FF' }} onClick={toAddHouse(record)} >添加</a>
+        </AuthButton>
+      ),
+    },
+  ];
+
+  function handleSubmit (e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err){
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  // 重置搜索
+  function handleReset () {
+    props.form.resetFields();
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Modal footer={null} title="添加房源" visible={props.visible} onCancel={props.onCancel} width={600}>
+        <span>可选房源仅包括当前销售批次中已发布且未被锁定的房源</span>
+        <Form layout="inline" onSubmit={handleSubmit}>
+            <Form.Item>
+              {getFieldDecorator('houseId')(
+                <Input placeholder="房源编号" style={{width:'150px'}} />,
+              )}
+            </Form.Item>
+            <Form.Item>
+              {getFieldDecorator('termName')(
+                <Input placeholder="期区" style={{width:'150px'}}/>,
+              )}
+            </Form.Item>
+            <Form.Item>
+              {getFieldDecorator('blockName')(
+                <Input placeholder="楼栋" style={{width:'150px'}}/>,
+              )}
+            </Form.Item>
+            <Form.Item>
+              {getFieldDecorator('unitName')(
+                <Input placeholder="单元" style={{width:'150px'}}/>,
+              )}
+            </Form.Item>
+            <Form.Item>
+              {getFieldDecorator('floorName')(
+                <Input placeholder="层" style={{width:'150px'}}/>,
+              )}
+            </Form.Item>
+            <Form.Item>
+              {getFieldDecorator('roomName')(
+                <Input placeholder="户号" style={{width:'150px'}}/>,
+              )}
+            </Form.Item>
+            <Form.Item>
+              <Button type="primary" htmlType="submit" >
+                搜索
+              </Button>
+              <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>      
+      </Modal>
+    </>
+  );
+}
+
+const WrappedBase = Form.create({ name: 'HouseListInfo' })(HouseListInfo);
+
+export default WrappedBase

estateagents-admin-manager/src/pages/house/raise/edit/components/HouseListInfo/style.less

@@ -0,0 +1,36 @@
+.article {
+    .section {
+        font-size: 16px;
+        line-height: 1.8em;
+        color: #666;
+
+        & + .section {
+            margin-top: 24px;
+        }
+    }
+
+    .title {
+        font-size: 18px;
+        line-height: 2em;
+        color: #333;
+    }
+
+    .subtitle {
+        font-size: 14px;
+        line-height: 1.6em;
+        color: #999;
+    }
+
+    .flex {
+        display: flex;
+        flex-wrap: wrap;
+
+        .flex-item {
+            margin-top: 16px;
+            margin-right: 8px;
+            flex: none;
+            width: 100px;
+            text-align: center;
+        }
+    }
+}

estateagents-admin-manager/src/pages/house/raise/edit/components/RaiseHelpDoc/index.jsx

@@ -0,0 +1,26 @@
+import React, { PureComponent } from 'react'
+import { Modal, Row, Col } from 'antd'
+import EnDash from '../EnDash'
+
+import Style from './style.less'
+import HotBlock from '../HotBlock'
+
+
+export default function RaiseHelpDoc(props) {
+  return (
+    <Modal footer={null} title="相关说明" visible={props.visible} onCancel={props.onCancel} width={800}>
+      <div className={Style.article}>
+        <div className={Style.section}>
+          <div>
+          1.锁房方式:
+          自动锁房：用户提交一次认筹只能选择一套房源，交一笔认筹金，仅支持线上缴费。缴费完成后锁定房源，防止他人认筹。缴费期间其他人也无法认筹。<br/>
+          手动锁房：用户选定一到多个房源提交认筹单。选择缴费方式，若为线上缴费则线上支付，若为线下支付则直接提交认筹单。<br/><br/>
+          2.同一销售批次同一用户可以提交多个认筹单，只要房源不重复。<br/><br/>
+          3.管理员在后台可以为客户手工锁定认筹单中的某个房源，若认筹单中房源全部被锁定，需要增加未被锁定房源锁定（增加时需线下和客户确认）。也可以解锁认筹单已被锁定的房源。<br/><br/>
+          4."认筹需预选"若为"是"，则代表不可只认筹不预选，在执行认筹操作时会提示未预选用户请先预选。如果此时仍然在预选期则可以预选后再认筹。"认筹需预选"若为"否"，则代表可以不经过预选环节直接认筹。
+        </div>
+        </div>
+      </div>
+    </Modal>
+  );
+}

estateagents-admin-manager/src/pages/house/raise/edit/components/RaiseHelpDoc/style.less

@@ -0,0 +1,36 @@
+.article {
+    .section {
+        font-size: 16px;
+        line-height: 1.8em;
+        color: #666;
+
+        & + .section {
+            margin-top: 24px;
+        }
+    }
+
+    .title {
+        font-size: 18px;
+        line-height: 2em;
+        color: #333;
+    }
+
+    .subtitle {
+        font-size: 14px;
+        line-height: 1.6em;
+        color: #999;
+    }
+
+    .flex {
+        display: flex;
+        flex-wrap: wrap;
+
+        .flex-item {
+            margin-top: 16px;
+            margin-right: 8px;
+            flex: none;
+            width: 100px;
+            text-align: center;
+        }
+    }
+}

estateagents-admin-manager/src/pages/house/raise/edit/components/RaiseHouse.jsx

@@ -0,0 +1,230 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, Table, notification, Modal,message } from 'antd';
+import moment from 'moment';
+import request from '../../../../../utils/request';
+import apis from '../../../../../services/apis';
+import Styles from './style.less';
+import { router } from 'umi';
+import BlockSelect from '../../../../../components/HouseSelect/BlockSelect'
+import UnitSelect from '../../../../../components/HouseSelect/UnitSelect'
+import FloorSelect from '../../../../../components/HouseSelect/FloorSelect'
+import RoomSelect from '../../../../../components/HouseSelect/RoomSelect'
+import ApartmentSelect from '../../../../../components/HouseSelect/ApartmentSelect';
+import BasicHeat from './BasicHeat';
+import Navigate from '@/components/Navigate';
+/**
+ *图片设置
+ *
+ * @param {*} props
+ * @returns
+ */
+function RaiseHouse(props) {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState([])
+  const [basicHeat, setBasicHeat] = useState({visable:false, houseId:'', salesBatchId:''})
+  const [houseId, setHouseId] = useState('')
+  const raiseId = props.raiseId.raiseId
+  const buildingId = props.buildingId
+  const salesBatchId = props.salesBatchId
+  console.log(salesBatchId,'updateNameupdateNameupdateName');
+  useEffect(() => {
+    getList()
+  }, [])
+
+  function openNotificationWithIcon(type, message) {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.house.houseRaise, params: { ...params,raiseId:raiseId, salesBatchId: salesBatchId, buildingId: buildingId} }).then(res => {
+      console.log(res,"resresres")
+      setData(res)
+    }).catch(err => {
+      openNotificationWithIcon('error', err.message)
+    })
+  }
+
+    // 重置搜索
+    function handleReset () {
+      props.form.resetFields();
+      getList({ pageNumber: 1, pageSize: 10 })
+    }
+
+    function showEdi(e) {
+      props.onSuccess(e);
+    }
+    
+  // 分页
+  const changePageNum = (pageNumber) => {
+    getList({ pageNumber: pageNumber, pageSize: 10,raiseId:raiseId, salesBatchId: salesBatchId, buildingId: buildingId, ...props.form.getFieldsValue() })
+  }
+
+  const rowSelection = {
+    onChange: (selectedRowKeys, selectedRows) => {
+      setHouseId(selectedRows)
+    },
+  };
+
+  // 提交事件
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNumber: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  function showBaseModal(e){
+    if (houseId.length <=0){
+      message.info("请选择数据");
+      return;
+    }
+    setBasicHeat(e);
+  }
+
+  const columns = [
+    {
+      title: '房源编号',
+      dataIndex: 'houseId',
+      key: 'houseId',
+    },
+    {
+        title: '房源',
+        dataIndex: 'roomInfo',
+        key: 'roomInfo',
+        render: (text, records) => <span>{records.termName}/{records.blockName}/{records.unitName}/{records.floorName}/{records.roomName}</span>,
+    },
+    {
+        title: '价格(万元)',
+        dataIndex: 'price',
+        key: 'price',
+      },
+    {
+      title: '对应户型',
+      dataIndex: 'apartmentName',
+      key: 'apartmentName',
+    },
+    {
+      title: '发布状态',
+      dataIndex: 'status',
+      key: 'status',
+      render: (text, records) => <span>{records.status === 1 ? '已发布':'未发布'}</span>,
+    },
+    {
+        title: '认筹基础热度',
+        dataIndex: 'raiseHeat',
+        key: 'raiseHeat',
+    },
+    {
+        title: '认筹实际热度',
+        dataIndex: 'raiseRealHeat',
+        key: 'raiseRealHeat',
+        render:  (x, row) => <Navigate onClick={() => showEdi({type: "identifyingChips",houseId: row.houseId})}>{row.raiseRealHeat}</Navigate>,
+    },
+    {
+      title: '锁定状态',
+      dataIndex: 'houseLockingStatus',
+      key: 'houseLockingStatus',
+      render: (text, records) => <span>{records.houseLockingStatus === 'locked' ? '已锁定':'未锁定'}</span>,
+    },
+    {
+      title: '锁定认筹单编号',
+      dataIndex: 'raiseRecordId',
+      key: 'raiseRecordId',
+    },
+    {
+        title: '最后修改人',
+        dataIndex: 'updateName',
+        key: 'updateName',
+    },
+    {
+        title: '最后修改时间',
+        dataIndex: 'updateDate',
+        key: 'updateDate',
+        render: (x, row) => <><span>{row.updateDate == null ? null : `${moment(row.updateDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    },
+  ]
+  const { getFieldDecorator } = props.form
+  return (
+    <>
+    <Form layout="inline" onSubmit={e => handleSubmit(e)}>
+        <Form.Item>
+          {getFieldDecorator('termname')(
+            <Input placeholder="期区"/>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('blockName')(
+            <Input placeholder="楼栋"/>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('unitName')(
+            <Input placeholder="单元"/>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('floorName')(
+            <Input placeholder="层"/>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('roomName')(
+            <Input placeholder="房号"/>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('apartmentId')(
+             <ApartmentSelect buildingId={props.buildingId} />
+          )}
+        </Form.Item>        
+        <Form.Item>
+          {getFieldDecorator('status')(
+             <Select placeholder="发布状态" style={{width: '120px'}}>
+             <Option value="0">否</Option>
+             <Option value="1">是</Option>
+           </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('lockingStatus')(
+             <Select placeholder="锁定状态" style={{width: '120px'}}>
+             <Option value="unlocked">未锁定</Option>
+             <Option value="locked">已锁定</Option>
+           </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('houseId')(
+            <Input placeholder="房源编号"/>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" >
+            搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+
+      </Form>
+      <Button type="primary" onClick={() => showBaseModal({visable:true, houseId: houseId, salesBatchId:salesBatchId})} style={{ marginTop: '20px', marginRight:'20px'}}>批量修改基础热度</Button>
+      <div style={{marginTop:'20px', marginBottom:'20px'}}><span>共筛选出{data.total}条数据</span></div>
+      <Table rowSelection={rowSelection} 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>   
+      <BasicHeat visible={basicHeat.visable} houseId={basicHeat.houseId} salesBatchId={basicHeat.salesBatchId} onCancel={() => setBasicHeat({visable:false, salesBatchId:'',houseId:[]})} onSuccess={()=>getList()}/>   
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'RaiseHouse' })(RaiseHouse);
+export default WrappedHeader

estateagents-admin-manager/src/pages/house/raise/edit/components/Refund.jsx

@@ -0,0 +1,239 @@
+import React, { useState, useEffect } from 'react';
+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 header = (props) => {
+  const [ data, setData ] = useState({})
+  const [page, changePage] = useState({})
+  const raiseId = props.raiseId.raiseId
+  const type = props.type
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10, raiseId : raiseId, payStatus:type,});
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.house.refundOrderList, params: { ...params, raiseId:raiseId, payStatus:type,},}).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+  
+  function toDecimal2 (x){
+    var f = parseFloat(x);
+    if (isNaN(f)) {
+      return false;
+    }
+    var f = Math.round(x * 100) / 100;
+    var s = f.toString();
+    var rs = s.indexOf('.');
+    if (rs < 0) {
+      rs = s.length;
+      s += '.';
+    }
+    while (s.length <= rs + 2) {
+      s += '0';
+    }
+    console.log(s)
+    return s;
+  }
+  function regFenToYuan(fen){
+    var num = fen;
+    num = fen * 0.01;
+    num += '';
+    var reg = num.indexOf('.') > -1 ? /(\d{1,3})(?=(?:\d{3})+\.)/g : /(\d{1,3})(?=(?:\d{3})+$)/g;
+    num = num.replace(reg, '$1');
+    console.log(num, 'yuan')
+    num = toDecimal2(num)
+    return num
+  }
+  
+  const columns = [
+    {
+      title: '退费单编号',
+      // dataIndex: 'orderId',
+      // key: 'orderId',
+      align: 'center',
+      render: (text, record) => (<><span>{record.refundedOrderId}</span></>),
+    },
+    {
+      title: '缴费单编号',
+      // dataIndex: 'orderId',
+      // key: 'orderId',
+      align: 'center',
+      render: (text, record) => (<><span>{record.orderId}</span></>),
+    },
+    {
+      title: '认筹单编号',
+      dataIndex: 'raiseRecordId',
+      key: 'raiseRecordId',
+      align: 'center',
+    },
+    {
+      title: '用户手机号',
+      dataIndex: 'tel',
+      key: 'tel',
+      align: 'center',
+    },
+    {
+      title: '微信订单号',
+      dataIndex: 'refundNo',
+      key: 'refundNo',
+      align: 'center',
+    },
+    {
+      title: '退费状态',
+      // dataIndex: 'payStatus',
+      // key: 'payStatus1',
+      align: 'center',
+      render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'退费失败'}</span></>),
+    },
+    // {
+    //   title: '退费结果',
+    //   // dataIndex: 'payStatus',
+    //   // key: 'payStatus2',
+    //   align: 'center',
+    //   render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
+    // },
+    {
+      title: '退费失败原因',
+      dataIndex: 'refundReason',
+      key: 'refundReason',
+      align: 'center',
+    },
+    {
+      title: '实退金额',
+      dataIndex: 'totalFee',
+      key: 'totalFee',
+      align: 'center',
+      render: (x, row) => <span>{regFenToYuan(row.totalFee)}</span>
+    },
+    {
+      title: '退费发起时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (x, row) => <><span>{row.createDate != null ? `${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}` : null}</span></>,
+    },
+    {
+      title: '退费时间',
+      // dataIndex: 'updateDate',
+      // key: 'updateDate',
+      align: 'center',
+      render: (x, row) => <><span>{row.payTime != null ? `${moment(row.payTime).format('YYYY-MM-DD HH:mm:ss')}` : null}</span></>,
+    },
+    // {
+    //   title: '退费失败时间',
+    //   // dataIndex: 'updateDate',
+    //   // key: 'updateDate',
+    //   align: 'center',
+    //   render: (x, row) => <><span>{`${moment(row.updateDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    // },
+  ];
+  
+  const changePageNum = (pageNumber) => {
+      getList({ pageNum: pageNumber, pageSize: 10, raiseId : raiseId, payStatus:type, ...props.form.getFieldsValue() })
+  }
+
+  // 提交事件
+const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        let {liveTime, ...submitValue} = values
+        if (submitValue.payStartTime != null){
+          submitValue.payStartTime = moment(submitValue.payStartTime).format('YYYY-MM-DD HH:mm:ss')
+        }
+        if (submitValue.payEndTime != null){
+          submitValue.payEndTime = moment(submitValue.payEndTime).format('YYYY-MM-DD HH:mm:ss')
+        }
+        getList({ pageNum: 1, pageSize: 10, raiseId : raiseId, payStatus:type, ...values })
+      }
+    });
+  }
+
+   //重置搜索
+   function handleReset() {
+    props.form.resetFields();
+  }
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('refundedOrderId')(
+            <Input placeholder="退费单编号"/>
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('orderId')(
+            <Input placeholder="缴费单编号"/>
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('raiseRecordId')(
+            <Input placeholder="认筹单编号"/>
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('tel')(
+            <Input placeholder="用户手机号"/>
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('tradeNo')(
+            <Input placeholder="微信订单号"/>
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('payStatus')(
+            <Select style={{ width: '180px' }} placeholder="退费状态">
+              <Option value="unRefunded">已发起</Option>
+              <Option value="refunded">已退费</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        {/* <Form.Item>
+          {getFieldDecorator('payStatus')(
+            <Select style={{ width: '180px' }} placeholder="退费结果">
+               <Option value="houseApp">成功</Option>
+               <Option value="houseApp">失败</Option>
+            </Select>,
+          )}
+        </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>
+      <div style={{marginTop:'20px', marginBottom:'20px'}}><span>共筛选出{data.total}条数据</span></div>  
+      <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 Refund = Form.create({ name: 'header' })(header);
+
+export default Refund

estateagents-admin-manager/src/pages/house/raise/edit/components/SalesBatchHelpDoc/index.jsx

@@ -0,0 +1,29 @@
+import React, { PureComponent } from 'react'
+import { Modal, Row, Col } from 'antd'
+import EnDash from '../EnDash'
+
+import Style from './style.less'
+import HotBlock from '../HotBlock'
+
+
+export default function SaleBatchHelpDoc(props) {
+  return (
+    <Modal footer={null} title="相关说明" visible={props.visible} onCancel={props.onCancel} width={800}>
+      <div className={Style.article}>
+        <div className={Style.section}>
+          <div>
+            1.楼盘多次开盘加推等销售行为，记录为多个“销售批次”，每个批次销售当前楼盘的一批不同房源。同一楼盘不同批次中房源不能重叠，即1套房不能卖2次。<br/><br/>
+            2.销售楼盘下拉仅显示上架楼盘。未上架楼盘若想发布销售批次请先在楼盘列表中将楼盘上架。<br/><br/>
+            3.销售批次和房源均发布后，用户在小程序端可以查看并“预选”或“认筹”房源，设置“预选开始时间”和“预选结束时间"可以限制用户预选，超出时间范围禁止用户预选，设置"认筹开始时间"和"认筹结束时间"可以限制用户认筹，超出时间范围禁止用户认筹。<br/><br/>
+            4."认筹需预选"若为"是"，则代表不可只认筹不预选，在执行认筹操作时会提示未预选用户请先预选。如果此时已超出预选期则无法预选，自然也无法认筹。如果此时仍然在预选期则可以预选后再认筹。"认筹需预选"若为"否"，则代表可以不经过预选环节直接认筹。通过配置修改预选时间、认筹时间和认筹是否需预选，可以在销售过程中控制销售行为。<br/><br/>
+            5."认筹需缴费"若为"是"，则代表在认筹过程中需要缴费（交认筹金/订金）才能最终认筹成功。"认筹需缴费"若为"否"，则代表认筹不需要含缴费流程，执行完其他流程即可认筹成功。<br/><br/>
+            6.若"认筹需缴费"设置为"是"，则需要再设置"缴费方式"，目前支持2种缴费方式，"线上微信支付"和"线下付款上传凭据"，可以多选，2种支付方式在缴费成功后都需要财务审核，审核不通过需要退费。<br/><br/>
+            7.认筹金额支持2位小数，整数部分最大8位数。<br/><br/>
+            8.发布状态为否，则在小程序端楼盘详情页面看不到当前销售批次入口。发布状态为是，则用户可以点击入口进入房源列表查看房源进行预选或认筹操作。<br/><br/>
+            </div>
+        </div>
+        
+      </div>
+    </Modal>
+  );
+}

estateagents-admin-manager/src/pages/house/raise/edit/components/SalesBatchHelpDoc/style.less

@@ -0,0 +1,36 @@
+.article {
+    .section {
+        font-size: 16px;
+        line-height: 1.8em;
+        color: #666;
+
+        & + .section {
+            margin-top: 24px;
+        }
+    }
+
+    .title {
+        font-size: 18px;
+        line-height: 2em;
+        color: #333;
+    }
+
+    .subtitle {
+        font-size: 14px;
+        line-height: 1.6em;
+        color: #999;
+    }
+
+    .flex {
+        display: flex;
+        flex-wrap: wrap;
+
+        .flex-item {
+            margin-top: 16px;
+            margin-right: 8px;
+            flex: none;
+            width: 100px;
+            text-align: center;
+        }
+    }
+}

estateagents-admin-manager/src/pages/house/raise/edit/components/UserInfo/index.jsx

@@ -0,0 +1,58 @@
+import React, { PureComponent, useState, useEffect } from 'react'
+import { Modal, Row, Col, Table, Pagination, Button, Form, Input,message } from 'antd'
+import EnDash from '../EnDash'
+
+import Style from './style.less'
+import HotBlock from '../HotBlock'
+import request from '../../../../../../utils/request';
+import apis from '../../../../../../services/apis';
+
+const UserInfo = props => {
+  // const [data, setData] = useState({})
+  const raiseRecord = props.raiseRecordId
+  const raiseId = props.raiseId
+
+  // useEffect(() => {
+  //   console.log('userInfoLog', raiseId)
+  //   getList({ pageNum: 1, pageSize: 10 });
+  // }, [raiseRecordId])
+
+  // function getList(params) {
+  //   // 网路请求
+  //   request({ ...apis.house.getUserInfo, params: { raiseRecordId:raiseRecordId} }).then(res => {
+  //     console.log(res,'adminData')
+  //     setData(res)
+  //   }).catch(err => {
+  //     message.info("出错了")
+  //   })
+  // }
+
+  function refreshList(e){
+    console.log('.....',e)
+    props.onCancel(e)
+  }
+
+  return (
+    <Modal footer={null} title="个人信息" visible={props.visible} onCancel={() => refreshList({visable:false, raiseRecord:raiseRecord})} width={800}>
+      <div className={Style.cardBox}>
+        <div className={Style.rightBox}>
+          <div className={Style.flexBox}>
+            <img className={Style.touxiang} src={raiseRecord.avatarurl} />
+            <div className={Style.right}>
+              <p className={Style.rightItem}>昵称：{raiseRecord.nickname}</p>
+              <p className={Style.rightItem}>姓名：{raiseRecord.name}</p>
+              <p className={Style.rightItem}>用户手机号：{raiseRecord.tel}</p>
+              <p className={Style.rightItem} style={{width:'400px'}}>身份证号：{raiseRecord.idcard}</p>
+              <p className={Style.rightItem}>认筹手机号：{raiseRecord.tel}</p> 
+            </div>
+          </div>
+        </div>
+      </div>
+    </Modal>
+  );
+}
+
+const WrappedBase = Form.create({ name: 'UserInfo' })(UserInfo);
+
+export default WrappedBase
+

estateagents-admin-manager/src/pages/house/raise/edit/components/UserInfo/style.less

@@ -0,0 +1,240 @@
+.SubmitButton {
+    background: rgba(239,39,58,1);
+    border-radius: 7px;
+    border: 0px;
+  }
+  .text {
+    color: rgba(239,39,58,1);
+  }
+  .SelectFrom {
+    width: 180px;
+    background: #ffffff;
+    border-radius: 7px;
+    border: 1px solid #dbdbdb;
+  }
+  .addButton {
+    background: #50be00;
+    border-radius: 4px;
+    border: 0px;
+    margin: 10px 0px;
+  }
+  .cardText {
+    color: #333;
+    display: flex;
+    align-items: center;
+    position: relative;
+    line-height: 1.5;
+    font-size: 0.106rem;
+    margin-bottom: 0.08rem;
+  
+  }
+  .cardItem{
+    color: #666;
+    display: flex;
+    align-items: center; 
+    line-height: 1.5;
+    font-size: 0.106rem;
+    margin-bottom: 0.08rem; 
+  }
+  .ediText {
+    font-size: 0.106rem;
+    color: #ff925c;
+    line-height: 24px;
+    position: absolute;
+    right: 0;
+  }
+  .title{
+    display: inline-block;
+    width:  0.54rem;
+    justify-content: space-between;
+    text-align: justify;
+    text-align-last:justify
+  }
+  
+  .address { 
+    width: 400px;
+    height: 24px; 
+    text-overflow: ellipsis; 
+    white-space: nowrap;
+    overflow: hidden;
+  }
+  
+  .pitchButton { 
+    border-color: rgba(255,126,72,1);
+    background-color: rgba(255,126,72,1);
+    color: rgba(255,255,255,1); 
+  }
+  .noButton {
+    border-color: rgba(255,126,72,1);
+    color: rgba(255,126,72,1);
+  }
+  .displayS {
+    display: none;
+  }
+  
+  
+  // 客户详情样式
+  .cardBox{
+    display: flex;
+    .leftBox{
+      width:1000px;
+      min-width:350px;
+      height:1000px;
+      background:rgba(255,255,255,1);
+      box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+      border-radius:8px;
+      display: inline-block;
+      margin-right: 30px;
+      padding: 30px;
+      overflow: hidden;
+    }
+    .rightBox{
+      width:865px;
+      min-width:342px;
+      height:290px;
+      background:rgba(255,255,255,1);
+      // box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+      border-radius:8px;
+      display: inline-block;
+      margin-right: 30px;
+      padding: 30px;
+      overflow: hidden;
+    }
+    .rightBox{
+      width:-webkit-fill-available;
+      height:315px;
+      min-width: 100%;
+      background:rgba(255,255,255,1);
+      // box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+      border-radius:8px;
+      display: inline-block;
+      padding: 30px;
+      overflow: hidden;
+      position: relative;
+    }
+    .rightBoxCentre{
+      width:865px;
+      height:345px;
+      min-width: 60%;
+      background:rgba(255,255,255,1);
+      box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+      border-radius:8px;
+      display: inline-block;
+      padding: 30px;
+      overflow: hidden;
+      position: relative;
+    }
+    .leftBoxCentre{
+      width:100%;
+      height:345px;
+      background:rgba(255,255,255,1);
+      box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+      border-radius:8px;
+      display: inline-block;
+      padding: 30px;
+      overflow: hidden;
+      position: relative;
+    }
+    .tit{
+      font-size:0.15rem;
+      font-weight:600;
+      color:#222;
+      margin: 10px 0 0 0;
+    }
+    .flexBox{
+      display: flex;
+      align-items: end;
+    }
+    .touxiang{
+      width: 120px;
+      width: 120px;
+      border-radius: 6px;
+      margin: 80px 0 20px 0;
+    }
+    .touxiangphoto{
+      width: 80px;
+      height: 80px;
+      margin: 38px 0 0px 0;
+    }
+    .infoItem{
+      color:#666;
+      font-size: 0.1rem;
+      margin: 0 0 30px 0;
+      
+    }
+    .rightItem{
+      color:#666;
+      font-size: 0.1rem;
+      margin: 0 0 15px 0;
+    }
+    .right{
+      width: 25%;
+      min-width: 1.3rem;
+      margin-left: 0.1rem;
+      padding-top: 0.3rem;
+      // position: absolute;
+      // top:108px;
+      // left:170px;
+    }
+    .rightphone{
+    
+      position: absolute;
+      top:108px;
+      left:170px;
+    }
+    .left{
+      position: absolute;
+      top:108px;
+      left:60%;
+    
+    }
+    .rightInfo{
+      width: 25%;
+      min-width: 1.3rem;
+      margin-right: 0.1rem;
+      padding-top: 0.3rem;
+      // position: absolute;
+      // top:108px;
+      // left:80%;
+    }
+  
+    .Centered{
+      width: 25%;
+      // position: absolute;
+      // top:108px;
+      // left:30%;
+      min-width: 1.3rem;
+      margin: 0 0 15px 0;
+      color:#666;
+      font-size: 0.1rem;
+      padding-top: 0.3rem;
+    }
+  
+    .rightCentered{
+      // position: absolute;
+      // top:108px;
+      // left:55%;
+      width: 25%;
+      min-width: 1.3rem;
+      margin: 0 0 15px 0;
+      padding-top: 0.3rem;
+      color:#666;
+      font-size: 0.1rem;
+    }
+    
+  }
+  .recordBox{
+    width:100%;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    margin-top: 30px;
+    padding: 30px;
+    .tableName{
+      font-size:24px;
+      font-weight:600;
+      color:#222;
+    }
+  }
+  
+  

estateagents-admin-manager/src/pages/house/raise/edit/components/style.less

@@ -0,0 +1,97 @@
+.SubmitButton {
+  background: #3a91d5;
+  border-radius: 7px;
+  border: 0px;
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  font-size: 0.106rem;
+  color: #333;
+  display: flex;
+  align-items: center;
+  position: relative;
+  margin-bottom: 0.08rem; 
+}
+
+.recommderTag{
+  position: absolute;
+  color: #fff;
+  line-height: 0.28rem;
+  width: 0.54rem;
+  background-color: rgba(0,0,0,0.4);
+  text-align: center;
+  border-radius: 12px 0 12px 0;
+  font-size: 0.09rem;
+}
+.cardItem{
+  font-size: 0.106rem;
+  font-weight: 400;
+  color: #666;
+  display: flex;
+  align-items: center;  
+  margin-bottom: 0.08rem;
+  .title{
+    display: inline-block;
+    width: 0.58rem;
+  
+    min-width: 0.58rem;
+    justify-content: space-between;
+    text-align: justify;
+    text-align-last:justify
+  }
+  
+}
+.cardText{
+  font-size: 0.106rem;
+  font-weight: 400;
+  color: #666;
+  display: flex;
+  align-items: center;  
+  margin-bottom: 0.08rem;
+  .title{
+    display: inline-block;
+    width: 0.58rem;
+  
+    min-width: 0.58rem;
+    justify-content: space-between;
+    text-align: justify;
+    text-align-last:justify
+  }
+  
+}
+.ediText {
+  font-size: 0.106rem;
+  color: #ff925c;
+  position: absolute;
+  right: 0;
+
+}
+
+
+.address { 
+  width: 400px;
+  height: 24px; 
+  text-overflow: ellipsis; 
+  white-space: nowrap;
+  overflow: hidden;
+}
+.cover{
+  width: 100%;
+
+  padding-bottom: 56.25%;
+  background-size: 100% 100% !important;
+ 
+  border-radius: 12px 12px 0 0;
+  
+    // height: '14vw';
+}

estateagents-admin-manager/src/pages/house/raise/list/index.jsx

@@ -0,0 +1,332 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Pagination, Modal, notification } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import styles from '../../../style/GoodsList.less';
+import BuildSelect from '../../../../components/SelectButton/BuildSelect';
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+import RaiseHelpDoc from '../edit/components/RaiseHelpDoc';
+import Navigate from '@/components/Navigate';
+
+const { Option } = Select;
+
+const header = props => {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState({ list: [], total: 0 })
+  //   const [page, changePage] = useState({})
+  const [houseIdList, setHouseIdList] = useState([])
+  const [time, setTime] = useState('')
+  const [showHelp, setShowHelp] = useState(false)
+
+  // 查询列表
+  const getList = params => {
+    request({ ...apis.house.taRaiseList, params: { ...params } }).then(data => {
+      console.log(data)
+      setData(data)
+    })
+  }
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  }, [])
+
+  // 跳转到编辑
+  const toAddHouse = rowData => () => {
+    if(rowData) {
+      router.push({
+      pathname: '/house/raise/edit',
+      query: {
+        id: rowData.raiseId,
+        buildingId: rowData.buildingId,
+        salesBatchId: rowData.salesBatchId,
+      },
+    });
+      return
+    }
+    router.push({
+      pathname: '/house/raise/add',
+    });
+  }
+
+  function openNotificationWithIcon(type, message) {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
+  function toDecimal2 (x){
+    var f = parseFloat(x);
+    if (isNaN(f)) {
+      return false;
+    }
+    var f = Math.round(x * 100) / 100;
+    var s = f.toString();
+    var rs = s.indexOf('.');
+    if (rs < 0) {
+      rs = s.length;
+      s += '.';
+    }
+    while (s.length <= rs + 2) {
+      s += '0';
+    }
+    console.log(s)
+    return s;
+  }
+  function regFenToYuan(fen){
+    var num = fen;
+    num = fen * 0.01;
+    num += '';
+    var reg = num.indexOf('.') > -1 ? /(\d{1,3})(?=(?:\d{3})+\.)/g : /(\d{1,3})(?=(?:\d{3})+$)/g;
+    num = num.replace(reg, '$1');
+    console.log(num, 'yuan')
+    num = toDecimal2(num)
+    return num
+  }
+  
+  const toDelBatch = rowData => () =>{
+    console.log(houseIdList, 'houseIdListhouseIdList')
+    if(houseIdList.length < 1){
+      openNotificationWithIcon('error', '请先选择需要删除的认筹单')
+      return
+    }
+
+    Modal.confirm({
+      title: '确定删除认筹单吗',
+      okText: '确定',
+      cancelText: '取消',
+      onOk () {
+        console.log(houseIdList,'houseIdListhouseIdList');
+        request({ ...apis.house.batchDelRaise, data: houseIdList, }).then((data) => {
+          message.info("操作成功")
+          getList({ pageNum: 1, pageSize: 10 });
+        }).catch((err) => {
+          // message.info(err.msg)
+        })
+      },
+    });
+  }
+
+  const newQrcode = row => {
+    const x = new XMLHttpRequest();
+    const resourceUrl = row.qrCode
+    x.open('GET', resourceUrl, true);
+    x.responseType = 'blob';
+    x.onload = function (e) {
+      const url = window.URL.createObjectURL(x.response)
+      const a = document.createElement('a');
+      a.href = url;
+      a.style.display = 'none'
+      a.download = '活动二维码.png';
+      a.click();
+    }
+    x.send();
+  }
+
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+  const columns = [
+    {
+      title: '销售批次名',
+      dataIndex: 'salesBatchName',
+      key: 'salesBatchName',
+      align: 'center',
+      render:  (x, row) => <Navigate onClick={toAddHouse(row)}>{row.salesBatchName}</Navigate>,
+    },
+    {
+      title: '楼盘名称',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+    },
+    {
+      title: '备注',
+      dataIndex: 'remark',
+      key: 'remark',
+      align: 'center',
+    },
+    {
+      title: '房源总数',
+      dataIndex: 'salesNumber',
+      key: 'salesNumber',
+      align: 'center',
+    },
+    {
+      title: '发布状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: status => <><span>{status == 0 ? '否' : '是'}</span></>,
+    },
+    {
+      title: '认筹开始时间',
+      dataIndex: 'raiseStartTime',
+      key: 'raiseStartTime',
+      align: 'center',
+      render: (x, row) => <><span>{`${moment(row.raiseStartTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    },
+    {
+      title: '认筹结束时间',
+      dataIndex: 'raiseEndTime',
+      key: 'raiseEndTime',
+      align: 'center',
+      render: (x, row) => <><span>{`${moment(row.raiseEndTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    },
+    {
+      title: '锁房方式',
+      dataIndex: 'houseLockingType',
+      key: 'houseLockingType',
+      align: 'center',
+      render: (x, row) => <><span>{row.houseLockingType == 'auto' ? "自动锁房" : "手动锁房"}</span></>,
+    },
+    {
+      title: '认筹金额',
+      dataIndex: 'raisePrice',
+      key: 'raisePrice',
+      align: 'center',
+      render: (x, row) => <span>{regFenToYuan(row.raisePrice)}</span>
+    },
+    {
+      title: '缴费方式',
+      dataIndex: 'payType',
+      key: 'payType',
+      align: 'center',
+      render: (x, row) => <><span>{row.payType == 'offLine' ? "线下缴费" : row.payType == 'onLine' ? "线上缴费" : "线上缴费，线下缴费"}</span></>,
+    },
+    {
+      title: '认筹单总数',
+      dataIndex: 'raiseRealHeat',
+      key: 'raiseRealHeat',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      dataIndex: '',
+      key: '',
+      align: 'center',
+      render: withActions((text, record) => [
+        <AuthButton name="admin.raise.detail.get" noRight={null}>
+          <EditIcon type="look" text="查看详情" onClick={toAddHouse(record)} />
+        </AuthButton>,
+      ]),
+    },
+  ];
+  const getSignList = dynamicId => {
+    router.push({
+      pathname: '/activity/SignList',
+      query: {
+        dynamicId,
+      },
+    });
+  }
+
+  const changePageNum = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
+
+  const rowSelection = {
+    onChange: (selectedRowKeys, selectedRows) => {
+      console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
+      setHouseIdList(selectedRows)
+    },
+  };
+
+  // 提交事件
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        if (time) {
+          values.time = `${moment(time).format('YYYY-MM-DDT00:00:00.000')}Z`
+        } else {
+          values.time = null
+        }
+        
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  // 重置搜索
+  function handleReset () {
+    props.form.resetFields();
+    setTime('')
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  // 时间回调
+  function timeOnChange(date, dateString) {
+    console.log(date, dateString)
+    setTime(date)
+  }
+
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      {/* style={{ display: 'none' }} */}
+      <div id="qrcode"></div>
+      <Form layout="inline" onSubmit={e => handleSubmit(e)}>
+        <Form.Item>
+          {getFieldDecorator('salesBatchName')(
+             <Input
+             prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+             placeholder="销售批次名"
+           />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="发布状态">
+            <Option value="1">是</Option>
+            <Option value="0">否</Option>
+          </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <AuthButton name="admin.buildingDynamic.search" noRight={null}>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
+            </Button>
+          </AuthButton>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.raise.add.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toAddHouse()}>新增</Button>
+      </AuthButton>
+      <AuthButton name="admin.raise.del" noRight={null}>
+        <Button type="primary" className={styles.addBtn} onClick={toDelBatch()} style={{marginLeft:'30px'}}>删除</Button>
+      </AuthButton>
+      <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft:'30px'}} onClick={() => setShowHelp(true)} />
+      <Table rowSelection={rowSelection}
+       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={e => changePageNum(e)} current={data.current}/>
+      </div>
+      <RaiseHelpDoc visible={showHelp} onCancel={() => setShowHelp(false)} />
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/indexEcharts/components/IntentionalCustomers.jsx

@@ -0,0 +1,132 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions } from 'antd';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import { func } from 'prop-types';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+// const { Option } = Select;
+
+const UserBehavior = (props) => {
+  const [data, setData] = useState({ records: [] })
+  const [buildingId, setBuildingId] = useState('')
+  useEffect(() => {
+    IntentionUsers({ pageNum: 1, pageSize: 5 })
+    // getUserBehaviorProfile(formatDate(props.startDate, props.endDate))
+
+  }, [])
+  function IntentionUsers (params) {
+    request({
+      ...apis.indexEcharts.intentionUsers,
+      params: { ...params }
+    }).then((data) => {
+      console.log(data,"datadata")
+      setData(data)
+    })
+  }
+
+  // 分页
+  function onChange(pageNum) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    IntentionUsers({ pageNum: pageNum, pageSize: 5, buildingId })
+  }
+
+  // getIntentionUsers({ commit }, payload) {
+  //   return new Promise((resolve, reject) => {
+  //     request({
+  //       ...apis.indexEcharts.intentionUsers,
+  //       params: { pageSize: 9999, ...payload }
+  //     }).then((data) => {
+  //       resolve(data.records)
+  //     }).catch((err) => {
+  //       reject(err)
+  //     })
+  //   })
+  // },
+  // const dataSource = [
+  //   {
+  //     key: '1',
+  //     name: '胡彦斌',
+  //     age: 32,
+  //     address: '西湖区湖底公园1号',
+  //   },
+  //   {
+  //     key: '2',
+  //     name: '胡彦祖',
+  //     age: 42,
+  //     address: '西湖区湖底公园1号',
+  //   },
+  // ];
+  
+  const columns = [
+    {
+      title: '用户姓名',
+      dataIndex: 'personName',
+      key: 'personName',
+      width: '25%',
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      width: '25%',
+    },
+    {
+      title: '意向楼盘',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      width: '25%',
+    },
+    {
+      title: '意向值',
+      dataIndex: 'intention',
+      key: 'intention',
+      width: '25%',
+    },
+  ];
+
+  function handleBuildingChange (e) {
+    IntentionUsers({  pageNum: 1, pageSize: 5, buildingId: e })
+    setBuildingId(e)
+  }
+
+  //意向客户导出
+  function exportIntentionUsers () {
+    request({
+      ...apis.indexEcharts.exportIntentionUsers,
+      params: { buildingId }
+    }).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()
+    })
+  }
+
+  return (
+    <>
+      <div>
+      <p style={{fontSize:'0.12rem',fontWeight:'600'}}>意向客户</p>
+        <Row>
+          <Col span={22}>
+            <BuildSelect slot='action' onChange={(e => handleBuildingChange(e))} value={buildingId}></BuildSelect>
+          </Col>
+          <Col span={2}>
+            <Button type="primary" onClick={exportIntentionUsers}>导出</Button>
+          </Col>
+        </Row>
+
+        <Table rowKey="IntentionalCustomers" dataSource={data.records} columns={columns} style={{marginTop:'15px'}} pagination={{ total: data.total, defaultPageSize: 5, onChange: e => onChange(e) }} scroll={{ y: 500 }} />
+
+      </div>
+
+    </>
+  )
+}
+
+export default UserBehavior;

estateagents-admin-manager/src/pages/indexEcharts/components/NewUsers.jsx

@@ -0,0 +1,103 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '../../../components/EchartsTest/EChart';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message } from 'antd';
+
+import styles from '../styles.less'
+const formatDate = (start, end) => {
+  const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
+  const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
+  return { startDate, endDate }
+}
+const NewUsers = (props) => {
+  const [data, setData] = useState({ records: [] })
+
+
+  useEffect(() => {
+    NewsUserCount(formatDate(props.startDate, props.endDate))
+  }, [props.startDate, props.endDate])
+
+
+  function NewsUserCount (params) {
+    request({
+      ...apis.indexEcharts.changeNewUser,
+      params,
+    }).then((data) => {
+      setData(data)
+    })
+  }
+
+  const dataZoom=props.dataZoom?[
+    {
+      type: 'inside',
+      start: 0,
+      end: 100
+    },
+    {
+      type: 'slider',
+      start: 0,
+      end: 100
+    },
+  ] : undefined 
+  const dataset = data || []
+  const options = {
+
+   
+      color: ["#FF814C", "#F02B3E"],
+      tooltip: {
+        trigger: "axis"
+      },
+      icon: "rect",
+      legend: {
+        data: ["新用户数", "授权注册"]
+      },
+      toolbox: {},
+      xAxis: {
+        type: "category",
+      },
+      yAxis: {},
+      dataZoom,
+      series: [
+        {
+          name: "新用户数",
+          type: "line",
+          smooth:true, 
+        },
+        {
+          name: "授权注册",
+          type: "line",
+          smooth:true, 
+        }
+      ],
+      dataset: {
+        dimensions: ['createTime', 'fromNum', 'registeredNum'],
+        source: dataset
+      }
+ 
+    
+    
+  }
+
+
+  const piestyles = {
+    width: '100%',
+    height: '400px',
+  }
+
+  return (
+    <>
+      <div>
+        <div >
+          <p onClick={()=>router.push('/statistical/newUsers')}><span style={{borderBottom:'1px solid #f02d40',cursor: 'pointer',fontSize:'0.12rem',fontWeight:'600'}}>新增用户</span> {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}</p>
+       </div>
+        <EChart options={options} style={piestyles}  />
+      </div>
+    </>
+  )
+}
+
+export default NewUsers;

estateagents-admin-manager/src/pages/indexEcharts/components/UserActive.jsx

@@ -0,0 +1,109 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '../../../components/EchartsTest/EChart';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message } from 'antd';
+// import UserSource from './mmm';
+
+import styles from '../styles.less'
+const formatDate = (start, end) => {
+  const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
+  const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
+  return { startDate, endDate }
+}
+const UserSource = (props) => {
+  const [data, setData] = useState({ records: [] })
+  //柱图
+
+  useEffect(() => {
+    UserActive({ dateType: 'day' })
+  }, [])
+
+
+
+  function UserActive (params) {
+    request({
+      ...apis.indexEcharts.userActive,
+      params: { pageSize: 9999, ...params },
+    }).then((data) => {
+  
+      setData(data)
+    })
+  }
+
+  const dataset = (data.selectActiveUserCount) || []
+  const options = {
+
+    tooltip: {},
+    xAxis: { type: 'category' },
+    yAxis: {},
+    series: {
+      type: 'bar',
+      name: '活跃用户',
+      barWidth: 50,
+      data: dataset.map(x => ([x.date, !x.activityCount ? 0 : x.activityCount])),
+      itemStyle: {
+        normal: {
+          barBorderRadius: [50, 50, 0, 0],
+          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+            offset: 0,
+            color: '#FD8A95'
+          }, {
+            offset: 1,
+            color: '#F13043'
+          }]),
+          shadowColor: 'rgba(0, 0, 0, 0.4)',
+
+        }
+      }
+    }
+
+  }
+
+
+  function onChange (value) {
+    UserActive({ dateType: value })
+  }
+
+
+  const piestyles = {
+    width: '100%',
+    height: '400px',
+
+  }
+
+
+  return (
+    <>
+      <div>
+
+
+        <div >
+        <p><span style={{fontSize:'0.12rem',fontWeight:'600'}}>用户活跃数</span></p>
+
+          <Select
+            showSearch
+            style={{ width: 100 }}
+            placeholder="日活跃"
+            optionFilterProp="children"
+            onChange={onChange}
+          >
+            <Option value="day">日活跃</Option>
+            <Option value="month">月活跃</Option>
+
+          </Select>
+        
+       </div>
+
+
+        <EChart options={options} style={piestyles} />
+      </div>
+
+    </>
+  )
+}
+
+export default UserSource;

estateagents-admin-manager/src/pages/indexEcharts/components/UserBehavior.jsx

@@ -0,0 +1,289 @@
+import React, { Component, useState, useEffect } from 'react';
+import EChart from '../../../components/EchartsTest/EChart';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import 'echarts/lib/component/dataZoom'
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message, Modal } from 'antd';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+
+const { Option } = Select;
+
+
+const eventcolumns = [
+  {
+    title: '编号',
+    dataIndex: 'recordId',
+    key: 'recordId',
+    align: 'center',
+    width: '16%',
+  },
+  {
+    title: '访问时间',
+    dataIndex: 'visitTime',
+    key: 'visitTime',
+    align: 'center',
+    width: '18%',
+    render: (x, row) => (
+      <>
+        <span>{ moment(row.visitTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+      </>
+    ),
+  },
+  {
+    title: '离开时间',
+    dataIndex: 'leaveTime',
+    key: 'leaveTime',
+    align: 'center',
+    width: '18%',
+    render: (x, row) => (
+      <>
+        <span>{ row.leaveTime && moment(row.leaveTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+      </>
+    ),
+  },
+]
+
+
+class EventcoModal extends React.Component {
+  constructor(props) {
+    super(props)
+    this.state = {
+      eventList: [],
+      visibleData: { visible: false, row: {} },
+    }
+  }
+
+  componentDidUpdate(prevProps) {
+    if (this.props.visibleData.visible !== prevProps.visibleData.visible) {
+      // eslint-disable-next-line react/no-did-update-set-state
+      this.setState({ visibleData: this.props.visibleData }, () => {
+        this.showDetails(this.props.visibleData.row)
+      })
+    }
+  }
+
+  showDetails = row => {
+    request({
+      ...apis.indexEcharts.userBehavior.profile,
+      params: { event: row.event, personId: row.personId },
+    }).then(data => {
+        this.setState({ eventList: data })
+    })
+  }
+
+  handleOk = e => {
+    this.props.onSuccess()
+  };
+
+  handleCancel = e => {
+    this.props.onSuccess()
+  };
+
+  render() {
+    return (
+      <>
+        <Modal
+          title="访问详情"
+          visible={this.state.visibleData.visible}
+          onOk={() => this.handleOk()}
+          onCancel={() => this.handleCancel()}
+          footer={null}
+        >
+         <Table rowKey="UserBehavior" dataSource={this.state.eventList} columns={eventcolumns} pagination={false} rowKey="eventall" scroll={{ y: 400 }} />
+        </Modal>
+      </>
+    )
+  }
+}
+
+
+const formatDate = (start, end) => {
+  const startDate = `${moment(start).format('YYYY-MM-DDT00:00:00.000')}Z`
+  const endDate = `${moment(end).format('YYYY-MM-DDT23:59:59.999')}Z`
+  return { startDate, endDate }
+}
+const UserBehavior = props => {
+  const [data, setData] = useState({ records: [] })
+  const [visibleData, setVisibleData] = useState({ visible: false, row: {} })
+  const [buildingId, setBuildingId] = useState('')
+
+  // 柱图
+  useEffect(() => {
+    const date = formatDate(props.startDate, props.endDate)
+    getUserBehaviorSummary({
+      ...date,
+      activity: props.activity,
+      event: props.event,
+      eventType: props.eventType,
+      buildingId: props.buildingId,
+    })
+    // getUserBehaviorProfile(formatDate(props.startDate, props.endDate))
+  }, [props.startDate, props.endDate, props.activity, props.event, props.eventType, props.buildingId])
+
+  const [recordList, setList] = useState([])
+  function getUserBehaviorSummary(params) {
+    request({
+      ...apis.indexEcharts.userBehavior.summary,
+      params,
+    }).then(data => {
+      setData(data || {})
+      setList((data.data.records || []).filter(e => e.activity !== '客户'))
+    })
+  }
+
+
+  const seriesMaker = (data.selectUserBehavior || []).filter(e => e.activity !== '客户' && e.activity !== '首页').reduce((series, item) => {
+    let { date, activityCount, activity } = item
+    date = moment(date).format('YYYY-MM-DD')
+    if (!activityCount) activityCount = 0
+
+    // 使用对象, 可以去重
+    series[`${activity}`] = (series[`${activity}`] || []).concat([[date, activityCount]])
+
+    return series;
+  }, {})
+
+
+  const dataZoom = props.dataZoom ? [
+    {
+      type: 'inside',
+      start: 0,
+      end: 100,
+    },
+    {
+      type: 'slider',
+      start: 0,
+      end: 100,
+    },
+  ] : undefined
+
+
+  const options = {
+    title: {},
+    icon: 'rect',
+    legend: {
+      show: true,
+      zlevel: 10,
+      itemGap: 100,
+    },
+    color: ['#F12B3E', '#FE929C', '#647CE1', '#A2B9FF', '#FF844F', '#FFBB9D'],
+    tooltip: {
+      trigger: 'axis',
+    },
+    xAxis: { type: 'category' },
+    yAxis: {},
+    dataZoom,
+    series: Object.keys(seriesMaker).map(x => ({
+        type: 'line',
+        smooth: true,
+        name: x,
+        data: seriesMaker[x],
+      })),
+  }
+  function handleBuildingChange(e) {
+    const date = formatDate(props.startDate, props.endDate)
+    getUserBehaviorSummary({
+      ...date,
+      activity: props.activity,
+      event: props.event,
+      eventType: props.eventType,
+      buildingId: e,
+    })
+    setBuildingId(e)
+  }
+
+  function showDetails(row) {
+    setVisibleData({ visible: true, row })
+  }
+
+  function onSuccess() {
+    setVisibleData({ visible: false, row: {} })
+  }
+
+
+  const style = {
+    width: '100%',
+    height: '400px',
+
+  }
+
+  const columns = [
+    {
+      title: '访问事件',
+      dataIndex: 'eventName',
+      key: 'eventName',
+      align: 'center',
+      width: '16%',
+
+    },
+    {
+      title: '访问用户',
+      dataIndex: 'userName',
+      key: 'userName',
+      align: 'center',
+      width: '15%',
+
+    },
+    {
+      title: '访问次数',
+      dataIndex: 'accessCount',
+      key: 'accessCount',
+      align: 'center',
+      width: '17%',
+
+      render: (x, row) => (
+        <>
+          <span style={{ color: '#EF273A', cursor: 'pointer' }} onClick={() => showDetails(row)}> {row.accessCount}</span>
+        </>
+      ),
+    },
+    {
+      title: '首次访问时间',
+      dataIndex: 'visitTime',
+      key: 'visitTime',
+      align: 'center',
+      width: '18%',
+      render: (x, row) => (
+        <>
+          <span>{ row.visitTime && moment(row.visitTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+        </>
+      ),
+    },
+    {
+      title: '离开时间',
+      dataIndex: 'leaveTime',
+      key: 'leaveTime',
+      width: '18%',
+      align: 'center',
+      render: (x, row) => (
+        <>
+          <span>{ row.leaveTime && moment(row.leaveTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+        </>
+      ),
+    },
+  ]
+
+
+  return (
+    <>
+      <div>
+        <p onClick={() => router.push('/statistical/userBehavior')} style={{cursor: 'pointer'}}>
+          <span style={{ borderBottom: '1px solid #f02d40', color: '#333', fontSize: '0.12rem', fontWeight: '600' }}>用户行为</span>
+          {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}
+        </p>
+        <div style={{ float: 'right', marginTop: '-40px', marginBottom: '20px' }}>
+          {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))} value={buildingId}></BuildSelect>}
+        </div>
+        <EChart options={options} style={style} />
+        {props.tableShow &&
+          <Table rowKey="UserBehaviorTwo" dataSource={recordList} columns={columns} pagination={false} rowKey="userbehavior" scroll={{ y: 500 }} />
+        }
+      </div>
+      <EventcoModal visibleData={visibleData} onSuccess={() => onSuccess()} />
+    </>
+  )
+}
+
+export default UserBehavior

estateagents-admin-manager/src/pages/indexEcharts/components/UserBehaviorIndex.jsx

@@ -0,0 +1,291 @@
+import React, { Component, useState, useEffect } from 'react';
+import EChart from '../../../components/EchartsTest/EChart';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import 'echarts/lib/component/dataZoom'
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message, Modal } from 'antd';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+
+const { Option } = Select;
+
+
+const eventcolumns = [
+  {
+    title: '编号',
+    dataIndex: 'recordId',
+    key: 'recordId',
+    align: 'center',
+    width: '16%',
+  },
+  {
+    title: '访问时间',
+    dataIndex: 'visitTime',
+    key: 'visitTime',
+    align: 'center',
+    width: '18%',
+    render: (x, row) => (
+      <>
+        <span>{moment(row.visitTime).format('YYYY-MM-DD hh:mm:ss')}</span>
+      </>
+    ),
+  },
+  {
+    title: '离开时间',
+    dataIndex: 'leaveTime',
+    key: 'leaveTime',
+    align: 'center',
+    width: '18%',
+    render: (x, row) => (
+      <>
+        <span>{row.leaveTime && moment(row.leaveTime).format('YYYY-MM-DD hh:mm:ss')}</span>
+      </>
+    ),
+  },
+]
+
+
+class EventcoModal extends React.Component {
+  constructor(props) {
+    super(props)
+    this.state = {
+      eventList: [],
+      visibleData: { visible: false, row: {} },
+    }
+  }
+
+  componentDidUpdate(prevProps) {
+    if (this.props.visibleData.visible !== prevProps.visibleData.visible) {
+      // eslint-disable-next-line react/no-did-update-set-state
+      this.setState({ visibleData: this.props.visibleData }, () => {
+        this.showDetails(this.props.visibleData.row)
+      })
+    }
+  }
+
+  showDetails = row => {
+    request({
+      ...apis.indexEcharts.userBehavior.profile,
+      params: { event: row.event, personId: row.personId },
+    }).then(data => {
+      this.setState({ eventList: data })
+    })
+  }
+
+  handleOk = e => {
+    this.props.onSuccess()
+  };
+
+  handleCancel = e => {
+    this.props.onSuccess()
+  };
+
+  render() {
+    return (
+      <>
+        <Modal
+          title="访问详情"
+          visible={this.state.visibleData.visible}
+          onOk={() => this.handleOk()}
+          onCancel={() => this.handleCancel()}
+          footer={null}
+        >
+          <Table rowKey="UserBehavior" dataSource={this.state.eventList} columns={eventcolumns} pagination={false} rowKey="eventall" scroll={{ y: 400 }} />
+        </Modal>
+      </>
+    )
+  }
+}
+
+
+const formatDate = (start, end) => {
+  const startDate = `${moment(start).format('YYYY-MM-DDT00:00:00.000')}Z`
+  const endDate = `${moment(end).format('YYYY-MM-DDT23:59:59.999')}Z`
+  return { startDate, endDate }
+}
+const UserBehaviorIndex = props => {
+  const [data, setData] = useState({ records: [] })
+  const [visibleData, setVisibleData] = useState({ visible: false, row: {} })
+  const [buildingId, setBuildingId] = useState('')
+
+  // 柱图
+  useEffect(() => {
+    const date = formatDate(props.startDate, props.endDate)
+    getUserBehaviorSummary({
+      ...date,
+      activity: props.activity,
+      event: props.event,
+      eventType: props.eventType,
+      buildingId: props.buildingId,
+    })
+    // getUserBehaviorProfile(formatDate(props.startDate, props.endDate))
+  }, [props.startDate, props.endDate, props.activity, props.event, props.eventType, props.buildingId])
+
+  const [recordList, setList] = useState([])
+  function getUserBehaviorSummary(params) {
+    request({
+      ...apis.indexEcharts.userBehavior.tsUserBehavior,
+      params,
+    }).then(data => {
+      setData(data || {})
+      // setList((data.data.records || []).filter(e => e.activity !== '客户'))
+    })
+  }
+
+
+  const seriesMaker = (data.selectUserBehavior || []).filter(e => e.activity !== '客户' && e.activity !== '首页').reduce((series, item) => {
+    let { date, activityCount, activity } = item
+    date = moment(date).format('YYYY-MM-DD')
+    if (!activityCount) activityCount = 0
+
+    // 使用对象, 可以去重
+    series[`${activity}`] = (series[`${activity}`] || []).concat([[date, activityCount]])
+
+    return series;
+  }, {})
+
+
+  const dataZoom = props.dataZoom ? [
+    {
+      type: 'inside',
+      start: 0,
+      end: 100,
+    },
+    {
+      type: 'slider',
+      start: 0,
+      end: 100,
+    },
+  ] : undefined
+
+
+  const options = {
+    title: {},
+    icon: 'rect',
+    legend: {
+      show: true,
+      zlevel: 10,
+      itemGap: 100,
+    },
+    color: ['#F12B3E', '#FE929C', '#647CE1', '#A2B9FF', '#FF844F', '#FFBB9D'],
+    tooltip: {
+      trigger: 'axis',
+    },
+    xAxis: { type: 'category' },
+    yAxis: {},
+    dataZoom,
+    series: Object.keys(seriesMaker).map(x => ({
+      type: 'line',
+      smooth: true,
+      name: x,
+      data: seriesMaker[x],
+    })),
+  }
+  function handleBuildingChange(e) {
+    const date = formatDate(props.startDate, props.endDate)
+    getUserBehaviorSummary({
+      ...date,
+      activity: props.activity,
+      event: props.event,
+      eventType: props.eventType,
+      buildingId: e,
+    })
+    setBuildingId(e)
+  }
+
+  function showDetails(row) {
+    setVisibleData({ visible: true, row })
+  }
+
+  function onSuccess() {
+    setVisibleData({ visible: false, row: {} })
+  }
+
+
+  const style = {
+    width: '100%',
+    height: '400px',
+
+  }
+
+  const columns = [
+    {
+      title: '访问事件',
+      dataIndex: 'eventName',
+      key: 'eventName',
+      align: 'center',
+      width: '16%',
+
+    },
+    {
+      title: '访问用户',
+      dataIndex: 'userName',
+      key: 'userName',
+      align: 'center',
+      width: '15%',
+
+    },
+    {
+      title: '访问次数',
+      dataIndex: 'accessCount',
+      key: 'accessCount',
+      align: 'center',
+      width: '17%',
+
+      render: (x, row) => (
+        <>
+          <span style={{ color: '#EF273A', cursor: 'pointer' }} onClick={() => showDetails(row)}> {row.accessCount}</span>
+        </>
+      ),
+    },
+    {
+      title: '首次访问时间',
+      dataIndex: 'visitTime',
+      key: 'visitTime',
+      align: 'center',
+      width: '18%',
+      render: (x, row) => (
+        <>
+          <span>{row.visitTime && moment(row.visitTime).format('YYYY-MM-DD hh:mm:ss')}</span>
+        </>
+      ),
+    },
+    {
+      title: '离开时间',
+      dataIndex: 'leaveTime',
+      key: 'leaveTime',
+      width: '18%',
+      align: 'center',
+      render: (x, row) => (
+        <>
+          <span>{row.leaveTime && moment(row.leaveTime).format('YYYY-MM-DD hh:mm:ss')}</span>
+        </>
+      ),
+    },
+  ]
+
+
+  return (
+    <>
+      <div>
+        {/* <p onClick={() => router.push('/statistical/userBehavior')} style={{cursor: 'pointer'}}> */}
+        <div style={{marginBottom:'40px'}}>
+          <span style={{ borderBottom: '1px solid #f02d40', color: '#333', fontSize: '0.12rem', fontWeight: '600' }}>用户行为</span>
+          {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}
+          {/* </p> */}
+          <div style={{ float: 'right' }}>
+            {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))} value={buildingId}></BuildSelect>}
+          </div>
+        </div>
+        <EChart options={options} style={style} />
+        {false &&
+          <Table rowKey="UserBehaviorTwo" dataSource={recordList} columns={columns} pagination={false} rowKey="userbehavior" scroll={{ y: 500 }} />
+        }
+      </div>
+      <EventcoModal visibleData={visibleData} onSuccess={() => onSuccess()} />
+    </>
+  )
+}
+
+export default UserBehaviorIndex

estateagents-admin-manager/src/pages/indexEcharts/components/UserConversion.jsx

@@ -0,0 +1,139 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '../../../components/EchartsTest/EChart';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message } from 'antd';
+
+import styles from '../styles.less'
+
+
+const UserSource = props => {
+
+  const [theCurrent, setTheCurrent] = useState({ records: [] })
+  const [conversionRate, setConversionRate] = useState(0)
+  useEffect(() => {
+    UserConversionRate({ conversion: 'authorization_phone' })
+  }, [])
+
+  function UserConversionRate(params) {
+
+    request({
+      ...apis.indexEcharts.userConversion,
+      params,
+    }).then(data => {
+      console.log(data.data_count.registeredCount / data.data_count.pvNum, '1241234')
+      setDataset(data, params.conversion)
+    })
+  }
+
+  function setDataset(data, theStatis) {
+    const { pvNum, ...other } = data.data_count
+
+    // 获取第一个值
+    let num = 0
+    for (const v of Object.keys(other)) {
+      num = other[v]
+      break
+    }
+
+    if (pvNum < num) {
+      setTheCurrent([
+        { name: getStatisName(theStatis), value: '0' },
+        { name: '其余', value:  '0' },
+      ])
+    } else {
+
+      setConversionRate(num / pvNum)
+      setTheCurrent([
+        { name: getStatisName(theStatis), value: num },
+        { name: '其余', value: pvNum - num },
+      ])
+    }
+  }
+
+  function getStatisName(theStatis) {
+    const statisTypes = [
+      { label: '授权手机', value: 'authorization_phone' },
+      { label: '项目收藏', value: 'building_save' },
+      { label: '项目转发', value: 'building_share' },
+      { label: '活动收藏', value: 'activity_save' },
+      { label: '活动转发', value: 'activity_share' },
+      { label: '资讯收藏', value: 'news_save' },
+      { label: '资讯转发', value: 'news_share' },
+      { label: '活动报名', value: 'activity_sign' },
+
+    ]
+    return statisTypes.filter(x => x.value === theStatis)[0].label
+  }
+
+  const options = {
+    legend: {},
+    color: ['#FF7E48', '#dcdcdc'],
+    tooltip: {},
+    series: {
+      type: 'pie',
+      name: '转化率',
+      radius: ['34%', '52%'],
+      avoidLabelOverlap: false,
+      label: {
+        formatter: '{b} {@value}',
+        emphasis: {
+          show: true,
+          formatter: '{d}%',
+          textStyle: {
+            fontSize: '22',
+            fontWeight: 'bold'
+          }
+        }
+      },
+      labelLine: {
+        normal: {
+          show: false
+        }
+      },
+
+      data: theCurrent,
+    },
+  }
+
+  function onChange(e) {
+    UserConversionRate({ conversion: e })
+  }
+  const piestyles = {
+    width: '100%',
+    height: '400px',
+  }
+
+  return (
+    <>
+      <div>
+        <p style={{ fontSize: '0.12rem', fontWeight: '600' }}>转化率</p>
+
+        <Select
+          style={{ width: 200 }}
+          placeholder="授权手机"
+          onChange={onChange}
+        >
+          <Select.Option value="authorization_phone">授权手机</Select.Option>
+          <Select.Option value="building_save">项目收藏</Select.Option>
+          <Select.Option value="building_share">项目转发</Select.Option>
+          <Select.Option value="activity_save">活动收藏</Select.Option>
+          <Select.Option value="activity_share">活动转发</Select.Option>
+          <Select.Option value="news_save">资讯收藏</Select.Option>
+          <Select.Option value="news_share">资讯转发</Select.Option>
+          <Select.Option value="activity_sign">活动报名</Select.Option>
+        </Select>
+        <EChart options={options} style={piestyles} />
+
+
+      </div>
+
+
+    </>
+  )
+}
+
+export default UserSource

estateagents-admin-manager/src/pages/indexEcharts/components/UserSex.jsx

@@ -0,0 +1,92 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '../../../components/EchartsTest/EChart';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message } from 'antd';
+
+import styles from '../styles.less'
+
+const formatDate = (start, end) => {
+  const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
+  const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
+  return { startDate, endDate }
+}
+
+const UserSource = (props) => {
+
+  const [data, setData] = useState({ records: [] })
+  const endDate = new Date()
+  const startDate = moment().subtract(7, 'day').toDate()
+
+  useEffect(() => {
+    UserSex(formatDate(startDate, endDate))
+  }, [])
+
+  function UserSex(params) {
+    request({
+      ...apis.indexEcharts.userSex,
+      params,
+    }).then((data) => {
+      setData(data)
+    })
+  }
+
+  const dataset = (data.selectSexUser) || []
+
+  const options = {
+    title: {
+      text: '性别比例'
+    },
+    legend: {},
+    color: ['#FF7E48', '#dcdcdc'],
+    tooltip: {
+      trigger: 'item',
+      formatter: "{b}: ({d}%)"
+    },
+    series: {
+      type: 'pie',
+      name: '性别比例',
+      center: ['44%', '65%'],
+      radius: ['34%', '52%'],
+      label: {
+        formatter: '{b} {@value}',
+      },
+      data:
+        dataset,
+    }
+  }
+
+
+  const piestyles = {
+    width: '100%',
+    height: '400px',
+    minWidth: '350px'
+
+  }
+
+
+  return (
+    <>
+      <div>
+        {/* <h3>性别比例</h3> */}
+
+
+        <EChart options={options} style={piestyles} />
+
+
+
+
+      </div>
+
+
+
+
+
+    </>
+  )
+}
+
+export default UserSource;

estateagents-admin-manager/src/pages/indexEcharts/components/UserSource.jsx

@@ -0,0 +1,125 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '../../../components/EchartsTest/EChart';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message } from 'antd';
+
+import styles from '../styles.less'
+
+const formatDate = (start, end) => {
+  const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
+  const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
+  return { startDate, endDate }
+}
+
+const UserSource = (props) => {
+  const [xData, setxData] = useState([])
+  const [fromData, setFromData] = useState([])
+  const [registerData, setRegisterData] = useState([])
+  //柱图
+  useEffect(() => {
+    userResource(formatDate(props.startDate, props.endDate))
+  }, [props.startDate, props.endDate])
+
+  function userResource(params) {
+    request({
+      ...apis.indexEcharts.selectPersonFrom,
+      params,
+    }).then((data) => {
+      console.log(data,"222222")
+      setxData(data.tdWxDicts.map(x =>  x.sceneAlias))
+      setFromData(data.tdWxDicts.map(x => x.fromData))
+      setRegisterData(data.tdWxDicts.map(x => x.registerSum))
+      props.onSuccess(data)
+    })
+  }
+
+  const subtitle = '最近7天';
+  const baroptions = {
+    title: { },
+    xAxis: { 
+              type: 'category',
+              data: xData,
+              axisLabel: {rotate: 45}
+            },
+    legend: {
+      left: '20%',
+      data: ['所有用户', '注册用户']
+    },
+
+    tooltip: {},
+
+    yAxis: {},
+    series: [
+      {
+        type: 'bar', name: '所有用户', datasetIndex: 0,
+        barWidth: 20,
+        data: fromData,
+        itemStyle: {
+          normal: {
+            barBorderRadius: [20, 20, 0, 0],
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+              offset: 0,
+              color: '#FFC4A8'
+            }, {
+              offset: 1,
+              color: '#FF7E49'
+            }]),
+            shadowColor: 'rgba(0, 0, 0, 0.4)',
+
+          }
+        }
+      },
+      {
+        type: 'bar',
+        name: '注册用户',
+        barWidth: 20,
+        data: registerData,
+        itemStyle: {
+          normal: {
+            barBorderRadius: [20, 20, 0, 0],
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+              offset: 0,
+              color: '#FE939D'
+            }, {
+              offset: 1,
+              color: '#F0293C'
+            }]),
+            shadowColor: 'rgba(0, 0, 0, 0.4)',
+
+          }
+        }
+
+      },
+    ],
+    // dataset: {
+    //   id: 'bar',
+    //   dimensions: ['fromName', 'userCount', 'registered'],
+    //   source: source,
+    // },
+  }
+
+
+  const barstyle = {
+    width: '100%',
+    height: '480px',
+    minWidth: '400px'
+  }
+
+  return (
+    <>
+      <div>
+      <p onClick={()=>router.push('/statistical/userSource')}><span style={{borderBottom:'1px solid #f02d40',cursor: 'pointer',color:'#333',fontSize:'0.12rem',fontWeight:'600'}}>用户来源</span> {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}</p>
+
+        <EChart options={baroptions} style={barstyle} />
+
+      </div>
+
+    </>
+  )
+}
+
+export default UserSource;

estateagents-admin-manager/src/pages/indexEcharts/components/UserSourceDetail.jsx

@@ -0,0 +1,139 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '../../../components/EchartsTest/EChart';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message } from 'antd';
+
+import styles from '../styles.less'
+
+const formatDate = (start, end) => {
+  const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
+  const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
+  return { startDate, endDate }
+}
+
+const UserSourceDetail = (props) => {
+  const [xData, setxData] = useState([])
+  const [fromData, setFromData] = useState([])
+  const [registerData, setRegisterData] = useState([])
+  //柱图
+  useEffect(() => {
+    userResource(formatDate(props.startDate, props.endDate))
+  }, [props.startDate, props.endDate])
+
+  function userResource(params) {
+    request({
+      ...apis.indexEcharts.selectPersonFromGroupByDay,
+      params,
+    }).then((data) => {
+      setxData(data.map(x =>  x.createTime))
+      setFromData(data.map(x => x.fromNum))
+      setRegisterData(data.map(x => x.registeredNum))
+      props.onSuccess(data)
+    })
+  }
+
+  const subtitle = '最近7天';
+  const baroptions = {
+    title: {
+    },
+    tooltip: {
+        trigger: 'axis'
+    },
+    legend: {
+        data: ['新用户数', '授权注册']
+    },
+    toolbox: {
+        show: true,
+        feature: {
+            dataZoom: {
+                yAxisIndex: 'none'
+            },
+            dataView: {readOnly: false},
+            magicType: {type: ['line', 'bar']},
+            restore: {},
+            saveAsImage: {}
+        }
+    },
+    xAxis: {
+        type: 'category',
+        boundaryGap: false,
+        data: xData
+    },
+    yAxis: {
+        type: 'value',
+        axisLabel: {
+            formatter: '{value} °C'
+        }
+    },
+    series: [
+        {
+            name: '新用户数',
+            type: 'line',
+            data: fromData,
+            markPoint: {
+                data: [
+                    {type: 'max', name: '最大值'},
+                    {type: 'min', name: '最小值'}
+                ]
+            },
+            markLine: {
+                data: [
+                    {type: 'average', name: '平均值'}
+                ]
+            }
+        },
+        {
+            name: '授权注册',
+            type: 'line',
+            data: registerData,
+            markPoint: {
+                data: [
+                    {name: '周最低', value: -2, xAxis: 1, yAxis: -1.5}
+                ]
+            },
+            markLine: {
+                data: [
+                    {type: 'average', name: '平均值'},
+                    [{
+                        symbol: 'none',
+                        x: '90%',
+                        yAxis: 'max'
+                    }, {
+                        symbol: 'circle',
+                        label: {
+                            position: 'start',
+                            formatter: '最大值'
+                        },
+                        type: 'max',
+                        name: '最高点'
+                    }]
+                ]
+            }
+        }
+    ]
+}
+
+  const barstyle = {
+    width: '100%',
+    height: '480px',
+    minWidth: '400px'
+  }
+
+  return (
+    <>
+      <div>
+      <p onClick={()=>router.push('/statistical/userSource')}><span style={{borderBottom:'1px solid #f02d40',cursor: 'pointer',color:'#333',fontSize:'0.12rem',fontWeight:'600'}}>用户来源</span> {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}</p>
+
+        <EChart options={baroptions} style={barstyle} />
+
+      </div>
+
+    </>
+  )
+}
+
+export default UserSourceDetail;

estateagents-admin-manager/src/pages/indexEcharts/components/UserSourcepie.jsx

@@ -0,0 +1,104 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '../../../components/EchartsTest/EChart';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message } from 'antd';
+
+import styles from '../styles.less'
+const formatDate = (start, end) => {
+  const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
+  const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
+  return { startDate, endDate }
+}
+const UserSource = (props) => {
+  const [data, setData] = useState({ records: [] })
+
+
+  useEffect(() => {
+    userResource(formatDate(props.startDate, props.endDate))
+  }, [props.startDate, props.endDate])
+
+  function userResource(params) {
+    request({
+      ...apis.indexEcharts.userResource,
+      params,
+    }).then((data) => {
+      setData(data)
+    })
+  }
+
+  function toEdit() {
+    router.push({
+      pathname: '/statistical/userSource',
+    });
+  }
+
+  const dataset = data || {};
+
+
+  const { person_estate_agent = 0, person_null = 0, person_realty_consultant = 0 } = dataset.pie || {};
+  const pieoptions = {
+    color: ['#6B82E6', '#F02D40', '#FF834E'],
+    legend: {
+      orient: 'vertical',
+      x: 'left',
+      data: ['来源置业', '来源客户', '其他'],
+    },
+    tooltip: {
+      // trigger: 'item',
+      // formatter: "{a} <br/>{b} : {c} ({d}%)"
+    },
+    series: [
+      {
+        name: '用户来源',
+        type: 'pie',
+        center: ['50%', '65%'],
+        radius: ['25%', '40%'],
+        label: {
+          formatter: '{b} {@value}',
+          emphasis: {
+            show: true,
+            formatter: '{d}%',
+            textStyle: {
+              fontSize: '22',
+              fontWeight: 'bold'
+            }
+          },
+        },
+      },
+
+    ],
+
+    dataset: {
+      id: 'pie',
+      source: [
+        { '用户来源': '来源置业', value: person_realty_consultant, },
+        { '用户来源': '来源客户', value: person_estate_agent },
+        { '用户来源': '其他', value: person_null },
+      ]
+    },
+  }
+
+
+  const piestyles = {
+    width: '100%',
+    height: '400px',
+    minWidth: '350px',
+  }
+
+  return (
+    <>
+      <div>
+
+        <EChart options={pieoptions} style={piestyles} />
+
+      </div>
+
+    </>
+  )
+}
+
+export default UserSource;

estateagents-admin-manager/src/pages/indexEcharts/index.jsx

@@ -0,0 +1,92 @@
+
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Row, Col, Tag, Pagination, Modal, DatePicker } from 'antd';
+import router from 'umi/router';
+import request from '../../utils/request'
+import apis from '../../services/apis';
+import UserSource from './components/UserSource.jsx';
+import UserSourcepie from './components/UserSourcepie.jsx';
+import UserBehaviorIndex from './components/UserBehaviorIndex.jsx';
+import UserActive from './components/UserActive';
+import UserSex from './components/UserSex';
+import NewUsers from './components/NewUsers'
+import UserConversion from './components/UserConversion'
+import IntentionalCustomers from './components/IntentionalCustomers'
+import styles from './styles.less'
+import moment from 'moment';
+import CityNums from '../charts/CityNums';
+const indexEcharts = props => {
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [checkData, setCheckData] = useState([])
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    setCheckData(props.checkData)
+  }, [props.checkData]);
+
+  const endDate = new Date()
+
+  const startDate = moment().subtract(7, 'day').toDate()
+
+  function onTabledatas (e) {
+
+  }
+  
+  return (
+
+    <>
+      <div style={{ display: 'flex', width: '100%' }}>
+        {checkData.includes('user_source') &&
+          <div className={styles.bar}>
+            <UserSource endDate={endDate} startDate={startDate} onSuccess={e => onTabledatas(e)}></UserSource>
+          </div>
+        }
+        {checkData.includes('user_source') &&
+          <div className={styles.pie}>
+            <UserSourcepie endDate={endDate} startDate={startDate}></UserSourcepie>
+          </div>
+        }
+      </div>
+      {checkData.includes('urban_distribution') &&
+        <div>
+          <CityNums></CityNums>
+        </div>
+      }
+      {checkData.includes('user_behavior') &&
+        <div className={styles.behavior}>
+          <UserBehaviorIndex tableShow={false} endDate={endDate} startDate={startDate} dataZoom={false}></UserBehaviorIndex>
+        </div>
+      }
+      <div style={{ display: 'flex' }}>
+        {checkData.includes('active_users') &&
+          <div className={styles.bar}>
+            <UserActive ></UserActive>
+          </div>
+        }
+        {checkData.includes('sex_ratio') &&
+          <div className={styles.pie}><UserSex></UserSex> </div>
+        }
+      </div>
+      <div style={{ display: 'flex' }}>
+        {checkData.includes('number_of_new_users') &&
+          <div className={styles.bar}>
+            <NewUsers endDate={endDate} startDate={startDate} dataZoom={false}></NewUsers>
+          </div>
+        }
+        {checkData.includes('conversion_rate') &&
+          <div className={styles.pie}><UserConversion></UserConversion> </div>
+        }
+      </div >
+
+      {checkData.includes('intentional_user') &&
+        <div className={styles.customers}>
+          <IntentionalCustomers></IntentionalCustomers>
+        </div>
+      }
+    </>
+  )
+}
+
+
+export default indexEcharts

estateagents-admin-manager/src/pages/indexEcharts/newUsers.jsx

@@ -0,0 +1,191 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Radio, DatePicker, Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb } from 'antd';
+import { Row, Col, Menu, Dropdown } from 'antd';
+import NewUsers from './components/NewUsers'
+// import XForm, { FieldTypes } from '../../components/XForm';
+import moment from 'moment';
+import router from 'umi/router';
+import EChart from '../../components/EchartsTest/EChart';
+import request from '../../utils/request';
+import apis from '../../services/apis';
+
+
+// const formatDate = (start, end) => {
+//   const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
+//   const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
+//   return { startDate, endDate }
+// }
+
+let columns = [
+  {
+    title: '日期',
+    dataIndex: 'createTime',
+    key: 'createTime',
+  },
+]
+
+let daterange = []
+
+const header = props => {
+
+  const [tableData, setTableData] = useState([])
+  const [endDate, setEndDate] = useState({})
+  const [data, setDate] = useState({})
+  const [userType, setUserType] = useState({})
+  const [startDate, setStartDate] = useState({})
+
+
+  useEffect(() => {
+
+    setEndDate(new Date())
+    setStartDate(moment().subtract(7, 'day').toDate())
+    // setStartDate(moment().subtract(7, 'day').toDate())
+    userResource({ startDate: moment().subtract(7, 'day').toDate(), endDate: new Date() })
+  }, [])
+
+  const { RangePicker } = DatePicker;
+
+  function onChangetime(dates, dateStrings) {
+
+    daterange[1] = `${moment(dateStrings[1]).format('YYYY-MM-DDT00:00:00.000')}Z`
+    daterange[0] = `${moment(dateStrings[0]).format('YYYY-MM-DDT00:00:00.000')}Z`
+
+  }
+
+  const handleSubmit = (e, props) => {
+
+    e.preventDefault();
+
+  }
+
+  const getDataOf = (days) => () => {
+
+
+    setEndDate(new Date())
+    setStartDate(moment().subtract(days, 'day').toDate())
+    userResource({ startDate: moment().subtract(days, 'day').toDate(), endDate: new Date() })
+  }
+
+  function onChange(e) {
+
+
+  }
+
+  function datalist() {
+    setEndDate(daterange[1])
+    setStartDate(daterange[0])
+    userResource({ startDate, endDate })
+
+  }
+
+  function userResource(params) {
+    request({
+      ...apis.indexEcharts.selectPersonFrom,
+      params,
+    }).then((data) => {
+      setDate(data);
+      onTabledatas(data, "all")
+    })
+  }
+
+  const onTabledatas = (e, changeType) => {
+    e.tdWxDicts.map(x => {
+      columns = columns.filter(y => y.key != x.sceneType).concat({
+        title: x.sceneAlias,
+        dataIndex: x.sceneType,
+        key: x.sceneType,
+      })
+    })
+    const data = (e.list || []).reduce((acc, item) => {
+      const { sceneType, fromNum, registeredNum, createTime } = item
+      const num = changeType === 'registered' ? registeredNum : fromNum
+      acc[createTime] = { ...acc[createTime], ...item, [`${sceneType}`]: !num ? 0 : num }
+      return acc
+    }, {})
+
+    const dictData = e.tdWxDicts.reduce((acc, item, index) => {
+      const { sceneType } = item
+      acc[sceneType] = 0
+      return acc
+    }, {})
+
+    const tableData = Object.keys(data).map(k => data[k]).reduce((acc, item, index) => {
+      acc[index] = { ...dictData, ...item }
+      return acc
+    }, [])
+
+    setTableData(tableData)
+
+  }
+
+  function handleSelectChange(e) {
+    setUserType(e)
+    onTabledatas(data, e)
+  }
+
+  function exportUserStats() {
+    console.log(startDate, endDate, userType)
+    request({
+      ...apis.indexEcharts.exportUserStats,
+      params: { startDate, endDate, userType },
+    }).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()
+    })
+  }
+
+  const { Column, ColumnGroup } = Table;
+
+  return (<>
+    <div >
+      <Radio.Group onChange={onChange} buttonStyle="solid" defaultValue="a" style={{ marginBottom: '20px' }}>
+        {/* <Radio.Button value="c" onClick={getDataOf(0)}>今日</Radio.Button> */}
+        <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
+        <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
+      </Radio.Group>
+      <RangePicker
+        style={{ paddingLeft: '30px' }}
+        ranges={{
+          Today: [moment(), moment()],
+          'This Month': [moment().startOf('month'), moment().endOf('month')],
+        }}
+        // showTime
+        // format="YYYY/MM/DD HH:mm:ss"
+        onChange={onChangetime}
+      />
+      <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={datalist}>
+        搜索
+          </Button>
+      <Button onClick={() => router.go(-1)} style={{ float: 'right' }}>返回</Button>
+      <div>
+        <NewUsers BuildSelectHide={true} endDate={endDate} startDate={startDate} dataZoom={true} ></NewUsers>
+        {/* */}
+
+        <Row>
+          <Col span={22}>
+            <Select style={{ width: '180px' }} placeholder="所有用户" onChange={(e) => handleSelectChange(e)}>
+              <Option value='all'>所有用户</Option>
+              <Option value='registered'>注册用户</Option>
+            </Select>
+          </Col>
+          <Col span={2}>
+            <Button type="primary" onClick={exportUserStats}>导出</Button>
+          </Col>
+        </Row>
+
+        <Table style={{ marginTop: '20px' }} dataSource={tableData} columns={columns} pagination={false} scroll={{ y: 500 }}></Table>
+      </div>
+    </div>
+  </>
+  )
+}
+
+export default header

estateagents-admin-manager/src/pages/indexEcharts/styles.less

@@ -0,0 +1,37 @@
+.bar {
+  width: 70%;
+  min-width: 400px;
+  min-height: 560px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
+  border-radius: 12px;
+  margin-right: 30px;
+}
+
+.pie {
+  width: 30%;
+  min-width: 370px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
+  border-radius: 12px;
+
+}
+
+.behavior {
+  width: 100%;
+  height: 586px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
+  border-radius: 12px;
+  margin-bottom: 40px;
+  padding: 40px;
+}
+
+.customers {
+  width: 100%;
+  height: 718px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
+  border-radius: 12px 12px 0px 0px;
+  padding: 40px;
+}

estateagents-admin-manager/src/pages/indexEcharts/userBehavior.jsx

@@ -0,0 +1,237 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Radio, DatePicker, Form, Input, Button, Icon, Select, message, Table, Row, Col, Menu, Dropdown } from 'antd';
+
+import moment from 'moment';
+import UserBehavior from './components/UserBehavior'
+import EChart from '../../components/EchartsTest/EChart';
+import request from '../../utils/request';
+import apis from '../../services/apis';
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import { func } from 'prop-types';
+import router from 'umi/router';
+
+
+// const formatDate = (start, end) => {
+//   const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
+//   const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
+//   return { startDate, endDate }
+// }
+const { Option } = Select;
+
+const header = props => {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [tableData, setTableData] = useState({ records: [] })
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [endDate, setEndDate] = useState({})
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [startDate, setStartDate] = useState({})
+  const daterange = []
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    window.scrollTo(0, 0)
+    setEndDate(new Date())
+    setStartDate(moment().subtract(7, 'day').toDate())
+    getBizEventType()
+    getBizEventList()
+    getProperties()
+    props.form.setFieldsValue({ radioGroup: 'a' })
+  }, [])
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [eventypes, setEventTypes] = useState([])
+  function getBizEventType(row) {
+    request({
+      ...apis.indexEcharts.bizEvent.dict,
+    }).then(data => {
+      const eventType = ['agent', 'main']
+      setEventTypes(data.records.filter(item => !eventType.includes(item.typeId)))
+    })
+  }
+  const [eventList, setEventList] = useState([])
+  function getBizEventList(row) {
+    request({
+      ...apis.indexEcharts.bizEvent.list,
+    }).then(data => {
+      setEventList(data.records)
+    })
+  }
+  const [properties, setProperties] = useState([])
+  function getProperties(row) {
+    request({
+      ...apis.indexEcharts.bizEvent.properties,
+    }).then(data => {
+      setProperties(data.records)
+    })
+  }
+
+  const { RangePicker } = DatePicker;
+
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        const { rangePicker } = values
+        console.log('Received values of form: ', values.rangePicker);
+        setEndDate(rangePicker[1])
+        setStartDate(rangePicker[0])
+      }
+    });
+  }
+
+  const getDataOf = days => () => {
+    setEndDate(new Date())
+    setStartDate(moment().subtract(days, 'day').toDate())
+  }
+
+
+  function redata(e) {
+    console.log('行为回调数据：', e)
+  }
+  const [eventType, setEventType] = useState('')
+  function handleChangeType(value) {
+    setEventType(value)
+  }
+  const [event, setEvent] = useState('')
+  function handleChangeEvent(value) {
+    setEvent(value)
+  }
+  const [activity, setActivity] = useState('')
+  function handleChangeProperty(value) {
+    setActivity(value)
+  }
+
+  const [buildingId, setBuildingId] = useState('')
+  function handleBuildingChange(value) {
+    setBuildingId(value)
+  }
+
+  // 重置
+  function resetQuery() {
+    props.form.resetFields()
+    props.form.setFieldsValue({ radioGroup: 'a' })
+  }
+
+  const columns = [
+    {
+      title: '访问事件',
+      dataIndex: 'personName',
+      key: 'personName',
+      width: '20%',
+    },
+    {
+      title: '访问用户',
+      dataIndex: 'phone',
+      key: 'phone',
+      width: '20%',
+    },
+    {
+      title: '访问次数',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      width: '20%',
+    },
+    {
+      title: '首次访问时间',
+      dataIndex: 'intention',
+      key: 'intention',
+      width: '20%',
+    },
+    {
+      title: '离开时间',
+      dataIndex: 'stion',
+      key: 'stion',
+
+    },
+  ];
+
+  const dataSource = []
+
+  const { getFieldDecorator, getFieldsError, getFieldError, isFieldTouched } = props.form;
+  return (
+    <>
+      <div>
+        <div>
+          <Form layout="inline" onSubmit={handleSubmit}>
+            <Form.Item>
+              {getFieldDecorator('radioGroup')(
+                <Radio.Group buttonStyle="solid">
+                  <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
+                  <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
+                </Radio.Group>,
+              )}
+            </Form.Item>
+            <Form.Item>
+              {getFieldDecorator('rangePicker')(
+                <RangePicker
+                  style={{ paddingLeft: '30px', width: '400px' }}
+                  ranges={{
+                    Today: [moment(), moment()],
+                    'This Month': [moment().startOf('month'), moment().endOf('month')],
+                  }}
+                  // defaultValue={[moment(new Date(new Date().setDate((new Date().getDate() - 6))), 'YYYY-MM-DD HH:MM:SS'), moment(new Date(), 'YYYY-MM-DD HH:MM:SS')]}
+                  showTime
+                />,
+              )}
+            </Form.Item>
+
+            <Button type="primary" htmlType="submit" style={{ marginLeft: '30px', float: 'right' }}>
+              搜索
+            </Button>
+            <Button style={{ marginLeft: '30px', float: 'right' }} onClick={resetQuery}>
+              重置
+            </Button>
+
+            <Button style={{ float: 'right' }} onClick={() => router.go(-1)}>返回</Button>
+
+            <div style={{ display: 'flex', margin: '24px 0' }}>
+              <Form.Item>
+                {getFieldDecorator('buildingId')(
+                  <BuildSelect style={{ width: '14%', minWidth: '160px' }} slot="action" onChange={(e => handleBuildingChange(e))}></BuildSelect>,
+                )}
+              </Form.Item>
+              <Form.Item>
+                {getFieldDecorator('handleType')(
+                  <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="所有事件组" onChange={handleChangeType}>
+                    {eventypes.map(type => (
+                      <Option key={type.typeId}>{type.typeName}</Option>
+                    ))}
+                  </Select>,
+                )}
+              </Form.Item>
+              <Form.Item>
+                {getFieldDecorator('handleEvent')(
+                  <Select style={{ width: '14%', minWidth: '200px', marginLeft: '2%' }} placeholder="请选择事件" onChange={handleChangeEvent}>
+                    {eventList.map(event => (
+                      <Option key={event.eventId}>{event.eventName}</Option>
+                    ))}
+                  </Select>,
+                )}
+              </Form.Item>
+              <Form.Item>
+                {getFieldDecorator('handleProperty')(
+                  <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="请选择属性" onChange={handleChangeProperty}>
+                    {properties.map(property => (
+                      <Option key={property.propertyId}>{property.propertyName}</Option>
+                    ))}
+                  </Select>,
+                )}
+              </Form.Item>
+            </div>
+          </Form>
+        </div>
+
+        <div style={{ margin: '24px 0' }}>
+          <UserBehavior tableShow BuildSelectHide buildingId={buildingId} endDate={endDate} startDate={startDate} eventType={eventType} activity={activity} event={event} dataZoom onReData={e => redata(e)}></UserBehavior>
+        </div>
+
+        {/* <Table dataSource={dataSource} columns={columns} pagination={false} scroll={{ y: 500 }} /> */}
+      </div>
+    </>
+  )
+}
+
+const WrappedHorizontalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedHorizontalLoginForm

estateagents-admin-manager/src/pages/indexEcharts/userSource.jsx

@@ -0,0 +1,207 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions } from 'antd';
+import UserSource from './components/UserSource.jsx';
+import UserSourcepie from './components/UserSourcepie.jsx';
+// import XForm, { FieldTypes } from '../../components/XForm';
+import moment from 'moment';
+import EChart from '../../components/EchartsTest/EChart';
+import request from '../../utils/request';
+import apis from '../../services/apis';
+import router from 'umi/router';
+
+
+const { RangePicker } = DatePicker;
+const { Option } = Select
+
+
+// const formatDate = (start, end) => {
+//   const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
+//   const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
+//   return { startDate, endDate }
+// }
+
+let daterange = []
+let tableTitle = ['类型']
+
+let columns = [
+  {
+    title: '日期',
+    dataIndex: 'createTime',
+    key: 'createTime',
+  },
+  // {
+  //   title: '名片分享',
+  //   dataIndex: '名片分享',
+  //   key: '名片分享',
+  // },
+  // {
+  //   title: '生成海报',
+  //   dataIndex: '生成海报',
+  //   key: '生成海报',
+  // },
+  // {
+  //   title: '小程序搜索',
+  //   dataIndex: '小程序搜索',
+  //   key: '小程序搜索',
+  // },
+  // {
+  //   title: '好友分享',
+  //   dataIndex: '好友分享',
+  //   key: '好友分享',
+  // },
+]
+
+// let columns = [
+//   {
+//     title: '类型',
+//     dataIndex: 'value',
+//     key: 'value',
+//   }
+// ]
+
+class Header extends React.Component {
+
+  constructor(props) {
+    super(props)
+    this.state = {
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      endDate: {},
+      startDate: {}
+    }
+  }
+
+  componentDidMount() {
+    this.setState({ endDate: new Date(), startDate: moment().subtract(7, 'day').toDate() })
+  }
+
+  formatDate = (start, end) => {
+    const tempStartDate = `${moment(start).format('YYYY-MM-DDT00:00:00.000')}Z`
+    const tempEndDate = `${moment(end).format('YYYY-MM-DDT23:59:59.999')}Z`
+    return { startDate: tempStartDate, endDate: tempEndDate }
+  }
+
+  onChangetime = (_dates, dateStrings) => {
+    daterange[1] = dateStrings[1]
+    daterange[0] = dateStrings[0]
+  }
+
+  handleSubmit = (e, props) => {
+
+    e.preventDefault();
+
+  }
+
+  getDataOf = (days) => {
+    this.setState({ endDate: new Date(), startDate: moment().subtract(days, 'day').toDate() })
+  }
+
+  datalist = () => {
+    console.log()
+    this.setState({
+      endDate: daterange[1] === '' ? new Date() : daterange[1],
+      startDate: daterange[0] === '' ? moment().subtract(7, 'day').toDate() : daterange[0],
+    })
+  }
+
+  onSuccess = e => {
+    this.setState({ dataSoures: e }, () => {
+      this.onTabledatas(e)
+    })
+  }
+
+  onTabledatas = (e) => {
+    console.log('this.state.userType: ', this.state.userType)
+    e.tdWxDicts.map(x => {
+      columns = columns.filter(y => y.key != x.sceneType).concat({
+        title: x.sceneAlias,
+        dataIndex: x.sceneType,
+        key: x.sceneType,
+      })
+    })
+    const data = (e.list || []).reduce((acc, item) => {
+      const { sceneType, fromNum, registeredNum, createTime } = item
+      const num = this.state.userType === 'registered' ? registeredNum : fromNum
+      acc[createTime] = { ...acc[createTime], ...item, [`${sceneType}`]: !num ? 0 : num }
+      return acc
+    }, {})
+
+    const dictData = e.tdWxDicts.reduce((acc, item, index) => {
+      const { sceneType } = item
+      acc[sceneType] = 0
+      return acc
+    }, {})
+
+    const tableData = Object.keys(data).map(k => data[k]).reduce((acc, item, index) => {
+      acc[index] = { ...dictData, ...item }
+      return acc
+    }, [])
+
+    this.setState({ tableData })
+
+  }
+
+  handleSelectChange = (e) => {
+    this.setState({ userType: e }, () => {
+      this.onTabledatas(this.state.dataSoures)
+    })
+  }
+
+
+  render() {
+    return (
+      <>
+        <div>
+          <Radio.Group buttonStyle="solid" defaultValue="a">
+            <Radio.Button value="a" onClick={() => this.getDataOf(7)}>最近7天</Radio.Button>
+            <Radio.Button value="b" onClick={() => this.getDataOf(30)}>最近1月</Radio.Button>
+          </Radio.Group>
+          <RangePicker
+            style={{ paddingLeft: '30px' }}
+            ranges={{
+              Today: [moment(), moment()],
+              'This Month': [moment().startOf('month'), moment().endOf('month')],
+            }}
+            // showTime
+            // format="YYYY/MM/DD HH:mm:ss"
+            onChange={(_dates, dateStrings) => this.onChangetime(_dates, dateStrings)}
+          />
+          <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={() => this.datalist()}>
+            搜索
+        </Button>
+          <Button onClick={() => router.go(-1)} style={{ float: 'right' }}>返回</Button>
+          <div>
+
+            <div style={{ display: 'flex' }}>
+              <div style={{
+                width: '1060px',
+                height: '560px',
+                paddingTop: '40px',
+                marginRight: ' 40px',
+              }}>
+                <UserSource BuildSelectHide={true} endDate={this.state.endDate} startDate={this.state.startDate} onSuccess={(e) => this.onSuccess(e)}></UserSource>
+              </div>
+              <div style={{
+                width: '509px',
+                height: '600px',
+                paddingTop: '40px',
+
+              }}>
+                <UserSourcepie endDate={this.state.endDate} startDate={this.state.startDate}></UserSourcepie>
+              </div>
+            </div>
+            <Select style={{ width: '180px' }} placeholder="所有用户" onChange={(e) => this.handleSelectChange(e)}>
+              <Option value='all'>所有用户</Option>
+              <Option value='registered'>注册用户</Option>
+            </Select>
+
+            <Table style={{ marginTop: '20px' }} dataSource={this.state.tableData} columns={columns} pagination={false} scroll={{ y: 500 }}></Table>
+          </div>
+        </div>
+      </>
+    )
+  }
+}
+
+export default Header

estateagents-admin-manager/src/pages/integralMall/GoodsList.jsx

@@ -0,0 +1,219 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Pagination, Modal } from 'antd';
+import router from 'umi/router';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import apis from '../../services/apis';
+import request from '../../utils/request'
+import styles from '../style/GoodsList.less';
+import Navigate from '@/components/Navigate';
+
+const { Option } = Select;
+
+
+function header(props) {
+  // 获取初始化数据
+  const [ data, setData ] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.integralMall.getTaGoods, params: { ...params },}).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+  
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  const changePageNum = (pageNumber) => {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNumber: pageNumber, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 });
+  }
+
+  // 跳转到编辑商品
+  const toEditGoods = (goodsId) => () => {
+    router.push({
+      pathname: '/integralMall/editGoods',
+      query: {
+        goodsId
+      },
+    });
+  }
+
+  
+  const changeGoodsStatus = (row) => () => {
+    const title = row.status === 1 ? '商品在小程序端隐藏，后台可继续编辑重新发布?':'商品会重新显示在小程序端?'
+
+    Modal.confirm({
+      title: title,
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.integralMall.changeTaGoods, data: { ...row },}).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
+        })
+      }
+    });
+  }
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+  const columns = [
+    {
+      title: '商品图片',
+      dataIndex: 'imgUrl',
+      key: 'imgUrl',
+      align: 'center',
+      render: (text, record) => <img src={record.imgUrl} className={styles.touxiang} />,
+    },
+    {
+      title: '商品名称',
+      dataIndex: 'goodsName',
+      key: 'goodsName',
+      align: 'center',
+      render:  (x, row) => <Navigate onClick={toEditGoods(row.goodsId)}>{row.goodsName}</Navigate>,
+    },
+    {
+      title: '所属积分',
+      dataIndex: 'pointPrice',
+      key: 'pointPrice',
+      align: 'center',
+    },
+    {
+      title: '总数量',
+      dataIndex: 'totalNum',
+      key: 'totalNum',
+      align: 'center',
+    },
+    {
+      title: '已兑换数量',
+      dataIndex: 'exchanged',
+      key: 'exchanged',
+      align: 'center',
+      render: (x,row) => <><span>{row.totalNum - row.inventory}</span></>
+    },
+    {
+      title: '剩余数量',
+      dataIndex: 'inventory',
+      key: 'inventory',
+      align: 'center',
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (status)=> <><span>{status == 1 ? '已上架' : '已下架'}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: withActions((x, row) => [
+          <AuthButton name="admin.taGoods.change.put" noRight={null}>
+            {
+              row.status === 1 ?
+              <EditIcon onClick={changeGoodsStatus(row)} type="down" text="下架" /> :
+              <EditIcon onClick={changeGoodsStatus(row)} type="up" text="上架" />
+            }
+          </AuthButton>,
+          <AuthButton name="admin.taGoods.put" noRight={null}>
+            <EditIcon onClick={toEditGoods(row.goodsId)} type="edit" text="编辑" />
+          </AuthButton>,
+        ]),
+    },
+  ];
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('goodsName')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="商品名称"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态">
+              <Option value="1">已上架</Option>
+              <Option value="0">已下架</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('priceLesser')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="价格小"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('priceGreater')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="价格大"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+            <AuthButton name="admin.taGoods.search" noRight={null}>
+              <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+                搜索
+              </Button>
+            </AuthButton>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.taGoods.add.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
+      </AuthButton>
+      <Table rowKey="goodsList" dataSource={data.records} columns={columns} pagination={false} />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/integralMall/achieve.jsx

@@ -0,0 +1,161 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Tabs, Table, Pagination, message, Modal } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import apis from '../../services/apis';
+import request from '../../utils/request';
+import styles from '../style/GoodsList.less';
+import Navigate from '@/components/Navigate';
+
+const { TabPane } = Tabs;
+
+function header(props) {
+  const [ carType, setCarType ] = useState({})
+  const callback = (key) => {
+    setCarType(key)
+    getList({ pageNum: 1, pageSize: 10 , type: key});
+  }
+    
+  // 获取初始化数据
+  const [ data, setData ] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 , type: 'platform'});
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.integralMall.tdPointsRules, params: { ...params },}).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+
+  const changePageNum = (pageNumber) => {
+    getList({ pageNum: pageNumber, pageSize: 10, type: carType })
+  }
+
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, ...values, type: carType})
+      }
+    });
+  }
+
+  const changeStatus = row => () => {
+    const title = row.status === 1 ? '停用后用户操作将不再发放积分，请确认相关免责声明等文案已修订说明?':'启用后用户操作将发放积分'
+
+    Modal.confirm({
+      title,
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.integralMall.change, data: { ...row }}).then(data => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, type: carType})
+        })
+      },
+    });
+  }
+
+  const updateRules = (row) => () => {
+    router.push({
+      pathname: '/integralMall/editAchieve',
+      query: {
+        ruleId: row.ruleId
+      },
+    });
+  }
+
+const columns = [
+    {
+      title: '类型',
+      dataIndex: 'ruleName',
+      key: 'ruleName',
+      align: 'center',
+      render:  (x, row) => <Navigate onClick={updateRules(row)}>{row.ruleName}</Navigate>,
+    },
+    {
+      title: '获取积分',
+      dataIndex: 'pointsAmount',
+      key: 'pointsAmount',
+      align: 'center',
+    },
+    {
+      title: '说明',
+      dataIndex: 'remark',
+      key: 'remark',
+      align: 'center',
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (status) => <span>{status == 1 ? '启用' : '停用'}</span>
+    },
+    {
+      title: '操作时间',
+      dataIndex: 'updateDate',
+      key: 'updateDate',
+      align: 'center',
+      render: (updateDate) => <><span>{updateDate != null ? moment(updateDate).format('YYYY-MM-DD') : ''}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: withActions((x,row) => [
+        <AuthButton name="admin.tdPointsRules.change.put" noRight={null}>
+          <EditIcon type={row.status === 1 ? 'stop' : 'start'} text={row.status === 1 ? '停用' : '启用'} onClick={changeStatus(row)} />
+        </AuthButton>,
+        <AuthButton name="admin.tdPointsRules.put" noRight={null}>
+          <EditIcon type="edit" text="编辑" onClick={updateRules(row)} />
+        </AuthButton>,
+      ]),
+    },
+  ];
+
+  return (
+    <>
+      <Tabs onChange={callback} type="card">
+        <TabPane tab="平台积分" key="platform">
+          <Table rowKey="achieve" style={{ marginTop: '40px' }} dataSource={data.records} columns={columns} pagination={false}/>
+          <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+            <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
+          </div>
+        </TabPane>
+        {/* <TabPane tab="项目积分" key="project">
+          <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+              <Form.Item>
+                {getFieldDecorator('buildingId')(
+                  <BuildSelect />,
+                )}
+              </Form.Item>
+              
+              <Form.Item>
+                <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+                  搜索
+                </Button>
+              </Form.Item>
+          </Form>
+          <Table rowKey="achie" style={{ marginTop: '40px' }} dataSource={data.records} columns={columns} pagination={false}/>
+          <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+            <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
+          </div>
+        </TabPane> */}
+      </Tabs>,
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/integralMall/editAchieve.jsx

@@ -0,0 +1,73 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import channels from '../channel/channelList.less';
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit'
+import router from 'umi/router';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { TextArea } = Input;
+const { Option } = Select;
+
+const header = props => {
+  const ruleId = props.location.query.ruleId
+  const [ ruleData, setRuleData ] = useState({})
+  if(ruleId){
+    useEffect(() => {
+      getRuleData(ruleId);
+    },[])
+
+  // 查询列表
+  const getRuleData = (ruleId) => {
+    request({ ...apis.integralMall.rulesDetail, urlData: { id: ruleId },}).then((data) => {
+        console.log(data)
+        setRuleData(data)
+    })
+  }
+  }
+
+  const fields = [
+    {
+      label: '获取积分',
+      name: 'pointsAmount',
+      type: FieldTypes.Text,
+      value: ruleData.pointsAmount,
+    },
+    {
+      label: '说明',
+      name: 'remark',
+      type: FieldTypes.Text,
+      value: ruleData.remark,
+    }
+  ]
+
+   
+  const handleSubmit = (values) => {
+    if(ruleId){
+      values.ruleId = ruleId
+      request({ ...apis.integralMall.rulesUpdate, data: values,}).then((data) => {
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+      }else{
+       
+      }
+  }
+
+  const cancelPage = () => {
+    router.push({
+      pathname: '/integralMall/achieve',
+    });
+  }
+
+  return (
+    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  )
+}
+
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedNormalLoginForm

estateagents-admin-manager/src/pages/integralMall/editGoods.jsx

@@ -0,0 +1,156 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import channels from '../channel/channelList.less';
+import BuildSelect from '../../components/SelectButton/BuildSelect2'
+import XForm, { FieldTypes } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit'
+import router from 'umi/router';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { TextArea } = Input;
+const { Option } = Select;
+
+const header = props => {
+  const goodsId = props.location.query.goodsId
+  const [ goodsData, setGoodsData ] = useState({})
+  if(goodsId){
+    useEffect(() => {
+      getGoodsData(goodsId);
+    },[])
+
+  // 查询列表
+  const getGoodsData = (goodsId) => {
+    request({ ...apis.integralMall.taGoods, urlData: { id: goodsId },}).then((data) => {
+        console.log(data)
+        setGoodsData(data)
+    })
+  }
+  }
+
+  const fields = [
+    {
+      label: '所属项目',
+      name: 'buildingId',
+      render: <BuildSelect />,
+      value: goodsData.buildingId,
+      rules: [
+        {required: true, message: '请选择所属项目'},
+      ]
+    },
+    {
+      label: '商品封面图',
+      name: 'imgUrl',
+      type: FieldTypes.ImageUploader,
+      value: goodsData.imgUrl,
+      help: '建议图片尺寸：320*320px，比例1:1,格式：jpg，用于商品封面图',
+      rules: [
+        {required: true, message: '请选择商品封面图'},
+      ]
+    },
+    {
+      label: '商品主图',
+      name: 'detailImgUrl',
+      type: FieldTypes.ImageUploader,
+      value: goodsData.detailImgUrl,
+      help: '建议图片尺寸：750*750px，比例1:1,格式：jpg，用于商品主图',
+      rules: [
+        {required: true, message: '请选择商品主图'},
+      ]
+    },
+    {
+      label: '商品名称',
+      name: 'goodsName',
+      type: FieldTypes.Text,
+      value: goodsData.goodsName,
+      rules: [
+        {required: true, message: '请输入商品名称'},
+      ]
+    },
+    {
+      label: '所需积分',
+      name: 'pointPrice',
+      type: FieldTypes.Text,
+      value: goodsData.pointPrice,
+      rules: [
+        {required: true, message: '请输入所需积分'},
+      ]
+    },
+    {
+      label: '商品数量',
+      name: 'totalNum',
+      type: FieldTypes.Text,
+      value: goodsData.totalNum,
+      rules: [
+        {required: true, message: '请输入商品数量'},
+      ]
+    },
+    {
+      label: '剩余数量',
+      name: 'inventory',
+      type: FieldTypes.Text,
+      value: goodsData.inventory,
+      rules: [
+        {required: true, message: '请输入剩余数量'},
+      ]
+    },
+    {
+      label: '商品详情',
+      name: 'goodsDescription',
+      render: <Wangedit />,
+      value: goodsData.goodsDescription,
+    },
+    {
+      label: '状态',
+      name: 'status',
+      type: FieldTypes.Select,
+      dict: [{label:"已上架",value:1},{label:"已下架",value:0}],
+      value: goodsData.status != null ? goodsData.status : 1,
+    },
+    {
+      label: '领取地址',
+      name: 'address',
+      type: FieldTypes.Text,
+      value: goodsData.address,
+      rules: [
+        {required: true, message: '请输入领取地址'},
+      ]
+    },
+  ]
+
+  const handleSubmit = values => {
+    if (values.inventory > values.totalNum) {
+      message.error('商品剩余数量不能大于商品总数量')
+      return
+  }
+
+    if (goodsId) {
+      values.goodsId = goodsId
+      request({ ...apis.integralMall.updateTaGoods, data: values,}).then((data) => {
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+      }else{
+      request({ ...apis.integralMall.addTaGoods, data: values,}).then((data) => {
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+      }
+  }
+
+  const cancelPage = () => {
+    router.push({
+      pathname: '/integralMall/GoodsList',
+    });
+  }
+
+  return (
+    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  )
+}
+
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedNormalLoginForm

estateagents-admin-manager/src/pages/integralMall/exchangeRecords.jsx

@@ -0,0 +1,222 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, DatePicker, Table, Pagination } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import router from 'umi/router';
+import moment from 'moment';
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import apis from '../../services/apis';
+import request from '../../utils/request'
+import AuthButton from '@/components/AuthButton';
+
+/**
+  @param {*} props
+  @returns
+ */
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+function record(props) {
+  const { getFieldDecorator } = props.form
+
+  // 获取初始化数据
+  const [data, setData] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  }, [])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.integralMall.taPointsExchange, params: { ...params }, }).then((data) => {
+      setData(data)
+      console.log("data:", data)
+    })
+  }
+
+  //重置搜索
+  function handleReset() {
+    props.form.resetFields();
+  }
+
+
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        let { exchangeTime, receiveTime, ...submitValue } = values
+        if (null != exchangeTime && exchangeTime.length > 0) {
+          const [startCreateDate, endCreateDate] = exchangeTime
+          submitValue.startCreateDate = moment(startCreateDate).format('YYYY-MM-DD');
+          submitValue.endCreateDate = moment(endCreateDate).format('YYYY-MM-DD');
+        } else {
+          submitValue.startCreateDate = null
+          submitValue.endCreateDate = null
+        }
+
+        if (null != receiveTime && receiveTime.length > 0) {
+          const [startVerifyDate, endVerifyDate] = receiveTime
+          submitValue.startVerifyDate = moment(startVerifyDate).format('YYYY-MM-DD');
+          submitValue.endVerifyDate = moment(endVerifyDate).format('YYYY-MM-DD');
+        } else {
+          submitValue.startVerifyDate = null
+          submitValue.endVerifyDate = null
+        }
+
+        console.log(submitValue)
+        getList({ pageNum: 1, pageSize: 10, ...submitValue })
+      }
+    });
+  }
+
+  const changePageNum = (pageNumber) => {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: pageNumber, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  const columns = [
+
+    {
+      title: '用户姓名',
+      dataIndex: 'personName',
+      key: 'personName',
+      align: 'center',
+    },
+    {
+      title: '用户类型',
+      dataIndex: 'personType',
+      key: 'personType',
+      align: 'center',
+      render: (personType) => <><span>{personType === 'Realty Consultant' ? '置业顾问' : personType === 'Sales Executive' ? '销售主管' : personType === 'estate agent' ? '经纪人' : personType === 'customer' ? '客户' : ''}</span></>
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '商品图片',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center',
+      render: (text, record) => <img src={record.image} className={styles.touxiang} />,
+    },
+    {
+      title: '商品名称',
+      dataIndex: 'targetName',
+      key: 'targetName',
+      align: 'center',
+    },
+    {
+      title: '兑换时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (_, recorde) => <><span>{moment(recorde.createDate).format('YYYY-MM-DD HH:mm')}</span></>,
+    },
+    {
+      title: '领取时间',
+      dataIndex: 'verifyDate',
+      key: 'verifyDate',
+      align: 'center',
+      render: (_, recorde) => <><span>{recorde.verifyDate != null ? moment(recorde.verifyDate).format('YYYY-MM-DD HH:mm') : ''}</span></>,
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (status) => <><span>{status == 1 ? '已领取' : '未领取'}</span></>
+    },
+  ];
+
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <div style={{ display: 'flex' }}>
+          <Form.Item>
+            {getFieldDecorator('personName')(
+              <Input
+                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                placeholder="用户姓名"
+              />,
+            )}
+          </Form.Item>
+          <Form.Item>
+            {getFieldDecorator('phone')(
+              <Input
+                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                placeholder="手机号"
+              />,
+            )}
+          </Form.Item>
+          <Form.Item>
+            {getFieldDecorator('targetName')(
+              <Input
+                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                placeholder="商品名称"
+              />,
+            )}
+          </Form.Item>
+          <Form.Item>
+            {getFieldDecorator('personType')(
+              <Select style={{ minWidth: '1.1rem' }} placeholder="用户类型">
+                <Option value="Realty Consultant">置业顾问</Option>
+                <Option value="customer">客户</Option>
+                <Option value="estate agent">经纪人</Option>
+              </Select>,
+            )}
+          </Form.Item>
+          <Form.Item>
+            {getFieldDecorator('status')(
+              <Select style={{ minWidth: '1.1rem' }} placeholder="状态">
+                <Option value="1">已领取</Option>
+                <Option value="0">未领取</Option>
+              </Select>,
+            )}
+          </Form.Item>
+
+        </div>
+        <div style={{ margin: '10px 0' }}>
+          <Form.Item>
+            <span style={{ marginRight: '10px' }}>兑换时间：</span>
+            {getFieldDecorator('exchangeTime')(
+              <RangePicker placeholder={['开始时间', '结束时间']} />
+            )}
+          </Form.Item>
+          <Form.Item>
+            <span style={{ marginRight: '10px' }}>领取时间：</span>
+            {getFieldDecorator('receiveTime')(
+              <RangePicker placeholder={['开始时间', '结束时间']} />
+            )}
+          </Form.Item>
+          <Form.Item >
+            <AuthButton name="admin.taGoods.exchange" noRight={null}>
+              <Button type="primary" htmlType="submit">
+                搜索
+              </Button>
+            </AuthButton>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+          </Form.Item>
+        </div>
+
+      </Form>
+      <Table rowKey="exchangeRecords" style={{ marginTop: '40px' }} dataSource={data.records} columns={columns} pagination={false} />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'record' })(record);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/integralMall/verifyList.jsx

@@ -0,0 +1,123 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = (props) => {
+  const [data, setData] = useState({})
+
+  useEffect(() => {
+    getVerifyList({ pageNum: 1, pageSize: 10, phone: props.location.query.telValue });
+  }, [])
+
+  // 查询列表
+  const getVerifyList = (params) => {
+    request({ ...apis.integralMall.taPointsExchange, params: { ...params }, }).then((data) => {
+      setData(data)
+    })
+  }
+
+  const changePageNum = (pageNumber) => {
+    getVerifyList({ pageNum: pageNumber, pageSize: 10, phone: props.location.query.telValue })
+  }
+
+  const toBack = () => {
+    router.push({
+      pathname: '/integralMall/writeOff',
+    });
+  }
+
+  const changeStatus = (row) => () => {
+    // console.log(new Date())
+    row.verifyDate = new Date()
+    // console.log('row.verifyDate: ', row.verifyDate)
+    request({ ...apis.integralMall.changeTaPointsExchange, data: row }).then((data) => {
+      message.info("操作成功")
+      getVerifyList({ pageNum: 1, pageSize: 10, phone: props.location.query.telValue })
+    })
+  }
+
+  const columns = [
+    {
+      title: '用户姓名',
+      dataIndex: 'personName',
+      key: 'personName',
+      align: 'center',
+    },
+    {
+      title: '用户类型',
+      dataIndex: 'personType',
+      key: 'personType',
+      align: 'center',
+      render: (personType) => <><span>{personType === 'Realty Consultant' ? '置业顾问' : personType === 'Sales Executive' ? '销售主管' : personType === 'estate agent' ? '经纪人' : personType === 'customer' ? '客户' : ''}</span></>
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '商品图片',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center',
+      render: (text, record) => <img src={record.image} className={styles.touxiang} />,
+    },
+    {
+      title: '商品名称',
+      dataIndex: 'targetName',
+      key: 'targetName',
+      align: 'center',
+    },
+    {
+      title: '兑换时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (createDate) => <><span>{moment(createDate).format('YYYY-MM-DD HH:mm')}</span></>
+    },
+    {
+      title: '领取时间',
+      dataIndex: 'verifyDate',
+      key: 'verifyDate',
+      align: 'center',
+      render: (verifyDate) => <><span>{verifyDate != null ? moment(verifyDate).format('YYYY-MM-DD HH:mm') : ''}</span></>
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (status) => <><span>{status == 1 ? '已领取' : '未领取'}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: (x, row) => <span style={{ color: '#1990FF' }} onClick={changeStatus(row)}>{row.status == 1 ? '' : '核销'}</span>
+
+    },
+  ];
+
+  return (
+    <>
+      <div align="right" style={{marginBottom:'16px'}}><Button onClick={toBack}>返回</Button></div>
+      <Table rowKey="verifyList" dataSource={data.records} columns={columns} pagination={false} />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/integralMall/writeOff.jsx

@@ -0,0 +1,161 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Tabs, Row, Col, Modal, message } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import router from 'umi/router';
+import erweima from '../../assets/erweima.png';
+import saoma from '../../assets/saoma.png';
+import list from '../../assets/list.png';
+import AuthButton from '@/components/AuthButton';
+
+const { TabPane } = Tabs;
+function callback(key) {
+  console.log(key);
+}
+
+/**
+ * @param {*} props
+ * @returns
+ */
+class Dialog extends React.Component {
+  state = {
+    visible: false,
+  };
+
+  showModal = () => {
+    this.setState({ visible: true, });
+  };
+
+  handleCancel = () => {
+    this.setState({ visible: false });
+  };
+
+  onKeyDown = (e) => {
+
+    if (e.keyCode == 13) {
+      this.setState({ visible: false });
+      this.props.onEnter();
+    }
+  }
+
+  render() {
+    const { visible, loading } = this.state;
+    return (
+      <div>
+        <AuthButton name="admin.taPointsExchange.recId.put" noRight={null}>
+          <Button type="primary" onClick={this.showModal} style={{ margin: '80px auto', display: 'block', padding: '6px 46px', backgroundColor: '#EA2323', border: 'none' }}>立即核销</Button>
+        </AuthButton>
+        <Modal
+          style={{ marginTop: '20vh' }}
+          visible={visible}
+          title="核销数据"
+          onCancel={this.handleCancel}
+          footer={[]}
+        >
+          <p>扫描二维码数据</p>
+          <Input placeholder="请用扫描枪扫描二维码" onKeyDown={this.onKeyDown} onChange={this.props.onChange} />
+        </Modal>
+      </div>
+    );
+  }
+}
+
+
+function header(props) {
+  const [telValue, setTelValue] = useState('')
+
+  const changeTel = (e) => {
+    setTelValue(e.target.value)
+  }
+
+  const [codeValue, setCodeValue] = useState('')
+  const changeCode = (e) => {
+
+    setCodeValue(e.target.value)
+
+  }
+
+  const verifyTel = () => {
+    if (telValue === "") {
+      message.error("请输入手机号");
+      return;
+    }
+    router.push({
+      pathname: '/integralMall/verifyList',
+      query: {
+        telValue
+      },
+    });
+  }
+
+
+  const handleEnter = (e) => {
+    if (codeValue === "") {
+      message.error("无二维码数据");
+      return;
+    } else {
+
+      router.push({
+        pathname: '/integralMall/verifyList',
+        query: {
+          telValue:codeValue
+        },
+      });
+    }
+  }
+
+  const { getFieldDecorator } = props.form
+  return (
+    <>
+      <Tabs onChange={callback} type="card">
+        {/* <TabPane tab="扫码核销" key="1">
+          <Row>
+            <Col span={8} style={{ textAlign: 'center' }}>
+              <img src={erweima} style={{ width: '50px', height: '50px', margin: '30px auto' }} />
+              <p>1</p>
+              <p>请用户出示核销的二维码</p>
+              <p>请将网页输入法切换成英文</p>
+            </Col>
+            <Col span={8} style={{ textAlign: 'center' }}>
+              <img src={saoma} style={{ width: '50px', height: '50px', margin: '30px auto' }} />
+              <p>2</p>
+              <p>点击“立即核销”按钮</p>
+              <p>使用扫码枪扫描客户二维码</p>
+            </Col>
+            <Col span={8} style={{ textAlign: 'center' }}>
+              <img src={list} style={{ width: '50px', height: '50px', margin: '30px auto' }} />
+              <p>3</p>
+              <p style={{ margin: '44px auto' }}>根据提示进行核销操作</p>
+            </Col>
+          </Row>
+          <Dialog onEnter={handleEnter} onChange={changeCode} />
+        </TabPane> */}
+        <TabPane tab="手机号核销" key="2">
+          <Row>
+            <Col span={12} style={{ textAlign: 'center' }}>
+              <img src={erweima} style={{ width: '50px', height: '50px', margin: '30px auto' }} />
+              <p>1</p>
+              <p>请输入用户的手机号</p>
+            </Col>
+            <Col span={12} style={{ textAlign: 'center' }}>
+              <img src={list} style={{ width: '50px', height: '50px', margin: '30px auto' }} />
+              <p>2</p>
+              <p>点击“立即核销”按钮</p>
+            </Col>
+          </Row>
+          <div style={{ margin: '110px auto', display: 'block', textAlign: 'center' }}>
+            <Input placeholder="请输入手机号" style={{ width: '200px' }} onChange={changeTel} />
+            <AuthButton name="admin.taPointsExchange.recId.put" noRight={null}>
+              <Button type="primary" style={{ marginLeft: '10px', padding: '0px 46px', backgroundColor: '#EA2323', border: 'none' }} onClick={verifyTel}>立即核销</Button>
+            </AuthButton>
+          </div>
+        </TabPane>
+      </Tabs>,
+    </>
+  )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/miniapp/editIcons.jsx

@@ -0,0 +1,96 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import channels from '../channel/channelList.less';
+import MiniappIconSelect from '../../components/SelectButton/MiniappIconSelect'
+import XForm, { FieldTypes } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit'
+import router from 'umi/router';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { TextArea } = Input;
+const { Option } = Select;
+
+const header = props => {
+  const goodsId = props.location.query.goodsId
+  const [ goodsData, setGoodsData ] = useState({})
+  if(goodsId){
+    useEffect(() => {
+      getGoodsData(goodsId);
+    },[])
+
+  // 查询列表
+  const getGoodsData = (goodsId) => {
+    request({ ...apis.integralMall.taGoods, urlData: { id: goodsId },}).then((data) => {
+        console.log(data)
+        setGoodsData(data)
+    })
+  }
+  }
+
+  const fields = [
+    {
+      label: '请选择首页功能',
+      name: 'iconCode',
+      render: <MiniappIconSelect />,
+      value: goodsData.iconCode,
+      rules: [
+        {required: true, message: '请选择所属项目'},
+      ]
+    },
+    {
+      label: '功能名称',
+      name: 'iconName',
+      type: FieldTypes.Text,
+      value: goodsData.iconName ,
+      help: '不填就使用默认名称',
+    },
+    {
+      label: '权重',
+      name: 'sort',
+      type: FieldTypes.Number,
+      render: <Input type="number" style={{ width: 80}} />,
+      value: goodsData.sort,
+      rules: [
+        { required: true, message: '请输入权重' },
+      ],
+      help: '数字越大越靠前',
+    },
+  ]
+
+  const handleSubmit = values => {
+    if (values.inventory > values.totalNum) {
+      message.error('商品剩余数量不能大于商品总数量')
+      return
+  }
+
+    if (goodsId) {
+      values.goodsId = goodsId
+      request({ ...apis.integralMall.updateTaGoods, data: values,}).then((data) => {
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+      }else{
+      request({ ...apis.integralMall.addTaGoods, data: values,}).then((data) => {
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+      }
+  }
+
+  const cancelPage = () => {
+    router.push({
+      pathname: '/integralMall/GoodsList',
+    });
+  }
+
+  return (
+    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  )
+}
+
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedNormalLoginForm

estateagents-admin-manager/src/pages/miniapp/menuList.jsx

@@ -0,0 +1,220 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal,Breadcrumb } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import router from 'umi/router';
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import apis from '../../services/apis';
+import request from '../../utils/request'
+import AuthButton from '@/components/AuthButton';
+
+const { Option } = Select;
+
+
+function header(props) {
+  // 获取初始化数据
+  const [ data, setData ] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.integralMall.getTaGoods, params: { ...params },}).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+  
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  const changePageNum = (pageNumber) => {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNumber: pageNumber, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 });
+  }
+
+  // 跳转到编辑商品
+  const toEditIcons = (goodsId) => () => {
+    router.push({
+      pathname: '/miniapp/editIcons',
+      query: {
+        goodsId
+      },
+    });
+  }
+
+  
+  const changeGoodsStatus = (row) => () => {
+    const title = row.status === 1 ? '商品在小程序端隐藏，后台可继续编辑重新发布?':'商品会重新显示在小程序端?'
+
+    Modal.confirm({
+      title: title,
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.integralMall.changeTaGoods, data: { ...row },}).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
+        })
+      }
+    });
+  }
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+  const columns = [
+    {
+      title: '商品图片',
+      dataIndex: 'imgUrl',
+      key: 'imgUrl',
+      align: 'center',
+      render: (text, record) => <img src={record.imgUrl} className={styles.touxiang} />,
+    },
+    {
+      title: '商品名称',
+      dataIndex: 'goodsName',
+      key: 'goodsName',
+      align: 'center',
+
+    },
+    {
+      title: '所属积分',
+      dataIndex: 'pointPrice',
+      key: 'pointPrice',
+      align: 'center',
+    },
+    {
+      title: '总数量',
+      dataIndex: 'totalNum',
+      key: 'totalNum',
+      align: 'center',
+    },
+    {
+      title: '已兑换数量',
+      dataIndex: 'exchanged',
+      key: 'exchanged',
+      align: 'center',
+      render: (x,row) => <><span>{row.totalNum - row.inventory}</span></>
+    },
+    {
+      title: '剩余数量',
+      dataIndex: 'inventory',
+      key: 'inventory',
+      align: 'center',
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (status)=> <><span>{status == 1 ? '已上架' : '已下架'}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: (x, row) => (
+        <>
+          <AuthButton name="admin.taGoods.change.put" noRight={null}>
+            <span style={{ color: '#EF273A', marginRight: '20px',cursor: 'pointer' }} onClick={changeGoodsStatus(row)}>
+              {row.status == 1 ? '下架' : '上架'}
+              {<Icon type="shopping-cart" className={styles.shoppingCart} />}
+            </span>
+          </AuthButton>
+          <AuthButton name="admin.taGoods.put" noRight={null}>
+            <span style={{ color: '#FF925C',cursor: 'pointer' }} onClick={toEditIcons(row.goodsId)}>
+              编辑<Icon type="form" className={styles.edit} />
+            </span>
+          </AuthButton>
+        </>
+      ),
+    },
+  ];
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('goodsName')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="商品名称"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态">
+              <Option value="1">已上架</Option>
+              <Option value="0">已下架</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('priceLesser')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="价格小"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('priceGreater')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="价格大"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+            <AuthButton name="admin.taGoods.search" noRight={null}>
+              <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+                搜索
+              </Button>
+            </AuthButton>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.taGoods.add.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toEditIcons()}>新增</Button>
+      </AuthButton>
+      <Table rowKey="goodsList" dataSource={data.records} columns={columns} pagination={false} />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

estateagents-admin-manager/src/pages/news/list/NewsList.jsx

@@ -0,0 +1,354 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Modal, message, Card, Row, Col, Pagination, Alert } from 'antd';
+import moment from 'moment';
+import router from 'umi/router';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import Styles from './style.less';
+import styles from '../../style/GoodsList.less';
+import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import SelectCity from '../../../components/SelectButton/CitySelect'
+import Prompt from 'umi/prompt';
+
+import AuthButton from '@/components/AuthButton';
+import EditIcon from '@/components/EditIcon';
+import Navigate from '@/components/Navigate';
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+const tempDate = [{ code: 's101' }]
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+function body(props) {
+  const { getFieldDecorator } = props.form
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [dataSource, setDataSource] = useState({ records: [] })
+  const [page, setPage] = useState(props.location.query.page || 1)
+
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    if (localStorage.getItem("newsPageParams")) {
+      props.form.setFieldsValue(JSON.parse(localStorage.getItem("newsPageParams")));
+      // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
+
+      getList(JSON.parse(localStorage.getItem("newsPageParams")))
+    } else {
+      localStorage.setItem("newsPageParams", JSON.stringify({ pageNum: 1, pageSize: 6 }));
+      getList({ pageNum: 1, pageSize: 6 })
+    }
+  }, [])
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.news.getList, params: { ...params } }).then(res => {
+      setDataSource(res)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        const { startDate } = values
+        localStorage.setItem("newsPageParams", (JSON.stringify({ pageNum: 1, pageSize: 6, ...values })));
+        getList({ pageNum: 1, pageSize: 6, ...values })
+      }
+    });
+  }
+
+  // 跳转到编辑资讯列表
+  const toEditList = (id) => () => {
+    router.push({
+      pathname: '/news/list/editNewsList',
+      query: {
+        id
+      },
+    });
+  }
+
+
+
+  /**
+   *卡片
+   *
+   * @returns
+   */
+  function CartBody(props) {
+    const { data } = props
+    console.log(data);
+    const cancelPage = () => {
+      router.push({
+        pathname: '/news/list/NewsList',
+      });
+    }
+
+    //删除资讯
+    const changeNewsListStatus = (row, newsId) => () => {
+      Modal.confirm({
+        title: '资讯会被删除，小程序端和后台都无法再看到',
+        okText: '确认',
+        cancelText: '取消',
+        onOk() {
+          request({ ...apis.news.put, urlData: { id: newsId }, data: { ...row, status: -1 } }).then((data) => {
+            message.info('操作成功！')
+            getList(JSON.parse(localStorage.getItem("newsPageParams")));
+          }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+          })
+        }
+      });
+    }
+
+    // 跳转到编辑资讯列表
+    const toEditList = (newsId) => () => {
+      router.push({
+        pathname: '/news/list/editNewsList',
+        query: {
+          newsId,
+        },
+      });
+    }
+
+    //   置顶
+    const topNews = (weightParam, newsId) => () => {
+      const weight = Math.abs(weightParam - 1)
+      request({ ...apis.news.weight, params: { newsId: newsId, weight } }).then((data) => {
+        console.log(data)
+        message.info('操作成功！')
+        getList(JSON.parse(localStorage.getItem("newsPageParams")))
+      }).catch((err) => {
+        console.log(err)
+        message.info(err.msg || err.message)
+      })
+    }
+
+    function cancelRelease(newsId, newsStatus, buildingId, newsTypeId) {
+      console.log("newsId" + newsId + "status" + newsStatus);
+      if (newsStatus === 1) {
+        Modal.confirm({
+          title: '资讯会在小程序端隐藏，后台可继续编辑重新发布',
+          okText: '确认',
+          cancelText: '取消',
+          onOk() {
+            request({ ...apis.news.cancel, data: { "newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId }, urlData: { id: newsId }, }).then((data) => {
+              message.info('操作成功！')
+              getList(JSON.parse(localStorage.getItem("newsPageParams")));
+            }).catch((err) => {
+              console.log(err)
+              message.info(err.msg || err.message)
+            })
+          },
+          onCancel() {
+            console.log('Cancel');
+          },
+        });
+      } else if (newsStatus === 0) {
+        Modal.confirm({
+          title: '确认发布该资讯？',
+          okText: '确认',
+          cancelText: '取消',
+          onOk() {
+            request({ ...apis.news.cancel, data: { "newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId }, urlData: { id: newsId }, }).then((data) => {
+              message.info('操作成功！')
+              getList(JSON.parse(localStorage.getItem("newsPageParams")));
+            }).catch((err) => {
+              console.log(err)
+              message.info(err.msg || err.message)
+            })
+          },
+          onCancel() {
+            console.log('Cancel');
+          },
+        });
+      }
+    }
+
+    return (
+      <Card
+        // hoverable
+        style={{ height: '230px', minWidth: '570px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)', position: 'relative' }}
+        cover={<img alt="example" src={data.newsImg} style={{ borderRadius: '12px 0 0 12px', width: '230px', height: '228px' }}></img>}
+        bodyStyle={{ padding: '10px 20px' }}
+      >
+        <AuthButton name="admin.taNews.top" noRight={null}>
+          <span style={{ position: 'absolute', right: '83px', top: '16px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={topNews(data.weight, data.newsId)}>{data.weight === 1 ? '取消置顶' : '置顶'}</span>
+        </AuthButton>
+
+        <AuthButton name="admin.taNews.id.put" noRight={null}>
+          <span style={{ position: 'absolute', right: '10px', top: '16px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(data.newsId)}>
+            <EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon>
+          </span>
+        </AuthButton>
+        <AuthButton name="admin.taNews.publish" noRight={null}>
+          {data.newsStatus === 0 ?
+            <span style={{ position: 'absolute', left: '250px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', zIndex: 1, cursor: 'pointer' }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
+              <EditIcon text="取消发布" color='#FF4A4A' type="cancel"></EditIcon>
+            </span> :
+            <span style={{ position: 'absolute', left: '250px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', zIndex: 1, cursor: 'pointer' }} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
+              <EditIcon text="发布" color='#ff925c' type="publish"></EditIcon>
+            </span>
+          }
+        </AuthButton>
+        <AuthButton name="admin.taNews.id.delete" noRight={null}>
+          <span style={{ position: 'absolute', right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', zIndex: 1 }} onClick={changeNewsListStatus(data, data.newsId)}>
+            <EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon>
+          </span>
+        </AuthButton>
+        <div style={{ position: 'absolute', left: '240px', top: '0px', padding: '16px 10px', width: '64%' }}>
+          <p style={{
+            fontSize: ' 0.106rem', color: '#333', fontWeight: '600', marginBottom: '10px', overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap',
+            width: '75%',
+          }}><Navigate to={`/news/list/editNewsList?newsId=${data.newsId}`}>{data.newsName}</Navigate></p>
+          <p style={{ fontSize: ' 0.106rem', color: '#555', marginBottom: '8px', display: 'flex' }}>
+            <span style={{ display: 'inline-block', width: '50%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>资讯类型：{data.newsType.newsTypeName}</span>
+            <span>状态：{data.newsStatus == 0 ? "已发布" : "未发布"}</span>
+          </p>
+
+          <p style={{ fontSize: ' 0.106rem', color: '#555', marginBottom: '8px', display: 'flex', alignItems: 'center' }}>
+            <span style={{ display: 'inline-block', width: '50%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>阅读数量：{data.pvNum}</span>
+            <span>转发数量：{data.shareNum}</span>
+          </p>
+
+          <p style={{ fontSize: ' 0.106rem', color: '#555', marginBottom: '8px', display: 'flex', alignItems: 'center' }}>
+            {/* <span style={{ display: 'inline-block', width: '50%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>点赞数量：{data.favorNum}</span> */}
+            <span>收藏数量：{data.saveNum}</span>
+          </p>
+
+          <p style={{ fontSize: ' 0.106rem', color: '#999', marginBottom: '8px' }}>发布时间：{moment(data.createDate).format('YYYY-MM-DD HH:mm:ss')}</p>
+        </div>
+      </Card>
+    )
+  }
+
+
+  // Change 事件
+  function handleSelectChange(e) {
+    // eslint-disable-next-line no-console
+    console.log(e)
+  }
+
+  // 分页
+  function onChange(pageNumber) {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        localStorage.setItem("newsPageParams", JSON.stringify({ pageNum: pageNumber, pageSize: 6, ...values }));
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        getList({ pageNum: pageNumber, pageSize: 6, ...values })
+      }
+    });
+  }
+
+  //重置搜索
+  function handleReset() {
+    props.form.resetFields();
+    localStorage.setItem("newsPageParams", JSON.stringify({ pageNum: 1, pageSize: 6 }));
+    getList({ pageNum: 1, pageSize: 6 })
+  }
+
+  function getDate(value, dateString) {
+    // moment(value).format('YYYY-MM-DD HH:mm:ss')
+    console.log(value, dateString)
+  }
+
+  return (
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+
+        <Form.Item>
+          {getFieldDecorator('cityId')(
+            <SelectCity />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('title')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="请输入标题"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('newsTypeId')(
+            <NewsTypeSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('newsStatus')(
+            <Select style={{ width: '180px' }} placeholder="状态">
+              <Option value="0">已发布</Option>
+              <Option value="1">未发布</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <AuthButton name="admin.news.search" noRight={null}>
+            <Button type="primary" htmlType="submit" >
+              搜索
+            </Button>
+          </AuthButton>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.taNews.post" noRight={null}>
+        <Button type="danger" style={{ padding: '0 40px', margin: '20px 0' }} onClick={toEditList()}>
+          新增
+        </Button>
+      </AuthButton>
+
+      {/* 卡片内容，显示楼盘项目  */}
+      <Row>
+        {
+          dataSource.records.map((item, index) => (
+            <Col span={12}>
+              <CartBody data={item} key={item.buildingId} />
+            </Col>
+          ))
+        }
+      </Row>
+      {/* 分页 */}
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} pageSize={6} onChange={onChange} current={dataSource.current} />
+      </div>
+      <Prompt message={location =>
+        location.pathname.startsWith("/news/list")
+          ? true
+          : localStorage.removeItem("newsPageParams")} />
+    </>
+  );
+}
+const WrappedBody = Form.create({ name: 'body' })(body);
+
+export default WrappedBody

estateagents-admin-manager/src/pages/news/list/editNewsList.jsx

@@ -0,0 +1,398 @@
+import React, { useState, useEffect } from 'react';
+import moment from 'moment';
+import router from 'umi/router';
+import Prompt from 'umi/prompt';
+import { connect } from 'dva';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../../style/GoodsList.less';
+import apis from '../../../services/apis';
+import BuildSelect from '../../../components/SelectButton/BuildSelect2'
+import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
+import  { FieldTypes, createForm } from '../../../components/XForm';
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import request from '../../../utils/request'
+import ImageUploader from '../../../components/XForm/ImageUpload';
+import logo from '../../../assets/logo.png';
+import yinhao from '../../../assets/yinhao.png'
+import touxiang from '../../../assets/touxiang.jpg';
+import poster1 from '../../../assets/poster1.png';
+import poster2 from '../../../assets/poster2.png';
+import xiaochengxu from '../../../assets/xiaochengxu.png'
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+let detailVisible = false;
+let urlVisible = false;
+
+const setExtraData = (data) => {
+  detailVisible = data.newsDetailType == '1'
+  urlVisible = data.newsDetailType == '0'
+}
+
+const handleFormValueChange = (props, changedValues, allValues) => {
+    setExtraData(allValues)
+}
+
+const XForm = createForm({ onValuesChange: handleFormValueChange })
+
+const cancelPage = () =>{
+  router.push({
+    pathname: '/news/list/NewsList',
+  });
+}
+
+const Basic = (props) => {
+  const { data: dynamicData } = props
+  const [ changeBuildingId, setChangeBuildingIdData ] = useState('')
+
+  const handleBuildingChange = (e) => {
+    console.log(e)
+    setChangeBuildingIdData(e)
+  }
+
+  const fields = [
+    {
+      label: '意向项目',
+      name: 'buildingId',
+      render: <BuildSelect onChange={(e => handleBuildingChange(e))}/>,
+      value: dynamicData.buildingId,
+      rules: [
+        {required: true, message: '请选择所属项目'},
+      ]
+    },
+    {
+      label: '资讯列表图',
+      name: 'newsImg',
+      type: FieldTypes.ImageUploader,
+      value: dynamicData.newsImg,
+      help: '建议图片尺寸：320*240px，比例5:4,格式：jpg，用于资讯列表',
+      rules: [
+        {required: true, message: '请选择资讯列表'},
+      ]
+    },
+    {
+      label: '资讯标题',
+      name: 'newsName',
+      type: FieldTypes.Text,
+      value: dynamicData.newsName,
+      rules: [
+        {required: true, message: '请输入资讯标题'},
+      ]
+    },
+    {
+      label: '资讯类型',
+      name: 'newsTypeId',
+      render: <NewsTypeSelect buildingId={changeBuildingId || dynamicData.buildingId}/>,
+      value: dynamicData.newsTypeId,
+      rules: [
+        {required: true, message: '请选择资讯类型'},
+      ]
+    },
+    {
+      label: '资讯详情',
+      name: 'newsDetailType',
+      render: <Radio.Group> 
+              <Radio value={1}>自定义</Radio>
+              <Radio value={0}>公众号链接</Radio>
+              </Radio.Group>,
+      value: dynamicData.newsDetailType - 0,
+      rules: [
+        {required: true, message: '请选择资讯类型'},
+      ]
+    },
+    {
+      label: '详情内容',
+      name: 'newsDetail',
+      render: <Wangedit />,
+      hidden: () => !detailVisible,
+      value: dynamicData.newsDetail,
+      rules: [
+        {required: true, message: '请输入详情内容'},
+      ]
+    },
+    {
+      label: '公众号链接',
+      name: 'newsDetail',
+      type: FieldTypes.Text,
+      hidden: () => !urlVisible,
+      value: dynamicData.newsDetail,
+      help: "只能填写同一主体公众号的文章链接",
+      rules: [
+        {required: true, message: '请输入公众号链接'},
+      ]
+    },
+  ]
+
+  const handleSubmit = val => { 
+    console.log(dynamicData,'12312345')
+    let {...submitValue} = val
+    
+    if(dynamicData.newsId){
+      submitValue.newsId = dynamicData.newsId
+      request({ ...apis.news.put, urlData: {id: dynamicData.newsId}, data: { ...submitValue },}).then((data) => {
+        // cancelPage();
+        message.info("保存成功")
+        console.log(data,'data1')
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+    }else{
+      request({ ...apis.news.post, data: { ...submitValue },}).then((data) => {
+        // cancelPage();
+        message.info("保存成功")
+        router.push({
+          pathname: '/news/list/editNewsList',
+          query: {
+            newsId:data.newsId
+          },
+        });
+        console.log(data,'data2')
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+    }
+  }
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/news/list/NewsList',
+    });
+  }
+  
+  return <XForm onSubmit={handleSubmit} onCancel={cancelPage}  fields={fields}></XForm>
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+ const Edit = (props) => {
+  const [ tab, changeTab ] = useState('basic')
+  const newsId = props.location.query.newsId
+  const [ dynamicData, setDynamicData ] = useState({})
+
+    useEffect(() => {
+      if(newsId){
+        getDynamicData(newsId);
+      }
+    },[newsId])
+
+  // 查询列表
+  const getDynamicData = (newsId) => {
+    request({ ...apis.news.get, urlData: { id: newsId },}).then((data) => {
+      setDynamicData(data)
+      setExtraData(data)
+      // detailVisible = data.newsDetailType == '1'
+      // urlVisible = data.newsDetailType == '0'
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+    }
+
+  const Poster = (props) => {
+    const [inputValue, changeInput] = useState('')
+    const [textAreaValue, changeTextArea] = useState('')
+    const [imgValue, changeImg] = useState('')
+    const [posterId, setPosterId] = useState('')
+
+    if(newsId){
+      useEffect(() => {
+        request({ ...apis.activity.poster, params: {targetId: newsId,targetType: 'news'} }).then((data) => {
+          console.log(data,"2222")
+          if(data.length > 0){
+            setPosterId(data[0].posterId)
+            changeImg(data[0].posterImg)
+            changeTextArea(data[0].posterDescription)
+            changeInput(data[0].posterTitle)
+          }
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+        getMiniappName()
+      }, [])
+    }else{
+      getMiniappName()
+    }
+
+    // 获取小程序名称
+  const [miniappName, setMiniappName] = useState('')
+  function getMiniappName() {
+    request({ ...apis.building.getMiniappName }).then(res => {
+      setMiniappName(res)
+    })
+  }
+    const submitPoster  = () => {
+       if(newsId){
+        if(posterId){
+          request({ ...apis.activity.updatePoster, urlData: {id: posterId}, data: {targetId: newsId,targetType: 'news',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},}).then((data) => {
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+         }else{
+          request({ ...apis.activity.addPoster, data: {targetId: newsId,targetType: 'news',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},}).then((data) => {
+            setPosterId(data.posterId)
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+         }
+       }else{
+        message.warn("请先保存基本信息数据")
+       }
+    }
+
+    return <div>
+      <div style={{ display: 'flex' }}>
+        <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
+          <div style={{ width: '375px', height: '700px', backgroundColor: '#fff', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
+            <img style={{ width: '100%', height: '300px' }} src={imgValue ? imgValue : poster1} alt="" />
+            <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
+              <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} src={touxiang} alt="" />
+              <span style={{ color: '#222', fontWeight: '600', margin: '24px 10px 0 14px', fontSize: '17px' }}>喵喵</span>
+              <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您阅读</span>
+              <span style={{ color: '#999', margin: '25px 0 0 60px', fontSize: '17px' }}>2019.09.21</span>
+            </div>
+            <p style={{
+              margin: '10px 20px', fontSize: '20px', color: '#222', fontWeight: '600',
+              display: '-webkit-box', lineClamp: '3', height: '60px',
+              WebkitLineClamp: '2',
+              WebkitBoxOrient: 'vertical',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis'
+            }}>{inputValue ? inputValue : '海报标题'}</p>
+
+            <img src={yinhao} style={{ width: '30px', marginLeft: '20px' }} alt="" />
+            <p style={{
+              margin: '16px 20px 28px 20px', fontSize: '17px', color: '#999',
+              display: '-webkit-box', lineClamp: '3', height: '72px',
+              WebkitLineClamp: '3',
+              WebkitBoxOrient: 'vertical',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis'
+            }}>{textAreaValue ? textAreaValue : '海报描述'}</p>
+               <div style={{ backgroundColor: '#f1f1f1', padding: '22px 30px', boxShadow: '0px 6px 12px -4px #dcdcdc',position:'relative' }}>
+            <p style={{margin:'0',fontSize:'18px',color:'#888'}}>长按识别小程序码</p>
+            <p style={{margin:'0',fontSize:'18px',color:'#888'}}>进入资讯查看详情</p>
+            <img style={{ width: '80px',position: 'absolute',right:'30px',top:'10px' }} src={xiaochengxu} alt="" />
+          </div>
+      
+          </div>
+          <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
+        </div>
+
+        <div >
+          <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>资讯海报图</p>
+            <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+          </div>
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：640*670px，比例64:67,格式：jpg，用于资讯海报</p>
+          <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
+            <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
+          </div>
+          <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
+            <TextArea rows={5} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+          </div>
+
+        </div>
+      </div>
+      <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
+      <Button onClick={cancelPage}>取消</Button>
+    </div>
+
+  }
+ 
+  const Share = (props) => {
+    const [inputValue, changeInput] = useState('')
+    const [imgValue, changeImg] = useState('')
+    const [shareContentId, setShareContentId] = useState('')
+    
+    if(newsId){
+      useEffect(() => {
+        request({ ...apis.activity.shareContent, params: {targetId: newsId,targetType: 'news'},}).then((data) => {
+          console.log(data,"2222")
+          if(data.length > 0){
+            setShareContentId(data[0].shareContentId)
+            changeImg(data[0].shareContentImg)
+            changeInput(data[0].shareContentTitle)
+          }
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }, [])
+    }
+
+    const submitShare = () => {
+      if(newsId){
+        if(shareContentId){
+          request({ ...apis.activity.updateShareContent, urlData: {id: shareContentId},data: {targetId: newsId,shareContentType: 'news',shareContentImg: imgValue,shareContentTitle: inputValue},}).then((data) => {
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+         }else{
+          request({ ...apis.activity.addShareContent, data: {targetId: newsId,shareContentType: 'news',shareContentImg: imgValue,shareContentTitle: inputValue},}).then((data) => {
+            setShareContentId(data.shareContentId)
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+         }
+       }else{
+        message.warn("请先保存基本信息数据")
+       }
+    }
+
+    return <div style={{ padding: '20px' }}>
+      <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
+        <div>
+          {/* <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />南京云致</p> */}
+          <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '精准获客平台'}</p>
+          <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
+        </div>
+      </div>
+      <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
+        <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
+      </div>
+      <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>资讯分享好友图</p>
+        <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+      </div>
+      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于资讯分享好友</p>
+      <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+      <Button onClick={cancelPage}>取消</Button>
+    </div>
+  }
+
+  return (
+    <div>
+      <div>
+        <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
+          <Radio.Button value="basic">基本信息</Radio.Button>
+          <Radio.Button value="poster">海报图片</Radio.Button>
+          <Radio.Button value="share">分享设置</Radio.Button>
+        </Radio.Group>
+      </div>
+      <div>
+        { tab === 'basic' && <Basic data={dynamicData} /> }
+        { tab === 'poster' && <Poster /> }
+        { tab === 'share' && <Share /> }
+      </div>
+      <Prompt message={location =>
+                          location.pathname.startsWith("/news/list")
+                            ? true
+                            : localStorage.removeItem("newsPageParams")} />
+    </div>
+  );
+ }
+
+export default connect(s => ({ user: s.user.currentUser }))(Edit)