合并

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

@@ -76,7 +76,7 @@ class ModalIntegralRecord extends React.Component {
   }
 
   // 积分类型
-  showChangeType(str) { 
+  showChangeType(str) {
     switch (str) {
       case 'goods':
         return '兑换商品'
@@ -88,56 +88,62 @@ class ModalIntegralRecord extends React.Component {
         return '注册经纪人'
       case 'recommend-customer':
         return '推荐客户'
+        case 'group':
+        return '拼团'
+        case 'recommend-customer':
+        return '推荐客户'
       default:
         return '未知类型'
     }
   }
-  
+
   // 判断是否是 - 开头
-  subPoints(points) { 
-    let subStr = points.toString().substring(0, 1)
+  subPoints(points) {
+    const subStr = points.toString().substring(0, 1)
     if (subStr === '-') {
       return true
     }
     return false
   }
 
+// eslint-disable-next-line class-methods-use-this
   render() {
     const columns = [
       {
         title: '序号',
         dataIndex: 'index',
         key: 'index',
+        render: (text, record, index) => <span>{(this.state.dataSource.result.total - this.state.dataSource.result.records.length) * 1 + index + 1}</span>,
       },
       {
         title: '积分类型',
         dataIndex: 'changeType',
         key: 'changeType',
-        render: (_, record) => { this.showChangeType(record.changeType) },
+        render: (_, record) => <span>{this.showChangeType(record.changeType) }</span>,
       },
       {
         title: '积分变化',
         dataIndex: 'pointsAmount',
         key: 'pointsAmount',
-        render: (_, record) => { <span style={this.subPoints(record.pointsAmount) && {color: 'red'}}>{ record.pointsAmount }</span> },
+        // render: (pointsAmount, record) => { <span style={this.subPoints(pointsAmount) && {color: 'red'}}>{ pointsAmount }</span> },
       },
       {
         title: '发生时间',
         dataIndex: 'createDate',
         key: 'createDate',
-        render: (text, records) => { moment(records.createDate).format('YYYY-MM-DD') },
+        render: (createDate, records) => <span> {moment(createDate).format('YYYY-MM-DD')}</span>,
       },
     ]
     return (
       <>
         <Modal
-            title={ "当前可用积分：" + this.state.dataSource.totalPoints }
+            title={ '当前可用积分：' + this.state.dataSource.totalPoints }
             width={800}
             destroyOnClose="true"
             footer={null}
             visible={this.state.visibleData.visible}
             // onOk={() => this.handleOk()}
-            onCancel={(e) => this.handleCancel(e)}
+            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>

src/pages/customer/customerlist/customerDetail.jsx

@@ -98,8 +98,8 @@ function onChange(number) {
     {
       title: 'Name',
       dataIndex: 'name',
-      width:500,
-    render: (_, record) => <span stytle={{width:'450px'}} >{record.buildingName}</span>,
+      width: 500,
+    render: (_, record) => <span>{record.buildingName}</span>,
     },
     {
       title: 'Address',
@@ -169,7 +169,7 @@ function onChange(number) {
         <div className={styles.leftBoxCentre}>
           <div className={styles.tit}>
                 <span>项目名称</span>
-                <span style={{ marginLeft: '47%' }}>意向值</span>
+                <span style={{ marginLeft: '50%' }}>意向值</span>
           </div>
           {/* <img className={styles.touxiang} src={ data.picture && data.picture } /> */}
           <div className={styles.infoItem}>

src/pages/customer/customerlist/index.jsx

@@ -135,7 +135,7 @@ function body(props) {
   }
 
   function showRecord(record) {
-    setRecordVisibleData({ visible: true, customerId: record.customerId })
+    setRecordVisibleData({ visible: true, customerId: record.personId })
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })