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

config/config.js

@@ -84,6 +84,7 @@ export default {
     ie: 11,
   },
   publicPath: './',
+  // publicPath: 'https://njcjweb.oss-accelerate.aliyuncs.com/admin/',
   history: 'hash',
   devtool: isAntDesignProPreview ? 'source-map' : false,
   // umi routes: https://umijs.org/zh/guide/router.html

config/routes.js

@@ -521,30 +521,36 @@ export default [
               },
             ],
           },
-          {
-            path: '/house',
-            name: '在线选房',
-            component: '../layouts/BlankLayout',
-            routes: [
-              {
-                path: '/house/list',
-                name: '房源管理',
-                component: './house/list/index',
-              },
-              {
-                path: '/house/add',
-                name: '新增', 
-                hideInMenu: true,
-                component: './house/add/index',
-              },
-              {
-                path: '/house/edit',
-                name: '编辑', 
-                hideInMenu: true,
-                component: './house/edit/index',
-              },
-            ],
-          },
+          // {
+          //   path: '/house',
+          //   name: '在线选房',
+          //   component: '../layouts/BlankLayout',
+          //   routes: [
+          //     {
+          //       path: '/house/list',
+          //       name: '房源管理',
+          //       component: './house/list/index',
+          //     },
+          //     {
+          //       path: '/house/add',
+          //       name: '新增', 
+          //       hideInMenu: true,
+          //       component: './house/add/index',
+          //     },
+          //     {
+          //       path: '/house/batch',
+          //       name: '批量上传', 
+          //       hideInMenu: true,
+          //       component: './house/add/HouseBatchAdd',
+          //     },
+          //     {
+          //       path: '/house/edit',
+          //       name: '编辑', 
+          //       hideInMenu: true,
+          //       component: './house/edit/index',
+          //     },
+          //   ],
+          // },
           // {
           //   path: '/miniapp',
           //   name: '小程序管理',

src/components/HouseSelect/ApartmentSelect.jsx

