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

config/config.js

@@ -218,6 +218,11 @@ export default {
                   name: '',
                   component: './channel/addChannel',
                 },
+                {
+                  path: '/channel/editChannel',
+                  name: '',
+                  component: './channel/editChannel',
+                },
                 {
                   path: '/channel/brokerList',
                   name: '经纪人',
@@ -225,12 +230,12 @@ export default {
                 },
                 {
                   path: '/channel/recommendClients',
-                  name: '推荐客户',
+                  name: '',
                   component: './channel/recommendClients',
                 },
                 {
                   path: '/channel/InviteClients',
-                  name: '邀请经纪人',
+                  name: '',
                   component: './channel/InviteClients',
                 },
               ],
@@ -241,13 +246,18 @@ export default {
               component: '../layouts/BlankLayout',
               routes: [
                 {
-                  path: '/news/NewsType',
+                  path: '/news/type/NewsType',
                   name: '资讯类型',
                   component: './news/type/NewsType',
                 },
                 {
-                  path: '/news/NewsList',
-                  name: '咨询列表',
+                  path: '/news/type/editNews',
+                  name: '',
+                  component: './news/type/editNews',
+                },
+                {
+                  path: '/news/list/NewsList',
+                  name: '资讯列表',
                   component: './news/list/NewsList',
                 },
               ],
@@ -291,6 +301,10 @@ export default {
   // Theme for antd: https://ant.design/docs/react/customize-theme-cn
   theme: {
     'primary-color': primaryColor,
+    'btn-primary-bg': '#EF273A',
+    'table-row-hover-bg': '#eee',
+    'btn-danger-bg': '#FF7E48',
+
   },
   define: {
     ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION:
@@ -333,7 +347,7 @@ export default {
 
   proxy: {
     '/api/': {
-      target: 'http://localhost:8080/',
+      target: 'http://192.168.0.84:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

src/components/Wangedit/Wangedit.jsx

@@ -8,7 +8,10 @@ import E from 'wangeditor'
 class Wangedit extends React.Component {
   constructor(props, context) {
     super(props, context);
-    this.state = {}
+    this.state = {
+      html: undefined,
+    }
+    this.editor = undefined;
   }
 
   render() {
@@ -20,11 +23,25 @@ class Wangedit extends React.Component {
 
   componentDidMount() {
     const elem = this.refs.editorElem
-    const editor = new E(elem)
+    this.editor = new E(elem)
     // 使用 onchange 函数监听内容的变化
-    editor.customConfig.onchange = this.props.onChange
-    editor.create()
-    editor.txt.html(this.props.value)
+    this.editor.customConfig.onchange = html => {
+      this.setState({ html })
+
+      if (typeof this.props.onChange === 'function') {
+        this.props.onChange(html)
+      }
+    }
+    this.editor.create()
+    this.editor.txt.html(this.props.value)
+  }
+
+  componentDidUpdate(props, state) {
+    if (this.props.value && !state.html) {
+      if (this.editor) {
+        this.editor.txt.html(this.props.value)
+      }
+    }
   }
 }
 

src/components/XForm/WrapperItem.jsx

@@ -84,7 +84,7 @@ const WrapperItem = (props) => {
     return <></>;
   }
 
-  const SelectOpts = (dict || []).map((item, index) => (<Option value={item.value}>{item.name}</Option>))
+  const SelectOpts = (dict || []).map((item, index) => (<Option value={item.value}>{item.label}</Option>))
 
   let Field = <></>;
   if (render) {

src/layouts/BasicLayout.jsx

@@ -100,7 +100,7 @@ const BasicLayout = props => {
       }}
       footerRender={footerRender}
       menuDataRender={menuDataRender}
-      formatMessage={formatMessage}
+      // formatMessage={formatMessage}
       rightContentRender={rightProps => <RightContent {...rightProps} />}
       {...props}
       {...settings}

src/pages/Welcome.jsx

@@ -17,39 +17,33 @@ import { FormattedMessage } from 'umi-plugin-react/locale';
 // );
 
 export default () => (
-  <div className="gutter-example">
-    <Row gutter={20} type="flex" justify="space-around" align="middle">
-      <Col className="gutter-row" span={7} style={{
-        background: 'linear-gradient(180deg,rgba(246,168,30,1) 0%,rgba(250,86,139,1) 100%)', height: '150px',
-        boxShadow: '0px 1px 5px 1px rgba(0,0,0,0.2)',
-        borderRadius: '12px'
+  <>
+    <div style={{ display: 'flex' }}>
+      <div style={{
+        textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(241,43,62,1) 0%,rgba(254,144,155,1) 100%)', height: '100px',
+        boxShadow: '0px 18px 14px -15px rgba(241,43,62,1)',
+        borderRadius: '12px', width: '32%', marginRight: '2%'
       }}>
-        <div className="gutter-box" style={{ textAlign: 'center' }}>
-          <p className="gutter-tit" style={{ fontSize: '24px', color: '#fff', margin: '26px 0 0 0 ' }}>总用户</p>
-          <p className="gutter-num" style={{ fontSize: '51px', color: '#fff', margin: '0' }}>133</p>
-        </div>
-      </Col>
-      <Col className="gutter-row" span={7} style={{
-        background: 'linear-gradient(180deg,rgba(78,239,186,1) 0%,rgba(63,197,224,1) 100%)', height: '150px',
-        boxShadow: '0px 1px 5px 1px rgba(0,0,0,0.2)',
-        borderRadius: '12px'
+        <span style={{ fontSize: '24px', color: '#fff' }}>总用户 </span>
+        <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>133</span>
+      </div>
+      <div style={{
+        textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
+        boxShadow: '0px 18px 14px -15px rgba(255,126,74,1)',
+        borderRadius: '12px', width: '32%', marginRight: '2%'
       }}>
-        <div className="gutter-box" style={{ textAlign: 'center' }}>
-          <p className="gutter-tit" style={{ fontSize: '24px', color: '#fff', margin: '24px 0 0 0 ' }}>总注册用户</p>
-          <p className="gutter-num" style={{ fontSize: '51px', color: '#fff', margin: '0' }}>76</p>
-        </div>
-      </Col>
-      <Col className="gutter-row" span={7} style={{
-        background: 'linear-gradient(180deg,rgba(77,231,247,1) 0%,rgba(89,49,238,1) 100%)', height: '150px',
-        boxShadow: '0px 1px 5px 1px rgba(0,0,0,0.2)',
-        borderRadius: '12px'
+        <span style={{ fontSize: '24px', color: '#fff' }}>总注册用户 </span>
+        <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>12</span>
+      </div>
+      <div style={{
+        textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(137deg,rgba(107,130,230,1) 0%,rgba(152,175,251,1) 100%)', height: '100px',
+        boxShadow: '0px 18px 14px -15px rgba(107,130,230,1)',
+        borderRadius: '12px', width: '32%',
       }}>
-        <div className="gutter-box" style={{ textAlign: 'center' }}>
-          <p className="gutter-tit" style={{ fontSize: '24px', color: '#fff', margin: '26px 0 0 0 ' }}>最近7天新增</p>
-          <p className="gutter-num" style={{ fontSize: '51px', color: '#fff', margin: '0' }}>24</p>
-        </div>
-      </Col>
-    </Row>
-  </div>
-
+        <span style={{ fontSize: '24px', color: '#fff' }}>最近7天新增 </span>
+        <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>91</span>
+      </div>
+    </div>
+    <div>11111111111111</div>
+  </>
 );

src/pages/activity/editActivity.jsx

@@ -155,6 +155,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         })
       }
     }
+    
     return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
   }
   

src/pages/channel/InviteClients.jsx

@@ -1,46 +1,31 @@
-import React from 'react';
+
+import React, { useState, useEffect } from 'react';
 import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import channels from './channelList.less';
 import router from 'umi/router';
+import request from '../../utils/request'
 
 const { Option } = Select;
 function handleChange(value) {
   console.log(`selected ${value}`);
 }
 
-
-const menu = (
-  <Menu onClick={handleMenuClick}>
-    <Menu.Item key="1">
-      <Icon type="user" />
-      1st menu item
-    </Menu.Item>
-    <Menu.Item key="2">
-      <Icon type="user" />
-      2nd menu item
-    </Menu.Item>
-    <Menu.Item key="3">
-      <Icon type="user" />
-      3rd item
-    </Menu.Item>
-  </Menu>
-);
-const dataSource = [
-  {
-    key: '1',
-    img: 'http://img0.imgtn.bdimg.com/it/u=4246326797,2657995307&fm=26&gp=0.jpg',
-    name: '123',
-    age: 32,
-    address: '西湖区湖底公园1号',
-  },
-  {
-    key: '2',
-    img: '',
-    age: 42,
-    address: '西湖区湖底公园1号',
-  },
-];
+// const dataSource = [
+//   {
+//     key: '1',
+//     img: 'http://img0.imgtn.bdimg.com/it/u=4246326797,2657995307&fm=26&gp=0.jpg',
+//     name: '123',
+//     age: 32,
+//     address: '西湖区湖底公园1号',
+//   },
+//   {
+//     key: '2',
+//     img: '',
+//     age: 42,
+//     address: '西湖区湖底公园1号',
+//   },
+// ];
 
 const columns = [
   {
@@ -49,7 +34,7 @@ const columns = [
     key: 'img',
     align: 'center',
 
-    render: (text, record) => <img src={record.img} className={channels.touxiang} />,
+    render: (text, record) => <img src={record.avatarurl} className={channels.touxiang} />,
   },
   {
     title: '用户姓名',
@@ -60,32 +45,62 @@ const columns = [
   },
   {
     title: '电话',
-    dataIndex: 'integral',
-    key: 'integral',
+    dataIndex: 'tel',
+    key: 'tel',
     align: 'center',
   },
   {
     title: '性别',
-    dataIndex: 'total',
-    key: 'total',
+    dataIndex: 'sex',
+    key: 'sex',
     align: 'center',
   },
 ];
+const header = props => {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState({ channelNmae: [], result: [] })
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getList({ id: props.location.query.id, pageNum: 1, pageSize: 10 })
+  }, [])
+
+  function getList(params) {
+    request({
+      url: '/api/admin/channel/InviteClientsList',
+      method: 'GET',
+      params: { ...params },
+  // eslint-disable-next-line no-shadow
+  }).then(data => {
+      console.log(data)
+      setData(data)
+  })
+  }
+  // value 的值
+  // eslint-disable-next-line no-shadow
+  function handleChange(value) {
+    // setQueryData({ ...queryData, channelId: value });
+    localStorage.setItem('value', value);
+  }
+  // 查询
+  function queryList() {
+    getList({ pageNum: 1, pageSize: 10 })
+  }
 
-// 跳转到编辑商品
-function toEditGoods() {
-  router.push({
-    pathname: '/channel/addChannel',
-    query: {
-      a: 'b',
-    },
-  });
-}
-export default () => (
-    <Table dataSource={dataSource} columns={columns} />
-);
 
-function handleMenuClick(e) {
-  message.info('Click on menu item.');
-  console.log('click', e);
+  // 分页
+  function onChange(pageNumber) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+      getList({ pageNum: pageNumber, pageSize: 9 })
+  }
+
+  return (
+    <>
+      <div className={channels.searchBox}>
+      </div>
+      <Table dataSource={data.records} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
+  </>
+  )
 }
+
+
+export default header

src/pages/channel/addChannel.jsx

@@ -37,7 +37,10 @@ const header = props => {
       if (!err) {
         console.log('Received values of form: ', values);
         // eslint-disable-next-line max-len
-        addChannel({ channelName: values.channelName, channelContact: values.channelContact, contactTel: values.contactTel })
+        addChannel({ channelName: values.channelName,
+                     channelContact: values.channelContact,
+                     contactTel: values.contactTel,
+                     explain: values.explain })
       }
     });
   }
@@ -63,7 +66,8 @@ const header = props => {
           })(<Input className={channels.inpuit} />)}
         </Form.Item>
         <Form.Item label="说明描述">
-       <TextArea className={channels.inpuitTxt} rows={8} />
+        {getFieldDecorator('explain', {
+        })(<TextArea className={channels.inpuitTxt} rows={8} />)}
         </Form.Item>
         <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
           <Button type="primary" htmlType="submit">

src/pages/channel/brokerList.jsx

@@ -51,7 +51,7 @@ const columns = [
     align: 'center',
 
     // eslint-disable-next-line jsx-a11y/alt-text
-    render: (text, record) => <img src={record.avatarurl }/>,
+    render: (text, list) => <img src={list.avatarurl }/>,
   },
   {
     title: '用户姓名',
@@ -61,8 +61,8 @@ const columns = [
   },
   {
     title: '电话',
-    dataIndex: 'tel',
-    key: 'tel',
+    dataIndex: 'phone',
+    key: 'phone',
     align: 'center',
   },
   {
@@ -76,64 +76,112 @@ const columns = [
     dataIndex: 'recommendCount',
     key: 'recommendCount',
     align: 'center',
+    render: (text, list) => <a style={ { color: '#66B3FF' } } onClick= {() => torecommend(list.personId)} >{ list.recommendCount }</a>,
   },
   {
     title: '邀请经纪人',
-    dataIndex: 'rest',
-    key: 'rest',
+    dataIndex: 'inviteCount',
+    key: 'inviteCount',
     align: 'center',
+    render: (text, list) => <a style={ { color: '#66B3FF' } } onClick= {() => toinvite(list.personId)} >{ list.inviteCount }</a>,
   },
 ];
 
-// 跳转到编辑商品
-function toEditGoods() {
+// 跳转到推荐客户
+function torecommend(personId) {
   router.push({
-    pathname: '/channel/addChannel',
+    pathname: '/channel/recommendClients',
     query: {
-      a: 'b',
+      id: personId,
     },
   });
 }
+
+// 跳转到邀请经纪人
+function toinvite(personId) {
+  router.push({
+    pathname: '/channel/InviteClients',
+    query: {
+      id: personId,
+    },
+  });
+}
+
+
 const header = props => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [data, setData] = useState({})
+  const [data, setData] = useState({ list: [] })
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [queryData, setQueryData] = useState({})
 //   const [page, changePage] = useState({})
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-    request({
+    getList()
+  }, [])
+      function getList(params) {
+      request({
         url: '/api/admin/channel/broker',
         method: 'GET',
-        params: { pageNum: 1, pageSize: 10 },
+        params: { ...params },
     // eslint-disable-next-line no-shadow
     }).then(data => {
         console.log(data)
         setData(data)
     })
-  }, [])
+    }
+  // const getList = e => {
+  //   request({
+  //       url: '/api/xxx',
+  //       method: 'GET',
+  //       params: {},
+  //   // eslint-disable-next-line no-shadow
+  //   }).then(data => {
+  //       setData(data)
+  //   })
+  // }
+ // 查询
+ function queryList() {
+  getList({ ...queryData, pageNum: 1, pageSize: 10, channelId: localStorage.getItem('value') })
+}
+    // 分页
+    function onChange(pageNumber) {
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+        getList({ pageNum: pageNumber, pageSize: 10 })
+    }
+    // 获取input的值
+    function onInputChangePhone (e) {
+      // const InputValue = e.target.name.x.value;
+      setQueryData({ ...queryData, name: e.target.value })
+   }
 
-  const getList = e => {
-    request({
-        url: '/api/xxx',
-        method: 'GET',
-        params: {},
-    // eslint-disable-next-line no-shadow
-    }).then(data => {
-        setData(data)
-    })
+   function onInputChangeName (e) {
+    // const InputValue = e.target.name.x.value;
+    setQueryData({ ...queryData, phone: e.target.value })
+  }
+  function refurbishList () {
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+  // eslint-disable-next-line no-undef
+  function handleClick() {
+    alert('11', this)
+    console.log('this is:', this);
   }
-
 return (
   <>
     <div className={ channels.searchBox }>
       <div>
         <span className={ channels.selectName }>姓名</span>
-        <Input style ={{ width: 150 }} />
+        <Input onChange = { onInputChangePhone } style ={{ width: 150 }} />
         <span className={ channels.selectName }>电话</span>
-        <Input style ={{ width: 150 }}/>
+        <Input onChange = { onInputChangeName } style ={{ width: 150 }} />
       </div>
-      <Button className={channels.about}>查询</Button>
+      <div>
+      <Button type="primary" onClick={() => queryList() }>查询</Button>
+      <Button onClick={() => refurbishList() }>重置</Button>
+    </div>
     </div>
-    <Table dataSource={data.records} columns={columns} />
+    <Table dataSource={data.list} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
   </>
 )
 }

src/pages/channel/channelList.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select } from 'antd';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Pagination } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import channels from './channelList.less';
 import router from 'umi/router';
@@ -81,12 +81,12 @@ const columns = [
     dataIndex: '',
     key: '',
     align: 'center',
-    render: () => <a style={ { color: '#66B3FF' } }>编辑</a>,
+    render: (text, record) => <a style={ { color: '#66B3FF' } } onClick= {() => toedit(record.channelId)} >编辑</a>,
   },
 ];
 
-// 跳转到编辑商品
-function toEditGoods() {
+// 跳转到添加页面
+function toAdd() {
   router.push({
     pathname: '/channel/addChannel',
     query: {
@@ -94,14 +94,21 @@ function toEditGoods() {
     },
   });
 }
+  // 跳编辑页面
+  function toedit(channelId) {
+    // alert(channelId)
+    router.push({
+      pathname: '/channel/editChannel',
+      query: {
+        id: channelId,
+      },
+    });
+  }
 
 const header = props => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState({ channelNmae: [], result: [] })
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  // const [queryData, setQueryData] = useState({ pageNum: 1, pageSize: 10 })
-  //   const [page, changePage] = useState({})
-  // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10 })
   }, [])
@@ -130,6 +137,23 @@ const header = props => {
  function reset() {
   getList({ pageNum: 1, pageSize: 10 })
  }
+
+ // 跳编辑页
+ function toEdit() {
+  router.push({
+    pathname: '/integralMall/editGoods',
+    query: {
+      a: 'b',
+    },
+  });
+}
+
+  // 分页
+  function onChange(pageNumber) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+      getList({ pageNum: pageNumber, pageSize: 9 })
+  }
+
   return (
     <>
       <div className={channels.searchBox}>
@@ -142,15 +166,14 @@ const header = props => {
               )}
               {/* {listItems} */}
           </Select>
-
         </dvi>
         <div >
-        <Button style ={{ backgroundColor: '#00bfff' } } onClick={() => queryList() }>查询</Button>
+        <Button type="primary" onClick={() => queryList() }>查询</Button>
         <Button onClick={() => reset() }>重置</Button>
         </div>
       </div>
-      <Button className={channels.addBtn} onClick={toEditGoods}>新增</Button>
-      <Table dataSource={data.result.records} columns={columns} />
+      <Button type="danger" onClick={toAdd}>新增</Button>
+      <Table dataSource={data.result.records} columns={columns} pagination={{ pageSize: 10, total: data.result.total, onChange }} />
   </>
   )
 }

