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

src/global.less

@@ -98,6 +98,9 @@ ol {
   background: #FF7E48;
   border-color: #FF7E48;
 }
+.ant-radio-button-wrapper:not(:first-child)::before{
+  background: #FF7E48;
+}
 .ant-row.ant-form-item .ant-form-item-label.ant-col-sm-3{
   min-width: 100px;
 }
@@ -105,7 +108,7 @@ ol {
   padding: 0;
 }
 .antd-pro-pages-index-echarts-styles-pie,.antd-pro-pages-index-echarts-styles-bar{
-  padding: 0.1rem;
+  padding: 26px;
   margin-bottom: 25px;
 }
 .ant-breadcrumb{

src/pages/Welcome.jsx

@@ -1,76 +1,66 @@
-import React, { useEffect, useState } from 'react';
+import React, { Component, useState, useEffect } from 'react';
 import { Card, Typography, Alert, Row, Col } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import EchartsTest from '../components/EchartsTest';
 import IndexEcharts from './indexEcharts/index';
 import router from 'umi/router';
+import request from '../utils/request';
 import apis from '../services/apis';
-import request from '../utils/request'
-const Welcome = (props) => {
 
-  const option = {
-    xAxis: {
-      type: 'category',
-      data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-    },
-    yAxis: {
-      type: 'value'
-    },
-    series: [{
-      data: [820, 932, 901, 934, 1290, 1330, 1320],
-      type: 'line'
-    }]
-  };
-  useEffect(() => {
-    echratsInfo();
-  }, [])
-  const [data, setData] = useState({ records: [] })
-  function echratsInfo(params) {
-    request({
-      ...apis.indexEcharts.list,
-      params,
-    }).then((data) => {
-      setData(data)
-      console.log(data, "666666666666666666666666666666")
+const header = props => {
 
-    })
-  }
+ const [data, setData] = useState([])
+
+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 || '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 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>
-      </div>
-      <IndexEcharts style={{ width: '100%' }}></IndexEcharts>
-
-      {/* <EchartsTest style={{ width: 500, height: 500 }}></EchartsTest> */}
-
-    </>
+        <IndexEcharts style={{ width: '100%'}} onReData={(e) => redata(e)} ></IndexEcharts>
+    
+        {/* <EchartsTest style={{ width: 500, height: 500 }}></EchartsTest> */}
+    
+      </>
   )
-}
-export default Welcome;
 
+}
 
+export default  header

src/pages/charts/CityNums.jsx

@@ -128,7 +128,7 @@ const CityNums = (props) => {
   }
 
   return (
-    <div style={{ margin: ' 0 0 20px  0', width: '100%', borderRadius: '8px', boxShadow: '0px 0px 9px 1px rgba(0,0,0,0.12)', overflow: 'hidden' }}>
+    <div style={{ margin: ' 0 0 20px  0', 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/independentList/index.jsx

@@ -18,8 +18,8 @@ class ModalTable extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-       dataSource: { records: [] },
-       visibleData: { visible: false, customerId: '', realtyConsultant: '' },
+      dataSource: { records: [] },
+      visibleData: { visible: false, customerId: '', realtyConsultant: '' },
     }
   }
 
@@ -69,7 +69,7 @@ class ModalTable extends React.Component {
     })
   }
 
-   // 分页
+  // 分页
   onChange(pageNum) {
     this.getList({ pageNumber: pageNum, pageSize: 5 })
   }
