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

config/config.js

@@ -151,6 +151,11 @@ export default {
                   name: '渠道管理',
                   component: './channel/channelList',
                 },
+                // {
+                //   path: '/channel/addChannel',
+                //   name: '新增渠道',
+                //   component: './channel/addChannel',
+                // },
               ],
             },
             {

src/pages/channel/channelList.jsx

@@ -7,6 +7,8 @@ const { Option } = Select;
 function handleChange(value) {
   console.log(`selected ${value}`);
 }
+
+
 const menu = (
   <Menu onClick={handleMenuClick}>
     <Menu.Item key="1">
@@ -92,6 +94,13 @@ const columns = [
     align: 'center',
     render: () => <a>Delete</a>,
   },
+  {
+    title: '操作',
+    dataIndex: 'handle',
+    key: 'handle',
+    align: 'center',
+    render: () => <a style={ { color: '#66B3FF' } }>编辑</a>,
+  },
 ];
 
 export default () => (

src/pages/channel/channelList.less

@@ -44,3 +44,16 @@
   color: rgb(10, 10, 10);
   margin: 30px 0;
 }
+
+.inpuit {
+  width:50%;
+}
+
+.inpuitTxt {
+  width:70%;
+}
+
+
+.formButton{
+  margin-left: 12% 
+}