src/pages/channel/channelList.less

@@ -32,7 +32,7 @@
 .about {
   padding: 0 30px;
   height: 36px;
-  background-color: #00bfff;
+  background-color:rgba(255,255,255,1);
   color: #fff;
   margin: 30px 0;
 }

src/pages/channel/editChannel.jsx

@@ -0,0 +1,89 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import channels from './channelList.less';
+import router from 'umi/router';
+import request from '../../utils/request'
+
+const { TextArea } = Input;
+const { Option } = Select;
+
+const header = props => {
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getById()
+  }, [])
+  // 查询当前信息
+  function getById() {
+    request({
+      url: `/api/admin/channel/${props.location.query.id}`,
+      method: 'GET',
+  // eslint-disable-next-line no-shadow
+  }).then(data => {
+      props.form.setFieldsValue(data)
+  })
+  }
+
+  // 编辑
+  function editChannel(data) {
+    alert(1111111)
+      request({
+        url: `/api/admin/channel/${props.location.query.id}`,
+        method: 'PUT',
+        data: { ...data },
+    // eslint-disable-next-line no-shadow
+    }).then(data => {
+         // eslint-disable-next-line no-unused-expressions
+         router.go(-1)
+    })
+  }
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('values', values)
+        editChannel({ ...values })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+  <>
+        <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+        <Form.Item label="渠道名称">
+          {getFieldDecorator('channelName', {
+            rules: [{ required: true, message: '请输入渠道名称' }],
+          })(<Input className={channels.inpuit} />)}
+        </Form.Item>
+        <Form.Item label="联系人">
+          {getFieldDecorator('channelContact', {
+            rules: [{ required: true, message: ' 请输入联系人' }],
+          })(<Input className={channels.inpuit} />)}
+        </Form.Item>
+        <Form.Item label="联系电话">
+          {getFieldDecorator('contactTel', {
+            rules: [{ required: true, message: '请输入联系电话' }],
+          })(<Input className={channels.inpuit} />)}
+        </Form.Item>
+        <Form.Item label="说明描述">
+        {getFieldDecorator('explain', {
+        })(<TextArea className={channels.inpuitTxt} rows={8} />)}
+        </Form.Item>
+        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
+          <Button type="primary" htmlType="submit">
+            保存
+          </Button>
+          <Button className={channels.formButton} onClick = {() => router.go(-1)} type="primary" htmlType="submit">
+            取消
+          </Button>
+        </Form.Item>
+      </Form>
+  </>
+)
+}
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedNormalLoginForm

