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

config/routes.js

@@ -413,23 +413,16 @@ export default [
                 hideInMenu: true,
                 component: './system/editPolicy',
               },
-            ],
-          },
-          {
-            path: '/third',
-            name: '第三方管理',
-            component: '../layouts/BlankLayout',
-            routes: [
               {
-                path: '/third/thirdList',
-                name: '第三方公司',
-                component: './third/thirdList',
+                path: '/system/document/list',
+                name: '客户资料',
+                component: './system/document/list',
               },
               {
-                path: '/third/editThirdParty',
-                name: '编辑活动',
+                path: '/system/document/audit',
+                name: '客户资料审核',
                 hideInMenu: true,
-                component: './third/editThirdParty',
+                component: './system/document/audit',
               },
             ],
           },

package.json

@@ -60,6 +60,7 @@
     "react-copy-to-clipboard": "^5.0.1",
     "react-document-title": "^2.0.3",
     "react-dom": "^16.8.6",
+    "react-zmage": "^0.8.5",
     "redux": "^4.0.1",
     "umi": "^2.8.7",
     "umi-plugin-pro-block": "^1.3.2",

src/components/ZmageImg/ZmageImg.jsx

@@ -0,0 +1,36 @@
+import React from 'react'
+import Zmage from 'react-zmage'
+
+function body(props) {
+  return (
+    <>
+      <Zmage
+        style={props.style}
+        src={props.src}
+        // alt="0"
+        backdrop="linear-gradient(90deg, rgba(86,81,81,0.7) 0%, rgba(86,81,81, 0.7) 100%)"
+        radius={5}
+        edge={20}
+        animate={{
+          flip: 'fade',
+        }}
+        controller={{
+          // 关闭按钮
+          close: false,
+          // 缩放按钮
+          zoom: false,
+          // 下载按钮
+          download: false,
+          // 旋转按钮
+          rotate: false,
+          // 翻页按钮
+          flip: true,
+          // 多页指示
+          pagination: true,
+        }}
+      />
+    </>
+  )
+}
+
+export default body

src/pages/activity/groupActivity/editGroupActivity.jsx

@@ -29,20 +29,22 @@ const { TextArea } = Input;
 const Edit = props => {
   const [tab, changeTab] = useState('basic')
   // 判断是否展示助力次数的输入框
-  // const [help, helpTab] = useState('1')
   const { groupActivityId } = props.location.query
   const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
+  const [scoreData, setScoreData] = useState({})
+  useEffect(() => {
+    request(apis.groupActivity.avgScore).then((data) => {
+      setScoreData(data);
+    })
+  }, [])
   if (groupActivityId) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
-      // eslint-disable-next-line no-use-before-define
       getDynamicData(groupActivityId);
     }, [])
 
     // 详情
     const getDynamicData = (groupActivityId) => {
       request({ ...apis.groupActivity.details, urlData: { id: groupActivityId } }).then((data) => {
-        console.log(data)
         setDynamicData(data)
       })
     }
