bug fix

src/components/ActionList/style.less

@@ -3,9 +3,9 @@
   display: inline-block;
 
   span {
+    display: inline-block;
     & + span {
-      display: inline-block;
-      margin-left: 8px;
+      margin-left: 16px;
     }
   }
 }

src/components/EditIcon/index.jsx

@@ -6,104 +6,99 @@ const spriteInfo = [
         name: '启用',
         type: 'start',
         pos: 0,
-        color: '#ff925c'
+        color: '#ff925c',
     },
     {
         name: '发布',
         type: 'publish',
         pos: -126,
-        color: '#ff925c'
+        color: '#ff925c',
     },
     {
         name: '上架',
         type: 'up',
         pos: -18,
-        color: '#ff925c'
+        color: '#ff925c',
     },
     {
         name: '编辑',
         type: 'edit',
         pos: -144,
-        color: '#ff925c'
+        color: '#ff925c',
     },
     {
         name: '取消',
         type: 'cancel',
         pos: -36,
-        color: '#FF4A4A'
+        color: '#FF4A4A',
     },
     {
         name: '停用',
         type: 'stop',
         pos: -162,
-        color: '#FF4A4A'
+        color: '#FF4A4A',
     },
     {
         name: '结束',
         type: 'end',
         pos: -54,
-        color: '#FF4A4A'
+        color: '#FF4A4A',
     },
     {
         name: '删除',
         type: 'delete',
         pos: -180,
-        color: '#FF4A4A'
+        color: '#FF4A4A',
     },
     {
         name: '查看',
         type: 'look',
         pos: -72,
-        color: '#FF4A4A'
+        color: '#FF4A4A',
     },
     {
         name: '添加',
         type: 'add',
         pos: -198,
-        color: '#FF4A4A'
+        color: '#FF4A4A',
     },
     {
         name: '前置',
         type: 'top',
         pos: -90,
-        color: '#FF4A4A'
+        color: '#FF4A4A',
     },
     {
         name: '下架',
         type: 'down',
         pos: -216,
-        color: '#FF4A4A'
+        color: '#FF4A4A',
     },
     {
         name: '记录',
         type: 'record',
         pos: -108,
-        color: '#FF4A4A'
+        color: '#FF4A4A',
     },
-
 ]
 
-const EditIcon = ({ text, type, color, position }) => {
+function noop() {}
+
+const EditIcon = ({ text, type, color, position, onClick }) => {
 
     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 wrappedStyle = useMemo(() => ({ color: `${color2}`, display: 'flex', alignItems: 'center', cursor: 'pointer' }), [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={wrappedStyle} >
+        <span style={wrappedStyle} onClick={onClick || noop} >
             {text}
             <span style={iconStyle}></span>
         </span>
-
-
     )
-
 };
 
-export default EditIcon;
+export default EditIcon;

src/pages/integralMall/GoodsList.jsx

@@ -3,6 +3,7 @@ import { Form, Input, Button, Icon, Select, message, Table, Pagination, Modal }
 import router from 'umi/router';
 import AuthButton from '@/components/AuthButton';
 import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import apis from '../../services/apis';
 import request from '../../utils/request'
@@ -136,15 +137,14 @@ function header(props) {
       align: 'center',
       render: withActions((x, row) => [
           <AuthButton name="admin.taGoods.change.put" noRight={null}>
-            <span style={{ color: '#EF273A', marginRight: '20px', cursor: 'pointer' }} onClick={changeGoodsStatus(row)}>
-              {row.status === 1 ? '下架' : '上架'}
-              <Icon type="shopping-cart" className={styles.shoppingCart} />
-            </span>
+            {
+              row.status === 1 ?
+              <EditIcon onClick={changeGoodsStatus(row)} type="down" text="下架" /> :
+              <EditIcon onClick={changeGoodsStatus(row)} type="up" text="上架" />
+            }
           </AuthButton>,
           <AuthButton name="admin.taGoods.put" noRight={null}>
-            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.goodsId)}>
-              编辑<Icon type="form" className={styles.edit} />
-            </span>
+            <EditIcon onClick={toEditGoods(row.goodsId)} type="edit" text="编辑" />
           </AuthButton>,
         ]),
     },