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

src/pages/activity/ActivityList.jsx

@@ -129,12 +129,11 @@ const header = props => {
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{row.weight === 1 ? '取消置顶' : '置顶'}<Icon type="vertical-align-top" className={styles.edit} /></span>
             {row.isEnlist != 2 && <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
           </AuthButton>
-          <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>下载二维码<Icon type="qrcode" className={styles.shoppingCart} /></span>
+          <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>{row.isEnlist == '1' ? '下载二维码' : ''}<Icon type="qrcode" className={styles.shoppingCart} /></span>
         </>
       ),
     },
   ];
-
   const getSignList = dynamicId => {
     router.push({
       pathname: '/activity/SignList',

src/pages/activity/helpActivity/helpRecord.jsx

@@ -41,19 +41,18 @@ class InviteTable extends React.Component {
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
   handleOk () {
+    this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
     this.props.onCancel()
-    this.setState({ dataSource: { records: [] } })
   }
 
   // 弹框取消按钮
   handleCancel () {
+    this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
     this.props.onCancel()
-    this.setState({ dataSource: { records: [] } })
   }
 
   getList (params) {
-    console.log('paramsparamsparams', params)
-    if (params.helpId === '') {
+    if (params.helpRecordInitiateId === '') {
       return
     }
     request({ ...apis.helpActivity.helpPeopleDetails, params: { ...params } }).then(res => {