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

config/config.js

@@ -83,8 +83,8 @@ export default {
   targets: {
     ie: 11,
   },
-  // publicPath: './',
-  publicPath: 'https://njcjweb.oss-accelerate.aliyuncs.com/',
+  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

src/components/SelectButton/BuildSelect.jsx

@@ -29,8 +29,8 @@ const BuildingSelect = props => {
 
   const getBuildList = e => {
     request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).then(data => {
-        setData(data.records)
-        checkValue(data.records)
+        setData(data)
+        checkValue(data)
         // 默认选中第一个
     })
   }

src/pages/activity/editActivity.jsx

@@ -396,7 +396,7 @@ const Edit = props => {
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
-      }, [])
+      }, [dynamicId])
     }
 
     const submitShare = () => {

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

@@ -66,6 +66,10 @@ function handleCancel(){
 }
 
 function batchSaveHouse() {
+  if(null == uploadFile){
+    message.error('请先上传房源数据，再提交')
+    return
+  }
   const uploadData = new FormData()
   uploadData.append('file', uploadFile)
   uploadData.append('salesBatchId', props.location.query.salesBatchId)
@@ -129,20 +133,21 @@ const columns = [
   },
 ]
 
-  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>
-    </>
-  )
+
+return (
+  <>
+    <div style={{ marginBottom: '30px' }} ><span>1.导入房源先下载模板--></span><a href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E6%88%BF%E6%BA%90%E6%A8%A1%E6%9D%BF.xlsx" download="房源模板.xlsx"><Button type="primary" htmlType="submit">下载模板</Button></a></div>
+    <div style={{ marginBottom: '30px' }}>2.使用excel打开模板文件，编辑房源数据并保存</div>
+    <div style={{ marginBottom: '30px' }}><span>3.将编辑好的文件上传--></span><Upload {...uploaderProps}><Button type="primary" htmlType="submit">上传</Button></Upload></div>
+    <span>4.检查导入的数据是否正常 ↓，不正常则重新编辑保存再次上传，请仔细阅读模板中的编辑规则</span>
+    <Table dataSource={data.list} columns={columns} pagination={{ total: data.total }} style={{ marginTop: '20px' }} rowKey="House" />
+
+    <div style={{ marginTop: '30px' }}>5.全部正常请点击提交</div>
+    <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

@@ -11,6 +11,7 @@ import ImageUpload from '../../../components/XForm/ImageUpload'
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
 import AuthButton from '@/components/AuthButton';
+import SaleBatchHelpDoc from '../edit/components/SalesBatchHelpDoc';
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -22,6 +23,7 @@ const header = props => {
   const { salesBatchId } = props.location.query
   console.log(salesBatchId)
   const [ saleBatchData, setSaleBatchData ] = useState({})
+  const [showHelp, setShowHelp] = useState(false)
   if(salesBatchId){
     useEffect(() => {
       getSaleBatchData(salesBatchId);
@@ -119,6 +121,9 @@ const header = props => {
                 <ImageUpload />,
               )}
         </Form.Item>  
+        <Form.Item label="说明信息">
+          <Icon type="question-circle" theme="filled" style={{ fontSize: '18px', color: '#F00' }} onClick={() => setShowHelp(true)} />
+        </Form.Item> 
         <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
           <Button type="primary" htmlType="submit"style={{marginRight:'20px'}}>
             下一步
@@ -128,6 +133,7 @@ const header = props => {
           </Button>
         </Form.Item>
       </Form>
+      <SaleBatchHelpDoc visible={showHelp} onCancel={() => setShowHelp(false)} />
     </>
   )
 }

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

@@ -60,6 +60,10 @@ function handleCancel(){
 }
 
 function batchSaveHouse() {
+  if(null == uploadFile){
+    message.error('请先上传房源数据，再提交')
+    return
+  }
   const uploadData = new FormData()
   uploadData.append('file', uploadFile)
   uploadData.append('salesBatchId', props.salesBatchId)
@@ -117,20 +121,20 @@ const columns = [
   },
 ]
 
-  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>
-    </>
-  )
+return (
+  <>
+    <div style={{ marginBottom: '30px' }} ><span>1.导入房源先下载模板--></span><a href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E6%88%BF%E6%BA%90%E6%A8%A1%E6%9D%BF.xlsx" download="房源模板.xlsx"><Button type="primary" htmlType="submit">下载模板</Button></a></div>
+    <div style={{ marginBottom: '30px' }}>2.使用excel打开模板文件，编辑房源数据并保存</div>
+    <div style={{ marginBottom: '30px' }}><span>3.将编辑好的文件上传--></span><Upload {...uploaderProps}><Button type="primary" htmlType="submit">上传</Button></Upload></div>
+    <span>4.检查导入的数据是否正常 ↓，不正常则重新编辑保存再次上传，请仔细阅读模板中的编辑规则</span>
+    <Table dataSource={data.list} columns={columns} pagination={{ total: data.total }} style={{ marginTop: '20px' }} rowKey="House" />
+
+    <div style={{ marginTop: '30px' }}>5.全部正常请点击提交</div>
+    <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/SalesBatchHelpDoc/index.jsx

@@ -0,0 +1,29 @@
+import React, { PureComponent } from 'react'
+import { Modal, Row, Col } from 'antd'
+import EnDash from '../EnDash'
+
+import Style from './style.less'
+import HotBlock from '../HotBlock'
+
+
+export default function SaleBatchHelpDoc(props) {
+  return (
+    <Modal footer={null} title="相关说明" visible={props.visible} onCancel={props.onCancel} width={800}>
+      <div className={Style.article}>
+        <div className={Style.section}>
+          <div>
+            1.楼盘多次开盘加推等销售行为，记录为多个“销售批次”，每个批次销售当前楼盘的一批不同房源。同一楼盘不同批次中房源不能重叠，即1套房不能卖2次。<br/><br/>
+            2.销售楼盘下拉仅显示上架楼盘。未上架楼盘若想发布销售批次请先在楼盘列表中将楼盘上架。<br/><br/>
+            3.销售批次和房源均发布后，用户在小程序端可以查看并“预选”或“认筹”房源，设置“预选开始时间”和“预选结束时间"可以限制用户预选，超出时间范围禁止用户预选，设置"认筹开始时间"和"认筹结束时间"可以限制用户认筹，超出时间范围禁止用户认筹。<br/><br/>
+            4."认筹需预选"若为"是"，则代表不可只认筹不预选，在执行认筹操作时会提示未预选用户请先预选。如果此时已超出预选期则无法预选，自然也无法认筹。如果此时仍然在预选期则可以预选后再认筹。"认筹需预选"若为"否"，则代表可以不经过预选环节直接认筹。通过配置修改预选时间、认筹时间和认筹是否需预选，可以在销售过程中控制销售行为。<br/><br/>
+            5."认筹需缴费"若为"是"，则代表在认筹过程中需要缴费（交认筹金/订金）才能最终认筹成功。"认筹需缴费"若为"否"，则代表认筹不需要含缴费流程，执行完其他流程即可认筹成功。<br/><br/>
+            6.若"认筹需缴费"设置为"是"，则需要再设置"缴费方式"，目前支持2种缴费方式，"线上微信支付"和"线下付款上传凭据"，可以多选，2种支付方式在缴费成功后都需要财务审核，审核不通过需要退费。<br/><br/>
+            7.认筹金额支持2位小数，整数部分最大8位数。<br/><br/>
+            8.发布状态为否，则在小程序端楼盘详情页面看不到当前销售批次入口。发布状态为是，则用户可以点击入口进入房源列表查看房源进行预选或认筹操作。<br/><br/>
+            </div>
+        </div>
+        
+      </div>
+    </Modal>
+  );
+}

src/pages/house/edit/components/SalesBatchHelpDoc/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/base.jsx

@@ -8,15 +8,16 @@ import XForm, { FieldTypes } from '../../../../components/XForm';
 import apis from '../../../../services/apis';
 import BuildSelect from '../../../../components/SelectButton/BuildSelect';
 import request from '../../../../utils/request';
-
+import SalesBatchHelpDoc from './SalesBatchHelpDoc';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const { TextArea } = Input;
 
 const Base = props => {
-  const { salesBatchId } = props.salesBatchId
-  console.log(salesBatchId)
+  const salesBatchId = props.salesBatchId.batchId
   const [ saleBatchData, setSaleBatchData ] = useState({})
+  const [showHelp, setShowHelp] = useState(false)
+  
   if(salesBatchId){
     useEffect(() => {
       getSaleBatchData(salesBatchId);
@@ -91,7 +92,8 @@ const Base = props => {
       label: '预选时间',
       name: 'preSelectTime',
       type: FieldTypes.RangePicker,
-      value: saleBatchData.preselectionStartTime != null ? [moment(saleBatchData.preselectionStartTime, 'YYYY-MM-DD HH:mm'), moment(saleBatchData.preselectionEndTime, 'YYYY-MM-DD HH:mm')] : null,
+      props: {showTime : 'HH:mm:ss' },
+      value: saleBatchData.preselectionStartTime != null ? [moment(saleBatchData.preselectionStartTime, 'YYYY-MM-DD HH:mm:ss'), moment(saleBatchData.preselectionEndTime, 'YYYY-MM-DD HH:mm:ss')] : null,
       rules: [
         { required: true, message: '请选择预选时间' },
       ],
@@ -109,6 +111,18 @@ const Base = props => {
         },
       ],
     },
+    {
+      label: '扫码查看房源列表',
+      name: 'qrCode',
+      type: FieldTypes.ImageUploader,
+      value: saleBatchData.qrCode,
+    },
+    {
+      label: '说明',
+      name: 'buildingId',
+      render: <Icon type="question-circle" theme="filled" style={{ fontSize: '18px', color: '#F00' }} onClick={() => setShowHelp(true)} />,
+      value: saleBatchData.buildingId,
+    },
   ]
   
     const handleSubmit = values => { 
@@ -129,10 +143,12 @@ const Base = props => {
         message.info(err.msg || err.message)
       })
     }
-     
-
+    
   return (
-    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+    <>
+      <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+      <SalesBatchHelpDoc visible={showHelp} onCancel={() => setShowHelp(false)} />
+    </>
   );
 }
 

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

@@ -10,6 +10,7 @@ import UnitSelect from '../../../../components/HouseSelect/UnitSelect'
 import FloorSelect from '../../../../components/HouseSelect/FloorSelect'
 import RoomSelect from '../../../../components/HouseSelect/RoomSelect'
 import ApartmentSelect from '../../../../components/HouseSelect/ApartmentSelect';
+import styles from '../../../style/GoodsList.less';
 
 /**
  *图片设置
@@ -95,7 +96,7 @@ function House(props) {
     // model提交事件
     const handleSubmitApartMent = e => {
       props.form.validateFields((err, values) => {
-        if (!err) {
+        // if (!err) {
           if(!values.apartmentIdSelected){
             openNotificationWithIcon('error', '请选择户型')
             return
@@ -107,7 +108,7 @@ function House(props) {
           }).catch(err => {
             openNotificationWithIcon('error', err.message)
           })
-        }
+        // }
       });
     }
   /**
@@ -117,8 +118,8 @@ function House(props) {
    */
   function deleteHouseResource(record) {
     Modal.confirm({
-      title: '确认删除当前数据?',
-      content: '确定后成功删除，点击取消则放弃当前操作',
+      title: '确定将所选房删除?',
+      content: '如果只是不想让用户看到房源，请修改发布状态为否，删除房源会导致大量关联数据异常。若房源有预选记录或认筹记录则无法删除，请先删除预选记录。',
       okText: '确定',
       cancelText: '取消',
       onOk() {
@@ -204,8 +205,8 @@ function House(props) {
       key: 'apartmentId',
       render: (_, record) => (
         <>
-          <Button type="link" style={{ color: 'red' }} onClick={() => showEdi({type: "add",houseId: record.houseId})}>编辑</Button>
-          <Button type="link" style={{ color: 'red' }} onClick={() => deleteHouseResource(record)}>删除</Button>
+          <Button type="link" style={{ color: 'red' }} onClick={() => showEdi({type: "add",houseId: record.houseId})}>编辑<Icon type="form" className={styles.edit} /></Button>
+          <Button type="link" style={{ color: 'red' }} onClick={() => deleteHouseResource(record)}>删除<Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} /></Button>
         </>
       ),
     },
@@ -231,12 +232,12 @@ function House(props) {
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('floorName')(
-            <Input placeholder="请输入楼层"/>
+            <Input placeholder="请输入层"/>
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('roomName')(
-             <Input placeholder="请输入房间号"/>
+             <Input placeholder="请输入房号"/>
           )}
         </Form.Item>
         <Form.Item>
@@ -266,11 +267,11 @@ function House(props) {
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => showEdi({type: "add",houseId: ''})}>新增房源</Button>
+      <Button type="primary" onClick={() => showEdi({type: "add",houseId: ''})} style={{ marginTop: '20px'}}>新增房源</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 => changePageNum(e) }} rowKey="House" />
+      <Table rowSelection={rowSelection} dataSource={data.records} columns={columns} pagination={{ total: data.total, onChange: e => changePageNum(e) }} style={{ marginTop: '20px'}} rowKey="House" />
       <Modal
             title="批量修改对应户型"
             width={400}

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

@@ -1,5 +1,5 @@
 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, InputNumber } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import moment from 'moment';
 import router from 'umi/router';
@@ -70,16 +70,30 @@ function HouseAdd(props) {
     props.onSuccess({type: "house"})
   }
 
+  const limitDecimals = (value) => {
+    const reg = /^(\-)*(\d+)\.(\d\d).*$/;
+    console.log(value);
+    if(typeof value === 'string') {
+        return !isNaN(Number(value)) ? value.replace(reg, '$1$2.$3') : ''
+    } else if (typeof value === 'number') {
+        return !isNaN(value) ? String(value).replace(reg, '$1$2.$3') : ''
+    } else {
+        return ''
+    }
+};
+
+
   const { getFieldDecorator } = props.form;
   return (
     <>
       <Form {...formItemLayout} onSubmit={handleSubmit}>
-      <Form.Item label="期" >
+      <Form.Item label="期/区" >
         {getFieldDecorator('termName', {
           rules: [
             {
               required: true,
-              message: '请输入楼栋',
+              message: '请输入期/区,且最多六个字',
+              max: 6,
             },
           ],
         })(<Input disabled={houseId && houseId !== '' ? true : false}/>)}
@@ -89,7 +103,8 @@ function HouseAdd(props) {
           rules: [
             {
               required: true,
-              message: '请输入楼栋',
+              message: '请输入楼栋,且最多六个字',
+              max: 6,
             },
           ],
         })(<Input disabled={houseId && houseId !== '' ? true : false}/>)}
@@ -99,7 +114,8 @@ function HouseAdd(props) {
           rules: [
             {
               required: true,
-              message: '请输入单元',
+              message: '请输入单元,且最多六个字',
+              max: 6,
             },
           ],
         })(<Input disabled={houseId && houseId !== '' ? true : false}/>)}
@@ -110,6 +126,7 @@ function HouseAdd(props) {
             {
               required: true,
               message: '请输入楼层',
+              max: 6,
             },
           ],
         })(<Input disabled={houseId && houseId !== '' ? true : false}/>)}