@@ -38,7 +38,7 @@ const ApartmentSelect = props => {
 
   const checkValue = (data) => {
     if (props.value) {
-      const tempData = data.filter(f => f.buildingId == props.value)
+      const tempData = data.filter(f => f.apartmentId == props.value)
       const va = (tempData.length > 0) ? props.value : '已删除，请重新选择'
       props.onChange(va)
 

src/pages/customer/customerlist/index.jsx

@@ -58,6 +58,8 @@ function body(props) {
 
   const [assistVisibleData, setAssistVisibleData] = useState({visible: false, customerId: ''})
 
+  const [loadingStatus, setLoadingStatus] = useState(false)
+
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     getList({ pageNumber: 1, pageSize: 10, customerType })
@@ -192,12 +194,15 @@ function body(props) {
   }
 
   function exportCustomer () {
+    setLoadingStatus(true)
     const fieldsValue = getFieldsValue()
     request({ ...apis.customer.customerRecommendExport, responseType: 'blob', params: { ...fieldsValue, customerType } })
       .then(response => {
         download(response)
+        setLoadingStatus(false)
       }).catch(error => {
-
+        message.err("连接超时");
+        setLoadingStatus(false)
       })
   }
 
@@ -459,11 +464,11 @@ function body(props) {
             </Button>
         </Form.Item>
       </Form>
-      {/* <AuthButton name="admin.customer.import" noRight={null}>
-        <Button type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+      <AuthButton name="admin.customer.import" noRight={null}>
+        <Button type="primary" loading={loadingStatus} onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
           导出
         </Button>
-      </AuthButton> */}
+      </AuthButton>
 
       <div style={{ margin: '20px 0'}}>
           <Radio.Group value={customerType} onChange={radioButtonHandleSizeChange} buttonStyle="solid">

src/pages/house/add/HouseBatchAdd.jsx

@@ -0,0 +1,148 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload, Table } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import moment from 'moment';
+import router from 'umi/router';
+import { fetch } from '../../../utils/request';
+import apis from '../../../services/apis';
+import XForm, { FieldTypes } from '../../../components/XForm';
+import ApartmentSelect from '../../../components/HouseSelect/ApartmentSelect';
+import request from '@/utils/request';
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+function HouseBatchAdd(props) {
+
+const [data, setData] = useState({list: [], total: 0})
+
+const [uploadFile, setUploadFile] = useState(null)
+
+const uploadExcel = fetch(apis.house.uploadExcel)
+
+const uploaderProps = {
+  name: 'file',
+  accept: '.xls, .xlsx',
+  showUploadList: false,
+  customRequest({
+    action,
+    file,
+    headers,
+    onError,
+    onProgress,
+    onSuccess,
+    withCredentials,
+  }) {
+     
+    const data = new FormData()
+    data.append('file', file)
+    data.append('salesBatchId', props.location.query.salesBatchId)
+    data.append('buildingId', props.location.query.buildingId)
+
+    setUploadFile(file)
+
+    uploadExcel({ data }).then((res) => {
+      setData(res)
+      onSuccess(res, file);
+    }).catch(onError);
+
+    return {
+      abort() {
+        console.log('upload progress is aborted.');
+      },
+    };
+  },
+}
+
+//取消
+function handleCancel(){
+  router.push({
+    pathname: '/house/edit',
+    query: {
+      id: props.location.query.salesBatchId,
+      buildingId: props.location.query.buildingId,
+    },
+  });
+}
+
+function batchSaveHouse() {
+  const uploadData = new FormData()
+  uploadData.append('file', uploadFile)
+  uploadData.append('salesBatchId', props.location.query.salesBatchId)
+  uploadData.append('buildingId', props.location.query.buildingId)
+
+  request({ ...apis.house.saveExcelValue, data: uploadData,headers: "content-type=multipart/form-data" }).then(res => {
+    message.info('新增房源成功！请确认全部数据正常，然后在房源详情页 销售批次栏 选择 发布状态 为“是” 将房源 发布到小程序。如需要置业顾问或用户分享，请在房源详情中配套海报图和分享图。')
+    router.push({
+      pathname: '/house/edit',
+      query: {
+        id: props.location.query.salesBatchId,
+        buildingId: props.location.query.buildingId,
+      },
+    });
+  }).catch(err => {
+    // openNotificationWithIcon('error', err.message)
+  })
+}
+
+const columns = [
+  {
+    title: '期/区',
+    dataIndex: 'termName',
+    key: 'termName',
+  },
+  {
+    title: '楼栋',
+    dataIndex: 'blockName',
+    key: 'blockName',
+  },
+  {
+    title: '单元',
+    dataIndex: 'unitName',
+    key: 'unitName',
+  },
+  {
+    title: '层',
+    dataIndex: 'floorName',
+    key: 'floorName',
+  },
+  {
+    title: '房号',
+    dataIndex: 'roomName',
+    key: 'roomName',
+  },
+  {
+    title: '价格（万元）',
+    dataIndex: 'price',
+    key: 'price',
+  },
+  {
+    title: '预选基础热度',
+    dataIndex: 'heat',
+    key: 'heat',
+  },
+  {
+    title: '发布状态',
+    dataIndex: 'status',
+    key: 'status',
+    render: status => <><span>{status == 0 ? '否' : status == 1 ? '是' : ''}</span></>,
+  },
+]
+
+  return (
+    <>
+      <span>1.导入房源先下载模板--></span><a href="https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1581597350487-房源模板.xlsx" download="房源模板.xlsx"><Button type="primary" htmlType="submit">下载模板</Button></a><br/>
+      <span>2.使用excel打开模板文件，编辑房源数据并保存</span><br/>
+      <span>3.将编辑好的文件上传--></span><Upload {...uploaderProps}><Button type="primary" htmlType="submit">上传</Button></Upload><br/>
+      <span>4.检查导入的数据是否正常 ↓，不正常则重新编辑保存再次上传，请仔细阅读模板中的编辑规则</span>
+      <Table dataSource={data.list} columns={columns} pagination={{ total: data.total}}  rowKey="House" />
+      
+      <span>5.全部正常请点击提交</span>
+      <Button type="primary" onClick={() => batchSaveHouse()}>提交</Button>
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <span>暂时未确定房源?  --></span><Button onClick={() => handleCancel()}>以后处理</Button>
+    </>
+  )
+}
+const WrappedHouseBatchAdd = Form.create({ name: 'house_batch' })(HouseBatchAdd);
+export default WrappedHouseBatchAdd

src/pages/house/add/index.jsx

@@ -7,6 +7,7 @@ import moment from 'moment';
 import styles from '../../style/GoodsList.less';
 import SelectCity from '../../../components/SelectButton/CitySelect'
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import ImageUpload from '../../../components/XForm/ImageUpload'
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
 import AuthButton from '@/components/AuthButton';
@@ -15,6 +16,8 @@ const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 
+
+
 const header = props => {
   const { salesBatchId } = props.location.query
   console.log(salesBatchId)
@@ -26,11 +29,11 @@ const header = props => {
 
   // 查询列表
   const getSaleBatchData = (salesBatchId) => {
-    request({ ...apis.system.taPolicy, urlData: {id: salesBatchId} }).then((data) => {
-        console.log(data)
-        setSaleBatchData(data)
-    })
-  }
+      request({ ...apis.system.taPolicy, urlData: {id: salesBatchId} }).then((data) => {
+          console.log(data)
+          setSaleBatchData(data)
+      })
+    }
   }
 
   const cancelPage = () =>{
@@ -38,79 +41,13 @@ const header = props => {
       pathname: '/house/list',
     });
   }
-    const fields = [
-      {
-        label: '销售批次名',
-        name: 'salesBatchName',
-        type: FieldTypes.Text,
-        value: saleBatchData.salesBatchName,
-        rules: [
-          {
-            required: true,
-            message: '销售批次名',
-          },
-        ],
-      },
-      {
-        label: '销售楼盘',
-        name: 'buildingId',
-        render: <BuildSelect />,
-        value: saleBatchData.buildingId,
-        rules: [
-          {
-            required: true,
-            message: '请选择销售楼盘',
-          },
-        ],
-      },
-      {
-        label: '备注',
-        name: 'remark',
-        type: FieldTypes.Text,
-        value: saleBatchData.remark,
-      },
-      {
-        label: '发布状态',
-        name: 'status',
-        type: FieldTypes.Select,
-        dict: [{label:"否",value:0},{label:"是",value:1}],
-        value: saleBatchData.status != null ? saleBatchData.status : 1,
-        rules: [
-          {
-            required: true,
-            message: '请选择发布状态',
-          },
-        ],
-      },
-      {
-        label: '预选时间',
-        name: 'preSelectTime',
-        type: FieldTypes.RangePicker,       
-        value: saleBatchData.preselectionStartTime != null ? [moment(saleBatchData.preselectionStartTime, 'YYYY-MM-DD HH:mm:ss'), moment(saleBatchData.preselectionEndTime, 'YYYY-MM-DD HH:mm')] : null,
-        props: { showTime: { format: 'HH:mm:ss' }},
-        rules: [
-          { required: true, message: '请选择预选时间' },
-        ],
-      },
-      {
-        label: '分栋鸟瞰图',
-        name: 'aerialViewImg',
-        type: FieldTypes.ImageUploader,
-        value: saleBatchData.aerialViewImg,
-        help: '建议图片尺寸：220*176px，比例5:4,格式：jpg，文件小于300KB。分栋鸟瞰图会显示在楼盘详情页面。用户点击进入查看全部发布房源。可以适当在图中添加引导语。',
-        rules: [
-          {
-            required: true,
-            message: '请选择分栋鸟瞰图',
-          },
-        ],
-      },
-    ]
-  
-    const handleSubmit = values => { 
-     console.log('submit data --->', values)
-      
-     let {preSelectTime, ...submitValue} = values
+
+
+  function handleSubmit (e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err){
+        let {preSelectTime, ...submitValue} = values
         if(null != preSelectTime && preSelectTime.length > 0){
           const [preselectionStartTime, preselectionEndTime] = preSelectTime
           submitValue.preselectionStartTime = moment(preselectionStartTime).format('YYYY-MM-DD HH:mm:ss');
@@ -122,17 +59,77 @@ const header = props => {
         // getList({ pageNum: pageNumber, pageSize: 10, ...submitValue })
         console.log(submitValue)
         request({ ...apis.house.addTaSalesBatch, data: { ...submitValue },}).then((data) => {
-          message.info("保存成功")
-          cancelPage()
-      }).catch((err) => {
-        message.info(err.msg || err.message)
-      })
-    }
-     
+          message.info("保存成功,请上传房源")
+          console.log(data,"datattttttt")
+          router.push({
+            pathname: '/house/batch',
+            query: {
+              salesBatchId: data.salesBatchId,
+              buildingId: data.buildingId,
+            },
+          });
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
 
   return (
-    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
-  );
+    <>
+      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+        <Form.Item label="销售批次名">
+          {getFieldDecorator('salesBatchName', {
+            rules: [{ required: true, message: '请输入销售批次名' }],
+          })(<Input maxLength={20} />)}
+        </Form.Item>
+        <Form.Item label="销售楼盘">
+          {getFieldDecorator('buildingId', {
+            rules: [{ required: true, message: ' 请输入销售楼盘' }],
+          })(<BuildSelect />)}
+        </Form.Item>
+        <Form.Item label="备注">
+          {getFieldDecorator('remark')
+            (<Input maxLength={20}/>)}
+        </Form.Item>
+        <Form.Item label="发布状态">
+          {getFieldDecorator('status', {
+              rules: [{ required: true, message: '请选择发布状态' }],
+            })(<Select placeholder="发布状态" style={{ width: '300px' }}>
+            <Option value="0">否</Option>
+            <Option value="1">是</Option>
+          </Select>)}
+        </Form.Item>
+        <Form.Item label="预选时间">
+            {getFieldDecorator('preSelectTime', {
+              rules: [
+                {
+                  required: true,
+                  message: '请选择预选时间',
+                },
+              ],
+            })(<RangePicker style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+        </Form.Item>
+        <Form.Item label="分栋鸟瞰图" help="建议尺寸：690*388px，比例16::9，格式：jpg，文件小于300KB。分栋鸟瞰图会显示在楼盘详情页面。用户点击进入查看全部发布房源。可以适当在图中添加引导语。">
+              {getFieldDecorator('aerialViewImg', {
+                  rules: [{ required: true, message: '请上传分栋鸟瞰图' }],
+              })(
+                <ImageUpload />,
+              )}
+        </Form.Item>  
+        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
+          <Button type="primary" htmlType="submit"style={{marginRight:'20px'}}>
+            下一步
+          </Button>
+          <Button onClick={() => router.go(-1)}>
+            取消
+          </Button>
+        </Form.Item>
+      </Form>
+    </>
+  )
 }
 
 const WrappedHeader = Form.create({ name: 'header' })(header);

src/pages/house/edit/components/EnDash/index.jsx

@@ -0,0 +1,14 @@
+import React from 'react'
+
+export default function EnDash(props) {
+    const { size = 1, color = '#999', style = {}, ...left } = props
+
+    const newSt = { 
+        ...style,
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+    }
+
+    return <div style={newSt} { ...left }><hr style={{ border: 'none', borderBottom: `${size}px dashed ${color}`, width: '100%' }} /></div>
+}

src/pages/house/edit/components/HelpDoc/index.jsx

@@ -0,0 +1,109 @@
+import React, { PureComponent } from 'react'
+import { Modal, Row, Col } from 'antd'
+import EnDash from '../EnDash'
+
+import Style from './style.less'
+import HotBlock from '../HotBlock'
+
+const dataset = [
+  {
+    label: '(0)',
+    value: 0,
+  },
+  {
+    label: '(1)',
+    value: 1,
+  },
+  {
+    label: '(2)',
+    value: 2,
+  },
+  {
+    label: '(3)',
+    value: 3,
+  },
+  {
+    label: '(4)',
+    value: 4,
+  },
+  {
+    label: '(5)',
+    value: 5,
+  },
+  {
+    label: '(6~10)',
+    value: 8,
+  },
+  {
+    label: '(11~20)',
+    value: 15,
+  },
+  {
+    label: '(21~30)',
+    value: 25,
+  },
+  {
+    label: '(31~40)',
+    value: 35,
+  },
+  {
+    label: '(41~50)',
+    value: 45,
+  },
+  {
+    label: '(51~100)',
+    value: 80,
+  },
+  {
+    label: '(101~200)',
+    value: 150,
+  },
+  {
+    label: '(200以上)',
+    value: 201,
+  },
+]
+
+function Cell(props) {
+  return (
+    <Row type="flex" align="middle" gutter={20}>
+      <Col span={4}>{props.left}</Col>
+      <Col span={12}><EnDash /></Col>
+      <Col span={6}>{props.right}</Col>
+    </Row>
+  )
+}
+
+export default function HelpDoc(props) {
+  return (
+    <Modal footer={null} title="相关说明" visible={props.visible} onCancel={props.onCancel} width={800}>
+      <div className={Style.article}>
+        <div className={Style.section}>
+          <div className={Style.title}>1.图例解释：</div>
+          <div>
+            <Cell left="1号楼" right="楼栋/幢" />
+            <Cell left="2单元" right="单元" />
+            <Cell left="3楼" right="楼层" />
+            <Cell left="301" right="房号" />
+            <Cell left="1人" right="预选人数" />
+            <Cell left="234万" right="价格" />
+            <Cell left="A户型" right="户型名" />
+          </div>
+        </div>
+        <div className={Style.section}>
+          <div className={Style.title}>2.预选人数（热度）：</div>
+          <div>每有一位客户预选此房源，热度自动增加1，热度越大说明想购买此房源的用户越多，认筹摇号购买难度越大。</div>
+        </div>
+        <div className={Style.section}>
+          <div className={Style.title}>3.热度指标:</div>
+          <div className={Style.subtitle}>颜色越深代表热度越高。黑底白字代表房源未发布,未发布房源用户不会看到。</div>
+          <div className={Style.flex}>
+            {
+              dataset.map((block) => (<div className={Style['flex-item']} key={block.value}><HotBlock number={block.value}>{block.label}</HotBlock></div>))
+            }
+          </div>
+        </div>
+      </div>
+    </Modal>
+  );
+}

src/pages/house/edit/components/HelpDoc/style.less

@@ -0,0 +1,36 @@
+.article {
+    .section {
+        font-size: 16px;
+        line-height: 1.8em;
+        color: #666;
+
+        & + .section {
+            margin-top: 24px;
+        }
+    }
+
+    .title {
+        font-size: 18px;
+        line-height: 2em;
+        color: #333;
+    }
+
+    .subtitle {
+        font-size: 14px;
+        line-height: 1.6em;
+        color: #999;
+    }
+
+    .flex {
+        display: flex;
+        flex-wrap: wrap;
+
+        .flex-item {
+            margin-top: 16px;
+            margin-right: 8px;
+            flex: none;
+            width: 100px;
+            text-align: center;
+        }
+    }
+}

src/pages/house/edit/components/HotBlock/index.jsx

@@ -0,0 +1,40 @@
+import React from 'react'
+import classNames from 'classnames'
+
+import Style from './style.less'
+
+function computeLevel (num) {
+    switch (true) {
+      case num >= 200:
+        return 13;
+      case num > 100:
+        return 12;
+      case num > 50:
+        return 11;
+      case num > 40:
+        return 10;
+      case num > 30:
+        return 9;
+      case num > 20:
+        return 8;
+      case num > 20:
+        return 8;
+      case num > 10:
+        return 7;
+      case num >= 6:
+        return 6;
+      case num > 0:
+        return num;
+      default:
+        return 0;
+    }
+  }
+  
+  export default function HotBlock(props) {
+    const level = computeLevel(props.number)
+
+    const cls = classNames(Style.hotblock, Style[`bkg-${level}`])
+
+    return (<div className={cls}>{props.children}</div>)
+  }
+  

src/pages/house/edit/components/HotBlock/style.less

@@ -0,0 +1,46 @@
+
+.hotblock {
+    &.bkg-0 {
+      background:#F8F8F8;
+    }
+    &.bkg-1 {
+      background:#F9DED1;
+    }
+    &.bkg-2 {
+      background:#F6D4C3;
+    }
+    &.bkg-3 {
+      background:#F8C6AD;
+    }
+    &.bkg-4 {
+      background:#FDDBDB;
+    }
+    &.bkg-5 {
+      background:#F9CCCC;
+    }
+    &.bkg-6 {
+      background:#F9B7B7;
+    }
+    &.bkg-7 {
+      background:#FFADAD;
+    }
+    &.bkg-8 {
+      background:#F59683;
+    }
+    &.bkg-9 {
+      background:#F7836C;
+    }
+    &.bkg-10 {
+      background:#F97459;
+    }
+    &.bkg-11 {
+      background:#FC6749;
+    }
+    &.bkg-12 {
+      background:#FD4E2B;
+    }
+    &.bkg-13 {
+      background:#FE2E2E;
+    }
+  }
+  

src/pages/house/edit/components/HouseBatch.jsx

@@ -0,0 +1,136 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload, Table } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import moment from 'moment';
+import router from 'umi/router';
+import { fetch } from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import XForm, { FieldTypes } from '../../../../components/XForm';
+import ApartmentSelect from '../../../../components/HouseSelect/ApartmentSelect';
+import request from '@/utils/request';
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+function HouseBatch(props) {
+
+const [data, setData] = useState({list: [], total: 0})
+
+const [uploadFile, setUploadFile] = useState(null)
+
+const uploadExcel = fetch(apis.house.uploadExcel)
+
+const uploaderProps = {
+  name: 'file',
+  accept: '.xls, .xlsx',
+  showUploadList: false,
+  customRequest({
+    action,
+    file,
+    headers,
+    onError,
+    onProgress,
+    onSuccess,
+    withCredentials,
+  }) {
+     
+    const data = new FormData()
+    data.append('file', file)
+    data.append('salesBatchId', props.salesBatchId)
+    data.append('buildingId', props.buildingId)
+
+    setUploadFile(file)
+
+    uploadExcel({ data }).then((res) => {
+      setData(res)
+      onSuccess(res, file);
+    }).catch(onError);
+
+    return {
+      abort() {
+        console.log('upload progress is aborted.');
+      },
+    };
+  },
+}
+
+//取消
+function handleCancel(){
+    props.onSuccess({type: "house"})
+}
+
+function batchSaveHouse() {
+  const uploadData = new FormData()
+  uploadData.append('file', uploadFile)
+  uploadData.append('salesBatchId', props.salesBatchId)
+  uploadData.append('buildingId', props.buildingId)
+
+  request({ ...apis.house.saveExcelValue, data: uploadData,headers: "content-type=multipart/form-data" }).then(res => {
+    message.info('上传成功')
+    props.onSuccess({type: "house"})
+  }).catch(err => {
+    // openNotificationWithIcon('error', err.message)
+  })
+}
+
+const columns = [
+  {
+    title: '期/区',
+    dataIndex: 'termName',
+    key: 'termName',
+  },
+  {
+    title: '楼栋',
+    dataIndex: 'blockName',
+    key: 'blockName',
+  },
+  {
+    title: '单元',
+    dataIndex: 'unitName',
+    key: 'unitName',
+  },
+  {
+    title: '层',
+    dataIndex: 'floorName',
+    key: 'floorName',
+  },
+  {
+    title: '房号',
+    dataIndex: 'roomName',
+    key: 'roomName',
+  },
+  {
+    title: '价格（万元）',
+    dataIndex: 'price',
+    key: 'price',
+  },
+  {
+    title: '预选基础热度',
+    dataIndex: 'heat',
+    key: 'heat',
+  },
+  {
+    title: '发布状态',
+    dataIndex: 'status',
+    key: 'status',
+    render: status => <><span>{status == 0 ? '否' : status == 1 ? '是' : ''}</span></>,
+  },
+]
+
+  return (
+    <>
+      <span>1.导入房源先下载模板--></span><a href="https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1581597350487-房源模板.xlsx" download="房源模板.xlsx"><Button type="primary" htmlType="submit">下载模板</Button></a><br/>
+      <span>2.使用excel打开模板文件，编辑房源数据并保存</span><br/>
+      <span>3.将编辑好的文件上传--></span><Upload {...uploaderProps}><Button type="primary" htmlType="submit">上传</Button></Upload><br/>
+      <span>4.检查导入的数据是否正常 ↓，不正常则重新编辑保存再次上传，请仔细阅读模板中的编辑规则</span>
+      <Table dataSource={data.list} columns={columns} pagination={{ total: data.total}}  rowKey="House" />
+      
+      <span>5.全部正常请点击提交</span>
+      <Button type="primary" onClick={() => batchSaveHouse()}>提交</Button>
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <Button onClick={() => handleCancel()}>取消</Button>
+    </>
+  )
+}
+const WrappedHouseBatch = Form.create({ name: 'house_batch' })(HouseBatch);
+export default WrappedHouseBatch

src/pages/house/edit/components/HouseGrid/Floor.jsx

@@ -0,0 +1,21 @@
+import React from 'react'
+import Style from './style.less'
+
+export default function Floor(props) {
+  const { floorName, roomList = [] } = props.dataset || {}
+
+  return (
+    <div className={Style.floor}>
+      <div className={Style['floor-head']}>{floorName}</div>
+      <div className={Style['floor-body']}>
+        {roomList.map((room) => {
+          return (
+            <div className={Style.item} key={room.houseId} >
+              {props.render(room)}
+            </div>
+          )
+        })}
+      </div>
+    </div>
+  );
+}

src/pages/house/edit/components/HouseGrid/Room.jsx

@@ -0,0 +1,31 @@
+import React from 'react'
+import classNames from 'classnames'
+import HotBlock from "../HotBlock"
+import Style from './style.less'
+
+export default function Room(props) {
+  const { roomName, price, apartmentName, status, heat, realHeat } = props.dataset || {}
+  let personNum = props.hotType === 1 ? (heat || 0) : (realHeat || 0)
+  if (props.hotType === 3) {
+    personNum = 0 + heat + realHeat
+  }
+
+  const handleClick = () => {
+    if (props.onClick) {
+      props.onClick(props.dataset || {})
+    }
+  }
+
+  const wanY = Number(price / 10000).toFixed(0)
+
+  return (
+    <HotBlock number={personNum}>
+      <div className={classNames(Style.room, { [`${Style.offline}`]: status !== 1 })} onClick={handleClick}>
+        <div className={Style.warn}>{roomName}</div>
+        <div className={Style.warn}>{`(${personNum}人)`}</div>
+        <div className={Style.info}>{`${wanY} 万`}</div>
+        <div className={Style.info}>{apartmentName}</div>
+      </div>
+    </HotBlock>
+  )
+}

src/pages/house/edit/components/HouseGrid/Unit.jsx

@@ -0,0 +1,15 @@
+import React from 'react'
+import Style from './style.less'
+
+export default function Unit(props) {
+  const { unitName, floorList = [] } = props.dataset || {}
+
+  return (
+    <div className={Style.unit}>
+      <div className={Style['unit-head']}>{unitName}</div>
+      <div className={Style['unit-body']}>
+        {floorList.map(floor => props.render(floor))}
+      </div>
+    </div>
+  )
+}

src/pages/house/edit/components/HouseGrid/index.js

@@ -0,0 +1,37 @@
+import React from 'react'
+import { PageHeader, Card } from 'antd';
+import Floor from "./Floor";
+import Room from "./Room";
+import Unit from './Unit';
+
+
+export default function(props) {
+  const blockList = props.dataset || []
+  
+  // 仅仅是一个函数, 不是函数式组件
+  function renderRoom(room) {
+    return (<Room dataset={room} hotType={props.hotType} />)
+  }
+
+  // 仅仅是一个函数, 不是函数式组件
+  function renderFloor(floor) {
+    return (<Floor key={floor.floorId} dataset={floor} render={renderRoom} />)
+  }
+
+  return (
+    <div>
+      {
+        blockList.map((block) => (
+          <div key={block.blockId} style={{marginTop: '20px', overflowX: 'auto'}}>
+            <PageHeader title={`${block.termName} ${block.blockName}`} backIcon={false} />
+            <div style={{ display: 'flex', padding: '10px' }}>
+            {
+              (block.unitList || []).map((unit) => (<div key={unit.unitId} style={{ flex: 'auto', marginRight: '30px' }} ><Unit dataset={unit} render={renderFloor} /></div>))
+            }
+            </div>
+          </div>
+        ))
+      }
+    </div>
+  )
+}

src/pages/house/edit/components/HouseGrid/style.less

@@ -0,0 +1,72 @@
+.room {
+  text-align: center;
+  margin-bottom: 12px;
+  padding: 10px;
+  font-size: 16px;
+  line-height: 1.4em;
+
+  .info {
+    color: #333;
+  }
+
+  .warn {
+    color: #730000;
+  }
+
+  &.offline {
+    color: #fff;
+    background: #000;
+    
+    .info, .warn {
+      color: #fff;
+    }
+  }
+}
+
+.floor {
+  display: flex;
+
+  &-head {
+    font-size: 20px;
+    padding-top: 36px;
+    flex: none;
+    width: 14%;
+    min-width: 100px;
+    text-align: center;
+  }
+
+  &-body {
+    padding-top: 10px;
+    text-align: center;
+    flex: auto;
+    display: flex;
+    justify-content: flex-start;
+    overflow-x: auto;
+
+    .item {
+      flex: none;
+      width: 110px;
+
+      & + .item {
+          margin-left: 2%;
+      }
+    }
+  }
+}
+
+.unit {
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+  max-width: 600px;
+
+  &-head {
+    padding-left: 40px;
+    font-size: 22px;
+    line-height: 44px;
+    color: #000;
+    background: #f8f8f8;
+  }
+
+  &-body {
+    // padding: 0 20px;
+  }
+}

src/pages/house/edit/components/base.jsx

@@ -45,7 +45,8 @@ const Base = props => {
       rules: [
         {
           required: true,
-          message: '销售批次名',
+          message: '销售批次名不合法',
+          max:20,
         },
       ],
     },
@@ -66,6 +67,12 @@ const Base = props => {
       name: 'remark',
       type: FieldTypes.Text,
       value: saleBatchData.remark,
+      rules: [
+        {
+          message: '最多20字',
+          max:20
+        }
+      ],
     },
     {
       label: '发布状态',
@@ -94,7 +101,7 @@ const Base = props => {
       name: 'aerialViewImg',
       type: FieldTypes.ImageUploader,
       value: saleBatchData.aerialViewImg,
-      help: '建议图片尺寸：220*176px，比例5:4,格式：jpg，文件小于300KB。分栋鸟瞰图会显示在楼盘详情页面。用户点击进入查看全部发布房源。可以适当在图中添加引导语。',
+      help: '建议图片尺寸：690*388px，比例16::9，格式：jpg，文件小于300KB。分栋鸟瞰图会显示在楼盘详情页面。用户点击进入查看全部发布房源。可以适当在图中添加引导语。',
       rules: [
         {
           required: true,
@@ -115,7 +122,7 @@ const Base = props => {
           submitValue.preselectionEndTime = null
         }        
         console.log(submitValue)
-        request({ ...apis.house.updateTaSalesBatch, urlData: {id: salesBatchId},data: values, }).then((data) => {
+        request({ ...apis.house.updateTaSalesBatch, urlData: {id: salesBatchId},data: submitValue, }).then((data) => {
           message.info("保存成功")
           cancelPage()
         }).catch((err) => {

src/pages/house/edit/components/house.jsx

@@ -20,6 +20,8 @@ import ApartmentSelect from '../../../../components/HouseSelect/ApartmentSelect'
 function House(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState([])
+  const [viable, setViable] = useState(false)
+  const [houseIdList, setHouseIdList] = useState([])
 
   useEffect(() => {
     getList()
@@ -58,6 +60,7 @@ function House(props) {
   const rowSelection = {
     onChange: (selectedRowKeys, selectedRows) => {
       console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+      setHouseIdList(selectedRows)
     },
   };
 
@@ -65,6 +68,19 @@ function House(props) {
     props.onSuccess(e);
   }
 
+  //打开model
+  function showAparement() {
+    if(houseIdList.length < 1){
+      openNotificationWithIcon('error', '请先选择需要改变的房源')
+      return
+    }
+    setViable(true)
+  }
+
+  function handleCancel() {
+    setViable(false)
+  }
+
   // 提交事件
   const handleSubmit = e => {
     e.preventDefault();
@@ -76,21 +92,39 @@ function House(props) {
     });
   }
 
+    // model提交事件
+    const handleSubmitApartMent = e => {
+      props.form.validateFields((err, values) => {
+        if (!err) {
+          if(!values.apartmentIdSelected){
+            openNotificationWithIcon('error', '请选择户型')
+            return
+          }
+          request({ ...apis.house.changeApartment, data: { apartmentId: values.apartmentIdSelected, houseIdList } }).then(res => {
+            setViable(false)
+            getList({ pageNumber: 1, pageSize: 10 })
+            openNotificationWithIcon('success', '操作成功')
+          }).catch(err => {
+            openNotificationWithIcon('error', err.message)
+          })
+        }
+      });
+    }
   /**
    * 删除
    *
    * @param {*} record
    */
-  function deleteApartment(record) {
-    confirm({
+  function deleteHouseResource(record) {
+    Modal.confirm({
       title: '确认删除当前数据?',
       content: '确定后成功删除，点击取消则放弃当前操作',
       okText: '确定',
       cancelText: '取消',
       onOk() {
         // 网路请求
-        request({ ...apis.building.buildingApartmentDelete, urlData: { id: record.apartmentId } }).then(res => {
-          getList()
+        request({ ...apis.house.houseDelete, urlData: { id: record.houseId } }).then(res => {
+          getList({ pageNumber: 1, pageSize: 10 })
           openNotificationWithIcon('success', '操作成功')
         }).catch(err => {
           // openNotificationWithIcon('error', err.message)
@@ -107,6 +141,11 @@ function House(props) {
       dataIndex: 'houseId',
       key: 'houseId',
     },
+    {
+      title: '期/区',
+      dataIndex: 'termName',
+      key: 'termName',
+    },
     {
       title: '楼栋',
       dataIndex: 'blockName',
@@ -146,6 +185,7 @@ function House(props) {
       title: '预选实际热度',
       dataIndex: 'realHeat',
       key: 'realHeat',
+      render:  (x, row) => <><span style={{color: 'blue',cursor: 'pointer'}} onClick={() => showEdi({type: "preselection",houseId: row.houseId})}>{row.realHeat}</span></>,
     },
     {
       title: '发布状态',
@@ -165,7 +205,7 @@ function House(props) {
       render: (_, record) => (
         <>
           <Button type="link" style={{ color: 'red' }} onClick={() => showEdi({type: "add",houseId: record.houseId})}>编辑</Button>
-          <Button type="link" style={{ color: 'red' }} onClick={() => deleteApartment(record)}>删除</Button>
+          <Button type="link" style={{ color: 'red' }} onClick={() => deleteHouseResource(record)}>删除</Button>
         </>
       ),
     },
@@ -227,10 +267,32 @@ function House(props) {
         </Form.Item>
       </Form>
       <Button type="primary" onClick={() => showEdi({type: "add",houseId: ''})}>新增房源</Button>
-      <Button type="primary" onClick={() => showEdi()} style={{ marginLeft: '18px'}}>批量导入房源</Button>
-      <Button type="primary" onClick={() => showEdi()} style={{ marginLeft: '18px'}}>批量修改对应户型</Button>
+      <Button type="primary" onClick={() => showEdi({type: "batch"})} style={{ marginLeft: '18px'}}>批量导入房源</Button>
+      <Button type="primary" onClick={() => showAparement()} style={{ marginLeft: '18px'}}>批量修改对应户型</Button>
       <Button type="danger" style={{ marginLeft: '18px'}} onClick={() => router.go(-1)}>返回</Button>
-      <Table rowSelection={rowSelection} dataSource={data.records} columns={columns} pagination={{ total: data.total, onChange: e => this.changePageNum(e) }} rowKey="House" />
+      <Table rowSelection={rowSelection} dataSource={data.records} columns={columns} pagination={{ total: data.total, onChange: e => changePageNum(e) }} rowKey="House" />
+      <Modal
+            title="批量修改对应户型"
+            width={400}
+            destroyOnClose="true"
+            footer={null}
+            visible={viable}
+            onOk={() => this.handleOk()}
+            onCancel={e => handleCancel(e)}
+          >
+            <Form onSubmit={e => handleSubmitApartMent(e)}>
+              <Form.Item label="将所选房源对应户型信息修改为" >
+                {getFieldDecorator('apartmentIdSelected')(
+                <ApartmentSelect buildingId={props.buildingId} />
+                )}
+              </Form.Item>
+              <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
+                <Button type="primary" htmlType="submit">保存</Button>
+                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <Button onClick={() => handleCancel()}>取消</Button>
+              </Form.Item>
+            </Form>
+        </Modal>
     </>
   )
 }

src/pages/house/edit/components/houseAdd.jsx

@@ -49,7 +49,7 @@ function HouseAdd(props) {
       if (!err) {
           if(houseId){
             request({ ...apis.house.houseEdit,urlData: {id: houseId}, data: { ...values,buildingId: props.buildingId, salesBatchId: props.salesBatchId } }).then((data) => {
-              message.info('保存成功')
+              message.info('修改成功')
               props.onSuccess({type: "house"})
             }).catch((err) => {
               // message.info(err.msg || err.message)
@@ -74,7 +74,7 @@ function HouseAdd(props) {
   return (
     <>
       <Form {...formItemLayout} onSubmit={handleSubmit}>
-      <Form.Item label="期">
+      <Form.Item label="期" >
         {getFieldDecorator('termName', {
           rules: [
             {
@@ -82,7 +82,7 @@ function HouseAdd(props) {
               message: '请输入楼栋',
             },
           ],
-        })(<Input/>)}
+        })(<Input disabled={houseId && houseId !== '' ? true : false}/>)}
         </Form.Item>
         <Form.Item label="楼栋">
         {getFieldDecorator('blockName', {
@@ -92,7 +92,7 @@ function HouseAdd(props) {
               message: '请输入楼栋',
             },
           ],
-        })(<Input/>)}
+        })(<Input disabled={houseId && houseId !== '' ? true : false}/>)}
         </Form.Item>
         <Form.Item label="单元">
         {getFieldDecorator('unitName', {
@@ -102,7 +102,7 @@ function HouseAdd(props) {
               message: '请输入单元',
             },
           ],
-        })(<Input/>)}
+        })(<Input disabled={houseId && houseId !== '' ? true : false}/>)}
         </Form.Item>
         <Form.Item label="层">
         {getFieldDecorator('floorName', {
@@ -112,7 +112,7 @@ function HouseAdd(props) {
               message: '请输入楼层',
             },
           ],
-        })(<Input/>)}
+        })(<Input disabled={houseId && houseId !== '' ? true : false}/>)}
         </Form.Item>
         <Form.Item label="房号">
         {getFieldDecorator('roomName', {
@@ -160,8 +160,8 @@ function HouseAdd(props) {
           ],
         })(
           <Select placeholder="发布状态">
-            <Option value="0">否</Option>
-            <Option value="1">是</Option>
+            <Option value={0}>否</Option>
+            <Option value={1}>是</Option>
           </Select>,
         )}
         </Form.Item>

src/pages/house/edit/components/houseTab.jsx

@@ -7,6 +7,8 @@ import { router } from 'umi';
 
 import House from './house'
 import HouseAdd from './houseAdd'
+import HouseBatch from './HouseBatch'
+import PreselectionRecord from './preselectionRecord'
 
 
 
@@ -15,6 +17,9 @@ function EditHouse(props) {
   const [houseId, setHouseId] = useState('')
 
   function changeTab(e) {
+    if(e.type === "preselection"){
+      props.onSuccess(e)
+    }
     setTab(e.type)
     if(e.type === "add"){
       setHouseId(e.houseId)
@@ -26,6 +31,7 @@ function EditHouse(props) {
       <div style={{ marginTop: '20px' }}>
         { (tab === 'house' && <House salesBatchId={props.salesBatchId} buildingId={props.buildingId} onSuccess={e => changeTab(e)}/>)} 
         { (tab === 'add' && <HouseAdd salesBatchId={props.salesBatchId} buildingId={props.buildingId} houseId={houseId} onSuccess={e => changeTab(e)}/>)} 
+        { (tab === 'batch' && <HouseBatch salesBatchId={props.salesBatchId} buildingId={props.buildingId} onSuccess={e => changeTab(e)}/>)} 
       </div>
     </>
   )

src/pages/house/edit/components/preselectionImg.jsx

@@ -1,15 +1,97 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import moment from 'moment';
-import router from 'umi/router';
-import apis from '../../../../services/apis';
+import { Form, Button, Radio, Icon } from 'antd';
+import HouseGrid from './HouseGrid';
+import { fetch, apis } from '../../../../utils/request'
+import HelpDoc from './HelpDoc';
 
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-const { TextArea } = Input;
+const getHouseList = fetch(apis.house.listHouseResources)
+
+function groupHouseList(houseList = []) {
+  // 先按照楼层分组
+  const floorList = houseList.reduce((list, room) => {
+    let found = false
+
+    list.forEach((floor) => {
+      if (floor.floorId === room.floorId) {
+        found = true
+        floor.roomList.push(room)
+      }
+    })
+    
+    if (!found) {
+      list.push({ ...room, roomList: [ room ]})
+    }
+
+    return list
+  }, [])
+
+  // 再按照单元分组
+  const unitList = floorList.reduce((list, floor) => {
+    let found = false
+    list.forEach((unit) => {
+      if (unit.unitId === floor.unitId) {
+        found = true
+        unit.floorList.push(floor)
+      }
+    })
+    
+    if (!found) {
+      list.push({ ...floor, floorList: [ floor ]})
+    }
+
+    return list
+  }, [])
+
+  // 最后按照楼栋分组
+  return unitList.reduce((list, unit) => {
+    let found = false
+    list.forEach((block) => {
+      if (block.blockId === unit.blockId) {
+        found = true
+        block.unitList.push(unit)
+      }
+    })
+    
+    if (!found) {
+      list.push({ ...unit, unitList: [ unit ]})
+    }
+
+    return list
+  }, [])
+}
 
 const PreselectionImg = props => {
-  return <div><span>预选热度图</span></div>
+  const salesBatchId = props.salesBatchId
+  const [hotType, setHotType] = useState(1)
+  const [blockList, setBlockList] = useState([])
+  const [showHelp, setShowHelp] = useState(false)
+
+  useEffect(() => {
+    if (salesBatchId) {
+      getHouseList({ params: { salesBatchId } }).then(res => {
+        const groupedData = groupHouseList(res)
+        setBlockList(groupedData)
+      })
+    }
+  }, [salesBatchId])
+
+  return (
+    <div>
+      <Form layout="inline">
+        <Form.Item label="热度选择">
+          <Radio.Group onChange={e => setHotType(e.target.value)} value={hotType}>
+            <Radio value={1}>基础热度</Radio>
+            <Radio value={2}>实际热度</Radio>
+            <Radio value={3}>显示热度</Radio>
+            <Icon type="question-circle" theme="filled" style={{ fontSize: '18px', color: '#F00' }} onClick={() => setShowHelp(true)} />
+          </Radio.Group>
+        </Form.Item>
+        <div>基础热度即预设的预选数量，实际并不存在用户预选，用来美化数据。实际热度即真实用户预选数量，基础热度+实际热度=显示热度</div>
+      </Form>
+      <HouseGrid dataset={blockList} hotType={hotType} />
+      <HelpDoc visible={showHelp} onCancel={() => setShowHelp(false)} />
+    </div>
+  )
 }
 
 export default PreselectionImg

src/pages/house/edit/components/preselectionRecord.jsx

@@ -1,15 +1,197 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, Table, notification, Modal } 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 { router } from 'umi';
+import BlockSelect from '../../../../components/HouseSelect/BlockSelect'
+import UnitSelect from '../../../../components/HouseSelect/UnitSelect'
+import FloorSelect from '../../../../components/HouseSelect/FloorSelect'
+import RoomSelect from '../../../../components/HouseSelect/RoomSelect'
+import ApartmentSelect from '../../../../components/HouseSelect/ApartmentSelect';
 
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-const { TextArea } = Input;
+/**
+ *图片设置
+ *
+ * @param {*} props
+ * @returns
+ */
+function PreselectionRecord(props) {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState([])
+  const {salesBatchId} = props.salesBatchId
+  console.log(salesBatchId,'updateNameupdateNameupdateName');
+  useEffect(() => {
+    getList()
+  }, [])
 
-const PreselectionRecord = props => {
-  return <div><span>预选记录</span></div>
-}
+  function openNotificationWithIcon(type, message) {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.house.taPreselectRecord, params: { ...params,salesBatchId: salesBatchId, houseId: props.houseId } }).then(res => {
+      console.log(res,"resresres")
+      setData(res)
+    }).catch(err => {
+      openNotificationWithIcon('error', err.message)
+    })
+  }
+
+    // 重置搜索
+    function handleReset () {
+      props.form.resetFields();
+      getList({ pageNumber: 1, pageSize: 10 })
+    }
+
+      // 分页
+  function changePageNum(pageNumber) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    getList({ pageNumber: pageNumber, pageSize: 10})
+  }
 
-export default PreselectionRecord
+  const rowSelection = {
+    onChange: (selectedRowKeys, selectedRows) => {
+      console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+    },
+  };
+
+  // 提交事件
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNumber: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+
+  const columns = [
+    {
+      title: '房源编号',
+      dataIndex: 'houseId',
+      key: 'houseId',
+    },
+    {
+      title: '期/区',
+      dataIndex: 'termname',
+      key: 'termname',
+    },
+    {
+      title: '楼栋',
+      dataIndex: 'blockName',
+      key: 'blockName',
+      // render: blockName => <><span>{blockName}幢</span></>,
+    },
+    {
+      title: '单元',
+      dataIndex: 'unitName',
+      key: 'unitName',
+      // render: unitName => <><span>{unitName}单元</span></>,
+    },
+    {
+      title: '层',
+      dataIndex: 'floorName',
+      key: 'floorName',
+      // render: floorName => <><span>{floorName}层</span></>,
+    },
+    {
+      title: '房号',
+      dataIndex: 'roomName',
+      key: 'roomName',
+    },
+    {
+      title: '对应户型',
+      dataIndex: 'apartmentName',
+      key: 'apartmentName',
+    },
+    {
+      title: '用户昵称',
+      dataIndex: 'nameOrnick',
+      key: 'nameOrnick',
+    },
+    {
+      title: '用户姓名',
+      dataIndex: 'name',
+      key: 'name',
+    },
+    {
+      title: '用户头像',
+      dataIndex: 'avatarurl',
+      key: 'avatarurl',
+      render: (text, records) => <img src={records.avatarurl} width={50} height={50} />,
+    },
+    {
+      title: '用户手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+    },
+    
+    {
+      title: '预选状态',
+      dataIndex: 'status',
+      key: 'status',
+      render: status => <><span>{status == 0 ? '否' : status == 1 ? '是' : ''}</span></>,
+    },
+    {
+      title: '状态修改时间',
+      dataIndex: 'updateDate',
+      key: 'updateDate',
+    },
+    {
+      title: '最后修改人',
+      dataIndex: 'updateName',
+      key: 'updateName',
+    },
+  ]
+  const { getFieldDecorator } = props.form
+  return (
+    <>
+    <Form layout="inline" onSubmit={e => handleSubmit(e)}>
+        <Form.Item>
+          {getFieldDecorator('houseId')(
+            <Input placeholder="房源编号"/>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('phone')(
+            <Input placeholder="用户手机号"/>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('apartmentId')(
+             <ApartmentSelect buildingId={props.buildingId} />
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('status')(
+             <Select placeholder="预选状态" style={{width: '120px'}}>
+             <Option value="0">否</Option>
+             <Option value="1">是</Option>
+           </Select>,
+          )}
+        </Form.Item>
+        
+        <Form.Item>
+          <Button type="primary" htmlType="submit" >
+            搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <Table rowSelection={rowSelection} dataSource={data.records} columns={columns} pagination={{ total: data.total, onChange: e => this.changePageNum(e) }} rowKey="House" />
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'PreselectionRecord' })(PreselectionRecord);
+export default WrappedHeader

src/pages/house/edit/components/share.jsx

@@ -35,9 +35,21 @@ const Share = props => {
       }).catch(err => {
         message.info(err.msg || err.message)
       })
+      getMiniappName();
     }, [])
   }
 
+  // 获取小程序名称
+  const [miniappName, setMiniappName] = useState('')
+  function getMiniappName() {
+
+    request({ ...apis.building.getMiniappName }).then(res => {
+    
+      setMiniappName(res)
+     
+    })
+  }
+
   const submitShare = () => {
     if (salesBatchId) {
       if (shareContentId) {
@@ -72,9 +84,9 @@ const Share = props => {
       <div>
         <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}>
           <img src={logo} style={{ width: '22px', marginRight: '10px' }} />
-          知与行互动
+            {miniappName}
         </p>
-        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '置业V客厅 精准获客平台'}</p>
+        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{miniappName ? miniappName : '置业V客厅 精准获客平台'}</p>
         <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
       </div>
     </div>

src/pages/house/edit/components/shareRecord.jsx

@@ -14,10 +14,11 @@ const { TextArea } = Input;
 
 const header = (props) => {
   const [ data, setData ] = useState({})
-//   const [page, changePage] = useState({})
+  const [page, changePage] = useState({})
+  const {salesBatchId} = props.salesBatchId
 
   useEffect(() => {
-    getList({ pageNum: 1, pageSize: 10, salesBatchId : 1});
+    getList({ pageNum: 1, pageSize: 10, salesBatchId : salesBatchId});
   },[])
 
   // 查询列表
@@ -71,7 +72,7 @@ const header = (props) => {
       dataIndex: 'shareType',
       key: 'shareType',
       align: 'center',
-      render: (x, row) => <span></span>
+      render: (x, row) => <span>{ row.shareType === 'housePoster' ? '海报分享' : '小程序分享' }</span>
     },
     {
       title: '分享内容',
@@ -83,7 +84,7 @@ const header = (props) => {
   ];
   
   const changePageNum = (pageNumber) => {
-      getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+      getList({ pageNum: pageNumber, pageSize: 10, salesBatchId : salesBatchId, ...props.form.getFieldsValue() })
   }
 
   // 提交事件
@@ -92,7 +93,7 @@ const handleSubmit = (e, props) => {
     props.form.validateFields((err, values) => {
       if (!err) {
         console.log('提交数据: ', values)
-        getList({ pageNum: 1, pageSize: 10, ...values, showType: 'banner' })
+        getList({ pageNum: 1, pageSize: 10, salesBatchId : salesBatchId,  ...values })
       }
     });
   }
@@ -116,11 +117,10 @@ const handleSubmit = (e, props) => {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('showPosition')(
+          {getFieldDecorator('personType')(
             <Select style={{ width: '180px' }} placeholder="身份">
               <Option value="Realty Consultant">置业顾问</Option>
               <Option value="customer">用户</Option>
-              <Option value="drift">游客</Option>
             </Select>,
           )}
         </Form.Item>

src/pages/house/edit/components/visitRecord.jsx

@@ -1,15 +1,153 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload, Table, Pagination } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import moment from 'moment';
 import router from 'umi/router';
 import apis from '../../../../services/apis';
+import BuildSelect from '../../../../components/SelectButton/BuildSelect';
+import AuthButton from '@/components/AuthButton';
+import styles from './style.less';
+import request from '../../../../utils/request';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const { TextArea } = Input;
 
-const VisitRecord = props => {
-  return <div><span>访问记录</span></div>
-}
+const header = (props) => {
+  const [ data, setData ] = useState({})
+  // const [page, changePage] = useState({})
+  const {salesBatchId} = props.salesBatchId
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10, salesBatchId : salesBatchId});
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.house.taHouseVisit, salesBatchId : salesBatchId, params: { ...params },}).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+  
+  const columns = [
+    {
+      title: '头像',
+      align: 'center',
+      render: (text, records) => <img src={records.photoOravatar} width={50} height={50} />,
+    },
+    {
+      title: '昵称',
+      dataIndex: 'nameOrnick',
+      key: 'nameOrnick',
+      align: 'center',
+    },
+    {
+      title: '姓名',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '身份',
+      dataIndex: 'personType',
+      key: 'personType',
+      align: 'center',
+      render: (personType) => <span>{ personType === 'Realty Consultant' ? '置业顾问' : personType === 'customer' ? '用户' : '游客' }</span>
+    },
+    {
+      title: '访问时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (x, row) => <><span>{moment(row.createDate).format('YYYY-MM-DD')}</span></>
+    },
+    {
+      title: '进入场景',
+      dataIndex: 'sceneName',
+      key: 'sceneName',
+      align: 'center',
+      render: (x, row) => <span>{ row.sceneName === 'mini_program_code' ? '扫码进入' : row.sceneName === 'search' ? '自主进入' : '小程序分享进入' }</span>
+    },
+    {
+      title: '分享内容',
+      dataIndex: 'salesBatchName',
+      key: 'salesBatchName',
+      align: 'center',
+      render: (x, row) => <span>{ row.salesBatchName }的房源列表</span>
+    },
+  ];
+  
+  const changePageNum = (pageNumber) => {
+      getList({ pageNum: pageNumber, pageSize: 10, salesBatchId : props.salesBatchId, ...props.form.getFieldsValue() })
+  }
+
+  // 提交事件
+const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values})
+      }
+    });
+  }
 
+   //重置搜索
+   function handleReset() {
+    props.form.resetFields();
+  }
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('shareType')(
+            <Select style={{ width: '180px' }} placeholder="进入场景">
+              <Option value="mini_program_code">扫码进入</Option>
+              <Option value="buddy_share">小程序分享进入</Option>
+              <Option value="search">自主进入</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('showPosition')(
+            <Select style={{ width: '180px' }} placeholder="身份">
+              <Option value="Realty Consultant">置业顾问</Option>
+              <Option value="customer">用户</Option>
+              <Option value="drift">游客</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('phone')(
+            <Input placeholder="手机号"/>
+          )}
+        </Form.Item>
+        <Form.Item>
+        <AuthButton name="admin.extendContent.search" noRight={null}>
+          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+            搜索
+          </Button>
+          </AuthButton>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
+      </div>
+    </>
+  )
+}
+const VisitRecord = Form.create({ name: 'header' })(header);
 export default VisitRecord

src/pages/house/edit/index.jsx

@@ -42,6 +42,7 @@ function EditHouse(props) {
   console.log(props.location.query.id)
   const [tab, setTab] = useState('base')
   const [salesBatchData, setSalesBatchData] = useState({ salesBatchId: undefined })
+  const [houseId, setHouseId] = useState('')
 
   function tabsCallback(e) {
     setTab(e.target.value)
@@ -52,6 +53,13 @@ function EditHouse(props) {
     setBuildingData(e)
   }
 
+  function housTabChange(e) {
+    setHouseId(e.houseId)
+    setTab('preselectionRecord')
+  }
+
+  const batchId = salesBatchData.salesBatchId || (props.location.query && props.location.query.id)
+
   return (
     <>
       <Radio.Group value={ tab } buttonStyle="solid" onChange={e => tabsCallback(e)}>
@@ -65,14 +73,14 @@ function EditHouse(props) {
         <Radio.Button value="visitRecord">访问记录</Radio.Button>
       </Radio.Group>
       <div style={{ marginTop: '20px' }}>
-        { (tab === 'base' && <Base salesBatchId={{ salesBatchId: salesBatchData.salesBatchId || (props.location.query && props.location.query.id) }} onSuccess={e => buildingOnSuccess(e)}/>)} 
-        { (tab === 'house' && <HouseTab salesBatchId={props.location.query.id} buildingId={props.location.query.buildingId}/>)}
-        { (tab === 'poster' && <Poster salesBatchId={{ salesBatchId: salesBatchData.salesBatchId || (props.location.query && props.location.query.id) }}/>)}
-        { (tab === 'share' && <Share salesBatchId={{ salesBatchId: salesBatchData.salesBatchId || (props.location.query && props.location.query.id) }}/>)}
-        { (tab === 'preselectionImg' && <PreselectionImg />)}
-        { (tab === 'preselectionRecord' && <PreselectionRecord />)}
-        { (tab === 'shareRecord' && <ShareRecord />)}
-        { (tab === 'visitRecord' && <VisitRecord />)}
+        { (tab === 'base' && <Base salesBatchId={{ batchId }} onSuccess={e => buildingOnSuccess(e)}/>)} 
+        { (tab === 'house' && <HouseTab salesBatchId={props.location.query.id} buildingId={props.location.query.buildingId} onSuccess={e => housTabChange(e)}/>)}
+        { (tab === 'poster' && <Poster salesBatchId={{ batchId }}/>)}
+        { (tab === 'share' && <Share salesBatchId={{ batchId }}/>)}
+        { (tab === 'preselectionImg' && <PreselectionImg salesBatchId={batchId} />)}
+        { (tab === 'preselectionRecord' && <PreselectionRecord houseId={houseId} buildingId={props.location.query.buildingId} salesBatchId={{ batchId }}/>)}
+        { (tab === 'shareRecord' && <ShareRecord salesBatchId={{ batchId }}/>)}
+        { (tab === 'visitRecord' && <VisitRecord salesBatchId={{ batchId }}/>)}
       </div>
     </>
   )

src/pages/house/list/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, notification } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import router from 'umi/router';
 import moment from 'moment';
@@ -17,9 +17,9 @@ const header = props => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState({ list: [], total: 0 })
   //   const [page, changePage] = useState({})
+  const [houseIdList, setHouseIdList] = useState([])
   const [time, setTime] = useState('')
 
-  //==========看这里-- 新功能都用house为中间单词，我已经创建好了，你只要修改list的指向链接就行，看完删除=========
   // 查询列表
   const getList = params => {
     request({ ...apis.house.taSalesBatch, params: { ...params } }).then(data => {
@@ -33,7 +33,7 @@ const header = props => {
     getList({ pageNum: 1, pageSize: 10 });
   }, [])
 
-  // 跳转到编辑商品
+  // 跳转到编辑
   const toAddHouse = rowData => () => {
     if(rowData) {
       router.push({
@@ -50,6 +50,30 @@ const header = props => {
     });
   }
 
+  function openNotificationWithIcon(type, message) {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
+  
+  const toDelBatch = rowData => () =>{
+    console.log(houseIdList, 'houseIdListhouseIdList')
+    if(houseIdList.length < 1){
+      openNotificationWithIcon('error', '请先选择需要删除的批次')
+      return
+    }
+    console.log(houseIdList,'houseIdListhouseIdList');
+    request({ ...apis.house.deleteTaSalesBatch, data: houseIdList, }).then((data) => {
+      message.info("操作成功")
+      getList({ pageNum: 1, pageSize: 10 });
+    }).catch((err) => {
+      // message.info(err.msg)
+    })
+  }
+
   const newQrcode = row => {
     const x = new XMLHttpRequest();
     const resourceUrl = row.qrCode
@@ -66,23 +90,6 @@ const header = props => {
     x.send();
   }
 
-  const getActivityDetail = (dynamicId) => () => {
-    router.push({
-      pathname: '/activity/detailActivity',
-      query: {
-        dynamicId,
-      },
-    });
-  }
-
-  const getJoinPeople = (dynamicId) => () => {
-    router.push({
-      pathname: '/activity/SignList',
-      query: {
-        dynamicId,
-      },
-    });
-  }
   /**
    *
    *
@@ -140,98 +147,17 @@ const header = props => {
     });
   }
 
-  const finishDynamic = row => {
-    Modal.confirm({
-      title: '活动会被强制结束，小程序端无法再发起或参与此活动，如果不想让客户看到活动，请再点击取消发布按钮',
-      okText: '确定',
-      cancelText: '取消',
-      onOk () {
-        request({ ...apis.activity.finish, data: { dynamicId: row.dynamicId, top: '' } }).then(data => {
-          console.log(data)
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
-        }).catch(err => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-      },
-    });
-  }
-
-  //   置顶
-  const topDynamic = row => () => {
-    const weight = Math.abs(row.weight - 1)
-    request({ ...apis.activity.weight, params: { dynamicId: row.dynamicId, weight } }).then(data => {
-      console.log(data)
-      message.info('操作成功！')
-      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
-    }).catch(err => {
-      console.log(err)
-      message.info(err.msg || err.message)
-    })
-  }
-
-  //   推首页
-  const homeDynamic = row => () => {
-    const home = Math.abs(row.home - 1)
-    request({ ...apis.activity.home, params: { dynamicId: row.dynamicId, home } }).then(data => {
-      console.log(data)
-      message.info('操作成功！')
-      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
-    }).catch(err => {
-      console.log(err)
-      message.info(err.msg || err.message)
-    })
-  }
-
-  const sendOrPublicDynamic = row => {
-    if (row.status === 1) {
-      cancelDynamic(row)
-    } else {
-      sendDynamic(row)
-    }
-  }
-
-  // 取消活动
-  const cancelDynamic = row => {
-    Modal.confirm({
-      title: '活动会在小程序端隐藏，后台可以继续编辑重新发布',
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        request({ ...apis.activity.cancel, urlData: { id: row.dynamicId } }).then(data => {
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue()  })
-        }).catch(err => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-      }
-    });
-  }
-
-  // 发布活动
-  const sendDynamic = row => {
-    Modal.confirm({
-      title: '确定发布吗？',
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        request({ ...apis.activity.send, urlData: { id: row.dynamicId } }).then(data => {
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
-        }).catch(err => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-      }
-    });
-  }
-
   const changePageNum = pageNumber => {
     getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
   }
 
+  const rowSelection = {
+    onChange: (selectedRowKeys, selectedRows) => {
+      console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
+      setHouseIdList(selectedRows)
+    },
+  };
+
   // 提交事件
   const handleSubmit = e => {
     e.preventDefault();
@@ -302,10 +228,13 @@ const header = props => {
             </Button>
         </Form.Item>
       </Form>
-      <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
+      <AuthButton name="admin.salesBatch.add.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toAddHouse()}>新增</Button>
       </AuthButton>
-      <Table
+      <AuthButton name="admin.salesBatch.del" noRight={null}>
+        <Button type="primary" className={styles.addBtn} onClick={toDelBatch()} style={{marginLeft:'30px'}}>删除</Button>
+      </AuthButton>
+      <Table rowSelection={rowSelection}
        dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current}/>

src/services/apis.js

@@ -1099,6 +1099,11 @@ export default {
     method: 'GET',
     action: 'admin.taHouseShare.get',
   },
+  taHouseVisit:{
+    url: `${prefix}/taHouseVisit`,
+    method: 'GET',
+    action: 'admin.taHouseVisit.get',
+  },
   getTaSalesBatch:{
     url: `${prefix}/taSalesBatch/:id`,
     method: 'get',
@@ -1109,6 +1114,11 @@ export default {
     method: 'put',
     action: 'admin.taHouseShare.put',
   },
+  deleteTaSalesBatch:{
+    url: `${prefix}/taSalesBatch`,
+    method: 'put',
+    action: 'admin.taHouseShare.put',
+  },
   taHousingResources: {
     method: 'GET',
     url: `${prefix}/taHousingResources`,
@@ -1153,6 +1163,36 @@ export default {
     url: `${prefix}/taHousingResources/:id`,
     method: 'PUT',
     action: 'admin.taHousingResources.id.put',
+  },
+  taPreselectRecord: {
+    url: `${prefix}/taPreselectRecord`,
+    method: 'GET',
+    action: 'admin.taPreselectRecord.get',
+  },
+  houseDelete: {
+    url: `${prefix}/houseDelete/:id`,
+    method: 'DELETE',
+    action: 'admin.houseDelete.id.put',
+  },
+  changeApartment: {
+    method: 'PUT',
+    url: `${prefix}/house/changeApartment`,
+    action: 'admin.house.changeApartment.get',
+  },
+  uploadExcel: {
+    url: `${prefix}/house/uploadExcel`,
+    method: 'POST',
+    action: 'upload',
+  },
+  saveExcelValue: {
+    url: `${prefix}/house/saveExcelValue`,
+    method: 'POST',
+    action: 'upload',
+  },
+  listHouseResources: {
+    url: `${prefix}/listHousingResources`,
+    method: 'GET',
+    action: 'admin.taHousingResources.get',
   }
  },
 }