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

src/global.less

   padding: 0;
 }
 .antd-pro-pages-index-echarts-styles-pie,.antd-pro-pages-index-echarts-styles-bar{
-  padding: 26px;
-  margin-bottom: 25px;
+  padding: 40px;
+  margin-bottom: 40px;
 }
 .ant-breadcrumb{
   font-size: 0.1rem;

src/pages/Welcome.jsx

 import request from '../utils/request';
 import apis from '../services/apis';
 
-const header = props => {
+const welcome = (props) => {
 
- const [data, setData] = useState([])
+  const [data, setData] = useState([])
 
-useEffect(() => {
-  getIndexEcharts()
-}, [])
-
-function getIndexEcharts (params) {
-  request({
-    ...apis.indexEcharts.list,
-    params
-  }).then((data) => {
-   setData(data)
-    console.log(data, '11111')
-  })
-}
-  
+  useEffect(() => {
+    getIndexEcharts()
+  }, [])
 
+  function getIndexEcharts(params) {
+    request({
+      ...apis.indexEcharts.list,
+      params
+    }).then((data) => {
+      setData(data)
+      console.log(data, '11111')
+    })
+  }
   return (
     <>
-       <div style={{ display: 'flex',marginBottom:'28px' }}>
-           <div style={{
-            textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(241,43,62,1) 0%,rgba(254,144,155,1) 100%)', height: '100px',
-            boxShadow: '0px  0.11rem 14px -15px rgba(241,43,62,1)',
-            borderRadius: '12px', width: '32%', marginRight: '2%'
-          }}>
-            <span style={{ fontSize: '24px', color: '#fff' }}>总用户 </span>
-            <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectUserCount}</span>
-          </div>
-          <div style={{
-            textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
-            boxShadow: '0px  0.11rem 14px -15px rgba(255,126,74,1)',
-            borderRadius: '12px', width: '32%', marginRight: '2%'
-          }}>
-            <span style={{ fontSize: '24px', color: '#fff' }}>总注册用户 </span>
-            <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectRegisteredCount}</span>
-          </div>
-          <div onClick={()=>router.push('/indexEcharts/newUsers')} style={{
-            textAlign: 'center', display: 'flex', justifyContent: 'center', background: 'linear-gradient(137deg,rgba(107,130,230,1) 0%,rgba(152,175,251,1) 100%)', height: '100px',
-            boxShadow: '0px  0.11rem 14px -15px rgba(107,130,230,1)',
-            borderRadius: '12px', width: '32%',
-          }}>
-            <span style={{ fontSize: '24px', color: '#fff',borderBottom:'1px solid #fff',margin:'30px 0' }}>最近7天新增 </span>
-            <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy', lineHeight: '100px' }}>{data.selectRecentlyCount}</span>
-          </div>
+      <div style={{ display: 'flex', marginBottom: '33px' }}>
+        <div style={{
+          textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(241,43,62,1) 0%,rgba(254,144,155,1) 100%)', height: '100px',
+          boxShadow: '0px  0.11rem 14px -15px rgba(241,43,62,1)',
+          borderRadius: '12px', width: '32%', marginRight: '2%'
+        }}>
+          <span style={{ fontSize: '24px', color: '#fff' }}>总用户 </span>
+          <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectUserCount || '0'}</span>
+        </div>
+        <div style={{
+          textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
+          boxShadow: '0px  0.11rem 14px -15px rgba(255,126,74,1)',
+          borderRadius: '12px', width: '32%', marginRight: '2%'
+        }}>
+          <span style={{ fontSize: '24px', color: '#fff' }}>总注册用户 </span>
+          <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectRegisteredCount || '0'}</span>
+        </div>
+        <div onClick={() => router.push('/indexEcharts/newUsers')} style={{
+          textAlign: 'center', display: 'flex', justifyContent: 'center', background: 'linear-gradient(137deg,rgba(107,130,230,1) 0%,rgba(152,175,251,1) 100%)', height: '100px',
+          boxShadow: '0px  0.11rem 14px -15px rgba(107,130,230,1)',
+          borderRadius: '12px', width: '32%',
+        }}>
+          <span style={{ fontSize: '24px', color: '#fff', borderBottom: '1px solid #fff', margin: '30px 0' }}>最近7天新增 </span>
+          <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy', lineHeight: '100px' }}>{data.selectRecentlyCount || '0'}</span>
         </div>
