合并

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -80,6 +80,19 @@ const header = props => {
           values.helpNum = 0
         }
 
+        // 判断助力人数不得超过200
+        if (values.helpNum > 200) {
+          message.error('限制助力人数不能超过200')
+          return
+        }
+
+        // 判断助力人数必须大于0
+        if (values.isEnlist === 1) {
+        if (values.helpNum <= 0) {
+          message.error('限制助力人数必须大于1')
+          return
+        }
+      }
         const { activityTime, signupTime, ...submitValue } = values
         const [startDate, endDate] = activityTime
         submitValue.startDate = moment(startDate).format('YYYY-MM-DD HH:mm');
@@ -135,9 +148,8 @@ const header = props => {
         })(<Input />)}
         </Form.Item>
 
-        <Form.Item label="活动主图">
+        <Form.Item label="活动主图" help="建议尺寸375*312px">
           {getFieldDecorator('img')(<ImageUploader />)}
-          <span>建议图片尺寸：750px*560px</span>
         </Form.Item>
 
         <Form.Item label="活动时间">
@@ -180,7 +192,7 @@ const header = props => {
         )}
         </Form.Item>
          {
-           isEnlist === 1 && <Form.Item label="请输入助力人数">
+           isEnlist === 1 && <Form.Item label="请输入助力人数" min={1} max={10}>
            {getFieldDecorator('helpNum', {
              rules: [
                {
@@ -188,13 +200,12 @@ const header = props => {
                  message: '请输入助力人数',
                },
              ],
-           })(<Input type="number" />)}
+           })(<Input type="number" placeholder="助力人数限制"/>)}
            </Form.Item>
          }
 
-        <Form.Item label="活动说明">
+        <Form.Item label="活动说明" help="建议宽度:335px,高度不限">
           {getFieldDecorator('activityInstructions')(<ImageUploader />)}
-          <span>建议图片尺寸：750px*560px</span>
         </Form.Item>
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
           <Button type="primary" htmlType="submit">

src/pages/activity/helpActivity/helpRecord.jsx

@@ -293,7 +293,7 @@ function body(props) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        getList({ pageNum: 1, pageSize: 10, customerType, ...values })
+        getList({ pageNum: 1, pageSize: 10, status: customerType, ...values, helpActivityId })
       }
     });
   }
@@ -324,7 +324,7 @@ function body(props) {
 
   function handleReset() {
     props.form.resetFields();
-    getList({ pageNumber: 1, pageSize: 10, customerType })
+    getList({ pageNum: 1, pageSize: 10, status: customerType, helpActivityId })
   }
 
   function toCustomerDateil(record) {
@@ -338,8 +338,7 @@ function body(props) {
 
   function exportCustomer () {
     const fieldsValue = getFieldsValue()
-    const code = customerType === 'helpSucceed' ? 1 : 0
-    request({ ...apis.helpActivity.HelpInitiateRecordSucceed, responseType: 'blob', params: { ...fieldsValue, customerType, helpActivityId, code } })
+    request({ ...apis.helpActivity.HelpInitiateRecordSucceed, responseType: 'blob', params: { ...fieldsValue, customerType, helpActivityId, condition: customerType } })
       .then(response => {
         download(response)
       }).catch(error => {
@@ -373,13 +372,19 @@ function helpRecord(row) {
   // 核销
   setVerifierData({ visible: true, helpId: row.helpRecordInitiateId, helpActivityId: row.helpActivityId, elpRecordInitiateId: '', verificationCode: '' })
  }
-
+ // 核销回调
  function onSuccess(e) {
    console.log('回调：', e)
    getList(e)
      // 核销
    setVerifierData({ visible: false, helpId: '', helpActivityId: '', elpRecordInitiateId: '', verificationCode: '' })
  }
+ // 返回到首页
+ function returList(params) {
+  router.push({
+      pathname: '/activity/helpActivity/list',
+    });
+}
 
   const publicColumns = [
     {
@@ -494,7 +499,7 @@ function helpRecord(row) {
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>
-            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            <Button style={{ marginLeft: 8 }} onClick={returList}>
               返回
             </Button>
         </Form.Item>

src/pages/activity/helpActivity/list.jsx

@@ -91,7 +91,7 @@ const toEditGoods = (helpActivityId) => () => {
       align: 'center',
       render: (x, row) => (
         <>
-          {row.activityStatus === 1 &&
+          {row.activityStatus === 0 &&
           <AuthButton name="admin.SignList.get" noRight={null}>
         
             <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
@@ -100,10 +100,10 @@ const toEditGoods = (helpActivityId) => () => {
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
           </AuthButton> }
 
-          {row.activityStatus === 0 &&
+          {row.activityStatus === 1 &&
            <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
                       <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
-                      <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
+                      {/* <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></span> */}
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
             </AuthButton>