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

src/pages/channel/brokerList.jsx

@@ -54,7 +54,7 @@ const columns = [
     dataIndex: 'sex',
     key: 'sex',
     align: 'center',
-    render: (text, list) => <a style={ { color: '#66B3FF' } } >{ list.sex === 1 ? '男' : '女' }</a>,
+    render: (text, list) => <a>{ list.sex === 1 ? '男' : '女' }</a>,
   },
   {
     title: '推荐客户',

src/pages/channel/channelList.jsx

@@ -59,20 +59,20 @@ const columns = [
   },
   {
     title: '经纪人数',
-    dataIndex: 'agentsNum',
-    key: 'agentsNum',
+    dataIndex: 'brokerCount',
+    key: 'brokerCount',
     align: 'center',
   },
   {
     title: '推荐客户有效',
-    dataIndex: 'recommendEffective',
-    key: 'recommendEffective',
+    dataIndex: 'recommendCount',
+    key: 'recommendCount',
     align: 'center',
   },
   {
     title: '邀请经济人',
-    dataIndex: 'agentsInvite',
-    key: 'agentsInvite',
+    dataIndex: 'inviteCount',
+    key: 'inviteCount',
     align: 'center',
   },
   {

src/pages/channel/editChannel.jsx

@@ -27,7 +27,6 @@ const header = props => {
 
   // 编辑
   function editChannel(data) {
-    alert(1111111)
       request({
         url: `/api/admin/channel/${props.location.query.id}`,
         method: 'PUT',
@@ -48,6 +47,11 @@ const header = props => {
       }
     });
   }
+  function go() {
+    router.push({
+      pathname: '/channel/channelList',
+    });
+  }
 
   const { getFieldDecorator } = props.form;
 
@@ -77,7 +81,7 @@ const header = props => {
           <Button type="primary" htmlType="submit">
             保存
           </Button>
-          <Button className={channels.formButton} onClick = {() => router.go(-1)} type="primary" htmlType="submit">
+          <Button className={channels.formButton} onClick = { go } type="primary" htmlType="submit">
             取消
           </Button>
         </Form.Item>