style

src/pages/channel/addChannel.jsx

@@ -22,22 +22,24 @@ const header = props => {
     request({ ...apis.channelList.addChannel, data: { ...params } }).then((data) => {
       setData(data)
       router.go(-1)
-  }).catch((err) => {
+    }).catch((err) => {
       console.log(err)
       message.info(err.msg || err.message)
-  })
+    })
   }
 
-  function handleSubmit (e) {
+  function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
         console.log('Received values of form: ', values);
         // eslint-disable-next-line max-len
-        addChannel({ channelName: values.channelName,
-                     channelContact: values.channelContact,
-                     contactTel: values.contactTel,
-                     explain: values.explain })
+        addChannel({
+          channelName: values.channelName,
+          channelContact: values.channelContact,
+          contactTel: values.contactTel,
+          explain: values.explain
+        })
       }
     });
   }
@@ -63,16 +65,18 @@ const header = props => {
           })(<Input className={channels.inpuit} />)}
         </Form.Item>
         <Form.Item label="说明描述">
-        {getFieldDecorator('explain', {
-        })(<TextArea className={channels.inpuitTxt} rows={8} />)}
+          {getFieldDecorator('explain', {
+          })(<TextArea className={channels.inpuitTxt} rows={8} />)}
         </Form.Item>
-        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
-          <Button type="primary" htmlType="submit">
-            保存
+        <Form.Item wrapperCol={{ span: 15, offset: 8 }}>
+          <div style={{ width: '190px' }}>
+            <Button type="primary" htmlType="submit">
+              保存
           </Button>
-          <Button className={channels.formButton} onClick={() => router.go(-1)} type="primary" htmlType="submit">
-            取消
+            <Button className={channels.formButton} onClick={() => router.go(-1)} htmlType="submit">
+              取消
           </Button>
+          </div>
         </Form.Item>
       </Form>
     </>

src/pages/channel/channelList.jsx

@@ -7,6 +7,7 @@ import apis from '../../services/apis';
 import request from '../../utils/request';
 import AuthButton from '@/components/AuthButton';
 import ChannelSelect from '@/components/SelectButton/channelSelect';
+import EditIcon from '@/components/EditIcon';
 
 const { Option } = Select;
 
@@ -65,7 +66,7 @@ const columns = [
     dataIndex: 'brokerCount',
     key: 'brokerCount',
     align: 'center',
-      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick= {() => toBroker(record)} >{ record.brokerCount }</a>,
+    render: (text, record) => <a style={{ color: '#66B3FF' }} onClick={() => toBroker(record)} >{record.brokerCount}</a>,
   },
   {
     title: '推荐客户有效数',
@@ -80,7 +81,9 @@ const columns = [
     align: 'center',
     render: (text, record) => (
       <AuthButton name="admin.channel.id.put" noRight={null}>
-        <a style={{ color: '#66B3FF' }} onClick={() => toedit(record.channelId)} >编辑</a>
+        <a style={{ display: 'flex', justifyContent: 'center' }} onClick={() => toedit(record.channelId)} >
+          <EditIcon text="编辑" color='#ff925c' position="-144"></EditIcon>
+        </a>
       </AuthButton>
     ),
   },
@@ -128,14 +131,14 @@ const header = props => {
     localStorage.removeItem('value');
     getList({ pageNum: 1, pageSize: 10 })
   }, [])
- 
+
   function getList(params) {
     request({ ...apis.channelList.getList, params: { ...params } }).then((data) => {
       setData(data)
-  }).catch((err) => {
+    }).catch((err) => {
       console.log(err)
       message.info(err.msg || err.message)
-  })
+    })
   }
   // value 的值
   function handleChange(value) {
@@ -144,7 +147,7 @@ const header = props => {
   }
   // 查询
   function queryList() {
-   
+
     getList({ pageNum: 1, pageSize: 10, channelId: channelNmae })
   }
   // 重置
@@ -182,22 +185,22 @@ const header = props => {
     <>
       <div className={channels.searchBox}>
         <div>
-        <span className={channels.selectName}>渠道名称</span>
-        <ChannelSelect value={channelNmae} onChange={onChannelChange}></ChannelSelect>
+          <span className={channels.selectName}>渠道名称</span>
+          <ChannelSelect value={channelNmae} onChange={onChannelChange}></ChannelSelect>
           {/* 
           <Select defaultValue="请选择" style={{ width: 180 }} onChange={handleChange}>
             <option value="">全部</option>
             {data.channelNmae.map(Item =>
               <Option value={Item.channelId}> {Item.channelName} </Option>,
             )} */}
-            {/* {listItems} */}
+          {/* {listItems} */}
           {/* </Select> */}
         </div>
         <div >
-        <AuthButton name="admin.channel.search" noRight={null}>
-          <Button type="primary" onClick={() => queryList()}>查询</Button>
+          <AuthButton name="admin.channel.search" noRight={null}>
+            <Button type="primary" onClick={() => queryList()}>搜索</Button>
           </AuthButton>
-          <Button onClick={() => reset() } style={{marginLeft:'8px'}}>重置</Button>
+          <Button onClick={() => reset()} style={{ marginLeft: '8px' }}>重置</Button>
         </div>
       </div>
       <AuthButton name="admin.channel.post" noRight={null}>

src/pages/channel/editChannel.jsx

@@ -15,26 +15,26 @@ const header = props => {
   useEffect(() => {
     getById()
   }, [])
-  
-  
+
+
   // 查询当前信息
   function getById(params) {
     request({ ...apis.channelList.getById, urlData: { id: props.location.query.id } }).then((data) => {
       props.form.setFieldsValue(data)
-  }).catch((err) => {
+    }).catch((err) => {
       console.log(err)
       message.info(err.msg || err.message)
-  })
+    })
   }
 
   // 编辑
   function editChannel(data) {
     request({ ...apis.channelList.editChannel, urlData: { id: props.location.query.id }, data: { ...data } }).then((data) => {
       router.go(-1)
-  }).catch((err) => {
+    }).catch((err) => {
       console.log(err)
       message.info(err.msg || err.message)
-  })
+    })
   }
 
 
