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

src/pages/activity/drainage/DrainageList.jsx

@@ -230,7 +230,7 @@ const header = (props) => {
         </AuthButton >,
 
         <AuthButton name="admin.taDrainage.publish" noRight={null}>
-          <EditIcon type={datas.status === 1 ? 'cancel' : 'publish'} text={datas.status === 1 ? '下架' : '上架'} onClick={exchangeDrainage(datas)} />
+          <EditIcon type={datas.status === 1 ? 'down' : 'up'} text={datas.status === 1 ? '下架' : '上架'} onClick={exchangeDrainage(datas)} />
         </AuthButton>,
 
         <AuthButton name="admin.taDrainage.data" noRight={null}>

src/pages/activity/groupActivity/list.jsx

@@ -163,7 +163,7 @@ const header = props => {
           </AuthButton>,
             
           <AuthButton name="admin.taShareActivity.top" noRight={null}>
-            <EditIcon type={row.sort ? 'cancel' : 'top'} text={row.sort ? '取消推荐首页' : '推荐首页'} onClick={recommendGroupActivity(row)} />
+            <EditIcon type={row.sort ? 'cancel' : 'top'} text={row.sort ? '取消推首页' : '推荐首页'} onClick={recommendGroupActivity(row)} />
           </AuthButton>,
 
           <EditIcon type="record" text="数据记录" onClick={() => toDataReacord(row.groupActivityId)} />,

src/pages/channel/channelList.jsx

@@ -30,7 +30,7 @@ const columns = [
     dataIndex: 'channelName',
     key: 'channelName',
     align: 'center',
-    render: (text, record) => <Navigate to={`/channel/editChannel?id=${record.channelId}`}>{text}</Navigate>
+    render: (text, record) => <Navigate to={`/channel/editChannel?id=${record.channelId}`}>{text}</Navigate>,
   },
   {
     title: '联系人',
@@ -49,7 +49,7 @@ const columns = [
     dataIndex: 'brokerCount',
     key: 'brokerCount',
     align: 'center',
-    render: (text, record) => <a style={{ color: '#66B3FF' }} onClick={() => toBroker(record)} >{record.brokerCount}</a>,
+    render: (text, record) => <Navigate onClick={() => toBroker(record)}>{text}</Navigate>,
   },
   {
     title: '推荐客户有效数',

src/pages/statistical/activity/compenents/Content.jsx

@@ -9,6 +9,7 @@ import apis from '../../../../services/apis';
 import router from 'umi/router';
 import AuthButton from '@/components/AuthButton';
 import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import Navigate from '@/components/Navigate';
 
 
 const { RangePicker } = DatePicker;
@@ -29,15 +30,15 @@ const toSharePersonNum = rowData => () => {
 
   if (rowData) {
     router.push({
-    pathname: '/statistical/activity/sharePersonNum',
-    query: {
-      startDate: startDate,
-      endDate: endDate,
-      activityId: rowData.activityId,
-      activityType: rowData.activityType,
-      activityName: rowData.activityName
-    },
-  });
+      pathname: '/statistical/activity/sharePersonNum',
+      query: {
+        startDate: startDate,
+        endDate: endDate,
+        activityId: rowData.activityId,
+        activityType: rowData.activityType,
+        activityName: rowData.activityName
+      },
+    });
     return
   }
 }
@@ -47,15 +48,15 @@ const toShareNum = rowData => () => {
   const endDate = new Date()
   if (rowData) {
     router.push({
-    pathname: '/statistical/activity/shareNum',
-    query: {
-      startDate: startDate,
-      endDate: endDate,
-      activityId: rowData.activityId,
-      activityType: rowData.activityType,
-      activityName: rowData.activityName
-    },
-  });
+      pathname: '/statistical/activity/shareNum',
+      query: {
+        startDate: startDate,
+        endDate: endDate,
+        activityId: rowData.activityId,
+        activityType: rowData.activityType,
+        activityName: rowData.activityName
+      },
+    });
     return
   }
 }
