资讯

config/config.js

                   name: '资讯列表',
                   component: './news/list/NewsList',
                 },
+                {
+                  path: '/news/list/editNewsList',
+                  name: '',
+                  component: './news/list/editNewsList',
+                },
               ],
             },
             {

src/components/SelectButton/NewTypeSelect.jsx

+import React, { useState, useEffect } from 'react';
+import { Select } from 'antd';
+
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const NewsTypeSelect = (props) => {
+  const [ data, setData ] = useState([])
+
+  useEffect(() => {
+    getCityList();
+  },[])
+
+  const getCityList = (e) => {
+    request({
+        url: '/api/admin/taNewsType',
+        method: 'GET',
+        params: {pageNum: 1,pageSize: 999},
+    }).then((data) => {
+        setData(data.records)
+    })
+  }
+
+  return (
+      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择类型" onChange={props.onChange}>
+          {data.map(type => (
+            <Option key={type.newsTypeId}>{type.newsTypeName}</Option>
+          ))}
+      </Select>
+  )
+}
+export default NewsTypeSelect
+

src/pages/news/list/NewsList.jsx

 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Modal, message, Card, Row, Col, Pagination, Alert } from 'antd';
 import moment from 'moment';
+import router from 'umi/router';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
+import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
 
 
 const { Option } = Select;
  */
 function CartBody(props) {
   const { data } = props
-  console.log(props);
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/news/list/NewsList',
+    });
+  }
+
+  // 查询列表
+  const getList = (params) => {
+    request({
+        url: '/api/admin/taNews',
+        method: 'GET',
+        params: { ...params },
+    }).then((data) => {
+        cancelPage();
+    })
+  }
+
+  //删除资讯
+  const changeNewsListStatus = (newsId) => () => {
+    Modal.confirm({
+      title: '确认删除该资讯？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({
+          url: '/api/admin/taNews/' + newsId,
+          method: 'DELETE',
+          // data: { ...row },
+        }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10 });
+        })
+      }
+    });
+  }
+
+  // 跳转到编辑资讯列表
+  const toEditList = (newsId) => ()  => {
+    router.push({
+      pathname: '/news/list/editNewsList',
+      query: {
+        newsId
+      },
+    });
+  }
+
   return (
           <Card
             hoverable
             <p className={Styles.cardText}>
               <span className={Styles.title}>资讯类型</span>
               <span >：{ data.newsType.newsTypeName }</span>
-              <span className={Styles.ediText}>
+              <span className={Styles.ediText} onClick={toEditList(data.newsId)}>
                 编辑
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
               </span>
             </p>
             <p className={Styles.cardText}>
               <span className={Styles.title}>状态</span>
-              <span >：{ data.status == 0 ? "已发布" : "未发布" }</span>
+              <span >：{ data.newsStatus == 0 ? "已发布" : "未发布" }</span>
             </p>
             <p className={Styles.cardItem}>
               <span className={Styles.title}>阅读数量</span>
             </p>
             <p className={Styles.cardItem}>
               <span className={Styles.title}>转发数量</span>
-              <span className={ Styles.address }>：{ data.shareNum }</span>
+              <span>：{ data.shareNum }</span>
             </p>
             <p className={Styles.cardItem}>
               <span className={Styles.title}>点赞数量</span>     
               </span>
               <span style={{
                 color: '#FF4A4A', position: 'absolute', right: '0',
-              }} >
+              }} onClick={changeNewsListStatus(data.newsId)}>
                 删除
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
               </span>
     });
   }
 
+  // 跳转到编辑资讯列表
+  const toEditList = (id) => ()  => {
+    router.push({
+      pathname: '/news/list/editNewsList',
+      query: {
+        id
+      },
+    });
+  }
+
+
   // Change 事件
   function handleSelectChange(e) {
     // eslint-disable-next-line no-console
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('type')(
-            <Select style={{ width: '180px' }} placeholder="咨询类型" onChange={handleSelectChange}>
-            </Select>,
+          {getFieldDecorator('buildingId')(
+            <NewsTypeSelect />,
           )}
         </Form.Item>       
         <Form.Item>
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={Styles.addButton}>
+      <Button type="primary" className={Styles.addButton} onClick={toEditList()}>
         新增
       </Button>
 

src/pages/news/list/editNewsList.jsx

+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 NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
+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 newsId = props.location.query.newsId
+  const [ dynamicData, setDynamicData ] = useState({})
+  if(newsId){
+    useEffect(() => {
+      getDynamicData(newsId);
+    },[])
+
+  // 查询列表
+  const getDynamicData = (newsId) => {
+    request({
+        url: '/api/admin/taNews/' + newsId,
+        method: 'GET',
+        params: { newsId },
+    }).then((data) => {
+        console.log(data)
+        setDynamicData(data)
+    })
+  }
+  }
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/news/list/NewsList',
+    });
+  }
+
+  const Basic = (props) => {
+    const fields = [
+      {
+        label: '意向项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: dynamicData.buildingId,
+        rules: [
+          {required: true, message: '请选择所属项目'},
+        ]
+      },
+      {
+        label: '资讯图片',
+        name: 'newsImg',
+        type: FieldTypes.ImageUploader,
+        value: dynamicData.newsImg,
+      },
+      {
+        label: '资讯标题',
+        name: 'newsName',
+        type: FieldTypes.Text,
+        value: dynamicData.newsName,
+        rules: [
+          {required: true, message: '请输入资讯标题'},
+        ]
+      },
+      {
+        label: '资讯类型',
+        name: 'newsTypeId',
+        render: <NewsTypeSelect />,
+        value: dynamicData.newsTypeId,
+        rules: [
+          {required: true, message: '请选择资讯类型'},
+        ]
+      },
+      {
+        label: '资讯详情',
+        name: 'desc',
+        render: <Wangedit />,
+        value: dynamicData.desc,
+      },
+    ]
+  
+    const handleSubmit = val => { 
+      let {...submitValue} = val
+      if(dynamicId){
+        submitValue.dynamicId = dynamicId
+        request({
+          url: '/api/admin/buildingDynamic/update',
+          method: 'PUT',
+          data: submitValue,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }else{
+        request({
+          url: '/api/admin/taNews',
+          method: 'POST',
+          data: submitValue,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    }
+    
+    return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  }
+  
+  const Poster = (props) => {
+   return <div>Poster</div>
+  }
+ 
+  const Share = (props) => {
+    return <div>Share</div>
+  }
+
+  return (
+    <div>
+      <div>
+        <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
+          <Radio.Button value="basic">基本信息</Radio.Button>
+          <Radio.Button value="poster">海报图片</Radio.Button>
+          <Radio.Button value="share">分享设置</Radio.Button>
+        </Radio.Group>
+      </div>
+      <div>
+        { tab === 'basic' && <Basic /> }
+        { tab === 'poster' && <Poster /> }
+        { tab === 'share' && <Share /> }
+      </div>
+    </div>
+  );
+ }
+
+
+
+export default Edit

src/pages/news/type/NewsType.jsx

   }
 
 
-  // 跳转到编辑咨询
+  // 跳转到编辑资讯
   const toEditNews = (id) => () => {
     router.push({
       pathname: '/news/type/editNews',