@@ -79,7 +79,7 @@ class ModalTable extends React.Component {
       {
         title: '头像',
         // eslint-disable-next-line jsx-a11y/alt-text
-        render: (text, records) => <img src={records.picture } width={50} height={50} />,
+        render: (text, records) => <img src={records.picture} width={50} height={50} />,
       },
       {
         title: '用户名',
@@ -95,7 +95,7 @@ class ModalTable extends React.Component {
         title: '性别',
         dataIndex: 'sex',
         key: 'sex',
-        render: (text, records) => <span>{ records.sex === 1 ? '男' : '女' }</span>,
+        render: (text, records) => <span>{records.sex === 1 ? '男' : '女'}</span>,
       },
       {
         title: '意向项目',
@@ -111,29 +111,29 @@ class ModalTable extends React.Component {
         title: '状态',
         // eslint-disable-next-line consistent-return
         render: (text, records) => {
-                                    if (records.status === 1) { return '报备' }
-                                    if (records.status === 2) { return '到访' }
-                                    if (records.status === 3) { return '认购' }
-                                    if (records.status === 4) { return '签约' }
-                                    if (records.verifyStatus === 1) { return '待审核' }
-                                    if (records.verifyStatus === 2) { return '审核同意' }
-                                    if (records.verifyStatus === 3) { return '签约' }
-                                  },
+          if (records.status === 1) { return '报备' }
+          if (records.status === 2) { return '到访' }
+          if (records.status === 3) { return '认购' }
+          if (records.status === 4) { return '签约' }
+          if (records.verifyStatus === 1) { return '待审核' }
+          if (records.verifyStatus === 2) { return '审核同意' }
+          if (records.verifyStatus === 3) { return '签约' }
+        },
       },
     ]
     return (
       <>
         <Modal
-            title="推荐客户"
-            destroyOnClose="true"
-            width={900}
-            footer={null}
-            visible={this.state.visibleData.visible}
-            // onOk={() => this.handleOk()}
-            onCancel={(e) => this.handleCancel(e)}
-          >
-            <Table rowKey="independentList" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
-          </Modal>
+          title="推荐客户"
+          destroyOnClose="true"
+          width={900}
+          footer={null}
+          visible={this.state.visibleData.visible}
+          // onOk={() => this.handleOk()}
+          onCancel={(e) => this.handleCancel(e)}
+        >
+          <Table rowKey="independentList" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+        </Modal>
       </>
     );
   }
@@ -147,8 +147,8 @@ class InviteTable extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-       dataSource: { records: [] },
-       visibleData: { visible: false, customerId: '', realtyConsultant: '' },
+      dataSource: { records: [] },
+      visibleData: { visible: false, customerId: '', realtyConsultant: '' },
     }
   }
 
@@ -178,7 +178,7 @@ class InviteTable extends React.Component {
   }
 
   getList(params) {
-     const { customerId } = this.props.visibleData
+    const { customerId } = this.props.visibleData
     if (customerId === '' || customerId === undefined) {
       return
     }
@@ -197,7 +197,7 @@ class InviteTable extends React.Component {
     })
   }
 
-   // 分页
+  // 分页
   onChange(pageNum) {
     this.getList({ pageNumber: pageNum, pageSize: 5 })
   }
@@ -209,7 +209,7 @@ class InviteTable extends React.Component {
         dataIndex: 'img',
         key: 'img',
         align: 'center',
-        render: (text, record) => <img src={record.avatarurl}  width = {50} height = {50}/>,
+        render: (text, record) => <img src={record.avatarurl} width={50} height={50} />,
       },
       {
         title: '用户姓名',
@@ -229,22 +229,22 @@ class InviteTable extends React.Component {
         dataIndex: 'sex',
         key: 'sex',
         align: 'center',
-        render: (text, list) => <span>{ list.sex === 1 ? '男' : '女' }</span>,
+        render: (text, list) => <span>{list.sex === 1 ? '男' : '女'}</span>,
       },
     ]
     return (
       <>
         <Modal
-            title="推荐客户"
-            destroyOnClose="true"
-            width={900}
-            footer={null}
-            visible={this.state.visibleData.visible}
-            // onOk={() => this.handleOk()}
-            onCancel={(e) => this.handleCancel(e)}
-          >
-            <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
-          </Modal>
+          title="推荐客户"
+          destroyOnClose="true"
+          width={900}
+          footer={null}
+          visible={this.state.visibleData.visible}
+          // onOk={() => this.handleOk()}
+          onCancel={(e) => this.handleCancel(e)}
+        >
+          <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+        </Modal>
       </>
     );
   }
