commit

src/pages/activity/editActivity.jsx

@@ -56,14 +56,14 @@ const BasicForm = props => {
     })
   }
 
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    useEffect(() => {
-      props.form.setFieldsValue({ isEnlist })
-      if (dynamicId) {
-        getDynamicData(dynamicId);
-      }
-    }, [])
- 
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    props.form.setFieldsValue({ isEnlist })
+    if (dynamicId) {
+      getDynamicData(dynamicId);
+    }
+  }, [])
+
   const handleSubmit = e => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
@@ -78,7 +78,7 @@ const BasicForm = props => {
           values.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
           values.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
         }
-        
+
         console.log('submit data --->', values)
         if (dynamicId) {
           values.dynamicId = dynamicId
@@ -111,97 +111,97 @@ const BasicForm = props => {
     <>
       <Form {...formItemLayout} onSubmit={handleSubmit}>
         <Form.Item label="所属项目">
-        {getFieldDecorator('buildingId', {
-          rules: [
-            {
-              required: true,
-              message: '请选择所属项目',
-            },
-          ],
-        })(<BuildSelect disabled={disable}/>)}
+          {getFieldDecorator('buildingId', {
+            rules: [
+              {
+                required: true,
+                message: '请选择所属项目',
+              },
+            ],
+          })(<BuildSelect disabled={disable} />)}
         </Form.Item>
         <Form.Item label="活动封面图1" help="建议图片尺寸：750px*420px，比例16:9,格式：jpg，用于：首页推荐/活动列表">
           {getFieldDecorator('listImgUrl', {
-          rules: [
-            {
-              required: true,
-              message: '请选择活动封面图1',
-            },
-          ],
-        })(<ImageUploader />)}
+            rules: [
+              {
+                required: true,
+                message: '请选择活动封面图1',
+              },
+            ],
+          })(<ImageUploader />)}
         </Form.Item>
         <Form.Item label="活动封面图2" help="建议图片尺寸：750*250，比例3:1，格式：jpg，用于：项目详情页">
           {getFieldDecorator('bannerListImg', {
-          rules: [
-            {
-              required: true,
-              message: '请选择活动封面图2',
-            },
-          ],
-        })(<ImageUploader />)}
+            rules: [
+              {
+                required: true,
+                message: '请选择活动封面图2',
+              },
+            ],
+          })(<ImageUploader />)}
         </Form.Item>
         <Form.Item label="活动详情主图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：普通活动详情">
           {getFieldDecorator('imgUrl', {
-          rules: [
-            {
-              required: true,
-              message: '请选择活动详情主图',
-            },
-          ],
-        })(<ImageUploader />)}
+            rules: [
+              {
+                required: true,
+                message: '请选择活动详情主图',
+              },
+            ],
+          })(<ImageUploader />)}
         </Form.Item>
         <Form.Item label="活动标题">
-        {getFieldDecorator('title', {
-          rules: [
-            {
-              required: true,
-              message: '请输入活动标题',
-            },
-          ],
-        })(<Input/>)}
+          {getFieldDecorator('title', {
+            rules: [
+              {
+                required: true,
+                message: '请输入活动标题',
+              },
+            ],
+          })(<Input />)}
         </Form.Item>
         <Form.Item label="活动时间">
-        {getFieldDecorator('activityTime', {
-          rules: [
-            {
-              required: true,
-              message: '请选择活动时间',
-            },
-          ],
-        })(<RangePicker format="YYYY-MM-DD HH:mm" disabled={activityStatus===0 ? true : false}/>)}
+          {getFieldDecorator('activityTime', {
+            rules: [
+              {
+                required: true,
+                message: '请选择活动时间',
+              },
+            ],
+          })(<RangePicker format="YYYY-MM-DD HH:mm" disabled={activityStatus === 0 ? true : false} />)}
         </Form.Item>
         <Form.Item label="活动地点">
-        {getFieldDecorator('address', {
-          rules: [
-            {
-              required: true,
-              message: '请输入活动地点',
-            },
-          ],
-        })(<Input disabled={activityStatus===0 ? true : false}/>)}
+          {getFieldDecorator('address', {
+            rules: [
+              {
+                required: true,
+                message: '请输入活动地点',
+              },
+            ],
+          })(<Input disabled={activityStatus === 0 ? true : false} />)}
         </Form.Item>
