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

config/config.js

@@ -328,10 +328,9 @@ export default {
 
   proxy: {
     '/api/': {
-      target: 'http://localhost:8080/',
+      target: 'http://192.168.0.84:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },
   },
-
 };

src/components/SelectButton/BuildSelect.jsx

@@ -0,0 +1,40 @@
+import React, { useState, useEffect } from 'react';
+import { Select } from 'antd';
+
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const BuildingSelect = (props) => {
+  const [ data, setData ] = useState([])
+
+  useEffect(() => {
+    getCityList();
+  },[])
+
+  const getCityList = (e) => {
+    request({
+        url: '/api/admin/buildinglist/select',
+        method: 'GET',
+        params: {pageNum: 1,pageSize: 999},
+    }).then((data) => {
+        setData(data.records)
+    })
+  }
+
+  return (
+      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择项目" onChange={props.onChange}>
+          {data.map(building => (
+            <Option key={building.buildingId}>{building.buildingName}</Option>
+          ))}
+      </Select>
+  )
+}
+export default BuildingSelect
+

src/components/SelectButton/CitySelect.jsx

@@ -20,18 +20,18 @@ const CitySelect = (props) => {
 
   const getCityList = (e) => {
     request({
-        url: '/api/admin/buildinglist/select',
+        url: '/api/admin/tdCity',
         method: 'GET',
-        params: {pageNum: 1,pageSize: 999},
+        params: {leveltype: 2, pageNum: 1,pageSize: 999},
     }).then((data) => {
-        setData(data.records)
+        setData(data)
     })
   }
 
   return (
       <Select value={props.value} style={{ width: '180px' }} placeholder="请选择城市" onChange={props.onChange}>
           {data.map(city => (
-            <Option key={city.buildingId}>{city.buildingName}</Option>
+            <Option key={city.id}>{city.name}</Option>
           ))}
       </Select>
   )

src/global.less

@@ -48,10 +48,10 @@ ol {
 }
 
 .ant-pro-global-header{
-  background:linear-gradient(180deg,rgba(107,192,216,1) 0%,rgba(54,141,212,1) 100%);
+  background:#393C39;
 }
 .ant-pro-sider-menu-sider.light .ant-pro-sider-menu-logo{
-  background:linear-gradient(180deg,rgba(107,192,216,1) 0%,rgba(54,141,212,1) 100%);
+  background:#EF273A;
   box-shadow: none;
   border: none;
 }

src/layouts/UserLayout.less

@@ -20,21 +20,13 @@
 
 .content {
   flex: 1;
-  padding: 32px 0;
-
 }
 
 @media (min-width: @screen-md-min) {
   .container {
-    background-image: url('../assets/bg.jpg');
-    background-repeat: no-repeat;
-    background-position: center;
-    background-size: 100% 100%;
+    background-color: #fff;
   }
 
-  .content {
-    padding: 32px 0 24px;
-  }
 }
 
 .top {

src/pages/activity/ActivityList.jsx

@@ -5,228 +5,226 @@ import styles from '../style/GoodsList.less';
 import router from 'umi/router';
 import moment from 'moment';
 import SelectCity from '../../components/SelectButton/CitySelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect'
 
 import request from '../../utils/request'
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-// 提交事件
-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: '/activity/editActivity',
-    query: {
-      a: 'b',
-    },
-  });
-}
-
-/**
- *
- *
- * @param {*} props
- * @returns
- */
-
-const columns = [
-  {
-    title: '活动标题',
-    dataIndex: 'title',
-    key: 'title',
-    align: 'center',
-  },
-  {
-    title: '活动时间',
-    dataIndex: 'startDate',
-    key: 'startDate',
-    align: 'center',
-    render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format('YYYY-MM-DD')}`}</span></>
-  },
-  {
-    title: '已参加人数',
-    dataIndex: 'count',
-    key: 'count',
-    align: 'center',
-  },
-  {
-    title: '阅读量',
-    dataIndex: 'pvNum',
-    key: 'pvNum',
-    align: 'center',
-  },
-  {
-    title: '转发量',
-    dataIndex: 'shareNum',
-    key: 'shareNum',
-    align: 'center',
-  },
-  {
-    title: '收藏数',
-    dataIndex: 'saveNum',
-    key: 'saveNum',
-    align: 'center',
-  },
-  {
-    title: '状态',
-    dataIndex: 'isEnlist',
-    key: 'isEnlist',
-    align: 'center',
-    render: (isEnlist)=> <><span>{isEnlist == 0 ?"未开始" : isEnlist==1 ? "进行中" : "已结束"}</span></>
-  },
-  {
-    title: '操作',
-    dataIndex: 'handle',
-    key: 'handle',
-    align: 'center',
-    render: (x,row) => <><span style={{ color: '#1990FF'}} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? "报名记录" : ""}<Icon type="snippets" className={styles.shoppingCart} /></span>
-                         <span style={{ color: '#1990FF' }} onClick={sendOrPublicDynamic.bind(this,row)}>{ row.status === 1 ? '取消发布' : '发布' }<Icon type="close-circle" className={styles.edit} /></span>
-                         <span style={{ color: '#1990FF' }} onClick={finishDynamic.bind(this,row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
-                         <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={topDynamic.bind(this,row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-                         <span style={{ color: '#FF925C' }}>编辑<Icon type="form" className={styles.edit} /></span>
-                       </>
-  },
-];
-
-const getSignList = (dynamicId) => {
-    router.push({
-        pathname: '/activity/SignList',
-        query: {
-            dynamicId
-        },
-      });
-}
-
-const finishDynamic = (row) => {
-    Modal.confirm({
-        title: '结束以后将无法编辑, 是否继续?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk() {
-            request({
-                url: '/api/admin/buildingDynamic/finish',
-                method: 'PUT',
-                data: {dynamicId: row.dynamicId, top: ""},
-            }).then((data) => {
-                console.log(data)
-                message.info('操作成功！')
-                // getList()
-            }).catch((err) => {
-                console.log(err)
-                message.info(err.msg || err.message)
-            })
-        },
-      });
-}
-
-const topDynamic = (row) => {
-    const weight = Math.abs(row.weight - 1)
-    request({
-        url: '/api/admin/buildingDynamic/weight',
-        method: 'PUT',
-        params: {dynamicId: row.dynamicId, weight},
-    }).then((data) => {
-        console.log(data)
-        message.info('操作成功！')
-        // getList()
-    }).catch((err) => {
-        console.log(err)
-        message.info(err.msg || err.message)
-    })
-}
-
-const sendOrPublicDynamic = (row) => {
-    if (row.status === 1) {
-        cancelDynamic(row)
-    } else {
-        sendDynamic(row)
-    }
-}
-
-// 取消活动
-const cancelDynamic = (row) => {
-    request({
-        url: '/api/admin/buildingDynamic/cancel/'+row.dynamicId,
-        method: 'PUT',
-    }).then((data) => {
-        message.info('操作成功！')
-        // getList()
-    }).catch((err) => {
-        console.log(err)
-        message.info(err.msg || err.message)
-    })
-}
-
-//发布活动
-const sendDynamic = (row) => {
-    request({
-        url: '/api/admin/buildingDynamic/send/'+row.dynamicId,
-        method: 'PUT',
-    }).then((data) => {
-        message.info('操作成功！')
-        // getList()
-    }).catch((err) => {
-        console.log(err)
-        message.info(err.msg || err.message)
-    })
-}
 
 const header = (props) => {
   const [ data, setData ] = useState({})
 //   const [page, changePage] = useState({})
 
   useEffect(() => {
-    getList();
+    getList({ pageNum: 1, pageSize: 10 });
   },[])
 
   // 查询列表
-  const getList = (e) => {
+  const getList = (params) => {
     request({
         url: '/api/admin/iBuildingDynamicList',
         method: 'GET',
-        params: {pageNum: 1,pageSize: 10},
+        params: { ...params },
     }).then((data) => {
         console.log(data)
         setData(data)
     })
   }
 
+  
+// 跳转到编辑商品
+const toEditGoods = (dynamicId) => () => {
+    router.push({
+      pathname: '/activity/editActivity',
+      query: {
+        dynamicId
+      },
+    });
+  }
+  
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+  
+  const columns = [
+    {
+      title: '活动标题',
+      dataIndex: 'title',
+      key: 'title',
+      align: 'center',
+    },
+    {
+      title: '活动时间',
+      dataIndex: 'startDate',
+      key: 'startDate',
+      align: 'center',
+      render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format('YYYY-MM-DD')}`}</span></>
+    },
+    {
+      title: '已参加人数',
+      dataIndex: 'count',
+      key: 'count',
+      align: 'center',
+    },
+    {
+      title: '阅读量',
+      dataIndex: 'pvNum',
+      key: 'pvNum',
+      align: 'center',
+    },
+    {
+      title: '转发量',
+      dataIndex: 'shareNum',
+      key: 'shareNum',
+      align: 'center',
+    },
+    {
+      title: '收藏数',
+      dataIndex: 'saveNum',
+      key: 'saveNum',
+      align: 'center',
+    },
+    {
+      title: '状态',
+      dataIndex: 'isEnlist',
+      key: 'isEnlist',
+      align: 'center',
+      render: (isEnlist)=> <><span>{isEnlist == 0 ?"未开始" : isEnlist==1 ? "进行中" : "已结束"}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: (x,row) => <><span style={{ color: '#1990FF'}} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? "报名记录" : ""}<Icon type="snippets" className={styles.shoppingCart} /></span>
+                           <span style={{ color: '#1990FF' }} onClick={sendOrPublicDynamic.bind(this,row)}>{ row.status === 1 ? '取消发布' : '发布' }<Icon type="close-circle" className={styles.edit} /></span>
+                           <span style={{ color: '#1990FF' }} onClick={finishDynamic.bind(this,row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
+                           <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={topDynamic(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+                           <span style={{ color: '#FF925C' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>
+                         </>
+    },
+  ];
+  
+  const getSignList = (dynamicId) => {
+      router.push({
+          pathname: '/activity/SignList',
+          query: {
+              dynamicId
+          },
+        });
+  }
+  
+  const finishDynamic = (row) => {
+      Modal.confirm({
+          title: '结束以后将无法编辑, 是否继续?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk() {
+              request({
+                  url: '/api/admin/buildingDynamic/finish',
+                  method: 'PUT',
+                  data: {dynamicId: row.dynamicId, top: ""},
+              }).then((data) => {
+                  console.log(data)
+                  message.info('操作成功！')
+                  getList({ pageNum: 1, pageSize: 10 })
+              }).catch((err) => {
+                  console.log(err)
+                  message.info(err.msg || err.message)
+              })
+          },
+        });
+  }
+  
+//   置顶
+  const topDynamic = (row) => () => {
+      const weight = Math.abs(row.weight - 1)
+      request({
+          url: '/api/admin/buildingDynamic/weight',
+          method: 'PUT',
+          params: {dynamicId: row.dynamicId, weight},
+      }).then((data) => {
+          console.log(data)
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10 })
+      }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+      })
+  }
+  
+  const sendOrPublicDynamic = (row) => {
+      if (row.status === 1) {
+          cancelDynamic(row)
+      } else {
+          sendDynamic(row)
+      }
+  }
+  
+  // 取消活动
+  const cancelDynamic = (row) => {
+      request({
+          url: '/api/admin/buildingDynamic/cancel/'+row.dynamicId,
+          method: 'PUT',
+      }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10 })
+      }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+      })
+  }
+  
+  //发布活动
+  const sendDynamic = (row) => {
+      request({
+          url: '/api/admin/buildingDynamic/send/'+row.dynamicId,
+          method: 'PUT',
+      }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10 });
+      }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+      })
+  }
+  
+  const changePageNum = (pageNumber) => {
+      getList({ pageNum: pageNumber, pageSize: 10 })
+  }
+
+  // 提交事件
+const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
   const { getFieldDecorator } = props.form
   return (
 
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
-          {getFieldDecorator('goodState')(
+          {getFieldDecorator('cityId')(
             <SelectCity />,
           )}
         </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('name')(
+          {getFieldDecorator('title')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
               placeholder="请输入标题"
@@ -234,13 +232,13 @@ const header = (props) => {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('min')(
+          {getFieldDecorator('time')(
             <DatePicker />
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('goodState')(
-            <Select style={{ width: '180px' }} placeholder="是否报名" onChange={handleSelectChange}>
+          {getFieldDecorator('isEnlist')(
+            <Select style={{ width: '180px' }} placeholder="是否报名">
               <Option value="1">已报名</Option>
               <Option value="0">未报名</Option>
             </Select>,
@@ -252,8 +250,11 @@ const header = (props) => {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEditGoods}>新增</Button>
-      <Table dataSource={data.list} columns={columns} />
+      <Button type="primary" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
+      <Table dataSource={data.list} 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/activity/SignList.jsx

@@ -10,14 +10,6 @@ import request from '../../utils/request'
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
-
-
-// 分页
-function onChange(pageNumber) {
-  console.log('Page: ', pageNumber);
-}
-
-
 /**
  *
  *
@@ -27,51 +19,64 @@ function onChange(pageNumber) {
 
 const columns = [
   {
-    title: '活动标题',
-    dataIndex: 'title',
-    key: 'title',
+    title: '用户姓名',
+    dataIndex: 'name',
+    key: 'name',
     align: 'center',
   },
   {
-    title: '活动时间',
-    dataIndex: 'startDate',
-    key: 'startDate',
+    title: '手机号',
+    dataIndex: 'phone',
+    key: 'phone',
     align: 'center',
-    render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format('YYYY-MM-DD')}`}</span></>
   },
   {
-    title: '已参加人数',
-    dataIndex: 'count',
-    key: 'count',
+    title: '报名时间',
+    dataIndex: 'createDate',
+    key: 'createDate',
     align: 'center',
+    render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD')}`}</span></>
   }
 ];
 
 
 
 const header = (props) => {
-  const [ data, setData ] = useState({})
+  const [ data, setData ] = useState({list: {}})
 //   const [page, changePage] = useState({})
   useEffect(() => {
-    getSignList();
+    getSignList({pageNum: 1,pageSize: 10, dynamicId: props.location.query.dynamicId });
   },[])
 
   // 查询列表
-  const getSignList = (e) => {
+  const getSignList = (params) => {
     request({
         url: '/api/admin/SignList',
         method: 'GET',
-        params: {pageNum: 1,pageSize: 10, dynamicId: props.location.query.dynamicId },
+        params: { ...params },
     }).then((data) => {
         console.log(data)
         setData(data)
     })
   }
 
+  const changePageNum = (pageNumber) => {
+    getList({ pageNum: pageNumber, pageSize: 10, dynamicId: props.location.query.dynamicId })
+  }
+
+  const toActivityList = () => {
+    router.push({
+      pathname: '/activity/ActivityList',
+    });
+  }
+
   return (
     <>
-      <Button type="primary" className={styles.addBtn}>返回</Button>
-      <Table dataSource={data} columns={columns} />
+      <Button type="primary" className={styles.addBtn} onClick={toActivityList}>返回</Button>
+      <Table dataSource={data.list.data} 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/activity/editActivity.jsx

@@ -3,45 +3,42 @@ import { Form, Input, Button, Icon, Select, Tabs, Radio } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 
-
-
 /**
  *
  *
  * @param {*} props
  * @returns
  */
-
-
- const Basic = (props) => {
-   return <div>Basic</div>
- }
- 
- const Poster = (props) => {
-  return <div>Poster</div>
-}
-
-const Share = (props) => {
-  return <div>Share</div>
-}
-
  const Edit = (props) => {
-   const [ tab, changeTab ] = useState('a');
-
+  const [ tab, changeTab ] = useState('basic');
+  const dynamicId = props.location.query.dynamicId
+  console.log(dynamicId)
+
+  const Basic = (props) => {
+  return <div>Basic</div>
+  }
+  
+  const Poster = (props) => {
+   return <div>Poster</div>
+  }
+ 
+  const Share = (props) => {
+    return <div>Share</div>
+  }
 
   return (
     <div>
       <div>
         <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
-          <Radio.Button value="a">基本信息</Radio.Button>
-          <Radio.Button value="b">海报图片</Radio.Button>
-          <Radio.Button value="c">分享设置</Radio.Button>
+          <Radio.Button value="basic">基本信息</Radio.Button>
+          <Radio.Button value="poster">海报图片</Radio.Button>
+          <Radio.Button value="share">分享设置</Radio.Button>
         </Radio.Group>
       </div>
       <div>
-        { tab === 'a' && <Basic /> }
-        { tab === 'b' && <Poster /> }
-        { tab === 'c' && <Share /> }
+        { tab === 'basic' && <Basic /> }
+        { tab === 'poster' && <Poster /> }
+        { tab === 'share' && <Share /> }
       </div>
     </div>
   );

src/pages/channel/addChannel.jsx

@@ -1,37 +1,64 @@
-import React from 'react';
-import { Form, Select, Input, Button } from 'antd';
+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;
 
-class App extends React.Component {
-  handleSubmit = e => {
+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(() => {
+  //   addChannel({ pageNum: 1, pageSize: 10 })
+  // }, [])
+
+  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();
-    this.props.form.validateFields((err, values) => {
-      console.log('Form.Item', values.note)
+    props.form.validateFields((err, values) => {
       if (!err) {
-       alert('Received values of form: ', values);
+        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;
 
-  render() {
-    const { getFieldDecorator } = this.props.form;
-    return (
-      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={this.handleSubmit}>
+  return (
+  <>
+        <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
         <Form.Item label="渠道名称">
-          {getFieldDecorator('note', {
+          {getFieldDecorator('channelName', {
             rules: [{ required: true, message: '请输入渠道名称' }],
           })(<Input className={channels.inpuit} / >)}
         </Form.Item>
         <Form.Item label="联系人">
-          {getFieldDecorator('note2', {
+          {getFieldDecorator('channelContact', {
             rules: [{ required: true, message: ' 请输入联系人' }],
           })(<Input className={channels.inpuit} />)}
         </Form.Item>
         <Form.Item label="联系电话">
-          {getFieldDecorator('note3', {
+          {getFieldDecorator('contactTel', {
             rules: [{ required: true, message: '请输入联系电话' }],
           })(<Input className={channels.inpuit} />)}
         </Form.Item>
@@ -42,19 +69,14 @@ class App extends React.Component {
           <Button type="primary" htmlType="submit">
             保存
           </Button>
-          <Button className={channels.formButton} type="primary" htmlType="submit">
+          <Button className={channels.formButton} onClick = {() => router.go(-1)} type="primary" htmlType="submit">
             取消
           </Button>
         </Form.Item>
       </Form>
-    );
-  }
+  </>
+)
 }
 
-const WrappedApp = Form.create({ name: 'coordinated' })(App);
-
-export default () => (
-  <>
-    <WrappedApp />
-  </>
-);
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedNormalLoginForm

src/pages/channel/brokerList.jsx

@@ -1,8 +1,9 @@
-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) {
@@ -26,54 +27,54 @@ const menu = (
     </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 = [
   {
     title: '头像',
-    dataIndex: 'img',
-    key: 'img',
+    dataIndex: 'avatarurl',
+    key: 'avatarurl',
     align: 'center',
 
-    render: (text, record) => <img src={record.img} className={channels.touxiang} />,
+    // eslint-disable-next-line jsx-a11y/alt-text
+    render: (text, record) => <img src={record.avatarurl }/>,
   },
   {
     title: '用户姓名',
     dataIndex: 'name',
     key: 'name',
     align: 'center',
-    render: text => <a>{text}</a>,
   },
   {
     title: '电话',
-    dataIndex: 'integral',
-    key: 'integral',
+    dataIndex: 'tel',
+    key: 'tel',
     align: 'center',
   },
   {
     title: '性别',
-    dataIndex: 'total',
-    key: 'total',
+    dataIndex: 'sex',
+    key: 'sex',
     align: 'center',
   },
   {
     title: '推荐客户',
-    dataIndex: 'exchanged',
-    key: 'exchanged',
+    dataIndex: 'recommendCount',
+    key: 'recommendCount',
     align: 'center',
   },
   {
@@ -93,7 +94,35 @@ function toEditGoods() {
     },
   });
 }
-export default () => (
+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/channel/broker',
+        method: 'GET',
+        params: { pageNum: 1, pageSize: 10 },
+    // 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)
+    })
+  }
+
+return (
   <>
     <div className={ channels.searchBox }>
       <div>
@@ -104,11 +133,13 @@ export default () => (
       </div>
       <Button className={channels.about}>查询</Button>
     </div>
-    <Table dataSource={dataSource} columns={columns} />
+    <Table dataSource={data.records} columns={columns} />
   </>
-);
+)
+}
 
 function handleMenuClick(e) {
   message.info('Click on menu item.');
   console.log('click', e);
 }
+export default header

src/pages/channel/channelList.jsx

@@ -1,46 +1,27 @@
-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 = [
   // {
@@ -53,52 +34,52 @@ const columns = [
   // },
   {
     title: '渠道代码',
-    dataIndex: 'name',
-    key: 'name',
+    dataIndex: 'channelCode',
+    key: 'channelCode',
     align: 'center',
     render: text => <a>{text}</a>,
   },
   {
     title: '渠道名称',
-    dataIndex: 'integral',
-    key: 'integral',
+    dataIndex: 'channelName',
+    key: 'channelName',
     align: 'center',
   },
   {
     title: '联系人',
-    dataIndex: 'total',
-    key: 'total',
+    dataIndex: 'channelContact',
+    key: 'channelContact',
     align: 'center',
   },
   {
     title: '联系电话',
-    dataIndex: 'exchanged',
-    key: 'exchanged',
+    dataIndex: 'contactTel',
+    key: 'contactTel',
     align: 'center',
   },
   {
-    title: '经纪人',
-    dataIndex: 'rest',
-    key: 'rest',
+    title: '经纪人数',
+    dataIndex: 'agentsNum',
+    key: 'agentsNum',
     align: 'center',
   },
   {
     title: '推荐客户有效',
-    dataIndex: 'state',
-    key: 'state',
+    dataIndex: 'recommendEffective',
+    key: 'recommendEffective',
     align: 'center',
   },
   {
     title: '邀请经济人',
-    dataIndex: 'handle',
-    key: 'handle',
+    dataIndex: 'agentsInvite',
+    key: 'agentsInvite',
     align: 'center',
-    render: () => <a>Delete</a>,
+    // render: () => <a>Delete</a>,
   },
   {
     title: '操作',
-    dataIndex: 'handle',
-    key: 'handle',
+    dataIndex: '',
+    key: '',
     align: 'center',
     render: () => <a style={ { color: '#66B3FF' } }>编辑</a>,
   },
@@ -113,28 +94,66 @@ function toEditGoods() {
     },
   });
 }
-export default () => (
-  <>
-    <div className={channels.searchBox}>
-      <dvi>
-        <span className={channels.selectName}>渠道名称</span>
-        <Select defaultValue="lucy" style={{ width: 180 }} onChange={handleChange}>
-          <Option value="jack">Jack</Option>
-          <Option value="lucy">Lucy</Option>
-          <Option value="disabled" disabled>
-            Disabled
-          </Option>
-          <Option value="Yiminghe">yiminghe</Option>
-        </Select>
-      </dvi>
-      <Button className={channels.about}>查询</Button>
-    </div>
-    <Button className={channels.addBtn} onClick={toEditGoods}>新增</Button>
-    <Table dataSource={dataSource} columns={columns} />
-  </>
-);
 
-function handleMenuClick(e) {
-  message.info('Click on menu item.');
-  console.log('click', e);
+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 })
+  }, [])
+
+  function getList(params) {
+    request({
+      url: '/api/admin/channel',
+      method: 'GET',
+      params: { ...params },
+  // eslint-disable-next-line no-shadow
+  }).then(data => {
+      console.log(data)
+      setData(data)
+  })
+  }
+  // value 的值
+  function handleChange(value) {
+    // setQueryData({ ...queryData, channelId: value });
+    localStorage.setItem('value', value);
+  }
+  // 查询
+  function queryList() {
+    getList({ pageNum: 1, pageSize: 10, channelId: localStorage.getItem('value') })
+  }
+ // 重置
+ function reset() {
+  getList({ pageNum: 1, pageSize: 10 })
+ }
+  return (
+    <>
+      <div className={channels.searchBox}>
+        <dvi>
+          <span className={channels.selectName}>渠道名称</span>
+          <Select defaultValue="请选择" style={{ width: 180 }} onChange={handleChange}>
+          <option value="">全部</option>
+              {data.channelNmae.map(Item =>
+                <Option value={ Item.channelId }> { Item.channelName } </Option>,
+              )}
+              {/* {listItems} */}
+          </Select>
+
+        </dvi>
+        <div >
+        <Button style ={{ backgroundColor: '#00bfff' } } onClick={() => queryList() }>查询</Button>
+        <Button onClick={() => reset() }>重置</Button>
+        </div>
+      </div>
+      <Button className={channels.addBtn} onClick={toEditGoods}>新增</Button>
+      <Table dataSource={data.result.records} columns={columns} />
+  </>
+  )
 }
+
+
+export default header

src/pages/channel/recommendClients.jsx

@@ -1,8 +1,9 @@
-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) {
@@ -45,11 +46,11 @@ const dataSource = [
 const columns = [
   {
     title: '头像',
-    dataIndex: 'img',
-    key: 'img',
+    // dataIndex: 'img',
+    // key: 'img',
     align: 'center',
 
-    render: (text, record) => <img src={record.img} className={channels.touxiang} />,
+    render: (text, record) => <img src={record.picture} className={channels.touxiang} />,
   },
   {
     title: '用户姓名',
@@ -60,32 +61,32 @@ const columns = [
   },
   {
     title: '电话',
-    dataIndex: 'integral',
-    key: 'integral',
+    dataIndex: 'recommendTel',
+    key: 'recommendTel',
     align: 'center',
   },
   {
     title: '性别',
-    dataIndex: 'total',
-    key: 'total',
+    dataIndex: 'sex',
+    key: 'sex',
     align: 'center',
   },
   {
     title: '意向项目',
-    dataIndex: 'exchanged',
-    key: 'exchanged',
+    dataIndex: 'intention',
+    key: 'intention',
     align: 'center',
   },
   {
     title: '推荐时间',
-    dataIndex: 'rest',
-    key: 'rest',
+    dataIndex: 'createDate',
+    key: 'createDate',
     align: 'center',
   },
   {
     title: '状态',
-    dataIndex: 'rest',
-    key: 'rest',
+    dataIndex: 'status',
+    key: 'status',
     align: 'center',
   },
 ];
@@ -99,11 +100,43 @@ function toEditGoods() {
     },
   });
 }
-export default () => (
-    <Table dataSource={dataSource} columns={columns} />
-);
+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)
+    })
+  }, [])
+
+  const getList = e => {
+    request({
+        url: '/api/xxx',
+        method: 'GET',
+        params: {},
+    // eslint-disable-next-line no-shadow
+    }).then(data => {
+        setData(data)
+    })
+  }
+
+return (
+  <>
+    <Table dataSource={data.records} columns={columns} />
+  </>
+)
+}
 
 function handleMenuClick(e) {
   message.info('Click on menu item.');
   console.log('click', e);
 }
+export default header

src/pages/integralMall/GoodsList.jsx

@@ -103,7 +103,7 @@ const columns = [
     dataIndex: 'handle',
     key: 'handle',
     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></>,
+    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() {

src/pages/style/GoodsList.less

@@ -1,24 +1,24 @@
 .addBtn {
   padding: 0 30px;
   height: 36px;
-  background-color: #50be00;
+  background-color: #FF7E48;
   color: #fff;
   margin: 30px 0;
-  border-color: #50be00;
+  border-color: #FF7E48;
 }
 .addBtn:focus {
   color: #fff;
-  background-color: #50be00;
-  border-color: #50be00;
+  background-color: #FF7E48;
+  border-color: #FF7E48;
 }
 .searchBtn{
- background-color: #3A91D5;
- border-color: #3A91D5;
+ background-color: #EF273A;
+ border-color: #EF273A;
 }
 .searchBtn:focus {
   color: #fff;
-  background-color: #3A91D5;
-  border-color: #3A91D5;
+  background-color: #EF273A;
+  border-color: #EF273A;
 }
 .touxiang {
   width: 93px;

src/pages/user/login/components/Login/LoginSubmit.jsx

@@ -9,7 +9,7 @@ const LoginSubmit = ({ className, ...rest }) => {
   const clsString = classNames(styles.submit, className);
   return (
     <FormItem>
-      <Button size="large" className={clsString} type="primary" htmlType="submit" {...rest} style={{ background: 'linear-gradient(270deg,rgba(43,112,192,1) 0%,rgba(6,185,209,1) 100%)', borderRadius: '7px', border: 'none' }} />
+      <Button size="large" className={clsString} type="primary" htmlType="submit" {...rest} style={{ backgroundColor: '#DB3C4B', borderRadius: '4px', border: 'none' }} />
     </FormItem>
   );
 };

src/pages/user/login/components/Login/index.jsx

@@ -14,7 +14,7 @@ class Login extends Component {
     className: '',
     defaultActiveKey: '',
     onTabChange: () => { },
-    onSubmit: () => {},
+    onSubmit: () => { },
   };
 
   constructor(props) {
@@ -113,16 +113,24 @@ class Login extends Component {
 
     });
     return (
-      <div  className={styles.loginBox}>
-      <div className={styles.leftBox}></div>
-      <LoginContext.Provider value={this.getContext()}>
-        <div className={styles.login}>
-          <Form onSubmit={this.handleSubmit}>
-            {children}
-          </Form>
+      <>
+        <div className={styles.topBox}>
+          <div className={styles.con}>
+            <p className={styles.welcome}>Welcome</p>
+            <div className={styles.title}>
+              <span style={{fontSize:'18px'}}>ying xiao yun</span>
+              <p className={styles.name}>营销云·系统</p>
+            </div>
+          </div>
         </div>
-      </LoginContext.Provider>
-      </div>
+        <LoginContext.Provider value={this.getContext()}>
+          <div className={styles.login}>
+            <Form onSubmit={this.handleSubmit}>
+              {children}
+            </Form>
+          </div>
+        </LoginContext.Provider>
+      </>
     );
   }
 }

src/pages/user/login/components/Login/index.less

@@ -1,33 +1,53 @@
 @import '~antd/es/style/themes/default.less';
-.loginBox{
-  width:880px;
-height:480px;
-background:rgba(255,255,255,1);
-box-shadow:0px 2px 14px 4px rgba(0,0,0,0.12);
-border-radius:30px;
-margin: 16vh auto;
-.leftBox{
-  width:440px;
-height:480px;
-background:linear-gradient(180deg,rgba(108,193,216,1) 0%,rgba(54,141,212,1) 100%);
-border-radius:30px 0px 0px 30px;
-display: inline-block;
-}
+
+.topBox{
+height:42vh;
+background-color: #DB3C4B;
+position: relative;
+  .con{
+    position: absolute;
+    left:50%;
+    top:50%;
+    margin-top: -100px;
+    margin-left: -136px;
+    text-align: center;
+    height: 200px;
+    width: 272px;
+    overflow: hidden;
+    .welcome{
+      color: #fff;
+      font-size: 60px;
+      font-style: italic;
+      margin-bottom: 0;
+    }
+    .title{
+      width: 260px;
+      height: 102px;
+      border:1px solid #fff;
+      text-align: left;
+      color:#fff;
+      padding: 14px  20px;
+      margin:  0 auto;
+      .name{
+        font-size: 40px;
+        margin:0; 
+      }
+    }
+    }
 }
 .login {
   background-color: #fff;
-  width:440px;
+  width:580px;
   height:480px;
   padding:120px 50px;
   border-radius:0px 30px 30px 0px;
- float: right;
+  margin: 0 auto;
   :global {
     .ant-tabs .ant-tabs-bar {
       margin-bottom: 24px;
       text-align: center;
       border-bottom: 0;
     }
-
     .ant-form-item {
       margin: 0 2px 24px;
     }