feats

config/routes.js

@@ -120,6 +120,17 @@ export default [
                 component: './property/notice/Edit',
                 hideInMenu: true,
               },
+              {
+                path: 'news-type',
+                name: '服务分类',
+                component: './property/news/type/NewsType'
+              },
+              {
+                path: 'news-type/edit',
+                name: '服务内容详情',
+                component: './property/news/type/editNews',
+                hideInMenu: true,
+              },
               {
                 path: 'news',
                 name: '服务内容',

src/pages/carouselFigure/editCarousel.jsx

@@ -179,10 +179,10 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
             label: '首页',
             value: 'index',
           },
-          {
-            label: '积分商城',
-            value: 'mall',
-          },
+          // {
+          //   label: '积分商城',
+          //   value: 'mall',
+          // },
           {
             label: '物业',
             value: 'property',

src/pages/news/type/NewsType.jsx

@@ -79,7 +79,7 @@ function NewsType(props) {
       dataIndex: 'newsTypeImg',
       key: 'newsTypeImg',
       align: 'center',
-      render: (text, record) => <img src={record.newsTypeImg} style={{ width: '165px', height: '104px' }} className={styles.touxiang} />,
+      render: (text, record) => <img src={record.newsTypeImg} className={styles.touxiang} />,
     },
     {
       title: '名称',

src/pages/news/type/style.less

@@ -38,8 +38,8 @@
     border-color: #3A91D5;
   }
   .touxiang {
-    width: 93px;
-    height: 93px;
+    width: 64px;
+    height: 64px;
   }
   .ant-table-column-title {
     font-weight: 600;

src/pages/property/news/type/NewsType.jsx

@@ -0,0 +1,147 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Button, message, Table, Pagination, Modal } from 'antd';
+import router from 'umi/router';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import { ConfirmButton } from '@/components/ModalButton';
+import apis from '@/services/apis';
+import request from '@/utils/request'
+import BuildSelect from '@/components/SelectButton/BuildSelect';
+import Navigate from '@/components/Navigate';
+
+function NewsType(props) {
+  // 获取初始化数据
+  const [data, setData] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  }, [])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.propNews.newsType.list, params: { ...params } }).then((data) => {
+      console.log(data)
+      setData(data)
+    })
+  }
+
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  const changePageNum = (pageNumber) => {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: pageNumber, pageSize: 10, ...values })
+      }
+    });
+  }
+
+
+  // 跳转到编辑资讯
+  const toEditNews = (id) => () => {
+    router.push({
+      pathname: '/property/news-type/edit',
+      query: {
+        id
+      },
+    });
+  }
+
+
+  const changeNewsStatus = (row, newsId) => () => {
+    request({ ...propNews.newsType.put, urlData: { id: newsId }, data: { ...row, status: -1 } }).then((data) => {
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10 });
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+  const columns = [
+    {
+      title: '类型图',
+      dataIndex: 'newsTypeImg',
+      key: 'newsTypeImg',
+      align: 'center',
+      render: (text, record) => <img src={record.newsTypeImg} style={{width: '72px', height: '72px'}} />,
+    },
+    {
+      title: '名称',
+      dataIndex: 'newsTypeName',
+      key: 'newsTypeName',
+      align: 'center',
+      render: (text, record) => <Navigate to={`/news/type/editNews?id=${record.newsTypeId}`}>{text}</Navigate>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: withActions((x, row) => [
+        <AuthButton name="admin.taNewsType.id.delete" noRight={null}>
+          <ConfirmButton type="link" title="确认删除？" onClick={changeNewsStatus(row, row.newsTypeId)}>
+            <EditIcon text="删除" type="delete" />
+          </ConfirmButton>
+        </AuthButton>,
+        <AuthButton name="admin.taNewsType.id.put" noRight={null}>
+          <EditIcon text="编辑" type="edit" onClick={toEditNews(row.newsTypeId)} />
+        </AuthButton>,
+      ]),
+    },
+  ];
+
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      {/* <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <AuthButton name="admin.taNewsType.search" noRight={null}>
+            <Button type="primary" htmlType="submit" >
+              搜索
+              </Button>
+          </AuthButton>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form> */}
+      <AuthButton name="admin.taNewsType.post" noRight={null}>
+        <Button type="primary" onClick={toEditNews()}>新增</Button>
+      </AuthButton>
+      <Table rowKey="newsType" 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} current={data.current} />
+      </div>
+    </>
+  )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(NewsType);
+
+export default WrappedHeader

src/pages/property/news/type/editNews.jsx

