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

# Conflicts:
#	src/pages/activity/liveActivity/list/index.jsx

src/pages/activity/liveActivity/list/index.jsx

@@ -155,6 +155,17 @@ const header = props => {
       align: 'center',
       render: (x, row) => <><span>{`${moment(row.updateDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
     },
+    {
+      title: '操作',
+      dataIndex: '',
+      key: '',
+      align: 'center',
+      render: (text, record) => (
+        <AuthButton name="admin.live.detail.get" noRight={null}>
+          <a style={{ color: '#66B3FF' }} onClick={toAddLive(record)} >查看详情</a>
+        </AuthButton>
+      ),
+    },
   ];
   const getSignList = dynamicId => {
     router.push({
@@ -251,10 +262,10 @@ const header = props => {
             </Button>
         </Form.Item>
       </Form>
-      <AuthButton name="admin.liveActivity.add.post" noRight={null}>
+      <AuthButton name="admin.live.add.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toAddLive()}>新增</Button>
       </AuthButton>
-      <AuthButton name="admin.liveActivity.del" noRight={null}>
+      <AuthButton name="admin.live.del" noRight={null}>
         <Button type="primary" className={styles.addBtn} onClick={toDelBatch()} style={{marginLeft:'30px'}}>删除</Button>
       </AuthButton>
       <Table rowSelection={rowSelection}

src/pages/house/list/index.jsx

@@ -104,7 +104,6 @@ const header = props => {
       dataIndex: 'salesBatchName',
       key: 'salesBatchName',
       align: 'center',
-      render:  (x, row) => <><span style={{color: 'blue',cursor: 'pointer'}} onClick={toAddHouse(row)}>{row.salesBatchName}</span></>,
     },
     {
       title: '楼盘名称',
@@ -139,6 +138,17 @@ const header = props => {
       align: 'center',
       render: status => <><span>{status == 0 ? '否' : '是'}</span></>,
     },
+    {
+      title: '操作',
+      dataIndex: '',
+      key: '',
+      align: 'center',
+      render: (text, record) => (
+        <AuthButton name="admin.salesBatch.detail.get" noRight={null}>
+          <a style={{ color: '#66B3FF' }} onClick={toAddHouse(record)} >查看详情</a>
+        </AuthButton>
+      ),
+    },
   ];
   const getSignList = dynamicId => {
     router.push({