新需求

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,11 @@ 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) {
+    props.form.validateFields((err, values) => {
+      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');
@@ -127,12 +62,64 @@ const header = props => {
       }).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/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,

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

@@ -121,7 +121,6 @@ const handleSubmit = (e, props) => {
             <Select style={{ width: '180px' }} placeholder="身份">
               <Option value="Realty Consultant">置业顾问</Option>
               <Option value="customer">用户</Option>
-              <Option value="drift">游客</Option>
             </Select>,
           )}
         </Form.Item>