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

# Conflicts:
#	src/pages/integralMall/GoodsList.jsx

config/config.js

@@ -218,6 +218,11 @@ export default {
                   name: '',
                   component: './channel/addChannel',
                 },
+                {
+                  path: '/channel/editChannel',
+                  name: '',
+                  component: './channel/editChannel',
+                },
                 {
                   path: '/channel/brokerList',
                   name: '经纪人',
@@ -291,6 +296,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:

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/channel/InviteClients.jsx

@@ -1,31 +1,16 @@
-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',
@@ -71,21 +56,51 @@ const columns = [
     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({ 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

@@ -61,8 +61,8 @@ const columns = [
   },
   {
     title: '电话',
-    dataIndex: 'tel',
-    key: 'tel',
+    dataIndex: 'phone',
+    key: 'phone',
     align: 'center',
   },
   {
@@ -94,46 +94,81 @@ function toEditGoods() {
     },
   });
 }
+
 const header = props => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState({})
+
+  // 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.records} 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

@@ -106,31 +106,30 @@ const header = props => {
 //   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/recommender',
+      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/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;