-        <Form.Item label="活动人数">
-        {getFieldDecorator('personNum', {
-          rules: [
-            {
-              required: true,
-              message: '请输入活动人数',
-            },
-          ],
-        })(<Input type="number" disabled={activityStatus===0 ? true : false}/>)}
+        <Form.Item label="活动人数" help="当前活动最多可报名人数">
+          {getFieldDecorator('personNum', {
+            rules: [
+              {
+                required: true,
+                message: '请输入活动人数',
+              },
+            ],
+          })(<Input type="number" disabled={activityStatus === 0 ? true : false} />)}
         </Form.Item>
-        <Form.Item label="最大报名人数">
-        {getFieldDecorator('maxEnlistByPerson', {
-          rules: [
-            {
-              required: true,
-              message: '请输入最大报名人数',
-            },
-          ],
-        })(<Input type="number" min={1} disabled={activityStatus===0 ? true : false}/>)}
+        <Form.Item label="用户携带人数" help="每个用户最多可携带参与活动的人数">
+          {getFieldDecorator('maxEnlistByPerson', {
+            rules: [
+              {
+                required: true,
+                message: '请输入用户携带人数',
+              },
+            ],
+          })(<Input type="number" min={1} disabled={activityStatus === 0 ? true : false} />)}
         </Form.Item>
         <Form.Item label="活动详情">
-        {getFieldDecorator('desc')(<Wangedit />)}
+          {getFieldDecorator('desc')(<Wangedit />)}
         </Form.Item>
         <Form.Item label="报名时间">
           {getFieldDecorator('signupTime', {
@@ -211,17 +211,17 @@ const BasicForm = props => {
                 message: '请选择报名时间',
               },
             ],
-          })(<RangePicker format="YYYY-MM-DD HH:mm" disabled={activityStatus===0 ? true : false}/>)}
-        </Form.Item>  
+          })(<RangePicker format="YYYY-MM-DD HH:mm" disabled={activityStatus === 0 ? true : false} />)}
+        </Form.Item>
         <Form.Item label="权重">
-        {getFieldDecorator('heavy', {
-          rules: [
-            {
-              required: true,
-              message: '请输入权重',
-            },
-          ],
-        })(<Input type="number" style={{ width: 80}}/>)}<span style={{ marginLeft: 30, color:'grey'}}>数字越大越靠前</span>
+          {getFieldDecorator('heavy', {
+            rules: [
+              {
+                required: true,
+                message: '请输入权重',
+              },
+            ],
+          })(<Input type="number" style={{ width: 80 }} />)}<span style={{ marginLeft: 30, color: 'grey' }}>数字越大越靠前</span>
         </Form.Item>
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
           <Button type="primary" htmlType="submit">
@@ -272,7 +272,7 @@ const Edit = props => {
         })
         getMiniappName()
       }, [])
-    }else{
+    } else {
       getMiniappName()
     }
     // 获取小程序名称
@@ -357,7 +357,7 @@ const Edit = props => {
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动海报图</p>
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
-          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：640*670px，比例64:67,格式：jpg，用于普通活动海报</p>
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px' }}>建议图片尺寸：640*670px，比例64:67,格式：jpg，用于普通活动海报</p>
           <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
             <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />

src/pages/statistical/consultant/sharetable.jsx

@@ -40,7 +40,7 @@ const typeList = [
     },
     {
         label: '首页',
-        value: 'mian'
+        value: 'main'
     },
 ]
 const showTypeList = [
@@ -128,7 +128,7 @@ function record(props) {
             dataIndex: 'targetType',
             key: 'targetType',
             align: 'center',
-            render: (_, record) => <><span>{getType(record.targetType)} {'【' + record.targetName + '】'}</span></>
+            render: (_, record) => <><span>{getType(record.targetType)} {record.targetName ? '【' + record.targetName + '】' : ''}</span></>
         },
         {
             title: '分享时间',

src/pages/statistical/consultant/visitNum.jsx

@@ -113,7 +113,7 @@ function record(props) {
             dataIndex: 'targetType',
             key: 'targetType',
             align: 'center',
-            render: (_, record) => <><span>{getType(record.targetType)} {'【' + record.targetName + '】'}</span></>
+            render: (_, record) => <><span>{getType(record.targetType)} {record.targetName ? '【' + record.targetName + '】' : ''}</span></>
         },
         {
             title: '姓名',
@@ -146,7 +146,7 @@ function record(props) {
     ];
 
     const { getFieldDecorator } = props.form
-    
+
     let row = 0
 
     return (