合并

src/pages/channel/InviteClients.jsx

@@ -37,6 +37,7 @@ const columns = [
     dataIndex: 'sex',
     key: 'sex',
     align: 'center',
+    render: (text, record) => <a style={ { color: '#66B3FF' } } >{ record.sex === 1 ? '男' : '女' }</a>,
   },
 ];
 const header = props => {

src/pages/channel/brokerList.jsx

@@ -155,7 +155,7 @@ const header = props => {
 return (
   <>
     <div className={ channels.searchBox }>
-      <div>
+      <div style = {{ marginLeft: '-5px' }}>
         <span className={ channels.selectName }>姓名</span>
         <Input onChange = { onInputChangePhone } style ={{ width: 150 }} />
         <span className={ channels.selectName }>电话</span>
@@ -163,7 +163,7 @@ return (
       </div>
       <div>
       <Button type="primary" onClick={() => queryList() }>查询</Button>
-      <Button onClick={() => refurbishList() }>重置</Button>
+      {/* <Button onClick={() => refurbishList() }>重置</Button> */}
     </div>
     </div>
     <Table dataSource={data.list} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />

src/pages/channel/channelList.jsx

@@ -168,10 +168,10 @@ const header = props => {
         </dvi>
         <div >
         <Button type="primary" onClick={() => queryList() }>查询</Button>
-        <Button onClick={() => reset() }>重置</Button>
+        {/* <Button onClick={() => reset() }>重置</Button> */}
         </div>
       </div>
-      <Button type="danger" onClick={toAdd}>新增</Button>
+      <Button type="danger" onClick={toAdd} className={channels.about} >新增</Button>
       <Table dataSource={data.result.records} columns={columns} pagination={{ pageSize: 10, total: data.result.total, onChange }} />
   </>
   )

src/pages/channel/channelList.less

@@ -32,13 +32,12 @@
 .about {
   padding: 0 30px;
   height: 36px;
-  background-color:rgba(255,255,255,1);
-  color: #fff;
   margin: 30px 0;
+  margin-left:8px;
 }
 
 .selectName {
-  font-size: 17px;
+  font-size: 14px;
   padding: 0 10px;
   height: 36px;
   color: rgb(10, 10, 10);
@@ -62,3 +61,8 @@
   float: 'left'; 
   width: 500
 }
+.brokerTable{
+  padding: 0 30px;
+  height: 36px;
+  margin: 30px 0;
+}

src/pages/channel/recommendClients.jsx

@@ -70,6 +70,7 @@ const columns = [
     dataIndex: 'sex',
     key: 'sex',
     align: 'center',
+    render: (text, record) => <a style={ { color: '#66B3FF' } } >{ record.sex === 1 ? '男' : '女' }</a>,
   },
   {
     title: '意向项目',

src/pages/customer/independentList/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, notification } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, notification, Modal } from 'antd';
 import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';