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

config/config.js

@@ -83,8 +83,8 @@ export default {
   targets: {
     ie: 11,
   },
-  publicPath: './',
-  // publicPath: 'https://njcjweb.oss-accelerate.aliyuncs.com/admin/',
+  // publicPath: './',
+  publicPath: 'https://njcjweb.oss-accelerate.aliyuncs.com/admin/',
   history: 'hash',
   devtool: isAntDesignProPreview ? 'source-map' : false,
   // umi routes: https://umijs.org/zh/guide/router.html

package.json

@@ -67,8 +67,8 @@
     "redux": "^4.0.1",
     "swiper": "^5.3.6",
     "umi": "^2.13.3",
-    "umi-plugin-pro-block": "^1.3.2",
-    "umi-plugin-react": "^1.9.5",
+    "umi-plugin-pro-block": "^1.3.6",
+    "umi-plugin-react": "^1.15.3",
     "umi-request": "^1.0.8",
     "wangeditor": "^3.1.1"
   },
@@ -108,10 +108,10 @@
     "pro-download": "1.0.1",
     "slash2": "^2.0.0",
     "stylelint": "^10.1.0",
-    "umi-plugin-ga": "^1.1.3",
-    "umi-plugin-pro": "^1.0.2",
+    "umi-plugin-ga": "^1.1.6",
+    "umi-plugin-pro": "^1.0.3",
     "umi-types": "^0.3.8",