@@ -56,8 +56,8 @@ const header = props => {
   const { getFieldDecorator } = props.form;
 
   return (
-  <>
-        <Form labelCol={{ span: 6 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+    <>
+      <Form labelCol={{ span: 6 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
         <Form.Item label="渠道名称">
           {getFieldDecorator('channelName', {
             rules: [{ required: true, message: '请输入渠道名称' }],
@@ -74,20 +74,22 @@ const header = props => {
           })(<Input className={channels.inpuit} />)}
         </Form.Item>
         <Form.Item label="说明描述">
-        {getFieldDecorator('explain', {
-        })(<TextArea className={channels.inpuitTxt} rows={8} />)}
+          {getFieldDecorator('explain', {
+          })(<TextArea className={channels.inpuitTxt} rows={8} />)}
         </Form.Item>
-        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
-          <Button type="primary" htmlType="submit">
-            保存
+        <Form.Item wrapperCol={{ span: 15, offset: 8 }}>
+          <div style={{ width: '190px' }}>
+            <Button type="primary" htmlType="submit">
+              保存
           </Button>
-          <Button className={channels.formButton} onClick = { go } type="primary" htmlType="submit">
-            取消
+            <Button className={channels.formButton} onClick={go} htmlType="submit">
+              取消
           </Button>
+          </div>
         </Form.Item>
       </Form>
-  </>
-)
+    </>
+  )
 }
 const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
 export default WrappedNormalLoginForm

src/pages/news/type/NewsType.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,27 +7,28 @@ import BuildSelect from '../../../components/SelectButton/BuildSelect';
 import AuthButton from '@/components/AuthButton';
 import apis from '../../../services/apis';
 import request from '../../../utils/request'
+import EditIcon from '@/components/EditIcon';
 
 const { Option } = Select;
 
 
 function header(props) {
   // 获取初始化数据
-  const [ data, setData ] = useState({})
+  const [data, setData] = useState({})
 
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10 });
-  },[])
+  }, [])
 
   // 查询列表
   const getList = (params) => {
     request({ ...apis.newsType.list, params: { ...params } }).then((data) => {
-        console.log(data)
-        setData(data)
+      console.log(data)
+      setData(data)
     })
   }
 
-  
+
   // 提交事件
   const handleSubmit = (e, props) => {
     e.preventDefault();
@@ -57,7 +58,7 @@ function header(props) {
     });
   }
 
-  
+
   const changeNewsStatus = (row, newsId) => () => {
     Modal.confirm({
       title: '确认删除？',
@@ -88,7 +89,7 @@ function header(props) {
       dataIndex: 'newsTypeImg',
       key: 'newsTypeImg',
       align: 'center',
-      render: (text, record) => <img src={record.newsTypeImg} style={{ width: '165px',height: '104px' }} className={styles.touxiang} />,
+      render: (text, record) => <img src={record.newsTypeImg} style={{ width: '165px', height: '104px' }} className={styles.touxiang} />,
     },
     {
       title: '名称',
@@ -104,16 +105,18 @@ function header(props) {
       align: 'center',
       render: (x, row) => (
         <>
-          <AuthButton name="admin.taNewsType.id.delete" noRight={null}>
-            <span style={{ color: '#EF273A', marginRight: '20px', cursor: 'pointer' }} onClick={changeNewsStatus(row, row.newsTypeId)}>
-              {row.status == 1 ? '删除' : '上架'}<Icon type="shopping-cart" className={styles.shoppingCart} />
-            </span>
-          </AuthButton>
-          <AuthButton name="admin.taNewsType.id.put" noRight={null}>
-            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditNews(row.newsTypeId)}>
-              编辑<Icon type="form" className={styles.edit} />
-            </span>
-          </AuthButton>
+          <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>}
+              </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>
+              </span>
+            </AuthButton>
+          </div>
         </>
       ),
     },
@@ -134,13 +137,13 @@ function header(props) {
           )}
         </Form.Item>
         <Form.Item>
-            <AuthButton name="admin.taNewsType.search" noRight={null}>
-              <Button type="primary" htmlType="submit" >
-                搜索
+          <AuthButton name="admin.taNewsType.search" noRight={null}>
+            <Button type="primary" htmlType="submit" >
+              搜索
               </Button>
-            </AuthButton>
-            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
+          </AuthButton>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
             </Button>
         </Form.Item>
       </Form>
@@ -149,7 +152,7 @@ function header(props) {
       </AuthButton>
       <Table rowKey="newsType" 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>
     </>
   )