-        <IndexEcharts style={{ width: '100%'}} onReData={(e) => redata(e)} ></IndexEcharts>
-    
-        {/* <EchartsTest style={{ width: 500, height: 500 }}></EchartsTest> */}
-    
-      </>
+      </div>
+      <IndexEcharts style={{ width: '100%' }} onReData={(e) => redata(e)} ></IndexEcharts>
+    </>
   )
 
 }
+export default welcome
 
-export default  header

src/pages/activity/ActivityList.jsx

     });
   }
 
+   //重置搜索
+   function handleReset() {
+    props.form.resetFields();
+  }
+
+
   const { getFieldDecorator } = props.form
   return (
 
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
           </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
         </Form.Item>
       </Form>
       <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>

src/pages/carouselFigure/advertisingList.jsx

     });
   }
 
+   //重置搜索
+   function handleReset() {
+    props.form.resetFields();
+  }
+
+
   const { getFieldDecorator } = props.form
   return (
 
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
           </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
         </Form.Item>
       </Form>
       <AuthButton name="admin.extendContent.post" noRight={null}>

src/pages/carouselFigure/carouselFigureList.jsx

     });
   }
 
+   //重置搜索
+   function handleReset() {
+    props.form.resetFields();
+  }
+
   const { getFieldDecorator } = props.form
   return (
 
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
           </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
         </Form.Item>
       </Form>
       <AuthButton name="admin.extendContent.post" noRight={null}>

src/pages/charts/CityNums.jsx

   backgroundColor: '#fff',
   title: {
     text: '城市分布',
-    left: 20,
-    top: 20
+    left: 40,
+    top: 40
   },
   tooltip : {
       trigger: 'item',
   }
 
   return (
-    <div style={{ margin: ' 0 0 20px  0', width: '100%', borderRadius: '12px', boxShadow: '0px 0px 9px 1px rgba(0,0,0,0.12)', overflow: 'hidden' }}>
+    <div style={{ marginBottom:'40px', width: '100%', borderRadius: '12px', boxShadow: '0px 0px 9px 1px rgba(0,0,0,0.12)', overflow: 'hidden' }}>
       <Echart options={options} style={{ width: '100%', height: '600px' }} ></Echart>
     </div>
   )

src/pages/customer/customerlist/index.jsx

     getList({ pageNumber: 1, pageSize: 10, customerType: value })
   }
 
+  function handleReset() {
+    props.form.resetFields();
+  }
+
+
   // 这里有个 Bug， 就是 Modal 弹框，会联动出现， 比如 我点击 调整归属的Model弹框， 那么 积分记录的Model弹框莫名其妙的也显示了
   // 所有这里临时解决方法是，弹出一个Modal对话框的时候，把其他的对话框给隐藏
 
             <Button type="primary" htmlType="submit" >
               查询
             </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
         </Form.Item>
       </Form>
 

src/pages/customer/independentList/index.jsx

   }
 
   // 挂载之后