@@ -0,0 +1,80 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import router from 'umi/router';
+import apis from '@/services/apis';
+import request from '@/utils/request'
+import XForm, { FieldTypes } from '@/components/XForm';
+
+const { TextArea } = Input;
+const { Option } = Select;
+
+const header = props => {
+  const newsId = props.location.query.id
+  console.log("newsId" + newsId);
+  const [ newsData, setNewsData ] = useState({})
+  if(newsId){
+    useEffect(() => {
+      getNewsData(newsId);
+    },[])
+
+  // 查询列表
+  const getNewsData = (newsId) => {
+    request({
+        ...apis.propNews.newsType.get,
+        urlData: { id: newsId }
+    }).then((data) => {
+        setNewsData(data)
+    }).catch((err) => {
+      message.error(err.msg || err.message)
+    })
+  }
+  }
+
+  const fields = [
+    {
+      label: '类型图',
+      name: 'newsTypeImg',
+      type: FieldTypes.ImageUploader,
+      value: newsData.newsTypeImg,
+      help: '建议图片尺寸：660px*416px',
+    },
+    {
+      label: '名称',
+      name: 'newsTypeName',
+      type: FieldTypes.Text,
+      value: newsData.newsTypeName,
+      rules: [
+        {required: true, message: '请输入分类名称'},
+      ]
+    },
+  ]
+
+   
+  const handleSubmit = (values) => {
+    if(newsId){
+        values.newsTypeId = newsId
+        request({ ...apis.propNews.newsType.put, urlData: { id: newsId }, data: { ...values }}).then((data) => {
+          cancelPage();
+        }).catch((err) => {
+          message.error(err.msg || err.message)
+        })
+      }else{
+        request({ ...apis.propNews.newsType.post, data: { ...values } }).then((data) => {
+          cancelPage();
+        }).catch((err) => {
+          message.error(err.msg || err.message)
+        })
+      }
+  }
+
+  const cancelPage = () => {
+    router.go(-1);
+  }
+
+  return (
+    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  )
+}
+
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedNormalLoginForm

src/pages/property/news/type/style.less

@@ -0,0 +1,56 @@
+.searchBox {
+    font-size: 30px;
+    color: red;
+    display: flex;
+    display: flex;
+    justify-items: center;
+    align-items: center;
+    justify-content: space-between;
+    .searchItem {
+      min-width: 200px;
+      margin-right: 20px;
+      text-align: left;
+      .anticon-down {
+        float: right !important;
+      }
+    }
+  }
+  .addBtn {
+    padding: 0 30px;
+    height: 36px;
+    background-color: #50be00;
+    color: #fff;
+    margin: 30px 0;
+    border-color: #50be00;
+  }
+  .addBtn:focus {
+    color: #fff;
+    background-color: #50be00;
+    border-color: #50be00;
+  }
+  .searchBtn{
+   background-color: #3A91D5;
+   border-color: #3A91D5;
+  }
+  .searchBtn:focus {
+    color: #fff;
+    background-color: #3A91D5;
+    border-color: #3A91D5;
+  }
+  .touxiang {
+    width: 64px;
+    height: 64px;
+  }
+  .ant-table-column-title {
+    font-weight: 600;
+  }
+  .shoppingCart{
+    color: #dcdcdc;
+    margin-left: 6px;
+    font-size: 16px;
+  }
+  .edit{
+    color: #dcdcdc;
+    margin-left: 6px;
+    font-size: 15px;
+  }

src/services/prop_news_api.js

@@ -36,6 +36,34 @@ export default prefix => {
       url: `${prefix}/${moduleName}/id`,
       method: 'delete',
       action: `admin.${moduleName}.delete`
-    }
+    },
+    
+    newsType: {
+      list: {
+        method: 'GET',
+        url: `${prefix}/tpNewsType`,
+        action: 'admin.tpNewsType.get',
+      },
+      delete: {
+        method: 'DELETE',
+        url: `${prefix}/tpNewsType/:id`,
+        action: 'admin.tpNewsType.id.delete',
+      },
+      put: {
+        method: 'PUT',
+        url: `${prefix}/tpNewsType/:id`,
+        action: 'admin.tpNewsType.id.delete',
+      },
+      post: {
+        method: 'POST',
+        url: `${prefix}/tpNewsType`,
+        action: 'admin.tpNewsType.post',
+      },
+      get: {
+        method: 'GET',
+        url: `${prefix}/tpNewsType/:id`,
+        action: 'admin.tpNewsType.get',
+      }
+    },
   }
 }