zls

src/components/GlobalHeader/AvatarDropdown.jsx

@@ -80,11 +80,15 @@ class AvatarDropdown extends React.Component {
     return currentUser && currentUser.userName ? (
       <>
         <HeaderDropdown overlay={menuHeaderDropdown}>
-            <span className={`${styles.action} ${styles.account}`}>
-              <Avatar size="small" className={styles.avatar} src={currentUser.avatar === null ? currentUser.photo:currentUser.avatar} alt="avatar" />
-              <span className={styles.name}>{currentUser.loginName}</span>
-              <span className={styles.name}>欢迎登录{currentUser.miniAppName}</span>
-            </span>
+            <div className={`${styles.action} ${styles.account}`} style={{display:'flex'}}>
+              
+         <div style={{margin:'10px 0' }}>
+              <p align="right" className={styles.name}>{currentUser.loginName}</p>
+     
+              <p align="right" className={styles.name}>欢迎登录{currentUser.miniAppName}</p>
+          </div>
+          <Avatar size="small" className={styles.avatar} src={currentUser.avatar === null ? currentUser.photo:currentUser.avatar} alt="avatar" />
+            </div>
         </HeaderDropdown>
 
         {/* 修改密码 */}

src/components/GlobalHeader/index.less

@@ -4,6 +4,11 @@
 .name {
 
   color: #fff;
+  padding: 0;
+  margin: 0;
+  height: 20px;
+  line-height: 20px;
+    
 }
 .logo {
   display: inline-block;
@@ -46,7 +51,7 @@
   .action {
     display: inline-block;
     height: 100%;
-    padding: 0 12px;
+    padding: 0 40px;
     cursor: pointer;
     transition: all 0.3s;
     > i {
@@ -68,8 +73,10 @@
   }
   .account {
     .avatar {
-      margin: ~'calc((@{layout-header-height} - 24px) / 2)' 0;
-      margin-right: 8px;
+      width: 44px;
+      height: 44px;
+      margin: ~'calc((@{layout-header-height} - 44px) / 2)' 0;
+      margin-left: 20px;
       color: @primary-color;
       vertical-align: top;
       background: rgba(255, 255, 255, 0.85);

src/pages/activity/editActivity.jsx

@@ -37,7 +37,7 @@ const BasicForm = props => {
   const [activityStatus, setActivityStatus] = useState(1)
   const [disable, setDisable] = useState(false)
   const [data, setData] = useState(1)
-  const [signupTime, setSignupTime] = useState([])
+  const [showSignupTime, setShowSignupTime] = useState([])
 
 
   const radioOnChange = e => {
@@ -52,7 +52,7 @@ const BasicForm = props => {
       console.log(data)
       data.activityTime = [moment(data.startDate), moment(data.endDate)]
       data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
-      setSignupTime([moment(data.enlistStart), moment(data.enlistEnd)])
+      // setSignupTime([moment(data.enlistStart), moment(data.enlistEnd)])
       setData(data)
       setIsEnlist(data.isEnlist)
       setActivityStatus(data.activityStatus)
@@ -68,10 +68,40 @@ const BasicForm = props => {
       getDynamicData(dynamicId);
     }
   }, [])
+  const checkTime = () => {
+    function compareDate(dateTime1, dateTime2) {
+      var formatDate1 = new Date(dateTime1)
+      var formatDate2 = new Date(dateTime2)
+      if (formatDate1 > formatDate2) {
+        return true;
+      }
+      else {
+        return false;
+      }
+    }
+    // 1）修改后的开始时间不得大于当前时间（会存在已经成功报名的用户）
+
+    // （2）修改后开始时间<当前时间<修改后结束时间：活动进行中
+
+    // （3）修改后结束时间<当前时间：活动已结束
+    if (showSignupTime[0]) {
+      const date = data.signupTime
+      const nowDate = new Date()
+      console.log(compareDate(nowDate, showSignupTime[0]))
+      if (compareDate(nowDate, showSignupTime[0])) {
+        return true
+      } else {
+        return '修改后的开始时间不得大于当前时间（会存在已经成功报名的用户）'
+      }
+    }
+    return true
+  }
+
 
   const handleSubmit = e => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
+
       if (!err) {
         console.log('Received values of form: ', values);
         const { activityTime, signupTime } = values
@@ -86,6 +116,17 @@ const BasicForm = props => {
 
         console.log('submit data --->', values)
         if (dynamicId) {
+          const checks = checkTime()
+          if (checks != true) {
+            message.info(checks)
+            return
+          }
+          console.log(data.count,values.personNum)
+          if (data.count || 0 > values.personNum) {
+            message.info('活动人数必须大于已报名人数')
+            return
+          }
+
           values.dynamicId = dynamicId
           request({ ...apis.activity.update, data: values }).then(data => {
             message.info('保存成功')
@@ -110,37 +151,45 @@ const BasicForm = props => {
       }
     });
   }
-  const checkTime = (value,data) => {
-    console.log(value,data,'-----checkTime---------')
-    console.log(props.form.getFieldsValue(),'--------time1-----------')
+  const changeTime = (value, date) => {
+    // console.log(value, data, '-----checkTime---------')
+    // console.log(props.form.getFieldsValue(), '--------time1-----------')
+    // let datas = data
+    // console.log(value, date, datas)
+    // datas.signupTime = date
+
+    // //   data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
+
+    // console.log(datas,'-------datas--------')
+    //   props.form.setFieldsValue(data)
+    setShowSignupTime(date)
+    // props.form.setFieldsValue(datas)
+    // // form.setFieldsValue
+    // console.log('-------1--------')
   }
-  
 
-  function validator(rule, value, callback){
-    // try {
-    //   throw new Error('Something wrong!');
-    // } catch (err) {
-    //   callback(err);
-    // }
-
-    console.log(rule,value,'--------time-----------')
-    console.log(props.form.getFieldsValue(),'--------time1-----------')
-
-  //   props.form.validateFields((err, values) => {
-  //     console.log(values,'--------values-----------')
-  //   })
-  // //   setTimeout(()=>{
-  // //     props.form.setFieldsValue({
-  // //         'buildingArea': buildingData.buildingArea
-  // //     })
-  // // },0)
-  //   setTimeout(
-  //    ()=>{console.log(props.form.getFieldsValue(),'--------time2-----------')} 
-  //   ,10000)
-    // props.form.validateFields((err, values) => {
-    //   console.log(values,'--------time2-----------')
-    // })
-    return false
+  function disabledDate(current) {
+    // Can not select days before today and today
+    return current && current > moment().endOf('day');
+  }
+  
+  // function disabledDateTime() {
+  //   return {
+  //     disabledHours: () => range(0, 24).splice(4, 20),
+  //     disabledMinutes: () => range(30, 60),
+  //     disabledSeconds: () => [55, 56],
+  //   };
+  // }
+  
+  function disabledRangeTime(_, type) {
+    if (type === 'start') {
+      return {
+        disabledHours: () => range(0, 60).splice(4, 20),
+        disabledMinutes: () => range(30, 60),
+        disabledSeconds: () => [55, 56],
+      };
+    }
+    return 
   }
 
   const { getFieldDecorator } = props.form;
@@ -205,7 +254,7 @@ const BasicForm = props => {
                 message: '请选择活动时间',
               },
             ],
-          })(<RangePicker format="YYYY-MM-DD HH:mm"  />)}
+          })(<RangePicker format="YYYY-MM-DD HH:mm" />)}
         </Form.Item>
         <Form.Item label="活动地点">
           {getFieldDecorator('address', {
@@ -215,7 +264,7 @@ const BasicForm = props => {
                 message: '请输入活动地点',
               },
             ],
-          })(<Input  />)}
+          })(<Input />)}
         </Form.Item>
         {/* disabled={activityStatus === 0 ? true : false} */}
         <Form.Item label="活动人数" help="当前活动最多可报名人数">
