合并

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -89,7 +89,11 @@ const header = props => {
         // 判断助力人数必须大于0
         if (values.isEnlist === 1) {
         if (values.helpNum <= 0) {
-          message.error('限制助力人数必须大于1')
+          message.error('限制助力次数必须大于0')
+          return
+        }
+        if (values.personNum <= 0) {
+          message.error('助力邀请人数大于0')
           return
         }
       }
@@ -149,7 +153,14 @@ const header = props => {
         </Form.Item>
 
         <Form.Item label="活动主图" help="建议尺寸375*312px">
-          {getFieldDecorator('img')(<ImageUploader />)}
+          {getFieldDecorator('img', {
+          rules: [
+            {
+              required: true,
+              message: '活动主图不能为空',
+            },
+          ],
+        })(<ImageUploader />)}
         </Form.Item>
 
         <Form.Item label="活动时间">
@@ -163,9 +174,7 @@ const header = props => {
         })(<RangePicker format="YYYY-MM-DD HH:mm" />)}
         </Form.Item>
 
-
-
-        <Form.Item label="助力邀请人数">
+        <Form.Item label="助力邀请人数" min={1} max={10}>
         {getFieldDecorator('personNum', {
           rules: [
             {
@@ -173,15 +182,15 @@ const header = props => {
               message: '请输入活动人数',
             },
           ],
-        })(<Input />)}
+        })(<Input type="number" />)}
         </Form.Item>
 
-        <Form.Item label="是否助力">
+        <Form.Item label="助力次数">
         {getFieldDecorator('isEnlist', {
           rules: [
             {
               required: true,
-              message: '请选择是否助力',
+              message: '请选择助力次数',
             },
           ],
         })(
@@ -192,7 +201,7 @@ const header = props => {
         )}
         </Form.Item>
          {
-           isEnlist === 1 && <Form.Item label="请输入助力人数" min={1} max={10}>
+           isEnlist === 1 && <Form.Item label=" " min={1} max={10}>
            {getFieldDecorator('helpNum', {
              rules: [
                {
@@ -205,7 +214,14 @@ const header = props => {
          }
 
         <Form.Item label="活动说明" help="建议宽度:335px,高度不限">
-          {getFieldDecorator('activityInstructions')(<ImageUploader />)}
+          {getFieldDecorator('activityInstructions', {
+          rules: [
+            {
+              required: true,
+              message: '活动说明不能为空',
+            },
+          ],
+        })(<ImageUploader />)}
         </Form.Item>
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
           <Button type="primary" htmlType="submit">