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

config/config.js

@@ -265,6 +265,11 @@ export default {
                   name: '资讯列表',
                   component: './news/list/NewsList',
                 },
+                {
+                  path: '/news/list/editNewsList',
+                  name: '',
+                  component: './news/list/editNewsList',
+                },
               ],
             },
             {

src/components/EchartsTest/index.jsx

@@ -3,15 +3,15 @@ import React, { Component } from 'react';
 // 引入 ECharts 主模块
 import echarts from 'echarts/lib/echarts';
 // 引入柱状图
-import  'echarts/lib/chart/bar';
+import 'echarts/lib/chart/bar';
 // 引入提示框和标题组件
 import 'echarts/lib/component/tooltip';
 import 'echarts/lib/component/title';
 class Chart extends Component {
 
-  render() { 
-    return ( <div></div> );
+  render() {
+    return (<div></div>);
   }
 }
- 
+
 export default Chart;

src/components/SelectButton/NewTypeSelect.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 NewsTypeSelect = (props) => {
+  const [ data, setData ] = useState([])
+
+  useEffect(() => {
+    getCityList();
+  },[])
+
+  const getCityList = (e) => {
+    request({
+        url: '/api/admin/taNewsType',
+        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(type => (
+            <Option key={type.newsTypeId}>{type.newsTypeName}</Option>
+          ))}
+      </Select>
+  )
+}
+export default NewsTypeSelect
+

src/global.less

@@ -110,4 +110,14 @@ ol {
 }
 .ant-table{
   line-height: 3;
+}
+.ant-modal-header{
+  border-bottom: none;
+  .ant-modal-title{
+    font-size: 24px;
+    line-height: 50px;
+  }
+}
+.ant-modal-footer{
+  border-top:none;
 }

src/pages/channel/brokerList.jsx

@@ -27,22 +27,6 @@ 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 columns = [
   {
     title: '头像',

src/pages/channel/channelList.jsx

@@ -74,7 +74,6 @@ const columns = [
     dataIndex: 'agentsInvite',
     key: 'agentsInvite',
     align: 'center',
-    // render: () => <a>Delete</a>,
   },
   {
     title: '操作',

src/pages/customer/independentList/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Modal } from 'antd';
 import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
@@ -11,6 +11,132 @@ const { Option } = Select;
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const { Meta } = Card;
 
+class ModalTable extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+       dataSource: { records: [] },
+       visibleData: { visible: false, customerId: '', realtyConsultant: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount() {
+    this.getList({ pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate(preProps, preState) {
+    if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
+      this.getList({ pageNumber: 1, pageSize: 5 })
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk() {
+    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+  }
+
+  getList(params) {
+    console.log('this.state.visibleData', this.state.visibleData)
+    const { customerId } = this.state.visibleData
+    if (customerId === '' || customerId === undefined) {
+      return
+    }
+    // 网路请求
+    const { url, method } = apis.customer.recommend
+    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(customerId)
+    // 网路请求
+    request({ url: tempUrl, method, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+   // 分页
+  onChange(pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5 })
+  }
+
+  render() {
+    const columns = [
+      {
+        title: '头像',
+        // eslint-disable-next-line jsx-a11y/alt-text
+        render: (text, records) => <img src={records.picture } width={50} height={50} />,
+      },
+      {
+        title: '用户名',
+        dataIndex: 'name',
+        key: 'name',
+      },
+      {
+        title: '电话',
+        dataIndex: 'phone',
+        key: 'phone',
+      },
+      {
+        title: '性别',
+        dataIndex: 'sex',
+        key: 'sex',
+        render: (text, records) => <span>{ records.sex === 1 ? '男' : '女' }</span>,
+      },
+      {
+        title: '意向项目',
+        dataIndex: 'intention',
+        key: 'intention',
+      },
+      {
+        title: '推荐时间',
+        dataIndex: 'createDate',
+        key: 'createDate',
+      },
+      {
+        title: '状态',
+        // eslint-disable-next-line consistent-return
+        render: (text, records) => {
+                                    if (records.status === 1) { return '报备' }
+                                    if (records.status === 2) { return '到访' }
+                                    if (records.status === 3) { return '认购' }
+                                    if (records.status === 4) { return '签约' }
+                                    if (records.verifyStatus === 1) { return '待审核' }
+                                    if (records.verifyStatus === 2) { return '审核同意' }
+                                    if (records.verifyStatus === 3) { return '签约' }
+                                  },
+      },
+    ]
+    return (
+      <>
+        <Modal
+            title="推荐客户"
+            destroyOnClose="true"
+            width={900}
+            footer={null}
+            visible={this.state.visibleData.visible}
+            // onOk={() => this.handleOk()}
+            onCancel={(e) => this.handleCancel(e)}
+          >
+            <Table dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          </Modal>
+      </>
+    );
+  }
+}
 /**
  *
  *
@@ -54,12 +180,16 @@ function body(props) {
       }
     });
   }
-
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [gVisibleData, setGVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
   // Change 事件
   function handleSelectChange(e) {
     // eslint-disable-next-line no-console
     console.log(e)
   }
+  function gM(row) {
+    setGVisibleData({ visible: true, customerId: row.personId, realtyConsultant: row.realtyConsultant })
+  }
 
   // 分页
   function onChange(pageNum) {
@@ -123,7 +253,7 @@ function body(props) {
               &nbsp;&nbsp;&nbsp;&nbsp;
               <sapn style={{ color: 'rgba(239,39,58,1)' }}>邀请经纪人</sapn>
               &nbsp;&nbsp;&nbsp;&nbsp;
-              <sapn style={{ color: 'rgba(239,39,58,1)' }}>推荐客户</sapn>
+              <sapn style={{ color: 'rgba(239,39,58,1)' }} onClick={() => gM(record)}>推荐客户</sapn>
             </>
           }
         </>
@@ -158,6 +288,8 @@ function body(props) {
       </Form>
 
       <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
+            {/* 调整归属 */}
+        <ModalTable visibleData={gVisibleData} />
     </>
   );
 }

src/pages/integralMall/writeOff.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Tabs, Row, Col, message } from 'antd';
+import { Form, Input, Button, Icon, Tabs, Row, Col, Modal, message } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import router from 'umi/router';
@@ -13,20 +13,67 @@ function callback(key) {
 }
 
 /**
- *
- *
  * @param {*} props
  * @returns
  */
+class Dialog extends React.Component {
+  state = {
+    visible: false,
+  };
+
+  showModal = () => {
+    this.setState({ visible: true, });
+  };
+
+  handleCancel = () => {
+    this.setState({ visible: false });
+  };
+
+  onKeyDown = (e) => {
+
+    if (e.keyCode == 13) {
+      this.setState({ visible: false });
+      this.props.onEnter();
+    }
+  }
+
+  render() {
+    const { visible, loading } = this.state;
+    return (
+      <div>
+        <Button type="primary" onClick={this.showModal} style={{ margin: '80px auto', display: 'block', padding: '6px 46px', backgroundColor: '#EA2323', border: 'none' }}>立即核销</Button>
+        <Modal
+          style={{ marginTop: '20vh' }}
+          visible={visible}
+          title="核销数据"
+          onCancel={this.handleCancel}
+          footer={[]}
+        >
+          <p>扫描二维码数据</p>
+          <Input placeholder="请用扫描枪扫描二维码" onKeyDown={this.onKeyDown} onChange={this.props.onChange} />
+        </Modal>
+      </div>
+    );
+  }
+}
+
 
 function header(props) {
   const [telValue, setTelValue] = useState('')
+
   const changeTel = (e) => {
     setTelValue(e.target.value)
   }
 
-  const verifyTel = () =>{
-    if(telValue === ""){
+  const [codeValue, setCodeValue] = useState('')
+  const changeCode = (e) => {
+
+    setCodeValue(e.target.value)
+
+  }
+
+  const verifyTel = () => {
+    if (telValue === "") {
       message.error("请输入手机号");
       return;
     }
@@ -38,6 +85,22 @@ function header(props) {
     });
   }
 
+
+  const handleEnter = (e) => {
+    if (codeValue === "") {
+      message.error("无二维码数据");
+      return;
+    } else {
+
+      router.push({
+        pathname: '/integralMall/verifyList',
+        query: {
+          codeValue
+        },
+      });
+    }
+  }
+
   const { getFieldDecorator } = props.form
   return (
     <>
@@ -62,7 +125,7 @@ function header(props) {
               <p style={{ margin: '44px auto' }}>根据提示进行核销操作</p>
             </Col>
           </Row>
-          <Button type="primary" style={{ margin: '80px auto', display: 'block', padding: '6px 46px', backgroundColor: '#EA2323', border: 'none' }}>立即核销</Button>
+          <Dialog onEnter={handleEnter} onChange={changeCode} />
         </TabPane>
         <TabPane tab="手机号核销" key="2">
           <Row>
@@ -77,15 +140,17 @@ function header(props) {
               <p>点击“立即核销”按钮</p>
             </Col>
           </Row>
-          <div style={{ margin: '110px auto', display: 'block',textAlign:'center' }}>
-            <Input placeholder="请输入手机号" style={{width:'200px'}} onChange={changeTel}/>
-            <Button type="primary" style={{marginLeft:'10px', padding: '6px 46px', backgroundColor: '#EA2323', border: 'none' }} onClick={verifyTel}>立即核销</Button>
+          <div style={{ margin: '110px auto', display: 'block', textAlign: 'center' }}>
+            <Input placeholder="请输入手机号" style={{ width: '200px' }} onChange={changeTel} />
+            <Button type="primary" style={{ marginLeft: '10px', padding: '6px 46px', backgroundColor: '#EA2323', border: 'none' }} onClick={verifyTel}>立即核销</Button>
           </div>
         </TabPane>
       </Tabs>,
     </>
   )
 }
+
 const WrappedHeader = Form.create({ name: 'header' })(header);
 
+
 export default WrappedHeader

src/pages/news/list/NewsList.jsx

@@ -1,9 +1,11 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Modal, message, Card, Row, Col, Pagination, Alert } from 'antd';
 import moment from 'moment';
+import router from 'umi/router';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
+import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
 
 
 const { Option } = Select;
@@ -19,7 +21,53 @@ const tempDate = [{ code: 's101' }]
  */
 function CartBody(props) {
   const { data } = props
-  console.log(props);
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/news/list/NewsList',
+    });
+  }
+
+  // 查询列表
+  const getList = (params) => {
+    request({
+        url: '/api/admin/taNews',
+        method: 'GET',
+        params: { ...params },
+    }).then((data) => {
+        cancelPage();
+    })
+  }
+
+  //删除资讯
+  const changeNewsListStatus = (newsId) => () => {
+    Modal.confirm({
+      title: '确认删除该资讯？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({
+          url: '/api/admin/taNews/' + newsId,
+          method: 'DELETE',
+          // data: { ...row },
+        }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10 });
+        })
+      }
+    });
+  }
+
+  // 跳转到编辑资讯列表
+  const toEditList = (newsId) => ()  => {
+    router.push({
+      pathname: '/news/list/editNewsList',
+      query: {
+        newsId
+      },
+    });
+  }
+
   return (
           <Card
             hoverable
@@ -30,14 +78,14 @@ function CartBody(props) {
             <p className={Styles.cardText}>
               <span className={Styles.title}>资讯类型</span>
               <span >：{ data.newsType.newsTypeName }</span>
-              <span className={Styles.ediText}>
+              <span className={Styles.ediText} onClick={toEditList(data.newsId)}>
                 编辑
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
               </span>
             </p>
             <p className={Styles.cardText}>
               <span className={Styles.title}>状态</span>
-              <span >：{ data.status == 0 ? "已发布" : "未发布" }</span>
+              <span >：{ data.newsStatus == 0 ? "已发布" : "未发布" }</span>
             </p>
             <p className={Styles.cardItem}>
               <span className={Styles.title}>阅读数量</span>
@@ -45,7 +93,7 @@ function CartBody(props) {
             </p>
             <p className={Styles.cardItem}>
               <span className={Styles.title}>转发数量</span>
-              <span className={ Styles.address }>：{ data.shareNum }</span>
+              <span>：{ data.shareNum }</span>
             </p>
             <p className={Styles.cardItem}>
               <span className={Styles.title}>点赞数量</span>     
@@ -66,7 +114,7 @@ function CartBody(props) {
               </span>
               <span style={{
                 color: '#FF4A4A', position: 'absolute', right: '0',
-              }} >
+              }} onClick={changeNewsListStatus(data.newsId)}>
                 删除
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
               </span>
@@ -122,6 +170,17 @@ function body(props) {
     });
   }
 
