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

src/components/Navigate/index.jsx

@@ -16,11 +16,15 @@ const Navigate = ({ children, to, onClick }) => {
             )
         }
 
-    } 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/customer/customerlist/components/BatchAssistConsultant.jsx

@@ -89,7 +89,6 @@ class ModalAttribution extends React.Component {
 
    // 分页
   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 })
@@ -97,7 +96,6 @@ class ModalAttribution extends React.Component {
 
   // 提交
   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/eContract/template/list.jsx

@@ -9,6 +9,8 @@ import BuildSelect from '../../../components/SelectButton/BuildSelect'
 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;
@@ -105,11 +107,11 @@ const header = props => {
       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

@@ -1,9 +1,9 @@
 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';
@@ -11,6 +11,8 @@ import request from '../../../utils/request';
 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;
@@ -106,10 +108,11 @@ const header = props => {
       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/statistical/activity/sharePersonNum.jsx

@@ -147,12 +147,12 @@ class SharePersonNum extends React.Component {
 
     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)
@@ -224,11 +224,11 @@ class SharePersonNum extends React.Component {
     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: {
@@ -297,6 +297,7 @@ class SharePersonNum extends React.Component {
 
     return (
       <>
+        <div align="right" style={{ marginBottom: '16px' }}><Button onClick={this.goback}>返回</Button></div>
         <div>
           <span style={{ marginLeft: '20px' }}>分享内容：{this.state.activityName}</span>
         </div>
@@ -323,23 +324,21 @@ class SharePersonNum extends React.Component {
             </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")} />
+      </>
     )
 
   }