src/pages/channel/recommendClients.jsx

@@ -91,46 +91,36 @@ const columns = [
   },
 ];
 
-// 跳转到编辑商品
-function toEditGoods() {
-  router.push({
-    pathname: '/channel/addChannel',
-    query: {
-      a: 'b',
-    },
-  });
-}
 const header = props => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState({})
 //   const [page, changePage] = useState({})
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-    request({
-        url: '/api/admin/customer/recommend/recommender',
-        method: 'GET',
-        params: { pageNum: 1, pageSize: 10 },
-    // eslint-disable-next-line no-shadow
-    }).then(data => {
-        console.log(data)
-        setData(data)
-    })
+    getList({ pageNumber: 1, pageSize: 10 })
   }, [])
 
-  const getList = e => {
+  function getList(params) {
     request({
-        url: '/api/xxx',
-        method: 'GET',
-        params: {},
-    // eslint-disable-next-line no-shadow
-    }).then(data => {
-        setData(data)
-    })
+      url: `/api/admin/customer/recommend/${props.location.query.id}`,
+      method: 'GET',
+      params: { ...params },
+  // eslint-disable-next-line no-shadow
+  }).then(data => {
+      console.log(data)
+      setData(data)
+  })
   }
 
+
+   // 分页
+ function onChange(pageNum) {
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+        getList({ pageNumber: pageNum, pageSize: 9 })
+    }
 return (
   <>
-    <Table dataSource={data.records} columns={columns} />
+  <Table dataSource={data.records} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
   </>
 )
 }