@@ -66,15 +67,15 @@ const toAddRegistNum = rowData => () => {
   console.log(rowData, 'rowData')
   if (rowData) {
     router.push({
-    pathname: '/statistical/activity/addRegistNum',
-    query: {
-      startDate: startDate,
-      endDate: endDate,
-      activityId: rowData.activityId,
-      activityType: rowData.activityType,
-      activityName: rowData.activityName
-    },
-  });
+      pathname: '/statistical/activity/addRegistNum',
+      query: {
+        startDate: startDate,
+        endDate: endDate,
+        activityId: rowData.activityId,
+        activityType: rowData.activityType,
+        activityName: rowData.activityName
+      },
+    });
     return
   }
 }
@@ -85,15 +86,15 @@ const toAddVisitNum = rowData => () => {
   console.log(rowData, 'rowData')
   if (rowData) {
     router.push({
-    pathname: '/statistical/activity/visitNum',
-    query: {
-      startDate: startDate,
-      endDate: endDate,
-      activityId: rowData.activityId,
-      activityType: rowData.activityType,
-      activityName: rowData.activityName
-    },
-  });
+      pathname: '/statistical/activity/visitNum',
+      query: {
+        startDate: startDate,
+        endDate: endDate,
+        activityId: rowData.activityId,
+        activityType: rowData.activityType,
+        activityName: rowData.activityName
+      },
+    });
     return
   }
 }
@@ -103,15 +104,15 @@ const toAddVisitPersonNum = rowData => () => {
   const endDate = new Date()
   if (rowData) {
     router.push({
-    pathname: '/statistical/activity/visitPersonNum',
-    query: {
-      startDate: startDate,
-      endDate: endDate,
-      activityId: rowData.activityId,
-      activityType: rowData.activityType,
-      activityName: rowData.activityName
-    },
-  });
+      pathname: '/statistical/activity/visitPersonNum',
+      query: {
+        startDate: startDate,
+        endDate: endDate,
+        activityId: rowData.activityId,
+        activityType: rowData.activityType,
+        activityName: rowData.activityName
+      },
+    });
     return
   }
 }
@@ -132,7 +133,7 @@ const toDetail = rowData => {
         buildingId: '',
       },
     });
-  
+
     return
   }
 }
