瀏覽代碼

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

魏熙美 5 年之前
父節點
當前提交
1498cc7fb6
共有 2 個文件被更改,包括 4 次插入6 次删除
  1. 1
    2
      src/pages/activity/ActivityList.jsx
  2. 3
    4
      src/pages/activity/helpActivity/helpRecord.jsx

+ 1
- 2
src/pages/activity/ActivityList.jsx 查看文件

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

+ 3
- 4
src/pages/activity/helpActivity/helpRecord.jsx 查看文件

41
   // 弹框确定按钮
41
   // 弹框确定按钮
42
   // eslint-disable-next-line react/sort-comp
42
   // eslint-disable-next-line react/sort-comp
43
   handleOk () {
43
   handleOk () {
44
+    this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
44
     this.props.onCancel()
45
     this.props.onCancel()
45
-    this.setState({ dataSource: { records: [] } })
46
   }
46
   }
47
 
47
 
48
   // 弹框取消按钮
48
   // 弹框取消按钮
49
   handleCancel () {
49
   handleCancel () {
50
+    this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
50
     this.props.onCancel()
51
     this.props.onCancel()
51
-    this.setState({ dataSource: { records: [] } })
52
   }
52
   }
53
 
53
 
54
   getList (params) {
54
   getList (params) {
55
-    console.log('paramsparamsparams', params)
56
-    if (params.helpId === '') {
55
+    if (params.helpRecordInitiateId === '') {
57
       return
56
       return
58
     }
57
     }
59
     request({ ...apis.helpActivity.helpPeopleDetails, params: { ...params } }).then(res => {
58
     request({ ...apis.helpActivity.helpPeopleDetails, params: { ...params } }).then(res => {