src/pages/customer/report/index.jsx

@@ -154,7 +154,7 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
+          <Button type="primary" htmlType="submit">
             搜索
           </Button>
         </Form.Item>

src/pages/integralMall/GoodsList.jsx

@@ -1,133 +1,148 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal,Breadcrumb } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import router from 'umi/router';
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+
+import request from '../../utils/request'
 
 const { Option } = Select;
-// 提交事件
-function handleSubmit(e, props) {
-  e.preventDefault();
-  props.form.validateFields((err, values) => {
-    if (!err) {
-      console.log('提交数据: ', values)
-    }
-  });
-}
-// Change 事件
-function handleSelectChange(props) {
-  console.log(props)
-}
 
-// 分页
-function onChange(pageNumber) {
-  console.log('Page: ', pageNumber);
-}
-// 跳转到编辑商品
-function toEditGoods() {
-  router.push({
-    pathname: '/integralMall/editGoods',
-    query: {
-      a: 'b',
-    },
-  });
-}
 
-/**
- *
- *
- * @param {*} props
- * @returns
- */
+function header(props) {
+  // 获取初始化数据
+  const [ data, setData ] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({
+        url: '/api/admin/taGoods',
+        method: 'GET',
+        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) => {
+    getList({ pageNum: pageNumber, pageSize: 10 })
+  }
 
-const dataSource = [
-  {
-    key: '1',
-    img: 'http://img0.imgtn.bdimg.com/it/u=4246326797,2657995307&fm=26&gp=0.jpg',
-    name: '华为P30 Pro',
-  },
-  {
-    key: '2',
-    img: '',
-    name: '大米',
-  },
-];
 
-const columns = [
-  {
-    title: '商品图片',
-    dataIndex: 'img',
-    key: 'img',
-    align: 'center',
-    render: (text, record) => <img src={record.img} className={styles.touxiang} />,
-  },
-  {
-    title: '商品名称',
-    dataIndex: 'name',
-    key: 'name',
-    align: 'center',
+  // 跳转到编辑商品
+  const toEditGoods = (goodsId) => () => {
+    router.push({
+      pathname: '/integralMall/editGoods',
+      query: {
+        goodsId
+      },
+    });
+  }
 
-  },
-  {
-    title: '所属积分',
-    dataIndex: 'integral',
-    key: 'integral',
-    align: 'center',
-  },
-  {
-    title: '总数量',
-    dataIndex: 'total',
-    key: 'total',
-    align: 'center',
-  },
-  {
-    title: '已兑换数量',
-    dataIndex: 'exchanged',
-    key: 'exchanged',
-    align: 'center',
-  },
-  {
-    title: '剩余数量',
-    dataIndex: 'rest',
-    key: 'rest',
-    align: 'center',
-  },
-  {
-    title: '状态',
-    dataIndex: 'state',
-    key: 'state',
-    align: 'center',
-  },
-  {
-    title: '操作',
-    dataIndex: 'handle',
-    key: 'handle',
-    align: 'center',
-    render: () => <><span style={{ color: '#EF273A', marginRight: '20px' }} onClick={confirm}>下架<Icon type="shopping-cart" className={styles.shoppingCart} /></span><span style={{ color: '#FF925C' }} onClick={toEditGoods}>编辑<Icon type="form" className={styles.edit} /></span></>,
-  },
-];
-function confirm() {
-  Modal.confirm({
-    title: '确认下架该商品？',
-    okText: '确认',
-    cancelText: '取消',
-    onOk() {
-      console.log('OK');
+  
+  const changeGoodsStatus = (row) => () => {
+    Modal.confirm({
+      title: '确认下架该商品？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({
+          url: '/api/admin/taGoods/change',
+          method: 'PUT',
+          data: { ...row },
+        }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10 });
+        })
+      }
+    });
+  }
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+  const columns = [
+    {
+      title: '商品图片',
+      dataIndex: 'imgUrl',
+      key: 'imgUrl',
+      align: 'center',
+      render: (text, record) => <img src={record.imgUrl} className={styles.touxiang} />,
     },
-    onCancel() {
-      console.log('Cancel');
+    {
+      title: '商品名称',
+      dataIndex: 'goodsName',
+      key: 'goodsName',
+      align: 'center',
+
+    },
+    {
+      title: '所属积分',
+      dataIndex: 'pointPrice',
+      key: 'pointPrice',
+      align: 'center',
+    },
+    {
+      title: '总数量',
+      dataIndex: 'totalNum',
+      key: 'totalNum',
+      align: 'center',
+    },
+    {
+      title: '已兑换数量',
+      dataIndex: 'exchanged',
+      key: 'exchanged',
+      align: 'center',
+      render: (x,row) => <><span>{row.totalNum - row.inventory}</span></>
+    },
+    {
+      title: '剩余数量',
+      dataIndex: 'inventory',
+      key: 'inventory',
+      align: 'center',
     },
-  });
+    {
+      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: '#EF273A', marginRight: '20px' }} onClick={changeGoodsStatus(row)}>{row.status == 1 ? '下架' : '上架'}<Icon type="shopping-cart" className={styles.shoppingCart} />
+                            </span><span style={{ color: '#FF925C' }} onClick={toEditGoods(row.goodsId)}>编辑<Icon type="form" className={styles.edit} /></span></>,
+    },
+  ];
 