@@ -161,7 +162,8 @@ let columns = [
     key: 'visitPersonNum',
     sorter: true,
     render: (text, record) => (
-      <a style={{ color: '#66B3FF' }} onClick={toAddVisitPersonNum(record)}><span>{record.visitPersonNum}</span></a>
+      <Navigate onClick={toAddVisitPersonNum(record)}>{record.visitPersonNum}</Navigate>
+      // <a style={{ color: '#66B3FF' }} onClick={toAddVisitPersonNum(record)}><span>{record.visitPersonNum}</span></a>
     ),
   },
   {
@@ -170,7 +172,8 @@ let columns = [
     key: 'visitNum',
     sorter: true,
     render: (text, record) => (
-      <a style={{ color: '#66B3FF' }} onClick={toAddVisitNum(record)}><span>{record.visitNum}</span></a>
+      <Navigate onClick={toAddVisitNum(record)}>{record.visitNum}</Navigate>
+      // <a style={{ color: '#66B3FF' }} onClick={toAddVisitNum(record)}><span>{record.visitNum}</span></a>
     ),
   },
   {
@@ -179,7 +182,8 @@ let columns = [
     key: 'addRegistNum',
     sorter: true,
     render: (text, record) => (
-      <a style={{ color: '#66B3FF' }} onClick={toAddRegistNum(record)}><span>{record.addRegistNum}</span></a>
+      <Navigate onClick={toAddRegistNum(record)}>{record.addRegistNum}</Navigate>
+      // <a style={{ color: '#66B3FF' }} onClick={toAddRegistNum(record)}><span>{record.addRegistNum}</span></a>
     ),
   },
   {
@@ -188,7 +192,8 @@ let columns = [
     key: 'sharePersonNum',
     sorter: true,
     render: (text, record) => (
-      <a style={{ color: '#66B3FF' }} onClick={toSharePersonNum(record)}><span>{record.sharePersonNum}</span></a>
+      <Navigate onClick={toSharePersonNum(record)}>{record.sharePersonNum}</Navigate>
+      // <a style={{ color: '#66B3FF' }} onClick={toSharePersonNum(record)}><span>{record.sharePersonNum}</span></a>
     ),
   },
   {
@@ -197,26 +202,28 @@ let columns = [
     key: 'shareNum',
     sorter: true,
     render: (text, record) => (
-      <a style={{ color: '#66B3FF' }} onClick={toShareNum(record)}><span>{record.shareNum}</span></a>
+      <Navigate onClick={toShareNum(record)}>{record.shareNum}</Navigate>
+      // <a style={{ color: '#66B3FF' }} onClick={toShareNum(record)}><span>{record.shareNum}</span></a>
     ),
   },
   {
     title: '详情',
     align: 'center',
     render: (text, record) => (
-      <a style={{ color: '#66B3FF' }} onClick={() => toDetail(record)}>查看</a>
+      <Navigate onClick={() => toDetail(record)}>查看</Navigate>
+      // <a style={{ color: '#66B3FF' }} onClick={() => toDetail(record)}>查看</a>
     ),
   },
 ]
 
 
 function getDayBegin(dt) {
-  return moment(dt, 'day').hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
+  return moment(dt, 'day').hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
 }
 
 
 function getDayEnd(dt) {
-  return moment(dt, 'day').hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
+  return moment(dt, 'day').hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
 }
 
 
@@ -258,7 +265,7 @@ class OverView extends React.Component {
     this.getTableList()
   }
 
-  getFormatedParams = ( params ) => {
+  getFormatedParams = (params) => {
     return {
       ...params,
       startDate: getDayBegin(params.startDate),
@@ -340,7 +347,7 @@ class OverView extends React.Component {
       startDate: '',
       buildingId: [],
       targetType: []
-    },this.getTableList)
+    }, this.getTableList)
   }
 
   exportActivityStats = () => {
@@ -401,20 +408,21 @@ class OverView extends React.Component {
     const endDate = this.state.formData.endDate
 
     return (
-    <>
-      <div >
-        <Radio.Group buttonStyle="solid" value={radioVal} onChange={this.handleRadioChange}>
-          <Radio.Button value={0}>今日</Radio.Button>
-          <Radio.Button value={6}>最近7天</Radio.Button>
-          <Radio.Button value={30}>最近1月</Radio.Button>
-        </Radio.Group>
-        <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)}>
-            <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
-            {getFieldDecorator('startDate', {initialValue: moment(startDate)
-              
-            })(
-                <DatePicker allowClear={false} placeholder="开始日期"/>,
-            )}
+      <>
+        <div >
+          <Radio.Group buttonStyle="solid" value={radioVal} onChange={this.handleRadioChange}>
+            <Radio.Button value={0}>今日</Radio.Button>
+            <Radio.Button value={6}>最近7天</Radio.Button>
+            <Radio.Button value={30}>最近1月</Radio.Button>
+          </Radio.Group>
+          <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)}>
+            <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+              {getFieldDecorator('startDate', {
+                initialValue: moment(startDate)
+
+              })(
+                <DatePicker allowClear={false} placeholder="开始日期" />,
+              )}
             </Form.Item>
             <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
               {getFieldDecorator('endDate', {
@@ -445,12 +453,12 @@ class OverView extends React.Component {
               <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}>
                 搜索
             </Button>
-            <Button onClick={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
-          </Form.Item>
-          </Form>     
-        <div>
+              <Button onClick={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
+            </Form.Item>
+          </Form>
+          <div>
             <AuthButton name="admin.statistical.activity.export" noRight={null}>
-            <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={this.exportActivityStats}>
+              <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={this.exportActivityStats}>
                 导出
             </Button>
             </AuthButton>

src/pages/statistical/activity/compenents/OverView.jsx

@@ -9,6 +9,7 @@ import apis from '../../../../services/apis';
 import router from 'umi/router';
 import AuthButton from '@/components/AuthButton';
 import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import Navigate from '@/components/Navigate';
 
 
 const { RangePicker } = DatePicker;
@@ -113,7 +114,8 @@ let columns = [
     key: 'visitPersonNum',
     sorter: true,
     render: (text, record) => (
-      <a style={{ color: '#66B3FF' }} onClick={toAddVisitPersonNum(record)}><span>{record.visitPersonNum}</span></a>
+      <Navigate onClick={toAddVisitPersonNum(record)}>{record.visitPersonNum}</Navigate>
+      // <a style={{ color: '#66B3FF' }} onClick={toAddVisitPersonNum(record)}><span>{record.visitPersonNum}</span></a>
       ),
   },
   {
@@ -122,7 +124,8 @@ let columns = [
     key: 'visitNum',
     sorter: true,
     render: (text, record) => (
-      <a style={{ color: '#66B3FF' }} onClick={toAddVisitNum(record)}><span>{record.visitNum}</span></a>
+      <Navigate onClick={toAddVisitNum(record)}>{record.visitNum}</Navigate>
+      // <a style={{ color: '#66B3FF' }} onClick={toAddVisitNum(record)}><span>{record.visitNum}</span></a>
       ),
   },
   {
@@ -131,7 +134,8 @@ let columns = [
     key: 'addRegistNum',
     sorter: true,
     render: (text, record) => (
-      <a style={{ color: '#66B3FF' }} onClick={toAddRegistNum(record)}><span>{record.addRegistNum}</span></a>
+      <Navigate onClick={toAddRegistNum(record)}>{record.addRegistNum}</Navigate>
+      // <a style={{ color: '#66B3FF' }} onClick={toAddRegistNum(record)}><span>{record.addRegistNum}</span></a>
       ),
   },
   {
@@ -140,7 +144,8 @@ let columns = [
     key: 'sharePersonNum',
     sorter: true,
     render: (text, record) => (
-    <a style={{ color: '#66B3FF' }} onClick={toSharePersonNum(record)}><span>{record.sharePersonNum}</span></a>
+      <Navigate onClick={toSharePersonNum(record)}>{record.sharePersonNum}</Navigate>
+    // <a style={{ color: '#66B3FF' }} onClick={toSharePersonNum(record)}><span>{record.sharePersonNum}</span></a>
     ),
   },
   {
@@ -149,7 +154,8 @@ let columns = [
     key: 'shareNum',
     sorter: true,
     render: (text, record) => (
-      <a style={{ color: '#66B3FF' }} onClick={toShareNum(record)}><span>{record.shareNum}</span></a>
+      <Navigate onClick={toShareNum(record)}>{record.shareNum}</Navigate>
+      // <a style={{ color: '#66B3FF' }} onClick={toShareNum(record)}><span>{record.shareNum}</span></a>
       ),
   },
 ]

src/pages/statistical/activity/detail.jsx

@@ -229,7 +229,8 @@ function record(props) {
             sorter: true,
             align: 'center',
             render: (text, record) => (
-                <a style={{ color: '#66B3FF' }} onClick={toAddVisitPersonNum(record)}><span>{record.visitPersons}</span></a>
+                <Navigate onClick={toAddVisitPersonNum(record)}>{record.visitPersons}</Navigate>
+                // <a style={{ color: '#66B3FF' }} onClick={toAddVisitPersonNum(record)}><span>{record.visitPersons}</span></a>
             ),
         },
         {
@@ -239,7 +240,8 @@ function record(props) {
             sorter: true,
             align: 'center',
             render: (text, record) => (
-                <a style={{ color: '#66B3FF' }} onClick={toAddVisitNum(record)}><span>{record.visitNum}</span></a>
+                <Navigate onClick={toAddVisitNum(record)}>{record.visitNum}</Navigate>
+                // <a style={{ color: '#66B3FF' }} onClick={toAddVisitNum(record)}><span>{record.visitNum}</span></a>
             ),
         },
         {
@@ -249,7 +251,8 @@ function record(props) {
             sorter: true,
             align: 'center',
             render: (text, record) => (
-                <a style={{ color: '#66B3FF' }} onClick={toAddRegistNum(record)}><span>{record.newCustomers}</span></a>
+                <Navigate onClick={toAddRegistNum(record)}>{record.newCustomers}</Navigate>
+                // <a style={{ color: '#66B3FF' }} onClick={toAddRegistNum(record)}><span>{record.newCustomers}</span></a>
             ),
         },
         {
@@ -259,7 +262,8 @@ function record(props) {
             sorter: true,
             align: 'center',
             render: (text, record) => (
-                <a style={{ color: '#66B3FF' }} onClick={toSharePersons(record)}><span>{record.sharePersons}</span></a>
+                <Navigate onClick={toSharePersons(record)}>{record.sharePersons}</Navigate>
+                // <a style={{ color: '#66B3FF' }} onClick={toSharePersons(record)}><span>{record.sharePersons}</span></a>
             ),
         },
         {
@@ -269,7 +273,8 @@ function record(props) {
             sorter: true,
             align: 'center',
             render: (text, record) => (
-                <a style={{ color: '#66B3FF' }} onClick={toShareNum(record)}><span>{record.shareNum}</span></a>
+                <Navigate onClick={toShareNum(record)}>{record.shareNum}</Navigate>
+                // <a style={{ color: '#66B3FF' }} onClick={toShareNum(record)}><span>{record.shareNum}</span></a>
             ),
         },
     ];

src/pages/statistical/activity/sharePersonNum.jsx

@@ -8,6 +8,7 @@ import router from 'umi/router';
 import AuthButton from '@/components/AuthButton';
 import BuildingSelect from '@/components/SelectButton/BuildSelect';
 import Prompt from 'umi/prompt';
+import Navigate from '@/components/Navigate';
 
 const { RangePicker } = DatePicker;
 const { Option } = Select
@@ -109,7 +110,8 @@ let columns = [
     key: 'shareNum',
     sorter: true,
     render: (text, record) => (
-      <a style={{ color: '#66B3FF' }} onClick={toShareNum(record)}><span>{record.shareNum}</span></a>
+      <Navigate onClick={toShareNum(record)}>{record.shareNum}</Navigate>
+      // <a style={{ color: '#66B3FF' }} onClick={toShareNum(record)}><span>{record.shareNum}</span></a>
     ),
   },
   {
@@ -118,7 +120,8 @@ let columns = [
     key: 'visitPersonNum',
     sorter: true,
     render: (text, record) => (
-      <a style={{ color: '#66B3FF' }} onClick={toVisitPersonNum(record)}><span>{record.visitPersonNum}</span></a>
+      <Navigate onClick={toVisitPersonNum(record)}>{record.visitPersonNum}</Navigate>
+      // <a style={{ color: '#66B3FF' }} onClick={toVisitPersonNum(record)}><span>{record.visitPersonNum}</span></a>
     ),
   },
   {
@@ -127,7 +130,8 @@ let columns = [
     key: 'visitNum',
     sorter: true,
     render: (text, record) => (
-      <a style={{ color: '#66B3FF' }} onClick={toVisitNum(record)}><span>{record.visitNum}</span></a>
+      <Navigate onClick={toVisitNum(record)}>{record.visitNum}</Navigate>
+      // <a style={{ color: '#66B3FF' }} onClick={toVisitNum(record)}><span>{record.visitNum}</span></a>
     ),
   },
 ]