Merge branch 'master' into v3.5

src/pages/news/list/NewsList.jsx

@@ -92,13 +92,13 @@ function body(props) {
     }
 
     //删除资讯
-    const changeNewsListStatus = (newsId) => () => {
+    const changeNewsListStatus = (row, newsId) => () => {
       Modal.confirm({
         title: '确认删除该资讯？',
         okText: '确认',
         cancelText: '取消',
         onOk() {
-          request({ ...apis.news.delete, urlData: { id: newsId }, }).then((data) => {
+          request({ ...apis.news.put, urlData: { id: newsId }, data: { ...row, status: -1 } }).then((data) => {
             message.info('操作成功！')
             getList({ pageNum: 1, pageSize: 10 });
           }).catch((err) => {
@@ -201,7 +201,7 @@ function body(props) {
           }
         </AuthButton>
         <AuthButton name="admin.taNews.id.delete" noRight={null}>
-          <span style={{ position: 'absolute', right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer' }} onClick={changeNewsListStatus(data.newsId)}>
+          <span style={{ position: 'absolute', right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', zIndex: 1 }} onClick={changeNewsListStatus(data, data.newsId)}>
             删除
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
           </span>

src/pages/news/type/NewsType.jsx

@@ -60,7 +60,8 @@ function header(props) {
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        request({ ...apis.newsType.delete, urlData: { id: newsId },}).then((data) => {
+
+        request({ ...apis.newsType.put, urlData: { id: newsId }, data: { ...row, status: -1 } }).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 });
         }).catch((err) => {