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

config/config.js

   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

     "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"
   },
     "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/components/Navigate/index.jsx

             )
         }
 
-    } else {
+    } else if (onClick) {
         return (
-            <a onClick={onClick} href={to} style={{ color: '#1D74D9' }}>{children}</a>
+            <span onClick={onClick} style={{ color: '#1D74D9' }}>{children}</span>
         )
 
+    } else {
+        return (
+            <span style={{ color: '#1D74D9' }}>{children}</span>
+        )
     }
 
 

src/pages/activity/ActivityList.jsx

   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/helpActivity/helpRecord.jsx

   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

 
   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 }));

src/pages/building/list/index.jsx

   // 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/customer/customerlist/components/BatchAssistConsultant.jsx

 
    // 分页
   onChange(pageNum) {
-    console.log(this.state.visibleData.buildingName,"222222222222222222222222")
     this.getList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingName ||this.props.visibleData.buildingId})
 
     // this.getUserList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingName })
 
   // 提交
   submitGm(record) {
-    console.log(this.state.visibleData.buildingName,"3333333333333333333")
     // 网路请求
     request({ ...apis.customer.batchConsultantAssist, data: { userId: record.userId
       ,buildingId:this.state.visibleData.buildingName  || this.props.visibleData.buildingId

src/pages/customer/customerlist/index.jsx

     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 {
 
   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)
     console.log(e)
   }
 
+  const localStorageDate = (date) => date ? moment(date) : ''
+
   // 分页
   function onChange(pageNum) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     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 }))
     } 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' })

src/pages/eContract/businessConfig/list.jsx

 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;
       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

 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 });
-
-
   }, [])
 
   // 查询列表
       router.push({
         pathname: '/eContract/manage/edit',
         query: {
-          id: id,
+          id,
         },
       });
-      return
+
     }
   }
 
       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>,
+      ]),
     },
   ];
 
     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 (
 
               <option value="">全部</option>
               <option value="1">是</option>
               <option value="0">否</option>
-
-            </Select>
+            </Select>,
           )}
         </Form.Item>
         <Form.Item>
               <option value="">全部</option>
               <option value="1">是</option>
               <option value="0">否</option>
-            </Select>
+            </Select>,
           )}
         </Form.Item>
         <Form.Item>
               <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>
           </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/eContract/template/list.jsx

 import apis from '../../../services/apis';
 import request from '../../../utils/request';
 import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
 // import RaiseHelpDoc from '../edit/components/RaiseHelpDoc';
 
 const { Option } = Select;
       dataIndex: '',
       key: '',
       align: 'center',
-      render: (text, record) => (
+      render: withActions((text, record) => [(
           <AuthButton name="admin.eContractTemplate.detail.get" noRight={null}>
-            <a style={{ color: '#66B3FF' }} onClick={toDetail(record)} >查看详情</a>
+            <EditIcon type="look" text="查看详情" onClick={toDetail(record)}></EditIcon>
           </AuthButton>
-      ),
+      ),])
     },
   ];
   const getSignList = dynamicId => {

src/pages/h5SampleManager/h5Demand/list.jsx

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

src/pages/record/share/countList.jsx

           </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/sharePersonNum.jsx

 
     if (props.location.query.queryDate) {
       console.log(queryDate, "props.location.query.queryDateprops.location.query.queryDate")
-      startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
-      endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
+      startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
       console.log(startDate, endDate, "endDateendDateendDateendDateendDateendDate")
     } else {
-      startDate = moment(props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
-      endDate = moment(props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
+      startDate = moment(props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
     }
 
     console.log(startDate)
     activityType = this.props.location.query.activityType;
 
     if (this.props.location.query.queryDate) {
-      startDate = moment(this.props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
-      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
+      startDate = moment(this.props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
     } else {
-      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
-      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
+      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
+      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
     }
     this.setState({
       formData: {
 
     return (
       <>
+        <div align="right" style={{ marginBottom: '16px' }}><Button onClick={this.goback}>返回</Button></div>
         <div>
           <span style={{ marginLeft: '20px' }}>分享内容：{this.state.activityName}</span>
         </div>
             </Button>
             <Button onClick={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
           </Form.Item>
-        </Form>
-        <div>
-          <Button type="primary" style={{ float: 'right', margin: '20px 0', marginLeft: '20px', zIndex: 1 }} onClick={this.goback}>
-            返回
-            </Button>
           <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', zIndex: 1, marginTop: '25px' }} onClick={this.exportActivityStats}>
               导出
             </Button>
           </AuthButton>
+        </Form>
+        <div>
+
           <Table style={{ marginTop: '20px' }} dataSource={this.state.tableData} columns={columns} pagination={{ total: this.state.total }} onChange={this.handleTableChange} scroll={{ y: 500 }}></Table>
         </div>
         <Prompt message={location =>
-        location.pathname.startsWith("/statistical/activity")
-          ? true
-          : localStorage.removeItem("tabState")} />
-    </>
+          location.pathname.startsWith("/statistical/activity")
+            ? true
+            : localStorage.removeItem("tabState")} />
+      </>
     )
 
   }

src/utils/request.js

   410: '请求的资源被永久删除，且不会再得到的。',
   422: '当创建一个对象时，发生一个验证错误。',
   500: '服务器发生错误，请检查服务器。',
-  502: '网关错误。',
+  502: '连接服务超时',
   503: '服务不可用，服务器暂时过载或维护。',
   504: '网关超时。',
 };
       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);