@@ -318,7 +318,7 @@ function body(props) {
   // 分页
   function onChange(pageNum) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-      getList({ pageNumber: pageNum, pageSize: 10 })
+    getList({ pageNumber: pageNum, pageSize: 10 })
   }
 
   function toAudit(cuurentId) {
@@ -332,11 +332,11 @@ function body(props) {
 
   function exportIndependen() {
     request({ ...apis.customer.customerRecommendAgentsExport, responseType: 'blob' })
-    .then(response => {
-      download(response)
-    }).catch(error => {
+      .then(response => {
+        download(response)
+      }).catch(error => {
 
-    })
+      })
   }
 
   function download(data) {
@@ -374,13 +374,13 @@ function body(props) {
       dataIndex: 'gender',
       key: 'gender',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{ record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知' }</span></>,
+      render: (_, record) => <><span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span></>,
     },
     {
       title: '类型',
       dataIndex: 'personType',
       key: 'personType',
-      render: (_, record) => <><span>{ record.channelName !== null ? '渠道经纪人' : '独立经纪人' }</span></>,
+      render: (_, record) => <><span>{record.channelName !== null ? '渠道经纪人' : '独立经纪人'}</span></>,
     },
     {
       title: '所属渠道',
@@ -412,7 +412,7 @@ function body(props) {
 
   return (
     <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex', alignItems: 'center' }}>
         <Form.Item>
           {getFieldDecorator('name')(
             <Input
@@ -429,19 +429,19 @@ function body(props) {
             />,
           )}
         </Form.Item>
-        <Form.Item>
-            <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
-              搜索
-            </Button>
+        <Form.Item style={{ position:'absolute',right:'38px' }} >
+          <Button type="primary" htmlType="submit" >
+            搜索
+          </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportIndependen()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px' }}>
-        导出数据
+      <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 }} />
-            {/* 调整归属 */}
-        <ModalTable visibleData={gVisibleData} />
-        <InviteTable visibleData={gInviteData} />
+      {/* 调整归属 */}
+      <ModalTable visibleData={gVisibleData} />
+      <InviteTable visibleData={gInviteData} />
     </>
   );
 }

src/pages/customer/independentList/style.less

@@ -1,12 +1,12 @@
 .SubmitButton {
   background: rgba(239,39,58,1);
-  border-radius: 7px;
+  border-radius: 6px;
   border: 0px;
 }
 .SelectFrom {
   width: 180px;
   background: #ffffff;
-  border-radius: 7px;
+  border-radius: 6px;
   border: 1px solid #dbdbdb;
 }
 .addButton {

src/pages/customer/recommendCustomer/index.jsx

@@ -171,7 +171,7 @@ function body(props) {
 
   return (
     <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{display:'flex'}}>
         <Form.Item>
           {getFieldDecorator('name')(
             <Input
@@ -207,14 +207,14 @@ function body(props) {
             </Select>,
           )}
         </Form.Item>
-        <Form.Item>
-            <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
+        <Form.Item style={{ position:'absolute',right:'38px' }}>
+            <Button type="primary" htmlType="submit" >
               搜索
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportRecommendCustomer()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px' }}>
-        导出数据
+      <Button type="primary" onClick={() => exportRecommendCustomer()} style={{float:'right',margin:'20px 0'}}>
+        导出
       </Button>
       <Table rowKey="recommendCustomer" dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
     </>

src/pages/customer/report/index.jsx

@@ -133,7 +133,7 @@ function body(props) {
 
   return (
     <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{display:'flex'}}>
         <Form.Item>
           {getFieldDecorator('name')(
             <Input
@@ -173,14 +173,14 @@ function body(props) {
             <BuildSelect />,
           )}
         </Form.Item>
-        <Form.Item>
+        <Form.Item style={{ position:'absolute',right:'38px' }}>
             <Button type="primary" htmlType="submit">
               搜索
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportReport()} className={Styles.SubmitButton} style={{ marginTop: '5px' }}>
-        导出数据
+      <Button type="primary" onClick={() => exportReport()} style={{ float:'right',margin:'20px 0' }}>
+        导出
       </Button>
       <Table rowKey="report" style={{marginTop:'40px'}} dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
     </>

src/pages/indexEcharts/styles.less

@@ -11,7 +11,6 @@
 .pie {
   width: 30%;
   min-width: 370px;
-  height: 560px;
   background: rgba(255, 255, 255, 1);
   box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
   border-radius: 12px;
@@ -25,7 +24,7 @@
   box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
   border-radius: 12px;
   margin-bottom: 25px;
-  padding: 40px;
+  padding: 26px;
 }
 
 .customers {
@@ -34,5 +33,5 @@
   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;
+  padding: 26px;
 }

src/pages/integralMall/exchangeRecords.jsx

@@ -155,7 +155,7 @@ function record(props) {
           </Form.Item>
           <Form.Item>
             {getFieldDecorator('personType')(
-              <Select style={{ width: '220px' }} placeholder="用户类型">
+              <Select style={{ minWidth: '1.1rem' }} placeholder="用户类型">
                 <Option value="Realty Consultant">置业顾问</Option>
                 <Option value="Sales Executive">销售主管</Option>
                 <Option value="estate agent">经纪人</Option>
@@ -164,27 +164,32 @@ function record(props) {
           </Form.Item>
           <Form.Item>
             {getFieldDecorator('status')(
-              <Select style={{ width: '220px' }} placeholder="状态">
+              <Select style={{ minWidth: '1.1rem' }} placeholder="状态">
                 <Option value="1">已领取</Option>
                 <Option value="0">未领取</Option>
               </Select>,
             )}
           </Form.Item>
-          <Form.Item>
+          
+          <Form.Item style={{position:'absolute',right:'38px'}}>
+            <Button type="primary" htmlType="submit">
+              搜索
+            </Button>
+          </Form.Item>
+        </div>
+        <div style={{margin:'10px 0'}}>
+        <Form.Item>
+          <span style={{marginRight:'10px'}}>兑换时间：</span>
             {getFieldDecorator('exchangeTime')(
-              <RangePicker placeholder={['兑换开始时间','兑换结束时间']}/>
+              <RangePicker placeholder={['开始时间','结束时间']}/>
             )}
           </Form.Item>
           <Form.Item>
+          <span style={{marginRight:'10px'}}>领取时间：</span>
             {getFieldDecorator('receiveTime')(
-              <RangePicker placeholder={['领取开始时间','领取结束时间']}/>
+              <RangePicker placeholder={['开始时间','结束时间']}/>
             )}
           </Form.Item>
-          <Form.Item>
-            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-              搜索
-            </Button>
-          </Form.Item>
         </div>
       </Form>
       <Table rowKey="exchangeRecords" style={{marginTop:'40px'}} dataSource={data.records} columns={columns} pagination={false} />

src/pages/news/type/NewsType.jsx

@@ -129,7 +129,7 @@ function header(props) {
         </Form.Item>
       </Form>
       <AuthButton name="admin.taNewsType.post" noRight={null}>
-        <Button type="primary" className={styles.addBtn} onClick={toEditNews()}>新增</Button>
+        <Button type="danger" className={styles.addBtn} onClick={toEditNews()}>新增</Button>
       </AuthButton>
       <Table rowKey="newsType" dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

src/pages/system/housingPolicy.jsx

@@ -182,7 +182,7 @@ const handleSubmit = (e, props) => {
         </Form.Item>
       </Form>
       <AuthButton name="admin.taPolicy.post" noRight={null}>
-        <Button type="primary" className={styles.addBtn} onClick={toEditPolicy()}>新增</Button>
+        <Button type="danger" className={styles.addBtn} onClick={toEditPolicy()}>新增</Button>
       </AuthButton>
       <Table rowKey="housingPolicy" dataSource={data.records} columns={columns} pagination={false}/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

src/services/apis.js

@@ -263,6 +263,11 @@ export default {
     },
   },
   indexEcharts: {
+    list:{
+      method:'GET',
+      url: `${prefix}/indexStatistical`,
+      action: 'userStatistics',
+    },
     userResource: {
       method: 'GET',
       url: `${prefix}/selectUserResource`,