@@ -119,7 +136,8 @@ function HouseAdd(props) {
           rules: [
             {
               required: true,
-              message: '请输入房号',
+              message: '请输入房号,且最多六个字',
+              max: 6,
             },
           ],
         })(<Input/> )}
@@ -127,27 +145,29 @@ function HouseAdd(props) {
             校验房源
           </Button>
         </Form.Item>
-        <Form.Item label="价格" help="单位：万元">
+        <Form.Item label="价格" >
         {getFieldDecorator('price', {
           rules: [
             {
               required: true,
-              message: '请输入价格',
+              message: '请输入价格，只能是数字和小数点且最多8位',
+              pattern: new RegExp('^[0-9]{1,5}([.][0-9]{1,2})?$'),
             },
           ],
-        })(<Input type="Number"/>)}
+        })(<div><Input/><span>万元</span></div>)}
         </Form.Item>
         <Form.Item label="预选基础热度">
         {getFieldDecorator('heat', {
           rules: [
             {
               required: true,
-              message: '请输入楼栋',
+              message: '请输入预选基础热度，只能是数字',
+              pattern: new RegExp('^[0-9]*$'),
             },
           ],
-        })(<Input/>)}
+        })(<Input placeholder="填写基础预选热度，建议为0"/>)}
         </Form.Item>
