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

src/pages/news/list/NewsList.jsx

@@ -97,13 +97,12 @@ function body(props) {
         okText: '确认',
         cancelText: '取消',
         onOk() {
-          request({
-            url: '/api/admin/taNews/' + newsId,
-            method: 'DELETE',
-            // data: { ...row },
-          }).then((data) => {
+          request({ ...apis.news.delete, urlData: { id: newsId },}).then((data) => {
             message.info('操作成功！')
             getList({ pageNum: 1, pageSize: 10 });
+          }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
           })
         }
       });
@@ -127,13 +126,12 @@ function body(props) {
           okText: '确认',
           cancelText: '取消',
           onOk() {
-            request({
-              url: '/api/admin/taNews/' + newsId,
-              method: 'PUT',
-              data: { "newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId },
-            }).then((data) => {
+            request({ ...apis.news.cancel, data:{"newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId}, urlData: { id: newsId },}).then((data) => {
               message.info('操作成功！')
               getList({ pageNum: 1, pageSize: 10 });
+            }).catch((err) => {
+              console.log(err)
+              message.info(err.msg || err.message)
             })
           },
           onCancel() {
@@ -146,13 +144,12 @@ function body(props) {
           okText: '确认',
           cancelText: '取消',
           onOk() {
-            request({
-              url: '/api/admin/taNews/' + newsId,
-              method: 'PUT',
-              data: { "newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId },
-            }).then((data) => {
+            request({ ...apis.news.cancel, data:{"newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId}, urlData: { id: newsId },}).then((data) => {
               message.info('操作成功！')
               getList({ pageNum: 1, pageSize: 10 });
+            }).catch((err) => {
+              console.log(err)
+              message.info(err.msg || err.message)
             })
           },
           onCancel() {
@@ -175,11 +172,11 @@ function body(props) {
                   <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
           </span>
           {data.newsStatus === 0 ?
-            <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48' }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
+            <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48',zIndex:1 }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
               取消发布
                 <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
             </span> :
-            <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48' }} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
+            <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48',zIndex:1 }} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
               发布
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
             </span>

src/pages/news/type/NewsType.jsx

@@ -5,7 +5,7 @@ import styles from '../../style/GoodsList.less';
 import router from 'umi/router';
 import BuildSelect from '../../../components/SelectButton/BuildSelect';
 import AuthButton from '@/components/AuthButton';
-
+import apis from '../../../services/apis';
 import request from '../../../utils/request'
 
 const { Option } = Select;
@@ -21,15 +21,12 @@ function header(props) {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/taNewsType',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.newsType.list, params: { ...params } }).then((data) => {
         console.log(data)
         setData(data)
     })
   }
+
   
   // 提交事件
   const handleSubmit = (e, props) => {
@@ -63,14 +60,22 @@ function header(props) {
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        request({
-          url: '/api/admin/taNewsType/' + newsId,
-          method: 'DELETE',
-          data: { ...row },
-        }).then((data) => {
+        request({ ...apis.newsType.delete, urlData: { id: newsId },}).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 });
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
         })
+
+        // request({
+        //   url: '/api/admin/taNewsType/' + newsId,
+        //   method: 'DELETE',
+        //   data: { ...row },
+        // }).then((data) => {
+        //   message.info('操作成功！')
+        //   getList({ pageNum: 1, pageSize: 10 });
+        // })
       }
     });
   }

src/services/apis.js

@@ -126,6 +126,28 @@ export default {
       url: `${prefix}/taNews`,
       action: 'admin.taNews.get',
     },
+    delete: {
+        method: 'DELETE',
+        url: `${prefix}/taNews/:id`,
+        action: 'admin.taNews.id.delete',
+    },
+    cancel: {
+        method: 'PUT',
+        url: `${prefix}/taNews/:id`,
+        action: 'admin.taNews.id.put',
+    },
+  },
+  newsType: {
+    list: {
+        method: 'GET',
+        url: `${prefix}/taNewsType`,
+        action: 'admin.taNewsType.get',
+      },
+    delete: {
+        method: 'DELETE',
+        url: `${prefix}/taNewsType/:id`,
+        action: 'admin.taNewsType.id.delete',
+    },
   },
   customer: {
     drift: {