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

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

@@ -302,6 +302,33 @@ class OverView extends React.Component {
   //重置搜索
   handleReset = e => {
     this.props.form.resetFields()
+    const defaultDays = 6
+    dateType = defaultDays
+    console.log(dateType)
+    this.setState({
+      radioVal: defaultDays,
+      formData: {
+
+        startDate: moment().subtract(6, 'day').toDate(),
+        endDate: new Date,
+        buildingId: '',
+        targetType: '',
+        pageNum: '',
+        pageSize: '',
+        activityName: '',
+        sort: null,
+        colKey: null
+      },
+      personData: [],
+      dataSoures: [],
+      tableData: [],
+      barData: {},
+      userType: 'all',
+      endDate: '',
+      startDate: '',
+      buildingId: [],
+      targetType: []
+    },this.getTableList)
   }
 
   exportActivityStats = () => {

src/pages/statistical/consultant/homePagePersons.jsx

@@ -90,10 +90,10 @@ function record(props) {
         },
         {
             title: '性别',
-            dataIndex: 'sex',
-            key: 'sex',
+            dataIndex: 'gender',
+            key: 'gender',
             align: 'center',
-            render: (_, record) => <span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span>,
+            render: (_, record) => <span>{record.gender == 1 ? '男' : record.gender == 2 ? '女' : '未知'}</span>,
         },
         {
             title: '访问次数',
@@ -128,9 +128,9 @@ function record(props) {
                 <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
             </div>
             <Prompt message={location =>
-        location.pathname.startsWith("/statistical/consultant")
-          ? true
-          : localStorage.removeItem("consultantPageParams")} />
+                location.pathname.startsWith("/statistical/consultant")
+                    ? true
+                    : localStorage.removeItem("consultantPageParams")} />
         </>
     )
 }

src/pages/statistical/consultant/table.jsx

@@ -106,10 +106,10 @@ function record(props) {
         },
         {
             title: '性别',
-            dataIndex: 'sex',
-            key: 'sex',
+            dataIndex: 'gender',
+            key: 'gender',
             align: 'center',
-            render: (_, record) => <span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span>,
+            render: (_, record) => <span>{record.gender == 1 ? '男' : record.gender == 2 ? '女' : '未知'}</span>,
         },
     ]
 

src/pages/statistical/consultant/visitNum.jsx

@@ -136,10 +136,10 @@ function record(props) {
         },
         {
             title: '性别',
-            dataIndex: 'sex',
-            key: 'sex',
+            dataIndex: 'gender',
+            key: 'gender',
             align: 'center',
-            render: (_, record) => <span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span>,
+            render: (_, record) => <span>{record.gender == 1 ? '男' : record.gender == 2 ? '女' : '未知'}</span>,
         },
         {
             title: '访问时间',

src/pages/statistical/consultant/visitPersons.jsx

@@ -82,10 +82,10 @@ function record(props) {
         },
         {
             title: '性别',
-            dataIndex: 'sex',
-            key: 'sex',
+            dataIndex: 'gender',
+            key: 'gender',
             align: 'center',
-            render: (_, record) => <span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span>,
+            render: (_, record) => <span>{record.gender == 1 ? '男' : record.gender == 2 ? '女' : '未知'}</span>,
         },
         {
             title: '访问次数',