@@ -225,8 +274,12 @@ const BasicForm = props => {
                 required: true,
                 message: '请输入活动人数',
               },
+              // {
+              //   min: data.personNum,min={data.personNum || 0}
+              //   message: '活动人数必须大于已报名人数',
+              // },
             ],
-          })(<Input type="number" min = {data.personNum||0} />)}
+          })(<Input type="number"   />)}
         </Form.Item>
         <Form.Item label="用户携带人数" help="每个用户最多可携带参与活动的人数">
           {getFieldDecorator('maxEnlistByPerson', {
@@ -236,30 +289,24 @@ const BasicForm = props => {
                 message: '请输入用户携带人数',
               },
             ],
-          })(<Input type="number" min={1}  />)}
+          })(<Input type="number" min={1} />)}
         </Form.Item>
         <Form.Item label="活动详情">
           {getFieldDecorator('desc')(<Wangedit />)}
         </Form.Item>
         <Form.Item label="报名时间">
           {getFieldDecorator('signupTime', {
-            initialValue:signupTime,
-            //  trigger:checkTime(),
             rules: [
               {
                 required: true,
                 message: '请选择报名时间',
               },
-              // {
-              //   validator,
-              //   message: '请选择报名时间',
-              // },
             ],
-          })(<RangePicker format="YYYY-MM-DD HH:mm"  onChange={checkTime}  />)}
+          })(<RangePicker format="YYYY-MM-DD HH:mm" disabledDate={disabledDate}  disabledTime={disabledRangeTime} onChange={changeTime} />)}
         </Form.Item>
         <Form.Item label="权重">
           {getFieldDecorator('heavy', {
-           
+
             rules: [
               {
                 required: true,

src/pages/activity/groupActivity/editGroupActivity.jsx

@@ -123,7 +123,7 @@ const Edit = props => {
         name: 'activityTime',
         type: FieldTypes.RangePicker,
         value: dynamicData.startTime != null ? [moment(dynamicData.startTime, 'YYYY-MM-DD HH:mm'), moment(dynamicData.endTime, 'YYYY-MM-DD HH:mm')] : null,
-        props: { showTime: { format: 'HH:mm' }, disabled: activityStatus === 0 ? true : false },
+        props: { showTime: { format: 'HH:mm' } },
         rules: [
           { required: true, message: '请选择活动时间' },
         ],
@@ -173,6 +173,17 @@ const Edit = props => {
       },
     ]
 
+    function compareDate(dateTime1, dateTime2) {
+      var formatDate1 = new Date(dateTime1)
+      var formatDate2 = new Date(dateTime2)
+      if (formatDate1 > formatDate2) {
+        return true;
+      }
+      else {
+        return false;
+      }
+    }
+
     const handleSubmit = val => {
       const { activityTime, signupTime, ...submitValue } = val
       console.log('val', val)
@@ -181,6 +192,13 @@ const Edit = props => {
       submitValue.endTime = moment(endTime).format('YYYY-MM-DD HH:mm');
       console.log('submit data --->', submitValue)
       if (groupActivityId) {
+
+        const nowDate = new Date()
+        if (!compareDate(nowDate, startTime)) {
+
+          message.info("修改后的开始时间不得大于当前时间（会存在已经成功助力或者发起助力的用户）")
+          return
+        }
         submitValue.groupActivityId = groupActivityId
         request({ ...apis.groupActivity.update, data: submitValue }).then((data) => {
           message.info("保存成功")

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -47,27 +47,27 @@ const header = props => {
   const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
 
 
-      // 详情
-      const getDynamicData = helpActivityId => {
-        request({ ...apis.helpActivity.details, params: { helpActivityId } }).then((data) => {
-          data.activityTime = [moment(data.startDate), moment(data.endDate)]
-          const num = data.helpNum > 0 ? 1 : 0
-          setIsEnlist(num)
-          setActivityStatus(data.activityStatus)
-          setDisable(data.activityStatus === 0 ? true : false)
-          data.isEnlist = num
-          props.form.setFieldsValue(data)
-          setDynamicData(data)
-        })
-      }
+  // 详情
+  const getDynamicData = helpActivityId => {
+    request({ ...apis.helpActivity.details, params: { helpActivityId } }).then((data) => {
+      data.activityTime = [moment(data.startDate), moment(data.endDate)]
+      const num = data.helpNum > 0 ? 1 : 0
+      setIsEnlist(num)
+      setActivityStatus(data.activityStatus)
+      setDisable(data.activityStatus === 0 ? true : false)
+      data.isEnlist = num
+      props.form.setFieldsValue(data)
+      setDynamicData(data)
+    })
+  }
 
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    useEffect(() => {
-      // eslint-disable-next-line no-use-before-define
-      if (helpActivityId) {
-        getDynamicData(helpActivityId) 
-      }
-    }, [])
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    // eslint-disable-next-line no-use-before-define
+    if (helpActivityId) {
+      getDynamicData(helpActivityId)
+    }
+  }, [])
 
   // function addChannel(params) {
   //   request({ ...apis.channelList.addChannel, data: { ...params } }).then((data) => {
@@ -78,6 +78,17 @@ const header = props => {
   // })
   // }
 
+  function compareDate(dateTime1, dateTime2) {
+    var formatDate1 = new Date(dateTime1)
+    var formatDate2 = new Date(dateTime2)
+    if (formatDate1 > formatDate2) {
+      return true;
+    }
+    else {
+      return false;
+    }
+  }
+
   function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
@@ -91,7 +102,7 @@ const header = props => {
           message.error('助力邀请人数不能超过200')
           return
         }
-          // 助力邀请人数>0
+        // 助力邀请人数>0
         if (values.personNum <= 0) {
           message.error('助力邀请人数大于0')
           return
@@ -99,11 +110,11 @@ const header = props => {
 
         // 判断助力人数必须大于0
         if (values.isEnlist === 1) {
-        if (values.helpNum <= 0) {
-          message.error('限制助力次数必须大于0')
-          return
+          if (values.helpNum <= 0) {
+            message.error('限制助力次数必须大于0')
+            return
+          }
         }
-      }
         const { activityTime, signupTime, ...submitValue } = values
         const [startDate, endDate] = activityTime
         console.log('startDate', activityTime)
@@ -114,6 +125,14 @@ const header = props => {
         // submitValue.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
         console.log('submit data --->', submitValue)
         if (helpActivityId) {
+
+          const nowDate = new Date()
+          if (!compareDate(nowDate, startDate)) {
+
+            message.info("修改后的开始时间不得大于当前时间（会存在已经成功助力或者发起助力的用户）")
+            return
+          }
+
           submitValue.helpActivityId = helpActivityId
           request({ ...apis.helpActivity.update, data: submitValue }).then((data) => {
             message.info("保存成功")
@@ -145,129 +164,129 @@ const header = props => {
     <>
       <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} 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="活动标题">
-        {getFieldDecorator('title', {
-          rules: [
-            {
-              required: true,
-              message: '请输入活动标题',
-            },
-          ],
-        })(<Input />)}
+          {getFieldDecorator('title', {
+            rules: [
+              {
+                required: true,
+                message: '请输入活动标题',
+              },
+            ],
+          })(<Input />)}
         </Form.Item>
 
         <Form.Item label="助力详情主图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：助力活动详情">
           {getFieldDecorator('img', {
-          rules: [
-            {
-              required: true,
-              message: '助力详情主图不能为空',
-            },
-          ],
-        })(<ImageUploader />)}
+            rules: [
+              {
+                required: true,
+                message: '助力详情主图不能为空',
+              },
+            ],
+          })(<ImageUploader />)}
         </Form.Item>
 
         <Form.Item label="助力封面图1" help="建议图片尺寸：750*420px，比例16:9,格式：jpg，用于：活动列表/首页推荐">
           {getFieldDecorator('listImg', {
-          rules: [
-            {
-              required: true,
-              message: '助力封面图1不能为空',
-            },
-          ],
-        })(<ImageUploader />)}
+            rules: [
+              {
+                required: true,
+                message: '助力封面图1不能为空',
+              },
+            ],
+          })(<ImageUploader />)}
         </Form.Item>
 
         <Form.Item label="助力封面图2" help="建议图片尺寸：750*250px，比例3:1,格式：jpg，用于：项目详情页">
           {getFieldDecorator('bannerListImg', {
-          rules: [
-            {
-              required: true,
-              message: '助力封面图2不能为空',
-            },
-          ],
-        })(<ImageUploader />)}
+            rules: [
+              {
+                required: true,
+                message: '助力封面图2不能为空',
+              },
+            ],
+          })(<ImageUploader />)}
         </Form.Item>
 
         <Form.Item label="活动时间">
-        {getFieldDecorator('activityTime', {
-          rules: [
-            {
-              required: true,
-              message: '请选择活动时间',
-            },
-          ],
-        })(<RangePicker disabled={activityStatus===0 ? true : false} format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+          {getFieldDecorator('activityTime', {
+            rules: [
+              {
+                required: true,
+                message: '请选择活动时间',
+              },
+            ],
+          })(<RangePicker format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }} />)}
         </Form.Item>
 
         <Form.Item label="助力邀请人数" min={1} max={10}>
-        {getFieldDecorator('personNum', {
-          rules: [
-            {
-              required: true,
-              message: '请输入活动人数',
-            },
-          ],
-        })(<Input type="number" disabled={activityStatus===0 ? true : false}/>)}
+          {getFieldDecorator('personNum', {
+            rules: [
+              {
+                required: true,
+                message: '请输入活动人数',
+              },
+            ],
+          })(<Input type="number" disabled={activityStatus === 0 ? true : false} />)}
         </Form.Item>
 
         <Form.Item label="助力次数">
-        {getFieldDecorator('isEnlist', {
-          rules: [
-            {
-              required: true,
-              message: '请选择助力次数',
-            },
-          ],
-        })(
-          <Radio.Group onChange={(e) => radioOnChange(e)} disabled={activityStatus===0 ? true : false}>
-            <Radio value={0}>不限制</Radio>
-            <Radio value={1}>限制</Radio>
-          </Radio.Group>,
-        )}
+          {getFieldDecorator('isEnlist', {
+            rules: [
+              {
+                required: true,
+                message: '请选择助力次数',
+              },
+            ],
+          })(
+            <Radio.Group onChange={(e) => radioOnChange(e)} disabled={activityStatus === 0 ? true : false}>
+              <Radio value={0}>不限制</Radio>
+              <Radio value={1}>限制</Radio>
+            </Radio.Group>,
+          )}
         </Form.Item>
-         {
-           isEnlist === 1 && <Form.Item label=" " min={1} max={10}>
-           {getFieldDecorator('helpNum', {
-             rules: [
-               {
-                 required: true,
-                 message: '请输入助力人数',
-               },
-             ],
-           })(<Input type="number" placeholder="助力人数限制"/>)}
-           </Form.Item>
-         }
+        {
+          isEnlist === 1 && <Form.Item label=" " min={1} max={10}>
+            {getFieldDecorator('helpNum', {
+              rules: [
+                {
+                  required: true,
+                  message: '请输入助力人数',
+                },
+              ],
+            })(<Input type="number" placeholder="助力人数限制" />)}
+          </Form.Item>
+        }
 
         <Form.Item label="活动说明" help="建议宽度：750px，高度不限，格式：jpg，用于活动详情">
           {getFieldDecorator('activityInstructions', {
-          rules: [
-            {
-              required: true,
-              message: '活动说明不能为空',
-            },
-          ],
-        })(<ImageUploader />)}
-        </Form.Item>        
+            rules: [
+              {
+                required: true,
+                message: '活动说明不能为空',
+              },
+            ],
+          })(<ImageUploader />)}
+        </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">
@@ -277,7 +296,7 @@ const header = props => {
           <Button onClick={() => cancelPage()}>
             取消
           </Button>
-          </Form.Item>
+        </Form.Item>
       </Form>
     </>
   )
@@ -298,22 +317,22 @@ const Edit = props => {
   const { helpActivityId } = props.location.query
   const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
 
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    useEffect(() => {
-      // eslint-disable-next-line no-use-before-define
-      if (helpActivityId) {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    // eslint-disable-next-line no-use-before-define
+    if (helpActivityId) {
       getDynamicData(helpActivityId);
     }
-    }, [])
+  }, [])
+
+  // 详情
+  const getDynamicData = (helpActivityId) => {
+    request({ ...apis.helpActivity.details, params: { helpActivityId } }).then((data) => {
+      console.log(data)
+      setDynamicData(data)
+    })
+  }
 
-    // 详情
-    const getDynamicData = (helpActivityId) => {
-      request({ ...apis.helpActivity.details, params: { helpActivityId } }).then((data) => {
-        console.log(data)
-        setDynamicData(data)
-      })
-    }
-  
   const radioOnChange = e => {
     console.log(e.target.value)
     setDynamicData({ ...dynamicData, isEnlist: e.target.value })
@@ -341,7 +360,7 @@ const Edit = props => {
         })
         getMiniappName()
       }, [])
-    }else{
+    } else {
       getMiniappName()
     }
     // 获取小程序名称
@@ -417,7 +436,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'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于助力活动海报</p>
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px' }}>建议图片尺寸：750*600px，比例5:4,格式：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)} />
@@ -495,7 +514,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'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于助力活动分享好友</p>
+      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于助力活动分享好友</p>
       <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
       <Button onClick={() => cancelPage()}>取消</Button>
     </div>
@@ -511,7 +530,7 @@ const Edit = props => {
         </Radio.Group>
       </div>
       <div>
-        {tab === 'basic' && <Basic helpActivityId={helpActivityId}/>}
+        {tab === 'basic' && <Basic helpActivityId={helpActivityId} />}
         {tab === 'poster' && <Poster />}
         {tab === 'share' && <Share />}
       </div>

src/pages/channel/brokerList.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form } from 'antd';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Avatar } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import channels from './channelList.less';
 import router from 'umi/router';
