合并

src/pages/activity/groupActivity/editGroupActivity.jsx

@@ -85,6 +85,9 @@ const Edit = props => {
         name: 'mainImg',
         type: FieldTypes.ImageUploader,
         value: dynamicData.mainImg,
+        rules: [
+          { required: true, message: '请输入活动主图' },
+        ],
         help: '建议尺寸375*312px',
       },
       {
@@ -122,6 +125,9 @@ const Edit = props => {
         name: 'descImg',
         type: FieldTypes.ImageUploader,
         value: dynamicData.descImg,
+        rules: [
+          { required: true, message: '请输入活动说明' },
+        ],
         help: '建议宽度:335px,高度不限',
       },
     ]

src/pages/activity/groupActivity/helpRecord.jsx

@@ -395,6 +395,12 @@ function helpRecord(row) {
   getList({ pageNumber: 1, pageSize: 10, ...e});
  }
 
+ function returnList(params) {
+  router.push({
+      pathname: '/activity/groupActivity/list',
+    });
+}
+
   const publicColumns = [
     {
       title: '拼团者',
@@ -514,7 +520,7 @@ function helpRecord(row) {
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>
-            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            <Button style={{ marginLeft: 8 }} onClick={returnList}>
               返回
             </Button>
         </Form.Item>

src/pages/activity/groupActivity/list.jsx

@@ -60,7 +60,7 @@ const toEditActivity = (groupActivityId) => () => {
       dataIndex: 'startTime',
       key: 'startTime',
       align: 'center',
-      render: (x, row) => <><span>{`${moment(row.startTime).format('YYYY-MM-DD hh:mm:ss')} —— ${moment(row.endTime).format('YYYY-MM-DD hh:mm:ss')}`}</span></>
+      render: (x, row) => <><span>{`${moment(row.startTime).format('YYYY-MM-DD HH:mm:ss')} —— ${moment(row.endTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>
     },
     {
         title: '所需积分',
@@ -246,7 +246,7 @@ const handleSubmit = (e, props) => {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('status')(
+          {getFieldDecorator('activityStatus')(
             <Select style={{ width: '180px' }} placeholder="活动状态">
               <Option value="0">进行中</Option>
               <Option value="1">未开始</Option>