Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

config/config.js

@@ -83,8 +83,8 @@ export default {
   targets: {
     ie: 11,
   },
-  publicPath: './',
-  // publicPath: 'https://njcjweb.oss-accelerate.aliyuncs.com/admin/',
+  // publicPath: './',
+  publicPath: 'https://njcjweb.oss-accelerate.aliyuncs.com/admin/',
   history: 'hash',
   devtool: isAntDesignProPreview ? 'source-map' : false,
   // umi routes: https://umijs.org/zh/guide/router.html

src/components/SelectButton/BuildSelect.jsx

@@ -55,7 +55,7 @@ const BuildingSelect = props => {
       filterOption={(input, option) =>
         option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
       }>
-          <Option key="" value="">全部项目</Option>
+          {/* <Option key="" value="">全部项目</Option> */}
           {data.map(building => (
             <Option key={building.buildingId} value={building.buildingId}>{building.buildingName}</Option>
           ))}

src/components/SelectButton/channelSelect.jsx

@@ -37,7 +37,7 @@ const ChannelSelect = props => {
         option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
       }>
           {data.map(Item => (
-            <Option key={Item.channelId} value={Item.channelId}> {console.log(Item)}{Item.channelName} </Option>
+            <Option key={Item.channelId} value={Item.channelId}> {Item.channelName} </Option>
           ))}
       </Select>
   )

src/pages/activity/ActivityList.jsx

@@ -43,7 +43,7 @@ const header = props => {
   }, [])
 
   // 跳转到编辑商品
