魏超 5 years ago
parent
commit
5fc66d7099

+ 6
- 0
src/pages/activity/groupActivity/editGroupActivity.jsx View File

85
         name: 'mainImg',
85
         name: 'mainImg',
86
         type: FieldTypes.ImageUploader,
86
         type: FieldTypes.ImageUploader,
87
         value: dynamicData.mainImg,
87
         value: dynamicData.mainImg,
88
+        rules: [
89
+          { required: true, message: '请输入活动主图' },
90
+        ],
88
         help: '建议尺寸375*312px',
91
         help: '建议尺寸375*312px',
89
       },
92
       },
90
       {
93
       {
122
         name: 'descImg',
125
         name: 'descImg',
123
         type: FieldTypes.ImageUploader,
126
         type: FieldTypes.ImageUploader,
124
         value: dynamicData.descImg,
127
         value: dynamicData.descImg,
128
+        rules: [
129
+          { required: true, message: '请输入活动说明' },
130
+        ],
125
         help: '建议宽度:335px,高度不限',
131
         help: '建议宽度:335px,高度不限',
126
       },
132
       },
127
     ]
133
     ]

+ 7
- 1
src/pages/activity/groupActivity/helpRecord.jsx View File

395
   getList({ pageNumber: 1, pageSize: 10, ...e});
395
   getList({ pageNumber: 1, pageSize: 10, ...e});
396
  }
396
  }
397
 
397
 
398
+ function returnList(params) {
399
+  router.push({
400
+      pathname: '/activity/groupActivity/list',
401
+    });
402
+}
403
+
398
   const publicColumns = [
404
   const publicColumns = [
399
     {
405
     {
400
       title: '拼团者',
406
       title: '拼团者',
514
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
520
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
515
               重置
521
               重置
516
             </Button>
522
             </Button>
517
-            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
523
+            <Button style={{ marginLeft: 8 }} onClick={returnList}>
518
               返回
524
               返回
519
             </Button>
525
             </Button>
520
         </Form.Item>
526
         </Form.Item>

+ 2
- 2
src/pages/activity/groupActivity/list.jsx View File

60
       dataIndex: 'startTime',
60
       dataIndex: 'startTime',
61
       key: 'startTime',
61
       key: 'startTime',
62
       align: 'center',
62
       align: 'center',
63
-      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></>
63
+      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></>
64
     },
64
     },
65
     {
65
     {
66
         title: '所需积分',
66
         title: '所需积分',
246
           )}
246
           )}
247
         </Form.Item>
247
         </Form.Item>
248
         <Form.Item>
248
         <Form.Item>
249
-          {getFieldDecorator('status')(
249
+          {getFieldDecorator('activityStatus')(
250
             <Select style={{ width: '180px' }} placeholder="活动状态">
250
             <Select style={{ width: '180px' }} placeholder="活动状态">
251
               <Option value="0">进行中</Option>
251
               <Option value="0">进行中</Option>
252
               <Option value="1">未开始</Option>
252
               <Option value="1">未开始</Option>