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

src/pages/activity/ActivityList.jsx

@@ -106,11 +106,11 @@ const toEditGoods = (dynamicId) => () => {
             <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this,row)}>{ row.status === 1 ? '取消发布' : '发布' }<Icon type="close-circle" className={styles.edit} /></span>
           </AuthButton>
           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={finishDynamic.bind(this,row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
+            {row.isEnlist != 2 && <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={finishDynamic.bind(this,row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
           </AuthButton>
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>
+            {row.isEnlist != 2 && <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
           </AuthButton>
         </>
       )

src/pages/building/list/index.jsx

@@ -135,7 +135,7 @@ function CartBody(props) {
       </p>
       <p className={Styles.cardItem}>
         <span className={Styles.title}>录入时间</span>
-        <span >：{data.createDate}</span>
+        <span >：{moment(data.createDate).format('YYYY-MM-DD HH:mm:ss')}</span>
       </p>
       <p style={{ margin: '15px 0', position: 'relative', fontSize: '0.106rem' }}>
       <AuthButton name="admin.building.update.status.put" noRight={null}>

src/pages/channel/recommendClients.jsx

@@ -84,6 +84,7 @@ const columns = [
     dataIndex: 'createDate',
     key: 'createDate',
     align: 'center',
+    render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD') }</span></>,
   },
   {
     title: '状态',

src/pages/customer/independentList/index.jsx

@@ -106,6 +106,7 @@ class ModalTable extends React.Component {
         title: '推荐时间',
         dataIndex: 'createDate',
         key: 'createDate',
+        render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD') }</span></>,
       },
       {
         title: '状态',

src/pages/news/list/NewsList.jsx

@@ -226,7 +226,7 @@ function body(props) {
             <span>收藏数量：{data.saveNum}</span>
           </p>
 
-          <p style={{ fontSize: ' 0.106rem', color: '#999', marginBottom: '8px' }}>发布时间：{data.createDate}</p>
+          <p style={{ fontSize: ' 0.106rem', color: '#999', marginBottom: '8px' }}>发布时间：{moment(data.createDate).format('YYYY-MM-DD HH:mm:ss')}</p>
         </div>
       </Card>
     )