-  const toEditGoods = dynamicId => () => {
+  const toEditGoods = dynamicId  => () => {
     router.push({
       pathname: '/activity/editActivity',
       query: {
@@ -196,7 +196,7 @@ const header = props => {
           {<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={toDataReacord(row.dynamicId)}>数据记录<Icon type="form" className={styles.edit} /></span>}
           {/* </AuthButton> */}
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
-            {(row.activityStatus === 0 || row.activityStatus === 1) && <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
+            {(row.activityStatus === 0 || row.activityStatus === 1) && <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId,row.count)}>编辑<Icon type="form" className={styles.edit} /></span>}
           </AuthButton>
           
           {/* {(row.activityStatus === 0 || row.activityStatus === 2) &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>{'下载二维码'} {<Icon type="qrcode" className={styles.shoppingCart} />}</span>} */}

src/pages/activity/dataRecord/index.jsx

@@ -46,6 +46,7 @@ const DataRecord = props => {
     return <>
         <div>
             <div>
+                <span>{data.activityName || '0'}</span>
                 <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
                 <Modal
                     title="指标说明（数据会存在一定时间延迟）"

src/pages/activity/editActivity.jsx

@@ -121,8 +121,9 @@ const BasicForm = props => {
             message.info(checks)
             return
           }
-          console.log(data.count,values.personNum)
-          if (data.count || 0 > values.personNum) {
+          console.log(data.enlistNum,values.personNum,'143')
+
+          if (data.enlistNum > values.personNum) {
             message.info('活动人数必须大于已报名人数')
             return
           }
@@ -257,7 +258,7 @@ const BasicForm = props => {
               //   message: '活动人数必须大于已报名人数',
               // },
             ],
-          })(<Input type="number"   />)}
+          })(<Input type="number" />)}
         </Form.Item>
         <Form.Item label="用户携带人数" help="每个用户最多可携带参与活动的人数">
           {getFieldDecorator('maxEnlistByPerson', {
@@ -320,7 +321,7 @@ const Edit = props => {
   const { dynamicId } = props.location.query
 
 
-  const Poster = (props) => {
+  const Poster = props => {
     const [inputValue, changeInput] = useState('')
     const [textAreaValue, changeTextArea] = useState('')
     const [imgValue, changeImg] = useState('')

src/pages/activity/groupActivity/detailActivity.jsx

@@ -121,7 +121,7 @@ const BasicForm = props => {
           <img src={detailData.bannerListImg} height="125px" width="375px" />
         </Form.Item>
         <Form.Item label="活动时间">
-          <span>{`${moment(detailData.startDate).format('YYYY-MM-DD HH:mm:ss')} —— ${moment(detailData.endDate).format('YYYY-MM-DD HH:mm:ss')}`}</span>
+      <span>{`${moment(detailData.startTime).format('YYYY-MM-DD HH:mm:ss')} —— ${moment(detailData.endTime).format('YYYY-MM-DD HH:mm:ss')}`}</span>
         </Form.Item>
         <Form.Item label="成团人数">
             <span>{detailData.groupBuyPeople}</span>

src/pages/activity/groupActivity/editGroupActivity.jsx

@@ -27,385 +27,385 @@ const cancelPage = () => {
   });
 }
 
-/**
- *
- *
- * @param {*} props
- * @returns
- */
-const Edit = props => {
-  const [tab, changeTab] = useState('basic')
-  // 判断是否展示助力次数的输入框
-  const { groupActivityId } = props.location.query
-  const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
-  const [scoreData, setScoreData] = useState({})
-  const [activityStatus, setActivityStatus] = useState({})
-  const [disable, setDisable] = useState(false)
 
-  useEffect(() => {
-    request(apis.groupActivity.avgScore).then((data) => {
-      setScoreData(data);
-    })
-  }, [])
+const Basic = props => {
+  const { dynamicData, disable, activityStatus, scoreData, groupActivityId } = props;
 
-    useEffect(() => {
-      if (groupActivityId) {
-      getDynamicData(groupActivityId);
-    }
-    }, [groupActivityId])
+  const fields = [
+    {
+      label: '选择项目',
+      name: 'buildingId',
+      render: <BuildSelect disabled={disable}/>,
+      value: dynamicData.buildingId,
+      rules: [
+        { required: true, message: '请选择项目' },
+      ],
+    },
+    {
+      label: '活动标题',
+      name: 'activityName',
+      type: FieldTypes.Text,
+      value: dynamicData.activityName,
+      rules: [
+        { required: true, message: '请输入活动标题' },
+      ]
+    },
+    {
+      label: '拼团详情主图',
+      name: 'mainImg',
+      type: FieldTypes.ImageUploader,
+      value: dynamicData.mainImg,
+      rules: [
+        { required: true, message: '请输入拼团详情主图' },
+      ],
+      help: '建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：拼团活动详情',
+    },
+    {
+      label: '拼团封面图1',
+      name: 'listImg',
+      type: FieldTypes.ImageUploader,
+      value: dynamicData.listImg,
+      rules: [
+        { required: true, message: '请输入拼团封面图1' },
+      ],
+      help: '建议图片尺寸：750*420px，比例16:9,格式：jpg，用于：活动列表/首页推荐',
+    },
+    {
+      label: '拼团封面图2',
+      name: 'bannerListImg',
+      type: FieldTypes.ImageUploader,
+      value: dynamicData.bannerListImg,
+      rules: [
+        { required: true, message: '请输入拼团封面图2' },
+      ],
+      help: '建议图片尺寸：750*250px，比例3:1,格式：jpg，用于：项目详情页',
+    },
+    {
+      label: '活动时间',
+      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' } },
+      rules: [
+        { required: true, message: '请选择活动时间' },
+      ],
+    },
+    {
+      label: '成团人数',
+      name: 'groupBuyPeople',
+      type: FieldTypes.Text,
+      value: dynamicData.groupBuyPeople,
+      props: { disabled: activityStatus === 0 },
+      help: '注：成团所需人数',
+      rules: [
+        { required: true, message: '请输入成团人数' },
+      ]
+    },
+    {
+      label: '所需积分',
+      name: 'integral',
+      type: FieldTypes.Text,
+      value: dynamicData.integral,
+      props: { disabled: activityStatus === 0 },
+      help: `注：用户平均积分${scoreData.averageScore}`,
+      rules: [
+        { required: true, message: '请输入所需积分' },
+      ]
+    },
+    {
+      label: '活动说明',
+      name: 'descImg',
+      type: FieldTypes.ImageUploader,
+      value: dynamicData.descImg,
+      rules: [
+        { required: true, message: '请输入活动说明' },
+      ],
+      help: '建议宽度：750px，高度不限，格式：jpg，用于活动详情',
+    },
+    {
+      label: '权重',
+      name: 'heavy',
+      type: FieldTypes.Number,
+      render: <Input type="number" style={{ width: 80}} />,
+      value: dynamicData.heavy,
+      rules: [
+        { required: true, message: '请输入权重' },
+      ],
+      help: '数字越大越靠前',
+    },
+  ]
 
-    // 详情
-    const getDynamicData = (groupActivityId) => {
-      request({ ...apis.groupActivity.details, urlData: { id: groupActivityId } }).then((data) => {
-        setDynamicData(data)
-        setActivityStatus(data.activityStatus)
-        setDisable(data.activityStatus === 0 ? true : false)
-      })
+  function compareDate(dateTime1, dateTime2) {
+    return new Date(dateTime1) > new Date(dateTime2);
   }
 
-  const radioOnChange = e => {
-    console.log(e.target.value)
-    setDynamicData({ ...dynamicData, isEnlist: e.target.value })
-  }
+  const handleSubmit = val => {
+    const { activityTime, signupTime, ...submitValue } = val
 
-  const Basic = props => {
-    const fields = [
-      {
-        label: '选择项目',
-        name: 'buildingId',
-        render: <BuildSelect disabled={disable}/>,
-        value: dynamicData.buildingId,
-        rules: [
-          { required: true, message: '请选择项目' },
-        ],
-      },
-      {
-        label: '活动标题',
-        name: 'activityName',
-        type: FieldTypes.Text,
-        value: dynamicData.activityName,
-        rules: [
-          { required: true, message: '请输入活动标题' },
-        ]
-      },
-      {
-        label: '拼团详情主图',
-        name: 'mainImg',
-        type: FieldTypes.ImageUploader,
-        value: dynamicData.mainImg,
-        rules: [
-          { required: true, message: '请输入拼团详情主图' },
-        ],
-        help: '建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：拼团活动详情',
-      },
-      {
-        label: '拼团封面图1',
-        name: 'listImg',
-        type: FieldTypes.ImageUploader,
-        value: dynamicData.listImg,
-        rules: [
-          { required: true, message: '请输入拼团封面图1' },
-        ],
-        help: '建议图片尺寸：750*420px，比例16:9,格式：jpg，用于：活动列表/首页推荐',
-      },
-      {
-        label: '拼团封面图2',
-        name: 'bannerListImg',
-        type: FieldTypes.ImageUploader,
-        value: dynamicData.bannerListImg,
-        rules: [
-          { required: true, message: '请输入拼团封面图2' },
-        ],
-        help: '建议图片尺寸：750*250px，比例3:1,格式：jpg，用于：项目详情页',
-      },
-      {
-        label: '活动时间',
-        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' } },
-        rules: [
-          { required: true, message: '请选择活动时间' },
-        ],
-      },
-      {
-        label: '成团人数',
-        name: 'groupBuyPeople',
-        type: FieldTypes.Text,
-        value: dynamicData.groupBuyPeople,
-        props: {disabled: activityStatus === 0 ? true : false },
-        help: '注：成团所需人数',
-        rules: [
-          { required: true, message: '请输入成团人数' },
-        ]
-      },
-      {
-        label: '所需积分',
-        name: 'integral',
-        type: FieldTypes.Text,
-        value: dynamicData.integral,
-        props: {disabled: activityStatus === 0 ? true : false },
-        help: '注：用户平均积分' + scoreData.averageScore,
-        rules: [
-          { required: true, message: '请输入所需积分' },
-        ]
-      },
-      {
-        label: '活动说明',
-        name: 'descImg',
-        type: FieldTypes.ImageUploader,
-        value: dynamicData.descImg,
-        rules: [
-          { required: true, message: '请输入活动说明' },
-        ],
-        help: '建议宽度：750px，高度不限，格式：jpg，用于活动详情',
-      },
-      {
-        label: '权重',
-        name: 'heavy',
-        type: FieldTypes.Number,
-        render: <Input type="number" style={{ width: 80}} />,
-        value: dynamicData.heavy,
-        rules: [
-          { required: true, message: '请输入权重' },
-        ],
-        help: '数字越大越靠前',
-      },
-    ]
+    const [startTime, endTime] = activityTime
+    submitValue.startTime = moment(startTime).format('YYYY-MM-DD HH:mm');
+    submitValue.endTime = moment(endTime).format('YYYY-MM-DD HH:mm');
 
-    function compareDate(dateTime1, dateTime2) {
-      var formatDate1 = new Date(dateTime1)
-      var formatDate2 = new Date(dateTime2)
-      if (formatDate1 > formatDate2) {
-        return true;
-      }
-      else {
-        return false;
+    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('保存成功')
+        // cancelPage()
+      }).catch(() => {
+        // message.info(err.msg || err.message)
+      })
+    } else {
+      request({ ...apis.groupActivity.add, data: submitValue }).then(data => {
+        router.push({
+          pathname: '/activity/groupActivity/editGroupActivity',
+          query: {
+            groupActivityId: data,
+          },
+        });
+        message.info("保存成功")
+        // cancelPage()
+      }).catch(() => {
+        // message.info(err.msg || err.message)
+      })
     }
+  }
 
-    const handleSubmit = val => {
-      const { activityTime, signupTime, ...submitValue } = val
-      console.log('val', val)
-      const [startTime, endTime] = activityTime
-      submitValue.startTime = moment(startTime).format('YYYY-MM-DD HH:mm');
-      submitValue.endTime = moment(endTime).format('YYYY-MM-DD HH:mm');
-      console.log('submit data --->', submitValue)
-      if (groupActivityId) {
+  return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+}
 
-        const nowDate = new Date()
-        if (!compareDate(nowDate, startTime)) {
+const Poster = props => {
+  const { groupActivityId } = props;
+  const [inputValue, changeInput] = useState('')
+  const [textAreaValue, changeTextArea] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [posterId, setPosterId] = useState('')
+  // const [miniappName, setMiniappName] = useState('')
 
-          message.info("修改后的开始时间不得大于当前时间（会存在已经成功助力或者发起助力的用户）")
-          return
+  useEffect(() => {
+    if (groupActivityId) {
+      request({ ...apis.activity.poster, params: { targetId: groupActivityId, targetType: 'groupActivity' } }).then(data => {
+        if (data.length > 0) {
+          setPosterId(data[0].posterId)
+          changeImg(data[0].posterImg)
+          changeTextArea(data[0].posterDescription)
+          changeInput(data[0].posterTitle)
         }
-        submitValue.groupActivityId = groupActivityId
-        request({ ...apis.groupActivity.update, data: submitValue }).then((data) => {
-          message.info("保存成功")
-          // cancelPage()
-        }).catch((err) => {
-          // message.info(err.msg || err.message)
-        })
-      } else {
-        request({ ...apis.groupActivity.add, data: submitValue }).then((data) => {
-          router.push({
-            pathname: '/activity/groupActivity/editGroupActivity',
-            query: {
-              groupActivityId: data,
-            },
-          });
-          message.info("保存成功")
-          // cancelPage()
-        }).catch((err) => {
-          // message.info(err.msg || err.message)
-        })
-      }
+      }).catch(err => {
+        message.info(err.msg || err.message)
+      })
     }
 
-    return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
-  }
+    // getMiniappName()
+  }, [])
 
-  const Poster = (props) => {
-    const [inputValue, changeInput] = useState('')
-    const [textAreaValue, changeTextArea] = useState('')
-    const [imgValue, changeImg] = useState('')
-    const [posterId, setPosterId] = useState('')
+  // // 获取小程序名称
+  // function getMiniappName() {
+  //   request({ ...apis.building.getMiniappName }).then(res => {
+  //     setMiniappName(res)
+  //   })
+  // }
 
+  const submitPoster = () => {
     if (groupActivityId) {
-      console.log(groupActivityId, 'groupActivityId')
-      useEffect(() => {
-        request({ ...apis.activity.poster, params: { targetId: groupActivityId, targetType: 'groupActivity' } }).then((data) => {
-          if (data.length > 0) {
-            setPosterId(data[0].posterId)
-            changeImg(data[0].posterImg)
-            changeTextArea(data[0].posterDescription)
-            changeInput(data[0].posterTitle)
-          }
-        }).catch((err) => {
+      if (posterId) {
+        request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: groupActivityId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then(data => {
+          message.info('保存成功')
+        }).catch(err => {
           message.info(err.msg || err.message)
         })
-        getMiniappName()
-      }, [])
-    }else{
-      getMiniappName()
-    }
-    // 获取小程序名称
-    const [miniappName, setMiniappName] = useState('')
-    function getMiniappName() {
-      request({ ...apis.building.getMiniappName }).then(res => {
-        console.log(res, "0000000000000")
-        setMiniappName(res)
-      })
-    }
-
-    const submitPoster = () => {
-      if (groupActivityId) {
-        if (posterId) {
-          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: groupActivityId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
-            message.info("保存成功")
-          }).catch((err) => {
-            message.info(err.msg || err.message)
-          })
-        } else {
-          request({ ...apis.activity.addPoster, data: { targetId: groupActivityId, targetType: 'groupActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
-            setPosterId(data.posterId)
-            message.info("保存成功")
-          }).catch((err) => {
-            message.info(err.msg || err.message)
-          })
-        }
       } else {
-        message.warn("请先保存基本信息数据")
+        request({ ...apis.activity.addPoster, data: { targetId: groupActivityId, targetType: 'groupActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then(data => {
+          setPosterId(data.posterId)
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
       }
+    } else {
+      message.warn('请先保存基本信息数据')
     }
+  }
 
-    return <div>
-      <div style={{ display: 'flex' }}>
-        <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
-          <div style={{ width: '375px', height: '700px', backgroundColor: '#fff', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
-            <img style={{ width: '100%', height: '300px' }} src={imgValue ? imgValue : poster1} alt="" />
-            <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
-              <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} src={touxiang} alt="" />
-              <span style={{ color: '#222', fontWeight: '600', margin: '24px 10px 0 14px', fontSize: '17px' }}>喵喵</span>
-              <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您参与</span>
-              <span style={{ color: '#999', margin: '25px 0 0 60px', fontSize: '17px' }}>2019.09.21</span>
-            </div>
-            <p style={{
-              margin: '10px 20px', fontSize: '20px', color: '#222', fontWeight: '600',
-              display: '-webkit-box', lineClamp: '3', height: '60px',
-              WebkitLineClamp: '2',
-              WebkitBoxOrient: 'vertical',
-              overflow: 'hidden',
-              textOverflow: 'ellipsis'
-            }}>{inputValue ? inputValue : '海报标题'}</p>
-
-            <img src={yinhao} style={{ width: '30px', marginLeft: '20px' }} alt="" />
-            <p style={{
-              margin: '16px 20px 28px 20px', fontSize: '17px', color: '#999',
-              display: '-webkit-box', lineClamp: '3', height: '72px',
-              WebkitLineClamp: '3',
-              WebkitBoxOrient: 'vertical',
-              overflow: 'hidden',
-              textOverflow: 'ellipsis'
-            }}>{textAreaValue ? textAreaValue : '海报描述'}</p>
-            <div style={{ backgroundColor: '#f1f1f1', padding: '22px 30px', boxShadow: '0px 6px 12px -4px #dcdcdc', position: 'relative' }}>
-              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>长按识别小程序码</p>
-              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>进入活动查看详情</p>
-              <img style={{ width: '80px', position: 'absolute', right: '30px', top: '10px' }} src={xiaochengxu} alt="" />
-            </div>
+  return <div>
+    <div style={{ display: 'flex' }}>
+      <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
+        <div style={{ width: '375px', height: '700px', backgroundColor: '#fff', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
+          <img style={{ width: '100%', height: '300px' }} src={imgValue || poster1} alt="" />
+          <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
+            <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} src={touxiang} alt="" />
+            <span style={{ color: '#222', fontWeight: '600', margin: '24px 10px 0 14px', fontSize: '17px' }}>喵喵</span>
+            <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您参与</span>
+            <span style={{ color: '#999', margin: '25px 0 0 60px', fontSize: '17px' }}>2019.09.21</span>
           </div>
-          <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
-        </div>
+          <p style={{
+            margin: '10px 20px',
+            fontSize: '20px',
+            color: '#222',
+            fontWeight: '600',
+            display: '-webkit-box',
+            lineClamp: '3',
+            height: '60px',
+            WebkitLineClamp: '2',
+            WebkitBoxOrient: 'vertical',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+          }}>{inputValue || '海报标题'}</p>
 
-        <div >
-          <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-            <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*600，比例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)} />
-          </div>
-          <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
-            <TextArea rows={5} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+          <img src={yinhao} style={{ width: '30px', marginLeft: '20px' }} alt="" />
+          <p style={{
+            margin: '16px 20px 28px 20px',
+            fontSize: '17px',
+            color: '#999',
+            display: '-webkit-box',
+            lineClamp: '3',
+            height: '72px',
+            WebkitLineClamp: '3',
+            WebkitBoxOrient: 'vertical',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+          }}>{ textAreaValue || '海报描述'}</p>
+          <div style={{ backgroundColor: '#f1f1f1', padding: '22px 30px', boxShadow: '0px 6px 12px -4px #dcdcdc', position: 'relative' }}>
+            <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>长按识别小程序码</p>
+            <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>进入活动查看详情</p>
+            <img style={{ width: '80px', position: 'absolute', right: '30px', top: '10px' }} src={xiaochengxu} alt="" />
           </div>
+        </div>
+        <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
+      </div>
 
+      <div >
+        <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+          <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*600，比例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)} />
         </div>
+        <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
+          <TextArea rows={5} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+        </div>
+
       </div>
-      <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
-      <Button onClick={() => cancelPage()}>取消</Button>
     </div>
-
-  }
+    <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
+    <Button onClick={() => cancelPage()}>取消</Button>
+  </div>
+}
 
 
+const Share = props => {
+  const { groupActivityId } = props
+  const [inputValue, changeInput] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [shareContentId, setShareContentId] = useState('')
 
-  const Share = (props) => {
-    const [inputValue, changeInput] = useState('')
-    const [imgValue, changeImg] = useState('')
-    const [shareContentId, setShareContentId] = useState('')
+  useEffect(() => {
+      if (groupActivityId) {
+      request({ ...apis.activity.shareContent, params: { targetId: groupActivityId, targetType: 'groupActivity' } }).then(data => {
+        if (data.length > 0) {
+          setShareContentId(data[0].shareContentId)
+          changeImg(data[0].shareContentImg)
+          changeInput(data[0].shareContentTitle)
+        }
+      }).catch(err => {
+        message.info(err.msg || err.message)
+      })
+    }
+  }, [])
 
+  const submitShare = () => {
     if (groupActivityId) {
-      useEffect(() => {
-        request({ ...apis.activity.shareContent, params: { targetId: groupActivityId, targetType: 'groupActivity' }, }).then((data) => {
-          console.log(data, "2222")
-          if (data.length > 0) {
-            setShareContentId(data[0].shareContentId)
-            changeImg(data[0].shareContentImg)
-            changeInput(data[0].shareContentTitle)
-          }
-        }).catch((err) => {
+      if (shareContentId) {
+        request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: groupActivityId, shareContentType: 'groupActivity', shareContentImg: imgValue, shareContentTitle: inputValue } }).then(data => {
+          message.info('保存成功')
+        }).catch(err => {
           message.info(err.msg || err.message)
         })
-      }, [])
-    }
-
-    const submitShare = () => {
-      if (groupActivityId) {
-        if (shareContentId) {
-          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: groupActivityId, shareContentType: 'groupActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
-            message.info("保存成功")
-          }).catch((err) => {
-            message.info(err.msg || err.message)
-          })
-        } else {
-          request({ ...apis.activity.addShareContent, data: { targetId: groupActivityId, shareContentType: 'groupActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
-            setShareContentId(data.shareContentId)
-            message.info("保存成功")
-          }).catch((err) => {
-            message.info(err.msg || err.message)
-          })
-        }
       } else {
-        message.warn("请先保存基本信息数据")
+        request({ ...apis.activity.addShareContent, data: { targetId: groupActivityId, shareContentType: 'groupActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then(data => {
+          setShareContentId(data.shareContentId)
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
       }
+    } else {
+      message.warn('请先保存基本信息数据')
     }
+  }
 
-    return <div style={{ padding: '20px' }}>
-      <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
-        <div>
-          <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />橙蕉互动</p>
-          <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '置业V客厅 精准获客平台'}</p>
-          <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
-        </div>
-      </div>
-      <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
-        <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
-      </div>
-      <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>拼团分享图</p>
-        <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+  return <div style={{ padding: '20px' }}>
+    <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
+      <div>
+        <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />橙蕉互动</p>
+        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue || '置业V客厅 精准获客平台'}</p>
+        <img style={{ width: '200px', height: '160px' }} src={imgValue || poster2} alt="" />
       </div>
-      <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>
+    <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
+      <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
+    </div>
+    <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
+      <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>
+    <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+    <Button onClick={() => cancelPage()}>取消</Button>
+  </div>
+}
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  const [tab, changeTab] = useState('basic')
+  // 判断是否展示助力次数的输入框
+  const { groupActivityId } = props.location.query
+  const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
+  const [scoreData, setScoreData] = useState({})
+  const [activityStatus, setActivityStatus] = useState({})
+  const [disable, setDisable] = useState(false)
+
+  // 详情
+  const getDynamicData = id => {
+    request({ ...apis.groupActivity.details, urlData: { id } }).then(data => {
+      setDynamicData(data)
+      setActivityStatus(data.activityStatus)
+      setDisable(data.activityStatus === 0)
+    })
   }
 
+  useEffect(() => {
+    request(apis.groupActivity.avgScore).then(data => {
+      setScoreData(data);
+    })
+  }, [])
+
+  useEffect(() => {
+    if (groupActivityId) {
+      getDynamicData(groupActivityId);
+    }
+  }, [groupActivityId])
+
+  // const radioOnChange = e => {
+  //   setDynamicData({ ...dynamicData, isEnlist: e.target.value })
+  // }
+
   return (
     <div>
       <div>
@@ -416,14 +416,14 @@ const Edit = props => {
         </Radio.Group>
       </div>
       <div>
-        {tab === 'basic' && <Basic />}
-        {tab === 'poster' && <Poster />}
+        {tab === 'basic' && <Basic dynamicData={dynamicData} disable={disable} activityStatus={activityStatus} scoreData={scoreData} groupActivityId={groupActivityId} />}
+        {tab === 'poster' && <Poster groupActivityId={groupActivityId}/>}
         {tab === 'share' && <Share />}
       </div>
       <Prompt message={location =>
-        location.pathname.startsWith("/activity/groupActivity")
+        (location.pathname.startsWith('/activity/groupActivity')
           ? true
-          : localStorage.removeItem("groupActivePageParams")} />
+          : localStorage.removeItem('groupActivePageParams'))} />
     </div>
   );
 }

src/pages/channel/brokerList.jsx

@@ -43,6 +43,7 @@ const columns = [
     dataIndex: 'nickname',
     key: 'nickname',
     align: 'center',
+    render: (text, list) => <><span>{ list.name || list.nickname }</span></>,
   },
   {
     title: '电话',

src/pages/channel/channelList.jsx

@@ -68,7 +68,7 @@ const columns = [
       render: (text, record) => <a style={ { color: '#66B3FF' } } onClick= {() => toBroker(record)} >{ record.brokerCount }</a>,
   },
   {
-    title: '推荐客户有效',
+    title: '推荐客户有效数',
     dataIndex: 'recommendCount',
     key: 'recommendCount',
     align: 'center',
@@ -144,10 +144,12 @@ const header = props => {
   }
   // 查询
   function queryList() {
+   
     getList({ pageNum: 1, pageSize: 10, channelId: channelNmae })
   }
   // 重置
   function reset() {
+    setChannelNmae()
     getList({ pageNum: 1, pageSize: 10 })
   }
 
@@ -163,11 +165,13 @@ const header = props => {
 
   // 分页
   function onChange(pageNumber) {
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        getList({ pageNum: pageNumber, pageSize: 10, ...values })
-      }
-    });
+    getList({ pageNum: pageNumber, pageSize: 10, channelId: channelNmae })
+    // getList({ pageNum: pageNumber, pageSize: 10, ...values })
+    // props.form.validateFields((err, values) => {
+    //   if (!err) {
+    //     getList({ pageNum: pageNumber, pageSize: 10, ...values })
+    //   }
+    // });
   }
 
   function onChannelChange(value) {
@@ -193,7 +197,7 @@ const header = props => {
         <AuthButton name="admin.channel.search" noRight={null}>
           <Button type="primary" onClick={() => queryList()}>查询</Button>
           </AuthButton>
-          {/* <Button onClick={() => reset() }>重置</Button> */}
+          <Button onClick={() => reset() } style={{marginLeft:'8px'}}>重置</Button>
         </div>
       </div>
       <AuthButton name="admin.channel.post" noRight={null}>

src/pages/channel/independentList/index.jsx

@@ -24,11 +24,11 @@ class ModalTable extends React.Component {
   }
 
   // 挂载之后
-  componentDidMount () {
+  componentDidMount() {
     this.getList({ pageNumber: 1, pageSize: 5 })
   }
 
-  componentDidUpdate (preProps, preState) {
+  componentDidUpdate(preProps, preState) {
     if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
       this.getList({ pageNumber: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });
@@ -37,16 +37,16 @@ class ModalTable extends React.Component {
 
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
-  handleOk () {
+  handleOk() {
     this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
   }
 
   // 弹框取消按钮
-  handleCancel () {
+  handleCancel() {
     this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
   }
 
-  getList (params) {
+  getList(params) {
     console.log('this.state.visibleData', this.state.visibleData)
     const { customerId } = this.state.visibleData
     if (customerId === '' || customerId === undefined) {
@@ -70,25 +70,25 @@ class ModalTable extends React.Component {
   }
 
   // 分页
-  onChange (pageNum) {
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        getList({ pageNumber: pageNum, pageSize: 5, ...values })
-      }
-    });
+  onChange(pageNum) {
+
+    this.getList({ pageNumber: pageNum, pageSize: 5, })
+
   }
 
-  render () {
+  render() {
     const columns = [
       {
         title: '头像',
         // eslint-disable-next-line jsx-a11y/alt-text
-        render: (text, records) => <img src={records.picture} width={50} height={50} />,
+        render: (text, record) => <Avatar shape="square" src={record.picture} size={64} icon="user" />,
+        // render: (text, records) => <img src={records.picture} width={50} height={50} />,
       },
       {
         title: '用户名',
         dataIndex: 'name',
         key: 'name',
+        // render: (row) => <><span>{console.log(row, 'row')}{row.name || row.nickname}</span></>,
       },
       {
         title: '电话',
@@ -110,20 +110,37 @@ class ModalTable extends React.Component {
         title: '推荐时间',
         dataIndex: 'createDate',
         key: 'createDate',
-        render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD') }</span></>,
+        render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
       },
       {
         title: '状态',
         // eslint-disable-next-line consistent-return
         render: (text, records) => {
           console.log("retrun", records)
-          if (records.status === 1) { if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
+          //     if (records.status === 1) { return '报备' }
+          // if (records.status === 2) { return '推荐' }
+          // if (records.status === 3) { return '认购' }
+          // if (records.status === 4) { return '签约' }
+          // if (records.verifyStatus === 1) { return '待审核' }
+          // if (records.verifyStatus === 2) { return '审核同意' }
+          // if (records.verifyStatus === 3) { return '签约' }
+          // if (records.status === 1) { if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
+          // if (records.status === 2) { return '到访' }
+          // if (records.status === 3) { return '认购' }
+          // if (records.status === 4) { return '签约' }
+          // if (records.verifyStatus === 1) { return '待审核' }
+          // if (records.verifyStatus === 2) { return '审核同意' }
+          // if (records.verifyStatus === 3) { return '签约' }
+          if (records.status === 1) {
+            if (records.verifyStatus === 0) { return '待审核' }
+            if (records.verifyStatus === 1) { return '报备' }
+            // if (records.reportRecommendStatus === 1) { return '报备' }
+            // if (records.reportRecommendStatus === 2) { return '推荐' }}
+            if (records.verifyStatus === 2) { return '审核驳回' }
+           }
           if (records.status === 2) { return '到访' }
           if (records.status === 3) { return '认购' }
           if (records.status === 4) { return '签约' }
-          if (records.verifyStatus === 1) { return '待审核' }
-          if (records.verifyStatus === 2) { return '审核同意' }
-          if (records.verifyStatus === 3) { return '签约' }
           // reportRecommendStatus
         },
       },
@@ -160,13 +177,13 @@ class InviteTable extends React.Component {
   }
 
   // 挂载之后
-  componentDidMount () {
-    
+  componentDidMount() {
+
   }
 
-  componentDidUpdate (preProps, preState) {
+  componentDidUpdate(preProps, preState) {
     const { customerId } = this.props.visibleData
-    
+
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
       this.getList({ id: customerId, pageNumber: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });
@@ -175,18 +192,18 @@ class InviteTable extends React.Component {
 
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
-  handleOk () {
+  handleOk() {
     this.setState({ dataSource: { records: [] } })
     this.props.onCancel()
   }
 
   // 弹框取消按钮
-  handleCancel () {
+  handleCancel() {
     this.setState({ dataSource: { records: [] } })
     this.props.onCancel()
   }
 
-  getList (params) {
+  getList(params) {
     const { id } = params
     console.log(id)
     if (id === '' || id === undefined) {
@@ -196,16 +213,16 @@ class InviteTable extends React.Component {
       this.setState({ dataSource: res })
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
-    
+
     })
   }
 
   // 分页
-  onChange (pageNum) {
+  onChange(pageNum) {
     this.getList({ pageNumber: pageNum, pageSize: 5 })
   }
 
-  render () {
+  render() {
     const columns = [
       {
         title: '头像',
@@ -219,7 +236,7 @@ class InviteTable extends React.Component {
         dataIndex: 'nickname',
         key: 'nickname',
         align: 'center',
-        render: text => <a>{text}</a>,
+        render: (row) => <><span>{console.log(row, 'row')}{row.name || row.nickname}</span></>,
       },
       {
         title: '电话',
@@ -259,8 +276,8 @@ class InviteTable extends React.Component {
  * @param {*} props
  * @returns
  */
-function body (props) {
-  const { getFieldDecorator } = props.form
+function body(props) {
+  const { getFieldDecorator, getFieldsValue } = props.form
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [dataSource, setDataSource] = useState({ records: [] })
@@ -271,7 +288,7 @@ function body (props) {
   }, [])
 
 
-  function openNotificationWithIcon (type, message) {
+  function openNotificationWithIcon(type, message) {
     notification[type]({
       message,
       description:
@@ -279,7 +296,7 @@ function body (props) {
     });
   }
 
-  function getList (params) {
+  function getList(params) {
     // 网路请求
     request({ ...apis.customer.agents, params: { ...params } }).then(res => {
       setDataSource(res)
@@ -289,7 +306,7 @@ function body (props) {
   }
 
   // 提交事件
-  function handleSubmit (e) {
+  function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
@@ -302,24 +319,24 @@ function body (props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [gInviteData, setGInviteData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
   // Change 事件
-  function handleSelectChange (e) {
+  function handleSelectChange(e) {
     // eslint-disable-next-line no-console
     console.log(e)
   }
-  function gM (row) {
+  function gM(row) {
     setGVisibleData({ visible: true, customerId: row.personId, realtyConsultant: row.realtyConsultant })
 
     setGInviteData({ visible: false })
   }
 
-  function Invite (row) {
+  function Invite(row) {
     setGInviteData({ visible: true, customerId: row.personId, realtyConsultant: row.realtyConsultant })
 
     setGVisibleData({ visible: false })
   }
 
   // 分页
-  function onChange (pageNum) {
+  function onChange(pageNum) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     getList({ pageNumber: pageNum, pageSize: 10 })
   }
@@ -327,11 +344,12 @@ function body (props) {
   /**
     * 重置搜索
     */
-  function handleReset () {
+  function handleReset() {
     props.form.resetFields();
+    getList({ pageNumber: 1, pageSize: 10 })
   }
 
-  function toAudit (cuurentId) {
+  function toAudit(cuurentId) {
     router.push({
       pathname: '/customer/recommendCustomer/audit',
       query: {
@@ -340,8 +358,10 @@ function body (props) {
     })
   }
 
-  function exportIndependen () {
-    request({ ...apis.customer.customerRecommendAgentsExport, responseType: 'blob' })
+  function exportIndependen() {
+    const fieldsValue = getFieldsValue()
+    console.log('fieldsValue', fieldsValue)
+    request({ ...apis.customer.customerRecommendAgentsExport, responseType: 'blob', params: { ...fieldsValue } })
       .then(response => {
         download(response)
       }).catch(error => {
@@ -349,7 +369,7 @@ function body (props) {
       })
   }
 
-  function download (data) {
+  function download(data) {
     if (!data) {
       return
     }
@@ -373,6 +393,7 @@ function body (props) {
       title: '姓名',
       dataIndex: 'nickname',
       key: 'nickname',
+      render: (_, record) => <><span>{record.name || record.nickname}</span></>,
     },
     {
       title: '电话',
@@ -396,7 +417,7 @@ function body (props) {
       title: '所属渠道',
       dataIndex: 'channelName',
       key: 'channelName',
-      render: (_, record) => <><span>{record.channelName }</span></>,
+      render: (_, record) => <><span>{record.channelName}</span></>,
     },
     {
       title: '操作',
@@ -436,16 +457,16 @@ function body (props) {
   return (
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex', alignItems: 'center' }}>
-      <Form.Item>
+        <Form.Item>
           {getFieldDecorator('channelId')(
-           <ChannelSelect />
-          //   <Select defaultValue="渠道名称" style={{ width: 180 }} onChange={handleChange}>
-          //   <option value="">全部</option>
-          //   {data.channelNmae.map(Item =>
-          //     <Option value={Item.channelId}> {Item.channelName} </Option>,
-          //   )}
-      
-          // </Select>,
+            <ChannelSelect />
+            //   <Select defaultValue="渠道名称" style={{ width: 180 }} onChange={handleChange}>
+            //   <option value="">全部</option>
+            //   {data.channelNmae.map(Item =>
+            //     <Option value={Item.channelId}> {Item.channelName} </Option>,
+            //   )}
+
+            // </Select>,
           )}
         </Form.Item>
         <Form.Item>

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,Avatar } 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,14 +52,14 @@ const columns = [
     // key: 'img',
     align: 'center',
 
-    render: (text, record) =>  <Avatar shape="square"   src={record.picture} size={64} icon="user" /> ,
+    render: (text, record) => <Avatar shape="square" src={record.picture} size={64} icon="user" />,
   },
   {
     title: '用户姓名',
     dataIndex: 'name',
     key: 'name',
     align: 'center',
-    render: text => <a>{text}</a>,
+    render: (text, record) => <div>{record.name}</div>,
   },
   {
     title: '电话',
@@ -72,7 +72,7 @@ const columns = [
     dataIndex: 'sex',
     key: 'sex',
     align: 'center',
-    render: (text, record) => <span>{ record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知' }</span>
+    render: (text, record) => <span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span>
   },
   {
     title: '意向项目',
@@ -85,7 +85,7 @@ const columns = [
     dataIndex: 'createDate',
     key: 'createDate',
     align: 'center',
-    render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD') }</span></>,
+    render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
   },
   {
     title: '状态',
@@ -94,21 +94,38 @@ const columns = [
     align: 'center',
     // eslint-disable-next-line consistent-return
     render: (text, records) => {
-      if (records.status === 1) { return '报备' }
-      if (records.status === 2) { return '推荐' }
+      //    if (records.status === 1) { if(records.reportRecommendStatus === 0) {return '未审核'} if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
+      // if (records.status === 2) { return '到访' }
+      // if (records.status === 3) { return '认购' }
+      // if (records.status === 4) { return '签约' }
+      // if (records.verifyStatus === 1) { return '待审核' }
+      // if (records.verifyStatus === 2) { return '审核同意' }
+      // if (records.verifyStatus === 3) { return '签约' }
+      // if (records.status === 1) { return '报备' }
+      // if (records.status === 2) { return '推荐' }
+      // if (records.status === 3) { return '认购' }
+      // if (records.status === 4) { return '签约' }
+      // if (records.verifyStatus === 1) { return '待审核' }
+      // if (records.verifyStatus === 2) { return '审核同意' }
+      // if (records.verifyStatus === 3) { return '签约' }
+      if (records.status === 1) {
+        if (records.verifyStatus === 0) { return '待审核' }
+        if (records.verifyStatus === 1) { return '报备' }
+        // if (records.reportRecommendStatus === 1) { return '报备' }
+        // if (records.reportRecommendStatus === 2) { return '推荐' }}
+        if (records.verifyStatus === 2) { return '审核驳回' }
+       }
+      if (records.status === 2) { return '到访' }
       if (records.status === 3) { return '认购' }
       if (records.status === 4) { return '签约' }
-      if (records.verifyStatus === 1) { return '待审核' }
-      if (records.verifyStatus === 2) { return '审核同意' }
-      if (records.verifyStatus === 3) { return '签约' }
-    },
+    }
   },
 ];
 
 const header = props => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState({})
-//   const [page, changePage] = useState({})
+  //   const [page, changePage] = useState({})
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     getListRecommend({ pageNumber: 1, pageSize: 10 })
@@ -129,23 +146,23 @@ const header = props => {
   function getListRecommend(params) {
     request({ ...apis.channelList.getListRecommend, urlData: { id: props.location.query.id }, params: { ...params } }).then((data) => {
       setData(data)
-  }).catch((err) => {
+    }).catch((err) => {
       console.log(err)
       message.info(err.msg || err.message)
-  })
+    })
   }
 
 
-   // 分页
- function onChange(pageNum) {
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      getListRecommend({ pageNumber: pageNum, pageSize: 9 })
-    }
-return (
-  <>
-  <Table dataSource={data.records} rowKey="recommendClist" columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
-  </>
-)
+  // 分页
+  function onChange(pageNum) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    getListRecommend({ pageNumber: pageNum, pageSize: 9 })
+  }
+  return (
+    <>
+      <Table dataSource={data.records} rowKey="recommendClist" columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
+    </>
+  )
 }
 
 function handleMenuClick(e) {

src/pages/customer/customerlist/customerDetail.jsx

@@ -151,7 +151,7 @@ function header(props) {
               <p className={styles.rightItem}>国家：{dataConsultant && dataConsultant.country}</p>
               <p className={styles.rightItem}>省份：{dataConsultant && dataConsultant.provience}</p>
               <p className={styles.rightItem}>城市：{dataConsultant && dataConsultant.city}</p>
-              <p className={styles.rightItem}>来访渠道：{data.personFrom ? data.personFrom : "其他"}</p>
+              <p className={styles.rightItem}>来源渠道：{data.personFrom ? data.personFrom : "其他"}</p>
               {/* <p className={styles.rightItem}>详细信息：</p> */}
               {/* <p className={styles.rightItem}>意向项目：{data.intention }</p> */}
               {/* <p className={styles.rightItem}>客户说明：{ data.verifyRemark }</p> */}

src/pages/customer/customerlist/publicCustomerDetail.jsx

@@ -139,7 +139,7 @@ function onChange(number) {
           <div className={publicStyle.Centered}>
           <p>访问时长：{ data.duration }秒</p>
           <p>访问次数：{ data.visitTimes }次</p>
-          <p className={publicStyle.rightItem}>来访渠道：{data.personFrom ? data.personFrom : '其他'}</p>
+          <p className={publicStyle.rightItem}>来源渠道：{data.personFrom ? data.personFrom : '其他'}</p>
           {/* <p>预约人数：{ data.visiteNum }</p> */}
           </div>
           {/* <p className={styles.rightItem}>预约到访时间：{data.appointmentTime && moment(data.appointmentTime).format('YYYY-MM-DD') }</p> */}

src/pages/recommend/recommendCustomer/audit.jsx

@@ -56,12 +56,13 @@ function body(props) {
   function getById(currentId) {
     request({ ...apis.customer.recommendGetById, urlData: { id: currentId } }).then(res => {
       res.reportDate = moment(res.reportDate)
-     props.form.setFieldsValue(res)
+      props.form.setFieldsValue(res)
     })
   }
 
   function submitDate(params) {
     // props.form.setFieldsValue(res)
+    console.log(params, 'params')
     request({ ...apis.customer.auto, urlData: { id: params.customerId || props.form.getFieldValue('customerId') }, params: { verifyStatus: params.verifyStatus, realtyConsultant: props.form.getFieldValue('realtyConsultant') } }).then(() => {
       // eslint-disable-next-line no-unused-expressions
       openNotificationWithIcon('success', '操作成功')
@@ -77,7 +78,8 @@ function body(props) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        submitDate({ ...values })
+        submitDate({ verifyStatus: '1' })
+        // submitDate({ ...values })
       }
     });
   }
@@ -195,20 +197,28 @@ function body(props) {
               <Option value={1}>已通过</Option>
               <Option value={2}>已驳回</Option>
             </Select>,
-          )}
+          )}onClick={() => submitDate({ verifyStatus: '1' })}
         </Form.Item> */}
-        <Form.Item label="归属置业顾问">
-            <Row gutter={8}>
-              <Col span={12}>
-                {getFieldDecorator('consultantName')(<Input placeholder="请选择置业顾问" />)}
-              </Col>
-              <Col span={12}>
-                <Button onClick={() => showConsultant()}>选择</Button>
-              </Col>
-            </Row>
+        <Form.Item label="归属置业顾问"
+      >
+          <Row gutter={8}>
+            <Col span={12}>
+              {getFieldDecorator('consultantName', {
+                rules: [
+                  {
+                    required: true,
+                    message: '请选择置业顾问',
+                  },
+                ],
+              })(<Input placeholder="请选择置业顾问" />)}
+            </Col>
+            <Col span={12}>
+              <Button onClick={() => showConsultant()}>选择</Button>
+            </Col>
+          </Row>
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
-          <Button type="primary" className={Styles.SubmitButton} onClick={() => submitDate({ verifyStatus: '1' })}>
+          <Button type="primary" className={Styles.SubmitButton} htmlType="submit" >
             审核通过
           </Button>
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -219,7 +229,7 @@ function body(props) {
       </Form>
 
       {/* 选择置业顾问 */}
-      <Attribution visibleData={visibleData} onCancel={() => closeConsultant()} onSuccess={e => consultantSuccess(e)}/>
+      <Attribution visibleData={visibleData} onCancel={() => closeConsultant()} onSuccess={e => consultantSuccess(e)} />
     </>
   );
 }