合并

src/pages/activity/editActivity.jsx

@@ -214,6 +214,135 @@ const Edit = props => {
     });
   }
 
+  const radioOnChange = e => {
+    console.log(e.target.value)
+    setDynamicData({ ...dynamicData, isEnlist: e.target.value })
+  }
+
+  const Basic = (props) => {
+    const fields = [
+      {
+        label: '所属项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: dynamicData.buildingId,
+        rules: [
+          { required: true, message: '请选择所属项目' },
+        ]
+      },
+      {
+        label: '主图',
+        name: 'imgUrl',
+        type: FieldTypes.ImageUploader,
+        value: dynamicData.imgUrl,
+        help: '建议图片尺寸：750px*560px',
+      },
+      {
+        label: '活动标题',
+        name: 'title',
+        type: FieldTypes.Text,
+        value: dynamicData.title,
+        rules: [
+          { required: true, message: '请输入活动标题' },
+        ]
+      },
+      {
+        label: '活动时间',
+        name: 'activityTime',
+        type: FieldTypes.RangePicker,
+        value: dynamicData.startDate != null ? [moment(dynamicData.startDate, 'YYYY-MM-DD HH:mm'), moment(dynamicData.endDate, 'YYYY-MM-DD HH:mm')] : null,
+        props: {showTime:{ format: 'HH:mm' }},
+        rules: [
+          { required: true, message: '请选择活动时间' },
+        ]
+      },
+      {
+        label: '活动地点',
+        name: 'address',
+        type: FieldTypes.Text,
+        value: dynamicData.address,
+        rules: [
+          { required: true, message: '请输入活动地点' },
+        ]
+      },
+      {
+        label: '活动人数',
+        name: 'personNum',
+        type: FieldTypes.Text,
+        value: dynamicData.personNum,
+        rules: [
+          { required: true, message: '请输入活动人数' },
+        ]
+      },
+      {
+        label: '最大报名人数',
+        name: 'maxEnlistByPerson',
+        type: FieldTypes.Text,
+        value: dynamicData.maxEnlistByPerson,
+        rules: [
+          { required: true, message: '请输入最大报名人数' },
+        ]
+      },
+      {
+        label: '活动详情',
+        name: 'desc',
+        render: <Wangedit />,
+        value: dynamicData.desc,
+      },
+      {
+        label: '是否需要报名',
+        name: 'isEnlist',
+        render: <Radio.Group name="radiogroup" onChange={(e) => radioOnChange(e)}>
+          <Radio value={1}>是</Radio>
+          <Radio value={0}>否</Radio>
+        </Radio.Group>,
+        value: dynamicData.isEnlist != null ? dynamicData.isEnlist - 0 : 1,
+      },
+      {
+        label: '报名时间',
+        name: 'signupTime',
+        // type: FieldTypes.RangePicker,
+        render: dynamicData.isEnlist === 1 ? (<RangePicker format={ 'YYYY/MM/DD HH:mm' } style={{ width: '100%' }} />) : '',
+        value: dynamicData.enlistStart != null ? [moment(dynamicData.enlistStart, 'YYYY-MM-DD HH:mm'), moment(dynamicData.enlistEnd, 'YYYY-MM-DD HH:mm')] : null,
+        // props: {showTime:{ format: 'HH:mm' }},
+        rules: [
+          { required: true, message: '请选择报名时间' },
+        ]
+      },
+    ]
+
+    const handleSubmit = val => {
+      let { isEnlist, activityTime, signupTime, ...submitValue } = val
+      const [startDate, endDate] = activityTime
+      submitValue.startDate = moment(startDate).format('YYYY-MM-DD HH:mm');
+      submitValue.endDate = moment(endDate).format('YYYY-MM-DD HH:mm');
+      const [enlistStart, enlistEnd] = signupTime
+      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)
+        })
+      }
+    }
+
+    return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  }
+
+
   const Poster = (props) => {
     const [inputValue, changeInput] = useState('')
     const [textAreaValue, changeTextArea] = useState('')

src/services/apis.js

@@ -752,6 +752,43 @@ export default {
     action: 'admin.taRole.get',
   },
  },
+ groupActivity: {
+  list: {
+    url: `${prefix}/taShareActivity/list`,
+    method: 'get',
+    action: 'admin.taShareActivity.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',
+  },
+  finish: {
+    url: `${prefix}/taShareActivity/finish/:id`,
+    method: 'put',
+    action: 'admin.taShareActivity.finish',
+  },
+  top: {
+    url: `${prefix}/taShareActivity/weight`,
+    method: 'put',
+    action: 'admin.taShareActivity.weight',
+  },
+  record: {
+    url: `${prefix}/helpRecord`,
+    method: 'get',
+    action: 'admin.taRole.get',
+  },
+ },
  third: {
   thirdPartyMiniapp: {
     url: `${prefix}/thirdPartyMiniapp`,