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

src/pages/carouselFigure/advertisingList.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 SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import apis from '../../services/apis';
@@ -47,7 +48,7 @@ const header = (props) => {
       dataIndex: 'image',
       key: 'image',
       align: 'center',
-      render: (image,row) => <img onClick={toEdit(row.contentId)} src={image} className={styles.imgSmall} />,
+      render: (image,row) => <Navigate onClick={toEdit(row.contentId)}><img src={image} className={styles.imgSmall} /></Navigate>,
     },
     {
       title: '发布城市',

src/pages/carouselFigure/carouselFigureList.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 SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import apis from '../../services/apis';
@@ -47,7 +48,7 @@ const header = (props) => {
       dataIndex: 'image',
       key: 'image',
       align: 'center',
-      render: (x, row) => <img onClick={toEditCarouse(row.contentId)} src={row.image} className={row.showPosition === 'index' ? styles.imgIndex : row.showPosition === 'mall' ? styles.imgPerfect : ''} />,
+      render: (x, row) => <Navigate onClick={toEditCarouse(row.contentId)} ><img src={row.image} className={row.showPosition === 'index' ? styles.imgIndex : row.showPosition === 'mall' ? styles.imgPerfect : ''} /></Navigate>,
     },
     {
       title: '发布城市',

src/pages/carouselFigure/customImg/list.jsx

@@ -1,9 +1,10 @@
 import React, { useState, useEffect } from 'react';
 import { Form, Table } from 'antd';
+import router from 'umi/router';
 import AuthButton from '@/components/AuthButton';
 import withActions from '@/components/ActionList';
 import EditIcon from '@/components/EditIcon';
-import router from 'umi/router';
+import Navigate from '@/components/Navigate';
 import apis from '../../../services/apis';
 import request from '../../../utils/request'
 
@@ -52,7 +53,7 @@ function header(props) {
       <Table dataSource={data}>
         <Column title="图片" dataIndex="imgUrl" key="imgUrl"
           render={(text, record) => (
-            <img onClick={toEditCustom(record.imgId, record.imgType)} src={record.imgUrl} height="120px" width="150px" style={{ objectFit: 'contain' }} />
+            <Navigate onClick={toEditCustom(record.imgId, record.imgType)} ><img src={record.imgUrl} height="120px" width="150px" style={{ objectFit: 'contain' }} /></Navigate>
           )} />
         <Column title="类型" dataIndex="imgType" key="imgType"
           render={(text, record) => (

src/pages/carouselFigure/propagandaList.jsx

@@ -5,6 +5,7 @@ import moment from 'moment';
 import AuthButton from '@/components/AuthButton';
 import EditIcon from '@/components/EditIcon';
 import withActions from '@/components/ActionList';
+import Navigate from '@/components/Navigate';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import apis from '../../services/apis';
@@ -47,7 +48,7 @@ const header = (props) => {
       dataIndex: 'image',
       key: 'image',
       align: 'center',
-      render: (image,row) => <img onClick={toEdit(row.contentId)} src={image} className={styles.propaganda} />,
+      render: (image,row) => <Navigate onClick={toEdit(row.contentId)} ><img src={image} className={styles.propaganda} /></Navigate>,
     },
     {
       title: '发布城市',

src/pages/customer/customerlist/index.jsx

@@ -5,7 +5,7 @@ import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
 import router from 'umi/router';
-
+import withActions from '@/components/ActionList';
 import Attribution from './components/attribution'
 import AssistConsultant from './components/assistConsultant'
 import BatchAssistConsultant from './components/BatchAssistConsultant'
@@ -217,7 +217,7 @@ function body(props) {
         localStorageValue.endCreateDate = localStorageDate(localStorageValue.endCreateDate)
         props.form.setFieldsValue(localStorageValue);
 
-        getList( {pageNumber: 1, pageSize: 10, customerType, ...JSON.parse(localStorage.getItem("pubPageParams")) })
+        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' })
@@ -413,7 +413,7 @@ function body(props) {
       dataIndex: 'picture',
       key: 'picture',
       align: 'center',
-      width: '15%',
+      width: '10%',
       // render: (_, record) => <Avatar shape="square" style={{ color: 'blue', cursor: 'pointer' }} onClick={() => publicCustomerDetail(record)} src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
       render: (_, record) => <Avatar shape="square" style={{ color: 'blue', cursor: 'pointer' }} onClick={() => publicCustomerDetail(record)} src={record.picture} size={64} icon="user" />,
     },
@@ -438,7 +438,7 @@ function body(props) {
       dataIndex: '',
       key: '',
       align: 'center',
-      width: '15%',
+      width: '10%',
       render: (_, record) => <><span>{record.buildingId != null ? '是' : '否'}</span></>,
     },
     {
@@ -453,7 +453,7 @@ function body(props) {
       dataIndex: 'sharePersonName',
       key: 'sharePersonName',
       align: 'center',
-      width: '15%',
+      width: '10%',
     },
     {
       title: '性别',
@@ -469,25 +469,35 @@ function body(props) {
       dataIndex: 'customerId',
       key: 'customerId',
       align: 'center',
-      width: '25%',
-      // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => (
-        <>
-          {/* <AuthButton name="admin.customer.public.detail" noRight={null}>
-            <Button className={customerType === 'private' ? Styles.displayS : Styles.text } type="link" onClick={() => publicCustomerDetail(record)}>查看详情</Button>
-          </AuthButton>
-          &nbsp;&nbsp; */}
-          <AuthButton name="admin.customer.recommend" noRight={null}>
-            <Button className={customerType === 'private' ? Styles.displayS : Styles.text} type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
-          </AuthButton>
-          <AuthButton name="admin.customer.assign" noRight={null}>
-            <Button className={customerType === 'private' ? Styles.displayS : Styles.text} type="link" onClick={() => assistConsultant(record.customerId, record.buildingId)}>分配置业顾问</Button>
-          </AuthButton>
-          <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
-            <Button className={Styles.text} type="link" onClick={() => showRecord(record)}>积分记录</Button>
-          </AuthButton>
-        </>
-      ),
+      width: '20%',
+      render: withActions((text, record) => [
+        <AuthButton name="admin.customer.recommend" noRight={null}>
+          <Button className={customerType === 'private' ? Styles.displayS : Styles.text} type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
+        </AuthButton>,
+        <AuthButton name="admin.customer.assign" noRight={null}>
+          <Button className={customerType === 'private' ? Styles.displayS : Styles.text} type="link" onClick={() => assistConsultant(record.customerId, record.buildingId)}>分配置业顾问</Button>
+        </AuthButton>,
+        <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
+          <Button className={Styles.text} type="link" onClick={() => showRecord(record)}>积分记录</Button>
+        </AuthButton>
+      ]),
+      // render: (_, record) => (
+      //   <>
+      //     {/* <AuthButton name="admin.customer.public.detail" noRight={null}>
+      //       <Button className={customerType === 'private' ? Styles.displayS : Styles.text } type="link" onClick={() => publicCustomerDetail(record)}>查看详情</Button>
+      //     </AuthButton>
+      //     &nbsp;&nbsp; */}
+      //     <AuthButton name="admin.customer.recommend" noRight={null}>
+      //       <Button className={customerType === 'private' ? Styles.displayS : Styles.text} type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
+      //     </AuthButton>
+      //     <AuthButton name="admin.customer.assign" noRight={null}>
+      //       <Button className={customerType === 'private' ? Styles.displayS : Styles.text} type="link" onClick={() => assistConsultant(record.customerId, record.buildingId)}>分配置业顾问</Button>
+      //     </AuthButton>
+      //     <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
+      //       <Button className={Styles.text} type="link" onClick={() => showRecord(record)}>积分记录</Button>
+      //     </AuthButton>
+      //   </>
+      // ),
     },
   ]
 
@@ -574,35 +584,46 @@ function body(props) {
       key: 'customerId',
       align: 'center',
       width: '20%',
-      // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => (
-        <>
-          <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center', }}>
-            <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
-              <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showStatus(record)}>变更状态</Button>
-            </AuthButton>
-
-            <AuthButton name="admin.customer.recommend.belong" noRight={null}>
-              <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showGM(record)}>调整归属</Button>
-            </AuthButton>
-          </div>
-
-
-          {/* <AuthButton name="admin.customer.recommend.get" noRight={null}>
-            <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => toCustomerDateil(record)}>查看详情</Button>
-          </AuthButton>
-            &nbsp;&nbsp; */}
-          <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
-            <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
-              <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecord(record)}>积分记录</Button>
-            </AuthButton>
-
-            <AuthButton name="admin.mine.taPointsRecords.id.get" noRight={null}>
-              <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
-            </AuthButton>
-          </div>
-        </>
-      ),
+      render: withActions((text, record) => [
+
+        <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
+          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showStatus(record)}>变更状态</Button>
+        </AuthButton>,
+
+        <AuthButton name="admin.customer.recommend.belong" noRight={null}>
+          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showGM(record)}>调整归属</Button>
+        </AuthButton>,
+
+        <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
+          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecord(record)}>积分记录</Button>
+        </AuthButton>,
+
+        <AuthButton name="admin.mine.taPointsRecords.id.get" noRight={null}>
+          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
+        </AuthButton>
+      ]),
+      // render: (_, record) => (
+      //   <>
+      //     <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
+      //       <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showStatus(record)}>变更状态</Button>
+      //     </AuthButton>
+      //     <AuthButton name="admin.customer.recommend.belong" noRight={null}>
+      //       <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showGM(record)}>调整归属</Button>
+      //     </AuthButton>
+
+      //     {/* <AuthButton name="admin.customer.recommend.get" noRight={null}>
+      //       <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => toCustomerDateil(record)}>查看详情</Button>
+      //     </AuthButton>
+      //       &nbsp;&nbsp; */}
+      //     <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
+      //       <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecord(record)}>积分记录</Button>
+      //     </AuthButton>
+      //     <AuthButton name="admin.mine.taPointsRecords.id.get" noRight={null}>
+      //       <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
+      //     </AuthButton>
+
+      //   </>
+      // ),
     },
   ]
 

src/pages/system/housingPolicy.jsx

@@ -6,12 +6,11 @@ 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 SelectCity from '../../components/SelectButton/CitySelect';
 import apis from '../../services/apis';
 import request from '../../utils/request';
 import styles from '../style/GoodsList.less';
-import Navigate from '@/components/Navigate';
-
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -53,7 +52,7 @@ const header = (props) => {
       dataIndex: 'policyImg',
       key: 'policyImg',
       align: 'center',
-      render: (policyImg,row) => <img onClick={toEditPolicy(row.policyId)} src={policyImg} className={styles.touxiang} />,
+      render: (policyImg,row) =><Navigate onClick={toEditPolicy(row.policyId)} ><img src={policyImg} className={styles.touxiang} /></Navigate> ,
     },
     {
       title: '标题',