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

src/pages/activity/editActivity.jsx

@@ -27,9 +27,10 @@ const formItemLayout = {
 
 const BasicForm = props => {
   const [isEnlist, setIsEnlist] = useState(1)
+  const [activityStatus, setActivityStatus] = useState(1)
+  const [disable, setDisable] = useState(false)
 
   const radioOnChange = e => {
-    // console.log(e.target.value)
     setIsEnlist(e.target.value)
   }
 
@@ -43,6 +44,8 @@ const BasicForm = props => {
       data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
 
       setIsEnlist(data.isEnlist)
+      setActivityStatus(data.activityStatus)
+      setDisable(data.activityStatus === 0 ? true : false)
       props.form.setFieldsValue(data)
     })
   }
@@ -103,10 +106,28 @@ const BasicForm = props => {
               message: '请选择所属项目',
             },
           ],
-        })(<BuildSelect />)}
+        })(<BuildSelect disabled={disable}/>)}
         </Form.Item>
-        <Form.Item label="主图">
-          {getFieldDecorator('imgUrl')(<ImageUploader />)}
+        <Form.Item label="活动详情图">
+          {getFieldDecorator('detailImgUrl', {
+          rules: [
+            {
+              required: true,
+              message: '请选择活动详情图',
+            },
+          ],
+        })(<ImageUploader />)}
+          <span>建议图片尺寸：750px*560px</span>
+        </Form.Item>
+        <Form.Item label="活动列表图">
+          {getFieldDecorator('imgUrl', {
+          rules: [
+            {
+              required: true,
+              message: '请选择活动列表图',
+            },
+          ],
+        })(<ImageUploader />)}
           <span>建议图片尺寸：750px*560px</span>
         </Form.Item>
         <Form.Item label="活动标题">
@@ -117,7 +138,7 @@ const BasicForm = props => {
               message: '请输入活动标题',
             },
           ],
-        })(<Input />)}
+        })(<Input/>)}
         </Form.Item>
         <Form.Item label="活动时间">
         {getFieldDecorator('activityTime', {
@@ -127,7 +148,7 @@ const BasicForm = props => {
               message: '请选择活动时间',
             },
           ],
-        })(<RangePicker format="YYYY-MM-DD HH:mm" />)}
+        })(<RangePicker format="YYYY-MM-DD HH:mm" disabled={activityStatus===0 ? true : false}/>)}
         </Form.Item>
         <Form.Item label="活动地点">
         {getFieldDecorator('address', {
@@ -137,7 +158,7 @@ const BasicForm = props => {
               message: '请输入活动地点',
             },
           ],
-        })(<Input />)}
+        })(<Input disabled={activityStatus===0 ? true : false}/>)}
         </Form.Item>
         <Form.Item label="活动人数">
         {getFieldDecorator('personNum', {
@@ -147,7 +168,7 @@ const BasicForm = props => {
               message: '请输入活动人数',
             },
           ],
-        })(<Input type="number" />)}
+        })(<Input type="number" disabled={activityStatus===0 ? true : false}/>)}
         </Form.Item>
         <Form.Item label="最大报名人数">
         {getFieldDecorator('maxEnlistByPerson', {
@@ -157,21 +178,12 @@ const BasicForm = props => {
               message: '请输入最大报名人数',
             },
           ],
-        })(<Input type="number" />)}
+        })(<Input type="number" disabled={activityStatus===0 ? true : false}/>)}
         </Form.Item>
         <Form.Item label="活动详情">
         {getFieldDecorator('desc')(<Wangedit />)}
         </Form.Item>
-        <Form.Item label="是否需要报名">
-        {getFieldDecorator('isEnlist')(
-          <Radio.Group onChange={(e) => radioOnChange(e)}>
-            <Radio value={1}>是</Radio>
-            <Radio value={0}>否</Radio>
-          </Radio.Group>,
-        )}
-        </Form.Item>
-        {
-          isEnlist === 1 && (<Form.Item label="报名时间">
+        <Form.Item label="报名时间">
           {getFieldDecorator('signupTime', {
             rules: [
               {
@@ -179,9 +191,18 @@ const BasicForm = props => {
                 message: '请选择报名时间',
               },
             ],
-          })(<RangePicker format="YYYY-MM-DD HH:mm" />)}
-          </Form.Item>)
-        }
+          })(<RangePicker format="YYYY-MM-DD HH:mm" disabled={activityStatus===0 ? true : false}/>)}
+        </Form.Item>  
+        <Form.Item label="权重">
+        {getFieldDecorator('heavy', {
+          rules: [
+            {
+              required: true,
+              message: '请输入权重',
+            },
+          ],
+        })(<Input type="number" disabled={activityStatus===0 ? true : false} style={{ width: 80}}/>)}<span style={{ marginLeft: 30, color:'grey'}}>数字越大越靠前</span>
+        </Form.Item>
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
           <Button type="primary" htmlType="submit">
             确认