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

src/components/EditIcon/index.jsx

@@ -1,14 +1,107 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import spriteImg from '../../assets/sprite.png';
 
-const EditIcon = ({ text, color, position }) => {
+const spriteInfo = [
+    {
+        name: '启用',
+        type: 'start',
+        pos: 0,
+        color: '#ff925c'
+    },
+    {
+        name: '发布',
+        type: 'publish',
+        pos: -126,
+        color: '#ff925c'
+    },
+    {
+        name: '上架',
+        type: 'up',
+        pos: -18,
+        color: '#ff925c'
+    },
+    {
+        name: '编辑',
+        type: 'edit',
+        pos: -144,
+        color: '#ff925c'
+    },
+    {
+        name: '取消',
+        type: 'cancel',
+        pos: -36,
+        color: '#FF4A4A'
+    },
+    {
+        name: '停用',
+        type: 'stop',
+        pos: -162,
+        color: '#FF4A4A'
+    },
+    {
+        name: '结束',
+        type: 'end',
+        pos: -54,
+        color: '#FF4A4A'
+    },
+    {
+        name: '删除',
+        type: 'delete',
+        pos: -180,
+        color: '#FF4A4A'
+    },
+    {
+        name: '查看',
+        type: 'look',
+        pos: -72,
+        color: '#FF4A4A'
+    },
+    {
+        name: '添加',
+        type: 'add',
+        pos: -198,
+        color: '#FF4A4A'
+    },
+    {
+        name: '前置',
+        type: 'top',
+        pos: -90,
+        color: '#FF4A4A'
+    },
+    {
+        name: '下架',
+        type: 'down',
+        pos: -216,
+        color: '#FF4A4A'
+    },
+    {
+        name: '记录',
+        type: 'record',
+        pos: -108,
+        color: '#FF4A4A'
+    },
+
+]
+
+const EditIcon = ({ text, type, color, position }) => {
+
+    const icon = spriteInfo.filter(x => x.type === type)[0];
+    const color2 = color || icon.color;
+    const position2 = position || icon.pos;
+
+    const wrappedStyle = useMemo(() => ({ color: `${color2}`, display: 'flex', alignItems: 'center' }), [color]);
+    const iconStyle = useMemo(() => ({ display: 'inline-block', marginLeft: '6px', background: `url(${spriteImg}) 0 ${position2}px / 100% 1300% no-repeat`, width: '18px', height: '18px' }), [position])
+
+
 
     return (
-        <span style={{ color: `${color}`, display: 'flex', alignItems: 'center' }} >
+
+        <span style={wrappedStyle} >
             {text}
-            <span style={{ display: 'inline-block', marginLeft: '6px', background: `url(${spriteImg}) 0 ${position}px no-repeat`, width: '18px', height: '18px', backgroundSize: '100% 1300%' }}></span>
+            <span style={iconStyle}></span>
         </span>
 
+
     )
 
 };

src/pages/activity/ActivityList.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { Form, Input, Button, Icon, Select, Menu, Dropdown, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import router from 'umi/router';
 import moment from 'moment';
@@ -10,6 +10,8 @@ import apis from '../../services/apis';
 import request from '../../utils/request';
 import AuthButton from '@/components/AuthButton';
 import Prompt from 'umi/prompt';
+import { DownOutlined } from '@ant-design/icons';
+import EditIcon from '@/components/EditIcon';
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -43,7 +45,7 @@ const header = props => {
   }, [])
 
   // 跳转到编辑商品
-  const toEditGoods = dynamicId  => () => {
+  const toEditGoods = dynamicId => () => {
     router.push({
       pathname: '/activity/editActivity',
       query: {
@@ -90,18 +92,48 @@ const header = props => {
     router.push({
       pathname: '/activity/activityRecord',
       query: {
-        
+
         id,
       },
     });
   }
-  
+
   /**
    *
    *
    * @param {*} props
    * @returns
    */
+
+  const menu = (row) => (
+    <Menu>
+      <Menu.Item>
+        <AuthButton name="admin.buildingDynamic.tag" noRight={null}>
+          <span style={{ cursor: 'pointer' }} onClick={homeDynamic(row)}>{row.home === 1 ? <EditIcon text="取消推首页" color='#666' type="cancel"></EditIcon> : <EditIcon text="推荐首页" color='#666' type="top"></EditIcon>}</span>
+        </AuthButton>
+      </Menu.Item>
+      <Menu.Item>
+        <span style={{ cursor: 'pointer' }} onClick={toDataReacord(row.dynamicId)}><EditIcon text="数据记录" color='#666' type="record"></EditIcon></span>
+      </Menu.Item>
+      <Menu.Item>
+        <AuthButton name="admin.buildingDynamic.tag" noRight={null}>
+          <span style={{ cursor: 'pointer' }} onClick={topDynamic(row)}>{row.weight === 1 ? <EditIcon text="取消标签" color='#666' type="cancel"></EditIcon> : <EditIcon text="添加标签" color='#666' type="add"></EditIcon>}</span>
+        </AuthButton>
+      </Menu.Item>
+      <Menu.Item>
+        <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
+          <span style={{ cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? <EditIcon text="取消发布" color='#666' type="cancel"></EditIcon> : <EditIcon text="发布" color='#666' type="publish"></EditIcon>}</span>
+        </AuthButton>
+      </Menu.Item>
+      <Menu.Item>
+        <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
+          {row.activityStatus === 0 && <span style={{ cursor: 'pointer' }} onClick={finishDynamic.bind(this, row)}><EditIcon text="结束活动" color='#666' type="end"></EditIcon></span>}
+        </AuthButton>
+      </Menu.Item>
+
+    </Menu>
+
+  );
   const columns = [
     {
       title: '活动标题',
@@ -110,7 +142,7 @@ const header = props => {
       align: 'center',
       // width: '15%',
       render: (x, row) => <><div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', width: '201px', title: 'content' }}>
-        <span style={{ color: 'blue', cursor: 'pointer' }} onClick={getActivityDetail(row.dynamicId)}>{row.title}</span></div></>,
+        <span style={{ color: '#1D74D9', cursor: 'pointer' }} onClick={getActivityDetail(row.dynamicId)}>{row.title}</span></div></>,
       // width: '300px',
       // ellipsis:'true'overflow: hidden; /*溢出隐藏*/
       // text-overflow: ellipsis; /*以省略号...显示*/
@@ -131,7 +163,7 @@ const header = props => {
       key: 'count',
       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.dynamicId)}>{row.count}</span></div></>,
+        <span style={{ color: '#1D74D9', cursor: 'pointer' }} onClick={getJoinPeople(row.dynamicId)}>{row.count}</span></div></>,
       // width: '10%',
       // width: '6%',
     },
@@ -177,32 +209,47 @@ const header = props => {
       align: 'center',
       render: (x, row) => (
         <>
-          {/* <AuthButton name="admin.SignList.get" noRight={null}>
-          {(row.activityStatus === 0 || row.activityStatus === 2) && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, row.dynamicId)}>报名记录{<Icon type="snippets" className={styles.shoppingCart} />}</span>}
-          </AuthButton> */}
-          <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>
-          </AuthButton>
-          <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
-            {row.activityStatus === 0 && <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={finishDynamic.bind(this, row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
-          </AuthButton>
-          <AuthButton name="admin.buildingDynamic.tag" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{row.weight === 1 ? '取消标签' : '添加标签'}<Icon type="vertical-align-top" className={styles.edit} /></span>
-          </AuthButton>
-          <AuthButton name="admin.buildingDynamic.tag" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={homeDynamic(row)}>{row.home === 1 ? '取消推首页' : '推首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
-          </AuthButton>
-          {/* <AuthButton name="admin.buildingDynamic.update.put" noRight={null}> */}
-          {<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={toDataReacord(row.dynamicId)}>数据记录<Icon type="form" className={styles.edit} /></span>}
-          {/* </AuthButton> */}
-          <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
-            {(row.activityStatus === 0 || row.activityStatus === 1) && <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId,row.count)}>编辑<Icon type="form" className={styles.edit} /></span>}
-          </AuthButton>
-          
-          {/* {(row.activityStatus === 0 || row.activityStatus === 2) &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>{'下载二维码'} {<Icon type="qrcode" className={styles.shoppingCart} />}</span>} */}
+          <Dropdown overlay={menu(row)}>
+            <a style={{ color: '#666' }} onClick={e => e.preventDefault()}>
+              <span style={{ color: '#FF4A4A' }} >更多</span> <DownOutlined />
+            </a>
+          </Dropdown>
         </>
       ),
     },
+    // {
+    //   title: '操作',
+    //   dataIndex: 'handle',
+    //   key: 'handle',
+    //   align: 'center',
+    //   render: (x, row) => (
+    //     <>
+    //       {/* <AuthButton name="admin.SignList.get" noRight={null}>
+    //       {(row.activityStatus === 0 || row.activityStatus === 2) && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, row.dynamicId)}>报名记录{<Icon type="snippets" className={styles.shoppingCart} />}</span>}
+    //       </AuthButton> */}
+    //       <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
+    //         <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>
+    //       </AuthButton>
+    //       <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
+    //         {row.activityStatus === 0 && <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={finishDynamic.bind(this, row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
+    //       </AuthButton>
+    //       <AuthButton name="admin.buildingDynamic.tag" noRight={null}>
+    //         <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{row.weight === 1 ? '取消标签' : '添加标签'}<Icon type="vertical-align-top" className={styles.edit} /></span>
+    //       </AuthButton>
+    //       <AuthButton name="admin.buildingDynamic.tag" noRight={null}>
+    //         <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={homeDynamic(row)}>{row.home === 1 ? '取消推首页' : '推首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
+    //       </AuthButton>
+    //       {/* <AuthButton name="admin.buildingDynamic.update.put" noRight={null}> */}
+    //       {<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={toDataReacord(row.dynamicId)}>数据记录<Icon type="form" className={styles.edit} /></span>}
+    //       {/* </AuthButton> */}
+    //       <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
+    //         {(row.activityStatus === 0 || row.activityStatus === 1) && <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId, row.count)}>编辑<Icon type="form" className={styles.edit} /></span>}
+    //       </AuthButton>
+
+    //       {/* {(row.activityStatus === 0 || row.activityStatus === 2) &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>{'下载二维码'} {<Icon type="qrcode" className={styles.shoppingCart} />}</span>} */}
+    //     </>
+    //   ),
+    // },
   ];
   const getSignList = dynamicId => {
     router.push({

src/pages/activity/dataRecord/index.jsx

@@ -16,7 +16,6 @@ const { TabPane } = Tabs;
 
 const DataRecord = props => {
 
-    const [showHelp, setShowHelp] = useState(false)
     const [tab, setTab] = useState('1')
     const [data, setData] = useState({})
 
@@ -31,15 +30,15 @@ const DataRecord = props => {
     }, [])
 
     const getData = (params) => {
-  
+
         request({ ...apis.activityDataStatis.getStatisticData, params: { ...params, } }).then((data) => {
             console.log(data)
-            setData(data||{})
+            setData(data || {})
         })
     }
 
     function tabsCallback(e) {
-        
+
         setTab(e)
     }
 
@@ -47,25 +46,6 @@ const DataRecord = props => {
         <div>
             <div>
                 <span>{data.activityName || '0'}</span>
-                <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
-                <Modal
-                    title="指标说明（数据会存在一定时间延迟）"
-                    centered
-                    visible={showHelp}
-                    footer={null}
-                    onCancel={() => setShowHelp(false)}
-                >
-                    <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享人数：</p>
-                    <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>分享小程序活动的总人数</p>
-                    <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享次数：</p>
-                    <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>触发小程序活动分享的总次数</p>
-                    <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>新增注册用户：</p>
-                    <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过当前活动授权手机号的总人数</p>
-                    <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问人数：</p>
-                    <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总人数</p>
-                    <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问次数：</p>
-                    <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总次数</p>
-                </Modal>
                 <Button type="primary" style={{ float: 'right', marginLeft: '20px', zIndex: 1 }} onClick={() => router.go(-1)}>
                     返回
                </Button>
@@ -122,15 +102,15 @@ const DataRecord = props => {
             </Tabs>
             <div style={{ marginTop: '20px' }}>
                 {/* 访问人数 */}
-                {(tab === '1' && < Visitors id={id} type={type} getData={()=>getData({ id: id, type: type })}/>)}
+                {(tab === '1' && < Visitors id={id} type={type} getData={() => getData({ id: id, type: type })} />)}
                 {/* 访问次数 */}
-                {(tab === '2' && <VisitNum id={id} type={type} getData={()=>getData({ id: id, type: type })}/>)}
+                {(tab === '2' && <VisitNum id={id} type={type} getData={() => getData({ id: id, type: type })} />)}
                 {/* 新增注册用户 */}
-                {(tab === '3' && <Newuser id={id} type={type} getData={()=>getData({ id: id, type: type })}/>)}
+                {(tab === '3' && <Newuser id={id} type={type} getData={() => getData({ id: id, type: type })} />)}
                 {/* 分享人数 */}
-                {(tab === '4' && <Shares id={id} type={type} getData={()=>getData({ id: id, type: type })}/>)}
+                {(tab === '4' && <Shares id={id} type={type} getData={() => getData({ id: id, type: type })} />)}
                 {/* 分享次数 */}
-                {(tab === '5' && <ShareNum id={id} type={type} getData={()=>getData({ id: id, type: type })}/>)}
+                {(tab === '5' && <ShareNum id={id} type={type} getData={() => getData({ id: id, type: type })} />)}
 
                 {/* { (tab === 'desc' && <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft:'30px'}} />)} */}
 

src/pages/activity/dataRecord/table/newuser.jsx

@@ -8,143 +8,162 @@ import WxDictSelect from '@/components/SelectButton/WxDictSelect';
 import moment from 'moment';
 
 const date = {
-  startDate: moment().year(1000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z',
-  endDate: moment().year(3000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z'
+  startDate: moment().year(1000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z',
+  endDate: moment().year(3000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z'
 }
 
 const header = props => {
-
+  const [showHelp, setShowHelp] = useState(false)
   const [data, setData] = useState({})
   const activityId = props.id
   const activityType = props.type
 
   useEffect(() => {
     console.log(activityId, activityType)
-    getList({pageNum: 1, pageSize: 10 })
+    getList({ pageNum: 1, pageSize: 10 })
 
   }, [])
 
   const getList = params => {
     console.log(params)
-    request({ ...apis.activityDataStatis.activityAddRegist, params: {...params,activityId: activityId, activityType: activityType,...date  }}).then( data=> {
+    request({ ...apis.activityDataStatis.activityAddRegist, params: { ...params, activityId: activityId, activityType: activityType, ...date } }).then(data => {
       console.log(data)
       props.getData()
       setData(data)
-    }).catch(e=>{
+    }).catch(e => {
       console.log(e)
     })
   }
-  
+
   const columns = [
-        {
-          title: '姓名',
-          dataIndex: 'nickName',
-          key: 'nickName',
-        },
-        {
-          title: '电话',
-          dataIndex: 'phone',
-          key: 'phone',
-        },
-        {
-          title: '性别',
-          dataIndex: 'gender',
-          key: 'gender',
-        },
-        {
-          title: '归属地',
-          dataIndex: 'province',
-          key: 'province',
-        },
-        {
-          title: '来源渠道',
-          dataIndex: 'personFrom',
-          key: 'personFrom',
-        },
-        {
-          title: '置业顾问',
-          dataIndex: 'realtyConsultant',
-          key: 'realtyConsultant',
-        },
-        {
-          title: '置业顾问电话',
-          dataIndex: 'realtyConsultantPhone',
-          key: 'realtyConsultantPhone',
-        },
-        {
-          title: '分享者',
-          dataIndex: 'sharePersonName',
-          key: 'sharePersonName',
-        },
-        {
-          title: '分享者电话',
-          dataIndex: 'sharePersonPhone',
-          key: 'sharePersonPhone',
-        },
-      ]
+    {
+      title: '姓名',
+      dataIndex: 'nickName',
+      key: 'nickName',
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+    },
+    {
+      title: '性别',
+      dataIndex: 'gender',
+      key: 'gender',
+    },
+    {
+      title: '归属地',
+      dataIndex: 'province',
+      key: 'province',
+    },
+    {
+      title: '来源渠道',
+      dataIndex: 'personFrom',
+      key: 'personFrom',
+    },
+    {
+      title: '置业顾问',
+      dataIndex: 'realtyConsultant',
+      key: 'realtyConsultant',
+    },
+    {
+      title: '置业顾问电话',
+      dataIndex: 'realtyConsultantPhone',
+      key: 'realtyConsultantPhone',
+    },
+    {
+      title: '分享者',
+      dataIndex: 'sharePersonName',
+      key: 'sharePersonName',
+    },
+    {
+      title: '分享者电话',
+      dataIndex: 'sharePersonPhone',
+      key: 'sharePersonPhone',
+    },
+  ]
 
-    function handleReset() {
-        props.form.resetFields();
-        getList({ pageNum: 1, pageSize: 10 })
-    }
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
 
-    const changePageNum = pageNumber => {
-        getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
-      }
+  const changePageNum = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
 
-      const handleSubmit = e => {
-        e.preventDefault();
-        props.form.validateFields((err, values) => {
-          if (!err) {
-            console.log('提交数据: ', values)
-           
-            getList({ pageNum: 1, pageSize: 10, ...values })
-          }
-        });
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+
+        getList({ pageNum: 1, pageSize: 10, ...values })
       }
-    
-      const exportActivityStats = () => {
-        
-        request({ ...apis.activityDataStatis.activityAddRegistNumExport, params: {activityId: activityId, activityType: activityType,...props.form.getFieldsValue(),...date} }).then(data => {
-          if (!data) {
-            return
-          }
-          const url = window.URL.createObjectURL(new Blob([data]))
-            const link = document.createElement('a')
-            link.style.display = 'none'
-            link.href = url
-            link.setAttribute('download', '访问统计.xlsx')
-            document.body.append(link)
-            link.click()
-        }).catch()
+    });
+  }
+
+  const exportActivityStats = () => {
+
+    request({ ...apis.activityDataStatis.activityAddRegistNumExport, params: { activityId: activityId, activityType: activityType, ...props.form.getFieldsValue(), ...date } }).then(data => {
+      if (!data) {
+        return
       }
+      const url = window.URL.createObjectURL(new Blob([data]))
+      const link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      link.setAttribute('download', '访问统计.xlsx')
+      document.body.append(link)
+      link.click()
+    }).catch()
+  }
 
-    const { getFieldDecorator } = props.form
-    return <>
-        <div>
-            <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-                <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-                    {getFieldDecorator('personFrom')(
-                        <WxDictSelect />,
-                    )}
-                </Form.Item>
-                <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-                    {getFieldDecorator('province')(<Input placeholder="请输入归属地" />)}
-                </Form.Item>
-                <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-                    <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}> 查询</Button>
-                    <Button onClick={handleReset} style={{ marginLeft: '30px' }}>重置</Button>
-                </Form.Item>
-            </Form>
-            <div>
-                <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats}>导出</Button>
-            </div>
-            <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>
-        </div>
-    </>
+  const { getFieldDecorator } = props.form
+  return <>
+    <div>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex', alignItems: 'center' }}>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          {getFieldDecorator('personFrom')(
+            <WxDictSelect />,
+          )}
+        </Form.Item>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          {getFieldDecorator('province')(<Input placeholder="请输入归属地" />)}
+        </Form.Item>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}> 查询</Button>
+          <Button onClick={handleReset} style={{ marginLeft: '30px' }}>重置</Button>
+          <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
+          <Modal
+            title="指标说明（数据会存在一定时间延迟）"
+            centered
+            visible={showHelp}
+            footer={null}
+            onCancel={() => setShowHelp(false)}
+          >
+            <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享人数：</p>
+            <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>分享小程序活动的总人数</p>
+            <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享次数：</p>
+            <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>触发小程序活动分享的总次数</p>
+            <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>新增注册用户：</p>
+            <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过当前活动授权手机号的总人数</p>
+            <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问人数：</p>
+            <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总人数</p>
+            <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问次数：</p>
+            <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总次数</p>
+          </Modal>
+        </Form.Item>
+      </Form>
+      <div>
+        <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats}>导出</Button>
+      </div>
+      <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>
+    </div>
+  </>
 }
 
 const WrappedTypeForm = Form.create()(header);

src/pages/activity/dataRecord/table/shareNum.jsx

@@ -9,142 +9,161 @@ import moment from 'moment';
 
 
 const date = {
-    startDate: moment().year(1000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z',
-    endDate: moment().year(3000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z'
+  startDate: moment().year(1000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z',
+  endDate: moment().year(3000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z'
+}
+
+const header = props => {
+
+  const [data, setData] = useState({})
+  const [showHelp, setShowHelp] = useState(false)
+  const activityId = props.id
+  const activityType = props.type
+
+  useEffect(() => {
+    console.log(activityId, activityType)
+    getList({ pageNum: 1, pageSize: 10 })
+
+  }, [])
+
+  const getList = params => {
+    console.log(params)
+    request({ ...apis.activityDataStatis.activityShareNum, params: { ...params, activityId: activityId, activityType: activityType, ...date } }).then(data => {
+      console.log(data)
+      props.getData()
+      setData(data)
+    }).catch(e => {
+      console.log(e)
+    })
+  }
+
+  const columns = [
+    {
+      title: '分享者姓名',
+      dataIndex: 'sharePersonName',
+      key: 'sharePersonName',
+    },
+    {
+      title: '分享者类型',
+      dataIndex: 'shareType',
+      key: 'shareType',
+      render: (text, records) => {
+        if (records.sharePersonType === 'drift') { return '游客' }
+        if (records.sharePersonType === 'customer') { return '普通客户' }
+        if (records.sharePersonType === 'Realty Consultant') { return '置业顾问' }
+        if (records.sharePersonType === 'estate agent') { return '专业经纪人' }
+      },
+    },
+    {
+      title: '分享时间',
+      dataIndex: 'shareTime',
+      key: 'shareTime',
+      render: (x, row) => <><span>{`${moment(row.shareTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    },
+    {
+      title: '分享者电话',
+      dataIndex: 'sharePersonPhone',
+      key: 'sharePersonPhone',
+    },
+    // {
+    //   title: '访问人数',
+    //   dataIndex: 'visitPersonNum',
+    //   key: 'visitPersonNum',
+    // },
+  ]
+
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  const changePageNum = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
   }
-  
-  const header = props => {
-  
-    const [data, setData] = useState({})
-
-    const activityId = props.id
-    const activityType = props.type
-  
-    useEffect(() => {
-      console.log(activityId, activityType)
-      getList({pageNum: 1, pageSize: 10 })
-  
-    }, [])
-  
-    const getList = params => {
-      console.log(params)
-      request({ ...apis.activityDataStatis.activityShareNum, params: {...params, activityId: activityId, activityType: activityType,...date  }}).then( data=> {
-        console.log(data)
-        props.getData()
-        setData(data)
-      }).catch(e=>{
-        console.log(e)
-      })
-    }
-   
-    const columns = [
-        {
-          title: '分享者姓名',
-          dataIndex: 'sharePersonName',
-          key: 'sharePersonName',
-        },
-        {
-          title: '分享者类型',
-          dataIndex: 'shareType',
-          key: 'shareType',
-          render: (text, records) => {
-            if (records.sharePersonType === 'drift') { return '游客' }
-            if (records.sharePersonType === 'customer') { return '普通客户' }
-            if (records.sharePersonType === 'Realty Consultant') { return '置业顾问' }
-            if (records.sharePersonType === 'estate agent') { return '专业经纪人' }
-          },
-        },
-        {
-          title: '分享时间',
-          dataIndex: 'shareTime',
-          key: 'shareTime',
-          render: (x, row) => <><span>{`${moment(row.shareTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-        },
-        {
-          title: '分享者电话',
-          dataIndex: 'sharePersonPhone',
-          key: 'sharePersonPhone',
-        },
-        // {
-        //   title: '访问人数',
-        //   dataIndex: 'visitPersonNum',
-        //   key: 'visitPersonNum',
-        // },
-      ]
-
-    function handleReset() {
-        props.form.resetFields();
-        getList({ pageNum: 1, pageSize: 10 })
-    }
-
-    const changePageNum = pageNumber => {
-        getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
-    }
-
-    const handleSubmit = e => {
-      e.preventDefault();
-      props.form.validateFields((err, values) => {
-        if (!err) {
-         
-          getList({ pageNum: 1, pageSize: 10, ...values })
-        }
-      });
-    }
-
-
-  
-    const exportActivityStats = () => {
-      
-      request({ ...apis.activityDataStatis.activityShareNumExport, params: {activityId: activityId, activityType: activityType,...props.form.getFieldsValue(),...date} }).then(data => {
-        if (!data) {
-          return
-        }
-        const url = window.URL.createObjectURL(new Blob([data]))
-          const link = document.createElement('a')
-          link.style.display = 'none'
-          link.href = url
-          link.setAttribute('download', '访问统计.xlsx')
-          document.body.append(link)
-          link.click()
-      }).catch()
-    }
-  
-
-    const { getFieldDecorator } = props.form
-    return <>
-        <div>
-            <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-                <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-                    {getFieldDecorator('sharePersonType')(
-                        <Select placeholder="分享者类型" style={{ width: 150, marginLeft: '20px' }}>
-                            <Option value="">全部</Option>
-                            <Option value="drift">游客</Option>
-                            <Option value="customer">普通客户</Option>
-                            <Option value="Realty Consultant">置业顾问</Option>
-                            <Option value="estate agent">专业经纪人</Option>
-                        </Select>
-                    )}
-                </Form.Item>
-                <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-                    {getFieldDecorator('sharePersonPhone')(<Input placeholder="分享者电话" />)}
-                </Form.Item>
-                <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-                    {getFieldDecorator('sharePersonName')(<Input placeholder="分享者姓名" />)}
-                </Form.Item>
-                <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-                    <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}> 查询</Button>
-                    <Button onClick={handleReset} style={{ marginLeft: '30px' }}>重置</Button>
-                </Form.Item>
-            </Form>
-            <div>
-                <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats}>导出</Button>
-            </div>
-            <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>
-        </div>
-    </>
+
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+
+
+  const exportActivityStats = () => {
+
+    request({ ...apis.activityDataStatis.activityShareNumExport, params: { activityId: activityId, activityType: activityType, ...props.form.getFieldsValue(), ...date } }).then(data => {
+      if (!data) {
+        return
+      }
+      const url = window.URL.createObjectURL(new Blob([data]))
+      const link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      link.setAttribute('download', '访问统计.xlsx')
+      document.body.append(link)
+      link.click()
+    }).catch()
+  }
+
+
+  const { getFieldDecorator } = props.form
+  return <>
+    <div>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex', alignItems: 'center' }}>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          {getFieldDecorator('sharePersonType')(
+            <Select placeholder="分享者类型" style={{ width: 150, marginLeft: '20px' }}>
+              <Option value="">全部</Option>
+              <Option value="drift">游客</Option>
+              <Option value="customer">普通客户</Option>
+              <Option value="Realty Consultant">置业顾问</Option>
+              <Option value="estate agent">专业经纪人</Option>
+            </Select>
+          )}
+        </Form.Item>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          {getFieldDecorator('sharePersonPhone')(<Input placeholder="分享者电话" />)}
+        </Form.Item>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          {getFieldDecorator('sharePersonName')(<Input placeholder="分享者姓名" />)}
+        </Form.Item>
+        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
+          <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}> 查询</Button>
+          <Button onClick={handleReset} style={{ marginLeft: '30px' }}>重置</Button>
+        </Form.Item>
+        <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
+        <Modal
+          title="指标说明（数据会存在一定时间延迟）"
+          centered
+          visible={showHelp}
+          footer={null}
+          onCancel={() => setShowHelp(false)}
+        >
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享人数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>分享小程序活动的总人数</p>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享次数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>触发小程序活动分享的总次数</p>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>新增注册用户：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过当前活动授权手机号的总人数</p>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问人数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总人数</p>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问次数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总次数</p>
+        </Modal>
+      </Form>
+      <div>
+        <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats}>导出</Button>
+      </div>
+      <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>
+    </div>
+  </>
 }
 
 const WrappedTypeForm = Form.create()(header);

src/pages/activity/dataRecord/table/shares.jsx

@@ -16,7 +16,7 @@ const header = props => {
 
   const [data, setData] = useState({})
   const [sort, setSort] = useState({})
-
+  const [showHelp, setShowHelp] = useState(false)
   const activityId = props.id
   const activityType = props.type
 
@@ -147,7 +147,7 @@ const header = props => {
   const { getFieldDecorator } = props.form
   return <>
     <div>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex', alignItems: 'center' }}>
         <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
           {getFieldDecorator('sharePersonType')(
             <Select placeholder="分享者类型" style={{ width: 150, marginLeft: '20px' }}>
@@ -170,6 +170,25 @@ const header = props => {
           <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}> 查询</Button>
           <Button onClick={handleReset} style={{ marginLeft: '30px' }}>重置</Button>
         </Form.Item>
+        <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
+        <Modal
+          title="指标说明（数据会存在一定时间延迟）"
+          centered
+          visible={showHelp}
+          footer={null}
+          onCancel={() => setShowHelp(false)}
+        >
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享人数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>分享小程序活动的总人数</p>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享次数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>触发小程序活动分享的总次数</p>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>新增注册用户：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过当前活动授权手机号的总人数</p>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问人数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总人数</p>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问次数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总次数</p>
+        </Modal>
       </Form>
       <div>
         <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats} >导出</Button>

src/pages/activity/dataRecord/table/visitNum.jsx

@@ -13,7 +13,7 @@ const date = {
 }
 
 const header = props => {
-
+  const [showHelp, setShowHelp] = useState(false)
   const [data, setData] = useState({})
   const activityId = props.id
   const activityType = props.type
@@ -134,7 +134,7 @@ const header = props => {
   const { getFieldDecorator } = props.form
   return <>
     <div>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex', alignItems: 'center' }}>
         <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
           {getFieldDecorator('personFrom')(
             <WxDictSelect />,
@@ -155,6 +155,25 @@ const header = props => {
             </Button>
           <Button onClick={handleReset} style={{ marginLeft: '30px' }}>重置</Button>
         </Form.Item>
+        <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
+        <Modal
+          title="指标说明（数据会存在一定时间延迟）"
+          centered
+          visible={showHelp}
+          footer={null}
+          onCancel={() => setShowHelp(false)}
+        >
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享人数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>分享小程序活动的总人数</p>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享次数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>触发小程序活动分享的总次数</p>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>新增注册用户：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过当前活动授权手机号的总人数</p>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问人数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总人数</p>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问次数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总次数</p>
+        </Modal>
       </Form>
       <div>
 

src/pages/activity/dataRecord/table/visitors.jsx

@@ -8,33 +8,33 @@ import WxDictSelect from '@/components/SelectButton/WxDictSelect';
 import moment from 'moment';
 
 const date = {
-  startDate: moment().year(1000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z',
-  endDate: moment().year(3000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z'
+  startDate: moment().year(1000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z',
+  endDate: moment().year(3000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z'
 }
 // 2020-04-18T16:00:00.000Z
 
 const header = props => {
 
   // const [id,type] = props
-
+  const [showHelp, setShowHelp] = useState(false)
   const [data, setData] = useState({})
   const activityId = props.id
   const activityType = props.type
-  
+
 
   useEffect(() => {
 
-    getList({pageNum: 1, pageSize: 10 })
+    getList({ pageNum: 1, pageSize: 10 })
 
   }, [])
 
   const getList = params => {
     console.log(params)
-    request({ ...apis.activityDataStatis.activityVisitPersonNum, params: {...params, activityId: activityId, activityType: activityType ,...date  }}).then( data=> {
+    request({ ...apis.activityDataStatis.activityVisitPersonNum, params: { ...params, activityId: activityId, activityType: activityType, ...date } }).then(data => {
       console.log(data)
       props.getData()
       setData(data)
-    }).catch(e=>{
+    }).catch(e => {
       console.log(e)
     })
   }
@@ -47,10 +47,10 @@ const header = props => {
   //     this.setState({ tableData: data.records, total: data.total})
   //   }).catch()
   // }
-  const format = data =>{
-    console.log(data.replace(/,/g,'\n'))
-    
-  return <div dangerouslySetInnerHTML={{__html:data.replace(/,/g,",<br/>")}}>{}</div>
+  const format = data => {
+    console.log(data.replace(/,/g, '\n'))
+
+    return <div dangerouslySetInnerHTML={{ __html: data.replace(/,/g, ",<br/>") }}>{}</div>
   }
   const columns = [
     {
@@ -82,15 +82,15 @@ const header = props => {
       title: '置业顾问',
       dataIndex: 'realtyConsultant',
       key: 'realtyConsultant',
-      render: (x, row) => <>{row.realtyConsultant?format(row.realtyConsultant):''}</>,
-      width:180
+      render: (x, row) => <>{row.realtyConsultant ? format(row.realtyConsultant) : ''}</>,
+      width: 180
     },
     {
       title: '置业顾问电话',
       dataIndex: 'realtyConsultantPhone',
       key: 'realtyConsultantPhone',
-      render: (x, row) => <>{row.realtyConsultantPhone?format(row.realtyConsultantPhone):''}</>,
-      width:180
+      render: (x, row) => <>{row.realtyConsultantPhone ? format(row.realtyConsultantPhone) : ''}</>,
+      width: 180
     },
     {
       title: '推广人',
@@ -118,32 +118,32 @@ const header = props => {
     props.form.validateFields((err, values) => {
       if (!err) {
         console.log('提交数据: ', values)
-       
+
         getList({ pageNum: 1, pageSize: 10, ...values })
       }
     });
   }
 
   const exportActivityStats = () => {
-    
-    request({ ...apis.activityDataStatis.activityVisitPersonNumExport, params: {activityId: activityId, activityType: activityType,...props.form.getFieldsValue(),...date} }).then(data => {
+
+    request({ ...apis.activityDataStatis.activityVisitPersonNumExport, params: { activityId: activityId, activityType: activityType, ...props.form.getFieldsValue(), ...date } }).then(data => {
       if (!data) {
         return
       }
       const url = window.URL.createObjectURL(new Blob([data]))
-        const link = document.createElement('a')
-        link.style.display = 'none'
-        link.href = url
-        link.setAttribute('download', '访问统计.xlsx')
-        document.body.append(link)
-        link.click()
+      const link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      link.setAttribute('download', '访问统计.xlsx')
+      document.body.append(link)
+      link.click()
     }).catch()
   }
 
   const { getFieldDecorator } = props.form
   return <>
-    <div>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+    <div >
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex', alignItems: 'center' }}>
         <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
           {getFieldDecorator('personFrom')(
             <WxDictSelect />,
@@ -164,6 +164,25 @@ const header = props => {
             </Button>
           <Button onClick={handleReset} style={{ marginLeft: '30px' }}>重置</Button>
         </Form.Item>
+        <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
+        <Modal
+          title="指标说明（数据会存在一定时间延迟）"
+          centered
+          visible={showHelp}
+          footer={null}
+          onCancel={() => setShowHelp(false)}
+        >
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享人数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>分享小程序活动的总人数</p>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享次数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>触发小程序活动分享的总次数</p>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>新增注册用户：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过当前活动授权手机号的总人数</p>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问人数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总人数</p>
+          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问次数：</p>
+          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总次数</p>
+        </Modal>
       </Form>
       <div>
 

src/pages/building/list/index.jsx

@@ -118,8 +118,7 @@ function CartBody(props) {
           <span style={{ textOverflow: 'ellipsis', whiteSpace: 'nowrap', overflow: 'hidden' }}>：{data.code}</span>
           <AuthButton name="admin.building.update" noRight={null}>
             <span className={Styles.ediText} onClick={() => toEdi(data)}>
-              编辑
-                  <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
+              <EditIcon text="编辑" type="edit"></EditIcon>
             </span>
           </AuthButton>
         </p>
@@ -150,14 +149,14 @@ function CartBody(props) {
           <AuthButton name="admin.building.public" noRight={null}>
             <span style={{ color: '#FF4A4A' }} onClick={() => pulicAndUnPulic(data)}>
               {/* 已发布的时候，需要显示取消发布的字样 */}
-              {data.status === 1 ? <EditIcon text="取消发布" color='#FF4A4A' position="-36"></EditIcon> : <EditIcon text="发布" color='#FF4A4A' position="-126"></EditIcon>}
+              {data.status === 1 ? <EditIcon text="取消发布" type="cancel"></EditIcon> : <EditIcon text="发布" type="publish"></EditIcon>}
             </span>
           </AuthButton>
           <AuthButton name="admin.building.delete" noRight={null}>
             <span style={{
               color: '#FF4A4A', position: 'absolute', right: '0', bottom: '0'
             }} onClick={() => deleteBuilding(data)}>
-              <EditIcon text="删除" color='#FF4A4A' position="-180"></EditIcon>
+              <EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon>
             </span>
           </AuthButton>
         </p>

src/pages/building/type/index.jsx

@@ -42,14 +42,14 @@ function body() {
             <Button type="link" style={{
               color: '#FF4A4A', right: '0',
             }} onClick={() => deleteType(record)}>
-              <EditIcon text="删除" color='#FF4A4A' position="-180"></EditIcon>
+              <EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon>
             </Button>
           </AuthButton>
           <AuthButton name="admin.tdBuildingType.update" noRight={null}>
             <Button type="link" style={{
               color: '#FF4A4A', right: '0',
             }} onClick={() => toEdi(record.buildingTypeId)}>
-              <EditIcon text="编辑" color='#ff925c' position="-144"></EditIcon>
+              <EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon>
             </Button>
           </AuthButton>
         </span>

src/pages/carouselFigure/advertisingList.jsx

@@ -9,29 +9,30 @@ import BuildSelect from '../../components/SelectButton/BuildSelect'
 import apis from '../../services/apis';
 import request from '../../utils/request';
 import AuthButton from '@/components/AuthButton';
+import EditIcon from '@/components/EditIcon';
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 const header = (props) => {
-  const [ data, setData ] = useState({})
-//   const [page, changePage] = useState({})
+  const [data, setData] = useState({})
+  //   const [page, changePage] = useState({})
 
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10, showType: 'screen' });
-  },[])
+  }, [])
 
   // 查询列表
   const getList = (params) => {
-    request({ ...apis.carsuseFigure.extendContent, params: { ...params },}).then((data) => {
-        console.log(data)
-        setData(data)
+    request({ ...apis.carsuseFigure.extendContent, params: { ...params }, }).then((data) => {
+      console.log(data)
+      setData(data)
     })
   }
 
-  
-// 跳转到编辑商品
-const toEdit = (contentId) => () => {
+
+  // 跳转到编辑商品
+  const toEdit = (contentId) => () => {
     router.push({
       pathname: '/carouselFigure/editAdvertising',
       query: {
@@ -39,7 +40,7 @@ const toEdit = (contentId) => () => {
       },
     });
   }
-  
+
   const columns = [
     {
       title: '主图',
@@ -59,15 +60,15 @@ const toEdit = (contentId) => () => {
       dataIndex: 'buildingName',
       key: 'buildingName',
       align: 'center',
-      render: (buildingName) => <span>{ buildingName === null ? '无' : buildingName }</span>
+      render: (buildingName) => <span>{buildingName === null ? '无' : buildingName}</span>
     },
     {
       title: '关联内容类型',
       dataIndex: 'contentType',
       key: 'contentType',
       align: 'center',
-      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : 
-                                       contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' :  contentType === 'salesBatch' ? '销售批次详情' : contentType === 'live' ? '直播活动详情' : '无' }</span>
+      render: (contentType) => <span>{contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' :
+        contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : contentType === 'salesBatch' ? '销售批次详情' : contentType === 'live' ? '直播活动详情' : '无'}</span>
     },
     // {
     //   title: '发布位置',
@@ -88,106 +89,108 @@ const toEdit = (contentId) => () => {
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: (status)=> <><span>{status == 1 ? '上架' : '下架'}</span></>
+      render: (status) => <><span>{status == 1 ? '上架' : '下架'}</span></>
     },
     {
       title: '操作',
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x,row) => (
+      render: (x, row) => (
         <>
-          <AuthButton name="admin.advert.publish" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px',cursor: 'pointer' }} onClick={changeStatus(row)}>{ row.status === 1 ? '下架' : '上架' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-          </AuthButton>
-          <AuthButton name="admin.advert.put" noRight={null}>
-            <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEdit(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
-          </AuthButton>
-          <AuthButton name="admin.advert.delete" noRight={null}>
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={deleteCarouse(row.contentId)}>删除<Icon type="vertical-align-top" className={styles.edit} /></span>
-          </AuthButton>
+          <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
+            <AuthButton name="admin.advert.publish" noRight={null}>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={changeStatus(row)}>{row.status === 1 ? <EditIcon text="下架" color='#FF4A4A' type="down"></EditIcon> : <EditIcon text="上架" color='#ff925c' type="up"></EditIcon>}</span>
+            </AuthButton>
+            <AuthButton name="admin.advert.put" noRight={null}>
+              <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEdit(row.contentId)}><EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon></span>
+            </AuthButton>
+            <AuthButton name="admin.advert.delete" noRight={null}>
+              <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={deleteCarouse(row.contentId)}><EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon></span>
+            </AuthButton>
+          </div>
         </>
       )
     },
   ];
-  
+
   const finishDynamic = (row) => {
-      Modal.confirm({
-          title: '结束以后将无法编辑, 是否继续?',
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-              request({ ...apis.carsuseFigure.finish, data: {dynamicId: row.dynamicId, top: ""},}).then((data) => {
-                  console.log(data)
-                  message.info('操作成功！')
-                  getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
-              }).catch((err) => {
-                  console.log(err)
-                  message.info(err.msg || err.message)
-              })
-          },
-        });
+    Modal.confirm({
+      title: '结束以后将无法编辑, 是否继续?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.carsuseFigure.finish, data: { dynamicId: row.dynamicId, top: "" }, }).then((data) => {
+          console.log(data)
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
   }
-  
+
   //删除
-const deleteCarouse = (contentId) => () =>{
-  Modal.confirm({
-    title: '确认删除此数据?',
-    okText: '确定',
-    cancelText: '取消',
-    onOk() {
-      request({ ...apis.carsuseFigure.deleteExtendContent,urlData:{id: contentId}}).then((data) => {
+  const deleteCarouse = (contentId) => () => {
+    Modal.confirm({
+      title: '确认删除此数据?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.carsuseFigure.deleteExtendContent, urlData: { id: contentId } }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
+  }
+
+  //   停用启用
+  const changeStatus = (row) => () => {
+    console.log(row)
+    if (row.status === 0) {
+
+      Modal.confirm({
+        title: '确认发布此数据?',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          row.status = 1
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
             message.info('操作成功！')
             getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
-        }).catch((err) => {
+          }).catch((err) => {
             console.log(err)
             message.info(err.msg || err.message)
-        })
-    },
-  });
-}
+          })
+        },
+      });
+    } else if (row.status === 1) {
 
-//   停用启用
-  const changeStatus = (row) => () => {
-      console.log(row)
-      if(row.status === 0) {
-        
-        Modal.confirm({
-          title: '确认发布此数据?',
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-            row.status = 1
-              request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
-                  message.info('操作成功！')
-                  getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
-              }).catch((err) => {
-                  console.log(err)
-                  message.info(err.msg || err.message)
-              })
-          },
-        });
-      }else if(row.status === 1){
-        
-        Modal.confirm({
-          title: '停用后不会再显示在小程序端',
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-            row.status = 0
-              request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
-                  message.info('操作成功！')
-                  getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
-              }).catch((err) => {
-                  console.log(err)
-                  message.info(err.msg || err.message)
-              })
-          },
-        });
-      }
+      Modal.confirm({
+        title: '停用后不会再显示在小程序端',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          row.status = 0
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
+          }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+          })
+        },
+      });
+    }
 
   }
-  
+
   const changePageNum = (pageNumber, props) => {
     props.form.validateFields((err, values) => {
       if (!err) {
@@ -197,7 +200,7 @@ const deleteCarouse = (contentId) => () =>{
   }
 
   // 提交事件
-const handleSubmit = (e, props) => {
+  const handleSubmit = (e, props) => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
@@ -207,8 +210,8 @@ const handleSubmit = (e, props) => {
     });
   }
 
-   //重置搜索
-   function handleReset() {
+  //重置搜索
+  function handleReset() {
     props.form.resetFields();
     getList({ pageNum: 1, pageSize: 10, showType: 'screen' });
   }
@@ -219,9 +222,9 @@ const handleSubmit = (e, props) => {
 
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-      <Form.Item>
+        <Form.Item>
           {getFieldDecorator('cityId')(
-             <SelectCity />,
+            <SelectCity />,
           )}
         </Form.Item>
         <Form.Item>
@@ -259,22 +262,22 @@ const handleSubmit = (e, props) => {
           )}
         </Form.Item>
         <Form.Item>
-        <AuthButton name="admin.advert.search" noRight={null}>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-            搜索
+          <AuthButton name="admin.advert.search" noRight={null}>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
           </Button>
           </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
+            重置
             </Button>
         </Form.Item>
       </Form>
       <AuthButton name="admin.advert.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEdit()}>新增</Button>
       </AuthButton>
-      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="advertisingList"/>
+      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="advertisingList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e,props)} current={data.current}/>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e, props)} current={data.current} />
       </div>
     </>
   )

src/pages/carouselFigure/carouselFigureList.jsx

@@ -9,29 +9,30 @@ import BuildSelect from '../../components/SelectButton/BuildSelect'
 import apis from '../../services/apis';
 import request from '../../utils/request';
 import AuthButton from '@/components/AuthButton';
+import EditIcon from '@/components/EditIcon';
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 const header = (props) => {
-  const [ data, setData ] = useState({})
-//   const [page, changePage] = useState({})
+  const [data, setData] = useState({})
+  //   const [page, changePage] = useState({})
 
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
-  },[])
+  }, [])
 
   // 查询列表
   const getList = (params) => {
-    request({ ...apis.carsuseFigure.extendContent, params: { ...params },}).then((data) => {
-        console.log(data)
-        setData(data)
+    request({ ...apis.carsuseFigure.extendContent, params: { ...params }, }).then((data) => {
+      console.log(data)
+      setData(data)
     })
   }
 
-  
-// 跳转到编辑页面
-const toEditCarouse = (contentId) => () => {
+
+  // 跳转到编辑页面
+  const toEditCarouse = (contentId) => () => {
     router.push({
       pathname: '/carouselFigure/editCarousel',
       query: {
@@ -39,7 +40,7 @@ const toEditCarouse = (contentId) => () => {
       },
     });
   }
-  
+
   const columns = [
     {
       title: '主图',
@@ -59,22 +60,22 @@ const toEditCarouse = (contentId) => () => {
       dataIndex: 'buildingName',
       key: 'buildingName',
       align: 'center',
-      render: (buildingName) => <span>{ buildingName === null ? '无' : buildingName }</span>
+      render: (buildingName) => <span>{buildingName === null ? '无' : buildingName}</span>
     },
     {
       title: '关联内容类型',
       dataIndex: 'contentType',
       key: 'contentType',
       align: 'center',
-      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : 
-                                       contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' :  contentType === 'salesBatch' ? '销售批次详情' : contentType === 'live' ? '直播活动详情' : '无' }</span>
+      render: (contentType) => <span>{contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' :
+        contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : contentType === 'salesBatch' ? '销售批次详情' : contentType === 'live' ? '直播活动详情' : '无'}</span>
     },
     {
       title: '发布位置',
       dataIndex: 'showPosition',
       key: 'showPosition',
       align: 'center',
-      render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : '' }</span>
+      render: (showPosition) => <span>{showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : ''}</span>
     },
     {
       title: '发布时间',
@@ -88,114 +89,116 @@ const toEditCarouse = (contentId) => () => {
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: (status)=> <><span>{status == 1 ? '已上架' : '已下架'}</span></>
+      render: (status) => <><span>{status == 1 ? '已上架' : '已下架'}</span></>
     },
     {
       title: '操作',
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x,row) => (
+      render: (x, row) => (
         <>
-          <AuthButton name="admin.extendContent.publish" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer'}} onClick={changeStatus(row)}>{ row.status === 1 ? '下架' : '上架' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-          </AuthButton>
-          <AuthButton name="admin.extendContent.id.put" noRight={null}>
-            <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditCarouse(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
-          </AuthButton>
-          <AuthButton name="admin.extendContent.delete" noRight={null}>
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={deleteCarouse(row.contentId)}>删除<Icon type="vertical-align-top" className={styles.edit} /></span>
-          </AuthButton>
+          <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
+            <AuthButton name="admin.extendContent.publish" noRight={null}>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={changeStatus(row)}>{row.status === 1 ? <EditIcon text="下架" color='#FF4A4A' type="down"></EditIcon> : <EditIcon text="上架" color='#ff925c' type="up"></EditIcon>}</span>
+            </AuthButton>
+            <AuthButton name="admin.extendContent.id.put" noRight={null}>
+              <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditCarouse(row.contentId)}><EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon></span>
+            </AuthButton>
+            <AuthButton name="admin.extendContent.delete" noRight={null}>
+              <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={deleteCarouse(row.contentId)}><EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon></span>
+            </AuthButton>
+          </div>
         </>
       )
     },
   ];
-  
+
   const finishDynamic = (row) => {
-      Modal.confirm({
-          title: '结束以后将无法编辑, 是否继续?',
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-            request({ ...apis.carsuseFigure.finish, data: {dynamicId: row.dynamicId, top: ""},}).then((data) => {
-                  console.log(data)
-                  message.info('操作成功！')
-                  getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
-              }).catch((err) => {
-                  console.log(err)
-                  message.info(err.msg || err.message)
-              })
-          },
-        });
+    Modal.confirm({
+      title: '结束以后将无法编辑, 是否继续?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.carsuseFigure.finish, data: { dynamicId: row.dynamicId, top: "" }, }).then((data) => {
+          console.log(data)
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
   }
-  
-//删除
-const deleteCarouse = (contentId) => () =>{
-  Modal.confirm({
-    title: '确认删除此数据?',
-    okText: '确定',
-    cancelText: '取消',
-    onOk() {
-      request({ ...apis.carsuseFigure.deleteExtendContent,urlData:{id: contentId}}).then((data) => {
+
+  //删除
+  const deleteCarouse = (contentId) => () => {
+    Modal.confirm({
+      title: '确认删除此数据?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.carsuseFigure.deleteExtendContent, urlData: { id: contentId } }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
+  }
+
+  //   停用启用
+  const changeStatus = (row) => () => {
+    console.log(row)
+    if (row.status === 0) {
+
+      Modal.confirm({
+        title: '确认发布此数据?',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          row.status = 1
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
             message.info('操作成功！')
             getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
-        }).catch((err) => {
+          }).catch((err) => {
             console.log(err)
+            row.status = 0
             message.info(err.msg || err.message)
-        })
-    },
-  });
-}
+          })
+        },
+      });
+    } else if (row.status === 1) {
 
-//   停用启用
-  const changeStatus = (row) => () => {
-      console.log(row)
-      if(row.status === 0) {
-        
-        Modal.confirm({
-          title: '确认发布此数据?',
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
+      Modal.confirm({
+        title: '停用后不会再显示在小程序端',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          row.status = 0
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
+          }).catch((err) => {
+            console.log(err)
             row.status = 1
-            request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
-                  message.info('操作成功！')
-                  getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
-              }).catch((err) => {
-                  console.log(err)
-                  row.status = 0
-                  message.info(err.msg || err.message)
-              })
-          },
-        });
-      }else if(row.status === 1){
-        
-        Modal.confirm({
-          title: '停用后不会再显示在小程序端',
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-            row.status = 0
-            request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
-                  message.info('操作成功！')
-                  getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
-              }).catch((err) => {
-                  console.log(err)
-                  row.status = 1
-                  message.info(err.msg || err.message)
-              })
-          },
-        });
-      }
+            message.info(err.msg || err.message)
+          })
+        },
+      });
+    }
 
   }
-  
+
   const changePageNum = (pageNumber) => {
-      getList({ pageNum: pageNumber, pageSize: 10, showType: 'banner', ...props.form.getFieldsValue() })
+    getList({ pageNum: pageNumber, pageSize: 10, showType: 'banner', ...props.form.getFieldsValue() })
   }
 
   // 提交事件
-const handleSubmit = (e, props) => {
+  const handleSubmit = (e, props) => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
@@ -205,8 +208,8 @@ const handleSubmit = (e, props) => {
     });
   }
 
-   //重置搜索
-   function handleReset() {
+  //重置搜索
+  function handleReset() {
     props.form.resetFields();
     getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
   }
@@ -218,7 +221,7 @@ const handleSubmit = (e, props) => {
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
           {getFieldDecorator('cityId')(
-             <SelectCity />,
+            <SelectCity />,
           )}
         </Form.Item>
         <Form.Item>
@@ -257,22 +260,22 @@ const handleSubmit = (e, props) => {
           )}
         </Form.Item>
         <Form.Item>
-        <AuthButton name="admin.extendContent.search" noRight={null}>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-            搜索
+          <AuthButton name="admin.extendContent.search" noRight={null}>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
           </Button>
           </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
+            重置
             </Button>
         </Form.Item>
       </Form>
       <AuthButton name="admin.extendContent.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEditCarouse()}>新增</Button>
       </AuthButton>
-      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
+      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
       </div>
     </>
   )

src/pages/carouselFigure/customImg/list.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal,Breadcrumb } from 'antd';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../../style/GoodsList.less';
 import router from 'umi/router';
@@ -7,73 +7,74 @@ import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import apis from '../../../services/apis';
 import request from '../../../utils/request'
 import AuthButton from '@/components/AuthButton';
+import EditIcon from '@/components/EditIcon';
 
 const { Option } = Select;
 const { Column } = Table;
 
 function header(props) {
   // 获取初始化数据
-  const [ data, setData ] = useState([])
+  const [data, setData] = useState([])
 
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10 });
-  },[])
+  }, [])
 
   // 查询列表
   const getList = (params) => {
-    request({ ...apis.carsuseFigure.customImg, params: { ...params },}).then((data) => {
-        console.log(data,"datadata")
-        if(data.records.length > 0){
-          setData(data.records)
-        }else{
-          setData([
-            {'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg','imgType':'index','imgDesc':'小程序首页分享配图'},
-            {'imgUrl':'http://njcj.oss-cn-shanghai.aliyuncs.com/icon.png','imgType':'indexNews','imgDesc':'首页资讯logo'}
-          ])
-        }
-        
+    request({ ...apis.carsuseFigure.customImg, params: { ...params }, }).then((data) => {
+      console.log(data, "datadata")
+      if (data.records.length > 0) {
+        setData(data.records)
+      } else {
+        setData([
+          { 'imgUrl': 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg', 'imgType': 'index', 'imgDesc': '小程序首页分享配图' },
+          { 'imgUrl': 'http://njcj.oss-cn-shanghai.aliyuncs.com/icon.png', 'imgType': 'indexNews', 'imgDesc': '首页资讯logo' }
+        ])
+      }
+
     })
   }
-  
-    // 跳转到编辑商品
+
+  // 跳转到编辑商品
   const toEditCustom = (imgId, imgType) => () => {
     router.push({
       pathname: '/carouselFigure/customImg/edit',
       query: {
         imgId,
-        imgType:imgType
+        imgType: imgType
       },
     });
   }
 
- 
+
   // const { getFieldDecorator } = props.form
   return (
 
     <>
       <Table dataSource={data}>
-        <Column title="图片" dataIndex="imgUrl" key="imgUrl" 
-        render={(text, record) => (
-        <img src={record.imgUrl} height="120px" width="150px" style={{ objectFit: 'contain' }}/>
-        )}/>
-        <Column title="类型" dataIndex="imgType" key="imgType" 
-        render={(text, record) => (
-          <span>
-            {record.imgType === 'index' ?'首页分享': record.imgType === 'indexNews' ? '首页资讯' : '请编辑'}
-          </span>
+        <Column title="图片" dataIndex="imgUrl" key="imgUrl"
+          render={(text, record) => (
+            <img src={record.imgUrl} height="120px" width="150px" style={{ objectFit: 'contain' }} />
+          )} />
+        <Column title="类型" dataIndex="imgType" key="imgType"
+          render={(text, record) => (
+            <span>
+              {record.imgType === 'index' ? '首页分享' : record.imgType === 'indexNews' ? '首页资讯' : '请编辑'}
+            </span>
           )}
         />
         <Column title="说明" dataIndex="imgDesc" key="imgDesc" />
-        <Column title="操作" 
-        dataIndex="handle" 
-        key="handle" 
-        render={(text, record) => (
-          <AuthButton name="admin.custom.put" noRight={null}>
-            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditCustom(record.imgId, record.imgType)}>
-              编辑<Icon type="form" className={styles.edit} />
-            </span>
-          </AuthButton>
-          )}/>/>
+        <Column title="操作"
+          dataIndex="handle"
+          key="handle"
+          render={(text, record) => (
+            <AuthButton name="admin.custom.put" noRight={null}>
+              <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditCustom(record.imgId, record.imgType)}>
+                <EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon>
+              </span>
+            </AuthButton>
+          )} />/>
       </Table>,
     </>
   )

src/pages/carouselFigure/propagandaList.jsx

@@ -9,29 +9,30 @@ import BuildSelect from '../../components/SelectButton/BuildSelect'
 import apis from '../../services/apis';
 import request from '../../utils/request';
 import AuthButton from '@/components/AuthButton';
+import EditIcon from '@/components/EditIcon';
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 const header = (props) => {
-  const [ data, setData ] = useState({})
-//   const [page, changePage] = useState({})
+  const [data, setData] = useState({})
+  //   const [page, changePage] = useState({})
 
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' });
-  },[])
+  }, [])
 
   // 查询列表
   const getList = (params) => {
-    request({ ...apis.carsuseFigure.extendContent, params: { ...params },}).then((data) => {
-        console.log(data)
-        setData(data)
+    request({ ...apis.carsuseFigure.extendContent, params: { ...params }, }).then((data) => {
+      console.log(data)
+      setData(data)
     })
   }
 
-  
-// 跳转到编辑商品
-const toEdit = (contentId) => () => {
+
+  // 跳转到编辑商品
+  const toEdit = (contentId) => () => {
     router.push({
       pathname: '/carouselFigure/propaganda',
       query: {
@@ -39,7 +40,7 @@ const toEdit = (contentId) => () => {
       },
     });
   }
-  
+
   const columns = [
     {
       title: '主图',
@@ -59,15 +60,15 @@ const toEdit = (contentId) => () => {
       dataIndex: 'buildingName',
       key: 'buildingName',
       align: 'center',
-      render: (buildingName) => <span>{ buildingName === null ? '无' : buildingName }</span>
+      render: (buildingName) => <span>{buildingName === null ? '无' : buildingName}</span>
     },
     {
       title: '关联内容类型',
       dataIndex: 'contentType',
       key: 'contentType',
       align: 'center',
-      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : 
-                                       contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : contentType === 'salesBatch' ? '销售批次详情' : contentType === 'live' ? '直播活动详情' : '无' }</span>
+      render: (contentType) => <span>{contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' :
+        contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : contentType === 'salesBatch' ? '销售批次详情' : contentType === 'live' ? '直播活动详情' : '无'}</span>
     },
     // {
     //   title: '发布位置',
@@ -88,106 +89,108 @@ const toEdit = (contentId) => () => {
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: (status)=> <><span>{status == 1 ? '上架' : '下架'}</span></>
+      render: (status) => <><span>{status == 1 ? '上架' : '下架'}</span></>
     },
     {
       title: '操作',
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x,row) => (
+      render: (x, row) => (
         <>
-          <AuthButton name="admin.propaganda.publish" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px',cursor: 'pointer' }} onClick={changeStatus(row)}>{ row.status === 1 ? '下架' : '上架' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-          </AuthButton>
-          <AuthButton name="admin.propaganda.put" noRight={null}>
-            <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEdit(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
-          </AuthButton>
-          <AuthButton name="admin.propaganda.delete" noRight={null}>
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={deleteCarouse(row.contentId)}>删除<Icon type="vertical-align-top" className={styles.edit} /></span>
-          </AuthButton>
+          <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
+            <AuthButton name="admin.propaganda.publish" noRight={null}>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={changeStatus(row)}>{row.status === 1 ? <EditIcon text="下架" color='#FF4A4A' type="down"></EditIcon> : <EditIcon text="上架" color='#ff925c' type="up"></EditIcon>}</span>
+            </AuthButton>
+            <AuthButton name="admin.propaganda.put" noRight={null}>
+              <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEdit(row.contentId)}><EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon></span>
+            </AuthButton>
+            <AuthButton name="admin.propaganda.delete" noRight={null}>
+              <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={deleteCarouse(row.contentId)}><EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon></span>
+            </AuthButton>
+          </div>
         </>
       )
     },
   ];
-  
+
   const finishDynamic = (row) => {
-      Modal.confirm({
-          title: '结束以后将无法编辑, 是否继续?',
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-              request({ ...apis.carsuseFigure.finish, data: {dynamicId: row.dynamicId, top: ""},}).then((data) => {
-                  console.log(data)
-                  message.info('操作成功！')
-                  getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' })
-              }).catch((err) => {
-                  console.log(err)
-                  message.info(err.msg || err.message)
-              })
-          },
-        });
+    Modal.confirm({
+      title: '结束以后将无法编辑, 是否继续?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.carsuseFigure.finish, data: { dynamicId: row.dynamicId, top: "" }, }).then((data) => {
+          console.log(data)
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
   }
-  
+
   //删除
-const deleteCarouse = (contentId) => () =>{
-  Modal.confirm({
-    title: '确认删除此数据?',
-    okText: '确定',
-    cancelText: '取消',
-    onOk() {
-      request({ ...apis.carsuseFigure.deleteExtendContent,urlData:{id: contentId}}).then((data) => {
+  const deleteCarouse = (contentId) => () => {
+    Modal.confirm({
+      title: '确认删除此数据?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.carsuseFigure.deleteExtendContent, urlData: { id: contentId } }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
+  }
+
+  //   停用启用
+  const changeStatus = (row) => () => {
+    console.log(row)
+    if (row.status === 0) {
+
+      Modal.confirm({
+        title: '确认发布此数据?',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          row.status = 1
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
             message.info('操作成功！')
             getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' })
-        }).catch((err) => {
+          }).catch((err) => {
             console.log(err)
             message.info(err.msg || err.message)
-        })
-    },
-  });
-}
+          })
+        },
+      });
+    } else if (row.status === 1) {
 
-//   停用启用
-  const changeStatus = (row) => () => {
-      console.log(row)
-      if(row.status === 0) {
-        
-        Modal.confirm({
-          title: '确认发布此数据?',
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-            row.status = 1
-              request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
-                  message.info('操作成功！')
-                  getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' })
-              }).catch((err) => {
-                  console.log(err)
-                  message.info(err.msg || err.message)
-              })
-          },
-        });
-      }else if(row.status === 1){
-        
-        Modal.confirm({
-          title: '停用后不会再显示在小程序端',
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-            row.status = 0
-              request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
-                  message.info('操作成功！')
-                  getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' })
-              }).catch((err) => {
-                  console.log(err)
-                  message.info(err.msg || err.message)
-              })
-          },
-        });
-      }
+      Modal.confirm({
+        title: '停用后不会再显示在小程序端',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          row.status = 0
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: row.contentId }, data: row, }).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' })
+          }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+          })
+        },
+      });
+    }
 
   }
-  
+
   const changePageNum = (pageNumber, props) => {
     props.form.validateFields((err, values) => {
       if (!err) {
@@ -197,7 +200,7 @@ const deleteCarouse = (contentId) => () =>{
   }
 
   // 提交事件
-const handleSubmit = (e, props) => {
+  const handleSubmit = (e, props) => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
@@ -207,8 +210,8 @@ const handleSubmit = (e, props) => {
     });
   }
 
-   //重置搜索
-   function handleReset() {
+  //重置搜索
+  function handleReset() {
     props.form.resetFields();
     getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' });
   }
@@ -219,9 +222,9 @@ const handleSubmit = (e, props) => {
 
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-      <Form.Item>
+        <Form.Item>
           {getFieldDecorator('cityId')(
-             <SelectCity />,
+            <SelectCity />,
           )}
         </Form.Item>
         <Form.Item>
@@ -259,22 +262,22 @@ const handleSubmit = (e, props) => {
           )}
         </Form.Item>
         <Form.Item>
-        <AuthButton name="admin.advert.search" noRight={null}>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-            搜索
+          <AuthButton name="admin.advert.search" noRight={null}>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
           </Button>
           </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
+            重置
             </Button>
         </Form.Item>
       </Form>
       <AuthButton name="admin.propaganda.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEdit()}>新增</Button>
       </AuthButton>
-      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="advertisingList"/>
+      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="advertisingList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e,props)} current={data.current}/>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e, props)} current={data.current} />
       </div>
     </>
   )

src/pages/channel/channelList.jsx

@@ -82,7 +82,7 @@ const columns = [
     render: (text, record) => (
       <AuthButton name="admin.channel.id.put" noRight={null}>
         <a style={{ display: 'flex', justifyContent: 'center' }} onClick={() => toedit(record.channelId)} >
-          <EditIcon text="编辑" color='#ff925c' position="-144"></EditIcon>
+          <EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon>
         </a>
       </AuthButton>
     ),

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

@@ -11,6 +11,7 @@ import FloorSelect from '../../../../../components/HouseSelect/FloorSelect'
 import RoomSelect from '../../../../../components/HouseSelect/RoomSelect'
 import ApartmentSelect from '../../../../../components/HouseSelect/ApartmentSelect';
 import styles from '../../../../style/GoodsList.less';
+import EditIcon from '@/components/EditIcon';
 
 /**
  *图片设置
@@ -39,24 +40,24 @@ function House(props) {
 
   function getList(params) {
     // 网路请求
-    request({ ...apis.house.taHousingResources, params: { ...params,salesBatchId: props.salesBatchId,buildingId: props.buildingId } }).then(res => {
-      console.log(res,"resresres")
+    request({ ...apis.house.taHousingResources, params: { ...params, salesBatchId: props.salesBatchId, buildingId: props.buildingId } }).then(res => {
+      console.log(res, "resresres")
       setData(res)
     }).catch(err => {
       openNotificationWithIcon('error', err.message)
     })
   }
 
-    // 重置搜索
-    function handleReset () {
-      props.form.resetFields();
-      getList({ pageNumber: 1, pageSize: 10 })
-    }
+  // 重置搜索
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNumber: 1, pageSize: 10 })
+  }
 
-      // 分页
+  // 分页
   function changePageNum(pageNumber) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    getList({ pageNumber: pageNumber, pageSize: 10,...props.form.getFieldsValue()})
+    getList({ pageNumber: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
   }
 
   const rowSelection = {
@@ -74,7 +75,7 @@ function House(props) {
 
   //打开model
   function showAparement() {
-    if(houseIdList.length < 1){
+    if (houseIdList.length < 1) {
       openNotificationWithIcon('error', '请先选择需要改变的房源')
       return
     }
@@ -91,32 +92,32 @@ function House(props) {
     props.form.validateFields((err, values) => {
       if (!err) {
         console.log('提交数据: ', values)
-        
+
         getList({ pageNumber: 1, pageSize: 10, ...values })
       }
     });
   }
 
-    // model提交事件
-    const handleSubmitApartMent = e => {
-      props.form.validateFields((err, values) => {
-        // if (!err) {
-          if(!values.apartmentIdSelected){
-            openNotificationWithIcon('error', '请选择户型')
-            return
-          }
-          request({ ...apis.house.changeApartment, data: { apartmentId: values.apartmentIdSelected, houseIdList } }).then(res => {
-            setViable(false)
-            setSelectedRowKeys([])
-            setHouseIdList([])
-            getList({ pageNumber: data.current, pageSize: 10 })
-            openNotificationWithIcon('success', '操作成功')
-          }).catch(err => {
-            openNotificationWithIcon('error', err.message)
-          })
-        // }
-      });
-    }
+  // model提交事件
+  const handleSubmitApartMent = e => {
+    props.form.validateFields((err, values) => {
+      // if (!err) {
+      if (!values.apartmentIdSelected) {
+        openNotificationWithIcon('error', '请选择户型')
+        return
+      }
+      request({ ...apis.house.changeApartment, data: { apartmentId: values.apartmentIdSelected, houseIdList } }).then(res => {
+        setViable(false)
+        setSelectedRowKeys([])
+        setHouseIdList([])
+        getList({ pageNumber: data.current, pageSize: 10 })
+        openNotificationWithIcon('success', '操作成功')
+      }).catch(err => {
+        openNotificationWithIcon('error', err.message)
+      })
+      // }
+    });
+  }
   /**
    * 删除
    *
@@ -137,7 +138,7 @@ function House(props) {
           // openNotificationWithIcon('error', err.message)
         })
       },
-      onCancel() {},
+      onCancel() { },
     });
   }
 
@@ -150,7 +151,7 @@ function House(props) {
     },
     {
       title: '房源',
-      render:  (x, row) => <><span>{row.termName}/{row.blockName}/{row.unitName}/{row.floorName}/{row.roomName}</span></>,
+      render: (x, row) => <><span>{row.termName}/{row.blockName}/{row.unitName}/{row.floorName}/{row.roomName}</span></>,
     },
     // {
     //   title: '期/区',
@@ -221,8 +222,10 @@ function House(props) {
       key: 'apartmentId',
       render: (_, record) => (
         <>
-          <Button type="link" style={{ color: 'red' }} onClick={() => showEdi({type: "add",houseId: record.houseId})}>编辑<Icon type="form" className={styles.edit} /></Button>
-          <Button type="link" style={{ color: 'red' }} onClick={() => deleteHouseResource(record)}>删除<Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} /></Button>
+          <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
+            <div style={{ marginRight: '16px' }} onClick={() => showEdi({ type: "add", houseId: record.houseId })}> <EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon></div>
+            <div onClick={() => deleteHouseResource(record)}><EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon></div>
+          </div>
         </>
       ),
     },
@@ -230,48 +233,48 @@ function House(props) {
   const { getFieldDecorator } = props.form
   return (
     <>
-    <Form layout="inline" onSubmit={e => handleSubmit(e)}>
+      <Form layout="inline" onSubmit={e => handleSubmit(e)}>
         <Form.Item>
           {getFieldDecorator('termName')(
-            <Input placeholder="请输入期/区"/>
+            <Input placeholder="请输入期/区" />
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('blockName')(
-            <Input placeholder="请输入楼栋"/>
+            <Input placeholder="请输入楼栋" />
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('unitName')(
-            <Input placeholder="请输入单元"/>
+            <Input placeholder="请输入单元" />
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('floorName')(
-            <Input placeholder="请输入层"/>
+            <Input placeholder="请输入层" />
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('roomName')(
-             <Input placeholder="请输入房号"/>
+            <Input placeholder="请输入房号" />
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('apartmentId')(
-             <ApartmentSelect buildingId={props.buildingId} />
+            <ApartmentSelect buildingId={props.buildingId} />
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('status')(
-             <Select placeholder="发布状态" style={{width: '120px'}}>
-             <Option value="0">否</Option>
-             <Option value="1">是</Option>
-           </Select>,
+            <Select placeholder="发布状态" style={{ width: '120px' }}>
+              <Option value="0">否</Option>
+              <Option value="1">是</Option>
+            </Select>,
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('houseId')(
-            <Input placeholder="请输入房源编号"/>,
+            <Input placeholder="请输入房源编号" />,
           )}
         </Form.Item>
         <Form.Item>
@@ -283,34 +286,34 @@ function House(props) {
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => showEdi({type: "add",houseId: ''})} style={{ marginTop: '20px'}}>新增房源</Button>
-      <Button type="primary" onClick={() => showEdi({type: "batch"})} style={{ marginLeft: '18px'}}>批量导入房源</Button>
-      <Button type="primary" onClick={() => showAparement()} style={{ marginLeft: '18px'}}>批量修改对应户型</Button>
-      <Button type="danger" style={{ marginLeft: '18px'}} onClick={() => router.go(-1)}>返回</Button>
-      <Table rowSelection={rowSelection} dataSource={data.records} columns={columns} pagination={{defaultCurrent:1,current:data.current, total: data.total, onChange: e => changePageNum(e) }} style={{ marginTop: '20px'}} rowKey={r => r.houseId} />
-  
+      <Button type="danger" onClick={() => showEdi({ type: "add", houseId: '' })} style={{ marginTop: '20px' }}>新增房源</Button>
+      <Button type="primary" onClick={() => showEdi({ type: "batch" })} style={{ marginLeft: '18px' }}>批量导入房源</Button>
+      <Button type="primary" onClick={() => showAparement()} style={{ marginLeft: '18px' }}>批量修改对应户型</Button>
+      <Button type="danger" style={{ marginLeft: '18px' }} onClick={() => router.go(-1)}>返回</Button>
+      <Table rowSelection={rowSelection} dataSource={data.records} columns={columns} pagination={{ defaultCurrent: 1, current: data.current, total: data.total, onChange: e => changePageNum(e) }} style={{ marginTop: '20px' }} rowKey={r => r.houseId} />
+
       <Modal
-            title="批量修改对应户型"
-            width={400}
-            destroyOnClose="true"
-            footer={null}
-            visible={viable}
-            onOk={() => this.handleOk()}
-            onCancel={e => handleCancel(e)}
-          >
-            <Form onSubmit={e => handleSubmitApartMent(e)}>
-              <Form.Item label="将所选房源对应户型信息修改为" >
-                {getFieldDecorator('apartmentIdSelected')(
-                <ApartmentSelect buildingId={props.buildingId} />
-                )}
-              </Form.Item>
-              <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
-                <Button type="primary" htmlType="submit">保存</Button>
+        title="批量修改对应户型"
+        width={400}
+        destroyOnClose="true"
+        footer={null}
+        visible={viable}
+        onOk={() => this.handleOk()}
+        onCancel={e => handleCancel(e)}
+      >
+        <Form onSubmit={e => handleSubmitApartMent(e)}>
+          <Form.Item label="将所选房源对应户型信息修改为" >
+            {getFieldDecorator('apartmentIdSelected')(
+              <ApartmentSelect buildingId={props.buildingId} />
+            )}
+          </Form.Item>
+          <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
+            <Button type="primary" htmlType="submit">保存</Button>
                 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                 <Button onClick={() => handleCancel()}>取消</Button>
-              </Form.Item>
-            </Form>
-        </Modal>
+          </Form.Item>
+        </Form>
+      </Modal>
     </>
   )
 }

src/pages/indexEcharts/newUsers.jsx

@@ -24,7 +24,7 @@ let columns = [
   },
 ]
 
-let daterange= []
+let daterange = []
 
 const header = props => {
 
@@ -33,22 +33,22 @@ const header = props => {
   const [data, setDate] = useState({})
   const [userType, setUserType] = useState({})
   const [startDate, setStartDate] = useState({})
-  
+
 
   useEffect(() => {
 
     setEndDate(new Date())
     setStartDate(moment().subtract(7, 'day').toDate())
     // setStartDate(moment().subtract(7, 'day').toDate())
-    userResource({startDate: moment().subtract(7, 'day').toDate(), endDate: new Date()})
+    userResource({ startDate: moment().subtract(7, 'day').toDate(), endDate: new Date() })
   }, [])
 
   const { RangePicker } = DatePicker;
 
-  function onChangetime (dates, dateStrings) {
+  function onChangetime(dates, dateStrings) {
 
-    daterange[1]=`${moment(dateStrings[1]).format('YYYY-MM-DDT00:00:00.000')}Z`
-    daterange[0]=`${moment(dateStrings[0]).format('YYYY-MM-DDT00:00:00.000')}Z`
+    daterange[1] = `${moment(dateStrings[1]).format('YYYY-MM-DDT00:00:00.000')}Z`
+    daterange[0] = `${moment(dateStrings[0]).format('YYYY-MM-DDT00:00:00.000')}Z`
 
   }
 
@@ -60,21 +60,21 @@ const header = props => {
 
   const getDataOf = (days) => () => {
 
- 
+
     setEndDate(new Date())
     setStartDate(moment().subtract(days, 'day').toDate())
-    userResource({startDate: moment().subtract(days, 'day').toDate(), endDate: new Date()})
+    userResource({ startDate: moment().subtract(days, 'day').toDate(), endDate: new Date() })
   }
 
-  function onChange (e) {
+  function onChange(e) {
 
 
   }
 
-  function datalist () {
+  function datalist() {
     setEndDate(daterange[1])
     setStartDate(daterange[0])
-    userResource({startDate, endDate})
+    userResource({ startDate, endDate })
 
   }
 
@@ -84,17 +84,17 @@ const header = props => {
       params,
     }).then((data) => {
       setDate(data);
-      onTabledatas(data,"all")
+      onTabledatas(data, "all")
     })
   }
 
-  const onTabledatas = (e,changeType) => {
+  const onTabledatas = (e, changeType) => {
     e.tdWxDicts.map(x => {
-        columns = columns.filter(y => y.key != x.sceneType).concat({
-          title: x.sceneAlias,
-          dataIndex: x.sceneType,
-          key: x.sceneType,
-        })
+      columns = columns.filter(y => y.key != x.sceneType).concat({
+        title: x.sceneAlias,
+        dataIndex: x.sceneType,
+        key: x.sceneType,
+      })
     })
     const data = (e.list || []).reduce((acc, item) => {
       const { sceneType, fromNum, registeredNum, createTime } = item
@@ -103,31 +103,31 @@ const header = props => {
       return acc
     }, {})
 
-    const dictData =  e.tdWxDicts.reduce((acc,item,index) => {
+    const dictData = e.tdWxDicts.reduce((acc, item, index) => {
       const { sceneType } = item
       acc[sceneType] = 0
       return acc
-    },{})
+    }, {})
 
-    const tableData = Object.keys(data).map(k => data[k]).reduce((acc,item,index) => {
+    const tableData = Object.keys(data).map(k => data[k]).reduce((acc, item, index) => {
       acc[index] = { ...dictData, ...item }
       return acc
-    },[])
+    }, [])
 
     setTableData(tableData)
 
   }
- 
-  function handleSelectChange (e) {
+
+  function handleSelectChange(e) {
     setUserType(e)
-    onTabledatas(data,e)
+    onTabledatas(data, e)
   }
 
   function exportUserStats() {
     console.log(startDate, endDate, userType)
     request({
       ...apis.indexEcharts.exportUserStats,
-      params: {startDate, endDate, userType},
+      params: { startDate, endDate, userType },
     }).then((data) => {
       if (!data) {
         return
@@ -145,14 +145,8 @@ const header = props => {
   const { Column, ColumnGroup } = Table;
 
   return (<>
-    <div style={{
-      backgroundColor: '#fff',
-      padding: '32PX 28px',
-      boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)',
-      borderRadius: '12px',
-      minHeight: '60vh'
-    }}>
-      <Radio.Group onChange={onChange} buttonStyle="solid" defaultValue="a"  style={{marginBottom:'20px'}}>
+    <div >
+      <Radio.Group onChange={onChange} buttonStyle="solid" defaultValue="a" style={{ marginBottom: '20px' }}>
         {/* <Radio.Button value="c" onClick={getDataOf(0)}>今日</Radio.Button> */}
         <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
         <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
@@ -170,24 +164,24 @@ const header = props => {
       <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={datalist}>
         搜索
           </Button>
-          <Button type="danger" onClick={() => router.go(-1)} style={{ marginBottom: '18px', marginLeft: '30px' }}>返回</Button>  
+      <Button onClick={() => router.go(-1)} style={{ float: 'right' }}>返回</Button>
       <div>
-        <NewUsers BuildSelectHide={true} endDate={endDate} startDate={startDate}  dataZoom={true} ></NewUsers>
+        <NewUsers BuildSelectHide={true} endDate={endDate} startDate={startDate} dataZoom={true} ></NewUsers>
         {/* */}
-        
+
         <Row>
-            <Col span={22}>
+          <Col span={22}>
             <Select style={{ width: '180px' }} placeholder="所有用户" onChange={(e) => handleSelectChange(e)}>
               <Option value='all'>所有用户</Option>
               <Option value='registered'>注册用户</Option>
             </Select>
-            </Col>
-            <Col span={2}>
-              <Button type="primary" onClick={exportUserStats}>导出</Button>
-            </Col>
+          </Col>
+          <Col span={2}>
+            <Button type="primary" onClick={exportUserStats}>导出</Button>
+          </Col>
         </Row>
 
-        <Table style={{marginTop:'20px'}} dataSource={tableData} columns={columns} pagination={false} scroll={{ y: 500 }}></Table>
+        <Table style={{ marginTop: '20px' }} dataSource={tableData} columns={columns} pagination={false} scroll={{ y: 500 }}></Table>
       </div>
     </div>
   </>

src/pages/news/list/NewsList.jsx

@@ -12,6 +12,7 @@ import SelectCity from '../../../components/SelectButton/CitySelect'
 import Prompt from 'umi/prompt';
 
 import AuthButton from '@/components/AuthButton';
+import EditIcon from '@/components/EditIcon';
 
 
 const { Option } = Select;
@@ -36,15 +37,15 @@ function body(props) {
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-    if(localStorage.getItem("newsPageParams")){
+    if (localStorage.getItem("newsPageParams")) {
       props.form.setFieldsValue(JSON.parse(localStorage.getItem("newsPageParams")));
       // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
-      
+
       getList(JSON.parse(localStorage.getItem("newsPageParams")))
-    }else{
-      localStorage.setItem("newsPageParams",JSON.stringify({ pageNum: 1, pageSize: 6 }));
+    } else {
+      localStorage.setItem("newsPageParams", JSON.stringify({ pageNum: 1, pageSize: 6 }));
       getList({ pageNum: 1, pageSize: 6 })
-    } 
+    }
   }, [])
 
   function getList(params) {
@@ -71,8 +72,8 @@ function body(props) {
       if (!err) {
         console.log('提交数据: ', values)
         const { startDate } = values
-        localStorage.setItem("newsPageParams",(JSON.stringify({ pageNum: 1, pageSize: 6 ,...values})));
-        getList({ pageNum: 1, pageSize: 6 ,...values})
+        localStorage.setItem("newsPageParams", (JSON.stringify({ pageNum: 1, pageSize: 6, ...values })));
+        getList({ pageNum: 1, pageSize: 6, ...values })
       }
     });
   }
@@ -197,27 +198,23 @@ function body(props) {
         </AuthButton>
 
         <AuthButton name="admin.taNews.id.put" noRight={null}>
-          <span style={{ position: 'absolute', right: '10px', top: '17px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(data.newsId)}>
-            编辑
-                  <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
+          <span style={{ position: 'absolute', right: '10px', top: '16px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(data.newsId)}>
+            <EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon>
           </span>
         </AuthButton>
         <AuthButton name="admin.taNews.publish" noRight={null}>
           {data.newsStatus === 0 ?
             <span style={{ position: 'absolute', left: '250px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', zIndex: 1, cursor: 'pointer' }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
-              取消发布
-                <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+              <EditIcon text="取消发布" color='#FF4A4A' type="cancel"></EditIcon>
             </span> :
             <span style={{ position: 'absolute', left: '250px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', zIndex: 1, cursor: 'pointer' }} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
-              发布
-                <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+              <EditIcon text="发布" color='#ff925c' type="publish"></EditIcon>
             </span>
           }
         </AuthButton>
         <AuthButton name="admin.taNews.id.delete" noRight={null}>
           <span style={{ position: 'absolute', right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', zIndex: 1 }} onClick={changeNewsListStatus(data, data.newsId)}>
-            删除
-                <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+            <EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon>
           </span>
         </AuthButton>
         <div style={{ position: 'absolute', left: '240px', top: '0px', padding: '16px 10px', width: '64%' }}>
@@ -259,8 +256,8 @@ function body(props) {
   function onChange(pageNumber) {
     props.form.validateFields((err, values) => {
       if (!err) {
-        localStorage.setItem("newsPageParams",JSON.stringify({ pageNum: pageNumber, pageSize: 6, ...values }));
-    // eslint-disable-next-line react-hooks/rules-of-hooks
+        localStorage.setItem("newsPageParams", JSON.stringify({ pageNum: pageNumber, pageSize: 6, ...values }));
+        // eslint-disable-next-line react-hooks/rules-of-hooks
         getList({ pageNum: pageNumber, pageSize: 6, ...values })
       }
     });
@@ -269,7 +266,7 @@ function body(props) {
   //重置搜索
   function handleReset() {
     props.form.resetFields();
-    localStorage.setItem("newsPageParams",JSON.stringify({ pageNum: 1, pageSize: 6 }));
+    localStorage.setItem("newsPageParams", JSON.stringify({ pageNum: 1, pageSize: 6 }));
     getList({ pageNum: 1, pageSize: 6 })
   }
 
@@ -345,9 +342,9 @@ function body(props) {
         <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} pageSize={6} onChange={onChange} current={dataSource.current} />
       </div>
       <Prompt message={location =>
-                          location.pathname.startsWith("/news/list")
-                            ? true
-                            : localStorage.removeItem("newsPageParams")} />
+        location.pathname.startsWith("/news/list")
+          ? true
+          : localStorage.removeItem("newsPageParams")} />
     </>
   );
 }

src/pages/news/type/NewsType.jsx

@@ -108,12 +108,12 @@ function header(props) {
           <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
             <AuthButton name="admin.taNewsType.id.delete" noRight={null}>
               <span style={{ color: '#EF273A', marginRight: '20px', cursor: 'pointer' }} onClick={changeNewsStatus(row, row.newsTypeId)}>
-                {row.status == 1 ? <EditIcon text="删除" color='#FF4A4A' position="-180"></EditIcon> : <EditIcon text="上架" color='#ff925c' position="-18"></EditIcon>}
+                {row.status == 1 ? <EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon> : <EditIcon text="上架" color='#ff925c' type="up"></EditIcon>}
               </span>
             </AuthButton>
             <AuthButton name="admin.taNewsType.id.put" noRight={null}>
               <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditNews(row.newsTypeId)}>
-                <EditIcon text="编辑" color='#ff925c' position="-144"></EditIcon>
+                <EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon>
               </span>
             </AuthButton>
           </div>

src/pages/staff/list/RoleList.jsx

@@ -9,139 +9,141 @@ import request from '../../../utils/request'
 import Styles from './style.less';
 import apis from '../../../services/apis';
 import AuthButton from '../../../components/AuthButton';
+import EditIcon from '@/components/EditIcon';
 
 const header = props => {
-// function confirm(id) {
-//   Modal.confirm({
-//     title: '确认停用该角色？',
-//     okText: '确认',
-//     cancelText: '取消',
-//     onOk() {
-//     },
-//     onCancel() {
-//       console.log('Cancel');
-//     },
-//   });
-// }
-
-function addRole(roleId) {
-  router.push({
-    pathname: '/staff/list/addRole',
-  });
-}
-
-function toEditRole(roleId) {
-  router.push({
-    pathname: '/staff/list/addRole',
-    query: {
-      id: roleId,
-    },
-  });
-}
-const [data, setData] = useState({ data: [] })
-// 初始化角色
- useEffect(() => {
-   localStorage.removeItem('value');
+  // function confirm(id) {
+  //   Modal.confirm({
+  //     title: '确认停用该角色？',
+  //     okText: '确认',
+  //     cancelText: '取消',
+  //     onOk() {
+  //     },
+  //     onCancel() {
+  //       console.log('Cancel');
+  //     },
+  //   });
+  // }
+
+  function addRole(roleId) {
+    router.push({
+      pathname: '/staff/list/addRole',
+    });
+  }
+
+  function toEditRole(roleId) {
+    router.push({
+      pathname: '/staff/list/addRole',
+      query: {
+        id: roleId,
+      },
+    });
+  }
+  const [data, setData] = useState({ data: [] })
+  // 初始化角色
+  useEffect(() => {
+    localStorage.removeItem('value');
     getRoleList({ pageNum: 1, pageSize: 100 })
- }, [])
-
-//  function getRoleList(params) {
-//    request({
-//      url: '/api/admin/taRole',
-//      method: 'GET',
-//      params: { ...params },
-//  // eslint-disable-next-line no-shadow
-//  }).then(data => {
-//      console.log(data)
-//      setData(data)
-//  })
-//  }
-
- function getRoleList(params) {
-  request({ ...apis.role.getRoleList, params: { ...params } }).then((data) => {
-    setData(data)
-}).catch((err) => {
-    console.log(err)
-    message.info(err.msg || err.message)
-})
-}
-
+  }, [])
+
+  //  function getRoleList(params) {
+  //    request({
+  //      url: '/api/admin/taRole',
+  //      method: 'GET',
+  //      params: { ...params },
+  //  // eslint-disable-next-line no-shadow
+  //  }).then(data => {
+  //      console.log(data)
+  //      setData(data)
+  //  })
+  //  }
+
+  function getRoleList(params) {
+    request({ ...apis.role.getRoleList, params: { ...params } }).then((data) => {
+      setData(data)
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+
+
+  function stop(ids, status) {
+    Modal.confirm({
+      title: "删除后角色对应账号权限也会被自动停用，请谨慎操作",
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.role.stop, urlData: { id: ids } }).then((data) => {
+          getRoleList({ pageNum: 1, pageSize: 100 })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
 
-function stop(ids, status) {
-  Modal.confirm({
-    title: "删除后角色对应账号权限也会被自动停用，请谨慎操作",
-    okText: '确认',
-    cancelText: '取消',
-    onOk () {
-      request({ ...apis.role.stop, urlData: { id: ids } }).then((data) => {
-        getRoleList({ pageNum: 1, pageSize: 100 })
-      }).catch((err) => {
-        console.log(err)
-        message.info(err.msg || err.message)
-      })
-    }
-  });
-}
+  const dataSource = [
+    {
+      name: '置业顾问',
+      status: '1',
+    },
+    {
+      name: '置业经理',
+      status: '1',
+    },
+  ];
+
+  const columns = [
+    // {
+    //   title: '商品图片',
+    //   dataIndex: 'img',
+    //   key: 'img',
+    //   align: 'center',
+
+    //   render: (text, record) => <img src={record.img} className={channels.touxiang} />,
+    // },
+    {
+      title: '角色名称',
+      dataIndex: 'roleName',
+      key: 'roleName',
+      align: 'center',
+    },
 
-const dataSource = [
-  {
-    name: '置业顾问',
-    status: '1',
-  },
-  {
-    name: '置业经理',
-    status: '1',
-  },
-];
-
-const columns = [
-  // {
-  //   title: '商品图片',
-  //   dataIndex: 'img',
-  //   key: 'img',
-  //   align: 'center',
-
-  //   render: (text, record) => <img src={record.img} className={channels.touxiang} />,
-  // },
-  {
-    title: '角色名称',
-    dataIndex: 'roleName',
-    key: 'roleName',
-    align: 'center',
-  },
-
-  {
-    title: '操作  ',
-    dataIndex: 'status',
-    key: 'status',
-    align: 'center',
-
-    render: (text, record) => <>
-    {record.isAdmin ? "" : 
-      <>
-        <AuthButton name="admin.role.publish" noRight={null}>
-        <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => stop(record.roleId, record.status)}>{ record.status === 1 ? '删除' : '' }
-        <Icon type="stop" className={styles.shoppingCart} style={{ fontSize: 14 }}/>
-        </span>
-        </AuthButton>
-        <AuthButton name="admin.role.put" noRight={null}>
-        <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={() => toEditRole(record.roleId)} >编辑
-        <Icon type="form" className={styles.edit} />
-        </span>
-        </AuthButton>
-      </>
-      }
-      
-    </>,
+    {
+      title: '操作  ',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+
+      render: (text, record) => <>
+        {record.isAdmin ? "" :
+          <>
+            <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
+              <AuthButton name="admin.role.publish" noRight={null}>
+                <span style={{ marginRight: '20px', cursor: 'pointer' }} onClick={() => stop(record.roleId, record.status)}>{record.status === 1 ? <EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon> : ''}
+                </span>
+              </AuthButton>
+              <AuthButton name="admin.role.put" noRight={null}>
+                <span style={{ cursor: 'pointer' }} onClick={() => toEditRole(record.roleId)} >
+                  <EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon>
+                </span>
+              </AuthButton>
+            </div>
+          </>
+        }
+
+      </>,
 
-  },
-];
+    },
+  ];
 
 
-return (
+  return (
     <>
-    <AuthButton name="admin.role.add" noRight={null}>
-      <Button type="danger" className={styles.addBtn} onClick={addRole}>新增</Button>
+      <AuthButton name="admin.role.add" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={addRole}>新增</Button>
       </AuthButton>
       <div className={Styles.roletext}>
 

src/pages/staff/list/StaffList.jsx

@@ -1,6 +1,6 @@
 
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Row, Col, Tag, Pagination, Modal, DatePicker , Card, Avatar } from 'antd';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Row, Col, Tag, Pagination, Modal, DatePicker, Card, Avatar } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../../style/GoodsList.less';
 import router from 'umi/router';
@@ -10,6 +10,7 @@ import request from '../../../utils/request'
 import Styles from './style.less';
 import BuildingSelect from '@/components/SelectButton/BuildSelect';
 import CustomerChange from '../components/CustomerChange'
+import EditIcon from '@/components/EditIcon';
 
 const { Meta } = Card;
 const { Option } = Select;
@@ -39,24 +40,24 @@ const CartBody = props => {
   const confirm = data => () => {
     // console.log(data, "11111")
     if (data.status === 1) {
-      if(data.isConsultant){
+      if (data.isConsultant) {
         request({ ...apis.staff.check, params: { userId: data.userId, personId: data.consultantPersonId, buildingId: data.buildingId } }).then(res => {
-          if(res.length > 0){
+          if (res.length > 0) {
             Modal.confirm({
               title: '此置业顾问下有私客，是否转移私客？',
               okText: '确认',
               cancelText: '取消',
-              onOk () {
+              onOk() {
                 setVisible(true)
               },
             });
-          }else{
+          } else {
             const titleMessahe = data.isConsultant ? '停用后此员工无法继续登录后台（若为置业顾问停用后在小程序端将成为普通用户）确认进行停用操作？' : '停用后此员工无法继续登录后台,确认进行停用操作？';
             Modal.confirm({
               title: titleMessahe,
               okText: '确认',
               cancelText: '取消',
-              onOk () {
+              onOk() {
                 request({ ...apis.staff.change, urlData: { id: data.userId, type: 'off' } }).then(res => {
                   message.info('操作成功')
                   props.onFresh()
@@ -64,14 +65,14 @@ const CartBody = props => {
               },
             });
           }
-       })
-      }else{
+        })
+      } else {
         const titleMessahe = data.isConsultant ? '停用后此员工无法继续登录后台（若为置业顾问停用后在小程序端将成为普通用户）确认进行停用操作？' : '停用后此员工无法继续登录后台,确认进行停用操作？';
         Modal.confirm({
           title: titleMessahe,
           okText: '确认',
           cancelText: '取消',
-          onOk () {
+          onOk() {
             request({ ...apis.staff.change, urlData: { id: data.userId, type: 'off' } }).then(res => {
               message.info('操作成功')
               props.onFresh()
@@ -84,7 +85,7 @@ const CartBody = props => {
         title: '确认启用该角色？',
         okText: '确认',
         cancelText: '取消',
-        onOk () {
+        onOk() {
           request({ ...apis.staff.change, urlData: { id: data.userId, type: 'on' } }).then(res => {
             message.info('操作成功')
             props.onFresh()
@@ -97,7 +98,7 @@ const CartBody = props => {
   //迁移私客成功回调
   const moveSuccess = (e) => {
     setVisible(false)
-    if(e === 'success'){
+    if (e === 'success') {
       confirm(data)()
     }
   }
@@ -122,7 +123,7 @@ const CartBody = props => {
       content: '确认进行离职操作？',
       okText: '确认',
       cancelText: '取消',
-      onOk () {
+      onOk() {
         request({ ...apis.staff.departure, urlData: { id: row.userId } }).then(() => {
           message.info('操作成功')
           props.onFresh()
@@ -139,20 +140,19 @@ const CartBody = props => {
         <div>
           <Avatar src={data.photo} style={{ width: '0.48rem', height: '0.48rem' }} />
           <AuthButton name="admin.user.put" noRight={null}>
-          <Button type="link" style={{ color: '#FF925C', fontSize: '0.106rem', position: 'absolute', top: '40px', left: '0.56rem' }} onClick={toEditStaff(data.userId)}>
-            编辑
-                  <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
-          </Button>
+            <Button type="link" style={{ color: '#FF925C', fontSize: '0.106rem', position: 'absolute', top: '40px', left: '0.56rem' }} onClick={toEditStaff(data.userId)}>
+              <EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon>
+            </Button>
           </AuthButton>
           {/* <Button type="link" style={{ fontSize: ' 0.106rem', color: '#cacaca', position: 'absolute', top: '40px', right: '0' }} onClick={() => departure(data)}>
             离职
                   <Icon type="exclamation-circle" style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
           </Button> */}
           <AuthButton name="admin.user.publish" noRight={null}>
-          <Button type="link" style={{ fontSize: ' 0.106rem', color: '#cacaca', position: 'absolute', top: '40px', right: '0' }} onClick={confirm(data)}>
-            {data.status === 1 ? '停用' : '启用'}
-            <Icon type={data.status === 1 ? 'close-circle' : 'form'} style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
-          </Button>
+            <Button type="link" style={{ fontSize: ' 0.106rem', color: '#cacaca', position: 'absolute', top: '40px', right: '0' }} onClick={confirm(data)}>
+              {data.status === 1 ? <EditIcon text="停用" color='#FF4A4A' type="stop"></EditIcon> : <EditIcon text="启用" color='#ff925c' type="start"></EditIcon>}
+
+            </Button>
           </AuthButton>
         </div>
         <div>
@@ -180,7 +180,7 @@ const CartBody = props => {
         footer={null}
         width={900}
       >
-          <CustomerChange userId={data.userId} consultantPersonId={data.consultantPersonId} buildingId={data.buildingId} onSuccess={moveSuccess} />
+        <CustomerChange userId={data.userId} consultantPersonId={data.consultantPersonId} buildingId={data.buildingId} onSuccess={moveSuccess} />
       </Modal>
     </div>
   )
@@ -216,7 +216,7 @@ const header = props => {
   }
 
   // 重置搜索
-  function handleReset () {
+  function handleReset() {
     props.form.resetFields();
     getList({ pageNum: 1, pageSize: 8 });
   }
@@ -279,18 +279,18 @@ const header = props => {
         </Form.Item>
 
         <Form.Item>
-        <AuthButton name="admin.user.search" noRight={null}>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-            搜索
+          <AuthButton name="admin.user.search" noRight={null}>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
           </Button>
-        </AuthButton>
+          </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
             </Button>
         </Form.Item>
       </Form>
       <AuthButton name="admin.user.add" noRight={null}>
-      <Button type="danger" style={{ margin: '20px 0', padding: '2px 36px' }} onClick={toEditStaff()}>新增</Button>
+        <Button type="danger" style={{ margin: '20px 0', padding: '2px 36px' }} onClick={toEditStaff()}>新增</Button>
       </AuthButton>
       <Row style={{ padding: ' 0 10px' }}>
         {
@@ -304,7 +304,7 @@ const header = props => {
 
       {/* 分页  */}
       <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
-        <Pagination showQuickJumper defaultCurrent={1} pageSize={8} total={tempData.total} onChange={onChange} current={tempData.current}/>
+        <Pagination showQuickJumper defaultCurrent={1} pageSize={8} total={tempData.total} onChange={onChange} current={tempData.current} />
       </div>
     </>
   )

src/pages/statistical/consultant/index.jsx

@@ -44,12 +44,12 @@ function record(props) {
                 startDate: consultantPageParams.startDate,
                 endDate: consultantPageParams.endDate,
                 buildingId: consultantPageParams.buildingId,
-                pageNum:consultantPageParams.pageNum
+                pageNum: consultantPageParams.pageNum
             })
             getList(JSON.parse(localStorage.getItem("consultantPageParams")))
-          } else {
+        } else {
             getList(formData);
-          }
+        }
     }, [])
 
     // 查询列表
@@ -132,7 +132,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 <><span style={{ color: '#1D74D9', cursor: 'pointer' }} onClick={() => toDetail(record, type)} >{val}</span></>
     }
 
     // 分享详情
@@ -404,7 +404,7 @@ function record(props) {
     return (
 
         <>
-            <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginBottom: '10px' }} onClick={() => setVisible(true)} />
+
             <Modal
                 title="指标说明（数据会存在一定时间延迟）"
                 centered
@@ -448,6 +448,7 @@ function record(props) {
                         <Button type="primary" onClick={handleSubmit}>搜索</Button>
                         <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
                     </Form.Item>
+                    <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00' }} onClick={() => setVisible(true)} />
                 </div>
             </Form>
             <AuthButton name="admin.statistical.consultant.export" noRight={null}>
@@ -468,9 +469,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/system/housingPolicy.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { Form, Input, Button, Icon, Select, message, Menu, Dropdown, 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';
@@ -9,28 +9,31 @@ import BuildSelect from '../../components/SelectButton/BuildSelect'
 import apis from '../../services/apis';
 import request from '../../utils/request';
 import AuthButton from '@/components/AuthButton';
+import { DownOutlined } from '@ant-design/icons';
+import EditIcon from '@/components/EditIcon';
+
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 const header = (props) => {
-  const [ data, setData ] = useState({})
+  const [data, setData] = useState({})
 
   useEffect(() => {
-    getList({ pageNum: 1, pageSize: 10,cityId: '' });
-  },[])
+    getList({ pageNum: 1, pageSize: 10, cityId: '' });
+  }, [])
 
   // 查询列表
   const getList = (params) => {
     request({ ...apis.system.getTaPolicy, params: { ...params }, }).then((data) => {
-        console.log(data)
-        setData(data)
+      console.log(data)
+      setData(data)
     })
   }
 
-  
-// 跳转到编辑商品
-const toEditPolicy = (policyId) => () => {
+
+  // 跳转到编辑商品
+  const toEditPolicy = (policyId) => () => {
     router.push({
       pathname: '/system/editPolicy',
       query: {
@@ -38,14 +41,47 @@ const toEditPolicy = (policyId) => () => {
       },
     });
   }
-  
+
   /**
    *
    *
    * @param {*} props
    * @returns
    */
-  
+
+  const menu = (row) => (
+    <Menu>
+      <Menu.Item>
+        <AuthButton name="admin.taPolicy.top" noRight={null}>
+          <span style={{ cursor: 'pointer' }} onClick={topPolicy(row)}>{row.weight === 1 ? <EditIcon text="取消置顶" color='#666' type="cancel"></EditIcon> : <EditIcon text="置顶" color='#666' type="top"></EditIcon>}</span>
+        </AuthButton>
+      </Menu.Item>
+      <Menu.Item>
+        <AuthButton name="admin.taPolicy.publish" noRight={null}>
+          <span style={{ cursor: 'pointer' }} onClick={publicOrNoPublic(row)}>{row.publishStatus === 0 ? <EditIcon text="发布" color='#666' type="publish"></EditIcon> : <EditIcon text="取消发布" color='#666' type="cancel"></EditIcon>}</span>
+        </AuthButton>
+      </Menu.Item>
+      <Menu.Item>
+        <AuthButton name="admin.taPolicy.id.put" noRight={null}>
+          <span style={{ cursor: 'pointer' }} onClick={toEditPolicy(row.policyId)}> <EditIcon text="编辑" color='#666' type="edit"></EditIcon></span>
+        </AuthButton>
+      </Menu.Item>
+      <Menu.Item>
+        <AuthButton name="admin.taPolicy.id.delete" noRight={null}>
+          <span style={{ cursor: 'pointer' }} onClick={deletePolicy(row.policyId)}>  <EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon></span>
+        </AuthButton>
+      </Menu.Item>
+
+    </Menu>
+
+
+
+
+
+
+
+
+  );
   const columns = [
     {
       title: '购房须知主图',
@@ -78,97 +114,112 @@ const toEditPolicy = (policyId) => () => {
       dataIndex: 'publishStatus',
       key: 'publishStatus',
       align: 'center',
-      render: (publishStatus)=> <><span>{publishStatus === 1 ? '已发布' : '未发布' }</span></>
+      render: (publishStatus) => <><span>{publishStatus === 1 ? '已发布' : '未发布'}</span></>
     },
     {
       title: '操作',
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x,row) => (
+      render: (x, row) => (
         <>
-          <AuthButton name="admin.taPolicy.publish" noRight={null}>
-            <span style={{ color: '#1990FF',cursor: 'pointer' }} onClick={publicOrNoPublic(row)}>{ row.publishStatus === 0 ? '发布' : '取消发布' }<Icon type="close-circle" className={styles.edit} /></span>
-          </AuthButton> 
-          <AuthButton name="admin.taPolicy.top" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px',cursor: 'pointer' }} onClick={topPolicy(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-          </AuthButton>
-          <AuthButton name="admin.taPolicy.id.put" noRight={null}>
-            <span style={{ color: '#FF925C',cursor: 'pointer' }} onClick={toEditPolicy(row.policyId)}>编辑<Icon type="form" className={styles.edit} /></span>
-          </AuthButton>
-          <AuthButton name="admin.taPolicy.id.delete" noRight={null}>
-            <span style={{ color: '#FF925C',cursor: 'pointer' }} onClick={deletePolicy(row.policyId)}>删除<Icon type="form" className={styles.edit} /></span>
-          </AuthButton>
+          <Dropdown overlay={menu(row)}>
+            <a style={{ color: '#666' }} onClick={e => e.preventDefault()}>
+              <span style={{ color: '#FF4A4A' }} >更多</span> <DownOutlined />
+            </a>
+          </Dropdown>
         </>
       )
     },
+    // {
+    //   title: '操作',
+    //   dataIndex: 'handle',
+    //   key: 'handle',
+    //   align: 'center',
+    //   render: (x,row) => (
+    //     <>
+    //       <AuthButton name="admin.taPolicy.publish" noRight={null}>
+    //         <span style={{ color: '#1990FF',cursor: 'pointer' }} onClick={publicOrNoPublic(row)}>{ row.publishStatus === 0 ? '发布' : '取消发布' }<Icon type="close-circle" className={styles.edit} /></span>
+    //       </AuthButton> 
+    //       <AuthButton name="admin.taPolicy.top" noRight={null}>
+    //         <span style={{ color: '#1990FF', marginRight: '20px',cursor: 'pointer' }} onClick={topPolicy(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+    //       </AuthButton>
+    //       <AuthButton name="admin.taPolicy.id.put" noRight={null}>
+    //         <span style={{ color: '#FF925C',cursor: 'pointer' }} onClick={toEditPolicy(row.policyId)}>编辑<Icon type="form" className={styles.edit} /></span>
+    //       </AuthButton>
+    //       <AuthButton name="admin.taPolicy.id.delete" noRight={null}>
+    //         <span style={{ color: '#FF925C',cursor: 'pointer' }} onClick={deletePolicy(row.policyId)}>删除<Icon type="form" className={styles.edit} /></span>
+    //       </AuthButton>
+    //     </>
+    //   )
+    // },
   ];
-  
+
   // 删除
-const deletePolicy = (policyId) => () => {
-  Modal.confirm({
-    title: '购房政策会被删除，小程序端和后台都无法再看到',
-    okText: '确定',
-    cancelText: '取消',
-    onOk() {
-        request({ ...apis.system.deleteTaPolicy, urlData: {id: policyId }, }).then((data) => {
-            message.info('操作成功！')
-            getList({ pageNum: 1, pageSize: 10,cityId: '' });
+  const deletePolicy = (policyId) => () => {
+    Modal.confirm({
+      title: '购房政策会被删除，小程序端和后台都无法再看到',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.system.deleteTaPolicy, urlData: { id: policyId }, }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, cityId: '' });
         }).catch((err) => {
-            console.log(err)
-            message.info(err.msg || err.message)
+          console.log(err)
+          message.info(err.msg || err.message)
         })
-    },
-  });
-}
+      },
+    });
+  }
 
 
-//   置顶
+  //   置顶
   const topPolicy = (row) => () => {
-      const weight = Math.abs(row.weight - 1)
-      row.weight = weight
-      request({ ...apis.system.updateTaPolicy, urlData: {id: row.policyId},data: row, }).then((data) => {
+    const weight = Math.abs(row.weight - 1)
+    row.weight = weight
+    request({ ...apis.system.updateTaPolicy, urlData: { id: row.policyId }, data: row, }).then((data) => {
+      console.log(data)
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10, cityId: '' });
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+
+  const publicOrNoPublic = (row) => () => {
+    if (row.publishStatus === 1) {
+      row.publishStatus = 0
+    } else {
+      row.publishStatus = 1
+    }
+    const title = row.publishStatus === 0 ? '购房政策会在小程序端隐藏，后台可继续编辑重新发布' : '确认发布此数据'
+    Modal.confirm({
+      title: title,
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.system.updateTaPolicy, urlData: { id: row.policyId }, data: row, }).then((data) => {
           console.log(data)
           message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10,cityId: '' });
-      }).catch((err) => {
+          getList({ pageNum: 1, pageSize: 10, cityId: '' });
+        }).catch((err) => {
           console.log(err)
           message.info(err.msg || err.message)
-      })
-  }
-  
-  const publicOrNoPublic = (row) => () => {
-      if (row.publishStatus === 1) {
-        row.publishStatus = 0
-      } else {
-        row.publishStatus = 1
-      }
-      const title = row.publishStatus === 0 ? '购房政策会在小程序端隐藏，后台可继续编辑重新发布' : '确认发布此数据'
-      Modal.confirm({
-        title: title,
-        okText: '确定',
-        cancelText: '取消',
-        onOk() {
-          request({ ...apis.system.updateTaPolicy, urlData: {id: row.policyId},data: row, }).then((data) => {
-            console.log(data)
-            message.info('操作成功！')
-            getList({ pageNum: 1, pageSize: 10,cityId: '' });
-            }).catch((err) => {
-                console.log(err)
-                message.info(err.msg || err.message)
-            })
-        },
-      });
-
-      
+        })
+      },
+    });
+
+
   }
-  
+
   const changePageNum = (pageNumber) => {
-      getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
   }
 
   // 提交事件
-const handleSubmit = (e, props) => {
+  const handleSubmit = (e, props) => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
@@ -189,9 +240,9 @@ const handleSubmit = (e, props) => {
           )}
         </Form.Item>
         <Form.Item>
-        <AuthButton name="admin.taPolicy.search" noRight={null}>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-            搜索
+          <AuthButton name="admin.taPolicy.search" noRight={null}>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
           </Button>
           </AuthButton>
         </Form.Item>
@@ -199,9 +250,9 @@ const handleSubmit = (e, props) => {
       <AuthButton name="admin.taPolicy.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEditPolicy()}>新增</Button>
       </AuthButton>
-      <Table rowKey="housingPolicy" dataSource={data.records} columns={columns} pagination={false}/>
+      <Table rowKey="housingPolicy" dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
       </div>
     </>
   )