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

src/pages/activity/editActivity.jsx

@@ -214,135 +214,6 @@ const Edit = props => {
     });
   }
 
-  const radioOnChange = e => {
-    console.log(e.target.value)
-    setDynamicData({ ...dynamicData, isEnlist: e.target.value })
-  }
-
-  const Basic = (props) => {
-    const fields = [
-      {
-        label: '所属项目',
-        name: 'buildingId',
-        render: <BuildSelect />,
-        value: dynamicData.buildingId,
-        rules: [
-          { required: true, message: '请选择所属项目' },
-        ]
-      },
-      {
-        label: '主图',
-        name: 'imgUrl',
-        type: FieldTypes.ImageUploader,
-        value: dynamicData.imgUrl,
-        help: '建议图片尺寸：750px*560px',
-      },
-      {
-        label: '活动标题',
-        name: 'title',
-        type: FieldTypes.Text,
-        value: dynamicData.title,
-        rules: [
-          { required: true, message: '请输入活动标题' },
-        ]
-      },
-      {
-        label: '活动时间',
-        name: 'activityTime',
-        type: FieldTypes.RangePicker,
-        value: dynamicData.startDate != null ? [moment(dynamicData.startDate, 'YYYY-MM-DD HH:mm'), moment(dynamicData.endDate, 'YYYY-MM-DD HH:mm')] : null,
-        props: {showTime:{ format: 'HH:mm' }},
-        rules: [
-          { required: true, message: '请选择活动时间' },
-        ]
-      },
-      {
-        label: '活动地点',
-        name: 'address',
-        type: FieldTypes.Text,
-        value: dynamicData.address,
-        rules: [
-          { required: true, message: '请输入活动地点' },
-        ]
-      },
-      {
-        label: '活动人数',
-        name: 'personNum',
-        type: FieldTypes.Text,
-        value: dynamicData.personNum,
-        rules: [
-          { required: true, message: '请输入活动人数' },
-        ]
-      },
-      {
-        label: '最大报名人数',
-        name: 'maxEnlistByPerson',
-        type: FieldTypes.Text,
-        value: dynamicData.maxEnlistByPerson,
-        rules: [
-          { required: true, message: '请输入最大报名人数' },
-        ]
-      },
-      {
-        label: '活动详情',
-        name: 'desc',
-        render: <Wangedit />,
-        value: dynamicData.desc,
-      },
-      {
-        label: '是否需要报名',
-        name: 'isEnlist',
-        render: <Radio.Group name="radiogroup" onChange={(e) => radioOnChange(e)}>
-          <Radio value={1}>是</Radio>
-          <Radio value={0}>否</Radio>
-        </Radio.Group>,
-        value: dynamicData.isEnlist != null ? dynamicData.isEnlist - 0 : 1,
-      },
-      {
-        label: '报名时间',
-        name: 'signupTime',
-        // type: FieldTypes.RangePicker,
-        render: dynamicData.isEnlist === 1 ? (<RangePicker format={ 'YYYY/MM/DD HH:mm' } style={{ width: '100%' }} />) : '',
-        value: dynamicData.enlistStart != null ? [moment(dynamicData.enlistStart, 'YYYY-MM-DD HH:mm'), moment(dynamicData.enlistEnd, 'YYYY-MM-DD HH:mm')] : null,
-        // props: {showTime:{ format: 'HH:mm' }},
-        rules: [
-          { required: true, message: '请选择报名时间' },
-        ]
-      },
-    ]
-
-    const handleSubmit = val => {
-      let { isEnlist, activityTime, signupTime, ...submitValue } = val
-      const [startDate, endDate] = activityTime
-      submitValue.startDate = moment(startDate).format('YYYY-MM-DD HH:mm');
-      submitValue.endDate = moment(endDate).format('YYYY-MM-DD HH:mm');
-      const [enlistStart, enlistEnd] = signupTime
-      submitValue.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
-      submitValue.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
-      console.log('submit data --->', submitValue)
-
-      if (dynamicId) {
-        submitValue.dynamicId = dynamicId
-        request({ ...apis.activity.update, data: submitValue }).then((data) => {
-          message.info("保存成功")
-          cancelPage()
-        }).catch((err) => {
-          message.info(err.msg || err.message)
-        })
-      } else {
-        request({ ...apis.activity.add, data: submitValue }).then((data) => {
-          message.info("保存成功")
-          cancelPage()
-        }).catch((err) => {
-          message.info(err.msg || err.message)
-        })
-      }
-    }
-
-    return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
-  }
-
-
   const Poster = (props) => {
     const [inputValue, changeInput] = useState('')
     const [textAreaValue, changeTextArea] = useState('')

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -178,7 +178,7 @@ const Edit = props => {
     if (helpActivityId) {
       console.log(helpActivityId, 'helpActivityId')
       useEffect(() => {
-        request({ ...apis.activity.poster, params: { targetId: helpActivityId, targetType: 'activity' } }).then((data) => {
+        request({ ...apis.activity.poster, params: { targetId: helpActivityId, targetType: 'helpActivity' } }).then((data) => {
           console.log(data, "2222")
           if (data.length > 0) {
             setPosterId(data[0].posterId)
@@ -206,13 +206,13 @@ const Edit = props => {
     const submitPoster = () => {
       if (helpActivityId) {
         if (posterId) {
-          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: helpActivityId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: helpActivityId, targetType: 'helPactivity', 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: helpActivityId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+          request({ ...apis.activity.addPoster, data: { targetId: helpActivityId, targetType: 'helPactivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
             setPosterId(data.posterId)
             message.info("保存成功")
           }).catch((err) => {
@@ -264,15 +264,15 @@ const Edit = props => {
 
         <div >
           <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片1</p>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
           <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题1</p>
+            <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' }}>海报描述1</p>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
             <TextArea rows={5} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
           </div>
 
@@ -293,7 +293,7 @@ const Edit = props => {
 
     if (helpActivityId) {
       useEffect(() => {
-        request({ ...apis.activity.shareContent, params: { targetId: helpActivityId, targetType: 'activity' }, }).then((data) => {
+        request({ ...apis.activity.shareContent, params: { targetId: helpActivityId, targetType: 'helPactivity' }, }).then((data) => {
           console.log(data, "2222")
           if (data.length > 0) {
             setShareContentId(data[0].shareContentId)
@@ -309,13 +309,13 @@ const Edit = props => {
     const submitShare = () => {
       if (helpActivityId) {
         if (shareContentId) {
-          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: helpActivityId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: helpActivityId, shareContentType: 'helPactivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
         } else {
-          request({ ...apis.activity.addShareContent, data: { targetId: helpActivityId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+          request({ ...apis.activity.addShareContent, data: { targetId: helpActivityId, shareContentType: 'helPactivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
             setShareContentId(data.shareContentId)
             message.info("保存成功")
           }).catch((err) => {
@@ -329,7 +329,7 @@ const Edit = props => {
 
     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' }}>分享模板1</p>
+        <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>
@@ -337,11 +337,11 @@ const Edit = props => {
         </div>
       </div>
       <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题1</p>
+        <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' }}>分享图片1</p>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
         <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
       </div>
       <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
@@ -353,9 +353,9 @@ const Edit = props => {
     <div>
       <div>
         <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
-          <Radio.Button value="basic">基本信息1</Radio.Button>
-          <Radio.Button value="poster">海报图片1</Radio.Button>
-          <Radio.Button value="share">分享设置1</Radio.Button>
+          <Radio.Button value="basic">基本信息</Radio.Button>
+          <Radio.Button value="poster">海报图片</Radio.Button>
+          <Radio.Button value="share">分享设置</Radio.Button>
         </Radio.Group>
       </div>
       <div>

src/pages/activity/helpActivity/helpRecord.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions, message } from 'antd';
 import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
@@ -123,23 +123,20 @@ class Verifier extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-      helpRecordInitiateId: { id: '' },
-      visibleData: { visible: false, customerId: '', realtyConsultant: '', helpRecordInitiateId: '' },
+      verification: { verificationCode: '' },
+      visibleData: { visible: false, customerId: '', realtyConsultant: '', helpRecordInitiateId: '', verificationCode: '' },
     }
   }
 
   // 挂载之后
   componentDidMount () {
     const { customerId } = this.state.visibleData
-    this.getList({ helpRecordInitiateId: customerId, pageNumber: 1, pageSize: 5 })
   }
 
   componentDidUpdate (preProps, preState) {
     const { customerId } = this.state.visibleData
-    console.log('this.state.visibleData', this.state.visibleData)
     if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
-      this.getList({ helpRecordInitiateId: customerId, pageNumber: 1, pageSize: 5 })
-      this.setState({ visibleData: this.props.visibleData });
+      this.setState({ visibleData: { visible: this.props.visibleData.visible, customerId: this.props.visibleData.customerId, verificationCode: '' } })
     }
   }
 
@@ -154,9 +151,11 @@ class Verifier extends React.Component {
     this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
   }
 
+  // eslint-disable-next-line class-methods-use-this
   getList (params) {
-    request({ ...apis.helpActivity.helpPeopleDetails, params: { ...params } }).then(res => {
-      this.setState({ dataSource: res })
+    request({ ...apis.helpActivity.verification, params: { ...params } }).then(res => {
+      // eslint-disable-next-line no-undef
+      message.info('核销成功')
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
       <Alert
@@ -172,13 +171,12 @@ class Verifier extends React.Component {
 
   // eslint-disable-next-line class-methods-use-this
   verify(e) {
-    console.log('111', e.target.value)
+    this.setState({ visibleData: { visible: true, customerId: this.props.visibleData.customerId, verificationCode: e.target.value } })
   }
 
   // eslint-disable-next-line class-methods-use-this
   verification(e) {
-    console.log('this.state.visibleData', this.state.visibleData)
-      alert(1)
+    this.getList({ helpRecordInitiateId: this.state.visibleData.customerId, verifyCode: this.state.visibleData.verificationCode })
   }
 
   render () {
@@ -286,7 +284,7 @@ function body(props) {
 
   // 助力成功/进行中/助力失败
   function radioButtonHandleSizeChange(e) {
-    setGInviteData({ visible: true, customerId: '', realtyConsultant: '' })
+    setGInviteData({ visible: false, customerId: '', realtyConsultant: '' })
     displayNone()
 
     const { value } = e.target
@@ -335,18 +333,23 @@ function body(props) {
 // 助力记录弹框
 function helpRecord(row) {
 // 关闭核销
-// eslint-disable-next-line max-len
-setVerifierData({ visible: false, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
-  // eslint-disable-next-line max-len
+console.log('gInviteData', gInviteData)
+
+
   setGInviteData({ visible: true, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+
+  setVerifierData({ visible: false, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
 }
  // 核销
  function helpInitiateRecordVerify(row) {
+
+  console.log('gVerifierData', gVerifierData)
 // 关闭助力记录弹框
-// eslint-disable-next-line max-len
-  setVerifierData({ visible: true, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
-  // eslint-disable-next-line max-len
   setGInviteData({ visible: false, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+
+  setVerifierData({ visible: true, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+
+
  }
 
   const publicColumns = [

src/pages/activity/helpActivity/list.jsx

@@ -79,9 +79,9 @@ const toEditGoods = (helpActivityId) => () => {
       key: 'isEnlist',
       align: 'center',
       render: (text, records) => {
-        if (records.status === 0) { return '未开始' }
-        if (records.status === 1) { return '进行中' }
-        if (records.status === 2) { return '已结束' }
+        if (records.activityStatus === 0) { return '未开始' }
+        if (records.activityStatus === 1) { return '进行中' }
+        if (records.activityStatus === 2) { return '已结束' }
       },
     },
     {
@@ -91,7 +91,7 @@ const toEditGoods = (helpActivityId) => () => {
       align: 'center',
       render: (x, row) => (
         <>
-          {row.status === 1 &&
+          {row.activityStatus === 1 &&
           <AuthButton name="admin.SignList.get" noRight={null}>
         
             <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
@@ -100,7 +100,7 @@ const toEditGoods = (helpActivityId) => () => {
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
           </AuthButton> }
 
-          {row.status === 0 &&
+          {row.activityStatus === 0 &&
            <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
                       <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
                       <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
@@ -109,7 +109,7 @@ const toEditGoods = (helpActivityId) => () => {
             </AuthButton>
           }
 
-          {row.status === 2 &&
+          {row.activityStatus === 2 &&
         <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>

src/services/apis.js

@@ -714,6 +714,11 @@ export default {
     method: 'get',
     action: 'admin.taRole.get',
   },
+  verification: {
+    url: `${prefix}/helpInitiateRecordVerify`,
+    method: 'post',
+    action: 'admin.taRole.get',
+  },
  },
  groupActivity: {
   list: {