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

config/config.js

@@ -299,7 +299,6 @@ export default {
                 },
               ],
             },
-
             {
               path: '/staff',
               name: '员工管理',
@@ -329,6 +328,33 @@ export default {
 
               ],
             },
+            {
+              path: '/carouselFigure',
+              name: '轮播图管理',
+              component: '../layouts/BlankLayout',
+              routes: [
+                {
+                  path: '/carouselFigure/carouselFigureList',
+                  name: '轮播图列表',
+                  component: './carouselFigure/carouselFigureList',
+                },
+                {
+                  path: '/carouselFigure/editCarousel',
+                  name: '',
+                  component: './carouselFigure/editCarousel',
+                },
+                {
+                  path: '/carouselFigure/advertisingList',
+                  name: '开屏广告',
+                  component: './carouselFigure/advertisingList',
+                },
+                {
+                  path: '/carouselFigure/editAdvertising',
+                  name: '',
+                  component: './carouselFigure/editAdvertising',
+                },
+              ],
+            },
             {
               component: './404',
             },
@@ -392,7 +418,7 @@ export default {
 
   proxy: {
     '/api/': {
-      target: 'http://192.168.0.11:8080/',
+      target: 'http://127.0.0.1:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

src/components/Wangedit/Wangedit.jsx

@@ -32,6 +32,7 @@ class Wangedit extends React.Component {
         this.props.onChange(html)
       }
     }
+    this.editor.customConfig.zIndex = 100
     this.editor.create()
     this.editor.txt.html(this.props.value)
   }

src/pages/carouselFigure/advertisingList.jsx

@@ -0,0 +1,230 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import router from 'umi/router';
+import moment from 'moment';
+import SelectCity from '../../components/SelectButton/CitySelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+
+import request from '../../utils/request'
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = (props) => {
+  const [ data, setData ] = useState({})
+//   const [page, changePage] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10, showType: 'screen' });
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({
+        url: '/api/admin/extendContent',
+        method: 'GET',
+        params: { ...params },
+    }).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+
+  
+// 跳转到编辑商品
+const toEdit = (contentId) => () => {
+    router.push({
+      pathname: '/carouselFigure/editAdvertising',
+      query: {
+        contentId
+      },
+    });
+  }
+  
+  const columns = [
+    {
+      title: '主图',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center',
+      render: (image) => <img src={image} className={styles.touxiang} />,
+    },
+    {
+      title: '类型',
+      dataIndex: 'contentType',
+      key: 'contentType',
+      align: 'center',
+      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : '' }</span>
+    },
+    {
+      title: '发布位置',
+      dataIndex: 'showPosition',
+      key: 'showPosition',
+      align: 'center',
+      render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : '' }</span>
+    },
+    {
+      title: '发布时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (x, row) => <><span>{moment(row.createDate).format('YYYY-MM-DD')}</span></>
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (status)=> <><span>{status == 1 ? '启用' : '停用'}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: (x,row) => <>
+                           <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={changeStatus(row)}>{ row.status === 1 ? '禁用' : '启用' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+                           <span style={{ color: '#FF925C' }} onClick={toEdit(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
+                         </>
+    },
+  ];
+  
+  const finishDynamic = (row) => {
+      Modal.confirm({
+          title: '结束以后将无法编辑, 是否继续?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk() {
+              request({
+                  url: '/api/admin/buildingDynamic/finish',
+                  method: 'PUT',
+                  data: {dynamicId: row.dynamicId, top: ""},
+              }).then((data) => {
+                  console.log(data)
+                  message.info('操作成功！')
+                  getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
+              }).catch((err) => {
+                  console.log(err)
+                  message.info(err.msg || err.message)
+              })
+          },
+        });
+  }
+  
+//   停用启用
+  const changeStatus = (row) => () => {
+      console.log(row)
+      if(row.status === 0) {
+        row.status = 1
+        Modal.confirm({
+          title: '确认发布此数据?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk() {
+              request({
+                  url: '/api/admin/extendContent/'+row.contentId,
+                  method: 'PUT',
+                  data: row,
+              }).then((data) => {
+                  message.info('操作成功！')
+                  getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
+              }).catch((err) => {
+                  console.log(err)
+                  message.info(err.msg || err.message)
+              })
+          },
+        });
+      }else if(row.status === 1){
+        row.status = 0
+        Modal.confirm({
+          title: '确认停用此轮播图?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk() {
+              request({
+                  url: '/api/admin/extendContent/'+row.contentId,
+                  method: 'PUT',
+                  data: row,
+              }).then((data) => {
+                  message.info('操作成功！')
+                  getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
+              }).catch((err) => {
+                  console.log(err)
+                  message.info(err.msg || err.message)
+              })
+          },
+        });
+      }
+
+  }
+  
+  const changePageNum = (pageNumber) => {
+      getList({ pageNum: pageNumber, pageSize: 10, showType: 'screen' })
+  }
+
+  // 提交事件
+const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values, showType: 'screen' })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('contentType')(
+            <Select style={{ width: '180px' }} placeholder="类型">
+              <Option value="activity">活动</Option>
+              <Option value="project">项目</Option>
+              <Option value="news">资讯</Option>
+              <Option value="other">其他</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('showPosition')(
+            <Select style={{ width: '180px' }} placeholder="发布位置">
+              <Option value="mall">商城</Option>
+              <Option value="index">首页</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态">
+              <Option value="1">启用</Option>
+              <Option value="0">停用</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+            搜索
+          </Button>
+        </Form.Item>
+      </Form>
+      <Button type="primary" className={styles.addBtn} onClick={toEdit()}>新增</Button>
+      <Table dataSource={data.records} columns={columns} pagination={false}/>
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/carouselFigure/carouselFigureList.jsx

@@ -0,0 +1,230 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import router from 'umi/router';
+import moment from 'moment';
+import SelectCity from '../../components/SelectButton/CitySelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+
+import request from '../../utils/request'
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = (props) => {
+  const [ data, setData ] = useState({})
+//   const [page, changePage] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({
+        url: '/api/admin/extendContent',
+        method: 'GET',
+        params: { ...params },
+    }).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+
+  
+// 跳转到编辑页面
+const toEditCarouse = (contentId) => () => {
+    router.push({
+      pathname: '/carouselFigure/editCarousel',
+      query: {
+        contentId
+      },
+    });
+  }
+  
+  const columns = [
+    {
+      title: '主图',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center',
+      render: (image) => <img src={image} className={styles.touxiang} />,
+    },
+    {
+      title: '类型',
+      dataIndex: 'contentType',
+      key: 'contentType',
+      align: 'center',
+      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : '' }</span>
+    },
+    {
+      title: '发布位置',
+      dataIndex: 'showPosition',
+      key: 'showPosition',
+      align: 'center',
+      render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : '' }</span>
+    },
+    {
+      title: '发布时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (x, row) => <><span>{moment(row.createDate).format('YYYY-MM-DD')}</span></>
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (status)=> <><span>{status == 1 ? '启用' : '停用'}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: (x,row) => <>
+                           <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={changeStatus(row)}>{ row.status === 1 ? '禁用' : '启用' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+                           <span style={{ color: '#FF925C' }} onClick={toEditCarouse(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
+                         </>
+    },
+  ];
+  
+  const finishDynamic = (row) => {
+      Modal.confirm({
+          title: '结束以后将无法编辑, 是否继续?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk() {
+              request({
+                  url: '/api/admin/buildingDynamic/finish',
+                  method: 'PUT',
+                  data: {dynamicId: row.dynamicId, top: ""},
+              }).then((data) => {
+                  console.log(data)
+                  message.info('操作成功！')
+                  getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
+              }).catch((err) => {
+                  console.log(err)
+                  message.info(err.msg || err.message)
+              })
+          },
+        });
+  }
+  
+//   停用启用
+  const changeStatus = (row) => () => {
+      console.log(row)
+      if(row.status === 0) {
+        row.status = 1
+        Modal.confirm({
+          title: '确认发布此数据?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk() {
+              request({
+                  url: '/api/admin/extendContent/'+row.contentId,
+                  method: 'PUT',
+                  data: row,
+              }).then((data) => {
+                  message.info('操作成功！')
+                  getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
+              }).catch((err) => {
+                  console.log(err)
+                  message.info(err.msg || err.message)
+              })
+          },
+        });
+      }else if(row.status === 1){
+        row.status = 0
+        Modal.confirm({
+          title: '确认停用此轮播图?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk() {
+              request({
+                  url: '/api/admin/extendContent/'+row.contentId,
+                  method: 'PUT',
+                  data: row,
+              }).then((data) => {
+                  message.info('操作成功！')
+                  getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
+              }).catch((err) => {
+                  console.log(err)
+                  message.info(err.msg || err.message)
+              })
+          },
+        });
+      }
+
+  }
+  
+  const changePageNum = (pageNumber) => {
+      getList({ pageNum: pageNumber, pageSize: 10, showType: 'banner' })
+  }
+
+  // 提交事件
+const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values, showType: 'banner' })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('contentType')(
+            <Select style={{ width: '180px' }} placeholder="类型">
+              <Option value="activity">活动</Option>
+              <Option value="project">项目</Option>
+              <Option value="news">资讯</Option>
+              <Option value="other">其他</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('showPosition')(
+            <Select style={{ width: '180px' }} placeholder="发布位置">
+              <Option value="mall">商城</Option>
+              <Option value="index">首页</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态">
+              <Option value="1">启用</Option>
+              <Option value="0">停用</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+            搜索
+          </Button>
+        </Form.Item>
+      </Form>
+      <Button type="primary" className={styles.addBtn} onClick={toEditCarouse()}>新增</Button>
+      <Table dataSource={data.records} columns={columns} pagination={false}/>
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/carouselFigure/editAdvertising.jsx

@@ -0,0 +1,155 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit'
+import request from '../../utils/request'
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+ const Edit = (props) => {
+  const [ tab, changeTab ] = useState('basic')
+  const contentId = props.location.query.contentId
+  const [ data, setData ] = useState({})
+  if(contentId){
+    useEffect(() => {
+      getDetail(contentId);
+    },[])
+
+  // 查询列表
+  const getDetail = (contentId) => {
+    request({
+        url: '/api/admin/extendContent/' + contentId,
+        method: 'GET',
+    }).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+  }
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/carouselFigure/advertisingList',
+    });
+  }
+ 
+    const fields = [
+      {
+        label: '所属项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: data.buildingId,
+      },
+      {
+        label: '商品图片',
+        name: 'image',
+        type: FieldTypes.ImageUploader,
+        value: data.image,
+      },
+      {
+        label: '标题',
+        name: 'title',
+        type: FieldTypes.Text,
+        value: data.title,
+      },
+      // {
+      //   label: '发布位置',
+      //   name: 'showPosition',
+      //   type: FieldTypes.Select,
+      //   dict: [{
+      //     label: '首页',
+      //     value: 'index'
+      //   },
+      //   {
+      //     label: '商城',
+      //     value: 'mall'
+      //   }],
+      //   value: data.showPosition,
+      // },
+      {
+        label: '类型',
+        name: 'contentType',
+        type: FieldTypes.Select,
+        dict: [{
+          label: '活动',
+          value: 'activity'
+        },
+        {
+          label: '项目',
+          value: 'project'
+        },
+        {
+          label: '资讯',
+          value: 'news'
+        },
+        {
+          label: '其他',
+          value: 'other'
+        }],
+        value: data.contentType,
+      },
+      // {
+      //   label: '发布内容',
+      //   name: 'content',
+      //   render: <Wangedit />,
+      //   value: data.content,
+      // },
+      {
+        label: '状态',
+        name: 'status',
+        type: FieldTypes.Select,
+        dict: [{
+          label: "启用",
+          value: 1
+        },
+        {
+          label: "停用",
+          value: 0
+        },],
+        value: data.status != null ? data.status : 1,
+      },
+    ]
+  
+    const handleSubmit = val => { 
+      val.showType = 'screen'
+      if(contentId){
+        request({
+          url: '/api/admin/extendContent/'+contentId,
+          method: 'PUT',
+          data: val,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }else{
+        request({
+          url: '/api/admin/extendContent',
+          method: 'POST',
+          data: val,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    }
+
+  return (
+    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  );
+ }
+
+
+
+export default Edit

src/pages/carouselFigure/editCarousel.jsx

@@ -0,0 +1,155 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit'
+import request from '../../utils/request'
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+ const Edit = (props) => {
+  const [ tab, changeTab ] = useState('basic')
+  const contentId = props.location.query.contentId
+  const [ data, setData ] = useState({})
+  if(contentId){
+    useEffect(() => {
+      getDetail(contentId);
+    },[])
+
+  // 查询列表
+  const getDetail = (contentId) => {
+    request({
+        url: '/api/admin/extendContent/' + contentId,
+        method: 'GET',
+    }).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+  }
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/carouselFigure/carouselFigureList',
+    });
+  }
+ 
+    const fields = [
+      {
+        label: '所属项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: data.buildingId,
+      },
+      {
+        label: '商品图片',
+        name: 'image',
+        type: FieldTypes.ImageUploader,
+        value: data.image,
+      },
+      {
+        label: '标题',
+        name: 'title',
+        type: FieldTypes.Text,
+        value: data.title,
+      },
+      {
+        label: '发布位置',
+        name: 'showPosition',
+        type: FieldTypes.Select,
+        dict: [{
+          label: '首页',
+          value: 'index'
+        },
+        {
+          label: '商城',
+          value: 'mall'
+        }],
+        value: data.showPosition,
+      },
+      {
+        label: '类型',
+        name: 'contentType',
+        type: FieldTypes.Select,
+        dict: [{
+          label: '活动',
+          value: 'activity'
+        },
+        {
+          label: '项目',
+          value: 'project'
+        },
+        {
+          label: '资讯',
+          value: 'news'
+        },
+        {
+          label: '其他',
+          value: 'other'
+        }],
+        value: data.contentType,
+      },
+      {
+        label: '发布内容',
+        name: 'content',
+        render: <Wangedit />,
+        value: data.content,
+      },
+      {
+        label: '状态',
+        name: 'status',
+        type: FieldTypes.Select,
+        dict: [{
+          label: "启用",
+          value: 1
+        },
+        {
+          label: "停用",
+          value: 0
+        },],
+        value: data.status != null ? data.status : 1,
+      },
+    ]
+  
+    const handleSubmit = val => { 
+      val.showType = 'banner'
+      if(contentId){
+        request({
+          url: '/api/admin/extendContent/'+contentId,
+          method: 'PUT',
+          data: val,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }else{
+        request({
+          url: '/api/admin/extendContent',
+          method: 'POST',
+          data: val,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    }
+
+  return (
+    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  );
+ }
+
+
+
+export default Edit

src/pages/news/list/NewsList.jsx

@@ -21,7 +21,7 @@ const tempDate = [{ code: 's101' }]
  */
 function CartBody(props) {
   const { data } = props
-
+  console.log(data);
   const cancelPage = () =>{
     router.push({
       pathname: '/news/list/NewsList',
@@ -66,6 +66,29 @@ function CartBody(props) {
         newsId
       },
     });
+  } 
+
+  function cancelRelease (newsId, newsStatus, buildingId,newsTypeId) {
+    console.log("newsId" + newsId + "status" + newsStatus);
+    Modal.confirm({
+      title: '确认发布或取消该资讯？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk () {
+        request({
+          url: '/api/admin/taNews/' + newsId,
+          method: 'PUT',
+          data: { "newsStatus": newsStatus, "buildingId":buildingId, "newsTypeId":newsTypeId },
+        }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10 });
+        })
+      },
+      onCancel () {
+        console.log('Cancel');
+      },
+    });
+  
   }
 
   return (
@@ -108,10 +131,17 @@ function CartBody(props) {
               <span >：{ data.createDate }</span>
             </p>
             <p style={{ margin: '15px 0', position: 'relative', fontSize: '18px' }}>
-              <span style={{ color: '#1990FF' }}>
-                取消发布
-                <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+              {data.newsStatus === 0 ? 
+              <span style={{ color: '#1990FF' }} onClick={cancelRelease.bind(this,data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
+              取消发布
+              <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+              </span>:
+              <span style={{ color: '#1990FF' }} onClick={cancelRelease.bind(this,data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
+              发布
+              <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
               </span>
+              }
+              
               <span style={{
                 color: '#FF4A4A', position: 'absolute', right: '0',
               }} onClick={changeNewsListStatus(data.newsId)}>

src/pages/news/list/editNewsList.jsx

@@ -90,10 +90,10 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
   
     const handleSubmit = val => { 
       let {...submitValue} = val
-      if(dynamicId){
-        submitValue.dynamicId = dynamicId
+      if(newsId){
+        submitValue.newsId = newsId
         request({
-          url: '/api/admin/buildingDynamic/update',
+          url: '/api/admin/taNews/' + newsId,
           method: 'PUT',
           data: submitValue,
         }).then((data) => {