活动助力

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -30,18 +30,19 @@ const Edit = props => {
   const [tab, changeTab] = useState('basic')
   // 判断是否展示助力次数的输入框
   // const [help, helpTab] = useState('1')
-  const { dynamicId } = props.location.query
-  const [dynamicData, setDynamicData] = useState({})
-  if (dynamicId) {
+  const { helpActivityId } = props.location.query
+  const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
+  if (helpActivityId) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
+      alert(helpActivityId)
       // eslint-disable-next-line no-use-before-define
-      getDynamicData(dynamicId);
+      getDynamicData(helpActivityId);
     }, [])
 
-    // 查询列表
-    const getDynamicData = (dynamicId) => {
-      request({ ...apis.activity.details, params: { dynamicId } }).then((data) => {
+    // 详情
+    const getDynamicData = (helpActivityId) => {
+      request({ ...apis.helpActivity.details, params: { helpActivityId } }).then((data) => {
         console.log(data)
         setDynamicData(data)
       })
@@ -50,9 +51,13 @@ const Edit = props => {
 
   const cancelPage = () => {
     router.push({
-      pathname: '/activity/ActivityList',
+      pathname: '/activity/helpActivity/list',
     });
   }
+  const radioOnChange = e => {
+    console.log(e.target.value)
+    setDynamicData({ ...dynamicData, isEnlist: e.target.value })
+  }
 
   const Basic = props => {
     const fields = [
@@ -63,7 +68,7 @@ const Edit = props => {
         value: dynamicData.buildingId,
         rules: [
           { required: true, message: '请选择项目' },
-        ]
+        ],
       },
       {
         label: '活动标题',
@@ -93,7 +98,7 @@ const Edit = props => {
       },
       {
         label: '助力邀请人数',
-        name: 'personNum',
+        name: 'persionNum',
         type: FieldTypes.Text,
         value: dynamicData.persionNum,
         rules: [
@@ -102,25 +107,28 @@ const Edit = props => {
       },
       {
         label: '助力次数',
-        name: 'maxEnlistByPerson',
+        name: 'helpNumStatus',
         type: FieldTypes.Text,
-        value: dynamicData.helpNum,
+        value: dynamicData.isEnlist != null ? dynamicData.isEnlist - 0 : 1,
         rules: [
           { required: true, message: '请选择是否助力' },
         ],
-        render: <Radio.Group name="radiogroup">
-        <Radio value={1}>不限制</Radio>
-        <Radio value={0}>次数限制</Radio>
+        render: <Radio.Group name="radiogroup" onChange={(e) => radioOnChange(e)}>
+        <Radio value={0}>不限制</Radio>
+        <Radio value={1}>次数限制</Radio>
       </Radio.Group>,
       },
+
       {
-        label: ' ',
-        name: 'personNum',
-        type: FieldTypes.Text,
-        value: dynamicData.personNum,
-        rules: [
-          { required: true, message: '请输入次数' },
-        ],
+        label: '请输入助力人数',
+        name: 'helpNum',
+        // type: FieldTypes.RangePicker,
+        render: dynamicData.isEnlist === 1 ? (<Input/>) : '',
+        value: dynamicData.helpNum,
+        // props: {showTime:{ format: 'HH:mm' }},
+        // rules: [
+        //   { required: true, message: '请输入助力人数' },
+        // ],
       },
       {
         label: '活动说明',
@@ -141,22 +149,22 @@ const Edit = props => {
       // submitValue.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
       // submitValue.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
       console.log('submit data --->', submitValue)
-      // if (dynamicId) {
-      //   submitValue.dynamicId = dynamicId
-      //   request({ ...apis.activity.update, data: submitValue }).then((data) => {
-      //     message.info("保存成功")
-      //     cancelPage()
-      //   }).catch((err) => {
-      //     message.info(err.msg || err.message)
-      //   })
-      // } else {
-      //   request({ ...apis.activity.add, data: submitValue }).then((data) => {
-      //     message.info("保存成功")
-      //     cancelPage()
-      //   }).catch((err) => {
-      //     message.info(err.msg || err.message)
-      //   })
-      // }
+      if (helpActivityId) {
+        submitValue.helpActivityId = helpActivityId
+        request({ ...apis.helpActivity.update, data: submitValue }).then((data) => {
+          message.info("保存成功")
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      } else {
+        request({ ...apis.helpActivity.add, data: submitValue }).then((data) => {
+          message.info("保存成功")
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
     }
 
     return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
@@ -168,10 +176,10 @@ const Edit = props => {
     const [imgValue, changeImg] = useState('')
     const [posterId, setPosterId] = useState('')
 
-    if (dynamicId) {
-      console.log(dynamicId, 'dynamicId')
+    if (helpActivityId) {
+      console.log(helpActivityId, 'helpActivityId')
       useEffect(() => {
-        request({ ...apis.activity.poster, params: { targetId: dynamicId, targetType: 'activity' } }).then((data) => {
+        request({ ...apis.activity.poster, params: { targetId: helpActivityId, targetType: 'activity' } }).then((data) => {
           console.log(data, "2222")
           if (data.length > 0) {
             setPosterId(data[0].posterId)
@@ -197,15 +205,15 @@ const Edit = props => {
     }
 
     const submitPoster = () => {
-      if (dynamicId) {
+      if (helpActivityId) {
         if (posterId) {
-          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: dynamicId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: helpActivityId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
         } else {
-          request({ ...apis.activity.addPoster, data: { targetId: dynamicId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+          request({ ...apis.activity.addPoster, data: { targetId: helpActivityId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
             setPosterId(data.posterId)
             message.info("保存成功")
           }).catch((err) => {
@@ -284,9 +292,9 @@ const Edit = props => {
     const [imgValue, changeImg] = useState('')
     const [shareContentId, setShareContentId] = useState('')
 
-    if (dynamicId) {
+    if (helpActivityId) {
       useEffect(() => {
-        request({ ...apis.activity.shareContent, params: { targetId: dynamicId, targetType: 'activity' }, }).then((data) => {
+        request({ ...apis.activity.shareContent, params: { targetId: helpActivityId, targetType: 'activity' }, }).then((data) => {
           console.log(data, "2222")
           if (data.length > 0) {
             setShareContentId(data[0].shareContentId)
@@ -300,15 +308,15 @@ const Edit = props => {
     }
 
     const submitShare = () => {
-      if (dynamicId) {
+      if (helpActivityId) {
         if (shareContentId) {
-          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: helpActivityId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
         } else {
-          request({ ...apis.activity.addShareContent, data: { targetId: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+          request({ ...apis.activity.addShareContent, data: { targetId: helpActivityId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
             setShareContentId(data.shareContentId)
             message.info("保存成功")
           }).catch((err) => {
@@ -359,7 +367,4 @@ const Edit = props => {
     </div>
   );
 }
-
-
-
 export default Edit

src/pages/activity/helpActivity/list.jsx

@@ -31,11 +31,11 @@ const header = (props) => {
 
   
 // 跳转到助力新增
-const toEditGoods = (dynamicId) => () => {
+const toEditGoods = (helpActivityId) => () => {
     router.push({
       pathname: '/activity/helpActivity/edithelpActivity',
       query: {
-        dynamicId
+        helpActivityId
       },
     });
   }
@@ -102,7 +102,7 @@ const toEditGoods = (dynamicId) => () => {
           </AuthButton>
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            {row.isEnlist != 2 && <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
+            {row.isEnlist != 2 && <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>}
           </AuthButton>
         </>
       )
@@ -229,11 +229,11 @@ const handleSubmit = (e, props) => {
           )}
         </Form.Item> */}
         <Form.Item>
-          {getFieldDecorator('isEnlist')(
+          {getFieldDecorator('status')(
             <Select style={{ width: '180px' }} placeholder="活动状态">
+              <Option value="0">未开始</Option>
               <Option value="1">进行中</Option>
-              <Option value="2">未开始</Option>
-              <Option value="3">已结束</Option>
+              <Option value="2">已结束</Option>
             </Select>,
           )}
         </Form.Item>

src/services/apis.js

@@ -684,6 +684,21 @@ export default {
     method: 'GET',
     action: 'admin.taRole.get',
   },
+  add: {
+    url: `${prefix}/helpActivity/add`,
+    method: 'post',
+    action: 'admin.taRole.get',
+  },
+  details: {
+    url: `${prefix}/helpActivity/details`,
+    method: 'get',
+    action: 'admin.taRole.get',
+  },
+  update: {
+    url: `${prefix}/helpActivity/update`,
+    method: 'put',
+    action: 'admin.taRole.get',
+  },
  },
  third: {
   thirdPartyMiniapp: {