csm

config/routes.js

@@ -62,13 +62,6 @@ export default [
         access: 'cmstype',
         component: './ContentManagementSystem/InformationClassification',
       },
-      {
-        path: '/ContentManagementSystem/InformationClassification/InformationClassificationEdit',
-        name: '资讯分类编辑',
-        component:
-          './ContentManagementSystem/InformationClassification/InformationClassificationEdit',
-        hideInMenu: true,
-      },
       {
         path: '/ContentManagementSystem/InformationList',
         name: '资讯列表',
@@ -76,9 +69,9 @@ export default [
         component: './ContentManagementSystem/InformationList',
       },
       {
-        path: '/ContentManagementSystem/InformationList/InformationListEdit',
+        path: '/ContentManagementSystem/InformationList/edit.jsx',
         name: '资讯列表编辑',
-        component: './ContentManagementSystem/InformationList/InformationListEdit',
+        component: './ContentManagementSystem/InformationList/edit.jsx',
         hideInMenu: true,
       },
       {

src/pages/ContentManagementSystem/Advertisement/edit.jsx

@@ -1,10 +1,11 @@
-import { Input, Card, Select, Button, message, Upload, Modal } from 'antd';
+import { Input, Card, Select, Button, message, InputNumber, Modal } from 'antd';
 import { useEffect, useState } from 'react';
 import { Form } from 'antd';
 import { history } from 'umi';
 import ProCard from '@ant-design/pro-card';
 import { UploadImage } from '@/components/Upload';
 import ExtendContent from '@/components/ExtendContent';
+import { addBanner, updateBanner } from '@/services/ad';
 
 const { Option } = Select;
 const goBack = () => {
@@ -12,6 +13,8 @@ const goBack = () => {
 };
 const FormItem = Form.Item;
 export default (props) => {
+  const { data } = props.location;
+
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
   const [image, setImage] = useState();
@@ -23,13 +26,40 @@ export default (props) => {
   };
 
   const Submit = (values) => {
-    message.success(`成功成功成功`);
+    setLoading(true);
+    if (data) {
+      updateBanner(data.bannerId, values)
+        .then(() => {
+          setLoading(false);
+          message.success('数据更新成功');
+          goBack();
+        })
+        .catch((err) => {
+          setLoading(false);
+          message.error(err.message || err);
+        });
+    } else {
+      addBanner(values)
+        .then((res) => {
+          setLoading(false);
+          message.success('数据保存成功');
+          goBack();
+        })
+        .catch((err) => {
+          setLoading(false);
+          message.error(err.message || err);
+        });
+    }
   };
-
+  useEffect(() => {
+    if (data) {
+      form.setFieldsValue(data);
+    }
+  }, [data]);
   return (
     <Card>
       <ProCard tabs={{ type: 'card' }} style={{ marginTop: '16px' }}>
-        <ProCard.TabPane key={1} tab="资讯管理">
+        <ProCard.TabPane key={1} tab="广告位管理">
           <Form {...formItemLayout} onFinish={Submit} form={form}>
             <FormItem label="名称" name="title" rules={[{ required: true, message: '请输入' }]}>
               <Input placeholder="请输入" style={{ width: '350px' }} />
@@ -38,19 +68,28 @@ export default (props) => {
               <UploadImage value={image} onChange={setImage} />
             </FormItem>
             <FormItem label="位置" name="position" rules={[{ required: true, message: '请选择' }]}>
-              <Select>
-                <Option value="index">首次引导页</Option>
-                <Option value="index">app启动页</Option>
-                <Option value="banner">banner</Option>
+              <Select style={{ width: '350px' }}>
+                <Option value="index" key="index">
+                  首次引导页
+                </Option>
+                <Option value="appIndex" key="appIndex">
+                  app启动页
+                </Option>
+                <Option value="banner" key="banner">
+                  轮播图
+                </Option>
               </Select>
             </FormItem>
-            <FormItem label="详细信息" colon={false}>
+            <FormItem label="排序" name="sortNo" rules={[{ required: true, message: '请输入' }]}>
+              <InputNumber min={0} placeholder="请输入排序" style={{ width: '350px' }} />
+            </FormItem>
+            {/* <FormItem label="详细信息" colon={false}>
               <ExtendContent
                 targetType="tourist"
                 targetId={'66'}
                 onCancel={() => history.goBack()}
               />
-            </FormItem>
+            </FormItem> */}
             <FormItem label=" " colon={false}>
               <Button type="default" onClick={() => goBack()}>
                 返回

src/pages/ContentManagementSystem/Advertisement/index.jsx

@@ -1,54 +1,54 @@
 import { history, Link } from 'umi';
 import { useRef } from 'react';
-import { Button, Modal, message, Popconfirm, Tooltip } from 'antd';
-import { PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons';
+import { Button, Modal, message, Popconfirm } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import ProTable, { TableDropdown } from '@ant-design/pro-table';
+import PageTable from '@/components/PageTable';
+import { getBannerList, deleteBanner } from '@/services/ad';
+import moment from 'moment';
 
+const formatterTime = (val) => {
+  return val && val !== '-' ? moment(val).format('YYYY-MM-DD') : '-';
+};
 export default (props) => {
-  const dataSource = [
-    {
-      id: 9,
-      key: '1',
-      name: '胡彦斌',
-      age: 32,
-      zz: '西湖区湖底公园1号',
-      status: 1,
-    },
-  ];
-
-  // 测试内容👆-------------------------
-
   const actionRef = useRef();
-  const gotoDetail = (id) => {
-    history.push(`Advertisement/edit.jsx`);
+  const gotoEdit = (val) => {
+    if (val) {
+      history.push({ pathname: `Advertisement/edit.jsx`, data: val });
+    } else {
+      history.push(`Advertisement/edit.jsx`);
+    }
   };
 
   const handleDelete = (e) => {
-    deleteNote(e.noteId).then((res) => {
+    deleteBanner(e).then((res) => {
       message.success('删除成功');
       actionRef.current.reload();
     });
   };
-
   const handleOK = (record, data) => {
-    const titleCourse = record.status
-      ? '您确定要禁用该用户吗? 禁用后该用户不能在后台登陆!'
-      : '您确定要启用该用户吗? 启用后该用户将允许在后台登陆!';
+    const title = record.status
+      ? '您确定要将该banner状态变更为未发布吗? 变更后该banner将不在移动端显示'
+      : '您确定要将该banner状态变更为发布吗? 发布后该banner可以在移动端显示';
     Modal.confirm({
-      title: titleCourse,
+      title: title,
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        publishNote(record.noteId, record.status ? 'off' : 'on').then((res) => {
-          message.success('操作成功');
-          actionRef.current.reload();
-        });
+        updateNews(record.newsId, { ...record, status: record.status === 1 ? 0 : 1 })
+          .then((res) => {
+            message.success('操作成功');
+            actionRef.current.reload();
+          })
+          .catch((err) => {
+            message.error(err);
+          });
       },
     });
   };
+
   const actions = () => [
-    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoDetail()}>
+    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoEdit()}>
       新增
     </Button>,
   ];
@@ -57,50 +57,46 @@ export default (props) => {
       title: '名称',
       key: 'title',
       dataIndex: 'title',
-      search: false,
     },
     {
       title: '图片',
       key: 'thumb',
       dataIndex: 'thumb',
-      search: false,
       render: (t) => <img width={110} src={t} alt="" />,
     },
     {
       title: '位置',
       key: 'position',
       dataIndex: 'position',
-      search: false,
+      render: (_, record) => {
+        return record.position === 'index'
+          ? '首次引导页'
+          : record.position === 'appIndex'
+          ? 'app启动页'
+          : '轮播图';
+      },
+    },
+    {
+      title: '排序',
+      key: 'sortNo',
+      dataIndex: 'sortNo',
+    },
+    {
+      title: '创建时间',
+      key: 'createDate',
+      dataIndex: 'createDate',
+      render: formatterTime,
     },
     {
       title: '状态',
       dataIndex: 'status',
-      // initialValue: 'all',
       key: 'status',
-      valueEnum: {
-        0: { text: '已发布', status: 'Success' },
-        1: { text: '未发布', status: 'Error' },
+      width: 100,
+      render: (_, record) => {
+        return record.status === 1 ? '发布' : '未发布';
       },
     },
 
-    {
-      title: (
-        <>
-          创建时间
-          <Tooltip placement="top">
-            <QuestionCircleOutlined style={{ marginLeft: 4 }} />
-          </Tooltip>
-        </>
-      ),
-      // hideInTable: true,
-      search: false,
-
-      key: 'createdAt',
-      dataIndex: 'createdAt',
-      valueType: 'date',
-      // render: (t) => formatterTime(t),
-      sorter: (a, b) => a.createdAt - b.createdAt, //时间排序
-    },
     {
       title: '操作',
       valueType: 'option',
@@ -108,17 +104,22 @@ export default (props) => {
       ellipsis: true,
       width: 200,
       render: (_, record) => [
-        <Link key={2} to={`Advertisement/edit.jsx`}>
+        <Button style={{ padding: 0 }} type="link" key={1} onClick={() => handleOK(record)}>
+          {record.status === 0 ? '发布' : '取消发布'}
+        </Button>,
+        <Button style={{ padding: 0 }} type="link" key={2} onClick={() => gotoEdit(record)}>
           编辑
-        </Link>,
+        </Button>,
         <Popconfirm
           key={3}
           title="您是否确认删除 ?"
-          onConfirm={() => handleDelete(record)}
+          onConfirm={() => handleDelete(record.bannerId)}
           okText="确定"
           cancelText="取消"
         >
-          <a href="#">删除</a>
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
         </Popconfirm>,
       ],
     },
@@ -126,11 +127,10 @@ export default (props) => {
 
   return (
     <PageHeaderWrapper>
-      <ProTable
-        dataSource={dataSource}
+      <PageTable
         columns={columns}
-        // request={getNoteList} 请求
-        // rowKey="noteId"
+        request={getBannerList}
+        rowKey="bannerId"
         search={false}
         options={false}
         toolBarRender={actions}

src/pages/ContentManagementSystem/InformationClassification/InformationClassificationEdit/index.jsx

@@ -1,50 +0,0 @@
-import { Input, Card, Select, Button, message } from 'antd';
-import { useEffect, useState } from 'react';
-import { Form } from 'antd';
-import { history } from 'umi';
-import ProCard from '@ant-design/pro-card';
-
-const { Option } = Select;
-const goBack = () => {
-  history.goBack();
-};
-const FormItem = Form.Item;
-export default (props) => {
-  const [form] = Form.useForm();
-  const [loading, setLoading] = useState(false);
-
-  const formItemLayout = {
-    //布局
-    labelCol: { span: 6 },
-    wrapperCol: { span: 14 },
-  };
-
-  const Submit = (values) => {};
-
-  return (
-    <Card>
-      <ProCard tabs={{ type: 'card' }} style={{ marginTop: '16px' }}>
-        <ProCard.TabPane key={1} tab="资讯管理">
-          <Form {...formItemLayout} onFinish={Submit} form={form}>
-            <FormItem label="分类名" name="name" rules={[{ required: true, message: '请输入' }]}>
-              <Input placeholder="请输入" style={{ width: '350px' }} />
-            </FormItem>
-            <FormItem label=" " colon={false}>
-              <Button type="default" onClick={() => goBack()}>
-                返回
-              </Button>
-              <Button
-                type="primary"
-                loading={loading}
-                htmlType="Submit"
-                style={{ marginLeft: '4em' }}
-              >
-                保存
-              </Button>
-            </FormItem>
-          </Form>
-        </ProCard.TabPane>
-      </ProCard>
-    </Card>
-  );
-};

src/pages/ContentManagementSystem/InformationList/InformationListEdit/index.jsx

@@ -1,77 +0,0 @@
-import { Input, Card, Select, Button, Form, message } from 'antd';
-import { useEffect, useState } from 'react';
-import { history } from 'umi';
-import ProCard from '@ant-design/pro-card';
-import ExtendContent from '@/components/ExtendContent';
-import { UploadImage } from '@/components/Upload';
-
-const { Option } = Select;
-const goBack = () => {
-  history.goBack();
-};
-const FormItem = Form.Item;
-export default (props) => {
-  const [form] = Form.useForm();
-  const [loading, setLoading] = useState(false);
-  const [image, setImage] = useState();
-
-  const formItemLayout = {
-    //布局
-    labelCol: { span: 6 },
-    wrapperCol: { span: 14 },
-  };
-
-  const Submit = (values) => {};
-
-  return (
-    <Card>
-      <ProCard tabs={{ type: 'card' }} style={{ marginTop: '16px' }}>
-        <ProCard.TabPane key={1} tab="资讯管理">
-          <Form {...formItemLayout} onFinish={Submit} form={form}>
-            <FormItem label="资讯分类" name="user" rules={[{ required: true, message: '请选择' }]}>
-              <Select
-                placeholder="请选择"
-                // onChange={onGenderChange}
-                allowClear
-                style={{ width: '350px' }}
-              >
-                <Option value="nongji">一分类</Option>
-                <Option value="nonghu">二分类</Option>
-              </Select>
-            </FormItem>
-            <FormItem
-              label="资讯名称"
-              name="shopName"
-              rules={[{ required: true, message: '请输入' }]}
-            >
-              <Input placeholder="请输入" style={{ width: '350px' }} />
-            </FormItem>
-            <FormItem label="资讯封面" name="thumb" rules={[{ required: true, message: '请输入' }]}>
-              <UploadImage value={image} onChange={setImage} />
-            </FormItem>
-            <FormItem label="详细信息" colon={false}>
-              <ExtendContent
-                targetType="tourist"
-                targetId={'66'}
-                onCancel={() => history.goBack()}
-              />
-            </FormItem>
-            <FormItem label=" " colon={false}>
-              <Button type="default" onClick={() => goBack()}>
-                返回
-              </Button>
-              <Button
-                type="primary"
-                loading={loading}
-                htmlType="Submit"
-                style={{ marginLeft: '4em' }}
-              >
-                保存
-              </Button>
-            </FormItem>
-          </Form>
-        </ProCard.TabPane>
-      </ProCard>
-    </Card>
-  );
-};

src/pages/ContentManagementSystem/InformationList/edit.jsx

@@ -0,0 +1,122 @@
+import { Input, Card, Select, Button, Form, InputNumber, message } from 'antd';
+import { useEffect, useState } from 'react';
+import { history } from 'umi';
+import ProCard from '@ant-design/pro-card';
+import ExtendContent from '@/components/ExtendContent';
+import { UploadImage } from '@/components/Upload';
+import { getNewsTypeList } from '@/services/newsType';
+import { addNews, updateNews, getNewsDetail } from '@/services/news';
+
+const { Option } = Select;
+const goBack = () => {
+  history.goBack();
+};
+const FormItem = Form.Item;
+export default (props) => {
+  const { location } = props;
+  const { id } = location.query;
+  const [form] = Form.useForm();
+  const [loading, setLoading] = useState(false);
+  const [newsTypeList, setNewsTypeList] = useState([]);
+
+  const formItemLayout = {
+    //布局
+    labelCol: { span: 6 },
+    wrapperCol: { span: 14 },
+  };
+
+  const Submit = (data) => {
+    setLoading(true);
+    if (id) {
+      updateNews(id, data)
+        .then(() => {
+          setLoading(false);
+          message.success('数据更新成功');
+          goBack();
+        })
+        .catch((err) => {
+          setLoading(false);
+          message.error(err.message || err);
+        });
+    } else {
+      addNews(data)
+        .then((res) => {
+          setLoading(false);
+          message.success('数据保存成功');
+          history.replace(`./edit.jsx?id=${res.newsId}`);
+        })
+        .catch((err) => {
+          setLoading(false);
+          message.error(err.message || err);
+        });
+    }
+  };
+  useEffect(() => {
+    getNewsTypeList().then((res) => {
+      setNewsTypeList(res.records);
+    });
+  }, []);
+  useEffect(() => {
+    if (id) {
+      getNewsDetail(id).then((res) => {
+        form.setFieldsValue(res);
+      });
+    }
+  }, [id]);
+  return (
+    <Card>
+      <ProCard tabs={{ type: 'card' }} style={{ marginTop: '16px' }}>
+        <ProCard.TabPane key={1} tab="资讯管理">
+          <Form {...formItemLayout} onFinish={Submit} form={form}>
+            <FormItem label="标题" name="title" rules={[{ required: true, message: '请输入' }]}>
+              <Input placeholder="请输入" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem
+              label="资讯分类"
+              name="typeId"
+              rules={[{ required: true, message: '请选择' }]}
+            >
+              <Select placeholder="请选择" allowClear style={{ width: '350px' }}>
+                {newsTypeList.map((item) => (
+                  <Option value={item.typeId} key={item.typeId}>
+                    {item.name}
+                  </Option>
+                ))}
+              </Select>
+            </FormItem>
+            <FormItem label="封面" name="thumb" rules={[{ required: true, message: '请输入' }]}>
+              <UploadImage />
+            </FormItem>
+            <FormItem label="权重" name="weight" rules={[{ required: true, message: '请输入' }]}>
+              <InputNumber min={0} placeholder="请输入权重" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem label="状态" name="status" rules={[{ required: true, message: '请选择' }]}>
+              <Select placeholder="请选择是否发布" style={{ width: '350px' }}>
+                <Option value={1}>发布</Option>
+                <Option value={0}>未发布</Option>
+              </Select>
+            </FormItem>
+            {id && (
+              <FormItem label="详细信息" colon={false}>
+                <ExtendContent targetType="info" targetId={id} onCancel={() => history.goBack()} />
+              </FormItem>
+            )}
+            <FormItem label=" " colon={false}>
+              <Button type="default" onClick={() => goBack()}>
+                返回
+              </Button>
+              <Button
+                type="primary"
+                loading={loading}
+                htmlType="Submit"
+                style={{ marginLeft: '4em' }}
+              >
+                保存
+              </Button>
+            </FormItem>
+          </Form>
+        </ProCard.TabPane>
+      </ProCard>
+    </Card>
+  );
+};

src/pages/ContentManagementSystem/InformationList/index.jsx

@@ -1,107 +1,147 @@
-import { history, Link } from 'umi';
-import { useRef } from 'react';
-import { Button, Modal, message, Popconfirm, Tooltip } from 'antd';
-import { PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons';
+import React, { useRef, useEffect, useState } from 'react';
+import { history } from 'umi';
+import { Button, Popconfirm, message, Select, Modal } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import ProTable, { TableDropdown } from '@ant-design/pro-table';
+import PageTable from '@/components/PageTable';
+import moment from 'moment';
+import { getNewsList, deleteNews, updateNews } from '@/services/news';
+import { getNewsTypeList } from '@/services/newsType';
 
-export default (props) => {
-  const dataSource = [
-    {
-      status: 0,
-      key: '1',
-      name: '胡彦斌',
-      age: 32,
-      zz: '西湖区湖底公园1号',
-    },
-  ];
-
-  // 测试内容👆-------------------------
+const formatterTime = (val) => {
+  return val && val !== '-' ? moment(val).format('YYYY-MM-DD') : '-';
+};
+const { Option } = Select;
 
+export default (props) => {
   const actionRef = useRef();
-  const gotoDetail = (id) => {
-    history.push(`InformationList/InformationListEdit`);
-  };
+  const [newsTypeList, setNewsTypeList] = useState([]);
 
-  const handleDelete = (e) => {
-    deleteNote(e.noteId).then((res) => {
+  const gotoEdit = (id) => {
+    const queryStr = id ? `?id=${id}` : '';
+    history.push(`./informationList/edit.jsx${queryStr}`);
+  };
+  const handleDelete = (id) => {
+    deleteNews(id).then(() => {
       message.success('删除成功');
       actionRef.current.reload();
     });
   };
-
+  //列表切换资讯状态方法
+  const handleOK = (record, data) => {
+    const title = record.status
+      ? '您确定要将该资讯状态变更为未发布吗? 变更后该资讯将不在移动端显示'
+      : '您确定要将该资讯状态变更为发布吗? 发布后该资讯可以在移动端显示';
+    Modal.confirm({
+      title: title,
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        updateNews(record.newsId, { ...record, status: record.status === 1 ? 0 : 1 })
+          .then((res) => {
+            message.success('操作成功');
+            actionRef.current.reload();
+          })
+          .catch((err) => {
+            message.error(err);
+          });
+      },
+    });
+  };
+  useEffect(() => {
+    getNewsTypeList().then((res) => {
+      setNewsTypeList(res.records);
+    });
+  }, []);
   const actions = () => [
-    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoDetail()}>
+    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoEdit()}>
       新增
     </Button>,
   ];
-
   const columns = [
     {
-      title: '分类名',
-      key: 'name',
-      dataIndex: 'name',
-      search: false,
+      title: '标题',
+      dataIndex: 'title',
+      key: 'title',
+    },
+    {
+      title: '资讯类型',
+      dataIndex: 'typeId',
+      key: 'typeId',
+      renderFormItem: (item, field, form) => {
+        return (
+          <Select style={{ width: '350px' }}>
+            {newsTypeList.map((item) => (
+              <Option value={item.typeId} key={item.typeId}>
+                {item.name}
+              </Option>
+            ))}
+          </Select>
+        );
+      },
+      hideInTable: true,
     },
     {
-      title: '资讯标题',
-      dataIndex: 'zz',
-      key: 'zz',
+      title: '资讯分类',
+      dataIndex: 'typeName',
+      key: 'typeName',
       search: false,
+      width: 240,
     },
     {
       title: '封面',
-      key: 'thumb',
       dataIndex: 'thumb',
+      key: 'thumb',
+      width: 150,
+      render: (t) => <img width={110} src={t} alt="" />,
       search: false,
-      render: (t) => <img src={t} alt="" width={110} />,
     },
     {
-      title: (
-        <>
-          创建时间
-          <Tooltip placement="top">
-            <QuestionCircleOutlined style={{ marginLeft: 4 }} />
-          </Tooltip>
-        </>
-      ),
-      // hideInTable: true,
+      title: '权重',
+      dataIndex: 'weight',
+      key: 'weight',
       search: false,
-      key: 'createdAt',
-      dataIndex: 'createdAt',
-      valueType: 'date',
-      // render: (t) => formatterTime(t),
-      sorter: (a, b) => a.createdAt - b.createdAt, //时间排序
+      width: 100,
     },
     {
-      title: '状态',
+      title: '创建时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: formatterTime,
+      search: false,
+      width: 100,
+    },
+    {
+      title: '发布状态',
       dataIndex: 'status',
-      // initialValue: 'all',
       key: 'status',
-      valueEnum: {
-        0: { text: '已发布', status: 'Success' },
-        1: { text: '未发布', status: 'Error' },
+      search: false,
+      width: 100,
+      render: (_, record) => {
+        return record.status === 1 ? '发布' : '未发布';
       },
     },
-
     {
       title: '操作',
       valueType: 'option',
-      key: 'option',
-      ellipsis: true,
-      width: 200,
+      width: 240,
       render: (_, record) => [
-        <Link key={2} to={`InformationList/InformationListEdit`}>
+        <Button style={{ padding: 0 }} type="link" key={1} onClick={() => handleOK(record)}>
+          {record.status === 0 ? '发布' : '取消发布'}
+        </Button>,
+        <Button style={{ padding: 0 }} type="link" key={2} onClick={() => gotoEdit(record.newsId)}>
           编辑
-        </Link>,
+        </Button>,
         <Popconfirm
           key={3}
           title="您是否确认删除 ?"
-          onConfirm={() => handleDelete(record)}
+          onConfirm={() => handleDelete(record.newsId)}
           okText="确定"
           cancelText="取消"
         >
-          <a href="#">删除</a>
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
         </Popconfirm>,
       ],
     },
@@ -109,15 +149,15 @@ export default (props) => {
 
   return (
     <PageHeaderWrapper>
-      <ProTable
-        dataSource={dataSource}
-        columns={columns}
-        // request={getNoteList} 请求
-        // rowKey="noteId"
-        search={false}
-        options={false}
+      <PageTable
+        request={getNewsList}
+        // expfunc={exportPersonList}
         toolBarRender={actions}
         actionRef={actionRef}
+        columns={columns}
+        rowKey="newsId"
+        options={false}
+        scroll={{ x: 1000 }}
       />
     </PageHeaderWrapper>
   );

src/pages/Machinery/GPS/index.jsx

@@ -83,7 +83,7 @@ export default (props) => {
 
   return (
     <PageHeaderWrapper>
-      <ProTable
+      {/* <ProTable
         dataSource={dataSource}
         columns={columns}
         // request={getNoteList} 请求
@@ -91,7 +91,7 @@ export default (props) => {
         options={false}
         toolBarRender={actions}
         actionRef={actionRef}
-      />
+      /> */}
     </PageHeaderWrapper>
   );
 };

src/pages/Machinery/Machinery/index.jsx

@@ -26,8 +26,8 @@ export default (props) => {
   //列表切换农机状态方法
   const handleOK = (record, data) => {
     const title = record.status
-      ? '您确定要将该农机状态变更为禁用吗? 禁用后该农机将不在移动端显示'
-      : '您确定要将该农机状态变更为启用吗? 启用后该农机可以在移动端显示';
+      ? '您确定要将该农机状态变更为取消发布吗? 取消后该农机将不在移动端显示'
+      : '您确定要将该农机状态变更为发布吗? 发布后该农机可以在移动端显示';
     Modal.confirm({
       title: title,
       okText: '确认',

src/pages/Machinery/MachineryType/index.jsx

@@ -28,8 +28,8 @@ export default (props) => {
   //列表切换分类状态方法
   const handleOK = (record, data) => {
     const title = record.status
-      ? '您确定要将该分类状态变更为禁用吗? 禁用后该分类将不能录入农机'
-      : '您确定要将该分类状态变更为启用吗? 启用后该分类可以录入农机';
+      ? '您确定要将该分类状态变更为取消发布吗? 取消后该分类将不能录入农机'
+      : '您确定要将该分类状态变更为发布吗? 发布后该分类可以录入农机';
     Modal.confirm({
       title: title,
       okText: '确认',

src/pages/PlatformMessageManagement/MessageManageList/index.jsx

@@ -112,7 +112,7 @@ export default (props) => {
 
   return (
     <PageHeaderWrapper>
-      <ProTable
+      {/* <ProTable
         dataSource={dataSource}
         columns={columns}
         // request={getList}
@@ -120,7 +120,7 @@ export default (props) => {
         options={false}
         toolBarRender={actions}
         scroll={{ x: 1000 }}
-      />
+      /> */}
     </PageHeaderWrapper>
   );
 };

src/services/ad.js

@@ -0,0 +1,29 @@
+import request from '@/utils/request';
+
+/**
+ * 保存banner
+ * @param {*} data
+ * @returns
+ */
+export const addBanner = (data) => request('/banner', { method: 'post', data });
+
+/**
+ * 修改banner
+ * @param {*} data
+ * @returns
+ */
+export const updateBanner = (id, data) => request(`/banner/${id}`, { method: 'put', data });
+
+/**
+ * 查询banner列表
+ * @param {*} params
+ * @returns
+ */
+export const getBannerList = (params) => request('/banner', { params });
+
+/**
+ * 删除banner
+ * @param {*} data
+ * @returns
+ */
+export const deleteBanner = (id) => request(`/banner/${id}`, { method: 'delete' });

src/services/extendContent.js

@@ -1,37 +1,36 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
 
 /**
  * 保存扩展内容
- * @param {*} data 
- * @returns 
+ * @param {*} data
+ * @returns
  */
-export const save = (data) => request('/taExtendContent', { method: 'post', data })
+export const save = (data) => request('/extend-content', { method: 'post', data });
 
 /**
  * 修改扩展内容
- * @param {*} data 
- * @returns 
+ * @param {*} data
+ * @returns
  */
-export const update = (id, data) => request(`/taExtendContent/${id}`, { method: 'put', data })
+export const update = (id, data) => request(`/extend-content/${id}`, { method: 'put', data });
 
 /**
- * 查询扩展内容列表 
- * @param {*} params 
- * @returns 
+ * 查询扩展内容列表
+ * @param {*} params
+ * @returns
  */
-export const getList = (params) => request('/taExtendContent', { params })
-
+export const getList = (params) => request('/extend-content', { params });
 
 /**
  * 删除扩展内容
- * @param {*} data 
- * @returns 
+ * @param {*} data
+ * @returns
  */
- export const remove = (id) => request(`/taExtendContent/${id}`, { method: 'delete'})
- 
+export const remove = (id) => request(`/extend-content/${id}`, { method: 'delete' });
+
 /**
  * 查询扩展内容详情
- * @param {*} params 
- * @returns 
+ * @param {*} params
+ * @returns
  */
-export const getDetail = (id) => request(`/taExtendContent/${id}`)
+export const getDetail = (id) => request(`/extend-content/${id}`);

src/services/news.js

@@ -0,0 +1,36 @@
+import request from '@/utils/request';
+
+/**
+ * 保存资讯
+ * @param {*} data
+ * @returns
+ */
+export const addNews = (data) => request('/news', { method: 'post', data });
+
+/**
+ * 修改资讯
+ * @param {*} data
+ * @returns
+ */
+export const updateNews = (id, data) => request(`/news/${id}`, { method: 'put', data });
+
+/**
+ * 查询资讯列表
+ * @param {*} params
+ * @returns
+ */
+export const getNewsList = (params) => request('/news', { params });
+
+/**
+ * 删除资讯
+ * @param {*} data
+ * @returns
+ */
+export const deleteNews = (id) => request(`/news/${id}`, { method: 'delete' });
+
+/**
+ * 查询资讯详情
+ * @param {*} params
+ * @returns
+ */
+export const getNewsDetail = (id) => request(`/news/${id}`);