-        <Form.Item label="户型">
+        <Form.Item label="户型" help="户型不存在时，请到楼盘详情中查看是否存在户型，不存在时请新增户型。">
         {getFieldDecorator('apartmentId')(<ApartmentSelect buildingId={props.buildingId} />)}
         </Form.Item>
         <Form.Item label="发布状态">

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

@@ -25,7 +25,7 @@ const Poster = props => {
   const [posterId, setPosterId] = useState('')
 
   const [building, setBuilding] = useState({ buildingImg: [{ url: '' }] })
-  const { salesBatchId } = props.salesBatchId
+  const salesBatchId = props.salesBatchId.batchId
   if (salesBatchId) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
@@ -111,7 +111,7 @@ const Poster = props => {
               building.buildingTag && building.buildingTag.map(item => <span>{item.tagName}</span>)
             }
           </p>
-          <p style={{
+          {/* <p style={{
             margin: '10px 20px', fontSize: '20px', color: '#222', fontWeight: '600',
             display: '-webkit-box', lineClamp: '3', height: '36px', lineHeight: '36px',
             WebkitLineClamp: '1',
@@ -128,7 +128,7 @@ const Poster = props => {
             WebkitBoxOrient: 'vertical',
             overflow: 'hidden',
             textOverflow: 'ellipsis',
-          }}>{textAreaValue || '海报描述'}</p>
+          }}>{textAreaValue || '海报描述'}</p> */}
           <div style={{ backgroundColor: '#f1f1f1', padding: '22px 30px', boxShadow: '0px 6px 12px -4px #dcdcdc',position:'relative' }}>
             <p style={{margin:'0',fontSize:'18px',color:'#888'}}>长按识别小程序码</p>
             <p style={{margin:'0',fontSize:'18px',color:'#888'}}>进入<span style={{margin:'0 5px',fontSize:'18px',color:'#333',fontWeight:'600'}}>{miniappName||'置业V顾问'}</span>报名活动</p>
@@ -139,18 +139,18 @@ const Poster = props => {
       </div>
       <div >
         <div style={{ display: 'flex', width: '100%', margin: '30px 0' }}>
-          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}><span style={{ color: 'red' }}>*</span> 楼盘海报图</p>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}><span style={{ color: 'red' }}>*</span> 海报图片</p>
           <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
         </div>
-        <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于楼盘海报</p>
+        <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议尺寸：640*960px，比例2::3，格式：jpg，文件小于300KB，用于：吸引用户在线选房</p>
         <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
-          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
-          <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
+          {/* <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
+          <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} /> */}
         </div>
-        <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+        {/* <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
           <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
           <TextArea rows={5} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
-        </div>
+        </div> */}
 
       </div>
     </div>

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

@@ -20,7 +20,7 @@ import ApartmentSelect from '../../../../components/HouseSelect/ApartmentSelect'
 function PreselectionRecord(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState([])
-  const {salesBatchId} = props.salesBatchId
+  const salesBatchId = props.salesBatchId.batchId
   console.log(salesBatchId,'updateNameupdateNameupdateName');
   useEffect(() => {
     getList()

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

@@ -19,7 +19,7 @@ const Share = props => {
   const [inputValue, changeInput] = useState('')
   const [imgValue, changeImg] = useState('')
   const [shareContentId, setShareContentId] = useState('')
-  const { salesBatchId } = props.salesBatchId
+  const salesBatchId = props.salesBatchId.batchId
   if (salesBatchId) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
@@ -31,6 +31,8 @@ const Share = props => {
           setShareContentId(data[0].shareContentId)
           changeImg(data[0].shareContentImg)
           changeInput(data[0].shareContentTitle)
+        }else{
+          changeInput("诚挚邀您在线选房购房~");
         }
       }).catch(err => {
         message.info(err.msg || err.message)
@@ -92,13 +94,13 @@ const Share = props => {
     </div>
     <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
       <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
-      <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
+      <Input placeholder="请输入分享标题" value={inputValue}  onChange={e => changeInput(e.target.value)} />
     </div>
     <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
-      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>楼盘分享图</p>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
       <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
     </div>
-    <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于楼盘分享好友</p>
+    <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>建议尺寸：750*600px，比例5：4，格式：jpg</p>
     <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
     <Button onClick={() => router.go(-1)}>取消</Button>
   </div>

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

@@ -15,7 +15,7 @@ const { TextArea } = Input;
 const header = (props) => {
   const [ data, setData ] = useState({})
   const [page, changePage] = useState({})
-  const {salesBatchId} = props.salesBatchId
+  const salesBatchId = props.salesBatchId.batchId
 
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10, salesBatchId : salesBatchId});

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

@@ -15,7 +15,7 @@ const { TextArea } = Input;
 const header = (props) => {
   const [ data, setData ] = useState({})
   // const [page, changePage] = useState({})
-  const {salesBatchId} = props.salesBatchId
+  const salesBatchId = props.salesBatchId.batchId
 
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10, salesBatchId : salesBatchId});

src/pages/house/list/index.jsx

@@ -9,6 +9,7 @@ import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
 import AuthButton from '@/components/AuthButton';
+import SaleBatchHelpDoc from '../edit/components/SalesBatchHelpDoc';
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -19,6 +20,7 @@ const header = props => {
   //   const [page, changePage] = useState({})
   const [houseIdList, setHouseIdList] = useState([])
   const [time, setTime] = useState('')
+  const [showHelp, setShowHelp] = useState(false)
 
   // 查询列表
   const getList = params => {
@@ -234,11 +236,13 @@ const header = props => {
       <AuthButton name="admin.salesBatch.del" noRight={null}>
         <Button type="primary" className={styles.addBtn} onClick={toDelBatch()} style={{marginLeft:'30px'}}>删除</Button>
       </AuthButton>
+      <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft:'30px'}} onClick={() => setShowHelp(true)} />
       <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}/>
       </div>
+      <SaleBatchHelpDoc visible={showHelp} onCancel={() => setShowHelp(false)} />
     </>
   )
 }

src/pages/record/share/countList.jsx

@@ -17,7 +17,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 function record(props) {
   const { getFieldDecorator } = props.form
-
+  
   // 获取初始化数据
   const [ data, setData ] = useState({})
 
@@ -138,8 +138,8 @@ function record(props) {
           </Form.Item>
           <Form.Item>
             <span style={{marginRight:'10px'}}>分享时间：</span>
-                {getFieldDecorator('shareTime')(
-                  <RangePicker placeholder={['开始时间','结束时间']}/>
+                {getFieldDecorator('shareTime',{initialValue : [moment(),moment()],})(
+                  <RangePicker placeholder={['开始时间','结束时间']} />
                 )}
           </Form.Item>
           <Form.Item style={{position:'absolute',right:'38px'}}>

src/pages/staff/list/editStaff.jsx

@@ -55,7 +55,7 @@ const Edit = (props) => {
   //获取项目列表
   const getBuildList = e => {
     request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).then(data => {
-        setBuildData(data.records)
+        setBuildData(data)
     })
   }
 

src/pages/system/document/audit.jsx

@@ -26,7 +26,7 @@ const noauditPass = {
 function body (props) {
   const documentVerifyId = props.location.query.id
   const [data, setData] = useState([])
-  const [datas, setDatas] = useState({})
+  const [datas, setDatas] = useState({size: 0})
   // const [status,setStatus] = useState()
   useEffect(() => {
     getList()