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

src/pages/customer/customerlist/components/attribution.jsx

@@ -0,0 +1,142 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions } from 'antd';
+import moment from 'moment';
+import request from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import Styles from '../style.less';
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+/**
+ * 调整归属
+ *
+ * @param {*} props
+ * @returns
+ */
+class ModalAttribution 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) {
+    // 网路请求
+    request({ ...apis.customer.consultant, 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 })
+  }
+
+  // 提交
+  submitGm() {
+    const { url, method } = apis.customer.recommendEdit
+    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(this.state.visibleData.customerId)
+
+    // 网路请求
+    request({ url: tempUrl, method, data: { ...this.state.visibleData } }).then(res => {
+      this.handleCancel()
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  render() {
+    const columns = [
+      {
+        title: '姓名',
+        dataIndex: 'name',
+        key: 'name',
+      },
+      {
+        title: '电话',
+        dataIndex: 'phone',
+        key: 'phone',
+      },
+      {
+        title: '部门',
+        dataIndex: 'department',
+        key: 'department',
+      },
+      {
+        title: '岗位',
+        dataIndex: 'post',
+        key: 'post',
+      },
+      {
+        title: '操作',
+        dataIndex: 'personId',
+        key: 'personId',
+        // eslint-disable-next-line no-nested-ternary
+        render: (_, record) => <><Button className={Styles.SubmitButton} onClick={() => this.submitGm()}>确定</Button></>,
+      },
+    ]
+    return (
+      <>
+        <Modal
+            title="选择置业顾问"
+            width={800}
+            destroyOnClose="true"
+            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>
+      </>
+    );
+  }
+}
+
+export default ModalAttribution

src/pages/customer/customerlist/components/integralRecord.jsx

@@ -0,0 +1,154 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions } from 'antd';
+import moment from 'moment';
+import request from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import Styles from '../style.less';
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+/**
+ * 积分记录
+ *
+ * @param {*} props
+ * @returns
+ */
+class ModalIntegralRecord extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+       dataSource: { result: { records: [] }, totalPoints: 0 },
+       visibleData: { visible: false, customerId: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount() {
+    this.getList({ pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate(preProps, preState) {
+    console.log(this.props.visibleData)
+    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) {
+    const { customerId } = this.state.visibleData
+    if (customerId === '' || customerId === undefined) {
+      return
+    }
+    // 网路请求
+    const { url, method } = apis.customer.taPointsRecords
+    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 })
+  }
+
+  // 积分类型
+  showChangeType(str) { 
+
+    switch (str) {
+      case 'goods':
+        return '兑换商品'
+      case 'checkin':
+        return '签到'
+      case 'share-poster':
+        return '分享'
+      case 'signup-agent':
+        return '注册经纪人'
+      case 'recommend-customer':
+        return '推荐客户'
+      default:
+        return '未知类型'
+    }
+  }
+  
+  // 判断是否是 - 开头
+  subPoints(points) { 
+    let subStr = points.toString().substring(0, 1)
+    if (subStr === '-') {
+      return true
+    }
+    return false
+  }
+
+  render() {
+    const columns = [
+      {
+        title: '序号',
+        dataIndex: 'index',
+        key: 'index',
+      },
+      {
+        title: '积分类型',
+        dataIndex: 'changeType',
+        key: 'changeType',
+        render: (_, record) => { this.showChangeType(record.changeType) },
+      },
+      {
+        title: '积分变化',
+        dataIndex: 'pointsAmount',
+        key: 'pointsAmount',
+        render: (_, record) => { <span style={this.subPoints(record.pointsAmount) && {color: 'red'}}>{ record.pointsAmount }</span> },
+      },
+      {
+        title: '发生时间',
+        dataIndex: 'createDate',
+        key: 'createDate',
+        render: (_, record) => { moment(record.createDate).format('YYYY-MM-DD') },
+      },
+    ]
+    return (
+      <>
+        <Modal
+            title={ "当前可用积分：" + this.state.dataSource.totalPoints }
+            width={800}
+            destroyOnClose="true"
+            footer={null}
+            visible={this.state.visibleData.visible}
+            // onOk={() => this.handleOk()}
+            onCancel={(e) => this.handleCancel(e)}
+          >
+            <Table dataSource={this.state.dataSource.result.records} columns={columns} pagination={{ total: this.state.dataSource.result.total, onChange: e => this.onChange(e) }} />
+          </Modal>
+      </>
+    );
+  }
+}
+
+export default ModalIntegralRecord

src/pages/customer/customerlist/index.jsx

@@ -5,140 +5,14 @@ import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
 
+import Attribution from './components/attribution'
+import IntegralRecord from './components/integralRecord'
+
 
 const { Option } = Select;
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const { Meta } = Card;
 
-/**
- * 调整归属
- *  (废弃， 后面研究)
- *
- * @param {*} props
- * @returns
- */
-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) {
-    // 网路请求
-    request({ ...apis.customer.consultant, 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 })
-  }
-
-  // 提交
-  submitGm() {
-    const { url, method } = apis.customer.recommendEdit
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(this.state.visibleData.customerId)
-
-    // 网路请求
-    request({ url: tempUrl, method, data: { ...this.state.visibleData } }).then(res => {
-      this.handleCancel()
-    }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
-    })
-  }
-
-  render() {
-    const columns = [
-      {
-        title: '姓名',
-        dataIndex: 'name',
-        key: 'name',
-      },
-      {
-        title: '电话',
-        dataIndex: 'phone',
-        key: 'phone',
-      },
-      {
-        title: '部门',
-        dataIndex: 'department',
-        key: 'department',
-      },
-      {
-        title: '岗位',
-        dataIndex: 'post',
-        key: 'post',
-      },
-      {
-        title: '操作',
-        dataIndex: 'personId',
-        key: 'personId',
-        // eslint-disable-next-line no-nested-ternary
-        render: (_, record) => <><Button className={Styles.SubmitButton} onClick={() => this.submitGm()}>确定</Button></>,
-      },
-    ]
-    return (
-      <>
-        <Modal
-            title="选择置业顾问"
-            destroyOnClose="true"
-            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>
-      </>
-    );
-  }
-}
-
 /**
  *
  *
@@ -161,6 +35,12 @@ function body(props) {
 
   // 调整归属 ============= end
 
+  // 积分记录 ============  start
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [recordVisibleData, setRecordVisibleData] = useState({ visible: false, personId: '' })
+
+  // 积分记录 ============= end
+
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     getList({ pageNumber: 1, pageSize: 10, customerType })
@@ -272,13 +152,13 @@ function body(props) {
       // eslint-disable-next-line no-nested-ternary
       render: (_, record) => (
         <>
-          <sapn className={ customerType === 'private' ? Styles.text : Styles.displayS }>变更状态</sapn>
+          <Button className={ customerType === 'private' ? Styles.text : Styles.displayS } type="link">变更状态</Button>
           &nbsp;&nbsp;
-          <sapn className={ customerType === 'private' ? Styles.text : Styles.displayS } onClick={() => gM(record)}>调整归属</sapn>
+          <Button className={ customerType === 'private' ? Styles.text : Styles.displayS } type="link" onClick={() => gM(record)}>调整归属</Button>
           <br/>
-          <sapn className={ Styles.text }>查看详情</sapn>
+          <Button className={ customerType === 'private' ? Styles.text : Styles.displayS } type="link">查看详情</Button>
           &nbsp;&nbsp;
-          <sapn className={ Styles.text }>积分记录</sapn>
+          <Button className={ customerType === 'private' ? Styles.text : Styles.displayS } type="link" onClick={ () => setRecordVisibleData({ visible: true, customerId: record.customerId }) }>积分记录</Button>
         </>
       ),
     },
@@ -345,8 +225,10 @@ function body(props) {
       <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
 
         {/* 调整归属 */}
-        <ModalTable visibleData={gVisibleData} />
+        <Attribution visibleData={gVisibleData} />
 
+        {/* 积分记录 */}
+        <IntegralRecord visibleData={recordVisibleData} />
     </>
   );
 }

src/services/apis.js

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