@@ -83,7 +85,7 @@ const Edit = props => {
         name: 'mainImg',
         type: FieldTypes.ImageUploader,
         value: dynamicData.mainImg,
-        help: '建议图片尺寸：750px*560px',
+        help: '建议尺寸375*312px',
       },
       {
         label: '活动时间',
@@ -100,6 +102,7 @@ const Edit = props => {
         name: 'groupBuyPeople',
         type: FieldTypes.Text,
         value: dynamicData.groupBuyPeople,
+        help: '注：成团所需人数',
         rules: [
           { required: true, message: '请输入成团人数' },
         ]
@@ -109,6 +112,7 @@ const Edit = props => {
         name: 'integral',
         type: FieldTypes.Text,
         value: dynamicData.integral,
+        help: '注：用户平均积分' + scoreData.averageScore,
         rules: [
           { required: true, message: '请输入所需积分' },
         ]
@@ -118,7 +122,7 @@ const Edit = props => {
         name: 'descImg',
         type: FieldTypes.ImageUploader,
         value: dynamicData.descImg,
-        help: '建议图片尺寸：750px*560px',
+        help: '建议宽度:335px,高度不限',
       },
     ]
 
@@ -160,7 +164,6 @@ const Edit = props => {
       console.log(groupActivityId, 'groupActivityId')
       useEffect(() => {
         request({ ...apis.activity.poster, params: { targetId: groupActivityId, targetType: 'groupActivity' } }).then((data) => {
-          console.log(data, "2222")
           if (data.length > 0) {
             setPosterId(data[0].posterId)
             changeImg(data[0].posterImg)
@@ -334,9 +337,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/edithelpActivity.jsx

@@ -80,6 +80,19 @@ const header = props => {
           values.helpNum = 0
         }
 
+        // 判断助力人数不得超过200
+        if (values.helpNum > 200) {
+          message.error('限制助力人数不能超过200')
+          return
+        }
+
+        // 判断助力人数必须大于0
+        if (values.isEnlist === 1) {
+        if (values.helpNum <= 0) {
+          message.error('限制助力人数必须大于1')
+          return
+        }
+      }
         const { activityTime, signupTime, ...submitValue } = values
         const [startDate, endDate] = activityTime
         submitValue.startDate = moment(startDate).format('YYYY-MM-DD HH:mm');
@@ -135,9 +148,8 @@ const header = props => {
         })(<Input />)}
         </Form.Item>
 
-        <Form.Item label="活动主图">
+        <Form.Item label="活动主图" help="建议尺寸375*312px">
           {getFieldDecorator('img')(<ImageUploader />)}
-          <span>建议图片尺寸：750px*560px</span>
         </Form.Item>
 
         <Form.Item label="活动时间">
@@ -180,7 +192,7 @@ const header = props => {
         )}
         </Form.Item>
          {
-           isEnlist === 1 && <Form.Item label="请输入助力人数">
+           isEnlist === 1 && <Form.Item label="请输入助力人数" min={1} max={10}>
            {getFieldDecorator('helpNum', {
              rules: [
                {
@@ -188,13 +200,12 @@ const header = props => {
                  message: '请输入助力人数',
                },
              ],
-           })(<Input type="number" />)}
+           })(<Input type="number" placeholder="助力人数限制"/>)}
            </Form.Item>
          }
 
-        <Form.Item label="活动说明">
+        <Form.Item label="活动说明" help="建议宽度:335px,高度不限">
           {getFieldDecorator('activityInstructions')(<ImageUploader />)}
-          <span>建议图片尺寸：750px*560px</span>
         </Form.Item>
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
           <Button type="primary" htmlType="submit">

src/pages/activity/helpActivity/helpRecord.jsx

@@ -293,7 +293,7 @@ function body(props) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        getList({ pageNum: 1, pageSize: 10, customerType, ...values })
+        getList({ pageNum: 1, pageSize: 10, status: customerType, ...values, helpActivityId })
       }
     });
   }
