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

src/components/ActionList/index.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Menu, Dropdown, Icon } from 'antd';
 
-import styles from './style.less';
+import './style.less';
 
 export default function withActions(actionsRender) {
   return function ActionList(text, record) {
@@ -9,13 +9,13 @@ export default function withActions(actionsRender) {
     const [Act1, Act2, Act3, ...leftActs] = actions || [];
 
     const menus = (
-      <Menu>
+      <Menu className="actlist-menu">
         {(leftActs || []).map((Act, index) => (<Menu.Item key={`dm-${index}`}>{Act}</Menu.Item>))}
       </Menu>
     );
 
     return (
-      <div className={styles['action-list']}>
+      <div className="action-list">
         {
           Act1 && <span>{Act1}</span>
         }
@@ -31,7 +31,7 @@ export default function withActions(actionsRender) {
             <span>
               <Dropdown overlay={menus} trigger={['click']}>
                 <a onClick={e => e.preventDefault()}>
-                  更多 <Icon type="down" />
+                  <span>更多</span> <Icon type="down" />
                 </a>
               </Dropdown>
             </span>

src/components/ActionList/style.less

@@ -1,11 +1,31 @@
 
-.action-list {
-  display: inline-block;
-
-  span {
+:global{
+  .action-list {
     display: inline-block;
-    & + span {
-      margin-left: 16px;
+  
+    span {
+      display: inline-block;
+      & + span {
+        margin-left: 16px;
+      }
+  
+      a {
+        color: #666;
+  
+        span {
+          color: #FF4A4A;
+        }
+      }
+    }
+  }
+  
+  .actlist-menu {
+    .ant-dropdown-menu-item {
+      color: #666 !important;
+
+      &:hover {
+        background-color: rgba(0,0,0, .1);
+      }
     }
   }
 }

src/pages/activity/helpActivity/list.jsx

@@ -1,25 +1,24 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../../style/GoodsList.less';
+import { Form, Input, Button, Icon, Select, message, Table, Pagination, Modal, DatePicker } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import Prompt from 'umi/prompt';
 import SelectCity from '../../../components/SelectButton/CitySelect'
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
-import AuthButton from '@/components/AuthButton';
-import Prompt from 'umi/prompt';
+import styles from '../../style/GoodsList.less';
 
 const { Option } = Select;
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 const header = props => {
   const [data, setData] = useState({})
   //   const [page, changePage] = useState({})
 
   useEffect(() => {
-
     if (localStorage.getItem("helpActivePageParams")) {
       props.form.setFieldsValue(JSON.parse(localStorage.getItem("helpActivePageParams")));
       // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
@@ -128,32 +127,31 @@ const header = props => {
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x, row) => (
-        <>
-          {
-            <AuthButton name="admin.help.publish" 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>
-          }
-          {row.activityStatus === 0 &&
-            <AuthButton name="admin.help.finish" noRight={null}>
-              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" style={{ color: '#bebebe' }} className={styles.edit} /></span> </AuthButton>
-          }
-          {
-            <AuthButton name="admin.help.tag" noRight={null}>
-              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{row.weight === 1 ? '取消标签' : '添加标签'}<Icon type="vertical-align-top" style={{ color: '#bebebe' }} className={styles.edit} /></span>
-            </AuthButton>}{
-            <AuthButton name="admin.help.top" noRight={null}>
-              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{row.isMain === true ? '取消推首页' : '推首页'}<Icon type="vertical-align-top" style={{ color: '#bebebe' }} className={styles.edit} /></span>
-            </AuthButton>}
-          {<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => toDataReacord(row.helpActivityId)}>数据记录<Icon type="form" className={styles.edit} /></span>}
-          {(row.activityStatus === 1 || row.activityStatus === 0) &&
+      render: withActions((x, row) => [
+        <AuthButton name="admin.help.publish" noRight={null}>
+          <EditIcon type={row.status === 1 ? 'cancel' : 'publish'} text={row.status === 1 ? '取消发布' : '发布'} onClick={sendOrPublicDynamic.bind(this, row)} />
+        </AuthButton>,
+
+        row.activityStatus === 0 ?
+          <AuthButton name="admin.help.finish" noRight={null}>
+            <EditIcon type="end" text="结束活动" onClick={topDynamic(row, 2)} />
+          </AuthButton> : null,
+
+        <AuthButton name="admin.help.tag" noRight={null}>
+          <EditIcon type={row.weight === 1 ? 'cancel' : 'add'} text={row.weight === 1 ? '取消标签' : '添加标签'} onClick={topDynamic(row, 0)} />
+        </AuthButton>,
+
+        <AuthButton name="admin.help.top" noRight={null}>
+          <EditIcon type={row.isMain === 1 ? 'cancel' : 'add'} color="#666" text={row.isMain === 1 ? '取消推首页' : '推首页'} onClick={topDynamic(row, 1)} />
+        </AuthButton>,
+
+        <EditIcon type="record" text="数据记录" color="#666" onClick={() => toDataReacord(row.helpActivityId)} />,
+
+        (row.activityStatus === 1 || row.activityStatus === 0) ?
             <AuthButton name="admin.helpActivity.update.put" noRight={null}>
-              <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" style={{ color: '#bebebe' }} className={styles.edit} /></span>
-            </AuthButton>
-          }
-        </>
-      ),
+              <EditIcon color="#666" type="edit" text="编辑" onClick={toEditGoods(row.helpActivityId)} />
+            </AuthButton> : null,
+      ]),
     },
   ];