@@ -36,18 +36,18 @@ const columns = [
     align: 'center',
 
     // eslint-disable-next-line jsx-a11y/alt-text
-    render: (text, list) => <img src={list.avatarurl }/>,
+    render: (text, list) => <Avatar shape="square" style={{ color: 'blue', cursor: 'pointer' }} src={list.avatarurl} size={64} icon="user" />,
   },
   {
     title: '用户姓名',
-    dataIndex: 'name',
-    key: 'name',
+    dataIndex: 'nickname',
+    key: 'nickname',
     align: 'center',
   },
   {
     title: '电话',
-    dataIndex: 'tel',
-    key: 'tel',
+    dataIndex: 'phone',
+    key: 'phone',
     align: 'center',
   },
   {
@@ -55,7 +55,7 @@ const columns = [
     dataIndex: 'sex',
     key: 'sex',
     align: 'center',
-    render: (text, list) => <a>{list.gender === '1' ? '男' : '女'}</a>,
+    render: (text, list) => <a>{list.gender === '1' ? '男' : list.gender === '2' ? '女':'未知'}</a>,
   },
   {
     title: '推荐客户',

src/pages/channel/independentList/index.jsx

@@ -390,13 +390,13 @@ function body (props) {
       title: '类型',
       dataIndex: 'personType',
       key: 'personType',
-      render: (_, record) => <><span>{record.personType === 'channel agent' ? '渠道经纪人' : '独立经纪人'}</span></>,
+      render: (_, record) => <><span>{record.personType === 'channel agent' ? '专业经纪人' : '专业经纪人'}</span></>,
     },
     {
       title: '所属渠道',
       dataIndex: 'channelName',
       key: 'channelName',
-      render: (_, record) => <><span>{record.personType === 'channel agent' ? record.channelName : ''}</span></>,
+      render: (_, record) => <><span>{record.channelName }</span></>,
     },
     {
       title: '操作',

src/pages/channel/recommendClients.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select } from 'antd';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select,Avatar } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import channels from './channelList.less';
 import router from 'umi/router';
@@ -52,7 +52,7 @@ const columns = [
     // key: 'img',
     align: 'center',
 
-    render: (text, record) => <img src={record.picture} className={channels.touxiang} />,
+    render: (text, record) =>  <Avatar shape="square"   src={record.picture} size={64} icon="user" /> ,
   },
   {
     title: '用户姓名',