+  // 跳转到编辑资讯列表
+  const toEditList = (id) => ()  => {
+    router.push({
+      pathname: '/news/list/editNewsList',
+      query: {
+        id
+      },
+    });
+  }
+
+
   // Change 事件
   function handleSelectChange(e) {
     // eslint-disable-next-line no-console
@@ -165,9 +224,8 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('type')(
-            <Select style={{ width: '180px' }} placeholder="咨询类型" onChange={handleSelectChange}>
-            </Select>,
+          {getFieldDecorator('buildingId')(
+            <NewsTypeSelect />,
           )}
         </Form.Item>       
         <Form.Item>
@@ -184,7 +242,7 @@ function body(props) {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={Styles.addButton}>
+      <Button type="primary" className={Styles.addButton} onClick={toEditList()}>
         新增
       </Button>
 

src/pages/news/list/editNewsList.jsx

@@ -0,0 +1,148 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../../style/GoodsList.less';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
+import XForm, { FieldTypes } from '../../../components/XForm';
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import request from '../../../utils/request'
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+ const Edit = (props) => {
+  const [ tab, changeTab ] = useState('basic')
+  const newsId = props.location.query.newsId
+  const [ dynamicData, setDynamicData ] = useState({})
+  if(newsId){
+    useEffect(() => {
+      getDynamicData(newsId);
+    },[])
+
+  // 查询列表
+  const getDynamicData = (newsId) => {
+    request({
+        url: '/api/admin/taNews/' + newsId,
+        method: 'GET',
+        params: { newsId },
+    }).then((data) => {
+        console.log(data)
+        setDynamicData(data)
+    })
+  }
+  }
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/news/list/NewsList',
+    });
+  }
+
+  const Basic = (props) => {
+    const fields = [
+      {
+        label: '意向项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: dynamicData.buildingId,
+        rules: [
+          {required: true, message: '请选择所属项目'},
+        ]
+      },
+      {
+        label: '资讯图片',
+        name: 'newsImg',
+        type: FieldTypes.ImageUploader,
+        value: dynamicData.newsImg,
+      },
+      {
+        label: '资讯标题',
+        name: 'newsName',
+        type: FieldTypes.Text,
+        value: dynamicData.newsName,
+        rules: [
+          {required: true, message: '请输入资讯标题'},
+        ]
+      },
+      {
+        label: '资讯类型',
+        name: 'newsTypeId',
+        render: <NewsTypeSelect />,
+        value: dynamicData.newsTypeId,
+        rules: [
+          {required: true, message: '请选择资讯类型'},
+        ]
+      },
+      {
+        label: '资讯详情',
+        name: 'desc',
+        render: <Wangedit />,
+        value: dynamicData.desc,
+      },
+    ]
+  
+    const handleSubmit = val => { 
+      let {...submitValue} = val
+      if(dynamicId){
+        submitValue.dynamicId = dynamicId
+        request({
+          url: '/api/admin/buildingDynamic/update',
+          method: 'PUT',
+          data: submitValue,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }else{
+        request({
+          url: '/api/admin/taNews',
+          method: 'POST',
+          data: submitValue,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    }
+    
+    return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  }
+  
+  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="basic">基本信息</Radio.Button>
+          <Radio.Button value="poster">海报图片</Radio.Button>
+          <Radio.Button value="share">分享设置</Radio.Button>
+        </Radio.Group>
+      </div>
+      <div>
+        { tab === 'basic' && <Basic /> }
+        { tab === 'poster' && <Poster /> }
+        { tab === 'share' && <Share /> }
+      </div>
+    </div>
+  );
+ }
+
+
+
+export default Edit

src/pages/news/type/NewsType.jsx

@@ -45,7 +45,7 @@ function header(props) {
   }
 
 
-  // 跳转到编辑咨询
+  // 跳转到编辑资讯
   const toEditNews = (id) => () => {
     router.push({
       pathname: '/news/type/editNews',

src/services/apis.js

@@ -92,5 +92,9 @@ export default {
       method: 'GET',
       url: `${prefix}/mine/taPointsRecords/id`,
     },
+    recommend: {
+      method: 'GET',
+      url: `${prefix}/customer/recommend/id`,
+    },
   },
 }