@@ -324,7 +324,7 @@ function body(props) {
 
   function handleReset() {
     props.form.resetFields();
-    getList({ pageNumber: 1, pageSize: 10, customerType })
+    getList({ pageNum: 1, pageSize: 10, status: customerType, helpActivityId })
   }
 
   function toCustomerDateil(record) {
@@ -338,8 +338,7 @@ function body(props) {
 
   function exportCustomer () {
     const fieldsValue = getFieldsValue()
-    const code = customerType === 'helpSucceed' ? 1 : 0
-    request({ ...apis.helpActivity.HelpInitiateRecordSucceed, responseType: 'blob', params: { ...fieldsValue, customerType, helpActivityId, code } })
+    request({ ...apis.helpActivity.HelpInitiateRecordSucceed, responseType: 'blob', params: { ...fieldsValue, customerType, helpActivityId, condition: customerType } })
       .then(response => {
         download(response)
       }).catch(error => {
@@ -373,13 +372,19 @@ function helpRecord(row) {
   // 核销
   setVerifierData({ visible: true, helpId: row.helpRecordInitiateId, helpActivityId: row.helpActivityId, elpRecordInitiateId: '', verificationCode: '' })
  }
-
+ // 核销回调
  function onSuccess(e) {
    console.log('回调：', e)
    getList(e)
      // 核销
    setVerifierData({ visible: false, helpId: '', helpActivityId: '', elpRecordInitiateId: '', verificationCode: '' })
  }
+ // 返回到首页
+ function returList(params) {
+  router.push({
+      pathname: '/activity/helpActivity/list',
+    });
+}
 
   const publicColumns = [
     {
@@ -494,7 +499,7 @@ function helpRecord(row) {
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>
-            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            <Button style={{ marginLeft: 8 }} onClick={returList}>
               返回
             </Button>
         </Form.Item>

src/pages/activity/helpActivity/list.jsx

@@ -91,7 +91,7 @@ const toEditGoods = (helpActivityId) => () => {
       align: 'center',
       render: (x, row) => (
         <>
-          {row.activityStatus === 1 &&
+          {row.activityStatus === 0 &&
           <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,10 +100,10 @@ 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.activityStatus === 0 &&
+          {row.activityStatus === 1 &&
            <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>
+                      {/* <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></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>
             <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>

src/pages/system/document/audit.jsx

@@ -0,0 +1,24 @@
+import React from 'react'
+import { Col, Row, Button } from 'antd'
+import ZmageImg from '../../../components/ZmageImg/ZmageImg'
+
+function body(props) {
+  return (
+    <>
+      <div style={{ background: '#ECECEC', padding: '30px' }}>
+        <Row gutter={16}>
+          <Col span={6}>
+            <ZmageImg style={{ width: '300px', height: '400px' }} src="https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1571303731819-1.jpg" />
+          </Col>
+        </Row>
+      </div>
+      <div style={{ marginTop: '10px', display: 'flex', justifyContent: 'center' }}>
+        <Button type="primary">通过</Button>
+        &nbsp;&nbsp;&nbsp;&nbsp;
+        <Button>不通过</Button>
+      </div>
+    </>
+  )
+}
+
+export default body

src/pages/system/document/list.jsx

@@ -0,0 +1,99 @@
+import React, { useState } from 'react'
+import { Table, Form, Icon, Input, Button  } from 'antd'
+
+function body(props) {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [dataSource, setDataSource] = useState({ records: [] })
+
+  /**
+   * 提交
+   * @param e
+   */
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('Received values of form: ', values);
+      }
+    });
+  }
+
+  /**
+   * 翻页
+   * @param page
+   * @param pageSize
+   */
+  function onPageNum(page, pageSize) {
+    console.log(page, pageSize)
+  }
+
+  /**
+   * 重置
+   */
+  function handleReset(e) {
+    props.form.resetFields();
+  }
+
+  const columns = [
+    {
+      title: '姓名',
+      dataIndex: 'name',
+      key: 'name',
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+    },
+    {
+      title: '提交时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+    },
+    {
+      title: '操作',
+      dataIndex: 'documentVerifyId',
+      key: 'documentVerifyId',
+    },
+  ]
+
+  const { getFieldDecorator, getFieldsError, getFieldError, isFieldTouched } = props.form;
+  return (
+    <>
+      <Form layout="inline" onSubmit={handleSubmit}>
+        <Form.Item>
+          {getFieldDecorator('username')(
+            <Input
+              placeholder="用户名"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('phone')(
+            <Input
+              placeholder="手机号"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit">
+            查询
+          </Button>
+          &nbsp;&nbsp;&nbsp;&nbsp;
+          <Button onClick={(e) => handleReset(e)}>
+            清空
+          </Button>
+        </Form.Item>
+      </Form>
+      <Table dataSource={dataSource.records} pagination={{ total: dataSource.total, pageSize: dataSource.pageSize, onChange: (page, pageSize) => onPageNum(page, pageSize), defaultCurrent: 1 }} columns={columns} />
+    </>
+  )
+}
+
+const WrappedbodyForm = Form.create({ name: 'body' })(body)
+export default WrappedbodyForm

src/services/apis.js

@@ -777,6 +777,11 @@ export default {
     method: 'get',
     action: 'admin.taRole.get',
   },
+  avgScore: {
+    url: `${prefix}/taShareActivity/avgScore`,
+    method: 'get',
+    action: 'admin.taRole.get',
+  },
   update: {
     url: `${prefix}/taShareActivity/update`,
     method: 'put',