合并

src/pages/channel/recommendClients.jsx

@@ -3,6 +3,7 @@ import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Sele
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import channels from './channelList.less';
 import router from 'umi/router';
+import moment from 'moment';
 import apis from '../../services/apis';
 import request from '../../utils/request'
 
@@ -91,6 +92,16 @@ const columns = [
     dataIndex: 'status',
     key: 'status',
     align: 'center',
+    // eslint-disable-next-line consistent-return
+    render: (text, records) => {
+      if (records.status === 1) { return '报备' }
+      if (records.status === 2) { return 'admin.taNews.weight' }
+      if (records.status === 3) { return '认购' }
+      if (records.status === 4) { return '签约' }
+      if (records.verifyStatus === 1) { return '待审核' }
+      if (records.verifyStatus === 2) { return '审核同意' }
+      if (records.verifyStatus === 3) { return '签约' }
+    },
   },
 ];
 

src/pages/news/list/NewsList.jsx

@@ -180,9 +180,11 @@ function body(props) {
         cover={<img alt="example" src={data.newsImg} style={{ borderRadius: '12px 0 0 12px', width: '230px', height: '228px' }}></img>}
         bodyStyle={{ padding: '10px 20px' }}
       >
-        <AuthButton name="admin.taNews.id.put" noRight={null}>
-          <span style={{ position: 'absolute', right: '100px', top: '19px', fontSize: ' 0.106rem',zIndex:1, color: '#FF7E48', cursor: 'pointer' }} onClick={topNews(data.weight, data.newsId)}>{ data.weight === 1 ? '取消置顶' : '置顶' }</span>
+        <AuthButton name="admin.taNews.weight.put" noRight={null}>
+        <span style={{ position: 'absolute', right: '100px', top: '19px', fontSize: ' 0.106rem',zIndex:1, color: '#FF7E48', cursor: 'pointer' }} onClick={topNews(data.weight, data.newsId)}>{ data.weight === 1 ? '取消置顶' : '置顶' }</span>
+        </AuthButton>
 
+        <AuthButton name="admin.taNews.id.put" noRight={null}>
           <span style={{ position: 'absolute', right: '20px', top: '20px', fontSize: ' 0.106rem',zIndex:1, color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(data.newsId)}>
             编辑
                   <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />