合并

src/pages/building/list/index.jsx

@@ -230,7 +230,21 @@ function body(props) {
 
 
   function toAdd() {
-    router.push({ pathname: '/building/list/add' })
+    // 判断楼盘是否最可以添加
+    request({ ...apis.building.verifyMax}).then(res => {
+      router.push({ pathname: '/building/list/add' })
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+      return
+    })
   }
 
   /**

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

@@ -27,7 +27,7 @@ class ModalIntegralRecord extends React.Component {
 
   // 挂载之后
   componentDidMount() {
-    // this.getList({ pageNumber: 1, pageSize: 5 })
+    this.getList({ pageNumber: 1, pageSize: 5 })
   }
 
   componentDidUpdate(preProps, preState) {
@@ -77,7 +77,6 @@ class ModalIntegralRecord extends React.Component {
 
   // 积分类型
   showChangeType(str) { 
-
     switch (str) {
       case 'goods':
         return '兑换商品'
@@ -126,7 +125,7 @@ class ModalIntegralRecord extends React.Component {
         title: '发生时间',
         dataIndex: 'createDate',
         key: 'createDate',
-        render: (_, record) => { moment(record.createDate).format('YYYY-MM-DD') },
+        render: (text, records) => { moment(records.createDate).format('YYYY-MM-DD') },
       },
     ]
     return (
@@ -140,7 +139,7 @@ class ModalIntegralRecord extends React.Component {
             // onOk={() => this.handleOk()}
             onCancel={(e) => this.handleCancel(e)}
           >
-            <Table dataSource={this.state.dataSource.result.records} rowKey="integralrecord" columns={columns} pagination={{ total: this.state.dataSource.result.total, onChange: e => this.onChange(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/components/recommend.jsx

@@ -109,7 +109,7 @@ class ModalRecommendRecord extends React.Component {
         title: '推荐时间',
         dataIndex: 'createDate',
         key: 'createDate',
-        render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD') }</span></>,
+        render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD hh:mm:ss') }</span></>,
       },
       {
         title: '状态',

src/pages/customer/customerlist/customerDetail.jsx

@@ -83,7 +83,7 @@ function onChange(number) {
       dataIndex: 'visitTime',
       key: 'visitTime',
       align: 'center',
-      render: (_, record) => <span> {moment(record.visitTime).format('YYYY-MM-DD hh:mm:ss') }</span>,
+      render: (_, record) => <span> {moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss') }</span>,
     },
     {
       title: '停留时间',

src/pages/customer/customerlist/index.jsx

@@ -207,6 +207,7 @@ function body(props) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: false, customerId: '', status: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
+    getList({ pageNum: 1, pageSize: 10, customerType, ...props.form.getFieldsValue() })
   }
 
   const publicColumns = [

src/pages/customer/customerlist/publicCustomerDetail.jsx

@@ -84,7 +84,7 @@ function onChange(number) {
       dataIndex: 'visitTime',
       key: 'visitTime',
       align: 'center',
-      render: (_, record) => <span> {moment(record.visitTime).format('YYYY-MM-DD hh:mm:ss') }</span>,
+      render: (_, record) => <span> {moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss') }</span>,
     },
     {
       title: '停留时间',

src/services/apis.js

@@ -45,6 +45,11 @@ export default {
       url: `${prefix}/buildinglist`,
       action: 'admin.buildinglist.get',
     },
+    verifyMax: {
+      method: 'GET',
+      url: `${prefix}/verifyMax`,
+      action: 'admin.verifyMax.get',
+    },
     updateStatus: {
       method: 'PUT',
       url: `${prefix}/building/update/status`,