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

src/components/Wangedit/Wangedit.jsx

@@ -33,6 +33,7 @@ class Wangedit extends React.Component {
       }
     }
     this.editor.customConfig.zIndex = 100
+    this.editor.customConfig.uploadImgShowBase64 = true   
     this.editor.create()
     this.editor.customConfig.uploadImgShowBase64 = true
     this.editor.txt.html(this.props.value)

src/pages/activity/editActivity.jsx

@@ -20,29 +20,193 @@ import xiaochengxu from '../../assets/xiaochengxu.png'
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const { TextArea } = Input;
 
+const formItemLayout = {
+  labelCol: { span: 6 },
+  wrapperCol: { span: 14 },
+};
+
+const BasicForm = props => {
+  const [isEnlist, setIsEnlist] = useState(1)
+
+  const radioOnChange = e => {
+    // console.log(e.target.value)
+    setIsEnlist(e.target.value)
+  }
+
+  const { dynamicId } = props
+
+  // 查询详情
+  const getDynamicData = dynamicId => {
+    request({ ...apis.activity.details, params: { dynamicId } }).then((data) => {
+      console.log(data)
+      data.activityTime = [moment(data.startDate), moment(data.endDate)]
+      data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
+
+      setIsEnlist(data.isEnlist)
+      props.form.setFieldsValue(data)
+    })
+  }
+
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      props.form.setFieldsValue({ isEnlist })
+      if (dynamicId) {
+        getDynamicData(dynamicId);
+      }
+    }, [])
+ 
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('Received values of form: ', values);
+        const { activityTime, signupTime } = values
+        const [startDate, endDate] = activityTime
+        values.startDate = moment(startDate).format('YYYY-MM-DD HH:mm');
+        values.endDate = moment(endDate).format('YYYY-MM-DD HH:mm');
+        if (signupTime) {
+          const [enlistStart, enlistEnd] = signupTime
+          values.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
+          values.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
+        }
+        
+        console.log('submit data --->', values)
+        if (dynamicId) {
+          values.dynamicId = dynamicId
+          request({ ...apis.activity.update, data: values }).then(data => {
+            message.info('保存成功')
+            router.go(-1)
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        } else {
+          request({ ...apis.activity.add, data: { ...values } }).then((data) => {
+            message.info('保存成功')
+            router.go(-1)
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        }
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+  return (
+    <>
+      <Form {...formItemLayout} onSubmit={handleSubmit}>
+        <Form.Item label="所属项目">
+        {getFieldDecorator('buildingId', {
+          rules: [
+            {
+              required: true,
+              message: '请选择所属项目',
+            },
+          ],
+        })(<BuildSelect />)}
+        </Form.Item>
+        <Form.Item label="主图">
+          {getFieldDecorator('imgUrl')(<ImageUploader />)}
+          <span>建议图片尺寸：750px*560px</span>
+        </Form.Item>
+        <Form.Item label="活动标题">
+        {getFieldDecorator('title', {
+          rules: [
+            {
+              required: true,
+              message: '请输入活动标题',
+            },
+          ],
+        })(<Input />)}
+        </Form.Item>
+        <Form.Item label="活动时间">
+        {getFieldDecorator('activityTime', {
+          rules: [
+            {
+              required: true,
+              message: '请选择活动时间',
+            },
+          ],
+        })(<RangePicker format="YYYY-MM-DD HH:mm" />)}
+        </Form.Item>
+        <Form.Item label="活动地点">
+        {getFieldDecorator('address', {
+          rules: [
+            {
+              required: true,
+              message: '请输入活动地点',
+            },
+          ],
+        })(<Input />)}
+        </Form.Item>
+        <Form.Item label="活动人数">
+        {getFieldDecorator('personNum', {
+          rules: [
+            {
+              required: true,
+              message: '请输入活动人数',
+            },
+          ],
+        })(<Input type="number" />)}
+        </Form.Item>
+        <Form.Item label="最大报名人数">
+        {getFieldDecorator('maxEnlistByPerson', {
+          rules: [
+            {
+              required: true,
+              message: '请输入最大报名人数',
+            },
+          ],
+        })(<Input type="number" />)}
+        </Form.Item>
+        <Form.Item label="活动详情">
+        {getFieldDecorator('desc')(<Wangedit />)}
+        </Form.Item>
+        <Form.Item label="是否需要报名">
+        {getFieldDecorator('isEnlist')(
+          <Radio.Group onChange={(e) => radioOnChange(e)}>
+            <Radio value={1}>是</Radio>
+            <Radio value={0}>否</Radio>
+          </Radio.Group>,
+        )}
+        </Form.Item>
+        {
+          isEnlist === 1 && (<Form.Item label="报名时间">
+          {getFieldDecorator('signupTime', {
+            rules: [
+              {
+                required: true,
+                message: '请选择报名时间',
+              },
+            ],
+          })(<RangePicker format="YYYY-MM-DD HH:mm" />)}
+          </Form.Item>)
+        }
+        <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
+          <Button type="primary" htmlType="submit">
+            确认
+          </Button>
+          &nbsp;&nbsp;&nbsp;&nbsp;
+          <Button onClick={() => router.go(-1)}>
+            取消
+          </Button>
+        </Form.Item>
+      </Form>
+    </>
+  )
+}
+
+const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
+
 /**
  *
  *
  * @param {*} props
  * @returns
  */
-const Edit = (props) => {
+const Edit = props => {
   const [tab, changeTab] = useState('basic')
-  const dynamicId = props.location.query.dynamicId
-  const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
-  if (dynamicId) {
-    useEffect(() => {
-      getDynamicData(dynamicId);
-    }, [])
-
-    // 查询列表
-    const getDynamicData = (dynamicId) => {
-      request({ ...apis.activity.details, params: { dynamicId } }).then((data) => {
-        console.log(data)
-        setDynamicData(data)
-      })
-    }
-  }
+  const { dynamicId } = props.location.query
 
   const cancelPage = () => {
     router.push({
@@ -178,6 +342,7 @@ const Edit = (props) => {
     return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
   }
 
+
   const Poster = (props) => {
     const [inputValue, changeInput] = useState('')
     const [textAreaValue, changeTextArea] = useState('')
@@ -245,8 +410,13 @@ const Edit = (props) => {
               <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',
+              margin: '10px 20px',
+fontSize: '20px',
+color: '#222',
+fontWeight: '600',
+              display: '-webkit-box',
+lineClamp: '3',
+height: '60px',
               WebkitLineClamp: '2',
               WebkitBoxOrient: 'vertical',
               overflow: 'hidden',
@@ -255,8 +425,12 @@ const Edit = (props) => {
 
             <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',
+              margin: '16px 20px 28px 20px',
+fontSize: '17px',
+color: '#999',
+              display: '-webkit-box',
+lineClamp: '3',
+height: '72px',
               WebkitLineClamp: '3',
               WebkitBoxOrient: 'vertical',
               overflow: 'hidden',
@@ -327,7 +501,7 @@ const Edit = (props) => {
           request({ ...apis.activity.addShareContent, data: { targetId: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
             setShareContentId(data.shareContentId)
             message.info("保存成功")
-          }).catch((err) => {
+          }).catch(err => {
             message.info(err.msg || err.message)
           })
         }
@@ -368,7 +542,7 @@ const Edit = (props) => {
         </Radio.Group>
       </div>
       <div>
-        {tab === 'basic' && <Basic />}
+        {tab === 'basic' && <Basic dynamicId={dynamicId} />}
         {tab === 'poster' && <Poster />}
         {tab === 'share' && <Share />}
       </div>
@@ -376,6 +550,4 @@ const Edit = (props) => {
   );
 }
 
-
-
 export default Edit

src/pages/activity/helpActivity/helpRecord.jsx

@@ -13,12 +13,206 @@ const { Option } = Select;
 const { Meta } = Card;
 
 /**
- *
+ * 助力者弹框
+ */
+class InviteTable extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      dataSource: { records: [] },
+      visibleData: { visible: false, customerId: '', realtyConsultant: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount () {
+    const { customerId } = this.state.visibleData
+    this.getList({ helpRecordInitiateId: customerId, pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate (preProps, preState) {
+    const { customerId } = 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 });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk () {
+    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+  }
+
+  // 弹框取消按钮
+  handleCancel () {
+    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+  }
+
+  getList (params) {
+    request({ ...apis.helpActivity.helpPeopleDetails, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  // 分页
+  onChange (pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5 })
+  }
+
+  render () {
+    const columns = [
+      {
+        title: '用户姓名',
+        dataIndex: 'name',
+        key: 'name',
+        align: 'center',
+      },
+      {
+        title: '手机号',
+        dataIndex: 'phone',
+        key: 'phone',
+        align: 'center',
+        render: text => <a>{text}</a>,
+      },
+      {
+        title: '助力时间',
+        dataIndex: 'createDate',
+        key: 'createDate',
+        align: 'center',
+      },
+    ]
+    return (
+      <>
+        <Modal
+          title="助力者"
+          destroyOnClose="true"
+          width={900}
+          footer={null}
+          visible={this.state.visibleData.visible}
+          // onOk={() => this.handleOk()}
+          onCancel={(e) => this.handleCancel(e)}
+        >
+          <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+        </Modal>
+      </>
+    );
+  }
+}
+
+
+
+
+
+
+
+/**
+ * 助力者弹框
+ */
+class Verifier extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      helpRecordInitiateId: { id: '' },
+      visibleData: { visible: false, customerId: '', realtyConsultant: '', helpRecordInitiateId: '' },
+    }
+  }
+
+  // 挂载之后
+  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 });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk () {
+    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+  }
+
+  // 弹框取消按钮
+  handleCancel () {
+    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+  }
+
+  getList (params) {
+    request({ ...apis.helpActivity.helpPeopleDetails, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  verify(e) {
+    console.log('111', e.target.value)
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  verification(e) {
+    console.log('this.state.visibleData', this.state.visibleData)
+      alert(1)
+  }
+
+  render () {
+    return (
+      <>
+        <Modal
+          title="核销"
+          destroyOnClose="true"
+          width={300}
+          footer={null}
+          visible={this.state.visibleData.visible}
+          // onOk={() => this.handleOk()}
+          onCancel={(e) => this.handleCancel(e)}
+        >
+          <div><span>核销码:<input onChange={this.verify.bind(this)}/></span>
+           <Button onClick={(e) => this.verification(e)}>立即核销</Button>
+          </div>
+        </Modal>
+      </>
+    );
+  }
+}
+
+/**
+ *主体列表
  *
  * @param {*} props
  * @returns
  */
 function body(props) {
+  const [gInviteData, setGInviteData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
+
+  const [gVerifierData, setVerifierData] = useState({ visible: false, customerId: '', realtyConsultant: '', helpRecordInitiateId: '' })
+
   const { getFieldDecorator, getFieldsValue } = props.form
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -26,23 +220,15 @@ function body(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   // const [columns, setColumns] = useState(privateColumns)
 
-  // 默认私客
+  // 默认成功
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [customerType, setCustomerType] = useState('helpSucceed')
 
   // 调整归属 ============  start
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [gVisibleData, setGVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
-  // 调整归属 ============= end
 
-  // 积分记录 ============  start
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [recordVisibleData, setRecordVisibleData] = useState({ visible: false, customerId: '' })
-  // 积分记录 ============= end
 
-  // 变更状态 ============  start
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [statusVisibleData, setStatusVisibleData] = useState({ visible: false, customerId: '', status: '' })
   // 变更状态 ============= end
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -70,9 +256,7 @@ function body(props) {
   }
 
   function displayNone() {
-    setRecordVisibleData({ visible: false, customerId: '' })
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
-    setStatusVisibleData({ visible: false, customerId: '', status: '' })
   }
 
   // 提交事件
@@ -100,8 +284,9 @@ function body(props) {
     getList({ pageNumber: pageNum, pageSize: 10, customerType })
   }
 
-  // 私客/公客切换
+  // 助力成功/进行中/助力失败
   function radioButtonHandleSizeChange(e) {
+    setGInviteData({ visible: true, customerId: '', realtyConsultant: '' })
     displayNone()
 
     const { value } = e.target
@@ -115,27 +300,6 @@ function body(props) {
     getList({ pageNumber: 1, pageSize: 10, customerType })
   }
 
-
-  // 这里有个 Bug， 就是 Modal 弹框，会联动出现， 比如 我点击 调整归属的Model弹框， 那么 积分记录的Model弹框莫名其妙的也显示了
-  // 所有这里临时解决方法是，弹出一个Modal对话框的时候，把其他的对话框给隐藏
-
-  function showGM(record) {
-    setGVisibleData({ visible: true, customerId: record.customerId, realtyConsultant: record.realtyConsultant })
-    setRecordVisibleData({ visible: false, customerId: '' })
-    setStatusVisibleData({ visible: false, customerId: '' })
-  }
-
-  function showRecord(record) {
-    setRecordVisibleData({ visible: true, customerId: record.customerId })
-    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
-    setStatusVisibleData({ visible: false, customerId: '' })
-  }
-
-  function showStatus(record) {
-    setRecordVisibleData({ visible: false, customerId: '' })
-    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
-    setStatusVisibleData({ visible: true, customerId: record.customerId, status: record.status })
-  }
   function toCustomerDateil(record) {
     router.push({
       pathname: '/customer/customerlist/customerDetail',
@@ -168,6 +332,23 @@ function body(props) {
     link.click()
   }
 
+// 助力记录弹框
+function helpRecord(row) {
+// 关闭核销
+// eslint-disable-next-line max-len
+setVerifierData({ visible: false, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+  // eslint-disable-next-line max-len
+  setGInviteData({ visible: true, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+}
+ // 核销
+ function helpInitiateRecordVerify(row) {
+// 关闭助力记录弹框
+// 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 })
+ }
+
   const publicColumns = [
     {
       title: '发起者',
@@ -196,7 +377,7 @@ function body(props) {
       key: 'helpCount',
       align: 'center',
       width: '15%',
-      render: (text, record) => <a style={ { color: '#66B3FF' } } >{record.helpCount}/{record.persionNumCount}</a>,
+      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick={() => helpRecord(record)}>{record.helpCount}/{record.persionNumCount}</a>,
     },
   ]
 
@@ -232,7 +413,7 @@ function body(props) {
       key: 'helpCount',
       align: 'center',
       width: '15%',
-      render: (text, record) => <a style={ { color: '#66B3FF' } } >{record.helpCount}人</a>,
+      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick={() => helpRecord(record)}>{record.helpCount}人</a>,
     },
     {
       title: '核销状态',
@@ -256,7 +437,7 @@ function body(props) {
         <>
           {row.verificationStatus === 0 &&
           <AuthButton name="admin.SignList.get" noRight={null}>
-           <span style={{ color: '#1990FF', cursor: 'pointer' }}>核销</span>
+           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={() => helpInitiateRecordVerify(row)}>核销</span>
           </AuthButton>
         }
         </>
@@ -297,7 +478,7 @@ function body(props) {
           <Radio.Group value={customerType} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
             <Radio.Button value="helpSucceed">助力成功</Radio.Button>
             <Radio.Button value="helpUnderway">进行中</Radio.Button>
-            <Radio.Button value="helpUnfinished ">助力失败</Radio.Button>
+            <Radio.Button value="helpUnfinished">助力失败</Radio.Button>
           </Radio.Group>
         </AuthButton>
       </div>
@@ -305,6 +486,8 @@ function body(props) {
         <Table dataSource={dataSource.list} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :
         <Table dataSource={dataSource.list} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> 
       }
+       <InviteTable visibleData={gInviteData} />
+       <Verifier visibleData={gVerifierData} />
     </>
   );
 }

src/services/apis.js

@@ -709,6 +709,48 @@ export default {
     method: 'get',
     action: 'admin.taRole.get',
   },
+  helpPeopleDetails: {
+    url: `${prefix}/taHelpRecord/details`,
+    method: 'get',
+    action: 'admin.taRole.get',
+  },
+ },
+ groupActivity: {
+  list: {
+    url: `${prefix}/taShareActivity/list`,
+    method: 'get',
+    action: 'admin.taShareActivity.get',
+  },
+  add: {
+    url: `${prefix}/helpActivity/add`,
+    method: 'post',
+    action: 'admin.taRole.get',
+  },
+  details: {
+    url: `${prefix}/helpActivity/details`,
+    method: 'get',
+    action: 'admin.taRole.get',
+  },
+  update: {
+    url: `${prefix}/helpActivity/update`,
+    method: 'put',
+    action: 'admin.taRole.get',
+  },
+  finish: {
+    url: `${prefix}/taShareActivity/finish/:id`,
+    method: 'put',
+    action: 'admin.taShareActivity.finish',
+  },
+  top: {
+    url: `${prefix}/taShareActivity/weight`,
+    method: 'put',
+    action: 'admin.taShareActivity.weight',
+  },
+  record: {
+    url: `${prefix}/helpRecord`,
+    method: 'get',
+    action: 'admin.taRole.get',
+  },
  },
  groupActivity: {
   list: {