合并

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -206,13 +206,13 @@ const Edit = props => {
     const submitPoster = () => {
       if (helpActivityId) {
         if (posterId) {
-          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: helpActivityId, targetType: 'helPactivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: helpActivityId, targetType: 'helpActivity', 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: helpActivityId, targetType: 'helPactivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+          request({ ...apis.activity.addPoster, data: { targetId: helpActivityId, targetType: 'helpActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
             setPosterId(data.posterId)
             message.info("保存成功")
           }).catch((err) => {
@@ -293,7 +293,7 @@ const Edit = props => {
 
     if (helpActivityId) {
       useEffect(() => {
-        request({ ...apis.activity.shareContent, params: { targetId: helpActivityId, targetType: 'helPactivity' }, }).then((data) => {
+        request({ ...apis.activity.shareContent, params: { targetId: helpActivityId, targetType: 'helpActivity' }, }).then((data) => {
           console.log(data, "2222")
           if (data.length > 0) {
             setShareContentId(data[0].shareContentId)
@@ -309,13 +309,13 @@ const Edit = props => {
     const submitShare = () => {
       if (helpActivityId) {
         if (shareContentId) {
-          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: helpActivityId, shareContentType: 'helPactivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: helpActivityId, shareContentType: 'helpActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
         } else {
-          request({ ...apis.activity.addShareContent, data: { targetId: helpActivityId, shareContentType: 'helPactivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+          request({ ...apis.activity.addShareContent, data: { targetId: helpActivityId, shareContentType: 'helpActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
             setShareContentId(data.shareContentId)
             message.info("保存成功")
           }).catch((err) => {

src/pages/activity/helpActivity/list.jsx

@@ -59,7 +59,7 @@ const toEditGoods = (helpActivityId) => () => {
       dataIndex: 'startDate',
       key: 'startDate',
       align: 'center',
-      render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format('YYYY-MM-DD')}`}</span></>
+      render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD HH:mm')} —— ${moment(row.endDate).format('YYYY-MM-DD HH:mm')}`}</span></>,
     },
     {
       title: '已参加人数',
@@ -197,6 +197,10 @@ const toEditGoods = (helpActivityId) => () => {
 const handleSubmit = (e, props) => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
+      console.log('values', values)
+      const startDate = moment(values.startTime).format('YYYY-MM-DD HH:mm');
+      const endDate = moment(values.endTime).format('YYYY-MM-DD HH:mm');
+      console.log('startDate', startDate)
       if (!err) {
         console.log('提交数据: ', values)
         getList({ pageNum: 1, pageSize: 10, ...values })
@@ -233,11 +237,16 @@ const handleSubmit = (e, props) => {
             />,
           )}
         </Form.Item>
-        {/* <Form.Item>
-          {getFieldDecorator('time')(
-            <DatePicker />
+        <Form.Item>
+          {getFieldDecorator('startTime')(
+            <DatePicker placeholder="活动开始时间"/>,
           )}
-        </Form.Item> */}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('endTime')(
+            <DatePicker placeholder="活动结束时间"/>,
+          )}
+        </Form.Item>
         <Form.Item>
           {getFieldDecorator('activityStatus')(
             <Select style={{ width: '180px' }} placeholder="活动状态">