-  componentDidMount() {
+  componentDidMount () {
     this.getList({ pageNumber: 1, pageSize: 5 })
   }
 
-  componentDidUpdate(preProps, preState) {
+  componentDidUpdate (preProps, preState) {
     if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
       this.getList({ pageNumber: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });
 
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
-  handleOk() {
+  handleOk () {
     this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
   }
 
   // 弹框取消按钮
-  handleCancel() {
+  handleCancel () {
     this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
   }
 
-  getList(params) {
+  getList (params) {
     console.log('this.state.visibleData', this.state.visibleData)
     const { customerId } = this.state.visibleData
     if (customerId === '' || customerId === undefined) {
   }
 
   // 分页
-  onChange(pageNum) {
+  onChange (pageNum) {
     this.getList({ pageNumber: pageNum, pageSize: 5 })
   }
 
-  render() {
+  render () {
     const columns = [
       {
         title: '头像',
   }
 
   // 挂载之后
-  componentDidMount() {
+  componentDidMount () {
     const { customerId } = this.state.visibleData
     this.getList({ id: customerId, pageNumber: 1, pageSize: 5 })
   }
 
-  componentDidUpdate(preProps, preState) {
+  componentDidUpdate (preProps, preState) {
     const { customerId } = this.state.visibleData
     if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
       this.getList({ id: customerId, pageNumber: 1, pageSize: 5 })
 
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
-  handleOk() {
+  handleOk () {
     this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
   }
 
   // 弹框取消按钮
-  handleCancel() {
+  handleCancel () {
     this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
   }
 
-  getList(params) {
+  getList (params) {
     const { customerId } = this.props.visibleData
     if (customerId === '' || customerId === undefined) {
       return
   }
 
   // 分页
-  onChange(pageNum) {
+  onChange (pageNum) {
     this.getList({ pageNumber: pageNum, pageSize: 5 })
   }
 
-  render() {
+  render () {
     const columns = [
       {
         title: '头像',
  * @param {*} props
  * @returns
  */
-function body(props) {
+function body (props) {
   const { getFieldDecorator } = props.form
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   }, [])
 
 
-  function openNotificationWithIcon(type, message) {
+  function openNotificationWithIcon (type, message) {
     notification[type]({
       message,
       description:
     });
   }
 
-  function getList(params) {
+  function getList (params) {
     // 网路请求
     request({ ...apis.customer.agents, params: { ...params } }).then(res => {
       setDataSource(res)
   }
 
   // 提交事件
-  function handleSubmit(e) {
+  function handleSubmit (e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [gInviteData, setGInviteData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
   // Change 事件
-  function handleSelectChange(e) {
+  function handleSelectChange (e) {
     // eslint-disable-next-line no-console
     console.log(e)
   }
-  function gM(row) {
+  function gM (row) {
     setGVisibleData({ visible: true, customerId: row.personId, realtyConsultant: row.realtyConsultant })
 
     setGInviteData({ visible: false })
   }
 
-  function Invite(row) {
+  function Invite (row) {
     setGInviteData({ visible: true, customerId: row.personId, realtyConsultant: row.realtyConsultant })
 
     setGVisibleData({ visible: false })
   }
 
   // 分页
-  function onChange(pageNum) {
+  function onChange (pageNum) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     getList({ pageNumber: pageNum, pageSize: 10 })
   }
 
-  function toAudit(cuurentId) {
+  /**
+    * 重置搜索
+    */
+  function handleReset () {
+    props.form.resetFields();
+  }
+
+  function toAudit (cuurentId) {
     router.push({
       pathname: '/customer/recommendCustomer/audit',
       query: {
     })
   }
 
-  function exportIndependen() {
+  function exportIndependen () {
     request({ ...apis.customer.customerRecommendAgentsExport, responseType: 'blob' })
       .then(response => {
         download(response)
       })
   }
 
-  function download(data) {
+  function download (data) {
     if (!data) {
       return
     }
             />,
           )}
         </Form.Item>
-        <Form.Item style={{ position:'absolute',right:'38px' }} >
+        <Form.Item style={{ position: 'absolute', right: '38px' }} >
           <Button type="primary" htmlType="submit" >
             搜索
           </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportIndependen()}  style={{ float: 'right', margin: '20px 0' }}>
+      <Button type="primary" onClick={() => exportIndependen()} style={{ float: 'right', margin: '20px 0' }}>
         导出
       </Button>
       <Table rowKey="independentIndex" dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />

src/pages/customer/recommendCustomer/index.jsx

     })
   }
 
+  
+ /**
+   * 重置搜索
+   */
+  function handleReset() {
+    props.form.resetFields();
+  }
+  
   /**
    *导出数据（推荐用户）
    *
             <Button type="primary" htmlType="submit" >
               搜索
             </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
         </Form.Item>
       </Form>
       <Button type="primary" onClick={() => exportRecommendCustomer()} style={{float:'right',margin:'20px 0'}}>

src/pages/customer/report/index.jsx

       getList({ pageNumber: pageNum, pageSize: 9 })
   }
 
+ /**
+   * 重置搜索
+   */
+  function handleReset() {
+    props.form.resetFields();
+  }
+
   function exportReport() {
     request({ ...apis.customer.customerRecommendReportExport, responseType: 'blob' })
     .then(response => {
             <Button type="primary" htmlType="submit">
               搜索
             </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
         </Form.Item>
       </Form>
       <Button type="primary" onClick={() => exportReport()} style={{ float:'right',margin:'20px 0' }}>

src/pages/indexEcharts/components/UserSourcepie.jsx

     series: [
       {
         type: 'pie',
-        center: ['44%', '65%'],
+        center: ['40%', '65%'],
         radius: ['34%', '52%'],
       },
     ],

src/pages/indexEcharts/styles.less

   background: rgba(255, 255, 255, 1);
   box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
   border-radius: 12px;
-  margin-bottom: 25px;
-  padding: 26px;
+  margin-bottom: 40px;
+  padding: 40px;
 }
 
 .customers {
   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: 26px;
+  padding: 40px;
 }

src/pages/indexEcharts/userBehavior.jsx

   const dataSource = []
 
   return (<>
-    <div style={{
-      backgroundColor: '#fff',
-      padding: '32PX 28px',
-      boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)',
-      borderRadius: '12px',
-      minHeight: '60vh'
-    }}>
+    <div>
       <div>
         <Radio.Group buttonStyle="solid" defaultValue="a">
           <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>

src/pages/integralMall/GoodsList.jsx

     getList({ pageNum: pageNumber, pageSize: 10 })
   }
 
+  function handleReset() {
+    props.form.resetFields();
+  }
 
   // 跳转到编辑商品
   const toEditGoods = (goodsId) => () => {
             <Button type="primary" htmlType="submit" className={styles.searchBtn}>
               搜索
             </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
         </Form.Item>
       </Form>
       <AuthButton name="admin.taGoods.add.post" noRight={null}>

src/pages/integralMall/exchangeRecords.jsx

         setData(data)
     })
   }
+
+  //重置搜索
+  function handleReset() {
+    props.form.resetFields();
+  }
+
+
   
   // 提交事件
   const handleSubmit = (e, props) => {
             <Button type="primary" htmlType="submit">
               搜索
             </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
           </Form.Item>
         </div>
         <div style={{margin:'10px 0'}}>

src/pages/news/list/NewsList.jsx

     getList({ pageNum: pageNumber, pageSize: 6 })
   }
 
+   //重置搜索
+   function handleReset() {
+    props.form.resetFields();
+  }
+  
   function getDate(value, dateString) {
     // moment(value).format('YYYY-MM-DD HH:mm:ss')
     console.log(value, dateString)
           <Button type="primary" htmlType="submit" >
             搜索
           </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
         </Form.Item>
       </Form>
       <AuthButton name="admin.taNews.post" noRight={null}>

src/pages/staff/list/StaffList.jsx

     });
   }
 
+   //重置搜索
+   function handleReset() {
+    props.form.resetFields();
+  }
+
   const { getFieldDecorator } = props.form
   return (
 
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
           </Button>
+          
+   <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
         </Form.Item>
       </Form>
       <Button type="danger" style={{ margin: '20px 0', padding: '2px 36px' }} onClick={toEditStaff()}>新增</Button>

src/pages/system/intention.jsx

 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message,Checkbox,Row, Col } from 'antd';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Checkbox, Row, Col } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import moment from 'moment';
  * @param {*} props
  * @returns
  */
- const Edit = (props) => {
-  const [ data, setData ] = useState([])
-  const [ buildingIdValue, setBuildingIdData ] = useState('')
+const Edit = (props) => {
+  const [data, setData] = useState([])
+  const [buildingIdValue, setBuildingIdData] = useState('')
 
   const changBuilding = (buildingId) => {
     setBuildingIdData(buildingId)
-    request({ ...apis.system.tdBizEventIntention, params: {pageNum: 1, pageSize: 999,buildingId}}).then((data) => {
+    request({ ...apis.system.tdBizEventIntention, params: { pageNum: 1, pageSize: 999, buildingId } }).then((data) => {
       console.log(data)
       setData(data.records)
     })
 
   const changeBox = (x) => (e) => {
     setData(data.map((item) => {
-      return x.eventId === item.eventId ? {...item, checkbox: e.target.checked} : item
+      return x.eventId === item.eventId ? { ...item, checkbox: e.target.checked } : item
     }))
   }
 
   const changeInput = (x) => (e) => {
     setData(data.map((item) => {
-      return x.eventId === item.eventId ? {...item, intention: e.target.value} : item
+      return x.eventId === item.eventId ? { ...item, intention: e.target.value } : item
     }))
   }
 
   const submitValue = () => {
     console.log(buildingIdValue)
-    if(buildingIdValue === ''){
+    if (buildingIdValue === '') {
       return
     }
-    request({ ...apis.system.taBuildingIntentionAddOrUpdate, urlData: {id: buildingIdValue}, data,}).then((data) => {
+    request({ ...apis.system.taBuildingIntentionAddOrUpdate, urlData: { id: buildingIdValue }, data, }).then((data) => {
       message.info("保存成功")
     })
   }
 
   return (
     <>
-    <Row>
-      <Col span={12}>
-        <BuildSelect onChange={changBuilding}/>
-      </Col>
-    </Row>
-    <Row style={{margin:'10px 0'}}>
-      <Col span={5} offset={2}>
-        用户操作
-      </Col>
-      <Col span={3} offset={3}>
-        意向值
-      </Col>
-    </Row>
-    {data.map((x) => {
-      return <Row>
-                <Col span={5} offset={2}>
-                  <Checkbox checked={x.checkbox} onChange={changeBox(x)}>{x.eventName}</Checkbox>
-                </Col>
-                <Col span={3} offset={3}>
-                  <Input value={x.intention} onChange={changeInput(x)}/>
-                </Col>
-              </Row>
-    })}
-    <Row>
-      <AuthButton name="admin.taBuildingIntentionAddOrUpdate.buildingId.post" noRight={null}>
-        <Button type="primary" className={styles.searchBtn} onClick={submitValue}>确定</Button>
-      </AuthButton>
-    </Row>
+      <Row>
+        <Col span={6}>
+          <BuildSelect onChange={changBuilding} />
+        </Col>
+        <Col span={5} style={{ lineHeight: '30px' }}>
+          用户操作
+        </Col>
+        <Col span={5} offset={2} style={{ lineHeight: '30px' }}>
+          意向值
+        </Col>
+        <Col span={2} offset={4}>
+          <AuthButton name="admin.taBuildingIntentionAddOrUpdate.buildingId.post" noRight={null}>
+            <Button type="primary" className={styles.searchBtn} onClick={submitValue}>确定</Button>
+          </AuthButton>
+        </Col>
+      </Row>
+      {data.map((x) => {
+        return <Row style={{margin:'5px 0'}}>
+          <Col span={6}>
+
+          </Col>
+          <Col span={5} >
+            <Checkbox checked={x.checkbox} onChange={changeBox(x)}>{x.eventName}</Checkbox>
+          </Col>
+          <Col span={5} offset={2}>
+            <Input value={x.intention} onChange={changeInput(x)} />
+          </Col>
+          <Col span={2} offset={4}>
+
+          </Col>
+
+        </Row>
+      })}
     </>
   );
- }
+}