-}
-function header(props) {
   const { getFieldDecorator } = props.form
   return (
 
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
-          {getFieldDecorator('name')(
+          {getFieldDecorator('goodsName')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
               placeholder="商品名称"
@@ -135,34 +150,31 @@ function header(props) {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('goodState')(
-            <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
-              <Option value="1">上架</Option>
-              <Option value="0">下架</Option>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态">
+              <Option value="1">已上架</Option>
+              <Option value="0">已下架</Option>
             </Select>,
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('isMain')(
-            <Select style={{ width: '180px' }} placeholder="所属项目" onChange={handleSelectChange}>
-              <Option value="1">首页推荐</Option>
-              <Option value="0">首页未推荐</Option>
-            </Select>,
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('min')(
+          {getFieldDecorator('priceLesser')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="最小积分"
+              placeholder="价格小"
             />,
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('max')(
+          {getFieldDecorator('priceGreater')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="最大积分"
+              placeholder="价格大"
             />,
           )}
         </Form.Item>
@@ -172,12 +184,11 @@ function header(props) {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEditGoods}>新增</Button>
-      <Table dataSource={dataSource} columns={columns} />
-      {/* 分页 */
-      /* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={500} onChange={onChange} />
-      </div> */}
+      <Button type="primary" className={styles.addBtn} onClick={toEditGoods()}>新增</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>
     </>
   )
 }

src/pages/integralMall/editGoods.jsx

@@ -2,6 +2,9 @@ import React, { useState, useEffect } from 'react';
 import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import channels from '../channel/channelList.less';
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit'
 import router from 'umi/router';
 import request from '../../utils/request'
 
@@ -9,78 +12,135 @@ const { TextArea } = Input;
 const { Option } = Select;
 
 const header = props => {
+  const goodsId = props.location.query.goodsId
+  const [ goodsData, setGoodsData ] = useState({})
+  if(goodsId){
+    useEffect(() => {
+      getGoodsData(goodsId);
+    },[])
 
-  const [data, setData] = useState({ channelNmae: [], result: [] })
-
-  function goBack(){
-    router.push({
-      pathname: '/integralMall/GoodsList',
-    });
-  }
-
-  function addChannel(params) {
+  // 查询列表
+  const getGoodsData = (goodsId) => {
     request({
-      url: '/api/admin/channel',
-      method: 'POST',
-      data: { ...params },
-      // eslint-disable-next-line no-shadow
-    }).then(data => {
-      console.log(data)
-      setData(data)
-      // eslint-disable-next-line no-unused-expressions
-      router.go(-1)
+        url: '/api/admin/taGoods/' + goodsId,
+        method: 'GET',
+    }).then((data) => {
+        console.log(data)
+        setGoodsData(data)
     })
   }
+  }
 
-  function handleSubmit(e) {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        console.log('Received values of form: ', values);
-        // eslint-disable-next-line max-len
-        addChannel({ channelName: values.channelName, channelContact: values.channelContact, contactTel: values.contactTel })
+  const fields = [
+    {
+      label: '所属项目',
+      name: 'buildingId',
+      render: <BuildSelect />,
+      value: goodsData.buildingId,
+      rules: [
+        {required: true, message: '请选择所属项目'},
+      ]
+    },
+    {
+      label: '商品图片',
+      name: 'imgUrl',
+      type: FieldTypes.ImageUploader,
+      value: goodsData.imgUrl,
+    },
+    {
+      label: '商品名称',
+      name: 'goodsName',
+      type: FieldTypes.Text,
+      value: goodsData.goodsName,
+      rules: [
+        {required: true, message: '请输入商品名称'},
+      ]
+    },
+    {
+      label: '所需积分',
+      name: 'pointPrice',
+      type: FieldTypes.Text,
+      value: goodsData.pointPrice,
+      rules: [
+        {required: true, message: '请输入所需积分'},
+      ]
+    },
+    {
+      label: '商品数量',
+      name: 'totalNum',
+      type: FieldTypes.Text,
+      value: goodsData.totalNum,
+      rules: [
+        {required: true, message: '请输入商品数量'},
+      ]
+    },
+    {
+      label: '剩余数量',
+      name: 'inventory',
+      type: FieldTypes.Text,
+      value: goodsData.inventory,
+      rules: [
+        {required: true, message: '请输入剩余数量'},
+      ]
+    },
+    {
+      label: '商品详情',
+      name: 'goodsDescription',
+      render: <Wangedit />,
+      value: goodsData.goodsDescription,
+    },
+    {
+      label: '状态',
+      name: 'status',
+      type: FieldTypes.Select,
+      dict: [{label:"已上架",value:1},{label:"已下架",value:0}],
+      value: goodsData.status != null ? goodsData.status : 1,
+    },
+    {
+      label: '领取地址',
+      name: 'address',
+      type: FieldTypes.Text,
+      value: goodsData.address,
+      rules: [
+        {required: true, message: '请输入领取地址'},
+      ]
+    },
+  ]
+
+   
+  const handleSubmit = (values) => {
+    if(goodsId){
+      values.goodsId = goodsId
+      request({
+        url: '/api/admin/taGoods',
+        method: 'PUT',
+        data: values,
+      }).then((data) => {
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+      }else{
+      request({
+        url: '/api/admin/taGoods/add',
+        method: 'POST',
+        data: values,
+      }).then((data) => {
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
       }
-    });
   }
 
-  const { getFieldDecorator } = props.form;
+  const cancelPage = () => {
+    router.push({
+      pathname: '/integralMall/GoodsList',
+    });
+  }
 
   return (
-    <>
-      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
-        <Form.Item label="商品名称">
-          {getFieldDecorator('channelName', {
-            rules: [{ message: '请输入商品名称' }],
-          })(<Input className={channels.inpuit} />)}
-        </Form.Item>
-        <Form.Item label="所需积分">
-          {getFieldDecorator('channelContact', {
-            rules: [{ message: ' 请输入所需积分' }],
-          })(<Input className={channels.inpuit} />)}
-        </Form.Item>
-        <Form.Item label="商品数量">
-          {getFieldDecorator('contactTel', {
-            rules: [{ message: '请输入商品数量' }],
-          })(<Input className={channels.inpuit} />)}
-        </Form.Item>
-        <Form.Item label="剩余数量">
-          {getFieldDecorator('contactTel', {
-            rules: [{ message: '请输入剩余数量' }],
-          })(<Input className={channels.inpuit} />)}
-        </Form.Item>
-        <Form.Item label="商品详情">
-          <TextArea className={channels.inpuitTxt} rows={8} />
-        </Form.Item>
-        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
-          <Button type="primary" htmlType="submit">
-            保存
-          </Button>
-          <Button className={channels.formButton} onClick={goBack} type="primary" htmlType="submit">
-            取消
-          </Button>
-        </Form.Item>
-      </Form>
-    </>
+    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
   )
 }
 

src/pages/integralMall/exchangeRecords.jsx

@@ -1,246 +1,131 @@
-import React from 'react';
-import { Form, Input, Button, Icon, Select, DatePicker, Table } from 'antd';
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, DatePicker, Table, Pagination } 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 BuildSelect from '../../components/SelectButton/BuildSelect'
+
+import request from '../../utils/request'
 
 /**
   @param {*} props
   @returns
  */
 const { Option } = Select;
-// 提交事件
-function handleSubmit(e, props) {
-  e.preventDefault();
-  props.form.validateFields((err, values) => {
-    if (!err) {
-      console.log('提交数据: ', values)
-    }
-  });
-}
-// Change 事件
-function handleSelectChange(props) {
-  console.log(props)
-}
-// 兑换时间 组件
-class DateRange extends React.Component {
-  state = {
-    startValue: null,
-    endValue: null,
-    endOpen: false,
-  };
-
-  disabledStartDate = startValue => {
-    const { endValue } = this.state;
-    if (!startValue || !endValue) {
-      return false;
-    }
-    return startValue.valueOf() > endValue.valueOf();
-  };
-
-  disabledEndDate = endValue => {
-    const { startValue } = this.state;
-    if (!endValue || !startValue) {
-      return false;
-    }
-    return endValue.valueOf() <= startValue.valueOf();
-  };
-
-  onChange = (field, value) => {
-    this.setState({
-      [field]: value,
-    });
-
-  };
-  onStartChange = value => {
-    this.onChange('startValue', value);
-    console.log(value, "startValue")
-  };
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
-  onEndChange = value => {
-    this.onChange('endValue', value);
-    console.log(value, "endValue")
-  };
+function record(props) {
+  const { getFieldDecorator } = props.form
 
-  handleStartOpenChange = open => {
-    if (!open) {
-      this.setState({ endOpen: true });
-    }
-  };
-  handleEndOpenChange = open => {
-    this.setState({ endOpen: open });
-  };
-  render() {
-    const { startValue, endValue, endOpen } = this.state;
-    return (
-      <div>
-        <span style={{ marginRight: '14px' }}>兑换时间</span>
-        <DatePicker
-          disabledDate={this.disabledStartDate}
-          format="YYYY-MM-DD"
-          value={startValue}
-          placeholder="开始时间"
-          onChange={this.onStartChange}
-          onOpenChange={this.handleStartOpenChange}
-          style={{ marginRight: '14px' }}
-        />
-        <DatePicker
-          disabledDate={this.disabledEndDate}
-          format="YYYY-MM-DD"
-          value={endValue}
-          placeholder="结束时间"
-          onChange={this.onEndChange}
-          open={endOpen}
-          onOpenChange={this.handleEndOpenChange}
-        />
-      </div>
-    );
+  // 获取初始化数据
+  const [ data, setData ] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({
+        url: '/api/admin/taPointsExchange',
+        method: 'GET',
+        params: { ...params },
+    }).then((data) => {
+        setData(data)
+    })
   }
-}
-// 兑换时间 组件  end
-// 领取时间 组件 
-class DateRange2 extends React.Component {
-  state = {
-    startValue2: null,
-    endValue2: null,
-    endOpen2: false,
-  };
-
-  disabledStartDate2 = startValue2 => {
-    const { endValue2 } = this.state;
-    if (!startValue2 || !endValue2) {
-      return false;
-    }
-    return startValue2.valueOf() > endValue2.valueOf();
-  };
-
-  disabledEndDate2 = endValue2 => {
-    const { startValue2 } = this.state;
-    if (!endValue2 || !startValue2) {
-      return false;
-    }
-    return endValue2.valueOf() <= startValue2.valueOf();
-  };
-
-  onChange = (field, value) => {
-    this.setState({
-      [field]: value,
+  
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        let {exchangeTime,receiveTime, ...submitValue} = values
+        if(null != exchangeTime && exchangeTime.length > 0){
+          const [startCreateDate, endCreateDate] = exchangeTime
+          submitValue.startCreateDate = moment(startCreateDate).format('YYYY-MM-DD');
+          submitValue.endCreateDate = moment(endCreateDate).format('YYYY-MM-DD');
+        }else{
+          submitValue.startCreateDate = null
+          submitValue.endCreateDate = null
+        }
+        
+        if(null != receiveTime && receiveTime.length > 0){
+          const [startVerifyDate, endVerifyDate] = receiveTime
+          submitValue.startVerifyDate = moment(startVerifyDate).format('YYYY-MM-DD');
+          submitValue.endVerifyDate = moment(endVerifyDate).format('YYYY-MM-DD');
+        }else{
+          submitValue.startVerifyDate = null
+          submitValue.endVerifyDate = null
+        }
+        
+        console.log(submitValue)
+        getList({ pageNum: 1, pageSize: 10, ...submitValue })
+      }
     });
-  };
-  onStartChange2 = value => {
-    this.onChange('startValue2', value);
-    console.log(value, "startValue2")
-  };
-
-  onEndChange2 = value => {
-    this.onChange('endValue2', value);
-    console.log(value, "endValue2")
-  };
-
-  handleStartOpenChange2 = open => {
-    if (!open) {
-      this.setState({ endOpen2: true });
-    }
-  };
-  handleEndOpenChange2 = open => {
-    this.setState({ endOpen2: open });
-  };
-  render() {
-    const { startValue2, endValue2, endOpen2 } = this.state;
-    return (
-      <div>
-        <span style={{ marginRight: '14px' }}>领取时间</span>
-        <DatePicker
-          disabledDate={this.disabledStartDate2}
-          format="YYYY-MM-DD"
-          value={startValue2}
-          placeholder="开始时间"
-          onChange={this.onStartChange2}
-          onOpenChange={this.handleStartOpenChange2}
-          style={{ marginRight: '14px' }}
-        />
-        <DatePicker
-          disabledDate={this.disabledEndDate2}
-          format="YYYY-MM-DD"
-          value={endValue2}
-          placeholder="结束时间"
-          onChange={this.onEndChange2}
-          open={endOpen2}
-          onOpenChange={this.handleEndOpenChange2}
-        />
-      </div>
-    );
   }
-}
-// 领取时间 组件  end
-const dataSource = [
-  {
-    key: '1',
-    img: 'http://img0.imgtn.bdimg.com/it/u=4246326797,2657995307&fm=26&gp=0.jpg',
-    name: '华为P30 Pro',
-  },
-  {
-    key: '2',
-    img: '',
-    name: '大米',
-  },
-];
-
-const columns = [
 
-  {
-    title: '用户姓名',
-    dataIndex: 'name',
-    key: 'name',
-    align: 'center',
-
-  },
-  {
-    title: '用户类型',
-    dataIndex: 'type',
-    key: 'type',
-    align: 'center',
-  },
-  {
-    title: '手机号',
-    dataIndex: 'phone',
-    key: 'phone',
-    align: 'center',
-  },
-  {
-    title: '商品图片',
-    dataIndex: 'img',
-    key: 'img',
-    align: 'center',
-    render: (text, record) => <img src={record.img} className={styles.touxiang} />,
-  },
-  {
-    title: '商品名称',
-    dataIndex: 'goodName',
-    key: 'goodName',
-    align: 'center',
-  },
-  {
-    title: '兑换时间',
-    dataIndex: 'time',
-    key: 'time',
-    align: 'center',
-  },
-  {
-    title: '领取时间',
-    dataIndex: 'time2',
-    key: 'time2',
-    align: 'center',
-  },
-  {
-    title: '状态',
-    dataIndex: 'state',
-    key: 'state',
-    align: 'center',
-  },
-];
+  const changePageNum = (pageNumber) => {
+    getList({ pageNum: pageNumber, pageSize: 10 })
+  }
 
-function record(props) {
-  const { getFieldDecorator } = props.form
+  const columns = [
+
+    {
+      title: '用户姓名',
+      dataIndex: 'personName',
+      key: 'personName',
+      align: 'center',
+    },
+    {
+      title: '用户类型',
+      dataIndex: 'personType',
+      key: 'personType',
+      align: 'center',
+      render: (personType)=> <><span>{personType === 'Realty Consultant' ? '置业顾问' : personType === 'Sales Executive' ? '销售主管' : personType === 'estate agent' ? '经纪人' : ''}</span></>
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '商品图片',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center',
+      render: (text, record) => <img src={record.image} className={styles.touxiang} />,
+    },
+    {
+      title: '商品名称',
+      dataIndex: 'targetName',
+      key: 'targetName',
+      align: 'center',
+    },
+    {
+      title: '兑换时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (createDate) => <><span>{moment(createDate).format('YYYY-MM-DD HH:mm')}</span></>
+    },
+    {
+      title: '领取时间',
+      dataIndex: 'verifyDate',
+      key: 'verifyDate',
+      align: 'center',
+      render: (verifyDate) => <><span>{verifyDate != null ? moment(verifyDate).format('YYYY-MM-DD HH:mm') : ''}</span></>
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (status)=> <><span>{status == 1 ? '已领取' : '未领取'}</span></>
+    },
+  ];
 
   return (
 
@@ -248,7 +133,7 @@ function record(props) {
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <div style={{ display: 'flex' }}>
           <Form.Item>
-            {getFieldDecorator('name')(
+            {getFieldDecorator('personName')(
               <Input
                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                 placeholder="用户姓名"
@@ -264,7 +149,7 @@ function record(props) {
             )}
           </Form.Item>
           <Form.Item>
-            {getFieldDecorator('goodName')(
+            {getFieldDecorator('targetName')(
               <Input
                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                 placeholder="商品名称"
@@ -272,36 +157,43 @@ function record(props) {
             )}
           </Form.Item>
           <Form.Item>
-            {getFieldDecorator('type')(
-              <Select style={{ width: '220px' }} placeholder="用户类型" onChange={handleSelectChange}>
-                <Option value="2">置业顾问</Option>
-                <Option value="1">销售主管</Option>
-                <Option value="0">经纪人</Option>
+            {getFieldDecorator('personType')(
+              <Select style={{ width: '220px' }} placeholder="用户类型">
+                <Option value="Realty Consultant">置业顾问</Option>
+                <Option value="Sales Executive">销售主管</Option>
+                <Option value="estate agent">经纪人</Option>
               </Select>,
             )}
           </Form.Item>
           <Form.Item>
-            {getFieldDecorator('state')(
-              <Select style={{ width: '220px' }} placeholder="状态" onChange={handleSelectChange}>
+            {getFieldDecorator('status')(
+              <Select style={{ width: '220px' }} placeholder="状态">
                 <Option value="1">已领取</Option>
                 <Option value="0">未领取</Option>
               </Select>,
             )}
           </Form.Item>
+          <Form.Item>
+            {getFieldDecorator('exchangeTime')(
+              <RangePicker placeholder={['兑换开始时间','兑换结束时间']}/>
+            )}
+          </Form.Item>
+          <Form.Item>
+            {getFieldDecorator('receiveTime')(
+              <RangePicker placeholder={['领取开始时间','领取结束时间']}/>
+            )}
+          </Form.Item>
           <Form.Item>
             <Button type="primary" htmlType="submit" className={styles.searchBtn}>
               搜索
           </Button>
           </Form.Item>
         </div>
-        <Form.Item>
-          <DateRange />
-        </Form.Item>
-        <Form.Item>
-          <DateRange2 />
-        </Form.Item>
       </Form>
-      <Table style={{ marginTop: '40px' }} dataSource={dataSource} columns={columns} />
+      <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>
     </>
   )
 }

src/pages/news/list/NewsList.jsx

@@ -37,7 +37,7 @@ function CartBody(props) {
             </p>
             <p className={Styles.cardText}>
               <span className={Styles.title}>状态</span>
-              <span >：{ data.status == '0' ? "已发布" : "未发布" }</span>
+              <span >：{ data.status == 0 ? "已发布" : "未发布" }</span>
             </p>
             <p className={Styles.cardItem}>
               <span className={Styles.title}>阅读数量</span>
@@ -173,8 +173,8 @@ function body(props) {
         <Form.Item>
           {getFieldDecorator('newsStatus')(
             <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
-              <Option value="1">已发布</Option>
-              <Option value="0">未发布</Option>
+              <Option value="0">已发布</Option>
+              <Option value="1">未发布</Option>
             </Select>,
           )}
         </Form.Item>

src/pages/news/type/NewsType.jsx

@@ -24,10 +24,10 @@ function onChange(pageNumber) {
   console.log('Page: ', pageNumber);
 }
 
-// 跳转到编辑商品
-function toEditGoods() {
+// 跳转到编辑资讯
+function toEditNews() {
   router.push({
-    pathname: '/integralMall/editGoods',
+    pathname: '/news/type/editNews',
     query: {
       a: 'b',
     },
@@ -76,7 +76,7 @@ const columns = [
     align: 'center',
     render: () => <>
     <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={confirm}>删除<Icon type="shopping-cart" className={styles.shoppingCart} /></span>
-    <span style={{ color: '#FF925C' }} onClick={toEditGoods}>编辑<Icon type="form" className={styles.edit} /></span></>,
+    <span style={{ color: '#FF925C' }} onClick={toEditNews}>编辑<Icon type="form" className={styles.edit} /></span></>,
   },
 ];
 function confirm() {
@@ -108,7 +108,7 @@ function header(props) {
           )}
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEditGoods}>新增</Button>
+      <Button type="primary" className={styles.addBtn} onClick={toEditNews}>新增</Button>
       <Table dataSource={dataSource} columns={columns} />
     </>
   )

src/pages/news/type/editNews.jsx

@@ -0,0 +1,75 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import channels from '../../channel/channelList.less';
+import router from 'umi/router';
+import request from '../../../utils/request'
+
+const { TextArea } = Input;
+const { Option } = Select;
+
+const header = props => {
+
+  const [data, setData] = useState({ channelNmae: [], result: [] })
+
+  function goBack(){
+    router.push({
+      pathname: '/news/type/NewsType',
+    });
+  }
+
+  function addChannel(params) {
+    request({
+      url: '/api/admin/channel',
+      method: 'POST',
+      data: { ...params },
+      // eslint-disable-next-line no-shadow
+    }).then(data => {
+      console.log(data)
+      setData(data)
+      // eslint-disable-next-line no-unused-expressions
+      router.go(-1)
+    })
+  }
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('Received values of form: ', values);
+        // eslint-disable-next-line max-len
+        addChannel({ channelName: values.channelName, channelContact: values.channelContact, contactTel: values.contactTel })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+      <Form.Item label="类型图片">
+          {getFieldDecorator('newsName', {
+            rules: [{ message: '' }],
+          })(<Input className={channels.inpuit} />)}
+        </Form.Item>
+        <Form.Item label="名称">
+          {getFieldDecorator('newsName', {
+            rules: [{ message: '请输入资讯名称' }],
+          })(<Input className={channels.inpuit} />)}
+        </Form.Item>
+        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
+          <Button type="primary" htmlType="submit">
+            保存
+          </Button>
+          <Button className={channels.formButton} onClick={goBack} type="primary" htmlType="submit">
+            取消
+          </Button>
+        </Form.Item>
+      </Form>
+    </>
+  )
+}
+
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedNormalLoginForm

src/pages/style/GoodsList.less

@@ -1,25 +1,9 @@
 .addBtn {
   padding: 0 40px;
   height: 36px;
-  background-color: #FF7E48;
-  color: #fff;
   margin: 30px 0;
-  border-color: #FF7E48;
-}
-.addBtn:focus {
-  color: #fff;
-  background-color: #FF7E48;
-  border-color: #FF7E48;
-}
-.searchBtn{
- background-color: #EF273A;
- border-color: #EF273A;
-}
-.searchBtn:focus {
-  color: #fff;
-  background-color: #EF273A;
-  border-color: #EF273A;
 }
+
 .touxiang {
   width: 93px;
   height: 93px;