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

config/routes.js

               },
             ],
           },
-          {
-            path: '/third',
-            name: '第三方管理',
-            component: '../layouts/BlankLayout',
-            routes: [
-              {
-                path: '/third/thirdList',
-                name: '第三方公司',
-                component: './third/thirdList',
-              },
-              {
-                path: '/third/editThirdParty',
-                name: '编辑活动',
-                hideInMenu: true,
-                component: './third/editThirdParty',
-              },
-            ],
-          },
           {
             component: './404',
           },

src/pages/activity/drainage/Detail.jsx

 
   function gettaDrainageRecord (params) {
     request({ ...apis.activity.taDrainageRecord, params: { ...params } }).then((data) => {
-      // setDatas(data)
-      setTotal(data)
+      // setDatas(data) 
       console.log(data.total, '3333333333333')
+      if(data.total!=0){
+      setTotal(data)
+      // console.log(data.total, '3333333333333')
+     
       setDatas(tableData(data.records))
       // content = data.records[0]
       console.log('json: ', eval('(' + data.records[0].content + ')'))
       setContent(eval('(' + data.records[0].content + ')'))
       setColumns(tableTitle(eval('(' + data.records[0].content + ')')))
+    }
+    else{
+      message.info('数据为空')
+    }
+
+
+
     }).catch((err) => {
       console.log(err)
       message.info(err.msg || err.message)

src/pages/activity/drainage/DrainageList.jsx

       align: 'center',
       render: (text, datas) => <div style={ { color: '#66B3FF' } } onClick= {() => addshowModal(datas)} >{ datas.name }</div>,
     },
+    {
+      title: 'appid',
+      dataIndex: 'appid',
+      key: 'appid',
+      align: 'center',
+      // render: (text, datas) => <div style={ { color: '#66B3FF' } } onClick= {() => addshowModal(datas)} >{ datas.name }</div>,
+    },
+    {
+      title: 'secret',
+      dataIndex: 'appSecret',
+      key: 'appSecret',
+      align: 'center',
+      // render: (text, datas) => <div style={ { color: '#66B3FF' } } onClick= {() => addshowModal(datas)} >{ datas.name }</div>,
+    },
     {
       title: '新建时间',
       dataIndex: 'createDate',
     console.log(formsdate,'111---------------')
     console.log(formsdate,'11122222222')
       // data: { ...submitValue }
-      alert(val)
+
       console.log(formsdate.drainageId,'9999999999999')
       if (formsdate.drainageId) {
         // { ...apis.activity.deletetaDrainage,urlData: { id: drainageIid }, }
           message.error(err.msg || err.message)
         })
       }
+      setDate({
+        visible: false,
+      });
+      gettaDrainage({ pageNum: 1, pageSize: 10 })
+    }
+
+    const handleCancel = val => {
+      setDate({
+        visible: false,
+      });
     }
 
-    return <XForm onSubmit={handleSubmit} fields={fields}></XForm>
+    return <XForm onSubmit={handleSubmit} onCancel={handleCancel}  fields={fields}></XForm>
     
   }
 

src/pages/activity/groupActivity/editGroupActivity.jsx

 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)
       })
     }
         name: 'mainImg',
         type: FieldTypes.ImageUploader,
         value: dynamicData.mainImg,
-        help: '建议图片尺寸：750px*560px',
+        help: '建议尺寸375*312px',
       },
       {
         label: '活动时间',
         name: 'groupBuyPeople',
         type: FieldTypes.Text,
         value: dynamicData.groupBuyPeople,
+        help: '注：成团所需人数',
         rules: [
           { required: true, message: '请输入成团人数' },
         ]
         name: 'integral',
         type: FieldTypes.Text,
         value: dynamicData.integral,
+        help: '注：用户平均积分' + scoreData.averageScore,
         rules: [
           { required: true, message: '请输入所需积分' },
         ]
         name: 'descImg',
         type: FieldTypes.ImageUploader,
         value: dynamicData.descImg,
-        help: '建议图片尺寸：750px*560px',
+        help: '建议宽度:335px,高度不限',
       },
     ]
 
       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)
     <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

           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');
         })(<Input />)}
         </Form.Item>
 
-        <Form.Item label="活动主图">
+        <Form.Item label="活动主图" help="建议尺寸375*312px">
           {getFieldDecorator('img')(<ImageUploader />)}
-          <span>建议图片尺寸：750px*560px</span>
         </Form.Item>
 
         <Form.Item label="活动时间">
         )}
         </Form.Item>
          {
-           isEnlist === 1 && <Form.Item label="请输入助力人数">
+           isEnlist === 1 && <Form.Item label="请输入助力人数" min={1} max={10}>
            {getFieldDecorator('helpNum', {
              rules: [
                {
                  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

     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 })
       }
     });
   }
 
   function handleReset() {
     props.form.resetFields();
-    getList({ pageNumber: 1, pageSize: 10, customerType })
+    getList({ pageNum: 1, pageSize: 10, status: customerType, helpActivityId })
   }
 
   function toCustomerDateil(record) {
 
   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 => {
   // 核销
   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 = [
     {
             <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

       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>
             <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/services/apis.js

     method: 'get',
     action: 'admin.taRole.get',
   },
+  avgScore: {
+    url: `${prefix}/taShareActivity/avgScore`,
+    method: 'get',
+    action: 'admin.taRole.get',
+  },
   update: {
     url: `${prefix}/taShareActivity/update`,
     method: 'put',