-    "webpack-theme-color-replacer": "^1.2.15"
+    "webpack-theme-color-replacer": "^1.3.7"
   },
   "optionalDependencies": {
     "puppeteer": "^1.17.0"

src/pages/activity/ActivityList.jsx

@@ -35,9 +35,11 @@ const header = props => {
   useEffect(() => {
 
     if (localStorage.getItem("activePageParams")) {
-      props.form.setFieldsValue(JSON.parse(localStorage.getItem("activePageParams")));
-      // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
 
+      const localStorageValue = JSON.parse(localStorage.getItem("activePageParams"))
+      localStorageValue.time = localStorageValue.time ? moment(localStorageValue.time) : ''
+
+      props.form.setFieldsValue(localStorageValue);
       getList(JSON.parse(localStorage.getItem("activePageParams")))
     } else {
       localStorage.setItem("activePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));

src/pages/activity/groupActivity/list.jsx

@@ -94,7 +94,6 @@ const header = props => {
       align: 'center',
       render: (x, row) => <><div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', width: '201px', title: 'content' }}>
         <Navigate onClick={getActivityDetail(row.groupActivityId)}>{row.activityName}</Navigate></div></>,
-      // <span style={{color: 'blue',cursor: 'pointer'}} onClick={getActivityDetail(row.groupActivityId)}>{row.activityName}</span></div></>,
     },
     {
       title: '活动时间',
@@ -115,7 +114,8 @@ const header = props => {
       key: 'participateNum',
       align: 'center',
       render: (x, row) => <><div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', width: '201px', title: 'content' }}>
-        <span style={{ color: 'blue', cursor: 'pointer' }} onClick={getJoinPeople(row.groupActivityId)}>{row.participateNum}</span></div></>,
+        <Navigate onClick={getJoinPeople(row.groupActivityId)}>{row.participateNum}</Navigate>
+        </div></>,
     },
     {
       title: '成团数',

src/pages/activity/helpActivity/helpRecord.jsx

@@ -267,7 +267,7 @@ function body(props) {
   const { helpActivityId } = props.location.query
   useEffect(() => {
     console.log('customerType', customerType)
-    getList({ pageNumber: 1, pageSize: 10, status: customerType, helpActivityId })
+    getList({ pageNum: 1, pageSize: 10, status: customerType, helpActivityId })
   }, [])
 
   function getList(params) {

src/pages/activity/helpActivity/list.jsx

@@ -5,6 +5,7 @@ import moment from 'moment';
 import AuthButton from '@/components/AuthButton';
 import withActions from '@/components/ActionList';
 import EditIcon from '@/components/EditIcon';
+import Navigate from '@/components/Navigate';
 import Prompt from 'umi/prompt';
 import SelectCity from '../../../components/SelectButton/CitySelect'
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
@@ -20,9 +21,13 @@ const header = props => {
 
   useEffect(() => {
     if (localStorage.getItem("helpActivePageParams")) {
-      props.form.setFieldsValue(JSON.parse(localStorage.getItem("helpActivePageParams")));
+      // props.form.setFieldsValue(JSON.parse(localStorage.getItem("helpActivePageParams")));
       // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
+      const localStorageValue = JSON.parse(localStorage.getItem("helpActivePageParams"))
+      localStorageValue.startTime = localStorageValue.startTime ? moment(localStorageValue.startTime) : ''
+      localStorageValue.endTime = localStorageValue.endTime ? moment(localStorageValue.endTime) : ''
 
+      props.form.setFieldsValue(localStorageValue);
       getList(JSON.parse(localStorage.getItem("helpActivePageParams")))
     } else {
       localStorage.setItem("helpActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));
@@ -82,7 +87,8 @@ const header = props => {
       key: 'title',
       align: 'center',
       render: (x, row) => <><div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', width: '201px', title: 'content' }}>
-        <span style={{ color: 'blue', cursor: 'pointer' }} onClick={getActivityDetail(row.helpActivityId)}>{row.title}</span></div></>,
+        <Navigate onClick={getActivityDetail(row.helpActivityId)}>{row.title}</Navigate>
+        </div></>,
     },
     {
       title: '活动时间',
@@ -97,7 +103,8 @@ const header = props => {
       key: 'enlistNum',
       align: 'center',
       render: (x, row) => <><div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', width: '201px', title: 'content' }}>
-        <span style={{ color: 'blue', cursor: 'pointer' }} onClick={getJoinPeople(row.helpActivityId)}>{row.enlistNum}</span></div></>,
+        <Navigate onClick={getJoinPeople(row.helpActivityId)}>{row.enlistNum}</Navigate>
+        </div></>,
     },
     {
       title: '助力成功数',

src/pages/activity/liveActivity/add/index.jsx

@@ -11,6 +11,7 @@ import LivePlatSelect from '../../../../components/SelectButton/LivePlatSelect'
 import CitySelect3 from '../../../../components/SelectButton/CitySelect3'
 import ImageUpload from '../../../../components/XForm/ImageUpload'
 import Wangedit from '../../../../components/Wangedit/Wangedit'
+import Navigate from '@/components/Navigate';
 import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
 import AuthButton from '@/components/AuthButton';
@@ -121,7 +122,7 @@ const header = props => {
         <Form.Item label="房间参数">
           {getFieldDecorator('liveRoomParam', {
             rules: [{ required: true, message: '请输入房间参数' }],
-          })(<Input maxLength={1000} placeholder="点击右侧按钮查看如何获取房间参数" style={{width:'680px'}}/>)}<a onClick={openIndexImg} style={{ color: 'blue' }}> 不知道怎么填？查看说明</a>
+          })(<Input maxLength={1000} placeholder="点击右侧按钮查看如何获取房间参数" style={{width:'680px'}}/>)}<Navigate onClick={openIndexImg}>不知道怎么填？查看说明</Navigate>
         </Form.Item>
         <Form.Item label="封面图1" help="建议尺寸：750px*420px，比例16:9，格式：jpg，用于：活动列表">
               {getFieldDecorator('listImg', {

src/pages/activity/liveActivity/edit/components/base.jsx

@@ -11,6 +11,7 @@ import LivePlatSelect from '../../../../../components/SelectButton/LivePlatSelec
 import CitySelect3 from '../../../../../components/SelectButton/CitySelect3';
 import ImageUpload from '../../../../../components/XForm/ImageUpload'
 import request from '../../../../../utils/request';
+import Navigate from '@/components/Navigate';
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -144,7 +145,7 @@ const header = props => {
             initialValue: liveActivityData.liveRoomParam,
             rules: [{ required: true, message: '请输入房间参数' }],
           })(<Input maxLength={1000} placeholder="点击右侧按钮查看如何获取房间参数" style={{width:'680px'}}/>)}
-          <a onClick={openIndexImg} style={{ color: 'blue' }}> 不知道怎么填？查看说明</a>
+          <Navigate onClick={openIndexImg}>不知道怎么填？查看说明</Navigate>
         </Form.Item>
         <Form.Item label="封面图1" help="建议尺寸：750px*420px，比例16:9，格式：jpg，用于：活动列表">
               {getFieldDecorator('listImg', {

src/pages/building/list/index.jsx

@@ -181,9 +181,13 @@ function body(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     if (localStorage.getItem("pageParams")) {
-      props.form.setFieldsValue(JSON.parse(localStorage.getItem("pageParams")));
+
       // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
-      getList(JSON.parse(localStorage.getItem("pageParams")))
+      const localStorageValue = JSON.parse(localStorage.getItem("pageParams"))
+      localStorageValue.startDate = localStorageValue.startDate ? moment(localStorageValue.startDate) : ''
+      props.form.setFieldsValue(localStorageValue);
+
+      getList({ pageNum: 1, pageSize: 9, ...JSON.parse(localStorage.getItem("pageParams")) })
     } else {
       getList({ pageNum: 1, pageSize: 9 })
     }

src/pages/carouselFigure/LiveGroup.jsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
 import { apis, fetch } from '../../utils/request';
+import Navigate from '@/components/Navigate';
 
 const { Search } = Input;
 
@@ -81,9 +82,7 @@ export default props => {
       align: 'center',
       width: '20%',
       render: (text, record) => (
-        <span>
-          <a onClick={() => setData(record.liveActivityId)} style={{ color: 'blue' }}>选择</a>
-        </span>
+        <Navigate onClick={() => setData(record.liveActivityId)}>选择</Navigate>
       ),
     },
   ];

src/pages/carouselFigure/SalesBatchGroup.jsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
 import { apis, fetch } from '../../utils/request';
+import Navigate from '@/components/Navigate';
 
 const { Search } = Input;
 
@@ -81,9 +82,7 @@ export default props => {
       align: 'center',
       width: '20%',
       render: (text, record) => (
-        <span>
-          <a onClick={() => setData(record.salesBatchId)} style={{ color: 'blue' }}>选择</a>
-        </span>
+        <Navigate onClick={() => setData(record.salesBatchId)}>选择</Navigate>
       ),
     },
   ];

src/pages/carouselFigure/SelectActivity.jsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
 import { apis, fetch } from '../../utils/request';
+import Navigate from '@/components/Navigate';
 
 const getActivities = fetch(apis.activity.listSelected)
 const { Search } = Input;
@@ -83,9 +84,7 @@ export default (props) => {
       align: 'center',
       width: '20%',
       render: (text, record) => (
-        <span>
-          <a onClick={() => setData(record.dynamicId)} style={{ color: 'blue' }}>选择</a>
-        </span>
+        <Navigate onClick={() => setData(record.dynamicId)}>选择</Navigate>
       ),
     },
   ];

src/pages/carouselFigure/SelectGroup.jsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
 import { apis, fetch } from '../../utils/request';
+import Navigate from '@/components/Navigate';
 
 const { Search } = Input;
 
@@ -81,9 +82,7 @@ export default props => {
       align: 'center',
       width: '20%',
       render: (text, record) => (
-        <span>
-          <a onClick={() => setData(record.groupActivityId)} style={{ color: 'blue' }}>选择</a>
-        </span>
+         <Navigate onClick={() => setData(record.groupActivityId)}>选择</Navigate>
       ),
     },
   ];

src/pages/carouselFigure/SelectH5.jsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { Form, Select, Modal, Button, Table, Divider, Tag, Input,Row,Col } from 'antd';
 import { apis, fetch } from '../../utils/request';
+import Navigate from '@/components/Navigate';
 
 const { Column, ColumnGroup } = Table;
 const getH5List = fetch(apis.h5Activity.EffectiveList)
@@ -86,9 +87,7 @@ export default props => {
       align: 'center',
       width: '20%',
       render: (text, record) => (
-        <span>
-          <a onClick={() => setData(record.drainageId)} style={{ color: 'blue' }}>选择</a>
-        </span>
+        <Navigate onClick={() => setData(record.drainageId)}>选择</Navigate>
       ),
     },
   ];

src/pages/carouselFigure/SelectHelp.jsx

@@ -2,6 +2,8 @@ import React, { useState, useEffect } from 'react';
 
 import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
 import { apis, fetch } from '../../utils/request';
+import Navigate from '@/components/Navigate';
+
 const { Search } = Input;
 
 const getHelpList = fetch(apis.helpActivity.effectiveList)
@@ -81,9 +83,7 @@ export default props => {
       align: 'center',
       width: '20%',
       render: (text, record) => (
-        <span>
-          <a onClick={() => setData(record.helpActivityId)} style={{ color: 'blue' }}>选择</a>
-        </span>
+        <Navigate onClick={() => setData(record.helpActivityId)}>选择</Navigate>
       ),
     },
   ];

src/pages/carouselFigure/SelectNews.jsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
 import { apis, fetch } from '../../utils/request';
+import Navigate from '@/components/Navigate';
 
 const getNewsList = fetch(apis.news.getList)
 const { Search } = Input;
@@ -77,9 +78,7 @@ export default props => {
       align: 'center',
       width: '20%',
       render: (text, record) => (
-        <span>
-          <a onClick={() => setData(record.newsId)} style={{ color: 'blue' }}>选择</a>
-        </span>
+        <Navigate onClick={() => setData(record.newsId)}>选择</Navigate>
       ),
     },
   ];

src/pages/customer/customerlist/index.jsx

@@ -14,6 +14,7 @@ import ModalRecommendRecord from './components/recommend'
 import ChangeStatus from './components/changeStatus'
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import AuthButton from '@/components/AuthButton';
+import Navigate from '@/components/Navigate';
 import WxDictSelect from '@/components/SelectButton/WxDictSelect';
 import Prompt from 'umi/prompt';
 
@@ -76,12 +77,18 @@ function body(props) {
     if (localStorage.getItem("state")) {
       console.log(localStorage.getItem("state"), 'state')
       if (JSON.parse(localStorage.getItem("state")) == 'private') {
-        props.form.setFieldsValue(JSON.parse(localStorage.getItem("priPageParams")));
-        getList({ ...JSON.parse(localStorage.getItem("priPageParams")) })
+        const localStorageValue = JSON.parse(localStorage.getItem("priPageParams"))
+        localStorageValue.startCreateDate = localStorageDate(localStorageValue.startCreateDate)
+        localStorageValue.endCreateDate = localStorageDate(localStorageValue.endCreateDate)
+        props.form.setFieldsValue(localStorageValue);
+        getList({ pageNumber: 1, pageSize: 10, ...JSON.parse(localStorage.getItem("priPageParams")) })
       } else {
         setCustomerType('public')
-        props.form.setFieldsValue(JSON.parse(localStorage.getItem("pubPageParams")));
-        getList({ ...JSON.parse(localStorage.getItem("pubPageParams")) })
+        const localStorageValue = JSON.parse(localStorage.getItem("pubPageParams"))
+        localStorageValue.startCreateDate = localStorageDate(localStorageValue.startCreateDate)
+        localStorageValue.endCreateDate = localStorageDate(localStorageValue.endCreateDate)
+        props.form.setFieldsValue(localStorageValue);
+        getList({ pageNumber: 1, pageSize: 10, ...JSON.parse(localStorage.getItem("pubPageParams")) })
       }
 
     } else {
@@ -92,6 +99,13 @@ function body(props) {
 
   function getList(params) {
     // 网路请求
+    console.log(params, '111111111111111')
+    if (params.startCreateDate) {
+      params.startCreateDate = moment(params.startCreateDate).format('YYYY-MM-DD HH:mm:ss');
+    }
+    if (params.endCreateDate) {
+      params.endCreateDate = moment(params.endCreateDate).format('YYYY-MM-DD HH:mm:ss');
+    }
     request({ ...apis.customer.customerRecommend, params: { ...params } }).then(res => {
       if (params.customerType === 'private') {
         setDataSource(res)
@@ -154,6 +168,8 @@ function body(props) {
     console.log(e)
   }
 
+  const localStorageDate = (date) => date ? moment(date) : ''
+
   // 分页
   function onChange(pageNum) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -184,8 +200,10 @@ function body(props) {
     localStorage.setItem("state", JSON.stringify(value))
     if (value === 'private') {
       if (localStorage.getItem("priPageParams")) {
-        props.form.setFieldsValue(JSON.parse(localStorage.getItem("priPageParams")));
-
+        const localStorageValue = JSON.parse(localStorage.getItem("priPageParams"))
+        localStorageValue.startCreateDate = localStorageDate(localStorageValue.startCreateDate)
+        localStorageValue.endCreateDate = localStorageDate(localStorageValue.endCreateDate)
+        props.form.setFieldsValue(localStorageValue);
         getList(JSON.parse(localStorage.getItem("priPageParams")))
       } else {
         localStorage.setItem("priPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType: value }))
@@ -195,9 +213,12 @@ function body(props) {
     } else {
 
       if (localStorage.getItem("pubPageParams")) {
-        props.form.setFieldsValue(JSON.parse(localStorage.getItem("pubPageParams")));
-        // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
-        getList({ customerType, ...JSON.parse(localStorage.getItem("pubPageParams")) })
+        const localStorageValue = JSON.parse(localStorage.getItem("pubPageParams"))
+        localStorageValue.startCreateDate = localStorageDate(localStorageValue.startCreateDate)
+        localStorageValue.endCreateDate = localStorageDate(localStorageValue.endCreateDate)
+        props.form.setFieldsValue(localStorageValue);
+
+        getList( {pageNumber: 1, pageSize: 10, customerType, ...JSON.parse(localStorage.getItem("pubPageParams")) })
       } else {
         localStorage.setItem("pubPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType: 'public' }))
         getList({ pageNumber: 1, pageSize: 10, customerType: 'public' })
@@ -398,7 +419,7 @@ function body(props) {
       align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => publicCustomerDetail(record)} >{record.name || record.nickname}</span></>,
+      render: (_, record) => <><Navigate onClick={() => publicCustomerDetail(record)}>{record.name || record.nickname}</Navigate></>,
     },
     {
       title: '电话',
@@ -481,7 +502,7 @@ function body(props) {
       align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toCustomerDateil(record)}>{customerType === 'private' ? record.name : record.nickname}</span></>,
+      render: (_, record) => <><Navigate onClick={() => toCustomerDateil(record)}>{customerType === 'private' ? record.name : record.nickname}</Navigate></>,
     },
     {
       title: '电话',

src/pages/eContract/businessConfig/components/SelectCompany.jsx

@@ -3,6 +3,7 @@ import { Form, Select, Modal, Button, Table, Divider, Tag, Input,Row,Col,Icon, P
 import request from '../../../../utils/request';
 import apis from '../../../../services/apis';
 import moment from 'moment';
+import Navigate from '@/components/Navigate';
 
 const { Column, ColumnGroup } = Table;
 const { Search } = Input;
@@ -132,7 +133,7 @@ const SelectContractTemp = props => {
       width: '20%',
       render: (text, record) => (
         <span>
-          {record.sealNum >0 && record.authorizeStatus === '3000' && <a onClick={() => setData({id:record.companyId, name:record.companyName})} style={{ color: 'blue' }}>选择</a>}
+          {record.sealNum >0 && record.authorizeStatus === '3000' && <Navigate onClick={() => setData({id:record.companyId, name:record.companyName})}>选择</Navigate>}
         </span>
       ),
     },
@@ -142,7 +143,7 @@ const SelectContractTemp = props => {
 
   return (
     <div>
-      <div>{group.groupName}<a style={{marginLeft:'30px', color: 'blue' }} onClick={() => setVisible(true)}>选择关联企业</a></div>
+      <div>{group.groupName}<Navigate onClick={() => setVisible(true)}>选择关联企业</Navigate></div>
       <Modal
         title="选择关联企业"
         visible={visible}
@@ -168,7 +169,7 @@ const SelectContractTemp = props => {
           )}
         </Form.Item>
         <Form.Item>
-          <span style={{color:'#999'}}>可选企业必须已认证通过、已上传印章且授权了自动签章。</span><span><a onClick={openIndexImg} style={{ color: 'blue' }}>查看电子合同接入手册</a></span>
+          <span style={{color:'#999'}}>可选企业必须已认证通过、已上传印章且授权了自动签章。</span><Navigate onClick={openIndexImg}>查看电子合同接入手册</Navigate>
         </Form.Item>
         <Form.Item>
           <Button type="primary" htmlType="submit" >

src/pages/eContract/businessConfig/components/SelectContractTemp.jsx

@@ -3,6 +3,7 @@ import { Form, Select, Modal, Button, Table, Divider, Tag, Input,Row,Col,Icon ,P
 import request from '../../../../utils/request';
 import apis from '../../../../services/apis';
 import moment from 'moment';
+import Navigate from '@/components/Navigate';
 
 const { Column, ColumnGroup } = Table;
 const { Search } = Input;
@@ -109,9 +110,7 @@ const SelectContractTemp = props => {
       align: 'center',
       width: '20%',
       render: (text, record) => (
-        <span>
-          <a onClick={() => setData({id:record.contractTemplateId, name:record.contractTemplateName})} style={{ color: 'blue' }}>选择</a>
-        </span>
+        <Navigate onClick={() => setData({id:record.contractTemplateId, name:record.contractTemplateName})}>选择</Navigate>
       ),
     },
   ];
@@ -120,7 +119,7 @@ const SelectContractTemp = props => {
 
   return (
     <div>
-      <div>{group.groupName}<a style={{marginLeft:'30px', color: 'blue' }} onClick={() => setVisible(true)}>选择合同模板</a></div>
+      <div>{group.groupName}<Navigate onClick={() => setVisible(true)}>选择合同模板</Navigate></div>
       <Modal
         title="选择合同模板"
         visible={visible}

src/pages/eContract/businessConfig/components/SelectRaise.jsx

@@ -4,6 +4,7 @@ import request from '../../../../utils/request';
 import apis from '../../../../services/apis';
 import BuildSelect from '../../../../components/SelectButton/BuildSelect'
 import moment from 'moment';
+import Navigate from '@/components/Navigate';
 
 const { Column, ColumnGroup } = Table;
 const { Search } = Input;
@@ -130,9 +131,7 @@ const SelectContractTemp = props => {
       align: 'center',
       width: '20%',
       render: (text, record) => (
-        <span>
-          <a onClick={() => setData({id:record.raiseId, name:record.salesBatchName})} style={{ color: 'blue' }}>选择</a>
-        </span>
+        <Navigate onClick={() => setData({id:record.raiseId, name:record.salesBatchName})}>选择</Navigate>
       ),
     },
   ];
@@ -141,7 +140,7 @@ const SelectContractTemp = props => {
 
   return (
     <div>
-      <div>{group.groupName}<a style={{marginLeft:'30px', color: 'blue' }} onClick={() => setVisible(true)}>{targetType != undefined && '选择关联业务'}</a></div>
+      <div>{group.groupName}<Navigate onClick={() => setVisible(true)}>{targetType != undefined && '选择关联业务'}</Navigate></div>
       <Modal
         title="选择关联业务"
         visible={visible}

src/pages/eContract/businessConfig/components/SelectSeal.jsx

@@ -3,6 +3,7 @@ import { Form, Select, Modal, Button, Table, Divider, Tag, Input,Row,Col,Icon, A
 import request from '../../../../utils/request';
 import apis from '../../../../services/apis';
 import moment from 'moment';
+import Navigate from '@/components/Navigate';
 
 const { Column, ColumnGroup } = Table;
 const { Search } = Input;
@@ -117,9 +118,7 @@ const SelectContractTemp = props => {
       align: 'center',
       width: '20%',
       render: (text, record) => (
-        <span>
-          <a onClick={() => setData({id:record.sealId, name:record.sealName})} style={{ color: 'blue' }}>选择</a>
-        </span>
+        <Navigate onClick={() => setData({id:record.sealId, name:record.sealName})}>选择</Navigate>
       ),
     },
   ];

src/pages/eContract/businessConfig/list.jsx

@@ -1,14 +1,17 @@
 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 AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import styles from '../../style/GoodsList.less';
 import SelectCity from '../../../components/SelectButton/CitySelect'
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
-import AuthButton from '@/components/AuthButton';
+
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -116,11 +119,12 @@ const header = props => {
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (text, record) => (
+      render: withActions((text, record) => [
         <AuthButton name="admin.eContractBusiness.detail.get" noRight={null}>
-          <a style={{ color: '#66B3FF' }} onClick={toDetail(record)} >查看详情</a>
-        </AuthButton>
-      ),
+           <EditIcon text="查看详情" type="look" onClick={toDetail(record)} />
+          {/* <a style={{ color: '#66B3FF' }} onClick={toDetail(record)} >查看详情</a> */}
+        </AuthButton>,
+      ])
     },
   ];
   

src/pages/eContract/manage/list.jsx

@@ -1,30 +1,22 @@
 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 { Form, Input, Button, Icon, Select, Table, Pagination, DatePicker } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
-import SelectCity from '../../../components/SelectButton/CitySelect'
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import AuthButton from '@/components/AuthButton';
+import styles from '../../style/GoodsList.less';
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
 
 
-import AuthButton from '@/components/AuthButton';
-
-const { Option } = Select;
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { RangePicker } = DatePicker;
 
 const header = props => {
-
   const [data, setData] = useState({})
 
-
   useEffect(() => {
-
     getList({ pageNum: 1, pageSize: 10 });
-
-
   }, [])
 
   // 查询列表
@@ -41,10 +33,10 @@ const header = props => {
       router.push({
         pathname: '/eContract/manage/edit',
         query: {
-          id: id,
+          id,
         },
       });
-      return
+
     }
   }
 
@@ -121,11 +113,11 @@ const header = props => {
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (text, row) => (
+      render: withActions((text, record) => [
         <AuthButton name="admin.eContractManager.detail.get" noRight={null}>
-          <a style={{ color: '#66B3FF' }} onClick={toDetail(row.contractId)} >查看详情</a>
-        </AuthButton>
-      ),
+          <EditIcon text="查看详情" type="look" onClick={toDetail(record.contractId)} />
+        </AuthButton>,
+      ]),
     },
   ];
 
@@ -145,26 +137,25 @@ const header = props => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        let {archivesDate, ...submitValue} = values
-        if(null != archivesDate && archivesDate.length > 0){
+        const { archivesDate, ...submitValue } = values
+        if (null != archivesDate && archivesDate.length > 0) {
           const [archivesStartDate, archivesEndDate] = archivesDate
           submitValue.archivesStartDate = moment(archivesStartDate).format('YYYY-MM-DD');
           submitValue.archivesEndDate = moment(archivesEndDate).format('YYYY-MM-DD');
-        }   
+        }
         console.log(submitValue)
         getList({ pageNum: 1, pageSize: 10, ...submitValue })
       }
     });
   }
 
-  //重置搜索
+  // 重置搜索
   function handleReset() {
     props.form.resetFields();
     getList({ pageNum: 1, pageSize: 10 })
   }
 
 
-
   const { getFieldDecorator } = props.form
   return (
 
@@ -200,8 +191,7 @@ const header = props => {
               <option value="">全部</option>
               <option value="1">是</option>
               <option value="0">否</option>
-
-            </Select>
+            </Select>,
           )}
         </Form.Item>
         <Form.Item>
@@ -210,7 +200,7 @@ const header = props => {
               <option value="">全部</option>
               <option value="1">是</option>
               <option value="0">否</option>
-            </Select>
+            </Select>,
           )}
         </Form.Item>
         <Form.Item>
@@ -219,14 +209,14 @@ const header = props => {
               <option value="">全部</option>
               <option value="1">是</option>
               <option value="0">否</option>
-            </Select>
+            </Select>,
           )}
         </Form.Item>
 
         <Form.Item>
-        
+
           {getFieldDecorator('archivesDate')(
-            <RangePicker placeholder={['归档开始时间', '归档结束时间']} />
+            <RangePicker placeholder={['归档开始时间', '归档结束时间']} />,
           )}
         </Form.Item>
         <Form.Item>
@@ -242,9 +232,9 @@ const header = props => {
           </AuthButton>
         </Form.Item>
       </Form>
-  
-    
-         <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
+
+
+      <Table style={{ marginTop: '30px' }} 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={changePageNum} current={data.current} />
       </div>

src/pages/h5SampleManager/h5Sample/detail.jsx

@@ -12,6 +12,7 @@ import DragableUploadImageList from './components/ContactInfo'
 import TextArea from 'antd/lib/input/TextArea';
 import copy from 'copy-to-clipboard';
 import copyImg from '../../../assets/copy.png';
+import Navigate from '@/components/Navigate';
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -104,7 +105,7 @@ const header = props => {
         </Form.Item>}
         <Form.Item label="样例内容">
           {demandData.sampleType === 'link' && <div><span style={{ color: 'rgba(0, 0, 0, 0.45)', fontSize: '14px' }}>点击链接查看内容</span><br/></div>}
-          {demandData.sampleType === 'rich' ? getFieldDecorator('sampleContent')(<div dangerouslySetInnerHTML={{ __html: demandData.sampleContent}}></div>) : getFieldDecorator('sampleContentLink')(<a style={{ color: "blue" }} href={demandData.sampleContentLink} target="_blank" >{demandData.sampleContentLink}</a>)}
+          {demandData.sampleType === 'rich' ? getFieldDecorator('sampleContent')(<div dangerouslySetInnerHTML={{ __html: demandData.sampleContent}}></div>) : getFieldDecorator('sampleContentLink')(<Navigate to={demandData.sampleContentLink}>{demandData.sampleContentLink}</Navigate>)}
         </Form.Item>
         <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
           <div style={{ margin: '0.16rem 0 0.06rem' }}>

src/pages/house/raise/edit/components/RaiseHouse.jsx

@@ -11,6 +11,7 @@ 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';
 /**
  *图片设置
  *
@@ -125,7 +126,7 @@ function RaiseHouse(props) {
         title: '认筹实际热度',
         dataIndex: 'raiseRealHeat',
         key: 'raiseRealHeat',
-        render:  (x, row) => <><span style={{color: 'blue',cursor: 'pointer'}} onClick={() => showEdi({type: "identifyingChips",houseId: row.houseId})}>{row.raiseRealHeat}</span></>,
+        render:  (x, row) => <Navigate onClick={() => showEdi({type: "identifyingChips",houseId: row.houseId})}>{row.raiseRealHeat}</Navigate>,
     },
     {
       title: '锁定状态',

src/pages/record/share/countList.jsx

@@ -7,6 +7,7 @@ import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import apis from '../../../services/apis';
 import request from '../../../utils/request'
 import AuthButton from '@/components/AuthButton';
+import Navigate from '@/components/Navigate';
 
 /**
   @param {*} props
@@ -144,14 +145,14 @@ function record(props) {
       dataIndex: 'shareCount',
       key: 'shareCount',
       align: 'center',
-      render: (_, record) => <><span style={{color: 'blue',cursor: 'pointer'}} onClick={() => shareCount(record.personId)} >{record.shareCount}</span></>,
+      render: (_, record) => <Navigate onClick={() => shareCount(record.personId)}>{record.shareCount}</Navigate>,
     },
     {
       title: '点击人数',
       dataIndex: 'clickNum',
       key: 'clickNum',
       align: 'center',
-      render: (_, record) => <><span style={{color: 'blue',cursor: 'pointer'}} onClick={() => clickCount(record.personId)} >{record.clickNum}</span></>,
+      render: (_, record) => <Navigate onClick={() => clickCount(record.personId)}>{record.clickNum}</Navigate>,
     },
   ];
 
@@ -167,8 +168,8 @@ function record(props) {
           </Form.Item>
           <Form.Item>
             <span style={{marginRight:'10px'}}>分享时间：</span>
-                {getFieldDecorator('shareTime')(
-                  <RangePicker placeholder={['开始时间','结束时间']} />
+                {getFieldDecorator('shareTime',{initialValue : [moment(),moment()],})(
+                  <RangePicker placeholder={['开始时间','结束时间']}/>
                 )}
           </Form.Item>
           <Form.Item style={{position:'absolute',right:'38px'}}>

src/pages/statistical/activity/detail.jsx

@@ -9,6 +9,7 @@ import AuthButton from '../../../components/AuthButton';
 import echarts from 'echarts/lib/echarts';
 import EChart from '../../../components/EchartsTest/EChart';
 import Prompt from 'umi/prompt';
+import Navigate from '@/components/Navigate';
 
 /**
   @param {*} props
@@ -102,7 +103,7 @@ function record(props) {
         if (val == 0) {
             return <><span>{val}</span></>
         }
-        return <><span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toDetail(record, type)} >{val}</span></>
+        return <Navigate onClick={() => toDetail(record, type)}>{val}</Navigate>
     }
 
     //排序

src/pages/statistical/consultant/homePagePersons.jsx

@@ -6,6 +6,7 @@ import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import apis from '../../../services/apis';
 import request from '../../../utils/request'
 import Prompt from 'umi/prompt';
+import Navigate from '@/components/Navigate';
 
 /**
   @param {*} props
@@ -80,7 +81,7 @@ function record(props) {
             dataIndex: 'name',
             key: 'name',
             align: 'center',
-            render: (_, record) => <span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toPersonDetail(record.personId)} >{record.name || record.nickname}</span>,
+            render: (_, record) => <Navigate onClick={() => toPersonDetail(record.personId)}>{record.name || record.nickname}</Navigate>,
         },
         {
             title: '电话',
@@ -100,7 +101,7 @@ function record(props) {
             dataIndex: 'visitTimes',
             key: 'visitTimes',
             align: 'center',
-            render: (_, record) => <span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toHomepageNum(record.personId)} >{record.visitTimes}</span>,
+            render: (_, record) => <Navigate onClick={() => toHomepageNum(record.personId)}>{record.visitTimes}</Navigate>,
         },
         {
             title: '最后访问时间',

src/pages/statistical/consultant/table.jsx

@@ -6,6 +6,7 @@ import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import apis from '../../../services/apis';
 import request from '../../../utils/request'
 import Prompt from 'umi/prompt';
+import Navigate from '@/components/Navigate';
 
 /**
   @param {*} props
@@ -96,7 +97,7 @@ function record(props) {
             dataIndex: 'name',
             key: 'name',
             align: 'center',
-            render: (_, record) => <span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => toPersonDetail(record.personId)} >{record.name || record.nickname}</span>,
+            render: (_, record) => <Navigate onClick={() => toPersonDetail(record.personId)}>{record.name || record.nickname}</Navigate>,
         },
         {
             title: '电话',

src/pages/statistical/consultant/visitPersons.jsx

@@ -6,6 +6,7 @@ import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import apis from '../../../services/apis';
 import request from '../../../utils/request'
 import Prompt from 'umi/prompt';
+import Navigate from '@/components/Navigate';
 
 /**
   @param {*} props
@@ -94,7 +95,7 @@ function record(props) {
             dataIndex: 'visitTimes',
             key: 'visitTimes',
             align: 'center',
-            render: (_, record) => <span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => tovisitNum(record.name || record.nickname, record.personId, record.visitTime)} >{record.visitTimes}</span>,
+            render: (_, record) => <Navigate onClick={() => tovisitNum(record.name || record.nickname, record.personId, record.visitTime)}>{record.visitTimes}</Navigate>,
         },
         {
             title: '最后访问时间',

src/utils/request.js

@@ -20,7 +20,7 @@ const codeMessage = {
   410: '请求的资源被永久删除，且不会再得到的。',
   422: '当创建一个对象时，发生一个验证错误。',
   500: '服务器发生错误，请检查服务器。',
-  502: '网关错误。',
+  502: '连接服务超时',
   503: '服务不可用，服务器暂时过载或维护。',
   504: '网关超时。',
 };
@@ -70,7 +70,8 @@ request.interceptors.response.use(async (response, options) => {
       const errorText = codeMessage[response.status] || response.statusText;
       const { status, url } = response;
       notification.error({
-        message: `请求错误 ${status}: ${url}`,
+        // message: `连接超时，请刷新或重新登录 ${status}: ${url}`,
+        message: `连接超时，请刷新或重新登录 ${status}: ${url}`,
         description: errorText,
       });
       throw new Error(response.statusText);