Merge branch 'master' of http://git.ycjcjy.com/marketing/pc-admin into master

config/routes.js

@@ -191,10 +191,17 @@ export default [
               },
               {
                 path: '/Live/LiveActivity/Edit',
-                name: '直播活动',
+                name: '编辑活动',
                 hideInMenu: true,
                 component: './Live/LiveActivity/Edit',
               },
+              {
+                path: '/Live/LiveActivity/add',
+                name: '新增活动',
+                hideInMenu: true,
+                component: './Live/LiveActivity/add',
+              },
+              
               // {
               //   path: '/staff/Staff/Edit',
               //   name: '编辑员工',
@@ -232,150 +239,104 @@ export default [
             component: '../layouts/BlankLayout',
             routes: [
               {
-                path: '/activity/ActivityList',
-                name: '报名活动',
-                component: './activity/ActivityList',
+                path: '/activity/groupRoomActivity',
+                name: '团房活动',
+                component: './activity/groupRoomActivity',
               },
               {
-                path: '/activity/editActivity',
-                name: '编辑活动',
-                hideInMenu: true,
-                component: './activity/editActivity',
-              },
-              {
-                path: '/activity/detailActivity',
+                path: '/activity/groupRoomActivity/detail',
                 name: '活动详情',
                 hideInMenu: true,
-                component: './activity/detailActivity',
-              },
-              {
-                path: '/activity/SignList',
-                name: '报名列表',
-                hideInMenu: true,
-                component: './activity/SignList',
-              },
-              {
-                path: '/activity/activityRecord',
-                name: '数据记录',
-                hideInMenu: true,
-                component: './activity/activityRecord',
-              },
-              {
-                path: '/activity/helpActivity/list',
-                name: '助力活动',
-                component: './activity/helpActivity/list',
-              },
-              {
-                path: '/activity/helpActivity/helpRecord',
-                name: '助力记录',
-                hideInMenu: true,
-                component: './activity/helpActivity/helpRecord',
+                component: './activity/groupRoomActivity/detail',
               },
               {
-                path: '/activity/helpActivity/edithelpActivity',
-                name: '编辑',
-                hideInMenu: true,
-                component: './activity/helpActivity/edithelpActivity',
-              },
-              {
-                path: '/activity/helpActivity/signList',
-                name: '助力记录',
-                hideInMenu: true,
-                component: './activity/helpActivity/signList',
-              },
-              {
-                path: '/activity/helpActivity/helpActivityRecord',
-                name: '数据记录',
+                path: '/activity/groupRoomActivity/edit',
+                name: '编辑活动',
                 hideInMenu: true,
-                component: './activity/helpActivity/helpActivityRecord',
-              },
-              {
-                path: '/activity/groupActivity/list',
-                name: '拼团活动',
-                component: './activity/groupActivity/list',
+                component: './activity/groupRoomActivity/edit',
               },
               {
-                path: '/activity/groupActivity/helpRecord',
-                name: '拼团记录',
+                path: '/activity/groupRoomActivity/registrationRecord',
+                name: '报名记录',
                 hideInMenu: true,
-                component: './activity/groupActivity/helpRecord',
+                component: './activity/groupRoomActivity/registrationRecord',
               },
+              
+
               {
-                path: '/activity/groupActivity/editgroupActivity',
-                name: '新增',
-                hideInMenu: true,
-                component: './activity/groupActivity/editgroupActivity',
+                path: '/activity/lookHouseActivity',
+                name: '看房团',
+                component: './activity/lookHouseActivity',
               },
               {
-                path: '/activity/groupActivity/detailActivity',
+                path: '/activity/lookHouseActivity/detail',
                 name: '活动详情',
                 hideInMenu: true,
-                component: './activity/groupActivity/detailActivity',
-              },
-              {
-                path: '/activity/groupActivity/groupActivityRecord',
-                name: '数据记录',
-                hideInMenu: true,
-                component: './activity/groupActivity/groupActivityRecord',
+                component: './activity/lookHouseActivity/detail',
               },
               {
-                path: '/activity/drainage/DrainageList',
-                name: 'H5活动',
-                component: './activity/drainage/DrainageList',
-              },
-              {
-                path: '/activity/drainage/Detail',
-                name: '查看详情',
+                path: '/activity/lookHouseActivity/edit',
+                name: '编辑活动',
                 hideInMenu: true,
-                component: './activity/drainage/Detail',
+                component: './activity/lookHouseActivity/edit',
               },
               {
-                path: '/activity/drainage/DetailDrainage',
-                name: 'H5详情',
+                path: '/activity/lookHouseActivity/registrationRecord',
+                name: '报名记录',
                 hideInMenu: true,
-                component: './activity/drainage/DetailDrainage',
+                component: './activity/lookHouseActivity/registrationRecord',
               },
+
+
+
               {
-                path: '/activity/drainage/h5edit',
-                name: 'H5详情',
-                hideInMenu: true,
-                component: './activity/drainage/h5edit',
+                path: '/activity/SignupActivity',
+                name: '报名活动',
+                component: './activity/SignupActivity',
               },
               {
-                path: '/activity/helpActivity/detailActivity',
+                path: '/activity/SignupActivity/detail',
                 name: '活动详情',
                 hideInMenu: true,
-                component: './activity/helpActivity/detailActivity',
-              },
-              {
-                path: '/activity/drainage/drainageRecord',
-                name: '数据记录',
-                hideInMenu: true,
-                component: './activity/drainage/drainageRecord',
-              },
-              {
-                path: '/activity/liveActivity/list/index',
-                name: '直播活动',
-                component: './activity/liveActivity/list/index',
-              },
-              {
-                path: '/activity/liveActivity/add',
-                name: '新增',
-                hideInMenu: true,
-                component: './activity/liveActivity/add',
+                component: './activity/SignupActivity/detail',
               },
               {
-                path: '/activity/liveActivity/edit',
-                name: '编辑',
+                path: '/activity/SignupActivity/edit',
+                name: '编辑活动',
                 hideInMenu: true,
-                component: './activity/liveActivity/edit',
+                component: './activity/SignupActivity/edit',
               },
               {
-                path: '/activity/liveActivity/liveActivityRecord',
-                name: '数据记录',
+                path: '/activity/SignupActivity/registrationRecord',
+                name: '报名记录',
                 hideInMenu: true,
-                component: './activity/liveActivity/list/liveActivityRecord',
+                component: './activity/SignupActivity/registrationRecord',
               },
+
+              // {
+              //   path: '/activity/SignupActivity',
+              //   name: '报名活动',
+              //   component: './activity/SignupActivity',
+              // },
+              // {
+              //   path: '/activity/SignupActivity/detail',
+              //   name: '活动详情',
+              //   hideInMenu: true,
+              //   component: './activity/SignupActivity/detail',
+              // },
+              // {
+              //   path: '/activity/SignupActivity/edit',
+              //   name: '编辑活动',
+              //   hideInMenu: true,
+              //   component: './activity/SignupActivity/edit',
+              // },
+              // {
+              //   path: '/activity/SignupActivity/registrationRecord',
+              //   name: '报名记录',
+              //   hideInMenu: true,
+              //   component: './activity/SignupActivity/registrationRecord',
+              // },
+              
             ],
           },
           {
@@ -516,7 +477,7 @@ export default [
             component: '../layouts/BlankLayout',
             routes: [
               {
-                path: '/home/recommend/home',
+                path: '/home/recommend',
                 name: '找房需求',
                 component: './home/recommend/index',
               },

src/components/QueryTable/index.jsx

@@ -6,7 +6,7 @@ export default React.forwardRef((props, ref) => {
   const tableRef = useRef()
   const searchRef = useRef()
   const [searchData, setSearchData] = useState({})
-  const {api, searchFields, params, onPageChange, ...leftProps} = props
+  const {api, searchFields, params, onPageChange,searchProps, ...leftProps} = props
   const handleSearch = (data) => setSearchData(data)
 
   useImperativeHandle(ref, () => ({
@@ -21,10 +21,11 @@ export default React.forwardRef((props, ref) => {
   return (
     <>
       <Search
-      ref={searchRef}
+        ref={searchRef}
         fields={searchFields}
         onSearch={handleSearch}
         onReset={handleSearch}
+        searchProps={searchProps}
       />
 
       <TableList

src/components/Search/Field.jsx

@@ -1,39 +1,47 @@
-import React from 'react'
-import { Input, Select, DatePicker } from 'antd'
+import React from 'react';
+import { Input, Select, DatePicker } from 'antd';
 
-const Option = Select.Option
-const { RangePicker } = DatePicker
+const Option = Select.Option;
+const { RangePicker } = DatePicker;
 
-export default (props) => {
-  const { style, type, value, options = [], placeholder, render, onChange } = props
+export default props => {
+  const { style, type, value, options = [], placeholder, render, onChange } = props;
 
   if (typeof render === 'function') {
-    const Element = render()
-    return React.cloneElement(Element, { value, onChange })
+    const Element = render();
+    return React.cloneElement(Element, { value, onChange });
   }
 
-  const handleChange = (e) => {
-    const isInput = !type || type === 'text' || type === 'input'
-    onChange(isInput ? e.target.value : e)
-  }
+  const handleChange = e => {
+    const isInput = !type || type === 'text' || type === 'input';
+    onChange(isInput ? e.target.value : e);
+  };
 
   switch (type) {
     case 'datepicker':
+      return <DatePicker value={value} placeholder={placeholder} onChange={handleChange} />;
     case 'rangepicker':
-      return (
-        <RangePicker value={value} placeholder={placeholder} onChange={handleChange} />
-      )
+      return <RangePicker value={value} placeholder={placeholder} onChange={handleChange} />;
     case 'select':
       return (
-        <Select style={style || {width: 160}} placeholder={placeholder} value={value} onChange={handleChange}>
-          {
-            options.map((item) => <Option key={item.value} value={item.value}>{item.label}</Option>)
-          }
+        <Select
+          style={style || { width: 160 }}
+          placeholder={placeholder}
+          value={value}
+          onChange={handleChange}
+        >
+          {options.map(item => (
+            <Option key={item.value} value={item.value}>
+              {item.label}
+            </Option>
+          ))}
         </Select>
-      )
+      );
     case 'text':
     case 'input':
     default:
-      return <Input style={style} value={value} placeholder={placeholder} onChange={handleChange} />
+      return (
+        <Input style={style} value={value} placeholder={placeholder} onChange={handleChange} />
+      );
   }
-}
+};

src/components/TableList/index.jsx

@@ -1,94 +1,100 @@
 import React, { useCallback, useRef, useState, useEffect, useImperativeHandle } from 'react';
 // import { stringify } from 'querystring';
 import { notification } from 'antd';
-import request from '@/utils/request'
+import request from '@/utils/request';
 import TableList from './TableList';
 import Pagination from './Pagination';
 
 export default React.forwardRef((props, ref) => {
-  const [loading, setLoading] = useState(false)
-  const mounted = useRef(false)
-  const [list, setList] = useState()
-  const [pageTotal, setPageTotal] = useState(0)
-  const [pageConfig, setPageConfig] = useState({ current: 1, pageSize: 10 })
+  const [loading, setLoading] = useState(false);
+  const mounted = useRef(false);
+  const [list, setList] = useState();
+  const [pageTotal, setPageTotal] = useState(0);
+  const [pageConfig, setPageConfig] = useState({ current: 1, pageSize: 10 });
 
-  const { api,urlData, params, onPageChange, ...tableProps } = props
+  const { api, urlData, params, onPageChange, postData=()=>{}, ...tableProps } = props;
 
   // 更新分页
   const updatePage = useCallback(
     (current, pageSize) => {
-      const config = pageSize ? { current, pageSize } : { current, pageSize:pageConfig.pageSize }
+      const config = pageSize ? { current, pageSize } : { current, pageSize: pageConfig.pageSize };
       const newPage = {
         ...pageConfig,
         ...config,
-      }
-  
-      setPageConfig(newPage)
+      };
+
+      setPageConfig(newPage);
       if (onPageChange) {
-        onPageChange(newPage)
+        onPageChange(newPage);
       }
     },
     [pageConfig],
-  )
+  );
 
   // 获取远程数据
-  const fetchData = useCallback(
-    () => {
-      setLoading(true)
-      const queryParams = {
-        ...params || {},
-        pageNum: pageConfig.current,
-        pageSize: pageConfig.pageSize,
-      }
-      request({...api, urlData:urlData||undefined, params: queryParams }).then((res) => {
-        if(res.records){
-          const {total, records = []} = res
-          setLoading(false)
-          setList(records)
-          setPageTotal(total)
-        }
-        else if(res.result){
-          const {total, records = []} = res.result
-          setLoading(false)
-          setList(records)
-          setPageTotal(total)
+  const fetchData = useCallback(() => {
+    setLoading(true);
+
+
+    const queryParams = {
+      ...(postData(params) || params || {}),
+      pageNum: pageConfig.current,
+      pageSize: pageConfig.pageSize,
+    };
+
+    request({ ...api, urlData: urlData || undefined, params: queryParams })
+      .then(res => {
+        console.log(res, 'fetchData');
+        if (res.records) {
+          const { total, records = [] } = res;
+          setLoading(false);
+          setList(records);
+          setPageTotal(total);
+        } else if (res.list) {
+          const { total, list = [] } = res;
+          setLoading(false);
+          setList(list);
+          setPageTotal(total);
+        } else if (res.result) {
+          const { total, records = [] } = res.result;
+          setLoading(false);
+          setList(records);
+          setPageTotal(total);
         }
-        
-      }).catch((err) => {
-        console.error(err)
-        setLoading(false)
-        notification.warn({ message: err.message })
       })
-    },
-    [params, pageConfig, api],
-  )
+      .catch(err => {
+        console.error(err);
+        setLoading(false);
+        notification.warn({ message: err.message });
+      });
+  }, [params, pageConfig, api]);
 
   // 监控查询参数的修改
   useEffect(() => {
     // 通过更新分页来触发查询
-    updatePage(1)
-  }, [params])
-  
+    updatePage(1);
+  }, [params]);
+
   // 监控分页的修改
   useEffect(() => {
     // 首次加载不查询
     if (!mounted.current) {
-      mounted.current = true
-      return
+      mounted.current = true;
+      return;
     }
 
-    fetchData()
-  }, [pageConfig])
+    fetchData();
+  }, [pageConfig]);
 
   // 透传给父组件部分方法
   useImperativeHandle(ref, () => ({
-    reload: fetchData
-  }))
+    reload: fetchData,
+  }));
 
   return (
     <>
       <TableList loading={loading} dataSource={list} {...tableProps} />
       <Pagination {...pageConfig} total={pageTotal} onChange={updatePage} />
     </>
-  )
+  );
 });

src/pages/Live/LiveActivity/Edit/components/base.jsx

@@ -1,5 +1,17 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload, InputNumber } from 'antd';
+import {
+  Form,
+  Input,
+  Button,
+  Icon,
+  Select,
+  Tabs,
+  Radio,
+  DatePicker,
+  message,
+  Upload,
+  InputNumber,
+} from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import moment from 'moment';
 import router from 'umi/router';
@@ -7,56 +19,58 @@ import styles from '../../../../style/GoodsList.less';
 import XForm, { FieldTypes, createForm } from '../../../../../components/XForm';
 import apis from '../../../../../services/apis';
 import BuildSelect2 from '../../../../../components/SelectButton/BuildSelect2';
-import LivePlatSelect from '../../../../../components/SelectButton/LivePlatSelect'
+import LivePlatSelect from '../../../../../components/SelectButton/LivePlatSelect';
 import CitySelect3 from '../../../../../components/SelectButton/CitySelect3';
-import ImageUpload from '../../../../../components/XForm/ImageUpload'
+import ImageUpload from '../../../../../components/XForm/ImageUpload';
 import request from '../../../../../utils/request';
 import Navigate from '@/components/Navigate';
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
-let cityId = ''
+let cityId = '';
 
 const header = props => {
-  console.log(props)
-  const liveActivityId = props.liveActivityId.liveId
-  console.log(liveActivityId)
-  const [ liveActivityData, setLiveActivityData ] = useState({})
-  const [showHelp, setShowHelp] = useState(false)
+  console.log(props);
+  const liveActivityId = props.liveActivityId.liveId;
+  console.log(liveActivityId);
+  const [liveActivityData, setLiveActivityData] = useState({});
+  const [showHelp, setShowHelp] = useState(false);
 
-  if(liveActivityId){
-    useEffect(() => {
+  useEffect(() => {
+    if (liveActivityId) {
       getLiveActivityData(liveActivityId);
-    },[])
+    }
+  }, []);
 
   // 查询列表
-  const getLiveActivityData = (liveActivityId) => {
-    request({ ...apis.taliveActivity.getTaLiveActivity, urlData: {id: liveActivityId} }).then((data) => {
-        console.log(data, 'getLiveActivityData')
-        setLiveActivityData(data.data)
+  const getLiveActivityData = liveActivityId => {
+    request({ ...apis.taliveActivity.getTaLiveActivity, urlData: { id: liveActivityId } }).then(
+      data => {
+        console.log(data, 'getLiveActivityData');
+        setLiveActivityData(data.data);
         // if(data.qrCode == 'null'){
         //   message.error("暂时无法获取二维码")
         // }
-    })
-  }
-  }
+      },
+    );
+  };
 
-  const cancelPage = () =>{
+  const cancelPage = () => {
     router.push({
       pathname: '/activity/liveActivity/list/index',
     });
-  }
+  };
 
   //打开新页面
   const openIndexImg = () => {
-    const newWin=window.open('about:blank');
-    newWin.location.href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E6%95%99%E7%A8%8B.png"
-  }
+    const newWin = window.open('about:blank');
+    newWin.location.href = 'http://njcj.oss-cn-shanghai.aliyuncs.com/%E6%95%99%E7%A8%8B.png';
+  };
 
   function highlightsTypeChange(e) {
-    console.log(e.target.value,"ee")
-    setTypeState(e.target.value)
+    console.log(e.target.value, 'ee');
+    setTypeState(e.target.value);
   }
 
   function disabledDate(current) {
@@ -64,30 +78,38 @@ const header = props => {
     return current && current < moment().endOf('day');
   }
 
-  function handleSubmit (e) {
+  function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       console.log(values, 'values');
-      if (!err){
-        let {liveTime, ...submitValue} = values
-        if (submitValue.status == '已发布' || submitValue.status == '1'){
-          submitValue.status = 1
-        }else{
-          submitValue.status = 0
+      if (!err) {
+        let { liveTime, ...submitValue } = values;
+        if (submitValue.status == '已发布' || submitValue.status == '1') {
+          submitValue.status = 1;
+        } else {
+          submitValue.status = 0;
         }
-        if (values.liveStartDate > values.liveEndDate){
-          message.info("直播结束时间大于开始时间")
+        if (values.liveStartDate > values.liveEndDate) {
+          message.info('直播结束时间大于开始时间');
           return;
         }
-        submitValue.liveStartDate = moment(submitValue.liveStartDate._d).format('YYYY-MM-DD HH:mm:ss')
-        submitValue.liveEndDate = moment(submitValue.liveEndDate._d).format('YYYY-MM-DD HH:mm:ss')
-        console.log(submitValue)
-        request({ ...apis.taliveActivity.updateTaLiveActivity, urlData: {id: liveActivityId},data: submitValue, }).then((data) => {
-          message.info("保存成功")
-          cancelPage()
-        }).catch((err) => {
-          message.info(err.msg || err.message)
+        submitValue.liveStartDate = moment(submitValue.liveStartDate._d).format(
+          'YYYY-MM-DD HH:mm:ss',
+        );
+        submitValue.liveEndDate = moment(submitValue.liveEndDate._d).format('YYYY-MM-DD HH:mm:ss');
+        console.log(submitValue);
+        request({
+          ...apis.taliveActivity.updateTaLiveActivity,
+          urlData: { id: liveActivityId },
+          data: submitValue,
         })
+          .then(data => {
+            message.info('保存成功');
+            cancelPage();
+          })
+          .catch(err => {
+            message.info(err.msg || err.message);
+          });
       }
     });
   }
@@ -101,12 +123,12 @@ const header = props => {
           {getFieldDecorator('cityId', {
             initialValue: liveActivityData.cityId,
             rules: [{ required: true, message: ' 请输入所属城市' }],
-          })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')}/>)}
+          })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')} />)}
         </Form.Item>
         <Form.Item label="所属楼盘">
           {getFieldDecorator('buildingId', {
             initialValue: liveActivityData.buildingId,
-          })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
+          })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')} />)}
         </Form.Item>
         <Form.Item label="直播活动标题">
           {getFieldDecorator('liveActivityTitle', {
@@ -115,92 +137,114 @@ const header = props => {
           })(<Input maxLength={20} placeholder="给直播活动起个名字" />)}
         </Form.Item>
         <Form.Item label="直播开始时间">
-          {getFieldDecorator('liveStartDate', { initialValue : liveActivityData.liveStartDate ? moment(liveActivityData.liveStartDate, 'YYYY-MM-DD HH:mm:ss') : null,
-                rules: [
-                  {
-                    required: true,
-                    message: '请选择直播开始时间',
-                  },
-                ],
-              })(<DatePicker placeholder="预计开始时间" style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+          {getFieldDecorator('liveStartDate', {
+            initialValue: liveActivityData.liveStartDate
+              ? moment(liveActivityData.liveStartDate, 'YYYY-MM-DD HH:mm:ss')
+              : null,
+            rules: [
+              {
+                required: true,
+                message: '请选择直播开始时间',
+              },
+            ],
+          })(
+            <DatePicker
+              placeholder="预计开始时间"
+              style={{ width: '500px' }}
+              format="YYYY-MM-DD HH:mm:ss"
+              showTime={{ format: 'HH:mm:ss' }}
+            />,
+          )}
         </Form.Item>
         <Form.Item label="直播结束时间">
-          {getFieldDecorator('liveEndDate', { initialValue : liveActivityData.liveEndDate ? moment(liveActivityData.liveEndDate, 'YYYY-MM-DD HH:mm:ss') : null,
-                rules: [
-                  {
-                    required: true,
-                    message: '请选择直播结束时间',
-                  },
-                ],
-              })(<DatePicker placeholder="预计结束时间" disabledDate={disabledDate} style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+          {getFieldDecorator('liveEndDate', {
+            initialValue: liveActivityData.liveEndDate
+              ? moment(liveActivityData.liveEndDate, 'YYYY-MM-DD HH:mm:ss')
+              : null,
+            rules: [
+              {
+                required: true,
+                message: '请选择直播结束时间',
+              },
+            ],
+          })(
+            <DatePicker
+              placeholder="预计结束时间"
+              disabledDate={disabledDate}
+              style={{ width: '500px' }}
+              format="YYYY-MM-DD HH:mm:ss"
+              showTime={{ format: 'HH:mm:ss' }}
+            />,
+          )}
         </Form.Item>
         <Form.Item label="直播小程序">
           {getFieldDecorator('liveApp', {
-              initialValue: liveActivityData.liveApp,
-              rules: [{ required: true, message: '请选择直播小程序' }],
-            })(<LivePlatSelect />)}
+            initialValue: liveActivityData.liveApp,
+            rules: [{ required: true, message: '请选择直播小程序' }],
+          })(<LivePlatSelect />)}
         </Form.Item>
         <Form.Item label="房间参数">
           {getFieldDecorator('liveRoomParam', {
             initialValue: liveActivityData.liveRoomParam,
             rules: [{ required: true, message: '请输入房间参数' }],
-          })(<Input maxLength={1000} placeholder="点击右侧按钮查看如何获取房间参数" style={{width:'680px'}}/>)}
+          })(
+            <Input
+              maxLength={1000}
+              placeholder="点击右侧按钮查看如何获取房间参数"
+              style={{ width: '680px' }}
+            />,
+          )}
           <Navigate onClick={openIndexImg}>不知道怎么填？查看说明</Navigate>
         </Form.Item>
-        <Form.Item label="封面图1" help="建议尺寸：750px*420px，比例16:9，格式：jpg，用于：活动列表">
-              {getFieldDecorator('listImg', {
-                  initialValue: liveActivityData.listImg,
-                  rules: [{ required: true, message: '请上传封面图1' }],
-              })(
-                <ImageUpload />,
-              )}
-        </Form.Item>  
+        <Form.Item
+          label="封面图1"
+          help="建议尺寸：750px*420px，比例16:9，格式：jpg，用于：活动列表"
+        >
+          {getFieldDecorator('listImg', {
+            initialValue: liveActivityData.listImg,
+            rules: [{ required: true, message: '请上传封面图1' }],
+          })(<ImageUpload />)}
+        </Form.Item>
         <Form.Item label="封面图2" help="建议尺寸：750*250px，比例3:1，格式：jpg，用于：项目详情页">
-              {getFieldDecorator('detailImg', {
-                  initialValue: liveActivityData.detailImg,
-                  rules: [{ required: true, message: '请上传封面图2' }],
-              })(
-                <ImageUpload />,
-              )}
-        </Form.Item>  
+          {getFieldDecorator('detailImg', {
+            initialValue: liveActivityData.detailImg,
+            rules: [{ required: true, message: '请上传封面图2' }],
+          })(<ImageUpload />)}
+        </Form.Item>
         <Form.Item label="详情图" help="格式：jpg，用于：直播活动详情页，点击可跳转到直播间">
-              {getFieldDecorator('detailTypeImg', {
-                  initialValue: liveActivityData.detailTypeImg,
-                  rules: [{ required: true, message: '请上传详情图' }],
-              })(
-                <ImageUpload style={{width:'300px',height:'600px'}}/>,
-              )}
-        </Form.Item>      
+          {getFieldDecorator('detailTypeImg', {
+            initialValue: liveActivityData.detailTypeImg,
+            rules: [{ required: true, message: '请上传详情图' }],
+          })(<ImageUpload style={{ width: '300px', height: '600px' }} />)}
+        </Form.Item>
         <Form.Item label="权重">
-              {getFieldDecorator('weight', {
-                  initialValue: liveActivityData.weight,
-                  rules: [{ required: true, message: '请设置权重' }],
-              })(
-                <InputNumber placeholder="权重越大越靠前" style={{width:'150px'}}/>
-              )}
+          {getFieldDecorator('weight', {
+            initialValue: liveActivityData.weight,
+            rules: [{ required: true, message: '请设置权重' }],
+          })(<InputNumber placeholder="权重越大越靠前" style={{ width: '150px' }} />)}
         </Form.Item>
         <Form.Item label="发布状态">
           {getFieldDecorator('status', {
-              initialValue: liveActivityData.status == 1 ? '已发布' : '未发布',
-              rules: [{ required: true, message: '请选择发布状态' }],
-            })(<Select placeholder="发布状态" style={{ width: '300px' }}>
-            <Option value="0">未发布</Option>
-            <Option value="1">已发布</Option>
-          </Select>)}
+            initialValue: liveActivityData.status == 1 ? '已发布' : '未发布',
+            rules: [{ required: true, message: '请选择发布状态' }],
+          })(
+            <Select placeholder="发布状态" style={{ width: '300px' }}>
+              <Option value="0">未发布</Option>
+              <Option value="1">已发布</Option>
+            </Select>,
+          )}
         </Form.Item>
         <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
-          <Button type="primary" htmlType="submit"style={{marginRight:'20px'}}>
+          <Button type="primary" htmlType="submit" style={{ marginRight: '20px' }}>
             确定
           </Button>
-          <Button onClick={() => router.go(-1)}>
-            取消
-          </Button>
+          <Button onClick={() => router.go(-1)}>取消</Button>
         </Form.Item>
       </Form>
     </>
-  )
-}
+  );
+};
 
 const Base = Form.create({ name: 'header' })(header);
 
-export default Base
+export default Base;

src/pages/Live/LiveActivity/Edit/index.jsx

@@ -1,19 +1,34 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, notification } from 'antd';
+import {
+  Form,
+  Input,
+  Button,
+  DatePicker,
+  Select,
+  Card,
+  Row,
+  Col,
+  Pagination,
+  Alert,
+  Radio,
+  Tag,
+  Tooltip,
+  Tabs,
+  notification,
+} from 'antd';
 import moment from 'moment';
 import request from '../../../../utils/request';
 import apis from '../../../../services/apis';
 import { router } from 'umi';
 
-import Base from './components/base'
-import Poster from './components/poster'
-import Share from './components/share'
-import ShareRecord from './components/shareRecord'
-import VisitRecord from './components/visitRecord'
+import Base from './components/base';
+import Poster from './components/poster';
+import Share from './components/share';
+import ShareRecord from './components/shareRecord';
+import VisitRecord from './components/visitRecord';
 import Prompt from 'umi/prompt';
 
-
-const { Option } = Select
+const { Option } = Select;
 const { TabPane } = Tabs;
 
 const formItemLayout = {
@@ -30,37 +45,53 @@ const formItemLayout = {
 function openNotificationWithIcon(type, message) {
   notification[type]({
     message,
-    description:
-      '',
+    description: '',
   });
 }
 
 function EditHouse(props) {
-  const {liveActivityId} = props.location.query;
-  console.log(props.location.query.id)
-  const [tab, setTab] = useState('base')
-  const [liveActivity, setLiveActivity] = useState({ liveActivityId: undefined })
-  const [houseId, setHouseId] = useState('')
+  const { liveActivityId } = props.location.query;
+  console.log(props.location.query.id);
+  const [tab, setTab] = useState('base');
+  const [liveActivity, setLiveActivity] = useState({ liveActivityId: undefined });
+  const [houseId, setHouseId] = useState('');
 
   function tabsCallback(e) {
-    setTab(e.target.value)
+    setTab(e.target.value);
   }
 
   // building 回调
   function buildingOnSuccess(e) {
-    setBuildingData(e)
+    setBuildingData(e);
   }
 
   function housTabChange(e) {
-    setHouseId(e.houseId)
-    setTab('preselectionRecord')
+    setHouseId(e.houseId);
+    setTab('preselectionRecord');
   }
 
-  const liveId = liveActivity.liveActivityId || (props.location.query && props.location.query.id)
-  console.log(liveId)
+  const liveId = liveActivity.liveActivityId || (props.location.query && props.location.query.id);
+  console.log(liveId, 'liveId');
   return (
-    <>
-      <Radio.Group value={ tab } buttonStyle="solid" onChange={e => tabsCallback(e)}>
+    <Card>
+      <Tabs defaultActiveKey="1">
+        <TabPane tab="基本信息" key="1">
+          <Base liveActivityId={{ liveId }} onSuccess={e => buildingOnSuccess(e)} />
+        </TabPane>
+        <TabPane tab="海报设置" key="2">
+          <Poster liveActivityId={{ liveId }} />
+        </TabPane>
+        <TabPane tab="分享设置" key="3">
+          <Share liveActivityId={{ liveId }} />
+        </TabPane>
+        <TabPane tab="分享记录" key="4">
+          <ShareRecord liveActivityId={{ liveId }} />
+        </TabPane>
+        <TabPane tab="分享访问记录" key="5">
+          <VisitRecord liveActivityId={{ liveId }} />
+        </TabPane>
+      </Tabs>
+      {/* <Radio.Group value={ tab } buttonStyle="solid" onChange={e => tabsCallback(e)}>
         <Radio.Button value="base">基本信息</Radio.Button>
         <Radio.Button value="poster">海报设置</Radio.Button>
         <Radio.Button value="share">分享设置</Radio.Button>
@@ -73,15 +104,11 @@ function EditHouse(props) {
         { (tab === 'share' && <Share liveActivityId={{ liveId }}/>)}
         { (tab === 'shareRecord' && <ShareRecord liveActivityId={{ liveId }}/>)}
         { (tab === 'visitRecord' && <VisitRecord liveActivityId={{ liveId }}/>)}
-      </div>
-      <Prompt message={location =>
-        location.pathname.startsWith("/activity/liveActivity")
-          ? true
-          : localStorage.removeItem("liveActivePageParams")} />
-    </>
-  )
+      </div> */}
+    </Card>
+  );
 }
 
 const WrappedEditHouseForm = Form.create({ name: 'editHouse' })(EditHouse);
 
-export default WrappedEditHouseForm
+export default WrappedEditHouseForm;

src/pages/Live/LiveActivity/List/index.jsx

@@ -1,13 +1,25 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Pagination, Modal, Card, notification } from 'antd';
+import {
+  Form,
+  Input,
+  Button,
+  Icon,
+  Select,
+  message,
+  Table,
+  Pagination,
+  Modal,
+  Card,
+  notification,
+} from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import AuthButton from '@/components/AuthButton';
 import Prompt from 'umi/prompt';
 import withActions from '@/components/ActionList';
 import EditIcon from '@/components/EditIcon';
-import SelectCity from '@/components/SelectButton/CitySelect'
-import BuildSelect from '@/components/SelectButton/BuildSelect'
+import SelectCity from '@/components/SelectButton/CitySelect';
+import BuildSelect from '@/components/SelectButton/BuildSelect';
 import apis from '@/services/apis';
 import request from '@/utils/request';
 import Navigate from '@/components/Navigate';
@@ -17,86 +29,80 @@ const { Option } = Select;
 
 const header = props => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [data, setData] = useState({ list: [], total: 0 })
+  const [data, setData] = useState({ list: [], total: 0 });
   //   const [page, changePage] = useState({})
-  const [liveIdList, setLiveIdList] = useState([])
-  const [time, setTime] = useState('')
-  const [showHelp, setShowHelp] = useState(false)
+  const [liveIdList, setLiveIdList] = useState([]);
+  const [time, setTime] = useState('');
+  const [showHelp, setShowHelp] = useState(false);
 
   // 查询列表
   const getList = params => {
     request({ ...apis.taliveActivity.taLiveActivity, params: { ...params } }).then(data => {
-      console.log(data)
-      setData(data)
-    })
-  }
+      console.log(data);
+      setData(data);
+    });
+  };
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-
-      getList({ pageNum: 1, pageSize: 10 });
-    
-   
-  }, [])
+    getList({ pageNum: 1, pageSize: 10 });
+  }, []);
 
   // 跳转到编辑
   const toAddLive = rowData => () => {
-    if(rowData) {
+    if (rowData) {
       router.push({
-      pathname: '/Live/LiveActivity/Edit',
-      query: {
-        id: rowData.liveActivityId,
-        buildingId: rowData.buildingId,
-      },
-    });
-      return
+        pathname: '/Live/LiveActivity/Edit',
+        query: {
+          id: rowData.liveActivityId,
+          buildingId: rowData.buildingId,
+        },
+      });
+      return;
     }
     router.push({
-      pathname: '/Live/LiveActivity/Edit',
+      pathname: '/Live/LiveActivity/add',
     });
-  }
+  };
 
   const toDataReacord = rowData => () => {
-  
-      router.push({
+    router.push({
       pathname: '/activity/liveActivity/liveActivityRecord',
       query: {
         id: rowData.liveActivityId,
       },
     });
-  }
+  };
 
   function openNotificationWithIcon(type, message) {
     notification[type]({
       message,
-      description:
-        '',
+      description: '',
     });
   }
 
-  
-  const toDelLiveActivity = rowData => () =>{
-    console.log(liveIdList, 'liveIdListliveIdList')
-    if(liveIdList.length < 1){
-      openNotificationWithIcon('error', '请先选择需要删除的直播活动')
-      return
+  const toDelLiveActivity = rowData => () => {
+    console.log(liveIdList, 'liveIdListliveIdList');
+    if (liveIdList.length < 1) {
+      openNotificationWithIcon('error', '请先选择需要删除的直播活动');
+      return;
     }
     Modal.confirm({
       title: '删除后当前直播活动关联的小程序端开屏图、banner图等也会自动下架',
       okText: '确定',
       cancelText: '取消',
-      onOk () {
-        request({ ...apis.taliveActivity.deleteTaLiveActivity, data: liveIdList, }).then((data) => {
-          message.info("操作成功")
-          getList({ pageNum: 1, pageSize: 10 });
-        }).catch((err) => {
-          // message.info(err.msg)
-        })
+      onOk() {
+        request({ ...apis.taliveActivity.deleteTaLiveActivity, data: liveIdList })
+          .then(data => {
+            message.info('操作成功');
+            getList({ pageNum: 1, pageSize: 10 });
+          })
+          .catch(err => {
+            // message.info(err.msg)
+          });
       },
     });
-
-    
-  }
+  };
 
   /**
    *
@@ -110,7 +116,7 @@ const header = props => {
       dataIndex: 'liveActivityTitle',
       key: 'liveActivityTitle',
       align: 'center',
-      render:  (x, row) => <Navigate onClick={toAddLive(row)}>{row.liveActivityTitle}</Navigate>,
+      render: (x, row) => <Navigate onClick={toAddLive(row)}>{row.liveActivityTitle}</Navigate>,
     },
     {
       title: '所属城市',
@@ -129,14 +135,22 @@ const header = props => {
       dataIndex: 'liveStartDate',
       key: 'liveStartDate',
       align: 'center',
-      render: (x, row) => <><span>{`${moment(row.liveStartDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+      render: (x, row) => (
+        <>
+          <span>{`${moment(row.liveStartDate).format('YYYY-MM-DD HH:mm:ss')}`}</span>
+        </>
+      ),
     },
     {
       title: '直播结束时间',
       dataIndex: 'liveEndDate',
       key: 'liveEndDate',
       align: 'center',
-      render: (x, row) => <><span>{`${moment(row.liveEndDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+      render: (x, row) => (
+        <>
+          <span>{`${moment(row.liveEndDate).format('YYYY-MM-DD HH:mm:ss')}`}</span>
+        </>
+      ),
     },
     {
       title: '权重',
@@ -149,7 +163,11 @@ const header = props => {
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: status => <><span>{status == 0 ? '未发布' : '已发布'}</span></>,
+      render: status => (
+        <>
+          <span>{status == 0 ? '未发布' : '已发布'}</span>
+        </>
+      ),
     },
     {
       title: '新增人',
@@ -162,7 +180,11 @@ const header = props => {
       dataIndex: 'createDate',
       key: 'createDate',
       align: 'center',
-      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+      render: (x, row) => (
+        <>
+          <span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span>
+        </>
+      ),
     },
     {
       title: '修改人',
@@ -175,17 +197,21 @@ const header = props => {
       dataIndex: 'updateDate',
       key: 'updateDate',
       align: 'center',
-      render: (x, row) => <><span>{`${moment(row.updateDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+      render: (x, row) => (
+        <>
+          <span>{`${moment(row.updateDate).format('YYYY-MM-DD HH:mm:ss')}`}</span>
+        </>
+      ),
     },
     {
       title: '操作',
       align: 'center',
       width: 240,
-      render: withActions((text, record) => [    
-        <AuthButton name="admin.liveActivity.dataRecord" noRight={null}>
-          <EditIcon type="record" text="数据记录" onClick={toDataReacord(record)} />
-        </AuthButton>,
- 
+      render: withActions((text, record) => [
+        // <AuthButton name="admin.liveActivity.dataRecord" noRight={null}>
+        //   <EditIcon type="record" text="数据记录" onClick={toDataReacord(record)} />
+        // </AuthButton>,
+
         <AuthButton name="admin.live.detail.get" noRight={null}>
           <EditIcon type="look" text="查看详情" onClick={toAddLive(record)} />
         </AuthButton>,
@@ -199,17 +225,16 @@ const header = props => {
         dynamicId,
       },
     });
-  }
+  };
 
   const changePageNum = pageNumber => {
-
-    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
-  }
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() });
+  };
 
   const rowSelection = {
     onChange: (selectedRowKeys, selectedRows) => {
       console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
-      setLiveIdList(selectedRows)
+      setLiveIdList(selectedRows);
     },
   };
 
@@ -218,93 +243,99 @@ const header = props => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        console.log('提交数据: ', values)
+        console.log('提交数据: ', values);
         if (time) {
-          values.time = `${moment(time).format('YYYY-MM-DDT00:00:00.000')}Z`
+          values.time = `${moment(time).format('YYYY-MM-DDT00:00:00.000')}Z`;
         } else {
-          values.time = null
+          values.time = null;
         }
-      
-        getList({ pageNum: 1, pageSize: 10, ...values })
+
+        getList({ pageNum: 1, pageSize: 10, ...values });
       }
     });
-  }
+  };
 
   // 重置搜索
-  function handleReset () {
+  function handleReset() {
     props.form.resetFields();
-    setTime('')
+    setTime('');
 
-    getList({ pageNum: 1, pageSize: 10 })
+    getList({ pageNum: 1, pageSize: 10 });
   }
 
   // 时间回调
   function timeOnChange(date, dateString) {
-    console.log(date, dateString)
-    setTime(date)
+    console.log(date, dateString);
+    setTime(date);
   }
 
-
-  const { getFieldDecorator } = props.form
+  const { getFieldDecorator } = props.form;
   return (
-
     <Card>
       {/* style={{ display: 'none' }} */}
       <div id="qrcode"></div>
       <Form layout="inline" onSubmit={e => handleSubmit(e)}>
         <Form.Item>
           {getFieldDecorator('liveActivityTitle')(
-             <Input
-             prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-             placeholder="直播活动标题"
-           />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('cityId')(
-            <SelectCity />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('buildingId')(
-            <BuildSelect />,
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="直播活动标题"
+            />,
           )}
         </Form.Item>
+        <Form.Item>{getFieldDecorator('cityId')(<SelectCity />)}</Form.Item>
+        <Form.Item>{getFieldDecorator('buildingId')(<BuildSelect />)}</Form.Item>
         <Form.Item>
           {getFieldDecorator('status')(
             <Select style={{ width: '180px' }} placeholder="发布状态">
-            <Option value="1">已发布</Option>
-            <Option value="0">未发布</Option>
-          </Select>,
+              <Option value="1">已发布</Option>
+              <Option value="0">未发布</Option>
+            </Select>,
           )}
         </Form.Item>
         <Form.Item>
           <AuthButton name="admin.buildingDynamic.search" noRight={null}>
-            <Button type="primary" htmlType="submit" >
+            <Button type="primary" htmlType="submit">
               搜索
             </Button>
           </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
-            </Button>
+          </Button>
         </Form.Item>
       </Form>
-      
+
       <AuthButton name="admin.live.add.post" noRight={null}>
-        <Button type="danger" style={{margin:'20px 0'}}  onClick={toAddLive()}>新增</Button>
+        <Button type="danger" style={{ margin: '20px 0' }} onClick={toAddLive()}>
+          新增
+        </Button>
       </AuthButton>
       <AuthButton name="admin.live.del" noRight={null}>
-        <Button type="primary"  onClick={toDelLiveActivity()} style={{marginLeft:'30px'}}>删除</Button>
-      </AuthButton><br/>
+        <Button type="primary" onClick={toDelLiveActivity()} style={{ marginLeft: '30px' }}>
+          删除
+        </Button>
+      </AuthButton>
+      <br />
       <span>共筛选出{data.total}条记录</span>
-      <Table rowSelection={rowSelection}
-       dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
+      <Table
+        rowSelection={rowSelection}
+        dataSource={data.records}
+        columns={columns}
+        pagination={false}
+        rowKey="activityList"
+      />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current}/>
+        <Pagination
+          showQuickJumper
+          defaultCurrent={1}
+          total={data.total}
+          onChange={e => changePageNum(e)}
+          current={data.current}
+        />
       </div>
     </Card>
-  )
-}
+  );
+};
 const WrappedHeader = Form.create({ name: 'header' })(header);
 
-export default WrappedHeader
+export default WrappedHeader;

src/pages/Live/LiveActivity/add/index.jsx

@@ -0,0 +1,176 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, Radio, Upload, InputNumber } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import XForm, { FieldTypes } from '../../../../components/XForm';
+import router from 'umi/router';
+import moment from 'moment';
+import styles from '../../../style/GoodsList.less';
+import SelectCity from '../../../../components/SelectButton/CitySelect'
+import BuildSelect2 from '../../../../components/SelectButton/BuildSelect2'
+import LivePlatSelect from '../../../../components/SelectButton/LivePlatSelect'
+import CitySelect3 from '../../../../components/SelectButton/CitySelect3'
+import ImageUpload from '../../../../components/XForm/ImageUpload'
+import Wangedit from '../../../../components/Wangedit/Wangedit'
+import Navigate from '@/components/Navigate';
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+import Prompt from 'umi/prompt';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+let cityId = ''
+
+const header = props => {
+  const { salesBatchId } = props.location.query
+  console.log(salesBatchId)
+  const [ saleBatchData, setSaleBatchData ] = useState({})
+  const [showHelp, setShowHelp] = useState(false)
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/activity/liveActivity/list',
+    });
+  }
+
+   //打开新页面
+   const openIndexImg = () => {
+    const newWin=window.open('about:blank');
+    newWin.location.href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E6%95%99%E7%A8%8B.png"
+  }
+
+  function highlightsTypeChange(e) {
+    console.log(e.target.value,"ee")
+    setTypeState(e.target.value)
+  }
+
+  function disabledDate(current) {
+    // Can not select days before today and today
+    return current && current < moment().endOf('day');
+  }
+
+  function handleSubmit (e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err){
+        let {liveTime, ...submitValue} = values
+        submitValue.liveStartDate = moment(submitValue.liveStartDate._d).format('YYYY-MM-DD HH:mm:ss')
+        submitValue.liveEndDate = moment(submitValue.liveEndDate._d).format('YYYY-MM-DD HH:mm:ss')
+        
+        if (values.liveStartDate > values.liveEndDate){
+          message.info("直播结束时间大于开始时间")
+          return;
+        }
+
+        request({ ...apis.taliveActivity.addTaLiveActivity, data: { ...submitValue },}).then((data) => {
+          message.info("保存成功")
+          console.log(data,"datattttttt")
+          router.go('-1');
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+        <Form.Item label="所属城市">
+          {getFieldDecorator('cityId', {
+            rules: [{ required: true, message: ' 请输入所属城市' }],
+          })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')}/>)}
+        </Form.Item>
+        <Form.Item label="所属楼盘">
+          {getFieldDecorator('buildingId')(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
+        </Form.Item>
+        <Form.Item label="直播活动标题">
+          {getFieldDecorator('liveActivityTitle', {
+            rules: [{ required: true, message: '请输入直播活动标题' }],
+          })(<Input maxLength={20} placeholder="给直播活动起个名字" />)}
+        </Form.Item>
+        <Form.Item label="直播开始时间">
+          {getFieldDecorator('liveStartDate', {
+                rules: [
+                  {
+                    required: true,
+                    message: '请选择直播开始时间',
+                  },
+                ],
+              })(<DatePicker placeholder="预计开始时间"style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+        </Form.Item>
+        <Form.Item label="直播结束时间">
+          {getFieldDecorator('liveEndDate', {
+                rules: [
+                  {
+                    required: true,
+                    message: '请选择直播结束时间',
+                  },
+                ],
+              })(<DatePicker placeholder="预计结束时间" disabledDate={disabledDate} style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+        </Form.Item>
+        <Form.Item label="直播小程序">
+          {getFieldDecorator('liveApp', {
+              rules: [{ required: true, message: '请选择直播小程序' }],
+            })((<LivePlatSelect />))}
+        </Form.Item>
+        <Form.Item label="房间参数">
+          {getFieldDecorator('liveRoomParam', {
+            rules: [{ required: true, message: '请输入房间参数' }],
+          })(<Input maxLength={1000} placeholder="点击右侧按钮查看如何获取房间参数" style={{width:'680px'}}/>)}<Navigate onClick={openIndexImg}>不知道怎么填？查看说明</Navigate>
+        </Form.Item>
+        <Form.Item label="封面图1" help="建议尺寸：750px*420px，比例16:9，格式：jpg，用于：活动列表">
+              {getFieldDecorator('listImg', {
+                  rules: [{ required: true, message: '请上传封面图1' }],
+              })(
+                <ImageUpload />,
+              )}
+        </Form.Item>  
+        <Form.Item label="封面图2" help="建议尺寸：750*250px，比例3:1，格式：jpg，用于：项目详情页">
+              {getFieldDecorator('detailImg', {
+                  rules: [{ required: true, message: '请上传封面图2' }],
+              })(
+                <ImageUpload />,
+              )}
+        </Form.Item>  
+        <Form.Item label="详情图" help="格式：jpg，用于：直播活动详情页，点击可跳转到直播间">
+              {getFieldDecorator('detailTypeImg', {
+                  rules: [{ required: true, message: '请上传详情图' }],
+              })(
+                <ImageUpload />,
+              )}
+        </Form.Item>      
+        <Form.Item label="权重">
+              {getFieldDecorator('weight', {
+                  rules: [{ required: true, message: '请设置权重' }],
+              })(
+                <InputNumber placeholder="权重越大越靠前" style={{width:'150px'}}/>
+              )}
+        </Form.Item>
+        <Form.Item label="发布状态">
+          {getFieldDecorator('status', {
+              rules: [{ required: true, message: '请选择发布状态' }],
+            })(<Select placeholder="发布状态" style={{ width: '300px' }}>
+            <Option value="0">否</Option>
+            <Option value="1">是</Option>
+          </Select>)}
+        </Form.Item>
+        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
+          <Button type="primary" htmlType="submit"style={{marginRight:'20px'}}>
+            确定
+          </Button>
+          <Button onClick={() => router.go(-1)}>
+            取消
+          </Button>
+        </Form.Item>
+      </Form>
+    </>
+  )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/Live/liveActivity copy/edit/components/shareRecord.jsx

@@ -26,7 +26,8 @@ const header = (props) => {
     request({ ...apis.taliveActivity.taLiveShare, params: { ...params },}).then((data) => {
         console.log(data)
         setData(data)
-    })
+    }).catch(e=>
+      console.error(e))
   }
   
   const columns = [

src/pages/activity/ActivityList.jsx

@@ -1,408 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Menu, Typography, message, Table, Pagination, Modal, DatePicker } from 'antd';
-import router from 'umi/router';
-import moment from 'moment';
-import AuthButton from '@/components/AuthButton';
-import Prompt from 'umi/prompt';
-import withActions from '@/components/ActionList';
-import EditIcon from '@/components/EditIcon';
-import Navigate from '@/components/Navigate';
-import styles from '../style/GoodsList.less';
-import SelectCity from '../../components/SelectButton/CitySelect'
-import BuildSelect from '../../components/SelectButton/BuildSelect'
-import apis from '../../services/apis';
-import request from '../../utils/request';
-
-const { Option } = Select;
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-
-const header = props => {
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [data, setData] = useState({ list: [], total: 0 })
-  //   const [page, changePage] = useState({})
-  const [time, setTime] = useState('')
-
-  // 查询列表
-  const getList = params => {
-    request({ ...apis.activity.list, params: { ...params } }).then(data => {
-      console.log(data)
-      setData(data)
-    })
-  }
-
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useEffect(() => {
-
-    if (localStorage.getItem("activePageParams")) {
-
-      const localStorageValue = JSON.parse(localStorage.getItem("activePageParams"))
-      localStorageValue.time = localStorageValue.time ? moment(localStorageValue.time) : ''
-
-      props.form.setFieldsValue(localStorageValue);
-      getList(JSON.parse(localStorage.getItem("activePageParams")))
-    } else {
-      localStorage.setItem("activePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));
-      getList({ pageNum: 1, pageSize: 10 });
-    }
-  }, [])
-
-  // 跳转到编辑商品
-  const toEditGoods = dynamicId => () => {
-    router.push({
-      pathname: '/activity/editActivity',
-      query: {
-        dynamicId,
-      },
-    });
-  }
-
-  const newQrcode = row => {
-    const x = new XMLHttpRequest();
-    const resourceUrl = row.qrCode
-    x.open('GET', resourceUrl, true);
-    x.responseType = 'blob';
-    x.onload = function (e) {
-      const url = window.URL.createObjectURL(x.response)
-      const a = document.createElement('a');
-      a.href = url;
-      a.style.display = 'none'
-      a.download = '活动二维码.png';
-      a.click();
-    }
-    x.send();
-  }
-
-  const getActivityDetail = (dynamicId) => () => {
-    router.push({
-      pathname: '/activity/detailActivity',
-      query: {
-        dynamicId,
-      },
-    });
-  }
-
-  const getJoinPeople = (dynamicId) => () => {
-    router.push({
-      pathname: '/activity/SignList',
-      query: {
-        dynamicId,
-      },
-    });
-  }
-
-  const toDataReacord = (id) => () => {
-    router.push({
-      pathname: '/activity/activityRecord',
-      query: {
-
-        id,
-      },
-    });
-  }
-
-  /**
-   *
-   *
-   * @param {*} props
-   * @returns
-   */
-  const columns = [
-    {
-      title: '活动标题',
-      dataIndex: 'title',
-      key: 'title',
-      align: 'center',
-      // width: '15%',
-      render: (x, row) => <Navigate onClick={getActivityDetail(row.dynamicId)}><Typography.Text ellipsis>{row.title}</Typography.Text></Navigate>,
-    },
-    {
-      title: '活动时间',
-      dataIndex: 'startDate',
-      key: 'startDate',
-      align: 'center',
-      // width: '15%',
-      // width: '20%',
-      render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format('YYYY-MM-DD')}`}</span></>,
-    },
-    {
-      title: '已参与人数',
-      dataIndex: 'count',
-      key: 'count',
-      align: 'center',
-      render: (x, row) => <Navigate onClick={getJoinPeople(row.dynamicId)}>{row.count}</Navigate>,
-    },
-    // {
-    //   title: '阅读量',
-    //   dataIndex: 'pvNum',
-    //   key: 'pvNum',
-    //   align: 'center',
-    //   // width: '10%',
-    // },
-    // {
-    //   title: '转发量',
-    //   dataIndex: 'shareNum',
-    //   key: 'shareNum',
-    //   align: 'center',
-    //   // width: '10%',
-    // },
-    // {
-    //   title: '收藏数',
-    //   dataIndex: 'saveNum',
-    //   key: 'saveNum',
-    //   align: 'center',
-    //   // width: '10%',
-    // },
-    {
-      title: '报名状态',
-      dataIndex: 'activityStatus',
-      key: 'activityStatus',
-      align: 'center',
-      render: activityStatus => (activityStatus == 0 ? '进行中' : activityStatus == 1 ? '未开始' : '已结束'),
-    },
-    {
-      title: '权重',
-      dataIndex: 'heavy',
-      key: 'heavy',
-      align: 'center',
-    },
-    {
-      title: '操作',
-      dataIndex: 'handle',
-      key: 'handle',
-      align: 'center',
-      render: withActions((x, row) => [
-        <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
-          <EditIcon type={row.status === 1 ? 'cancel' : 'publish'} text={row.status === 1 ? '取消发布' : '发布'} onClick={sendOrPublicDynamic.bind(this, row)} />
-        </AuthButton>,
-
-        <EditIcon type="look" text="查看详情" onClick={getActivityDetail(row.dynamicId)} />,
-
-        row.activityStatus === 0 ?
-          <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
-            <EditIcon type="end" text="结束活动" onClick={finishDynamic.bind(this, row)} />
-          </AuthButton> : null,
-
-        <AuthButton name="admin.buildingDynamic.tag" noRight={null}>
-          <EditIcon type={row.weight === 1 ? 'cancel' : 'add'} text={row.weight === 1 ? '取消标签' : '添加标签'} onClick={topDynamic(row)} />
-        </AuthButton>,
-
-        <EditIcon type={row.home === 1 ? 'cancel' : 'top'} text={row.home === 1 ? '取消推首页' : '推荐首页'} onClick={homeDynamic(row)} />,
-
-        <AuthButton name="admin.buildingDynamic.dataRecord" noRight={null}>
-          <EditIcon type="record" text="数据记录" onClick={toDataReacord(row.dynamicId)} />
-        </AuthButton>,
-
-        (row.activityStatus === 0 || row.activityStatus === 1) ?
-          <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
-            <EditIcon type="edit" text="编辑" onClick={toEditGoods(row.dynamicId, row.count)} />
-          </AuthButton> : null,
-      ]),
-    },
-  ];
-
-  const getSignList = dynamicId => {
-    router.push({
-      pathname: '/activity/SignList',
-      query: {
-        dynamicId,
-      },
-    });
-  }
-
-  const finishDynamic = row => {
-    Modal.confirm({
-      title: '活动会被强制结束，小程序端无法再发起或参与此活动，如果不想让客户看到活动，请再点击取消发布按钮',
-      okText: '确定',
-      cancelText: '取消',
-      onOk() {
-        request({ ...apis.activity.finish, data: { dynamicId: row.dynamicId, top: '' } }).then(data => {
-          console.log(data)
-          message.info('操作成功！')
-          getList(JSON.parse(localStorage.getItem("activePageParams")))
-        }).catch(err => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-      },
-    });
-  }
-
-  //   置顶
-  const topDynamic = row => () => {
-    const weight = Math.abs(row.weight - 1)
-    request({ ...apis.activity.weight, params: { dynamicId: row.dynamicId, weight } }).then(data => {
-      console.log(data)
-      message.info('操作成功！')
-      getList(JSON.parse(localStorage.getItem("activePageParams")))
-    }).catch(err => {
-      console.log(err)
-      message.info(err.msg || err.message)
-    })
-  }
-
-  //   推首页
-  const homeDynamic = row => () => {
-    const home = Math.abs(row.home - 1)
-    request({ ...apis.activity.home, params: { dynamicId: row.dynamicId, home } }).then(data => {
-      console.log(data)
-      message.info('操作成功！')
-      getList(JSON.parse(localStorage.getItem("activePageParams")))
-    }).catch(err => {
-      console.log(err)
-      message.info(err.msg || err.message)
-    })
-  }
-
-  const sendOrPublicDynamic = row => {
-    if (row.status === 1) {
-      cancelDynamic(row)
-    } else {
-      sendDynamic(row)
-    }
-  }
-
-  // 取消活动
-  const cancelDynamic = row => {
-    Modal.confirm({
-      title: '活动会在小程序端隐藏，后台可以继续编辑重新发布',
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        request({ ...apis.activity.cancel, urlData: { id: row.dynamicId } }).then(data => {
-          message.info('操作成功！')
-          getList(JSON.parse(localStorage.getItem("activePageParams")))
-
-        }).catch(err => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-      }
-    });
-  }
-
-  // 发布活动
-  const sendDynamic = row => {
-    Modal.confirm({
-      title: '确定发布吗？',
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        request({ ...apis.activity.send, urlData: { id: row.dynamicId } }).then(data => {
-          message.info('操作成功！')
-          getList(JSON.parse(localStorage.getItem("activePageParams")))
-        }).catch(err => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-      }
-    });
-  }
-
-  const changePageNum = pageNumber => {
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        localStorage.setItem("activePageParams", JSON.stringify({ pageNum: pageNumber, pageSize: 10, ...values }));
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        getList({ pageNum: pageNumber, pageSize: 10, ...values })
-      }
-    });
-
-  }
-
-  // 提交事件
-  const handleSubmit = e => {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        console.log('提交数据: ', values)
-        if (time) {
-          values.time = `${moment(time).format('YYYY-MM-DDT00:00:00.000')}Z`
-        } else {
-          values.time = null
-        }
-        localStorage.setItem("activePageParams", (JSON.stringify({ pageNum: 1, pageSize: 10, ...values })));
-        getList({ pageNum: 1, pageSize: 10, ...values })
-      }
-    });
-  }
-
-  // 重置搜索
-  function handleReset() {
-    props.form.resetFields();
-    setTime('')
-    props.form.resetFields();
-    localStorage.setItem("activePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));
-    getList({ pageNum: 1, pageSize: 10 })
-  }
-
-  // 时间回调
-  function timeOnChange(date, dateString) {
-    console.log(date, dateString)
-    setTime(date)
-  }
-
-
-  const { getFieldDecorator } = props.form
-  return (
-
-    <>
-      {/* style={{ display: 'none' }} */}
-      <div id="qrcode"></div>
-      <Form layout="inline" onSubmit={e => handleSubmit(e)}>
-        <Form.Item>
-          {getFieldDecorator('cityId')(
-            <SelectCity />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('buildingId')(
-            <BuildSelect />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('title')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="请输入标题"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('time')(
-            <DatePicker onChange={timeOnChange} />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          <AuthButton name="admin.buildingDynamic.search" noRight={null}>
-            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-              搜索
-            </Button>
-          </AuthButton>
-          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-            重置
-            </Button>
-        </Form.Item>
-      </Form>
-      <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
-        <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
-      </AuthButton>
-      <Table
-        // onRow={record => {
-        //   return {
-        //     onClick: getActivityDetail(record.dynamicId),
-        //   };
-        // }}
-        dataSource={data.list} columns={columns} pagination={false} rowKey="dynamicId" />
-      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current} />
-      </div>
-      <Prompt message={location =>
-        location.pathname.startsWith("/activity/ActivityList")
-          ? true
-          : location.pathname.startsWith("/activity/detailActivity") ? true : localStorage.removeItem("activePageParams")} />
-    </>
-  )
-}
-const WrappedHeader = Form.create({ name: 'header' })(header);
-// ||"/activity/detailActivity"
-export default WrappedHeader

src/pages/activity/detailActivity.jsx → src/pages/activity/SignupActivity/detail.jsx

@@ -1,21 +1,17 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../style/GoodsList.less';
-import apis from '../../services/apis';
+import { Form, Input, Button, Icon, Select, Card, Radio, DatePicker, message, Upload } from 'antd';
+
+import apis from '@/services/apis';
 import moment from 'moment';
 import router from 'umi/router';
-import BuildSelect from '../../components/SelectButton/BuildSelect'
-import XForm, { FieldTypes } from '../../components/XForm';
-import Wangedit from '../../components/Wangedit/Wangedit'
-import request from '../../utils/request'
-import yinhao from '../../assets/yinhao.png'
-import ImageUploader from '../../components/XForm/ImageUpload';
-import logo from '../../assets/logo.svg';
-import touxiang from '../../assets/touxiang.jpg';
-import poster1 from '../../assets/poster1.png';
-import poster2 from '../../assets/poster2.png';
-import xiaochengxu from '../../assets/xiaochengxu.png';
+import BuildSelect from '@/components/SelectButton/BuildSelect'
+import request from '@/utils/request'
+import yinhao from '@/assets/yinhao.png'
+import logo from '@/assets/logo.svg';
+import touxiang from '@/assets/touxiang.jpg';
+import poster1 from '@/assets/poster1.png';
+import poster2 from '@/assets/poster2.png';
+import xiaochengxu from '@/assets/xiaochengxu.png';
 import AuthButton from '@/components/AuthButton';
 import Prompt from 'umi/prompt';
 
@@ -28,9 +24,7 @@ const formItemLayout = {
 };
 
 const cancelPage = () => {
-  router.push({
-    pathname: '/activity/ActivityList',
-  });
+  router.go('-1')
 }
 
 const getSignList = dynamicId => {
@@ -401,7 +395,7 @@ const Edit = props => {
   
 
   return (
-    <div>
+    <Card>
       <div>
         <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
           <Radio.Button value="basic">基本信息</Radio.Button>
@@ -425,11 +419,7 @@ const Edit = props => {
           取消
           </Button>
       </div>
-      <Prompt message={location =>
-        location.pathname.startsWith("/activity/ActivityList")
-          ? true
-          : location.pathname.startsWith("/activity/detailActivity") ? true : localStorage.removeItem("activePageParams")} />
-    </div>
+    </Card>
   );
 }
 

src/pages/activity/SignupActivity/edit/Basic.jsx

@@ -0,0 +1,294 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, DatePicker, message } from 'antd';
+import router from 'umi/router';
+import apis from '@/services/apis';
+import moment from 'moment';
+import BuildSelect from '@/components/SelectButton/BuildSelect2';
+import Wangedit from '@/components/Wangedit/Wangedit';
+import request from '@/utils/request';
+import ImageUploader from '@/components/XForm/ImageUpload';
+
+const { RangePicker } = DatePicker;
+
+const formItemLayout = {
+  labelCol: { span: 6 },
+  wrapperCol: { span: 14 },
+};
+
+const cancelPage = () => {
+  router.go('-1');
+};
+
+const BasicForm = props => {
+  const [isEnlist, setIsEnlist] = useState(1);
+  const [activityStatus, setActivityStatus] = useState(1);
+  const [disable, setDisable] = useState(false);
+  const [data, setData] = useState(1);
+  const [showSignupTime, setShowSignupTime] = useState([]);
+
+  const radioOnChange = e => {
+    setIsEnlist(e.target.value);
+  };
+
+  const { dynamicId } = props;
+
+  // 查询详情
+  const getDynamicData = dynamicId => {
+    request({ ...apis.activity.details, params: { dynamicId } }).then(data => {
+      data.activityTime = [moment(data.startDate), moment(data.endDate)];
+      data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)];
+      // setSignupTime([moment(data.enlistStart), moment(data.enlistEnd)])
+      setData(data);
+      setIsEnlist(data.isEnlist);
+      setActivityStatus(data.activityStatus);
+      setDisable(data.activityStatus === 0);
+      props.form.setFieldsValue(data);
+    });
+  };
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    props.form.setFieldsValue({ isEnlist });
+    if (dynamicId) {
+      getDynamicData(dynamicId);
+    }
+  }, []);
+  const checkTime = () => {
+    function compareDate(dateTime1, dateTime2) {
+      return new Date(dateTime1) > new Date(dateTime2);
+    }
+    // 1）修改后的开始时间不得大于当前时间（会存在已经成功报名的用户）
+
+    // （2）修改后开始时间<当前时间<修改后结束时间：活动进行中
+
+    // （3）修改后结束时间<当前时间：活动已结束
+    if (showSignupTime[0]) {
+      // const date = data.signupTime
+      const nowDate = new Date();
+      // console.log(compareDate(nowDate, showSignupTime[0]))
+      if (compareDate(nowDate, showSignupTime[0])) {
+        return true;
+      } else {
+        return '修改后的开始时间不得大于当前时间（会存在已经成功报名的用户）';
+      }
+    }
+    return true;
+  };
+
+  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) {
+          const checks = checkTime();
+          if (checks != true) {
+            message.info(checks);
+            return;
+          }
+          console.log(data.enlistNum, values.personNum, '143');
+
+          if (data.enlistNum > values.personNum) {
+            message.info('活动人数必须大于已报名人数');
+            return;
+          }
+
+          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.push({
+                pathname: '/activity/editActivity',
+                query: {
+                  dynamicId: data.dynamicId,
+                },
+              });
+              // router.go(-1)
+            })
+            .catch(err => {
+              message.info(err.msg || err.message);
+            });
+        }
+      }
+    });
+  };
+  const changeTime = (value, date) => {
+    // console.log(value, data, '-----checkTime---------')
+    // console.log(props.form.getFieldsValue(), '--------time1-----------')
+    // let datas = data
+    // console.log(value, date, datas)
+    // datas.signupTime = date
+
+    // //   data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
+
+    // console.log(datas,'-------datas--------')
+    //   props.form.setFieldsValue(data)
+    setShowSignupTime(date);
+    // props.form.setFieldsValue(datas)
+    // // form.setFieldsValue
+    // console.log('-------1--------')
+  };
+
+  const { getFieldDecorator } = props.form;
+  return (
+    <>
+      <Form {...formItemLayout} onSubmit={handleSubmit}>
+        <Form.Item label="所属项目">
+          {getFieldDecorator('buildingId', {
+            rules: [
+              {
+                required: true,
+                message: '请选择所属项目',
+              },
+            ],
+          })(<BuildSelect disabled={disable} />)}
+        </Form.Item>
+        <Form.Item
+          label="活动封面图1"
+          help="建议图片尺寸：750px*420px，比例16:9,格式：jpg，用于：首页推荐/活动列表"
+        >
+          {getFieldDecorator('listImgUrl', {
+            rules: [
+              {
+                required: true,
+                message: '请选择活动封面图1',
+              },
+            ],
+          })(<ImageUploader />)}
+        </Form.Item>
+        <Form.Item
+          label="活动封面图2"
+          help="建议图片尺寸：750*250，比例3:1，格式：jpg，用于：项目详情页"
+        >
+          {getFieldDecorator('bannerListImg', {
+            rules: [
+              {
+                required: true,
+                message: '请选择活动封面图2',
+              },
+            ],
+          })(<ImageUploader />)}
+        </Form.Item>
+        <Form.Item
+          label="活动详情主图"
+          help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：普通活动详情"
+        >
+          {getFieldDecorator('imgUrl', {
+            rules: [
+              {
+                required: true,
+                message: '请选择活动详情主图',
+              },
+            ],
+          })(<ImageUploader />)}
+        </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>
+        {/* disabled={activityStatus === 0 ? true : false} */}
+        <Form.Item label="活动人数" help="当前活动最多可报名人数">
+          {getFieldDecorator('personNum', {
+            rules: [
+              {
+                required: true,
+                message: '请输入活动人数',
+              },
+              // {
+              //   min: data.personNum,min={data.personNum || 0}
+              //   message: '活动人数必须大于已报名人数',
+              // },
+            ],
+          })(<Input type="number" />)}
+        </Form.Item>
+        <Form.Item label="用户携带人数" help="每个用户最多可携带参与活动的人数">
+          {getFieldDecorator('maxEnlistByPerson', {
+            rules: [
+              {
+                required: true,
+                message: '请输入用户携带人数',
+              },
+            ],
+          })(<Input type="number" min={1} />)}
+        </Form.Item>
+        <Form.Item label="活动详情">{getFieldDecorator('desc')(<Wangedit />)}</Form.Item>
+        <Form.Item label="报名时间">
+          {getFieldDecorator('signupTime', {
+            rules: [
+              {
+                required: true,
+                message: '请选择报名时间',
+              },
+            ],
+          })(<RangePicker format="YYYY-MM-DD HH:mm" onChange={changeTime} />)}
+        </Form.Item>
+        <Form.Item label="权重">
+          {getFieldDecorator('heavy', {
+            rules: [
+              {
+                required: true,
+                message: '请输入权重',
+              },
+            ],
+          })(<Input type="number" style={{ width: 80 }} />)}
+          <span style={{ marginLeft: 30, color: 'grey' }}>数字越大越靠前</span>
+        </Form.Item>
+        <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
+          <Button type="primary" htmlType="submit">
+            确认
+          </Button>
+          &nbsp;&nbsp;&nbsp;&nbsp;
+          <Button onClick={() => cancelPage()}>取消</Button>
+        </Form.Item>
+      </Form>
+    </>
+  );
+};
+
+export default Form.create({ name: 'BasicForm' })(BasicForm);

src/pages/activity/SignupActivity/edit/Poster.jsx

@@ -0,0 +1,255 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Button, message } from 'antd';
+import router from 'umi/router';
+import apis from '@/services/apis';
+import request from '@/utils/request';
+import yinhao from '@/assets/yinhao.png';
+import ImageUploader from '@/components/XForm/ImageUpload';
+import touxiang from '@/assets/touxiang.jpg';
+import poster1 from '@/assets/poster1.png';
+import xiaochengxu from '@/assets/xiaochengxu.png';
+
+const { TextArea } = Input;
+
+const cancelPage = () => {
+  router.go('-1');
+};
+
+const Poster = props => {
+  const { dynamicId } = props;
+  const [inputValue, changeInput] = useState('');
+  const [textAreaValue, changeTextArea] = useState('');
+  const [imgValue, changeImg] = useState('');
+  const [posterId, setPosterId] = useState('');
+
+  useEffect(() => {
+    if (dynamicId) {
+      request({ ...apis.activity.poster, params: { targetId: dynamicId, targetType: 'activity' } })
+        .then(data => {
+          if (data.length > 0) {
+            setPosterId(data[0].posterId);
+            changeImg(data[0].posterImg);
+            changeTextArea(data[0].posterDescription);
+            changeInput(data[0].posterTitle);
+          }
+        })
+        .catch(err => {
+          message.info(err.msg || err.message);
+        });
+    }
+    // getMiniappName()
+  }, []);
+
+  // 获取小程序名称
+  // const [miniappName, setMiniappName] = useState('')
+  // function getMiniappName() {
+  //   request({ ...apis.building.getMiniappName }).then(res => {
+  //     console.log(res, "0000000000000")
+  //     setMiniappName(res)
+  //   })
+  // }
+
+  const submitPoster = () => {
+    if (dynamicId) {
+      if (posterId) {
+        request({
+          ...apis.activity.updatePoster,
+          urlData: { id: posterId },
+          data: {
+            targetId: dynamicId,
+            targetType: 'activity',
+            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: dynamicId,
+            targetType: 'activity',
+            posterImg: imgValue,
+            posterTitle: inputValue,
+            posterDescription: textAreaValue,
+          },
+        })
+          .then(data => {
+            setPosterId(data.posterId);
+            message.info('保存成功');
+          })
+          .catch(err => {
+            message.info(err.msg || err.message);
+          });
+      }
+    } else {
+      message.warn('请先保存基本信息数据');
+    }
+  };
+
+  return (
+    <div>
+      <div style={{ display: 'flex' }}>
+        <div
+          style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}
+        >
+          <div
+            style={{
+              width: '375px',
+              height: '700px',
+              backgroundColor: '#fff',
+              boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)',
+              position: 'relative',
+              margin: '0 auto',
+            }}
+          >
+            <img style={{ width: '100%', height: '300px' }} src={imgValue || poster1} alt="" />
+            <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
+              <img
+                style={{
+                  width: '70px',
+                  height: '70px',
+                  border: '4px solid #fff',
+                  borderRadius: '35px',
+                  marginLeft: '16px',
+                }}
+                src={touxiang}
+                alt=""
+              />
+              <span
+                style={{
+                  color: '#222',
+                  fontWeight: '600',
+                  margin: '24px 10px 0 14px',
+                  fontSize: '17px',
+                }}
+              >
+                喵喵
+              </span>
+              <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您参与</span>
+              <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',
+                WebkitLineClamp: '2',
+                WebkitBoxOrient: 'vertical',
+                overflow: 'hidden',
+                textOverflow: 'ellipsis',
+              }}
+            >
+              {inputValue || '海报标题'}
+            </p>
+
+            <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',
+                WebkitLineClamp: '3',
+                WebkitBoxOrient: 'vertical',
+                overflow: 'hidden',
+                textOverflow: 'ellipsis',
+              }}
+            >
+              {textAreaValue || '海报描述'}
+            </p>
+            <div
+              style={{
+                backgroundColor: '#f1f1f1',
+                padding: '22px 30px',
+                boxShadow: '0px 6px 12px -4px #dcdcdc',
+                position: 'relative',
+              }}
+            >
+              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>长按识别小程序码</p>
+              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>进入活动查看详情</p>
+              <img
+                style={{ width: '80px', position: 'absolute', right: '30px', top: '10px' }}
+                src={xiaochengxu}
+                alt=""
+              />
+            </div>
+          </div>
+          <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>
+            海报模板
+          </p>
+        </div>
+
+        <div>
+          <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+            <p
+              style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}
+            >
+              活动海报图
+            </p>
+            <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+          </div>
+          <p
+            style={{
+              fontSize: '0.5vw',
+              color: '#A9A9A9',
+              marginLeft: '230px',
+              marginBottom: '30px',
+            }}
+          >
+            建议图片尺寸：640*670px，比例64:67,格式：jpg，用于普通活动海报
+          </p>
+          <div
+            style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}
+          >
+            <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' }}
+            >
+              海报描述
+            </p>
+            <TextArea
+              rows={5}
+              maxLength={1024}
+              value={textAreaValue}
+              onChange={e => changeTextArea(e.target.value)}
+            />
+          </div>
+        </div>
+      </div>
+      <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}>
+        {' '}
+        确定
+      </Button>
+      <Button onClick={() => cancelPage()}>取消</Button>
+    </div>
+  );
+};
+
+export default Poster;

src/pages/activity/SignupActivity/edit/Share.jsx

@@ -0,0 +1,150 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Card } from 'antd';
+
+import router from 'umi/router';
+import apis from '@/services/apis';
+import moment from 'moment';
+import BuildSelect from '@/components/SelectButton/BuildSelect2';
+import Wangedit from '@/components/Wangedit/Wangedit';
+import request from '@/utils/request';
+import yinhao from '@/assets/yinhao.png';
+import ImageUploader from '@/components/XForm/ImageUpload';
+import logo from '@/assets/logo.png';
+import touxiang from '@/assets/touxiang.jpg';
+import poster1 from '@/assets/poster1.png';
+import poster2 from '@/assets/poster2.png';
+import xiaochengxu from '@/assets/xiaochengxu.png';
+
+const { TextArea } = Input;
+
+const cancelPage = () => {
+  router.go('-1');
+};
+
+const Share = props => {
+  const { dynamicId } = props;
+  const [inputValue, changeInput] = useState('');
+  const [imgValue, changeImg] = useState('');
+  const [shareContentId, setShareContentId] = useState('');
+
+  useEffect(() => {
+    if (dynamicId) {
+      request({
+        ...apis.activity.shareContent,
+        params: { targetId: dynamicId, targetType: 'activity' },
+      })
+        .then(data => {
+          if (data.length > 0) {
+            setShareContentId(data[0].shareContentId);
+            changeImg(data[0].shareContentImg);
+            changeInput(data[0].shareContentTitle);
+          }
+        })
+        .catch(err => {
+          message.info(err.msg || err.message);
+        });
+    }
+  }, [dynamicId]);
+
+  const submitShare = () => {
+    if (dynamicId) {
+      if (shareContentId) {
+        request({
+          ...apis.activity.updateShareContent,
+          urlData: { id: shareContentId },
+          data: {
+            targetId: dynamicId,
+            shareContentType: 'activity',
+            shareContentImg: imgValue,
+            shareContentTitle: inputValue,
+          },
+        })
+          .then(data => {
+            message.info('保存成功');
+          })
+          .catch(err => {
+            message.info(err.msg || err.message);
+          });
+      } else {
+        request({
+          ...apis.activity.addShareContent,
+          data: {
+            targetId: dynamicId,
+            shareContentType: 'activity',
+            shareContentImg: imgValue,
+            shareContentTitle: inputValue,
+          },
+        })
+          .then(data => {
+            setShareContentId(data.shareContentId);
+            message.info('保存成功');
+          })
+          .catch(err => {
+            message.info(err.msg || err.message);
+          });
+      }
+    } else {
+      message.warn('请先保存基本信息数据');
+    }
+  };
+
+  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' }}>
+          分享模板
+        </p>
+        <div>
+          <p
+            style={{
+              display: 'flex',
+              alignItems: 'center',
+              fontSize: '14px',
+              color: '#999',
+              margin: '0',
+              lineHeight: '0',
+            }}
+          >
+            <img src={logo} style={{ width: '22px', marginRight: '10px' }} alt="" />
+            橙蕉互动
+          </p>
+          <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>
+            {inputValue || '置业V客厅 精准获客平台'}
+          </p>
+          <img style={{ width: '200px', height: '160px' }} src={imgValue || poster2} alt="" />
+        </div>
+      </div>
+      <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+        <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' }}>
+          活动分享图
+        </p>
+        <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+      </div>
+      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>
+        建议图片尺寸：750*600px，比例5:4,格式：jpg，用于活动分享好友
+      </p>
+      <Button
+        type="primary"
+        htmlType="submit"
+        onClick={submitShare}
+        style={{ margin: '40px 40px 40px 220px' }}
+      >
+        {' '}
+        确定
+      </Button>
+      <Button onClick={() => cancelPage()}>取消</Button>
+    </div>
+  );
+};
+
+export default Share;

src/pages/activity/editActivity.jsx → src/pages/activity/SignupActivity/edit/ind.jsx

@@ -1,22 +1,19 @@
 import React, { useState, useEffect } from 'react';
 import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import Prompt from 'umi/prompt';
+
 import router from 'umi/router';
-import styles from '../style/GoodsList.less';
-import apis from '../../services/apis';
+import apis from '@/services/apis';
 import moment from 'moment';
-import BuildSelect from '../../components/SelectButton/BuildSelect2'
-import XForm, { FieldTypes } from '../../components/XForm';
-import Wangedit from '../../components/Wangedit/Wangedit'
-import request from '../../utils/request'
-import yinhao from '../../assets/yinhao.png'
-import ImageUploader from '../../components/XForm/ImageUpload';
-import logo from '../../assets/logo.svg';
-import touxiang from '../../assets/touxiang.jpg';
-import poster1 from '../../assets/poster1.png';
-import poster2 from '../../assets/poster2.png';
-import xiaochengxu from '../../assets/xiaochengxu.png'
+import BuildSelect from '@/components/SelectButton/BuildSelect2'
+import Wangedit from '@/components/Wangedit/Wangedit'
+import request from '@/utils/request'
+import yinhao from '@/assets/yinhao.png'
+import ImageUploader from '@/components/XForm/ImageUpload';
+import logo from '@/assets/logo.svg';
+import touxiang from '@/assets/touxiang.jpg';
+import poster1 from '@/assets/poster1.png';
+import poster2 from '@/assets/poster2.png';
+import xiaochengxu from '@/assets/xiaochengxu.png'
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const { TextArea } = Input;
@@ -519,10 +516,7 @@ const Edit = props => {
         {tab === 'poster' && <Poster dynamicId={dynamicId}/>}
         {tab === 'share' && <Share dynamicId={dynamicId}/>}
       </div>
-      <Prompt message={location =>
-        (location.pathname.startsWith('/activity/ActivityList')
-          ? true
-          : (location.pathname.startsWith("/activity/detailActivity") ? true : localStorage.removeItem("activePageParams")))} />
+    
     </div>
   );
 }

src/pages/activity/SignupActivity/edit/index.jsx

@@ -0,0 +1,34 @@
+import React, { useState } from 'react';
+import { Radio, Card } from 'antd';
+import Basic from './Basic';
+import Poster from './Poster';
+import Share from './Share';
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  const [tab, changeTab] = useState('basic');
+  const { dynamicId } = props.location.query;
+
+  return (
+    <Card>
+      <div>
+        <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
+          <Radio.Button value="basic">基本信息</Radio.Button>
+          <Radio.Button value="poster">海报图片</Radio.Button>
+          <Radio.Button value="share">分享设置</Radio.Button>
+        </Radio.Group>
+      </div>
+      <div>
+        {tab === 'basic' && <Basic dynamicId={dynamicId} />}
+        {tab === 'poster' && <Poster dynamicId={dynamicId} />}
+        {tab === 'share' && <Share dynamicId={dynamicId} />}
+      </div>
+    </Card>
+  );
+};
+
+export default Edit;

src/pages/activity/SignupActivity/index.jsx

@@ -0,0 +1,331 @@
+import React, { useState, useEffect, useRef } from 'react';
+import {
+  Form,
+  Input,
+  Button,
+  Icon,
+  Typography,
+  message,
+  Table,
+  Pagination,
+  Modal,
+  DatePicker,
+  Card,
+} from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import Navigate from '@/components/Navigate';
+import SelectCity from '@/components/SelectButton/CitySelect';
+import BuildSelect from '@/components/SelectButton/BuildSelect';
+import apis from '@/services/apis';
+import request from '@/utils/request';
+import QueryTable from '@/components/QueryTable';
+
+const SignupActivity = props => {
+  const ref = useRef();
+
+  const searchFields = [
+    {
+      name: 'cityId',
+      label: '城市',
+      placeholder: '请选择城市',
+      render: () => <SelectCity style={{ width: 160 }} />,
+    },
+    {
+      name: 'buildingId',
+      label: '项目',
+      placeholder: '请选择项目',
+      render: () => <BuildSelect style={{ width: 160 }} />,
+    },
+
+    {
+      name: 'title',
+      label: '标题',
+      placeholder: '请输入标题',
+    },
+    {
+      name: 'time',
+      label: '时间',
+      placeholder: '请选择时间',
+      type: 'datepicker',
+    },
+  ];
+
+  const toSignupActivityDetail = dynamicId => () => {
+    router.push({
+      pathname: '/activity/SignupActivity/detail',
+      query: {
+        dynamicId,
+      },
+    });
+  };
+
+  // 跳转到编辑
+  const toSignupActivityEdit = dynamicId => {
+    router.push({
+      pathname: '/activity/SignupActivity/edit',
+      query: {
+        dynamicId,
+      },
+    });
+  };
+
+  //   置顶
+  const topDynamic = row => () => {
+    const weight = Math.abs(row.weight - 1);
+    request({ ...apis.activity.weight, params: { dynamicId: row.dynamicId, weight } })
+      .then(data => {
+        message.info('操作成功！');
+        ref.current.reload();
+      })
+      .catch(err => {
+        console.log(err);
+        message.info(err.msg || err.message);
+      });
+  };
+
+  //   推首页
+  const homeDynamic = row => () => {
+    const home = Math.abs(row.home - 1);
+    request({ ...apis.activity.home, params: { dynamicId: row.dynamicId, home } })
+      .then(data => {
+        message.info('操作成功！');
+        ref.current.reload();
+      })
+      .catch(err => {
+        console.log(err);
+        message.info(err.msg || err.message);
+      });
+  };
+
+  //结束活动
+  const finishDynamic = row => {
+    Modal.confirm({
+      title:
+        '活动会被强制结束，小程序端无法再发起或参与此活动，如果不想让客户看到活动，请再点击取消发布按钮',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.activity.finish, data: { dynamicId: row.dynamicId, top: '' } })
+          .then(data => {
+            message.info('操作成功！');
+            ref.current.reload();
+          })
+          .catch(err => {
+            console.log(err);
+            message.info(err.msg || err.message);
+          });
+      },
+    });
+  };
+
+  // 发布活动
+  const sendDynamic = row => {
+    Modal.confirm({
+      title: '确定发布吗？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.activity.send, urlData: { id: row.dynamicId } })
+          .then(data => {
+            message.info('操作成功！');
+            ref.current.reload();
+          })
+          .catch(err => {
+            console.log(err);
+            message.info(err.msg || err.message);
+          });
+      },
+    });
+  };
+
+  // 取消活动
+  const cancelDynamic = row => {
+    Modal.confirm({
+      title: '活动会在小程序端隐藏，后台可以继续编辑重新发布',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.activity.cancel, urlData: { id: row.dynamicId } })
+          .then(data => {
+            message.info('操作成功！');
+            ref.current.reload();
+          })
+          .catch(err => {
+            console.log(err);
+            message.info(err.msg || err.message);
+          });
+      },
+    });
+  };
+
+  //   发布or取消发布
+  const sendOrPublicDynamic = row => {
+    if (row.status === 1) {
+      cancelDynamic(row);
+    } else {
+      sendDynamic(row);
+    }
+  };
+
+  const getJoinPeople = dynamicId => () => {
+    router.push({
+      pathname: '/activity/SignupActivity/registrationRecord',
+      query: {
+        dynamicId,
+      },
+    });
+  };
+
+  const columns = [
+    {
+      title: '活动标题',
+      dataIndex: 'title',
+      key: 'title',
+      align: 'center',
+      width: '20%',
+      render: (x, row) => (
+        <Navigate onClick={toSignupActivityDetail(row.dynamicId)}>
+          <Typography.Text ellipsis>{row.title}</Typography.Text>
+        </Navigate>
+      ),
+    },
+    {
+      title: '活动时间',
+      dataIndex: 'startDate',
+      key: 'startDate',
+      align: 'center',
+      width: '15%',
+      // width: '20%',
+      render: (x, row) => (
+        <>
+          <span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format(
+            'YYYY-MM-DD',
+          )}`}</span>
+        </>
+      ),
+    },
+    {
+      title: '已参与人数',
+      dataIndex: 'count',
+      key: 'count',
+      align: 'center',
+      render: (x, row) => <Navigate onClick={getJoinPeople(row.dynamicId)}>{row.count}</Navigate>,
+    },
+    // {
+    //   title: '阅读量',
+    //   dataIndex: 'pvNum',
+    //   key: 'pvNum',
+    //   align: 'center',
+    //   // width: '10%',
+    // },
+    // {
+    //   title: '转发量',
+    //   dataIndex: 'shareNum',
+    //   key: 'shareNum',
+    //   align: 'center',
+    //   // width: '10%',
+    // },
+    // {
+    //   title: '收藏数',
+    //   dataIndex: 'saveNum',
+    //   key: 'saveNum',
+    //   align: 'center',
+    //   // width: '10%',
+    // },
+    {
+      title: '报名状态',
+      dataIndex: 'activityStatus',
+      key: 'activityStatus',
+      align: 'center',
+      render: activityStatus =>
+        activityStatus == 0 ? '进行中' : activityStatus == 1 ? '未开始' : '已结束',
+    },
+    {
+      title: '权重',
+      dataIndex: 'heavy',
+      key: 'heavy',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: withActions((x, row) => [
+        <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
+          <EditIcon
+            type={row.status === 1 ? 'cancel' : 'publish'}
+            text={row.status === 1 ? '取消发布' : '发布'}
+            onClick={() => sendOrPublicDynamic(row)}
+          />
+        </AuthButton>,
+
+        // //   <EditIcon type="look" text="查看详情" onClick={toSignupActivityDetail(row.dynamicId)} />,
+
+        row.activityStatus === 0 ? (
+          <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
+            <EditIcon type="end" text="结束活动" onClick={finishDynamic.bind(this, row)} />
+          </AuthButton>
+        ) : null,
+
+        <AuthButton name="admin.buildingDynamic.tag" noRight={null}>
+          <EditIcon
+            type={row.weight === 1 ? 'cancel' : 'add'}
+            text={row.weight === 1 ? '取消标签' : '添加标签'}
+            onClick={topDynamic(row)}
+          />
+        </AuthButton>,
+
+        <EditIcon
+          type={row.home === 1 ? 'cancel' : 'top'}
+          text={row.home === 1 ? '取消推首页' : '推荐首页'}
+          onClick={homeDynamic(row)}
+        />,
+
+        //   <AuthButton name="admin.buildingDynamic.dataRecord" noRight={null}>
+        //     <EditIcon type="record" text="数据记录" onClick={toDataReacord(row.dynamicId)} />
+        //   </AuthButton>,
+
+        row.activityStatus === 0 || row.activityStatus === 1 ? (
+          <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
+            <EditIcon
+              type="edit"
+              text="编辑"
+              onClick={() => toSignupActivityEdit(row.dynamicId, row.count)}
+            />
+          </AuthButton>
+        ) : null,
+      ]),
+    },
+  ];
+
+  const actionRender = () => {
+    return (
+      <Button type="primary" icon="plus" onClick={() => toSignupActivityEdit()}>
+        新增
+      </Button>
+    );
+  };
+
+  return (
+    <QueryTable
+      ref={ref}
+      rowKey="dynamicId"
+      api={apis.activity.list}
+      searchFields={searchFields}
+      columns={columns}
+      postData={data => {
+        data.time && (data.time = `${moment(data.time).format('YYYY-MM-DDT00:00:00.000')}Z`);
+        return data;
+      }}
+      actionRender={actionRender}
+      // onPageChange={(pg) => setPage(pg)}
+    />
+  );
+};
+
+export default SignupActivity;

src/pages/activity/SignList.jsx → src/pages/activity/SignupActivity/registrationRecord.jsx

@@ -1,14 +1,12 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../style/GoodsList.less';
+import { Form, Input, Button, Icon, Select, Table, Card } from 'antd';
+
 import router from 'umi/router';
 import moment from 'moment';
-import apis from '../../services/apis';
-import request from '../../utils/request'
+import apis from '@/services/apis';
+import request from '@/utils/request';
 
 const { Option } = Select;
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 /**
  *
@@ -41,10 +39,14 @@ const columns = [
     dataIndex: 'createDate',
     key: 'createDate',
     align: 'center',
-    render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD')}`}</span></>,
+    render: (x, row) => (
+      <>
+        <span>{`${moment(row.createDate).format('YYYY-MM-DD')}`}</span>
+      </>
+    ),
   },
   {
-    title: '引流人',
+    title: '推广人员',
     dataIndex: 'sharePersonName',
     key: 'sharePersonName',
     align: 'center',
@@ -60,77 +62,90 @@ const columns = [
     dataIndex: 'isCheckin',
     key: 'isCheckin',
     align: 'center',
-    render: (x, row) => <><span>{row.isCheckin === 1 ? '已签到' : '未签到'}</span></>,
+    render: (x, row) => (
+      <>
+        <span>{row.isCheckin === 1 ? '已签到' : '未签到'}</span>
+      </>
+    ),
   },
 ];
 
-
-
 const header = props => {
-  const [data, setData] = useState({ list: {} })
+  const [data, setData] = useState({ list: {} });
+  const [loading, setLoading] = useState(false);
+  
   //   const [page, changePage] = useState({})
   // 存入导入数据的值
-  const { getFieldDecorator, getFieldsValue } = props.form
+  const { getFieldDecorator, getFieldsValue } = props.form;
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     // eslint-disable-next-line no-use-before-define
     getSignList({ pageNum: 1, pageSize: 10, dynamicId: props.location.query.dynamicId });
-  }, [])
+  }, []);
 
   // 查询列表
   const getSignList = params => {
     // eslint-disable-next-line no-shadow
+    setLoading(true)
     request({ ...apis.activity.signList, params: { ...params } }).then(data => {
-      console.log(data)
-      setData(data)
-    })
-  }
+     
+      setData(data);
+      setLoading(false)
+    });
+  };
 
-  const changePageNum = (pageNumber) => {
-    getSignList({ pageNum: pageNumber, pageSize: 10, dynamicId: props.location.query.dynamicId })
-  }
+  const changePageNum = pageNumber => {
+    getSignList({ pageNum: pageNumber, pageSize: 10, dynamicId: props.location.query.dynamicId });
+  };
 
   const toActivityList = () => {
-    router.push({
-      pathname: '/activity/ActivityList',
-    });
-  }
+    router.go('-1')
+  };
   // 提交事件
   // eslint-disable-next-line no-shadow
   const handleSubmit = (e, props) => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
-      getSignList({ pageNum: 1, pageSize: 10, dynamicId: props.location.query.dynamicId, isCheckin: values.isCheckin, name: values.name, phone: values.phone })
+      getSignList({
+        pageNum: 1,
+        pageSize: 10,
+        dynamicId: props.location.query.dynamicId,
+        isCheckin: values.isCheckin,
+        name: values.name,
+        phone: values.phone,
+      });
     });
-  }
+  };
   // 重置搜索
   function handleReset() {
     props.form.resetFields();
-    getSignList({ pageNum: 1, pageSize: 10, dynamicId: props.location.query.dynamicId })
+    getSignList({ pageNum: 1, pageSize: 10, dynamicId: props.location.query.dynamicId });
   }
   // eslint-disable-next-line class-methods-use-this
   function exportHelp() {
-    const fieldsValue = getFieldsValue()
-    console.log('fieldsValue', fieldsValue)
-    request({ ...apis.activity.getTaActivityDynamicEnlistExport, params: { ...fieldsValue, dynamicId: props.location.query.dynamicId } })
+    const fieldsValue = getFieldsValue();
+    console.log('fieldsValue', fieldsValue);
+    request({
+      ...apis.activity.getTaActivityDynamicEnlistExport,
+      params: { ...fieldsValue, dynamicId: props.location.query.dynamicId },
+    })
       .then(data => {
         if (!data) {
-          return
+          return;
         }
-        const url = window.URL.createObjectURL(new Blob([data]))
-        const link = document.createElement('a')
-        link.style.display = 'none'
-        link.href = url
-        link.setAttribute('download', '报名列表.xlsx')
-        document.body.append(link)
-        link.click()
-      }).catch(() => {
-
+        const url = window.URL.createObjectURL(new Blob([data]));
+        const link = document.createElement('a');
+        link.style.display = 'none';
+        link.href = url;
+        link.setAttribute('download', '报名列表.xlsx');
+        document.body.append(link);
+        link.click();
       })
+      .catch(() => {});
   }
 
   return (
-    <>
+    <Card>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
           {getFieldDecorator('isCheckin')(
@@ -157,24 +172,42 @@ const header = props => {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+          <Button type="primary" htmlType="submit">
             搜索
           </Button>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
-            </Button>
+          </Button>
         </Form.Item>
-        <Button style={{ position: 'absolute', right: '30px' }} onClick={toActivityList}>返回</Button>
+        <Button style={{ position: 'absolute', right: '30px' }} onClick={toActivityList}>
+          返回
+        </Button>
       </Form>
 
-     <div style={{textAlign:'right',margin:'6px 0 10px 0'}}> <Button name="admin.activityDynamicEnlist.export.get" noRight={null} type="primary" onClick={exportHelp}>导出</Button></div>
-      <Table dataSource={data.list.data} columns={columns} pagination={{ total: data.total, onChange: changePageNum }} rowKey="activity" />
+      <div style={{ textAlign: 'right', margin: '6px 0 10px 0' }}>
+        {' '}
+        <Button
+          name="admin.activityDynamicEnlist.export.get"
+          noRight={null}
+          type="primary"
+          onClick={exportHelp}
+        >
+          导出
+        </Button>
+      </div>
+      <Table
+        dataSource={data.list.data}
+        columns={columns}
+        pagination={{ total: data.total, onChange: changePageNum }}
+        loading={loading}
+        rowKey="activity"
+      />
       {/* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div> */}
-    </>
-  )
-}
+    </Card>
+  );
+};
 const WrappedHeader = Form.create({ name: 'header' })(header);
 
-export default WrappedHeader
+export default WrappedHeader;

src/pages/activity/activityRecord.jsx

@@ -1,16 +0,0 @@
-import React from 'react';
-import DataRecord from './dataRecord/index'
-import Prompt from 'umi/prompt';
-
-const header = props =>{
-    const id = props.location.query.id
-    // type:'activity',
-    return <><DataRecord id = {id} activeType = "activity"/>
-    <Prompt message={location =>
-        location.pathname.startsWith("/activity/ActivityList")
-          ? true
-          : location.pathname.startsWith("/activity/detailActivity") ? true : localStorage.removeItem("activePageParams")} />
-          </>
-}
-
-export default header

src/pages/activity/dataRecord/index.jsx

@@ -1,122 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Input, Menu, Dropdown, Button, Icon, Modal, message, Table, Divider, Tabs, Tag, Select, Pagination } from 'antd';
-import router from 'umi/router';
-import apis from '../../../services/apis';
-import request from '../../../utils/request';
-import Visitors from './table/visitors'
-import VisitNum from './table/visitNum'
-import Newuser from './table/newuser'
-import Shares from './table/shares'
-import ShareNum from './table/shareNum'
-import moment from 'moment';
-
-const { TabPane } = Tabs;
-
-
-
-const DataRecord = props => {
-
-    const [tab, setTab] = useState('1')
-    const [data, setData] = useState({})
-
-    const id = props.id
-    const type = props.activeType
-
-
-    useEffect(() => {
-
-        getData({ id: id, type: type })
-
-    }, [])
-
-    const getData = (params) => {
-
-        request({ ...apis.activityDataStatis.getStatisticData, params: { ...params, } }).then((data) => {
-            console.log(data)
-            setData(data || {})
-        })
-    }
-
-    function tabsCallback(e) {
-
-        setTab(e)
-    }
-
-    return <>
-        <div>
-            <div>
-                <span>{data.activityName || '0'}</span>
-                <Button style={{ float: 'right', zIndex: 1 }} onClick={() => router.go(-1)}>
-                    返回
-               </Button>
-            </div>
-            <div>
-
-                <div style={{ display: 'flex', marginBottom: '33px', marginTop: '20px' }}>
-                    <div style={{
-                        textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(241,43,62,1) 0%,rgba(254,144,155,1) 100%)', height: '100px',
-                        borderRadius: '12px', width: '32%', marginRight: '15px'
-                    }}>
-                        <span style={{ fontSize: '20px', color: '#fff' }}>访问总人数 </span>
-                        <span style={{ fontSize: '46px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.visitPersons || '0'}</span>
-                    </div>
-                    <div style={{
-                        textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
-                        borderRadius: '12px', width: '32%', marginRight: '15px'
-                    }}>
-                        <span style={{ fontSize: '20px', color: '#fff' }}>访问总次数 </span>
-                        <span style={{ fontSize: '46px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.visitNum || '0'}</span>
-                    </div>
-                    <div style={{
-                        textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(137deg,rgba(107,130,230,1) 0%,rgba(152,175,251,1) 100%)', height: '100px',
-                        borderRadius: '12px', width: '32%', marginRight: '15px'
-                    }}>
-                        <span style={{ fontSize: '20px', color: '#fff' }}>新增注册用户 </span>
-                        <span style={{ fontSize: '46px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.newPersons || '0'}</span>
-                    </div>
-                    <div style={{
-                        textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(137deg,rgba(150,83,215,1) 0%,rgba(208,160,255,1) 100%)', height: '100px',
-                        borderRadius: '12px', width: '32%', marginRight: '15px'
-                    }}>
-                        <span style={{ fontSize: '20px', color: '#fff' }}>分享总人数 </span>
-                        <span style={{ fontSize: '46px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.sharePersons || '0'}</span>
-                    </div>
-                    <div style={{
-                        textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(0,175,141,1) 0%,rgba(115,231,209,1) 100%)', height: '100px',
-                        borderRadius: '12px', width: '32%'
-                    }}>
-                        <span style={{ fontSize: '20px', color: '#fff' }}>分享总次数 </span>
-                        <span style={{ fontSize: '46px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.shareNum || '0'}</span>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-        <div>
-            <Tabs type="card" value={tab} buttonStyle="solid" onChange={e => tabsCallback(e)}>
-                <TabPane tab="访问人数" key="1" ></TabPane>
-                <TabPane tab="访问次数" key="2" ></TabPane>
-                <TabPane tab="新增注册用户" key="3" ></TabPane>
-                <TabPane tab="分享人数" key="4" ></TabPane>
-                <TabPane tab="分享次数" key="5" ></TabPane>
-            </Tabs>
-            <div style={{ marginTop: '20px' }}>
-                {/* 访问人数 */}
-                {(tab === '1' && < Visitors id={id} type={type} getData={() => getData({ id: id, type: type })} />)}
-                {/* 访问次数 */}
-                {(tab === '2' && <VisitNum id={id} type={type} getData={() => getData({ id: id, type: type })} />)}
-                {/* 新增注册用户 */}
-                {(tab === '3' && <Newuser id={id} type={type} getData={() => getData({ id: id, type: type })} />)}
-                {/* 分享人数 */}
-                {(tab === '4' && <Shares id={id} type={type} getData={() => getData({ id: id, type: type })} />)}
-                {/* 分享次数 */}
-                {(tab === '5' && <ShareNum id={id} type={type} getData={() => getData({ id: id, type: type })} />)}
-
-                {/* { (tab === 'desc' && <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft:'30px'}} />)} */}
-
-            </div>
-        </div>
-    </>
-}
-
-export default DataRecord

src/pages/activity/dataRecord/table/newuser.jsx

@@ -1,170 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
-import router from 'umi/router';
-import apis from '../../../../services/apis';
-import request from '../../../../utils/request';
-import AuthButton from '../../../../components/AuthButton';
-import WxDictSelect from '@/components/SelectButton/WxDictSelect';
-import moment from 'moment';
-
-const date = {
-  startDate: moment().year(1000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z',
-  endDate: moment().year(3000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z'
-}
-
-const header = props => {
-  const [showHelp, setShowHelp] = useState(false)
-  const [data, setData] = useState({})
-  const activityId = props.id
-  const activityType = props.type
-
-  useEffect(() => {
-    console.log(activityId, activityType)
-    getList({ pageNum: 1, pageSize: 10 })
-
-  }, [])
-
-  const getList = params => {
-    console.log(params)
-    request({ ...apis.activityDataStatis.activityAddRegist, params: { ...params, activityId: activityId, activityType: activityType, ...date } }).then(data => {
-      console.log(data)
-      props.getData()
-      setData(data)
-    }).catch(e => {
-      console.log(e)
-    })
-  }
-
-  const columns = [
-    {
-      title: '姓名',
-      dataIndex: 'nickName',
-      key: 'nickName',
-    },
-    {
-      title: '电话',
-      dataIndex: 'phone',
-      key: 'phone',
-    },
-    {
-      title: '性别',
-      dataIndex: 'gender',
-      key: 'gender',
-    },
-    {
-      title: '归属地',
-      dataIndex: 'province',
-      key: 'province',
-    },
-    {
-      title: '来源渠道',
-      dataIndex: 'personFrom',
-      key: 'personFrom',
-    },
-    {
-      title: '置业顾问',
-      dataIndex: 'realtyConsultant',
-      key: 'realtyConsultant',
-    },
-    {
-      title: '置业顾问电话',
-      dataIndex: 'realtyConsultantPhone',
-      key: 'realtyConsultantPhone',
-    },
-    {
-      title: '分享者',
-      dataIndex: 'sharePersonName',
-      key: 'sharePersonName',
-    },
-    {
-      title: '分享者电话',
-      dataIndex: 'sharePersonPhone',
-      key: 'sharePersonPhone',
-    },
-  ]
-
-  function handleReset() {
-    props.form.resetFields();
-    getList({ pageNum: 1, pageSize: 10 })
-  }
-
-  const changePageNum = pageNumber => {
-    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
-  }
-
-  const handleSubmit = e => {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        console.log('提交数据: ', values)
-
-        getList({ pageNum: 1, pageSize: 10, ...values })
-      }
-    });
-  }
-
-  const exportActivityStats = () => {
-
-    request({ ...apis.activityDataStatis.activityAddRegistNumExport, params: { activityId: activityId, activityType: activityType, ...props.form.getFieldsValue(), ...date } }).then(data => {
-      if (!data) {
-        return
-      }
-      const url = window.URL.createObjectURL(new Blob([data]))
-      const link = document.createElement('a')
-      link.style.display = 'none'
-      link.href = url
-      link.setAttribute('download', '访问统计.xlsx')
-      document.body.append(link)
-      link.click()
-    }).catch()
-  }
-
-  const { getFieldDecorator } = props.form
-  return <>
-    <div>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex', alignItems: 'center' }}>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          {getFieldDecorator('personFrom')(
-            <WxDictSelect />,
-          )}
-        </Form.Item>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          {getFieldDecorator('province')(<Input placeholder="请输入归属地" />)}
-        </Form.Item>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}> 搜索</Button>
-          <Button onClick={handleReset} style={{ marginLeft: '30px' }}>重置</Button>
-          <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
-          <Modal
-            title="指标说明（数据会存在一定时间延迟）"
-            centered
-            visible={showHelp}
-            footer={null}
-            onCancel={() => setShowHelp(false)}
-          >
-            <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享人数：</p>
-            <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>分享小程序活动的总人数</p>
-            <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享次数：</p>
-            <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>触发小程序活动分享的总次数</p>
-            <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>新增注册用户：</p>
-            <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过当前活动授权手机号的总人数</p>
-            <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问人数：</p>
-            <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总人数</p>
-            <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问次数：</p>
-            <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总次数</p>
-          </Modal>
-        </Form.Item>
-      </Form>
-      <div>
-        <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats}>导出</Button>
-      </div>
-      <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
-      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
-      </div>
-    </div>
-  </>
-}
-
-const WrappedTypeForm = Form.create()(header);
-export default WrappedTypeForm

src/pages/activity/dataRecord/table/shareNum.jsx

@@ -1,170 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
-import router from 'umi/router';
-import apis from '../../../../services/apis';
-import request from '../../../../utils/request';
-import AuthButton from '../../../../components/AuthButton';
-import WxDictSelect from '@/components/SelectButton/WxDictSelect';
-import moment from 'moment';
-
-
-const date = {
-  startDate: moment().year(1000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z',
-  endDate: moment().year(3000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z'
-}
-
-const header = props => {
-
-  const [data, setData] = useState({})
-  const [showHelp, setShowHelp] = useState(false)
-  const activityId = props.id
-  const activityType = props.type
-
-  useEffect(() => {
-    console.log(activityId, activityType)
-    getList({ pageNum: 1, pageSize: 10 })
-
-  }, [])
-
-  const getList = params => {
-    console.log(params)
-    request({ ...apis.activityDataStatis.activityShareNum, params: { ...params, activityId: activityId, activityType: activityType, ...date } }).then(data => {
-      console.log(data)
-      props.getData()
-      setData(data)
-    }).catch(e => {
-      console.log(e)
-    })
-  }
-
-  const columns = [
-    {
-      title: '分享者姓名',
-      dataIndex: 'sharePersonName',
-      key: 'sharePersonName',
-    },
-    {
-      title: '分享者类型',
-      dataIndex: 'shareType',
-      key: 'shareType',
-      render: (text, records) => {
-        if (records.sharePersonType === 'drift') { return '游客' }
-        if (records.sharePersonType === 'customer') { return '普通客户' }
-        if (records.sharePersonType === 'Realty Consultant') { return '置业顾问' }
-        if (records.sharePersonType === 'estate agent') { return '专业经纪人' }
-      },
-    },
-    {
-      title: '分享时间',
-      dataIndex: 'shareTime',
-      key: 'shareTime',
-      render: (x, row) => <><span>{`${moment(row.shareTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-    },
-    {
-      title: '分享者电话',
-      dataIndex: 'sharePersonPhone',
-      key: 'sharePersonPhone',
-    },
-    // {
-    //   title: '访问人数',
-    //   dataIndex: 'visitPersonNum',
-    //   key: 'visitPersonNum',
-    // },
-  ]
-
-  function handleReset() {
-    props.form.resetFields();
-    getList({ pageNum: 1, pageSize: 10 })
-  }
-
-  const changePageNum = pageNumber => {
-    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
-  }
-
-  const handleSubmit = e => {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-
-        getList({ pageNum: 1, pageSize: 10, ...values })
-      }
-    });
-  }
-
-
-
-  const exportActivityStats = () => {
-
-    request({ ...apis.activityDataStatis.activityShareNumExport, params: { activityId: activityId, activityType: activityType, ...props.form.getFieldsValue(), ...date } }).then(data => {
-      if (!data) {
-        return
-      }
-      const url = window.URL.createObjectURL(new Blob([data]))
-      const link = document.createElement('a')
-      link.style.display = 'none'
-      link.href = url
-      link.setAttribute('download', '访问统计.xlsx')
-      document.body.append(link)
-      link.click()
-    }).catch()
-  }
-
-
-  const { getFieldDecorator } = props.form
-  return <>
-    <div>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex', alignItems: 'center' }}>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          {getFieldDecorator('sharePersonType')(
-            <Select placeholder="分享者类型" style={{ width: 150, marginLeft: '20px' }}>
-              <Option value="">全部</Option>
-              <Option value="drift">游客</Option>
-              <Option value="customer">普通客户</Option>
-              <Option value="Realty Consultant">置业顾问</Option>
-              <Option value="estate agent">专业经纪人</Option>
-            </Select>
-          )}
-        </Form.Item>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          {getFieldDecorator('sharePersonPhone')(<Input placeholder="分享者电话" />)}
-        </Form.Item>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          {getFieldDecorator('sharePersonName')(<Input placeholder="分享者姓名" />)}
-        </Form.Item>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}> 搜索</Button>
-          <Button onClick={handleReset} style={{ marginLeft: '30px' }}>重置</Button>
-        </Form.Item>
-        <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
-        <Modal
-          title="指标说明（数据会存在一定时间延迟）"
-          centered
-          visible={showHelp}
-          footer={null}
-          onCancel={() => setShowHelp(false)}
-        >
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享人数：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>分享小程序活动的总人数</p>
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享次数：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>触发小程序活动分享的总次数</p>
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>新增注册用户：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过当前活动授权手机号的总人数</p>
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问人数：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总人数</p>
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问次数：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总次数</p>
-        </Modal>
-      </Form>
-      <div>
-        <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats}>导出</Button>
-      </div>
-      <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
-      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
-      </div>
-    </div>
-  </>
-}
-
-const WrappedTypeForm = Form.create()(header);
-export default WrappedTypeForm

src/pages/activity/dataRecord/table/shares.jsx

@@ -1,205 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
-import router from 'umi/router';
-import apis from '../../../../services/apis';
-import request from '../../../../utils/request';
-import AuthButton from '../../../../components/AuthButton';
-import WxDictSelect from '@/components/SelectButton/WxDictSelect';
-import moment from 'moment';
-
-const date = {
-  startDate: moment().year(1000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z',
-  endDate: moment().year(3000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z'
-}
-
-const header = props => {
-
-  const [data, setData] = useState({})
-  const [sort, setSort] = useState({})
-  const [showHelp, setShowHelp] = useState(false)
-  const activityId = props.id
-  const activityType = props.type
-
-  useEffect(() => {
-    console.log(activityId, activityType)
-    getList({pageNum: 1, pageSize: 10 })
-
-  }, [])
-
-  const getList = params => {
-    console.log(params)
-    request({ ...apis.activityDataStatis.activitySharePersonNum, params: { ...params, activityId: activityId, activityType: activityType, ...date } }).then(data => {
-      console.log(data)
-      props.getData()
-      setData(data)
-    }).catch(e => {
-      console.log(e)
-    })
-  }
-
-  const columns = [
-    {
-      title: '分享者姓名',
-      dataIndex: 'sharePersonName',
-      key: 'sharePersonName',
-    },
-    {
-      title: '分享者类型',
-      dataIndex: 'sharePersonType',
-      key: 'sharePersonType',
-      render: (text, records) => {
-        if (records.sharePersonType === 'drift') { return '游客' }
-        if (records.sharePersonType === 'customer') { return '普通客户' }
-        if (records.sharePersonType === 'Realty Consultant') { return '置业顾问' }
-        if (records.sharePersonType === 'estate agent') { return '专业经纪人' }
-      //   ESTATE_AGENT']:
-      //   return [{ isAgent: true }, '普通用户']
-      // case ROLE_CODE['CHANNEL_AGENT
-      },
-    },
-    {
-      title: '分享者电话',
-      dataIndex: 'sharePersonPhone',
-      key: 'sharePersonPhone',
-    },
-    {
-      title: '分享次数',
-      dataIndex: 'shareNum',
-      key: 'shareNum',
-      sorter: true,
-      // render: (text, record) => (
-      //   <a style={{ color: '#66B3FF' }} onClick={toShareNum(record)}><span>{record.shareNum}</span></a>
-      // ),
-    },
-    {
-      title: '访问人数',
-      dataIndex: 'visitPersonNum',
-      key: 'visitPersonNum',
-      sorter: true,
-      // render: (text, record) => (
-      //   <a style={{ color: '#66B3FF' }} onClick={toVisitPersonNum(record)}><span>{record.visitPersonNum}</span></a>
-      // ),
-    },
-    {
-      title: '访问次数',
-      dataIndex: 'visitNum',
-      key: 'visitNum',
-      sorter: true,
-      // render: (text, record) => (
-      //   <a style={{ color: '#66B3FF' }} onClick={toVisitNum(record)}><span>{record.visitNum}</span></a>
-      // ),
-    },
-  ]
-
-  const handleTableChange = (pagination, filters, sorter) => {
-    console.log(pagination, filters, sorter)
-    setSort({
-      sort: sorter.order,
-      colKey: sorter.columnKey,
-    })
-    const query = {
-      pageNum: pagination.current,
-        pageSize: pagination.pageSize,
-        sort: sorter.order,
-        colKey: sorter.columnKey,
-        ...props.form.getFieldsValue()
-    }
-    getList(query)
-  };
-
-  function handleReset() {
-    props.form.resetFields();
-    getList({ pageNum: 1, pageSize: 10 })
-  }
-
-  const changePageNum = pageNumber => {
-    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue(),...sort })
-  }
-
-  const handleSubmit = e => {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        console.log('提交数据: ', values)
-       
-        getList({ pageNum: 1, pageSize: 10, ...values })
-      }
-    });
-  }
-
-  const exportActivityStats = () => {
-    
-    request({ ...apis.activityDataStatis.activitySharePersonNumExport, params: {activityId: activityId, activityType: activityType,...props.form.getFieldsValue(),...date} }).then(data => {
-      if (!data) {
-        return
-      }
-      const url = window.URL.createObjectURL(new Blob([data]))
-        const link = document.createElement('a')
-        link.style.display = 'none'
-        link.href = url
-        link.setAttribute('download', '访问统计.xlsx')
-        document.body.append(link)
-        link.click()
-    }).catch()
-  }
-
-
-  const { getFieldDecorator } = props.form
-  return <>
-    <div>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex', alignItems: 'center' }}>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          {getFieldDecorator('sharePersonType')(
-            <Select placeholder="分享者类型" style={{ width: 150, marginLeft: '20px' }}>
-              <Option value="">全部</Option>
-              <Option value="drift">游客</Option>
-              <Option value="customer">普通客户</Option>
-              <Option value="Realty Consultant">置业顾问</Option>
-              <Option value="estate agent">专业经纪人</Option>
-              
-            </Select>
-          )}
-        </Form.Item>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          {getFieldDecorator('sharePersonPhone')(<Input placeholder="分享者电话" />)}
-        </Form.Item>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          {getFieldDecorator('sharePersonName')(<Input placeholder="分享者姓名" />)}
-        </Form.Item>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}> 搜索</Button>
-          <Button onClick={handleReset} style={{ marginLeft: '30px' }}>重置</Button>
-        </Form.Item>
-        <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
-        <Modal
-          title="指标说明（数据会存在一定时间延迟）"
-          centered
-          visible={showHelp}
-          footer={null}
-          onCancel={() => setShowHelp(false)}
-        >
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享人数：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>分享小程序活动的总人数</p>
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享次数：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>触发小程序活动分享的总次数</p>
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>新增注册用户：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过当前活动授权手机号的总人数</p>
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问人数：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总人数</p>
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问次数：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总次数</p>
-        </Modal>
-      </Form>
-      <div>
-        <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats} >导出</Button>
-      </div>
-      <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} onChange={handleTableChange} rowKey="activityList" />
-      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum}  current={data.current} />
-      </div>
-    </div>
-  </>
-}
-
-const WrappedTypeForm = Form.create()(header);
-export default WrappedTypeForm

src/pages/activity/dataRecord/table/visitNum.jsx

@@ -1,195 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
-import router from 'umi/router';
-import apis from '../../../../services/apis';
-import request from '../../../../utils/request';
-import AuthButton from '../../../../components/AuthButton';
-import WxDictSelect from '@/components/SelectButton/WxDictSelect';
-import moment from 'moment';
-
-const date = {
-  startDate: moment().year(1000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z',
-  endDate: moment().year(3000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z'
-}
-
-const header = props => {
-  const [showHelp, setShowHelp] = useState(false)
-  const [data, setData] = useState({})
-  const activityId = props.id
-  const activityType = props.type
-
-  useEffect(() => {
-    console.log(activityId, activityType)
-    getList({ pageNum: 1, pageSize: 10 })
-
-  }, [])
-
-  const getList = params => {
-    console.log(params)
-    request({ ...apis.activityDataStatis.activityVisitNum, params: { ...params, activityId: activityId, activityType: activityType, ...date } }).then(data => {
-      console.log(data)
-      props.getData()
-      setData(data)
-    }).catch(e => {
-      console.log(e)
-    })
-  }
-
-  const format = data =>{    
-  return <div dangerouslySetInnerHTML={{__html:data.replace(/,/g,",<br/>")}}>{}</div>
-  }
-
-  let columns = [
-    {
-      title: '姓名',
-      dataIndex: 'nickName',
-      key: 'nickName',
-    },
-    {
-      title: '电话',
-      dataIndex: 'phone',
-      key: 'phone',
-    },
-    {
-      title: '性别',
-      dataIndex: 'gender',
-      key: 'gender',
-    },
-    {
-      title: '归属地',
-      dataIndex: 'province',
-      key: 'province',
-    },
-    {
-      title: '来源渠道',
-      dataIndex: 'personFrom',
-      key: 'personFrom',
-    },
-    {
-      title: '置业顾问',
-      dataIndex: 'realtyConsultant',
-      key: 'realtyConsultant',
-      render: (x, row) => <>{row.realtyConsultant?format(row.realtyConsultant):''}</>,
-      width:180
-    },
-    {
-      title: '置业顾问电话',
-      dataIndex: 'realtyConsultantPhone',
-      key: 'realtyConsultantPhone',
-      render: (x, row) => <>{row.realtyConsultantPhone?format(row.realtyConsultantPhone):''}</>,
-      width:180
-    },
-    {
-      title: '分享者',
-      dataIndex: 'sharePersonName',
-      key: 'sharePersonName',
-    },
-    {
-      title: '分享者电话',
-      dataIndex: 'sharePersonPhone',
-      key: 'sharePersonPhone',
-    },
-    {
-      title: '访问时间',
-      dataIndex: 'visitDate',
-      key: 'visitDate',
-      render: (x, row) => <><span>{`${moment(row.visitDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-    },
-  ]
-
-  function handleReset() {
-    props.form.resetFields();
-    getList({ pageNum: 1, pageSize: 10 })
-  }
-
-  const changePageNum = pageNumber => {
-    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
-  }
-
-  const handleSubmit = e => {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        getList({ pageNum: 1, pageSize: 10, ...values })
-      }
-    });
-  }
-
-  const exportActivityStats = () => {
-
-    request({ ...apis.activityDataStatis.activityVisitNumExport, params: { activityId: activityId, activityType: activityType, ...props.form.getFieldsValue(), ...date } }).then(data => {
-      if (!data) {
-        return
-      }
-      const url = window.URL.createObjectURL(new Blob([data]))
-      const link = document.createElement('a')
-      link.style.display = 'none'
-      link.href = url
-      link.setAttribute('download', '访问统计.xlsx')
-      document.body.append(link)
-      link.click()
-    }).catch()
-  }
-
-  const { getFieldDecorator } = props.form
-  return <>
-    <div>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex', alignItems: 'center' }}>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          {getFieldDecorator('personFrom')(
-            <WxDictSelect />,
-          )}
-        </Form.Item>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          {getFieldDecorator('province')(<Input placeholder="请输入归属地" />)}
-        </Form.Item>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          {getFieldDecorator('realtyConsultant')(<Input placeholder="置业顾问" />)}
-        </Form.Item>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          {getFieldDecorator('realtyConsultantPhone')(<Input placeholder="置业顾问电话" />)}
-        </Form.Item>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}>
-            搜索
-            </Button>
-          <Button onClick={handleReset} style={{ marginLeft: '30px' }}>重置</Button>
-        </Form.Item>
-        <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
-        <Modal
-          title="指标说明（数据会存在一定时间延迟）"
-          centered
-          visible={showHelp}
-          footer={null}
-          onCancel={() => setShowHelp(false)}
-        >
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享人数：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>分享小程序活动的总人数</p>
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享次数：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>触发小程序活动分享的总次数</p>
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>新增注册用户：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过当前活动授权手机号的总人数</p>
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问人数：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总人数</p>
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问次数：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总次数</p>
-        </Modal>
-      </Form>
-      <div>
-
-
-        <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats} >
-          导出
-            </Button>
-
-      </div>
-      <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
-      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
-      </div>
-    </div>
-  </>
-}
-
-const WrappedTypeForm = Form.create()(header);
-export default WrappedTypeForm

src/pages/activity/dataRecord/table/visitors.jsx

@@ -1,204 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
-import router from 'umi/router';
-import apis from '../../../../services/apis';
-import request from '../../../../utils/request';
-import AuthButton from '../../../../components/AuthButton';
-import WxDictSelect from '@/components/SelectButton/WxDictSelect';
-import moment from 'moment';
-
-const date = {
-  startDate: moment().year(1000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z',
-  endDate: moment().year(3000).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z'
-}
-// 2020-04-18T16:00:00.000Z
-
-const header = props => {
-
-  // const [id,type] = props
-  const [showHelp, setShowHelp] = useState(false)
-  const [data, setData] = useState({})
-  const activityId = props.id
-  const activityType = props.type
-
-
-  useEffect(() => {
-
-    getList({ pageNum: 1, pageSize: 10 })
-
-  }, [])
-
-  const getList = params => {
-    console.log(params)
-    request({ ...apis.activityDataStatis.activityVisitPersonNum, params: { ...params, activityId: activityId, activityType: activityType, ...date } }).then(data => {
-      console.log(data)
-      props.getData()
-      setData(data)
-    }).catch(e => {
-      console.log(e)
-    })
-  }
-
-  // getTableList () {
-
-  //   console.log(formData)
-  //   request({ ...apis.activityDataStatis.activityVisitPersonNum, params: formData }).then(data => {
-  //     console.log(data)
-  //     this.setState({ tableData: data.records, total: data.total})
-  //   }).catch()
-  // }
-  const format = data => {
-    console.log(data.replace(/,/g, '\n'))
-
-    return <div dangerouslySetInnerHTML={{ __html: data.replace(/,/g, ",<br/>") }}>{}</div>
-  }
-  const columns = [
-    {
-      title: '姓名',
-      dataIndex: 'nickName',
-      key: 'nickName',
-    },
-    {
-      title: '电话',
-      dataIndex: 'phone',
-      key: 'phone',
-    },
-    {
-      title: '性别',
-      dataIndex: 'gender',
-      key: 'gender',
-    },
-    {
-      title: '归属地',
-      dataIndex: 'province',
-      key: 'province',
-    },
-    {
-      title: '来源渠道',
-      dataIndex: 'personFrom',
-      key: 'personFrom',
-    },
-    {
-      title: '置业顾问',
-      dataIndex: 'realtyConsultant',
-      key: 'realtyConsultant',
-      render: (x, row) => <>{row.realtyConsultant ? format(row.realtyConsultant) : ''}</>,
-      width: 180
-    },
-    {
-      title: '置业顾问电话',
-      dataIndex: 'realtyConsultantPhone',
-      key: 'realtyConsultantPhone',
-      render: (x, row) => <>{row.realtyConsultantPhone ? format(row.realtyConsultantPhone) : ''}</>,
-      width: 180
-    },
-    {
-      title: '推广人',
-      dataIndex: 'sharePersonName',
-      key: 'sharePersonName',
-    },
-    {
-      title: '访问次数',
-      dataIndex: 'visitNum',
-      key: 'visitNum',
-    },
-  ]
-
-  function handleReset() {
-    props.form.resetFields();
-    getList({ pageNum: 1, pageSize: 10 })
-  }
-
-  const changePageNum = pageNumber => {
-    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
-  }
-
-  const handleSubmit = e => {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        console.log('提交数据: ', values)
-
-        getList({ pageNum: 1, pageSize: 10, ...values })
-      }
-    });
-  }
-
-  const exportActivityStats = () => {
-
-    request({ ...apis.activityDataStatis.activityVisitPersonNumExport, params: { activityId: activityId, activityType: activityType, ...props.form.getFieldsValue(), ...date } }).then(data => {
-      if (!data) {
-        return
-      }
-      const url = window.URL.createObjectURL(new Blob([data]))
-      const link = document.createElement('a')
-      link.style.display = 'none'
-      link.href = url
-      link.setAttribute('download', '访问统计.xlsx')
-      document.body.append(link)
-      link.click()
-    }).catch()
-  }
-
-  const { getFieldDecorator } = props.form
-  return <>
-    <div >
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex', alignItems: 'center' }}>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          {getFieldDecorator('personFrom')(
-            <WxDictSelect />,
-          )}
-        </Form.Item>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          {getFieldDecorator('province')(<Input placeholder="请输入归属地" />)}
-        </Form.Item>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          {getFieldDecorator('realtyConsultant')(<Input placeholder="置业顾问" />)}
-        </Form.Item>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          {getFieldDecorator('realtyConsultantPhone')(<Input placeholder="置业顾问电话" />)}
-        </Form.Item>
-        <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
-          <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}>
-            搜索
-            </Button>
-          <Button onClick={handleReset} style={{ marginLeft: '30px' }}>重置</Button>
-        </Form.Item>
-        <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
-        <Modal
-          title="指标说明（数据会存在一定时间延迟）"
-          centered
-          visible={showHelp}
-          footer={null}
-          onCancel={() => setShowHelp(false)}
-        >
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享人数：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>分享小程序活动的总人数</p>
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享次数：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>触发小程序活动分享的总次数</p>
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>新增注册用户：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过当前活动授权手机号的总人数</p>
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问人数：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总人数</p>
-          <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>访问次数：</p>
-          <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问小程序活动的总次数</p>
-        </Modal>
-      </Form>
-      <div>
-
-
-        <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats}>
-          导出
-            </Button>
-
-      </div>
-      <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
-      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
-      </div>
-    </div>
-  </>
-}
-
-const WrappedTypeForm = Form.create()(header);
-export default WrappedTypeForm

src/pages/activity/drainage/Detail.jsx

@@ -1,207 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
-import router from 'umi/router';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../../style/GoodsList.less';
-import moment from 'moment';
-import apis from '../../../services/apis';
-import request from '../../../utils/request';
-import { SSL_OP_SSLEAY_080_CLIENT_DH_BUG } from 'constants';
-import AuthButton from '../../../components/AuthButton';
-import { timeout } from 'q';
-import Prompt from 'umi/prompt';
-
-const data = []
-
-const header = (props) => {
-  const { drainageId, name } = props.location.query
-
-
-  const [datas, setDatas] = useState([])
-  const [content, setContent] = useState([{}, {}])
-  const [columns, setColumns] = useState([])
-  const [startDate, setStartDate] = useState('')
-  const [endDate, setEndDate] = useState('')
-  const [total, setTotal] = useState({})
-  // let content = {}
-  useEffect(() => {
-
-    gettaDrainageRecord({ pageNum: 1, pageSize: 10, drainageId: drainageId })
-
-  }, [])
-
-  function gettaDrainageRecord(params) {
-    request({ ...apis.activity.taDrainageRecord, params: { ...params } }).then((data) => {
-      // setDatas(data) 
-      console.log(data, '3333333333333')
-      if (data.total != 0) {
-        setTotal(data)
-        setDatas(tableData(data.records))
-        // content = data.records[0]
-        console.log('json: ', eval('(' + data.records[0].content + ')'))
-        setContent(eval('(' + data.records[0].content + ')'))
-        setColumns(tableTitle(data.records))
-      }
-      else {
-        setDatas([])
-        message.info('数据为空')
-      }
-
-
-
-    }).catch((err) => {
-      console.log(err)
-      message.info(err.msg || err.message)
-    })
-  }
-  function tableData(data) {
-    console.log('tabledata', data)
-    return data.map((row, inx) => {
-      return eval('(' + row.content + ')').reduce((acc, col) => {
-        const r = {
-
-          key: inx + 1,
-          createDate: row.createDate,
-          [`${col.key}`]: col.value,
-          ...acc,
-        }
-        console.log('r', r)
-        return r
-      }, {})
-    })
-  }
-
-  function tableTitle(data) {
-    tableTitle = eval('(' + data[0].content + ')')
-    const cols = [{
-      title: "提交时间",
-      dataIndex: "createDate",
-      key: "createDate",
-      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-    }]
-    return cols.concat(tableTitle.map((item) => {
-      const col = {
-        title: item.label,
-        dataIndex: item.key,
-        key: item.key
-      }
-      return col
-    }))
-  }
-  // function datalist () {
-
-  //   gettaDrainageRecord({ pageNum: 1, pageSize: 10, drainageId: drainageId, startTime: Time(startDate), endTime: Time(endDate) })
-  // }
-
-  function fromTime(str) {
-    return str === '' ? null : `${moment(str).format('YYYY-MM-DDT00:00:00.000')}Z`
-  }
-
-  function Time(str) {
-    return str === '' ? null : `${moment(str).format('YYYY-MM-DD')}`
-  }
-  // 2019-10-30T11:04:49
-  function onChangetime(dates, dateStrings) {
-    console.log(dateStrings[1])
-    setEndDate(dateStrings[1])
-    setStartDate(dateStrings[0])
-
-  }
-
-  const changePageNum = pageNumber => {
-    gettaDrainageRecord({ pageNum: pageNumber, pageSize: 10, drainageId: drainageId, startTime: Time(startDate), endTime: Time(endDate) })
-  }
-
-
-  function excelPort() {
-    // const fieldsValue = getFieldsValue()
-
-    request({ ...apis.activity.exporttaDrainageRecord, params: { drainageId: drainageId, startTime: fromTime(startDate), endTime: fromTime(endDate) } })
-      .then(response => {
-        download(response)
-      }).catch(error => {
-
-      })
-  }
-
-
-
-  function download(data) {
-    if (!data) {
-      return
-    }
-    const url = window.URL.createObjectURL(new Blob([data]))
-    const link = document.createElement('a')
-    link.style.display = 'none'
-    link.href = url
-    link.setAttribute('download', '引流.xlsx')
-    document.body.append(link)
-    link.click()
-  }
-
-  function handleReset(e) {
-    console.log(e)
-    props.form.resetFields();
-    setEndDate('')
-    setStartDate('')
-  }
-
-  const handleSubmit = (e, props) => {
-    e.preventDefault();
-    gettaDrainageRecord({ pageNum: 1, pageSize: 10, drainageId: drainageId, startTime: Time(startDate), endTime: Time(endDate) })
-  }
-
-  const { RangePicker } = DatePicker;
-  const { getFieldDecorator } = props.form
-  return (
-    <>
-      <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
-        <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-
-          <Form.Item label="提交时间">
-            {getFieldDecorator('time')(
-              <RangePicker showTime format="YYYY-MM-DD HH:mm:ss"
-                showTime
-                onChange={onChangetime}
-              />,
-            )}
-          </Form.Item>
-          <Form.Item>
-            <Button type="primary" htmlType="submit" >
-              搜索
-          </Button>
-            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
-            </Button>
-          </Form.Item>
-        </Form>
-        <Button onClick={() => router.go(-1)} style={{ float: 'right' }}>返回</Button>
-      </div>
-      <div>
-        <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-          <div style={{ lineHeight: '92px', width: '600px', fontWeight: 'bold', fontSize: '18px' }}>
-            H5项目：{name}
-          </div>
-          {/* H5项目名称 style={{ float: 'right', margin: '20px 0', zIndex: 1 }} */}
-          <AuthButton name="admin.taDrainageRecord.export.get" noRight={null}>
-            <Button type="primary" style={{ marginLeft: '30px', float: 'right', marginTop: '30px', marginBottom: '30px', zIndex: 1 }} onClick={excelPort}>导出数据</Button>
-          </AuthButton>
-        </div>
-        <Table columns={columns} dataSource={datas} pagination={false} />
-        <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-          <Pagination showQuickJumper defaultCurrent={1} total={total.total} onChange={(e) => changePageNum(e)} current={total.current} />
-        </div>
-      </div>
-
-      <Prompt message={location =>
-        location.pathname.startsWith("/activity/drainage")
-          ? true
-          : localStorage.removeItem("drainageActivePageParams")} />
-
-
-    </>
-  )
-}
-const WrappedHeader = Form.create({ name: 'header' })(header);
-
-export default WrappedHeader

src/pages/activity/drainage/DrainageList.jsx

@@ -1,600 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Select, message, Table, Pagination, Typography, Modal, DatePicker, Radio } from 'antd';
-import router from 'umi/router';
-import moment from 'moment';
-import Prompt from 'umi/prompt';
-import withActions from '@/components/ActionList';
-import EditIcon from '@/components/EditIcon';
-import Navigate from '@/components/Navigate';
-import styles from '../../style/GoodsList.less';
-import apis from '../../../services/apis';
-import request from '../../../utils/request';
-import AuthButton from '../../../components/AuthButton';
-import ImageUploader from '../../../components/XForm/ImageUpload';
-import BuildSelect from '../../../components/SelectButton/BuildSelect2'
-
-const toEditList = row => () => {
-  router.push({
-    pathname: '/activity/drainage/Detail',
-    query: {
-      drainageId: row.drainageId,
-      name: row.name,
-    },
-  });
-}
-
-const toDataReacord = row => () => {
-  router.push({
-    pathname: '/activity/drainage/drainageRecord',
-    query: {
-      id: row.drainageId,
-    },
-  });
-}
-const header = props => {
-  // const [data, setData] = useState({ data: [] })
-  const [datas, setDatas] = useState([])//表格数据
-  const [date, setDate] = useState({})
-  const [formsdate, setFormsDate] = useState({})
-  //   const [page, changePage] = useState({})
-  useEffect(() => {
-    if (localStorage.getItem('drainageActivePageParams')) {
-      props.form.setFieldsValue(JSON.parse(localStorage.getItem('drainageActivePageParams')));
-      // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
-
-      gettaDrainage(JSON.parse(localStorage.getItem('drainageActivePageParams')))
-    } else {
-      localStorage.setItem('drainageActivePageParams', JSON.stringify({ pageNum: 1, pageSize: 10 }));
-      gettaDrainage({ pageNum: 1, pageSize: 10 });
-    }
-
-
-    setDate({
-      ModalText: 'Content of the modal',
-      visible: false,
-      confirmLoading: false,
-    })
-
-  }, [])
-
-  function gettaDrainage(params) {
-    request({ ...apis.activity.taDrainage, params }).then(data => {
-      setDatas(data)
-      console.log(data.records, '_213_')
-    }).catch(err => {
-      console.log(err)
-      message.info(err.msg || err.message)
-    })
-  }
-
-  const deleteDrainage = (drainageIid) => () => {
-    Modal.confirm({
-      title: '确认删除该引流？',
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        request({ ...apis.activity.deletetaDrainage, urlData: { id: drainageIid }, }).then((data) => {
-          message.info('操作成功！')
-          gettaDrainage(JSON.parse(localStorage.getItem("drainageActivePageParams")))
-        }).catch((err) => {
-          console.log('111111', err)
-          // message.info(err.msg || err.message)
-        })
-      }
-    });
-  }
-
-  const toDrainageDetail = (drainageId) => () => {
-    router.push({
-      pathname: '/activity/drainage/DetailDrainage',
-      query: {
-        drainageId
-      },
-    });
-  }
-
-  const newQrcode = row => {
-    const x = new XMLHttpRequest();
-    const resourceUrl = row.qrCode
-    console.log(resourceUrl);
-    x.open('GET', resourceUrl, true);
-    x.responseType = 'blob';
-    x.onload = function (e) {
-      const url = window.URL.createObjectURL(x.response)
-      const a = document.createElement('a');
-      a.href = url;
-      a.style.display = 'none'
-      a.download = 'H5二维码.png';
-      a.click();
-    }
-    x.send();
-  }
-
-  const exchangeDrainage = drainage => () => {
-    if (drainage.status === 1) {
-      if (drainage.isMiniapp) {
-        Modal.confirm({
-          title: '下架后当前H5活动关联的小程序端开屏图、banner图等也会自动下架。',
-          okText: '确认',
-          cancelText: '取消',
-          onOk() {
-            request({ ...apis.activity.exchangeDrainage, urlData: { id: drainage.drainageId }, data: drainage }).then((data) => {
-              message.info('操作成功！')
-              gettaDrainage(JSON.parse(localStorage.getItem("drainageActivePageParams")))
-            }).catch((err) => {
-              console.log(err)
-              message.info(err.msg || err.message)
-            })
-          }
-        });
-      } else {
-        request({ ...apis.activity.exchangeDrainage, urlData: { id: drainage.drainageId }, data: drainage }).then((data) => {
-          message.info('H5活动已下架！')
-          gettaDrainage(JSON.parse(localStorage.getItem("drainageActivePageParams")))
-        }).catch((err) => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-      }
-
-    } else {
-      request({ ...apis.activity.exchangeDrainage, urlData: { id: drainage.drainageId }, data: drainage }).then((data) => {
-        message.info('H5活动已上架！')
-        gettaDrainage(JSON.parse(localStorage.getItem("drainageActivePageParams")))
-      }).catch((err) => {
-        console.log(err)
-        message.info(err.msg || err.message)
-      })
-    }
-
-  }
-
-  const columns = [
-    {
-      title: 'H5项目编号',
-      dataIndex: 'drainageId',
-      key: 'drainageId',
-      align: 'center',
-    },
-    {
-      title: '是否投放小程序',
-      dataIndex: 'isMiniapp',
-      key: 'isMiniapp',
-      align: 'cenxter',
-      render: (isMiniapp) => <span>{isMiniapp ? '是' : '否'}</span>,
-    },
-    {
-      title: 'H5项目名称',
-      dataIndex: 'name',
-      key: 'name',
-      align: 'center',
-      render: (text, datas) => <Navigate onClick={toDrainageDetail(datas.drainageId)}><Typography.Text ellipsis>{datas.name}</Typography.Text></Navigate>,
-    },
-    {
-      title: '链接地址',
-      dataIndex: 'h5Address',
-      key: 'h5Address',
-      align: 'center',
-      // render: (text, datas) => <div style={ { color: '#66B3FF' } } onClick= {() => addshowModal(datas)} >{ datas.name }</div>, 
-    },
-    {
-      title: '上架状态',
-      dataIndex: 'status',
-      key: 'status',
-      align: 'center',
-      render: (status) => <span>{status === 1 ? '已上架' : '已下架'}</span>,
-    },
-    {
-      title: '新建时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
-      align: 'center',
-      render: (x, row) => (
-        <>
-          <span>{row.createDate && moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}</span>
-        </>
-      ),
-    },
-    {
-      title: '自动下架时间',
-      dataIndex: 'endDate',
-      key: 'endDate',
-      align: 'center',
-      render: (x, row) => (
-        <>
-          <span>{row.endDate && moment(row.endDate).format('YYYY-MM-DD HH:mm:ss')}</span>
-        </>
-      ),
-    },
-    // {
-    //   title: '参与数',
-    //   dataIndex: 'enlistNum',
-    //   key: 'enlistNum',
-    //   align: 'center',
-    //   // render:
-    // },
-    {
-      title: '操作',
-      key: 'action',
-      align: 'center',
-      width: 300,
-      render: withActions((text, datas) => [
-        <AuthButton name="admin.taDrainage.put" noRight={null}>
-          <EditIcon type="edit" text="编辑" onClick={() => addshowModal(datas)} />
-        </AuthButton>,
-
-        <EditIcon type="look" text="查看详情" onClick={toDrainageDetail(datas.drainageId)} />,
-
-        <AuthButton name="admin.taDrainage.id.delete" noRight={null}>
-          <EditIcon type="delete" text="删除" onClick={deleteDrainage(datas.drainageId)} />
-        </AuthButton >,
-
-        <AuthButton name="admin.taDrainage.publish" noRight={null}>
-          <EditIcon type={datas.status === 1 ? 'down' : 'up'} text={datas.status === 1 ? '下架' : '上架'} onClick={exchangeDrainage(datas)} />
-        </AuthButton>,
-
-        <AuthButton name="admin.taDrainage.data" noRight={null}>
-          <EditIcon text="数据" type="data" onClick={toEditList(datas)} />
-        </AuthButton>,
-
-        <AuthButton name="admin.drainageActivity.dataRecord" noRight={null}>
-          <EditIcon type="record" text="数据记录" onClick={toDataReacord(datas)} />
-        </AuthButton>,
-
-        <AuthButton name="admin.taDrainage.id.delete" noRight={null}>
-          <EditIcon text="下载二维码" type="download" onClick={newQrcode.bind(this, datas)} />
-        </AuthButton >,
-      ]),
-    },
-  ];
-  const Forms = props => {
-    const { formsDate } = props
-    // useEffect(() => {
-    //   if (formsDate) {
-    //     props.form.setFieldsValue({ ...formsDate, endDate: formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null })
-    //   }
-    // }, [formsDate])
-
-    const [hiddenStatus, setHiddenStatus] = useState(formsdate.isMiniapp)
-
-    const handleSubmit = e => {
-      e.preventDefault();
-      props.form.validateFields((err, values) => {
-        if (!err) {
-          values.endDate = moment(values.endDate._d).format('YYYY-MM-DD HH:mm:ss')
-          if (formsDate.drainageId) {
-            // { ...apis.activity.deletetaDrainage,urlData: { id: drainageIid }, }
-            request({ ...apis.activity.updatetaDrainage, urlData: { id: formsDate.drainageId }, data: values }).then(data => {
-              message.info('操作成功！')
-              gettaDrainage(JSON.parse(localStorage.getItem('drainageActivePageParams')))
-              setDate({
-                visible: false,
-              });
-            }).catch(err => {
-              console.log('111111', err)
-              message.info(err.msg || err.message)
-            })
-          } else {
-            request({ ...apis.activity.addtaDrainage, data: values }).then(data => {
-              message.info('操作成功')
-              gettaDrainage(JSON.parse(localStorage.getItem('drainageActivePageParams')))
-              setDate({
-                visible: false,
-              });
-            }).catch(err => {
-              message.error(err.msg || err.message)
-            })
-          }
-        }
-      });
-    }
-
-    const handleCancel = val => {
-      setDate({
-        visible: false,
-      });
-    }
-
-    const tailFormItemLayout = {
-      wrapperCol: {
-        xs: {
-          span: 24,
-          offset: 0,
-        },
-        sm: {
-          span: 16,
-          offset: 8,
-        },
-      },
-    };
-
-    const formItemLayout = {
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 8 },
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 16 },
-      },
-    };
-
-    const changeMiniapp = e => {
-      if (e.target.value == 1) {
-        setHiddenStatus(true)
-      } else {
-        setHiddenStatus(false)
-      }
-    }
-
-    const { getFieldDecorator } = props.form;
-    {/* <XForm onSubmit={handleSubmit} onCancel={handleCancel} fields={fields} ></XForm> */ }
-
-    return <Form {...formItemLayout} onSubmit={handleSubmit}>
-      <span style={{ color: '#ef273a' }}>发布后请到资源位管理中关联资源位图，否则客户看不到</span>
-      <Form.Item label="是否投放小程序端" help='选择是后,该活动可投放至小程序的轮播位以及开屏广告'>
-        {getFieldDecorator('isMiniapp', {
-          initialValue: formsDate.isMiniapp ? 1 : 0,
-          rules: [
-            { required: true, message: '请选择是否投放小程序' },
-          ],
-        })(
-          <Radio.Group onChange={changeMiniapp} disabled={!!formsDate.activityId}>
-            <Radio value={1}>是</Radio>
-            <Radio value={0}>否</Radio>
-          </Radio.Group>
-        )}
-      </Form.Item>
-      <Form.Item label="H5项目名称">
-        {getFieldDecorator('name', {
-          initialValue: formsDate.name,
-          rules: [
-            { required: true, message: '请输入H5项目名称' },
-          ],
-        })(
-          <Input
-            placeholder="请输入H5项目名称"
-          />,
-        )}
-      </Form.Item>
-      {hiddenStatus && (<Form.Item label="选择项目">
-        {getFieldDecorator('buildingId', { initialValue: formsDate.buildingId })(
-          <BuildSelect />,
-        )}
-      </Form.Item>)}
-      <Form.Item label="下架时间">
-        {getFieldDecorator('endDate', {
-          initialValue: formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm:ss') : null,
-          rules: [
-            { required: true, message: '请输入下架时间' },
-          ]
-        })(
-          <DatePicker
-            showTime={{ format: 'HH:mm:ss' }}
-          />,
-        )}
-      </Form.Item>
-      {hiddenStatus && (<Form.Item label="活动链接地址">
-        {getFieldDecorator('h5Address', {
-          initialValue: formsDate.h5Address,
-          rules: [
-            { required: true, message: '请输入H5活动链接地址' },
-          ]
-        })(
-          <Input
-            placeholder="请输入H5活动链接地址"
-            disabled={formsDate.isMiniapp}
-          />,
-        )}
-      </Form.Item>)}
-      {hiddenStatus && (<Form.Item label="分享设置" help="建议图片尺寸：750*600px，比例5:4,格式：jpg">
-        {getFieldDecorator('shareImg', {
-          initialValue: formsDate.shareImg,
-          rules: [
-            { required: true, message: '请选择分享图片' },
-          ]
-        })(<ImageUploader />)}
-      </Form.Item>)}
-      {hiddenStatus && (<Form.Item label="活动分享语" help="可使用{name}代表用户昵称。">
-        {getFieldDecorator('shareTitle', {
-          initialValue: formsDate.shareTitle,
-          rules: [
-            { required: true, message: '请输入活动分享语' },
-          ]
-        })(
-          <Input
-            placeholder="分享语，不超过15个字"
-            maxLength="15"
-          />,
-        )}
-      </Form.Item>)}
-      {hiddenStatus && (<Form.Item label="中间页飞机图" help="建议图片尺寸：750*1667px，比例9:20,格式：jpg。图片底部不要放置关键信息。">
-        {getFieldDecorator('middleImg', {
-          initialValue: formsDate.middleImg,
-          rules: [
-            { required: true, message: '请选择中间页飞机图' },
-          ]
-        })(<ImageUploader />)}
-      </Form.Item>)}
-      <Form.Item {...tailFormItemLayout}>
-        <AuthButton name="admin.taDrainage.id.put" noRight={null}>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn} onClick>
-            确定
-    </Button>
-        </AuthButton>
-        <Button style={{ marginLeft: 8 }} onClick={handleCancel}>
-          取消
-      </Button>
-      </Form.Item>
-    </Form>
-
-  }
-  const Formss = Form.create({ name: 'Forms' })(Forms);
-
-
-
-  //重置搜索
-  function handleReset() {
-    props.form.resetFields();
-    localStorage.setItem("drainageActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));
-    gettaDrainage({ pageNum: 1, pageSize: 10 })
-  }
-
-
-
-  function addshowModal(datas) {
-
-    // alert(datas.drainageId)
-    setFormsDate(datas)
-    setDate({
-      visible: true,
-      title: "修改H5项目"
-    });
-  };
-
-  function showModal() {
-    setFormsDate({
-      drainageId: '',
-      name: '',
-      endDate: '',
-    })
-    setDate({
-      visible: true,
-      title: '新建H5项目'
-    });
-  };
-  const changePageNum = pageNumber => {
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        localStorage.setItem("drainageActivePageParams", JSON.stringify({ pageNum: pageNumber, pageSize: 10, ...values }));
-        gettaDrainage({ pageNum: pageNumber, pageSize: 10, ...values })
-      }
-    });
-  }
-
-  function handleOk() {
-
-
-    setDate({
-      ModalText: 'The modal will be closed after two seconds',
-      confirmLoading: true,
-    });
-    function setTimeout() {
-      setDate({
-        visible: false,
-        confirmLoading: false,
-      });
-    };
-  };
-
-  function handleCancel() {
-    console.log('Clicked cancel button');
-    setDate({
-      visible: false,
-    });
-  };
-  function handleSubmit(e) {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      console.log('values', values)
-      if (!err) {
-        console.log('values', values)
-        localStorage.setItem("drainageActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10, ...values }));
-        gettaDrainage({ pageNum: 1, pageSize: 10, ...values })
-      }
-    });
-  }
-
-  //打开新页面
-  const openIndexImg = () => {
-    const newWin = window.open('about:blank');
-    newWin.location.href = "http://njcj.oss-cn-shanghai.aliyuncs.com/%E6%A1%88%E4%BE%8B.png"
-  }
-
-  const { getFieldDecorator } = props.form;
-  const { visible, confirmLoading, ModalText, title } = date;
-  return (
-    <>
-      <div>
-        <Form layout="inline" onSubmit={handleSubmit}>
-          <Form.Item>
-            {getFieldDecorator('drainageId')(
-              <Input
-                // prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-                placeholder="H5项目编号"
-              />,
-              // {getFieldDecorator('name', {
-              // })(<Input/>)}
-            )}
-          </Form.Item>
-          <Form.Item>
-            {getFieldDecorator('name')(
-              <Input
-                // prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-                placeholder="H5项目名称"
-              />,
-            )}
-          </Form.Item>
-          <Form.Item>
-            {getFieldDecorator('isMiniapp')(
-              <Select style={{ width: '180px' }} placeholder="是否投放小程序">
-                <Option value="1">是</Option>
-                <Option value="0">否</Option>
-              </Select>,
-            )}
-          </Form.Item>
-          <Form.Item>
-            {getFieldDecorator('status')(
-              <Select style={{ width: '180px' }} placeholder="上架状态">
-                <Option value="1">已上架</Option>
-                <Option value="0">已下架</Option>
-              </Select>,
-            )}
-          </Form.Item>
-          <Form.Item >
-            <AuthButton name="admin.taDrainage.search" noRight={null}>
-              <Button type="primary" htmlType="submit" className={styles.searchBtn} onClick>
-                搜索
-          </Button>
-            </AuthButton>
-            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
-            </Button>
-          </Form.Item>
-        </Form>
-        <AuthButton name="admin.taDrainage.add.post" noRight={null}>
-          <Button type="danger" className={styles.addBtn} onClick={showModal}>新增</Button>
-        </AuthButton>
-        <span style={{ color: '#66B3FF', cursor: 'pointer', margin: '20px', display: 'inline-block' }} onClick={openIndexImg}>优质案例</span>
-        <Modal
-          title={title}
-
-          visible={visible}
-          //  onOk={handleOk}
-          confirmLoading={confirmLoading}
-          onCancel={handleCancel}
-          footer={null}
-        >
-          <Formss formsDate={formsdate} />
-        </Modal>
-        <Table
-          // onRow={record => {
-          //   return {
-          //     onClick: toDrainageDetail(record.drainageId),
-          //   };
-          // }}
-          columns={columns} dataSource={datas.records} pagination={false} rowKey="drainageList" />
-        <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-          <Pagination showQuickJumper defaultCurrent={1} total={datas.total} onChange={(e) => changePageNum(e)} current={datas.current} />
-        </div>
-      </div>
-      <Prompt message={location =>
-        location.pathname.startsWith("/activity/drainage")
-          ? true
-          : localStorage.removeItem("drainageActivePageParams")} />
-    </>
-  )
-}
-const WrappedHeader = Form.create({ name: 'header' })(header);
-
-export default WrappedHeader

src/pages/activity/drainage/components/Basic.jsx

@@ -1,243 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Slider, Row, Col, Button, InputNumber, message } from 'antd';
-import router from 'umi/router';
-import apis from '../../../../services/apis';
-import request from '../../../../utils/request';
-import ImageUploader from './ImageUpload';
-import Styles from './styles.less';
-import BuildSelect from '../../../../components/SelectButton/BuildSelect2'
-import CheckboxGroup from './CheckboxGroup';
-
-function Basic(props) {
-
-    const { id, name } = props
-
-    const [data, setData] = useState({})
-    useEffect(() => {
-        getList();
-    }, [])
-    // 查询列表
-
-    const getList = () => {
-        request({ ...apis.redPacket.detail, urlData: { id } }).then(data => {
-            setData(data)
-        })
-    }
-
-    const updateRedPacket = data => {
-        request({ ...apis.redPacket.update, data: { ...data } }).then(data => {
-            // setData(data)
-            message.success('操作成功')
-        }).catch(() => {
-            message.error('操作失败')
-        })
-    }
-
-
-    function handleSubmit(e) {
-        e.preventDefault();
-        props.form.validateFields((err, values) => {
-            if (!err) {
-                values.activityId = id
-                updateRedPacket(values)
-            }
-        },
-        )
-    }
-
-    const { getFieldDecorator } = props.form
-
-    return (
-
-        <>
-            <Form labelCol={{ span: 8 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
-                <Form.Item label="活动名称">
-                    <span>{data.name}</span>
-                </Form.Item>
-                <Form.Item label="扫码查看" >
-                    <img src={data.qrcode || ''} alt="" style={{ width: '100px' }} />
-                </Form.Item>
-                <Form.Item label="首页背景图" help="建议尺寸：640*1234px，格式:jpg；内容区大小：640*1040px（画面最上和最下部分分别预留640*97px的空间不要放置文字、logo等关键性内容，小屏手机该部分的画面会被遮挡）">
-                    {getFieldDecorator('indexBackgroundImg',
-                        {
-                            initialValue: data.indexBackgroundImg,
-                        })(
-                            <ImageUploader />,
-                        )}
-                </Form.Item>
-                <Form.Item label="分享海报图" help="建议尺寸：750*1206px，格式:jpg；内容区大小：750*1150">
-                    {getFieldDecorator('sharePosterImg',
-                        {
-                            initialValue: data.sharePosterImg,
-                        })(
-                            <ImageUploader />,
-                        )}
-                </Form.Item>
-                <Form.Item label="活动规则图" help="建议尺寸：640*1234px，格式:jpg；内容区大小：640*1040px（画面最上和最下部分分别预留640*97px的空间不要放置文字、logo等关键性内容，小屏手机该部分的画面会被遮挡）">
-                    {getFieldDecorator('activityRulesImg',
-                        {
-                            initialValue: data.activityRulesImg,
-                        })(
-                            <ImageUploader />,
-                        )}
-                </Form.Item>
-                <Form.Item label="助力页背景图" help="建议尺寸：640*1234px，格式:jpg；内容区大小：640*1040px（画面最上和最下部分分别预留640*97px的空间不要放置文字、logo等关键性内容，小屏手机该部分的画面会被遮挡）">
-                    {getFieldDecorator('helpBackgroundImg',
-                        {
-                            initialValue: data.helpBackgroundImg,
-                        })(
-                            <ImageUploader />,
-                        )}
-                </Form.Item>
-                <Form.Item label="排行榜背景图" help="建议尺寸：640*1234px，格式:jpg；内容区大小：640*1040px（画面最上和最下部分分别预留640*97px的空间不要放置文字、logo等关键性内容，小屏手机该部分的画面会被遮挡）">
-                    {getFieldDecorator('rankingBackgroundImg',
-                        {
-                            initialValue: data.rankingBackgroundImg,
-                        })(
-                            <ImageUploader />,
-                        )}
-                </Form.Item>
-                
-                
-                <Form.Item label="邀请好友按钮图" help="尺寸: 191*47px，格式:png, 背景透明, 图片上需带有 邀请好友 字样">
-                    {getFieldDecorator('inviteBtnImg',
-                        {
-                            initialValue: data.inviteBtnImg,
-                        })(
-                            <ImageUploader width="191" height="47" />,
-                        )}
-                </Form.Item>
-                
-                <Form.Item label="活动规则按钮图" help="尺寸: 191*47px，格式:png, 背景透明, 图片上需带有 活动规则 字样">
-                    {getFieldDecorator('ruleBtnImg',
-                        {
-                            initialValue: data.ruleBtnImg,
-                        })(
-                            <ImageUploader width="191" height="47" />,
-                        )}
-                </Form.Item>
-                
-                <Form.Item label="我要参加按钮图" help="尺寸: 191*47px，格式:png, 背景透明, 图片上需带有 我要参加 字样">
-                    {getFieldDecorator('joinBtnImg',
-                        {
-                            initialValue: data.joinBtnImg,
-                        })(
-                            <ImageUploader width="191" height="47" />,
-                        )}
-                </Form.Item>
-                
-                <Form.Item label="查看排名按钮图" help="尺寸: 191*47px，格式:png, 背景透明, 图片上需带有 查看排名 字样">
-                    {getFieldDecorator('topBtnImg',
-                        {
-                            initialValue: data.topBtnImg,
-                        })(
-                            <ImageUploader width="191" height="47" />,
-                        )}
-                </Form.Item>
-                
-                <Form.Item label="返回首页按钮图" help="尺寸: 191*47px，格式:png, 背景透明, 图片上需带有 返回首页 字样">
-                    {getFieldDecorator('homeBtnImg',
-                        {
-                            initialValue: data.homeBtnImg,
-                        })(
-                            <ImageUploader width="191" height="47" />,
-                        )}
-                </Form.Item>
-                
-                <Form.Item label="帮他助力按钮图" help="尺寸: 191*47px，格式:png, 背景透明, 图片上需带有 帮他助力 字样">
-                    {getFieldDecorator('helpBtnImg',
-                        {
-                            initialValue: data.helpBtnImg,
-                        })(
-                            <ImageUploader width="191" height="47" />,
-                        )}
-                </Form.Item>
-                
-                <Form.Item label="返回按钮图" help="尺寸: 191*47px，格式:png, 背景透明, 图片上需带有 返回 字样">
-                    {getFieldDecorator('backBtnImg',
-                        {
-                            initialValue: data.backBtnImg,
-                        })(
-                            <ImageUploader width="191" height="47" />,
-                        )}
-                </Form.Item>
-                
-                <Form.Item label="生成海报按钮图" help="尺寸: 60*60px，格式:png, 背景透明, 图片上需带有 生成海报 字样">
-                    {getFieldDecorator('posterBtnImg',
-                        {
-                            initialValue: data.posterBtnImg,
-                        })(
-                            <ImageUploader width="60" height="60" />,
-                        )}
-                </Form.Item>
-                
-                <Form.Item label="项目详情按钮图" help="尺寸: 60*60px，格式:png, 背景透明, 图片上需带有 项目详情 字样">
-                    {getFieldDecorator('buildingBtnImg',
-                        {
-                            initialValue: data.buildingBtnImg,
-                        })(
-                            <ImageUploader width="60" height="60" />,
-                        )}
-                </Form.Item>
-
-                <Form.Item label="上榜人数限制">
-                    <Row>
-                        <Col span={6}>
-                            {getFieldDecorator('topLimitPersons',
-                                {
-                                    initialValue: typeof data.topLimitPersons === 'number' ? data.topLimitPersons : 0,
-                                })(
-                                    <Slider
-                                        min={5}
-                                        max={100}
-                                        step={1}
-                                    />,
-                                )}
-                        </Col>
-                        <Col span={6}>
-                            {getFieldDecorator('topLimitPersons',
-                                {
-                                })(
-                                    <InputNumber
-                                        min={5}
-                                        max={100}
-                                        style={{ marginLeft: 16 }}
-
-                                    />,
-                                )}
-                        </Col>
-                    </Row>
-                </Form.Item>
-                <Form.Item label="查看楼盘按钮">
-                    {getFieldDecorator('buildingShowPos',
-                        {
-                            initialValue: data.buildingShowPos || 'index',
-                        })(<CheckboxGroup />)}
-                </Form.Item>
-                <Form.Item label="关联楼盘">
-                    {getFieldDecorator('buildingId',
-                        {
-                            initialValue: data.buildingId,
-                        })(
-                            <BuildSelect />,
-                        )}
-                </Form.Item>
-                <Form.Item label="生成海报按钮">
-                    {getFieldDecorator('posterShowPos', {
-                        initialValue: data.posterShowPos || 'index',
-                    })(<CheckboxGroup />)}
-                </Form.Item>
-                <Form.Item wrapperCol={{ span: 15, offset: 8 }}>
-                    <div style={{ width: '190px' }}>
-                        <Button type="primary" style={{ marginRight: '20px' }} htmlType="submit">保存</Button>
-                    </div>
-                </Form.Item>
-            </Form>
-        </>
-
-    )
-}
-
-const WrappedBasic = Form.create({ name: 'Basic' })(Basic);
-
-export default WrappedBasic

src/pages/activity/drainage/components/CheckboxGroup.jsx

@@ -1,46 +0,0 @@
-import React from 'react'
-import { Checkbox, Row, Col } from 'antd'
-import classNames from 'classnames'
-
-import Styles from './styles.less';
-
-const DataDict = [
-    {
-        label: '首页',
-        value: 'index',
-    },
-    {
-        label: '助力页',
-        value: 'help',
-    },
-    {
-        label: '活动规则页',
-        value: 'rule',
-    },
-]
-
-export default props => {
-    const { value, onChange } = props;
-    const vals = (value || '').split(',');
-    const handleChange = e => {
-        onChange(e.join(','));
-    }
-
-    return (
-        <Checkbox.Group className={Styles.Checkboxs} onChange={handleChange} style={{ width: '100%' }} value={vals}>
-            <Row>
-                {
-                    DataDict.map(item => {
-                        const key = item.value;
-                        return (
-                            <Col span={6} key={key}>
-                                <Checkbox className={classNames({ [Styles.CheckboxStytle]: vals.indexOf(item.value) > -1 })} value={item.value} >{item.label}</Checkbox>
-                            </Col>
-                        );
-                    })
-                }
-            </Row>
-        </Checkbox.Group>
-    );
-
-}

src/pages/activity/drainage/components/CustomerData.jsx

@@ -1,211 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, Avatar } from 'antd';
-import router from 'umi/router';
-import moment from 'moment';
-import apis from '../../../../services/apis';
-import request from '../../../../utils/request';
-
-const { RangePicker } = DatePicker
-
-const formateValue = v => {
-    const { date, ...values } = v
-
-    console.log(date)
-    return {
-        ...values,
-        startTime: date && date[0] ? `${date[0].format('YYYY-MM-DDT00:00:00')}Z` : undefined,
-        endTime: date && date[1] ? `${date[1].format('YYYY-MM-DDT23:59:59')}Z` : undefined,
-    }
-}
-
-function CustomerData(props) {
-
-    const { id, drainageId } = props
-    // const [taNoticeList, setTaNoticeList] = useState([])
-    const [data, setData] = useState({})
-
-    useEffect(() => {
-        getList({ pageNum: 1, pageSize: 10 });
-    }, [])
-    // 查询列表
-
-    const getList = params => {
-        // const { LocalDate, ...values } = params
-        // if (LocalDate != null && LocalDate.length > 0) {
-        //     const [refundStartTime, refundEndTime] = LocalDate
-        //     values.refundStartTime = `${moment(refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
-        //     values.refundEndTime = `${moment(refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
-        // } else {
-        //     values.refundStartTime = null
-        //     values.refundEndTime = null
-        // }
-        console.log(params, 'params')
-        request({ ...apis.redPacket.getRecordByConditionList, params: { ...params, activityId: id, drainageId } }).then(data => {
-            setData(data)
-        })
-    }
-
-    const changePageNum = pageNumber => {
-        props.form.validateFields((err, values) => {
-            if (!err) {
-                getList({ pageNum: pageNumber, pageSize: 10, ...formateValue(values) })
-            }
-        });
-    }
-
-    function handleSubmit(e) {
-        e.preventDefault();
-        props.form.validateFields((err, values) => {
-            if (!err) {
-                // eslint-disable-next-line no-console
-                console.log('提交数据: ', values)
-                getList({
-                    pageNum: 1,
-                    pageSize: 10,
-                    ...formateValue(values),
-                })
-            }
-        });
-    }
-
-    function handleReset() {
-        props.form.resetFields();
-
-        getList({ pageNum: 1, pageSize: 10 })
-    }
-
-    const columns = [
-        {
-            title: '头像',
-            dataIndex: 'avatarurl',
-            key: 'avatarurl',
-            align: 'center',
-            render: (x, row) => <img src={row.avatarurl} alt="" width="64px"></img >,
-        },
-        {
-            title: '昵称',
-            dataIndex: 'nickname',
-            key: 'nickname',
-            align: 'center',
-        },
-        {
-            title: '姓名',
-            dataIndex: 'name',
-            key: 'name',
-            align: 'center',
-        },
-        {
-            title: '手机号',
-            dataIndex: 'phone',
-            key: 'phone',
-            align: 'center',
-        },
-        {
-            title: '访问时间',
-            dataIndex: 'visitTime',
-            key: 'visitTime',
-            align: 'center',
-            render: (x, row) => <><span>{`${moment(row.visitTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-        },
-        {
-            title: '分享人昵称',
-            dataIndex: 'sharePersonNickname',
-            key: 'sharePersonNickname',
-            align: 'center',
-            render: (x, row) => <><span>{row.sharePersonNickname || row.sharePersonName}</span></>,
-        },
-        {
-            title: '分享人手机号',
-            dataIndex: 'sharePersonPhone',
-            key: 'sharePersonPhone',
-            align: 'center',
-        },
-    ]
-
-    function download(data) {
-        if (!data) {
-            console.log('234')
-            return
-        }
-        const url = window.URL.createObjectURL(new Blob([data]))
-        const link = document.createElement('a')
-        link.style.display = 'none'
-        link.href = url
-        link.setAttribute('download', '客户数据.xlsx')
-        document.body.append(link)
-        link.click()
-    }
-
-    // ...formateValue(values)
-    const exportReport = () => {
-        props.form.validateFields((err, values) => {
-            if (!err) {
-                request({ ...apis.redPacket.exportVisitRecordByCondition, responseType: 'blob', params: { ...formateValue(values), activityId: id, drainageId } }).then(data => {
-                    download(data)
-                }).catch()
-            }
-        });
-
-    }
-
-    const { getFieldDecorator } = props.form
-
-    return (
-
-        <>
-            <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-                <Form.Item>
-                    {getFieldDecorator('phone')(
-                        <Input
-                            placeholder="手机号"
-                        />,
-                    )}
-                </Form.Item>
-
-                <Form.Item>
-                    {getFieldDecorator('date')(
-                        <RangePicker placeholder={['访问开始时间', '访问结束时间']} />,
-                    )}
-                </Form.Item>
-
-                {/* <Form.Item>
-                    {getFieldDecorator('startTime')(
-                        <DatePicker placeholder="访问开始时间" />,
-                    )}
-                </Form.Item>
-                <Form.Item>
-                    {getFieldDecorator('endTime')(
-                        <DatePicker placeholder="访问结束时间" />,
-                    )}
-                </Form.Item> */}
-                <Form.Item>
-                    {getFieldDecorator('sharePersonPhone')(
-                        <Input
-                            placeholder="分享人手机号"
-                        />,
-                    )}
-                </Form.Item>
-                <Form.Item>
-                    <Button type="primary" htmlType="submit"> 搜索</Button>
-                    <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
-                </Form.Item>
-            </Form>
-            <div style={{ marginTop: '20px' }}>
-                <span style={{ lineHeight: '32px' }}>共筛选出{data.total}条数据</span>
-                <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
-            </div>
-            <Table dataSource={data.records} columns={columns} pagination={false} style={{ marginTop: '20px' }} />
-            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-                <Pagination
-                    showQuickJumper
-                    defaultCurrent={1}
-                    total={data.total} onChange={e => changePageNum(e)} current={data.current} />
-            </div>
-        </>
-
-    )
-}
-
-const WrappedCustomerData = Form.create({ name: 'CustomerData' })(CustomerData);
-
-export default WrappedCustomerData

src/pages/activity/drainage/components/Help.jsx

@@ -1,198 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, InputNumber, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb, DatePicker } from 'antd';
-import router from 'umi/router';
-import moment from 'moment';
-import apis from '../../../../services/apis';
-import request from '../../../../utils/request';
-
-const { RangePicker } = DatePicker;
-
-function validatorNum(rule, value, callback) {
-    callback(value < 1 || value > 1000 ? '人数必须大于0 小于 1000' : undefined);
-}
-
-function Help(props) {
-
-    const { id, name } = props
-
-    // const [taNoticeList, setTaNoticeList] = useState([])
-    const [data, setData] = useState({})
-
-    useEffect(() => {
-        getHelpDetail();
-    }, [])
-    // 查询列表
-
-    const getHelpDetail = () => {
-        request({ ...apis.redPacket.helpDetail, urlData: { id } }).then(data => {
-            data.date = [moment(data.startDate), moment(data.endDate)]
-            setData(data)
-        })
-    }
-
-    const updateRedPacket = values => {
-
-        const [startDate, endDate] = values.date
-        console.log(values.date)
-        values.startDate = `${moment(startDate).format('YYYY-MM-DDTHH:mm:ss.000')}Z`
-        values.endDate = `${moment(endDate).format('YYYY-MM-DDTHH:mm:ss.000')}Z`
-        values.activityId = id
-        request({ ...apis.redPacket.updateHelp, urlData: { id }, data: { ...values } }).then(data => {
-            message.info('操作成功')
-        }).catch(() => {
-            message.error('操作失败')
-        })
-    }
-
-    function handleSubmit(e) {
-        e.preventDefault();
-        props.form.validateFields((err, values) => {
-            if (!err) {
-                console.log(values, '------222-------')
-
-                // date
-
-                // values.
-                updateRedPacket(values)
-            }
-        },
-        )
-    }
-
-    const { getFieldDecorator } = props.form
-
-    return (
-
-        <>
-            <Form labelCol={{ span: 8 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
-                <Form.Item label="助力成功需要人数">
-                    {getFieldDecorator('helpSuccesPersons', {
-                        initialValue: data.helpSuccesPersons || 3,
-                        rules: [
-                            { required: true, message: '请设置 助力成功需要人数' },
-                            { validator: validatorNum },
-                        ],
-                    },
-                    )(
-                        <InputNumber min={1} max={1000} />,
-                    )}
-                </Form.Item>
-                <Form.Item label="单人每日助力次数限制">
-                    {getFieldDecorator('limitNumPerDay', {
-                        initialValue: data.limitNumPerDay || 3,
-                        rules: [
-                            { required: true, message: '请设置 单人每日助力次数限制' },
-                            { validator: validatorNum },
-                        ],
-                    })(
-                        <InputNumber min={1} max={1000} />,
-                    )}
-                </Form.Item>
-                <Form.Item label="超出时提示文案">
-                    {getFieldDecorator('limitPerDayIllegalTip', {
-                        initialValue: data.limitPerDayIllegalTip || '每人每天最多只能助力3次',
-                        rules: [
-                            { required: true, message: '请设置 超出时提示文案' },
-                        ],
-                    })(
-                        <Input placeholder="每人每天最多只能助力3次" />,
-                    )}
-                </Form.Item>
-                <Form.Item label="单人总助力次数限制">
-                    {getFieldDecorator('limitNumPerPerson', {
-                        initialValue: data.limitNumPerPerson || 3,
-                        rules: [
-                            { required: true, message: '请设置 单人总助力次数限制' },
-                            { validator: validatorNum },
-                        ],
-                    })(
-                        <InputNumber min={1} max={1000} />,
-                    )}
-                </Form.Item>
-                <Form.Item label="超出时提示文案">
-                    {getFieldDecorator('limitPerPersonIllegalTip', {
-                        initialValue: data.limitPerPersonIllegalTip || '每人最多只能为他人助力3次',
-                        rules: [
-                            { required: true, message: '请设置 超出时提示文案' },
-                        ],
-                    })(
-                        <Input placeholder="每人最多只能为他人助力3次" />,
-                    )}
-                </Form.Item>
-                <Form.Item label="为同一人助力次数限制">
-                    {getFieldDecorator('limitNumForEachPerson', {
-                        initialValue: data.limitNumForEachPerson || 1,
-                        rules: [
-                            { required: true, message: '请设置 为同一人助力次数限制' },
-                            { validator: validatorNum },
-                        ],
-                    })(
-                        <InputNumber min={1} max={1000} />,
-                    )}
-                </Form.Item>
-                <Form.Item label="超出时提示文案">
-                    {getFieldDecorator('limitForEachPersonIllegalTip', {
-                        initialValue: data.limitForEachPersonIllegalTip || '只能为同一人助力1次',
-                        rules: [
-                            { required: true, message: '请设置 超出时提示文案' },
-                        ],
-                    })(
-                        <Input placeholder="只能为同一人助力1次" />,
-                    )}
-                </Form.Item>
-                <Form.Item label="助力成功时提示文案">
-                    {getFieldDecorator('successTip', {
-                        initialValue: data.successTip || '助力成功！快去告诉你的好友吧',
-                        rules: [
-                            { required: true, message: '请设置 助力成功时提示文案' },
-                        ],
-                    })(
-                        <Input placeholder="助力成功！快去告诉你的好友吧" />,
-                    )}
-                </Form.Item>
-                <Form.Item label="其他无法助力时提示文案">
-                    {getFieldDecorator('warnningTip', {
-                        initialValue: data.warnningTip || '无法助力！具体原因请看活动规则',
-                        rules: [
-                            { required: true, message: '请设置 其他无法助力时提示文案' },
-                        ],
-                    })(
-                        <Input placeholder="无法助力！具体原因请看活动规则" />,
-                    )}
-                </Form.Item>
-                <Form.Item label="活动开始～结束时间">
-                    {getFieldDecorator('date', {
-                        initialValue: data.date || [],
-                        rules: [
-                            { required: true, message: '请设置 活动开始～结束时间' },
-                        ],
-                    })(
-                        <RangePicker showTime={{ format: 'HH:mm:ss' }} />,
-                    )}
-                </Form.Item>
-                <Form.Item label="活动结束提示文案">
-                    {getFieldDecorator('activityEndTip', {
-                        initialValue: data.activityEndTip,
-                        rules: [
-                            { required: true, message: '请设置 活动结束提示文案' },
-                        ],
-                    })(
-                        <Input placeholder="活动已经结束啦" />,
-                    )}
-                </Form.Item>
-
-
-                <Form.Item wrapperCol={{ span: 15, offset: 8 }}>
-                    <div style={{ width: '190px' }}>
-                        <Button type="primary" style={{ marginRight: '20px' }} htmlType="submit">保存</Button>
-                        {/* <Button onClick={() => router.go(-1)} >取消</Button> */}
-                    </div>
-                </Form.Item>
-            </Form></>
-
-    )
-}
-
-const WrappedHelp = Form.create({ name: 'Help' })(Help);
-
-export default WrappedHelp

src/pages/activity/drainage/components/ImageUpload.jsx

@@ -1,110 +0,0 @@
-import React from 'react';
-import { Upload, Icon, message } from 'antd';
-// import './style.less';
-import { uploaderProps } from '../../../../utils/upload';
-import './style.less';
-
-
-class ImageUpload extends React.Component {
-    state = {
-        loading: false,
-        imageUrl: undefined,
-    };
-
-    handleChange = info => {
-        if (info.file.status === 'uploading') {
-            this.setState({ loading: true });
-            return;
-        }
-
-        if (info.file.status === 'removed') {
-            this.props.onChange();
-        }
-
-        // if (info.file.status === "done") {
-        //   this.setState({
-        //     loading: false,
-        //   })
-
-        //   if (info.file.response && info.file.response.url) {
-        //     this.setState({
-        //       imageUrl: info.file.response.thumbUrl,
-        //     });
-
-        //     if (typeof this.props.onChange === 'function') {
-        //       this.props.onChange(info.file.response.url);
-        //     }
-        //   }
-        // }
-    };
-
-    // {(this.state.imageUrl || value) ? (
-    //   <img src={this.state.imageUrl || value} alt="avatar" style={{ width: "100%" }} />
-    // ) : (
-    //     uploadButton
-    //   )}
-
-    handleUploadSucess = (url) => {
-        this.setState({ loading: false });
-        if (typeof this.props.onChange === 'function') {
-            this.props.onChange(url);
-        }
-    }
-
-    render() {
-        const uploadButton = (
-            <div>
-                <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? 'loading' : 'plus'} />
-            </div>
-        );
-
-        // width: 150px;
-        // height: 241px;
-        const boundStyle = {
-            width: `${this.props.width || 150}px`,
-            height: `${this.props.height || 150}px`,
-            marginTop: '10px',
-        }
-        
-        const { value } = this.props;
-        return (
-            <>
-                {!(this.state.imageUrl || value) && <div style={boundStyle}> <Upload
-                    listType="picture-card"
-                    className="avatar-uploader avatar-newupdate"
-                    showUploadList={false}
-                    beforeUpload={this.props.beforeUpload}
-                    onChange={this.handleChange}
-                    {...uploaderProps}
-                    disabled={this.props.disabled}
-                    onSuccess={this.handleUploadSucess}
-
-                >
-                    {uploadButton}
-                </Upload>
-                </div>
-                }
-                {(this.state.imageUrl || value) && <div className="uploadbox" style={boundStyle}>
-                    <img className="img" src={this.state.imageUrl || value} alt="avatar" style={{ width: '100%' }} ></img>
-
-                    <Upload
-                        listType="picture-card"
-                        // className={}
-                        className="avatar-uploader avatar-update"
-                        showUploadList={false}
-                        beforeUpload={this.props.beforeUpload}
-                        onChange={this.handleChange}
-                        {...uploaderProps}
-                        disabled={this.props.disabled}
-                        onSuccess={this.handleUploadSucess}
-                    >
-                        更换
-                </Upload>
-                </div>}
-
-            </>
-        );
-    }
-}
-
-export default ImageUpload;

src/pages/activity/drainage/components/Ranking.jsx

@@ -1,148 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Avatar } from 'antd';
-import router from 'umi/router';
-import moment from 'moment';
-import apis from '../../../../services/apis';
-import request from '../../../../utils/request';
-
-function Ranking(props) {
-
-    const { id } = props
-    // const [taNoticeList, setTaNoticeList] = useState([])
-    const [data, setData] = useState({})
-
-    useEffect(() => {
-        getList({ pageNum: 1, pageSize: 10 });
-    }, [])
-    // 查询列表
-
-    const getList = params => {
-        request({ ...apis.redPacket.getRedPacketRankingList, params: { ...params, activityId: id } }).then(data => {
-            setData(data)
-        })
-    }
-
-    function handleSubmit(e) {
-        e.preventDefault();
-        props.form.validateFields((err, values) => {
-            if (!err) {
-                // eslint-disable-next-line no-console
-                console.log('提交数据: ', values)
-                getList({ pageNum: 1, pageSize: 10, ...values })
-            }
-        });
-    }
-
-    const changePageNum = pageNumber => {
-        props.form.validateFields((err, values) => {
-            if (!err) {
-                getList({ pageNum: pageNumber, pageSize: 10, ...values })
-            }
-        });
-    }
-
-    function handleReset() {
-        props.form.resetFields();
-
-        getList({ pageNum: 1, pageSize: 10 })
-    }
-
-    const columns = [
-        {
-            title: '头像',
-            dataIndex: 'avatarurl',
-            key: 'avatarurl',
-            align: 'center',
-            render: (x, row) => <img src={row.avatarurl} alt="" width="64px"></img >,
-        },
-        {
-            title: '昵称',
-            dataIndex: 'nickname',
-            key: 'nickname',
-            align: 'center',
-        },
-        {
-            title: '姓名',
-            dataIndex: 'name',
-            key: 'name',
-            align: 'center',
-        },
-        {
-            title: '手机号',
-            dataIndex: 'phone',
-            key: 'phone',
-            align: 'center',
-        },
-        {
-            title: '发起时间',
-            dataIndex: 'createDate',
-            key: 'createDate',
-            align: 'center',
-            render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-        },
-        {
-            title: '助力人数',
-            dataIndex: 'votes',
-            key: 'votes',
-            align: 'center',
-        },
-    ]
-
-    function download(data) {
-        // if (!data) {
-        //     console.log('234')
-        //     return
-        // }
-        const url = window.URL.createObjectURL(new Blob([data]))
-        const link = document.createElement('a')
-        link.style.display = 'none'
-        link.href = url
-        link.setAttribute('download', '排行榜.xlsx')
-        document.body.append(link)
-        link.click()
-    }
-
-    const exportReport = () => {
-
-        request({ ...apis.redPacket.exportRedPacketRankingList, responseType: 'blob', params: { ...props.form.getFieldsValue(), activityId: id } }).then(data => {
-            download(data)
-        }).catch()
-    }
-    const { getFieldDecorator } = props.form
-
-    return (
-
-        <>
-            <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-                <Form.Item>
-                    {getFieldDecorator('phone')(
-                        <Input
-                            placeholder="手机号"
-                        />,
-                    )}
-                </Form.Item>
-                <Form.Item>
-                    <Button type="primary" htmlType="submit"> 搜索</Button>
-                    <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
-                </Form.Item>
-            </Form>
-            <div style={{ marginTop: '20px' }}>
-                <span style={{ lineHeight: '32px' }}>共筛选出{data.total}条数据</span>
-                <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
-            </div>
-            <Table dataSource={data.records} columns={columns} pagination={false} style={{ marginTop: '20px' }} />
-            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-                <Pagination
-                    showQuickJumper
-                    defaultCurrent={1}
-                    total={data.total} onChange={e => changePageNum(e)} current={data.current} />
-            </div>
-        </>
-
-    )
-}
-
-
-const WrappedRanking = Form.create({ name: 'Ranking' })(Ranking);
-
-export default WrappedRanking

src/pages/activity/drainage/components/RedPacket.jsx

@@ -1,218 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Row, Col, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb, InputNumber } from 'antd';
-import router from 'umi/router';
-import moment from 'moment';
-import Navigate from '@/components/Navigate';
-import apis from '../../../../services/apis';
-import request from '../../../../utils/request';
-import Styles from './styles.less';
-
-
-function RedPacket(props) {
-
-    const { id, name } = props
-    // const [taNoticeList, setTaNoticeList] = useState([])
-    const [data, setData] = useState({})
-
-    useEffect(() => {
-        getMoneyDetail()
-        // getList({ pageNum: 1, pageSize: 10 });
-    }, [])
-    // 查询列表
-    //     moneyDetail
-    // updateMoney
-
-    const getMoneyDetail = () => {
-        request({ ...apis.redPacket.moneyDetail, urlData: { id } }).then(data => {
-            setData(data)
-        })
-    }
-
-    const updateRedPacket = data => {
-        request({ ...apis.redPacket.updateMoney, urlData: { id }, data: { ...data } }).then(data => {
-            // setData(data)
-            message.info('操作成功')
-        })
-    }
-
-    function handleSubmit(e) {
-        e.preventDefault();
-        props.form.validateFields((err, values) => {
-            if (!err) {
-                values.budget = Math.round(values.budget * 100)
-                values.minPacket = Math.round(values.minPacket * 100)
-                values.maxPacket = Math.round(values.maxPacket * 100)
-                console.log(values, '------222-------')
-                // values
-                updateRedPacket(values)
-            }
-        },
-        )
-    }
-
-    const toRecharge = () => {
-
-        router.push({
-            pathname: '/funds/accountfunds',
-        })
-    }
-
-
-    const { getFieldDecorator } = props.form
-    const { taRedPacketClient } = data
-
-    return (
-
-        <>
-            <Row style={{ marginBottom: '40px' }}>
-                <Col span={8} style={{ paddingRight: '30px' }}>
-                    <div className={Styles.redHeader}>
-                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>账户余额/元</span><span className={Styles.redHeaderTopNum}>{data.availableBalance / 100 || 0}</span></div>
-                        <div className={Styles.redHeaderBottom}> <Navigate onClick={() => toRecharge()}>去充值</Navigate></div>
-                    </div>
-                </Col>
-                <Col span={8} style={{ padding: '0 10px' }}>
-                    <div className={Styles.redHeader}>
-                        {/* packetSendedNum */}
-                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>已发送红包总数量/个</span><span className={Styles.redHeaderTopNum}>{data.sendNum || 0}</span></div>
-                        <div className={Styles.redHeaderBottom}><Navigate onClick={() => props.toDetail()}>查看详情</Navigate></div>
-                    </div>
-                </Col>
-                <Col span={8} style={{ paddingLeft: '30px' }}>
-                    <div className={Styles.redHeader}>
-                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>已发送红包金额/元</span><span className={Styles.redHeaderTopNum}>{data.sendTotalAmount / 100 || 0}</span></div>
-                        <div className={Styles.redHeaderBottom}><Navigate onClick={() => props.toDetail(1)}>查看详情</Navigate></div>
-                    </div>
-                </Col>
-            </Row>
-            <Form labelCol={{ span: 8 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
-                <Form.Item label="本次红包预算/元">
-                    {getFieldDecorator('budget', {
-                        initialValue: data.budget / 100,
-                        rules: [
-
-                            { required: true, message: '请设置合适的红包预算金额', pattern: new RegExp('^[0-9]{1,5}([.][0-9]{1,2})?$') },
-                            {
-                                validator: (rule, value, callback) => {
-                                    callback(value > (data.availableBalance + data.sendTotalAmount) / 100 ? '预算超支' : value < data.sendTotalAmount / 100 ? '红包预算不能小于已发送红包金额' : undefined)
-                                }
-                            }
-                        ],
-                    },
-                    )(
-                        <Input type="number"
-                            // formatter={value => `$ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
-                            // parser={value => value.replace(/\$\s?|(,*)/g, '')}
-                            min={0}
-                            max={99999}
-                            step={0.01}
-                        />,
-                    )}
-                </Form.Item>
-                <Form.Item label="单个红包金额范围/元">
-                    {getFieldDecorator('minPacket', {
-                        initialValue: data.minPacket / 100 || 3,
-                        rules: [
-                            { required: true, message: '请设置合适的最小红包值', pattern: new RegExp('^[0-9]{1,5}([.][0-9]{1,2})?$') },
-                        ],
-                    })(
-                        <InputNumber min={1} max={199} />,
-                    )}~
-                     {getFieldDecorator('maxPacket', {
-                        initialValue: data.maxPacket / 100 || 3,
-                        rules: [
-                            { required: true, message: '请设置合适的最大红包值', pattern: new RegExp('^[0-9]{1,5}([.][0-9]{1,2})?$') },
-                        ],
-                    })(
-                        <InputNumber min={1} max={199} />,
-                    )}
-                </Form.Item>
-                {/*  */}
-                <Form.Item label="发放红包个数上限">
-                    {getFieldDecorator('limitPacketNum', {
-                        initialValue: data.limitPacketNum === -1 ? -1 : data.limitPacketNum,
-                        rules: [
-                            // { required: false, message: '请设置合适的发放红包个数上限', pattern: new RegExp('^[0-9]{1,99}\d*$') }, help="-1为不限制红包个数" 
-                            {
-                                validator: (rule, value, callback) => {
-                                    // callback(((value > data.sendNum || data.limitPacketNum === -1) ? undefined : '不能小于已发送个数'))
-                                    callback(value >= data.sendNum ? undefined : value == -1 ? undefined : '不能小于已发送个数')
-                                },
-                            },
-
-                        ],
-                    })(<InputNumber precision={0} min={-1} />,
-                    )} -1为不限制红包个数
-                </Form.Item>
-                {/* <Form.Item label="余额或预算不足时提示文案">
-                    {getFieldDecorator('insufficientBalanceTip', {
-                        initialValue: data.insufficientBalanceTip || '红包已发送完毕，谢谢您的参与',
-                        rules: [
-                            { required: true, message: '请设置余额或预算不足时提示文案' },
-                        ],
-                    })(
-                        <Input placeholder="红包已发送完毕，谢谢您的参与" />,
-                    )}
-                </Form.Item> */}
-                {/* font-size:22px;
-font-family:PingFangSC-Medium,PingFang SC;
-font-weight:500;
-color:rgba(102,102,102,1); */}
-                <Row>
-                    <Col span={8} style={{ textAlign: 'end', fontSize: '0.13rem', fontWeight: '500', color: 'rgba(102,102,102,1)', padding: '0 0.076rem' }}>配置消息</Col>
-                </Row>
-                <Form.Item label="商户名称" >
-                    {getFieldDecorator('mchName', {
-                        initialValue: data.mchName,
-                        rules: [
-                            { required: true, message: '请设置商户名称' },
-                            { max: 10, message: '标商户名称长度不能超过10个字符' }
-                        ],
-                    })(
-                        <Input placeholder="{小程序名}" />,
-                    )}
-                </Form.Item>
-                <Form.Item label="红包祝福语">
-                    {getFieldDecorator('blessing', {
-                        initialValue: data.blessing,
-                        rules: [
-                            { required: true, message: '请设置红包祝福语' },
-                        ],
-                    })(
-                        <Input placeholder="祝您中个大红包！" />,
-                    )}
-                </Form.Item>
-                <Form.Item label="活动名称">
-                    {getFieldDecorator('activityName', {
-                        initialValue: data.activityName,
-                        rules: [
-                            { required: true, message: '请设置活动名称' },
-                        ],
-                    })(
-                        <Input placeholder="{活动标题}" />,
-                    )}
-                </Form.Item>
-                <Form.Item label="备注">
-                    {getFieldDecorator('remark', {
-                        initialValue: data.remark,
-                        rules: [
-                            { required: true, message: '请设置remark' },
-                        ],
-                    })(
-                        <Input placeholder="点我拆红包" />,
-                    )}
-                </Form.Item>
-                <Form.Item wrapperCol={{ span: 15, offset: 8 }}>
-                    <div style={{ width: '190px' }}>
-                        <Button type="primary" style={{ marginRight: '20px' }} htmlType="submit">保存</Button>
-                        {/* <Button onClick={() => router.go(-1)} >取消</Button> */}
-                    </div>
-                </Form.Item>
-            </Form></>
-
-    )
-}
-
-const WrappedRedPacket = Form.create({ name: 'RedPacket' })(RedPacket);
-
-export default WrappedRedPacket

src/pages/activity/drainage/components/RedPacketRecord.jsx

@@ -1,163 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb } from 'antd';
-import router from 'umi/router';
-import moment from 'moment';
-import apis from '../../../../services/apis';
-import request from '../../../../utils/request';
-
-const TradingStatus = {
-    // processing: '进行中',
-    success: '成功',
-    fail: '失败',
-}
-
-function RedPacketRecord(props) {
-
-    // const [taNoticeList, setTaNoticeList] = useState([])
-
-    const { id, toRedPacketRecord } = props
-    const [data, setData] = useState({})
-
-    useEffect(() => {
-        console.log(toRedPacketRecord, 'toRedPacketRecord')
-        if (toRedPacketRecord === 1) {
-            props.form.setFieldsValue({ tradingStatus: 'success' })
-            getList({ pageNum: 1, pageSize: 10, tradingStatus: 'success' });
-        } else { getList({ pageNum: 1, pageSize: 10 }); }
-
-    }, [])
-    // 查询列表
-
-    const getList = params => {
-        request({ ...apis.redPacket.listSendRecord, params: { ...params, activityId: id } }).then(data => {
-            setData(data)
-        })
-    }
-
-    function handleSubmit(e) {
-        e.preventDefault();
-        props.form.validateFields((err, values) => {
-            if (!err) {
-                // eslint-disable-next-line no-console
-                console.log('提交数据: ', values)
-                getList({ pageNum: 1, pageSize: 10, ...values })
-            }
-        });
-    }
-
-    function handleReset() {
-        props.form.resetFields();
-
-        getList({ pageNum: 1, pageSize: 10 })
-    }
-
-    const changePageNum = pageNumber => {
-        props.form.validateFields((err, values) => {
-            if (!err) {
-                getList({ pageNum: pageNumber, pageSize: 10, ...values })
-            }
-        });
-    }
-
-    const columns = [
-        {
-            title: '订单号',
-            dataIndex: 'tradeNo',
-            key: 'tradeNo',
-            align: 'center',
-        },
-        {
-            title: '用户昵称',
-            dataIndex: 'nickname',
-            key: 'nickname',
-            align: 'center',
-        },
-        {
-            title: '头像',
-            dataIndex: 'avatarurl',
-            key: 'avatarurl',
-            align: 'center',
-            render: (x, row) => <img src={row.avatarurl} alt="" width="64px"></img >,
-        },
-        {
-            title: '手机号',
-            dataIndex: 'phone',
-            key: 'phone',
-            align: 'center',
-        },
-        {
-            title: '发放时间',
-            key: 'createDate',
-            align: 'center',
-            render: (x, row) => <span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span>,
-        },
-        {
-            title: '金额（元）',
-            dataIndex: 'amount',
-            key: 'amount',
-            align: 'center',
-            render: x => <span>{x / 100}</span >,
-        },
-        {
-            title: '发送状态',
-            dataIndex: 'tradingStatus',
-            key: 'tradingStatus',
-            align: 'center',
-            render: x => <span>{TradingStatus[x] || ''}</span>,
-        },
-    ]
-
-    const { getFieldDecorator } = props.form
-
-    return (
-
-        <>
-            <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-                <Form.Item>
-                    {getFieldDecorator('tradeNo')(
-                        <Input
-                            placeholder="订单号"
-                        />,
-                    )}
-                </Form.Item>
-                <Form.Item>
-                    {getFieldDecorator('phone')(
-                        <Input
-                            placeholder="手机号"
-                        />,
-                    )}
-                </Form.Item>
-                <Form.Item>
-                    {getFieldDecorator('tradingStatus')(
-                        <Select style={{ width: '180px' }} placeholder="发送状态">
-                            <option value="">全部</option>
-                            {
-                                Object.keys(TradingStatus).map(k => {
-                                    const key = `tds-${k}`;
-                                    return (<option key={key} value={k}>{TradingStatus[k]}</option>);
-                                })
-                            }
-                        </Select>,
-                    )}
-                </Form.Item>
-                <Form.Item>
-                    <Button type="primary" htmlType="submit"> 搜索</Button>
-                    <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
-                </Form.Item>
-            </Form>
-
-            <Table dataSource={data.records} columns={columns} pagination={false} rowKey={r => r.qrCodeId} style={{ marginTop: '20px' }} />
-            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-                <Pagination
-                    showQuickJumper
-                    defaultCurrent={1}
-                    total={data.total} onChange={e => changePageNum(e)} current={data.current} />
-            </div>
-        </>
-
-    )
-}
-
-const WrappedRedPacketRecord = Form.create({ name: 'RedPacketRecord' })(RedPacketRecord);
-
-export default WrappedRedPacketRecord

src/pages/activity/drainage/components/style.less

@@ -1,120 +0,0 @@
-:global {
-  .avatar-newupdate{
-    width: 100%;
-    height: 100%;
-    & > .ant-upload {
-      width: 100%;
-        height: 100%;
-    }
-    
-  }
-  
-  // > .ant-upload{
-  //   width: 100%;
-  //   height: 100%;
-  // }
-  .avatar-update {
-    & > .ant-upload {
-      width:36px;
-      height:25px;
-      border: none;
-      font-size:18px;
-      // font-family:PingFangSC-Medium,PingFang SC;
-      font-weight:500;
-      color:rgba(255,255,255,1);
-      line-height:25px;
-      padding: 0;
-      margin: 0;
-      border: none;
-      background: none;
-      // position: absolute;
-     .ant-upload{
-        padding: 0;
-        color:#fff;
-        // position: relative;
-      }
-    }
-  }
- .uploadbox {
-   margin-top: 10px;
-  position: relative;
-  width: 150px;
-  height: 241px;
- 
-  .img{
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    border-radius:7px;
-    border:1px solid rgba(156,156,156,1);
-  }
-  .avatar-update{
-    width: 100%;
-    text-align: center;
-    position: absolute;
-    bottom: 0;
-    left: 50%;
-    transform: translate(-50%, 0);
-    // margin: 0 auto;
-
-    .ant-upload {
-      width: 100%;
-      text-align: center;
-      background-color: rgba(0,0,0,0.2);
-    }
-  }
-}
-}
-
-.avatar-uploader{
-  width: 100%;
-  height: 100%;
-}
-
-
-
-/* you can make up upload button and sample style by using stylesheets */
-.ant-upload-select-picture-card i {
-  font-size: 32px;
-  color: #999;
-}
-
-.ant-upload-select-picture-card .ant-upload-text {
-  margin-top: 8px;
-  color: #666;
-}
-
-.ant-checkbox-inner {
-  background-color: #EF273A !important;
-}
-
-.Checkboxs {
-  background-color: #EF273A !important;
-}
-
-.img {
-  position: absolute;
-}
-
-.avatar-update > .ant-upload {
-  width:36px;
-height:25px;
-border: none;
-font-size:18px;
-// font-family:PingFangSC-Medium,PingFang SC;
-font-weight:500;
-color:rgba(255,255,255,1);
-line-height:25px;
-padding: 0;
-}
-
-.avatar-update{
-  
-  width:36px;
-height:25px !important;
-// font-size:18px;
-// font-family:PingFangSC-Medium,PingFang SC;
-// font-weight:500;
-// color:rgba(255,255,255,1);
-// line-height:25px;
-}

src/pages/activity/drainage/components/styles.less

@@ -1,39 +0,0 @@
-
-  .CheckboxStytle {
-    color: #EF273A;
-    
-  }
-
-  .redHeader{
-    height: 150px;
-    background:rgba(249,249,249,1);
-    border-radius:12px;
-    padding: 0 24px;
-    .redHeaderTop{
-      text-align: center;
-      height: 97px;
-      font-family:PingFangSC-Regular,PingFang SC;
-      font-weight:400;
-      
-      line-height:97px;
-      display: flex;
-      justify-content: center;
-      .redHeaderTopText{
-        font-size:18px;
-        color:rgba(51,51,51,1);
-      }
-      .redHeaderTopNum{
-        font-size:48px;
-        font-family:PingFangSC-Medium,PingFang SC;
-        font-weight:500;
-        color:rgba(255,126,72,1);
-
-      }
-    }
-    .redHeaderBottom{
-      border-top:1px solid rgba(216,216,216,1);
-      height: 53px;
-      text-align: center;
-      line-height: 53px;
-    }
-  }

src/pages/activity/drainage/detailDrainage.jsx

@@ -1,114 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Button } from 'antd';
-// import { FormattedMessage } from 'umi-plugin-react/locale';
-import moment from 'moment';
-import router from 'umi/router';
-import Navigate from '@/components/Navigate';
-// import AuthButton from '@/components/AuthButton';
-import request from '../../../utils/request';
-import apis from '../../../services/apis';
-
-const cancelPage = () => {
-  router.go(-1);
-};
-
-const BasicForm = props => {
-  const { drainageId } = props.location.query;
-  const [data, setData] = useState({});
-
-  useEffect(() => {
-    request({ ...apis.activity.detailDrainage, urlData: { id: drainageId } }).then(data => {
-      setData(data);
-    });
-  }, []);
-
-  const toDrainageDetail = () => {
-    router.push({
-      pathname: '/activity/drainage/h5edit',
-      query: {
-        id: data.activityId,
-        name: data.name,
-        drainageId,
-      },
-    });
-  }
-
-  const formItemLayout = {
-    labelCol: {
-      xs: { span: 24 },
-      sm: { span: 8 },
-    },
-    wrapperCol: {
-      xs: { span: 24 },
-      sm: { span: 16 },
-    },
-  };
-  return (
-    <>
-      <Form {...formItemLayout}>
-        <Form.Item label="H5活动编号：">
-          <span>{data.drainageId}</span>
-        </Form.Item>
-        <Form.Item label="是否投放小程序：">
-          <span>{data.isMiniapp ? '是' : '否'}</span>
-        </Form.Item>
-        <Form.Item label="H5活动名称：">
-          <span>{data.name}</span>
-        </Form.Item>
-        {data.isMiniapp && (
-          <Form.Item label="链接地址：">
-            <span>{data.h5Address}</span>
-          </Form.Item>
-        )}
-        {data.activityId && (
-          <Form.Item label="扫码查看">
-            <img src={data.qrCode} alt="" width="200"></img>
-          </Form.Item>
-        )}
-        {data.activityId && (
-          <Form.Item label="配置H5">
-            <Navigate onClick={toDrainageDetail}>修改配置</Navigate>
-          </Form.Item>
-        )}
-        <Form.Item label="上架状态：">
-          <span>{data.status === 1 ? '已上架' : '未上架'}</span>
-        </Form.Item>
-        <Form.Item label="新建时间：">
-          <span>{moment(data.createDate).format('YYYY-MM-DD HH:mm:ss')}</span>
-        </Form.Item>
-        <Form.Item label="自动下架时间：">
-          <span>{moment(data.endDate).format('YYYY-MM-DD HH:mm:ss')}</span>
-        </Form.Item>
-        <Form.Item label="appid：">
-          <span>{data.appid}</span>
-        </Form.Item>
-        <Form.Item label="secret：">
-          <span>{data.appSecret}</span>
-        </Form.Item>
-        <Form.Item label="参与人数：">
-          <span>{data.enlistNum}</span>
-        </Form.Item>
-        {data.isMiniapp && (
-          <Form.Item label="分享语：">
-            <span>{data.shareTitle}</span>
-          </Form.Item>
-        )}
-        {data.isMiniapp && (
-          <Form.Item label="分享图：">
-            <img src={data.shareImg} width="75px" height="60px" alt="" />
-          </Form.Item>
-        )}
-        {data.isMiniapp && (
-          <Form.Item label="中间页飞机图：">
-            <img src={data.middleImg} width="75px" height="166.7px" alt="" />
-          </Form.Item>
-        )}
-        <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
-          <Button onClick={() => cancelPage()}>取消</Button>
-        </Form.Item>
-      </Form>
-    </>
-  );
-};
-
-export default BasicForm;

src/pages/activity/drainage/drainageRecord.jsx

@@ -1,16 +0,0 @@
-import React from 'react';
-import DataRecord from '../dataRecord/index'
-import Prompt from 'umi/prompt';
-
-const header = props =>{
-    const id = props.location.query.id
-    // type:'h5',
-    return <><DataRecord  id ={id} activeType="h5"/>
-    <Prompt message={location =>
-        location.pathname.startsWith("/activity/drainage")
-          ? true
-          : localStorage.removeItem("drainageActivePageParams")} />
-    </>
-}
-
-export default header

src/pages/activity/drainage/h5edit.jsx

@@ -1,89 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Radio } from 'antd';
-import router from 'umi/router';
-import moment from 'moment';
-import apis from '../../../services/apis';
-import request from '../../../utils/request';
-import Basic from './components/Basic';
-import Help from './components/Help';
-import RedPacket from './components/RedPacket';
-import RedPacketRecord from './components/RedPacketRecord';
-import CustomerData from './components/CustomerData';
-import Ranking from './components/Ranking';
-
-
-const H5configuration = props => {
-
-    const [tab, setTab] = useState('1')
-    const [data, setData] = useState({})
-    const [toRedPacketRecord, setToRedPacketRecord] = useState()
-
-    const { id, name, drainageId } = props.location.query
-    // const type = props.activeType
-
-
-    useEffect(() => {
-        console.log(props)
-        // getData({ id: id, type: type })
-
-    }, [])
-
-    const getData = (params) => {
-
-        // request({ ...apis.activityDataStatis.getStatisticData, params: { ...params, } }).then((data) => {
-        //     console.log(data)
-        //     setData(data || {})
-        // })
-    }
-
-    function tabsCallback(e) {
-
-        setTab(e.target.value)
-        setToRedPacketRecord()
-    }
-    const onDetai = (e) => {
-        console.log(e)
-        setTab('4')
-        setToRedPacketRecord(e)
-    }
-
-
-    return <>
-
-        <div>
-            <Radio.Group value={tab} buttonStyle="solid" onChange={e => tabsCallback(e)}>
-                <Radio.Button value="1">基础配置</Radio.Button>
-                <Radio.Button value="2">助力配置</Radio.Button>
-                <Radio.Button value="3">红包配置</Radio.Button>
-                <Radio.Button value="4">红包记录</Radio.Button>
-                <Radio.Button value="5">客户数据</Radio.Button>
-                <Radio.Button value="6">排行榜</Radio.Button>
-            </Radio.Group>
-
-            {/* <Tabs type="card" value={tab} buttonStyle="solid" onChange={e => tabsCallback(e)}>
-                <TabPane tab="基础配置" key="1" ></TabPane>
-                <TabPane tab="助力配置" key="2" ></TabPane>
-                <TabPane tab="红包配置" key="3" ></TabPane>
-                <TabPane tab="红包记录" key="4" ></TabPane>
-                <TabPane tab="客户数据" key="5" ></TabPane>
-                <TabPane tab="排行榜" key="6" ></TabPane>
-            </Tabs> */}
-            <div style={{ marginTop: '20px' }}>
-                {/* 基础配置 */}
-                {(tab === '1' && <Basic id={id} name={name} />)}
-                {/* 助力配置 */}
-                {(tab === '2' && <Help id={id} name={name} />)}
-                {/* 红包配置 */}
-                {(tab === '3' && <RedPacket toDetail={onDetai} id={id} name={name} />)}
-                {/* 红包记录 */}
-                {(tab === '4' && <RedPacketRecord id={id} toRedPacketRecord={toRedPacketRecord} />)}
-                {/* 客户数据 */}
-                {(tab === '5' && <CustomerData id={id} drainageId={drainageId} />)}
-                {/* 排行榜 */}
-                {(tab === '6' && <Ranking id={id} />)}
-            </div>
-        </div>
-    </>
-}
-
-export default H5configuration

src/pages/activity/groupActivity/editGroupActivity.jsx

@@ -1,432 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../../style/GoodsList.less';
-import apis from '../../../services/apis';
-import moment from 'moment';
-import router from 'umi/router';
-import BuildSelect from '../../../components/SelectButton/BuildSelect2'
-import XForm, { FieldTypes } from '../../../components/XForm';
-import Wangedit from '../../../components/Wangedit/Wangedit'
-import request from '../../../utils/request'
-import yinhao from '../../../assets/yinhao.png'
-import ImageUploader from '../../../components/XForm/ImageUpload';
-import logo from '../../../assets/logo.svg';
-import touxiang from '../../../assets/touxiang.jpg';
-import poster1 from '../../../assets/poster1.png';
-import poster2 from '../../../assets/poster2.png';
-import xiaochengxu from '../../../assets/xiaochengxu.png'
-import Prompt from 'umi/prompt';
-
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-const { TextArea } = Input;
-
-const cancelPage = () => {
-  router.push({
-    pathname: '/activity/groupActivity/list',
-  });
-}
-
-
-const Basic = props => {
-  const { dynamicData, disable, activityStatus, scoreData, groupActivityId } = props;
-
-  const fields = [
-    {
-      label: '选择项目',
-      name: 'buildingId',
-      render: <BuildSelect disabled={disable} />,
-      value: dynamicData.buildingId,
-      rules: [
-        { required: true, message: '请选择项目' },
-      ],
-    },
-    {
-      label: '活动标题',
-      name: 'activityName',
-      type: FieldTypes.Text,
-      value: dynamicData.activityName,
-      rules: [
-        { required: true, message: '请输入活动标题' },
-      ]
-    },
-    {
-      label: '拼团详情主图',
-      name: 'mainImg',
-      type: FieldTypes.ImageUploader,
-      value: dynamicData.mainImg,
-      rules: [
-        { required: true, message: '请输入拼团详情主图' },
-      ],
-      help: '建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：拼团活动详情',
-    },
-    {
-      label: '拼团封面图1',
-      name: 'listImg',
-      type: FieldTypes.ImageUploader,
-      value: dynamicData.listImg,
-      rules: [
-        { required: true, message: '请输入拼团封面图1' },
-      ],
-      help: '建议图片尺寸：750*420px，比例16:9,格式：jpg，用于：活动列表/首页推荐',
-    },
-    {
-      label: '拼团封面图2',
-      name: 'bannerListImg',
-      type: FieldTypes.ImageUploader,
-      value: dynamicData.bannerListImg,
-      rules: [
-        { required: true, message: '请输入拼团封面图2' },
-      ],
-      help: '建议图片尺寸：750*250px，比例3:1,格式：jpg，用于：项目详情页',
-    },
-    {
-      label: '活动时间',
-      name: 'activityTime',
-      type: FieldTypes.RangePicker,
-      value: dynamicData.startTime != null ? [moment(dynamicData.startTime, 'YYYY-MM-DD HH:mm'), moment(dynamicData.endTime, 'YYYY-MM-DD HH:mm')] : null,
-      props: { showTime: { format: 'HH:mm' } },
-      rules: [
-        { required: true, message: '请选择活动时间' },
-      ],
-    },
-    {
-      label: '成团人数',
-      name: 'groupBuyPeople',
-      type: FieldTypes.Text,
-      value: dynamicData.groupBuyPeople,
-      props: { disabled: activityStatus === 0 },
-      help: '注：成团所需人数',
-      rules: [
-        { required: true, message: '请输入成团人数' },
-      ]
-    },
-    {
-      label: '所需积分',
-      name: 'integral',
-      type: FieldTypes.Text,
-      value: dynamicData.integral,
-      props: { disabled: activityStatus === 0 },
-      help: `注：用户平均积分${scoreData.averageScore}`,
-      rules: [
-        { required: true, message: '请输入所需积分' },
-      ]
-    },
-    {
-      label: '活动说明',
-      name: 'descImg',
-      type: FieldTypes.ImageUploader,
-      value: dynamicData.descImg,
-      rules: [
-        { required: true, message: '请输入活动说明' },
-      ],
-      help: '建议宽度：750px，高度不限，格式：jpg，用于活动详情',
-    },
-    {
-      label: '权重',
-      name: 'heavy',
-      type: FieldTypes.Number,
-      render: <Input type="number" style={{ width: 80 }} />,
-      value: dynamicData.heavy,
-      rules: [
-        { required: true, message: '请输入权重' },
-      ],
-      help: '数字越大越靠前',
-    },
-  ]
-
-  function compareDate(dateTime1, dateTime2) {
-    return new Date(dateTime1) > new Date(dateTime2);
-  }
-
-  const handleSubmit = val => {
-    const { activityTime, signupTime, ...submitValue } = val
-
-    const [startTime, endTime] = activityTime
-    submitValue.startTime = moment(startTime).format('YYYY-MM-DD HH:mm');
-    submitValue.endTime = moment(endTime).format('YYYY-MM-DD HH:mm');
-
-    if (groupActivityId) {
-      const nowDate = new Date()
-      if (!compareDate(nowDate, startTime)) {
-        message.info('修改后的开始时间不得大于当前时间（会存在已经成功助力或者发起助力的用户）')
-        return
-      }
-      submitValue.groupActivityId = groupActivityId
-      request({ ...apis.groupActivity.update, data: submitValue }).then(data => {
-        message.info('保存成功')
-        // cancelPage()
-      }).catch(() => {
-        // message.info(err.msg || err.message)
-      })
-    } else {
-      request({ ...apis.groupActivity.add, data: submitValue }).then(data => {
-        router.push({
-          pathname: '/activity/groupActivity/editGroupActivity',
-          query: {
-            groupActivityId: data,
-          },
-        });
-        message.info("保存成功")
-        // cancelPage()
-      }).catch(() => {
-        // message.info(err.msg || err.message)
-      })
-    }
-  }
-
-  return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
-}
-
-const Poster = props => {
-  const { groupActivityId } = props;
-  const [inputValue, changeInput] = useState('')
-  const [textAreaValue, changeTextArea] = useState('')
-  const [imgValue, changeImg] = useState('')
-  const [posterId, setPosterId] = useState('')
-  // const [miniappName, setMiniappName] = useState('')
-
-  useEffect(() => {
-    if (groupActivityId) {
-      request({ ...apis.activity.poster, params: { targetId: groupActivityId, targetType: 'groupActivity' } }).then(data => {
-        if (data.length > 0) {
-          setPosterId(data[0].posterId)
-          changeImg(data[0].posterImg)
-          changeTextArea(data[0].posterDescription)
-          changeInput(data[0].posterTitle)
-        }
-      }).catch(err => {
-        message.info(err.msg || err.message)
-      })
-    }
-
-    // getMiniappName()
-  }, [])
-
-  // // 获取小程序名称
-  // function getMiniappName() {
-  //   request({ ...apis.building.getMiniappName }).then(res => {
-  //     setMiniappName(res)
-  //   })
-  // }
-
-  const submitPoster = () => {
-    if (groupActivityId) {
-      if (posterId) {
-        request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: groupActivityId, targetType: 'activity', 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: groupActivityId, targetType: 'groupActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then(data => {
-          setPosterId(data.posterId)
-          message.info('保存成功')
-        }).catch(err => {
-          message.info(err.msg || err.message)
-        })
-      }
-    } else {
-      message.warn('请先保存基本信息数据')
-    }
-  }
-
-  return <div>
-    <div style={{ display: 'flex' }}>
-      <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
-        <div style={{ width: '375px', height: '700px', backgroundColor: '#fff', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
-          <img style={{ width: '100%', height: '300px' }} src={imgValue || poster1} alt="" />
-          <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
-            <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} src={touxiang} alt="" />
-            <span style={{ color: '#222', fontWeight: '600', margin: '24px 10px 0 14px', fontSize: '17px' }}>喵喵</span>
-            <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您参与</span>
-            <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',
-            WebkitLineClamp: '2',
-            WebkitBoxOrient: 'vertical',
-            overflow: 'hidden',
-            textOverflow: 'ellipsis',
-          }}>{inputValue || '海报标题'}</p>
-
-          <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',
-            WebkitLineClamp: '3',
-            WebkitBoxOrient: 'vertical',
-            overflow: 'hidden',
-            textOverflow: 'ellipsis',
-          }}>{textAreaValue || '海报描述'}</p>
-          <div style={{ backgroundColor: '#f1f1f1', padding: '22px 30px', boxShadow: '0px 6px 12px -4px #dcdcdc', position: 'relative' }}>
-            <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>长按识别小程序码</p>
-            <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>进入活动查看详情</p>
-            <img style={{ width: '80px', position: 'absolute', right: '30px', top: '10px' }} src={xiaochengxu} alt="" />
-          </div>
-        </div>
-        <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
-      </div>
-
-      <div >
-        <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>拼团海报图</p>
-          <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
-        </div>
-        <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px' }}>建议图片尺寸：750*600，比例5:4,格式：jpg，用于拼团活动海报</p>
-        <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
-          <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' }}>海报描述</p>
-          <TextArea rows={5} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
-        </div>
-
-      </div>
-    </div>
-    <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
-    <Button onClick={() => cancelPage()}>取消</Button>
-  </div>
-}
-
-
-const Share = props => {
-  console.log(props, 'props')
-  const { groupActivityId } = props
-  const [inputValue, changeInput] = useState('')
-  const [imgValue, changeImg] = useState('')
-  const [shareContentId, setShareContentId] = useState('')
-
-  useEffect(() => {
-    if (groupActivityId) {
-      request({ ...apis.activity.shareContent, params: { targetId: groupActivityId, targetType: 'groupActivity' } }).then(data => {
-        if (data.length > 0) {
-          setShareContentId(data[0].shareContentId)
-          changeImg(data[0].shareContentImg)
-          changeInput(data[0].shareContentTitle)
-        }
-      }).catch(err => {
-        message.info(err.msg || err.message)
-      })
-    }
-  }, [])
-
-  const submitShare = () => {
-    console.log(groupActivityId)
-    if (groupActivityId) {
-      if (shareContentId) {
-        request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: groupActivityId, shareContentType: 'groupActivity', shareContentImg: imgValue, shareContentTitle: inputValue } }).then(data => {
-          message.info('保存成功')
-        }).catch(err => {
-          message.info(err.msg || err.message)
-        })
-      } else {
-        request({ ...apis.activity.addShareContent, data: { targetId: groupActivityId, shareContentType: 'groupActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then(data => {
-          setShareContentId(data.shareContentId)
-          message.info('保存成功')
-        }).catch(err => {
-          message.info(err.msg || err.message)
-        })
-      }
-    } else {
-      message.warn('请先保存基本信息数据')
-    }
-  }
-
-  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' }}>分享模板</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 || '置业V客厅 精准获客平台'}</p>
-        <img style={{ width: '200px', height: '160px' }} src={imgValue || poster2} alt="" />
-      </div>
-    </div>
-    <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
-      <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' }}>拼团分享图</p>
-      <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
-    </div>
-    <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于拼团活动分享好友</p>
-    <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
-    <Button onClick={() => cancelPage()}>取消</Button>
-  </div>
-}
-
-
-/**
- *
- *
- * @param {*} props
- * @returns
- */
-const Edit = props => {
-  const [tab, changeTab] = useState('basic')
-  // 判断是否展示助力次数的输入框
-  const { groupActivityId } = props.location.query
-  const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
-  const [scoreData, setScoreData] = useState({})
-  const [activityStatus, setActivityStatus] = useState({})
-  const [disable, setDisable] = useState(false)
-
-  // 详情
-  const getDynamicData = id => {
-    request({ ...apis.groupActivity.details, urlData: { id } }).then(data => {
-      setDynamicData(data)
-      setActivityStatus(data.activityStatus)
-      setDisable(data.activityStatus === 0)
-    })
-  }
-
-  useEffect(() => {
-    request(apis.groupActivity.avgScore).then(data => {
-      setScoreData(data);
-    })
-  }, [])
-
-  useEffect(() => {
-    if (groupActivityId) {
-      getDynamicData(groupActivityId);
-    }
-  }, [groupActivityId])
-
-  // const radioOnChange = e => {
-  //   setDynamicData({ ...dynamicData, isEnlist: e.target.value })
-  // }
-
-  return (
-    <div>
-      <div>
-        <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
-          <Radio.Button value="basic">基本信息</Radio.Button>
-          <Radio.Button value="poster">海报图片</Radio.Button>
-          <Radio.Button value="share">分享设置</Radio.Button>
-        </Radio.Group>
-      </div>
-      <div>
-        {tab === 'basic' && <Basic dynamicData={dynamicData} disable={disable} activityStatus={activityStatus} scoreData={scoreData} groupActivityId={groupActivityId} />}
-        {tab === 'poster' && <Poster groupActivityId={groupActivityId} />}
-        {tab === 'share' && <Share groupActivityId={groupActivityId} />}
-      </div>
-      <Prompt message={location =>
-        (location.pathname.startsWith('/activity/groupActivity')
-          ? true
-          : localStorage.removeItem('groupActivePageParams'))} />
-    </div>
-  );
-}
-export default Edit

src/pages/activity/groupActivity/groupActivityRecord.jsx

@@ -1,16 +0,0 @@
-import React from 'react';
-import DataRecord from '../dataRecord/index'
-import Prompt from 'umi/prompt';
-
-const header = props =>{
-    const id = props.location.query.id
-    // type:'group',
-    return <><DataRecord id ={id} activeType="group" />
-    <Prompt message={location =>
-        location.pathname.startsWith("/activity/groupActivity")
-          ? true
-          : localStorage.removeItem("groupActivePageParams")} />
-          </>
-}
-
-export default header

src/pages/activity/groupActivity/helpRecord.jsx

@@ -1,546 +0,0 @@
-import React, { useState, useEffect } from 'react';
-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';
-import router from 'umi/router';
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
-import AuthButton from '@/components/AuthButton';
-
-
-const { Option } = Select;
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const { Meta } = Card;
-
-/**
- * 拼团者弹框
- */
-class InviteTable extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      dataSource: { records: [] },
-      visibleData: { visible: false, groupActivityId: '', groupStatus: '' },
-    }
-  }
-
-  // 挂载之后
-  componentDidMount() {
-    const { groupActivityId } = this.state.visibleData
-    this.getList({ groupActivityId: groupActivityId, groupStatus: status, pageNumber: 1, pageSize: 5 })
-  }
-
-  componentDidUpdate(preProps, preState) {
-    const { groupActivityId } = this.props.visibleData
-    if (this.props.visibleData.visible !== preState.visibleData.visible) {
-      this.getList({ ...this.props.visibleData, pageNumber: 1, pageSize: 5 })
-      this.setState({ visibleData: this.props.visibleData });
-    }
-  }
-
-  // 弹框确定按钮
-  // eslint-disable-next-line react/sort-comp
-  handleOk() {
-    this.setState({ visibleData: { visible: false, groupActivityId: '', realtyConsultant: '' } })
-  }
-
-  // 弹框取消按钮
-  handleCancel() {
-    this.setState({ visibleData: { visible: false, groupActivityId: '', realtyConsultant: '' } })
-  }
-
-  getList(params) {
-    console.log("params", params);
-    request({ ...apis.groupActivity.shareChildList, 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 })
-  }
-
-  exportChildRecord(params) {
-    request({ ...apis.groupActivity.exportShareChildRecord, responseType: 'blob', params: { ...params } })
-      .then(data => {
-        if (!data) {
-          return
-        }
-        const url = window.URL.createObjectURL(new Blob([data]))
-        const link = document.createElement('a')
-        link.style.display = 'none'
-        link.href = url
-        link.setAttribute('download', '拼团发起记录.xlsx')
-        document.body.append(link)
-        link.click()
-      }).catch(() => {
-
-      })
-  }
-
-  render() {
-    const columns = [
-      {
-        title: '用户姓名',
-        dataIndex: 'nickname',
-        key: 'nickname',
-        align: 'center',
-      },
-      {
-        title: '手机号',
-        dataIndex: 'phone',
-        key: 'phone',
-        align: 'center',
-        render: text => <a>{text}</a>,
-      },
-      {
-        title: '开团时间',
-        dataIndex: 'createTime',
-        key: 'createTime',
-        align: 'center',
-        render: (x, row) => <><span>{row.createTime ? `${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
-      },
-    ]
-    return (
-      <>
-        <Modal
-          title="参团者"
-          destroyOnClose="true"
-          width={900}
-          footer={null}
-          visible={this.state.visibleData.visible}
-          // onOk={() => this.handleOk()}
-          onCancel={(e) => this.handleCancel(e)}
-        >
-          <Button type="primary" name="admin.taShareChildRecord.export.get" noRight={null} onClick={() => this.exportChildRecord({ ...this.props.visibleData, pageNumber: 1, pageSize: 5 })} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
-            导出
-          </Button>
-
-          <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 = {
-      groupActivityId: { id: '' },
-      visibleData: { visible: false, groupActivityId: '', recordId: '' },
-    }
-  }
-
-  // 挂载之后
-  componentDidMount() {
-    const { groupActivityId } = this.state.visibleData
-  }
-
-  componentDidUpdate(preProps, preState) {
-    const { groupActivityId } = this.state.visibleData
-    console.log('this.state.visibleData', this.state.visibleData)
-    if (this.props.visibleData.visible !== preState.visibleData.visible) {
-      this.setState({ visibleData: this.props.visibleData });
-    }
-  }
-
-  // 弹框确定按钮
-  handleOk() {
-  }
-
-  // 弹框取消按钮
-  handleCancel() {
-    this.props.onSuccess({ groupActivityId: this.props.visibleData.groupActivityId, groupStatus: 0 });
-  }
-
-  getVerCodeList(params) {
-    request({ ...apis.groupActivity.verification, params: { ...params } }).then(res => {
-      message.info('核销成功')
-      this.props.onSuccess({ groupActivityId: this.state.visibleData.groupActivityId, groupStatus: 0 });
-    }).catch(err => {
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
-    })
-  }
-
-  verify(e) {
-    this.setState({ visibleData: { visible: true, groupActivityId: this.props.visibleData.groupActivityId, verificationCode: e.target.value, recordId: this.state.visibleData.recordId } })
-  }
-
-  // eslint-disable-next-line class-methods-use-this
-  verification(e) {
-    console.log("asdasdasdasd", this.state.visibleData);
-    this.getVerCodeList({ groupActivityId: this.state.visibleData.groupActivityId, verifyCode: this.state.visibleData.verificationCode, recordId: this.state.visibleData.recordId })
-  }
-
-  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 style={{ marginLeft: '10px' }} onChange={this.verify.bind(this)} /></span>
-            <Button name="admin.taShareRecord.verificate.put" noRight={null} style={{ marginLeft: '80px', marginTop: '10px', backgroundColor: 'red' }} onClick={() => this.verification()}><span style={{ color: 'white' }}>立即核销</span></Button>
-          </div>
-        </Modal>
-      </>
-    );
-  }
-}
-
-/**
- *主体列表
- *
- * @param {*} props
- * @returns
- */
-function body(props) {
-  const [gInviteData, setGInviteData] = useState({ visible: false, groupActivityId: '', recordId: '', groupStatus: '' })
-
-  const [gVerifierData, setVerifierData] = useState({ visible: false, groupActivityId: '', verificateCode: '', recordId: '' })
-
-  const { getFieldDecorator, getFieldsValue } = props.form
-
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [dataSource, setDataSource] = useState({ records: [] })
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  // const [columns, setColumns] = useState(privateColumns)
-
-  // 默认成功
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [groupStatus, setgroupStatus] = useState('0')
-
-  // 调整归属 ============  start
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [gVisibleData, setGVisibleData] = useState({ visible: false })
-
-
-  // 变更状态 ============= end
-
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const { groupActivityId } = props.location.query
-  useEffect(() => {
-    getList({ pageNumber: 1, pageSize: 10, groupStatus: groupStatus, groupActivityId: groupActivityId })
-  }, [])
-
-
-  function getFailList(params) {
-    // 网路请求
-    request({ ...apis.groupActivity.shareFailList, params: { ...params } }).then(res => {
-      console.log(res);
-      setDataSource(res)
-    }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
-    })
-  }
-
-  function getList(params) {
-    console.log(params);
-    // 网路请求
-    request({ ...apis.groupActivity.shareSuccList, params: { ...params } }).then(res => {
-      console.log("process");
-      setDataSource(res)
-    }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
-    })
-  }
-
-  function displayNone() {
-    setGVisibleData({ visible: false })
-  }
-
-  // 提交事件
-  function handleSubmit(e) {
-    displayNone()
-
-
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        getList({ pageNum: 1, pageSize: 10, groupStatus, ...values, groupActivityId })
-      }
-    });
-  }
-
-  // Change 事件
-  function handleSelectChange(e) {
-    // eslint-disable-next-line no-console
-    console.log(e)
-  }
-
-  // 分页
-  function onChange(pageNum) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    getList({ pageNumber: pageNum, pageSize: 10, groupStatus, groupActivityId: groupActivityId, ...props.form.getFieldsValue() })
-  }
-
-  // 助力成功/进行中/助力失败
-  function radioButtonHandleSizeChange(e) {
-    setGInviteData({ visible: false })
-    displayNone()
-
-    const { value } = e.target
-    setgroupStatus(value)
-    if (value == 0) {
-      getList({ pageNumber: 1, pageSize: 10, groupStatus: value, groupActivityId: groupActivityId, ...props.form.getFieldsValue() })
-    }
-    if (value == 1 || value == 2) {
-      getFailList({ pageNumber: 1, pageSize: 10, groupStatus: value, groupActivityId: groupActivityId, ...props.form.getFieldsValue() })
-    }
-  }
-
-  function handleReset() {
-    props.form.resetFields();
-    getList({ pageNumber: 1, pageSize: 10, groupStatus, groupActivityId: groupActivityId })
-  }
-
-  function toCustomerDateil(record) {
-    router.push({
-      pathname: '/customer/customerlist/customerDetail',
-      query: {
-        id: record.customerId,
-      },
-    });
-  }
-
-  function download(data) {
-    if (!data) {
-      return
-    }
-    const url = window.URL.createObjectURL(new Blob([data]))
-    const link = document.createElement('a')
-    link.style.display = 'none'
-    link.href = url
-    link.setAttribute('download', '拼团列表.xlsx')
-    document.body.append(link)
-    link.click()
-  }
-
-  function exportRecord() {
-    request({ ...apis.groupActivity.exportShareRecord, responseType: 'blob', params: { groupActivityId: groupActivityId, groupStatus: groupStatus } })
-      .then(response => {
-        download(response)
-      }).catch(error => {
-
-      })
-  }
-
-  // 助力记录弹框
-  function helpRecord(row) {
-    // 关闭核销
-    // eslint-disable-next-line max-len
-    setVerifierData({ visible: false, groupActivityId: row.groupActivityId, groupStatus: 0 })
-    // eslint-disable-next-line max-len
-    setGInviteData({ visible: true, groupActivityId: row.groupActivityId, groupStatus: row.status, recordId: row.recordId })
-  }
-  // 打开核销
-  function shareRecordVerify(row) {
-    setVerifierData({ visible: true, groupActivityId: row.groupActivityId, groupStatus: 0, recordId: row.recordId })
-    setGInviteData({ visible: false, groupActivityId: row.groupActivityId })
-  }
-
-  function onSuccess(e) {
-    setVerifierData({ visible: false, groupActivityId: e.groupActivityId, groupStatus: 0 })
-    getList({ pageNumber: 1, pageSize: 10, ...e });
-  }
-
-  function returnList(params) {
-    router.push({
-      pathname: '/activity/groupActivity/list',
-    });
-  }
-
-  const publicColumns = [
-    {
-      title: '开团者',
-      dataIndex: 'nickname',
-      key: 'nickname',
-      align: 'center',
-      width: '15%',
-    },
-    {
-      title: '开团者手机号',
-      dataIndex: 'phone',
-      key: 'phone',
-      align: 'center',
-      width: '10%',
-    },
-    {
-      title: '开团时间',
-      dataIndex: 'createTime',
-      key: 'createTime',
-      align: 'center',
-      width: '15%',
-      render: (x, row) => <><span>{row.createTime ? `${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
-    },
-    {
-      title: '参团者',
-      dataIndex: 'helpCount',
-      key: 'helpCount',
-      align: 'center',
-      width: '15%',
-      render: (text, record) => <a style={{ color: '#66B3FF' }} onClick={() => helpRecord(record)}>{record.joinPeople === null ? 0 : record.joinPeople}/{record.groupBuyPeople}</a>,
-    },
-  ]
-
-  const privateColumns = [
-    {
-      title: '拼团者',
-      dataIndex: 'nickname',
-      key: 'nickname',
-      align: 'center',
-      width: '15%',
-    },
-    {
-      title: '拼团者手机号',
-      dataIndex: 'phone',
-      key: 'phone',
-      align: 'center',
-      width: '10%',
-    },
-    {
-      title: '拼团时间',
-      dataIndex: 'createTime',
-      key: 'createTime',
-      align: 'center',
-      width: '10%',
-      render: (x, row) => <><span>{row.createTime ? `${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>
-    },
-    {
-      title: '成团时间',
-      dataIndex: 'endTime',
-      key: 'endTime',
-      align: 'center',
-      width: '10%',
-      render: (x, row) => <><span>{row.endTime ? `${moment(row.endTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>
-    },
-    {
-      title: '核销状态',
-      dataIndex: 'verificationStatus',
-      key: 'verificationStatus',
-      align: 'center',
-      width: '10%',
-      // eslint-disable-next-line no-nested-ternary
-      render: (text, records) => {
-        if (records.verificationStatus === 0) { return '未核销' }
-        if (records.verificationStatus === 1) { return '已核销' }
-      },
-    },
-    {
-      title: '操作',
-      dataIndex: 'customerId',
-      key: 'customerId',
-      align: 'center',
-      width: '25%',
-      render: (x, row) => (
-        <>
-          {row.verificationStatus === 0 &&
-            <AuthButton name="admin.taShare.writeOff" noRight={null}>
-              <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={(e) => shareRecordVerify(row)}>核销</span>
-            </AuthButton>
-          }
-        </>
-      ),
-    },
-  ]
-
-
-  const changePageNum = pageNumber => {
-    getList({ pageNum: pageNumber, pageSize: 10 })
-  }
-
-  return (
-    <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item>
-          {getFieldDecorator('phone')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="电话"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          <Button type="primary" htmlType="submit" >
-            搜索
-            </Button>
-          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-            重置
-            </Button>
-        </Form.Item>
-        <Button style={{ float: 'right' }} onClick={returnList}>
-          返回
-        </Button>
-      </Form>
-      <Button name="admin.taShareRecord.export.get" noRight={null} type="primary" onClick={() => exportRecord()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
-        导出
-      </Button>
-
-      <div style={{ margin: '20px 0' }}>
-        <AuthButton name="admin.taShareSuccessRecord.get" noRight={null}>
-          <Radio.Group value={groupStatus} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
-            <Radio.Button value="0">拼团成功</Radio.Button>
-            <Radio.Button value="1">进行中</Radio.Button>
-            <Radio.Button value="2">拼团失败</Radio.Button>
-          </Radio.Group>
-        </AuthButton>
-      </div>
-
-      {groupStatus === '0' ?
-        <Table dataSource={dataSource.records} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :
-        <Table dataSource={dataSource.records} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" />
-      }
-      <InviteTable visibleData={gInviteData} />
-      {/* 核销 */}
-      <Verifier visibleData={gVerifierData} onSuccess={(e) => onSuccess(e)} />
-    </>
-  );
-}
-
-const WrappedBody = Form.create({ name: 'body' })(body);
-
-export default WrappedBody

src/pages/activity/groupActivity/list.jsx

@@ -1,377 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Typography, Pagination, Modal } from 'antd';
-import router from 'umi/router';
-import moment from 'moment';
-import AuthButton from '@/components/AuthButton';
-import withActions from '@/components/ActionList';
-import EditIcon from '@/components/EditIcon';
-import Navigate from '@/components/Navigate';
-import Prompt from 'umi/prompt';
-import SelectCity from '../../../components/SelectButton/CitySelect'
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
-import apis from '../../../services/apis';
-import request from '../../../utils/request';
-import styles from '../../style/GoodsList.less';
-
-const { Option } = Select;
-
-const header = props => {
-  const [data, setData] = useState({})
-  //   const [page, changePage] = useState({})
-
-  useEffect(() => {
-    if (localStorage.getItem("groupActivePageParams")) {
-      props.form.setFieldsValue(JSON.parse(localStorage.getItem("groupActivePageParams")));
-      // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
-
-      getList(JSON.parse(localStorage.getItem("groupActivePageParams")))
-    } else {
-      localStorage.setItem("groupActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));
-      getList({ pageNum: 1, pageSize: 10 });
-    }
-
-  }, [])
-
-  // 查询列表
-  const getList = (params) => {
-    console.log(params);
-    request({ ...apis.groupActivity.list, params: { ...params } }).then((data) => {
-      console.log(data)
-      setData(data)
-    })
-  }
-
-
-  // 跳转到拼团活动新增
-  const toEditActivity = (groupActivityId) => () => {
-    router.push({
-      pathname: '/activity/groupActivity/editGroupActivity',
-      query: {
-        groupActivityId
-      },
-    });
-  }
-
-  const getActivityDetail = (groupActivityId) => () => {
-    router.push({
-      pathname: '/activity/groupActivity/detailActivity',
-      query: {
-        groupActivityId,
-      },
-    });
-  }
-
-  const getJoinPeople = (groupActivityId) => () => {
-    router.push({
-      pathname: '/activity/groupActivity/helpRecord',
-      query: {
-        groupActivityId,
-      },
-    });
-  }
-
-  const toDataReacord = id => {
-    router.push({
-      pathname: '/activity/groupActivity/groupActivityRecord',
-      query: {
-        id,
-      },
-    });
-  }
-
-  /**
-   *
-   *
-   * @param {*} props
-   * @returns
-   */
-
-  const columns = [
-    {
-      title: '活动标题',
-      dataIndex: 'activityName',
-      key: 'activityName',
-      align: 'center',
-      render: (x, row) => <Navigate onClick={getActivityDetail(row.groupActivityId)}><Typography.Text ellipsis>{row.activityName}</Typography.Text></Navigate>,
-    },
-    {
-      title: '活动时间',
-      dataIndex: 'startTime',
-      key: 'startTime',
-      align: 'center',
-      render: (x, row) => <><span>{`${moment(row.startTime).format('YYYY-MM-DD HH:mm:ss')} —— ${moment(row.endTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>
-    },
-    {
-      title: '所需积分',
-      dataIndex: 'integral',
-      key: 'integral',
-      align: 'center',
-    },
-    {
-      title: '已参与人数',
-      dataIndex: 'participateNum',
-      key: 'participateNum',
-      align: 'center',
-      render: (x, row) => <><div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', width: '201px', title: 'content' }}>
-        <Navigate onClick={getJoinPeople(row.groupActivityId)}>{row.participateNum}</Navigate>
-        </div></>,
-    },
-    {
-      title: '成团数',
-      dataIndex: 'groupBuyPeople',
-      key: 'groupBuyPeople',
-      align: 'center',
-    },
-    {
-      title: '状态',
-      dataIndex: 'activityStatus',
-      key: 'activityStatus',
-      align: 'center',
-      render: (text, records) => {
-        if (records.activityStatus === 0) { return '进行中' }
-        if (records.activityStatus === 1) { return '未开始' }
-        if (records.activityStatus === 2) { return '已结束' }
-      },
-    },
-    {
-      title: '权重',
-      dataIndex: 'heavy',
-      key: 'heavy',
-      align: 'center',
-    },
-    {
-      title: '操作',
-      dataIndex: 'handle',
-      key: 'handle',
-      align: 'center',
-      width: 400,
-      render: withActions((x, row) => [
-
-        <EditIcon type="look" text="查看详情" onClick={getActivityDetail(row.groupActivityId)} />,
-
-        row.activityStatus === 0 ?
-          <AuthButton name="admin.taShareActivity.finish.put" noRight={null}>
-            <EditIcon type="end" text="结束活动" onClick={endGroupActivity(row)} />
-          </AuthButton> : null,
-
-          <AuthButton name="admin.taShareActivity.publish" noRight={null}>
-            <EditIcon type={row.status === 1 ? 'cancel' : 'publish'} text={row.status === 1 ? '取消发布' : '发布'} onClick={sendOrPublicDynamic.bind(this, row)} />
-          </AuthButton>,
-
-          <AuthButton name="admin.taShareActivity.tag" noRight={null}>
-            <EditIcon type={row.weight === 1 ? 'cancel' : 'add'} text={row.weight === 1 ? '取消标签' : '添加标签'} onClick={topGroupActivity(row, row.weight)} />
-          </AuthButton>,
-            
-          <AuthButton name="admin.taShareActivity.top" noRight={null}>
-            <EditIcon type={row.sort ? 'cancel' : 'top'} text={row.sort ? '取消推首页' : '推荐首页'} onClick={recommendGroupActivity(row)} />
-          </AuthButton>,
-
-          <AuthButton name="admin.groupActivity.dataRecord" noRight={null}>
-            <EditIcon type="record" text="数据记录" onClick={() => toDataReacord(row.groupActivityId)} />
-          </AuthButton>,
-
-          (row.activityStatus === 0 || row.activityStatus === 1) ?
-            <AuthButton name="admin.taShareActivity.update.put" noRight={null}>
-              <EditIcon type="edit" text="编辑" onClick={toEditActivity(row.groupActivityId)} />
-            </AuthButton> : null,
-      ]),
-    },
-  ];
-
-  const finishDynamic = (row) => {
-    Modal.confirm({
-      title: '结束以后将无法编辑, 是否继续?',
-      okText: '确定',
-      cancelText: '取消',
-      onOk() {
-        request({ ...apis.activity.finish, data: { dynamicId: row.dynamicId, top: "" } }).then((data) => {
-          console.log(data)
-          message.info('操作成功！')
-          getList(JSON.parse(localStorage.getItem("groupActivePageParams")))
-        }).catch((err) => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-      },
-    });
-  }
-
-  //结束活动
-  const endGroupActivity = (row) => () => {
-    Modal.confirm({
-      title: '活动会被强制结束，小程序端无法再发起或参与此拼团，如果不想让客户看到活动，请再点击取消发布按钮',
-      okText: '确定',
-      cancelText: '取消',
-      onOk() {
-        request({ ...apis.groupActivity.finish, urlData: { id: row.groupActivityId } }).then((data) => {
-          console.log(data)
-          message.info('操作成功！')
-          getList(JSON.parse(localStorage.getItem("groupActivePageParams")))
-        }).catch((err) => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-      },
-    });
-  }
-
-  //置顶
-  const topGroupActivity = (row, weight) => () => {
-    request({ ...apis.groupActivity.top, data: { groupActivityId: row.groupActivityId, weight: weight } }).then((data) => {
-      console.log(data)
-      message.info('操作成功！')
-      getList(JSON.parse(localStorage.getItem("groupActivePageParams")))
-    }).catch((err) => {
-      console.log(err)
-      message.info(err.msg || err.message)
-    })
-  }
-
-  const sendOrPublicDynamic = row => {
-    if (row.status === 1) {
-      cancelDynamic(row)
-    } else {
-      sendDynamic(row)
-    }
-  }
-
-  // 取消活动
-  const cancelDynamic = row => {
-    Modal.confirm({
-      title: '活动会在小程序端隐藏，后台可以继续编辑重新发布',
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        request({ ...apis.groupActivity.cancel, urlData: { id: row.groupActivityId } }).then(data => {
-          message.info('操作成功！')
-          getList(JSON.parse(localStorage.getItem("groupActivePageParams")))
-        }).catch(err => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-      }
-    });
-  }
-
-  // 发布活动
-  const sendDynamic = row => {
-    Modal.confirm({
-      title: '确定发布吗？',
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        request({ ...apis.groupActivity.send, urlData: { id: row.groupActivityId } }).then(data => {
-          message.info('操作成功！')
-          getList(JSON.parse(localStorage.getItem("groupActivePageParams")))
-        }).catch(err => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-      }
-    });
-  }
-
-  //首页推荐
-  const recommendGroupActivity = (row, code) => () => {
-    request({ ...apis.groupActivity.top, data: { groupActivityId: row.groupActivityId, sort: row.sort } }).then((data) => {
-      console.log(data)
-      message.info('操作成功！')
-      getList(JSON.parse(localStorage.getItem("groupActivePageParams")))
-    }).catch((err) => {
-      console.log(err)
-      message.info(err.msg || err.message)
-    })
-  }
-
-  const changePageNum = pageNumber => {
-    localStorage.setItem("groupActivePageParams", JSON.stringify({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() }));
-
-    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
-  }
-
-  // 提交事件
-  const handleSubmit = (e, props) => {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        console.log('提交数据: ', values)
-        localStorage.setItem("groupActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10, ...values }));
-        getList({ pageNum: 1, pageSize: 10, ...values })
-      }
-    });
-  }
-
-  //重置搜索
-  function handleReset() {
-    props.form.resetFields();
-    localStorage.setItem("groupActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));
-    getList({ pageNum: 1, pageSize: 10 })
-  }
-
-
-  const { getFieldDecorator } = props.form
-  return (
-
-    <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item>
-          {getFieldDecorator('cityId')(
-            <SelectCity />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('buildingId')(
-            <BuildSelect />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('activityName')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="请输入标题"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('activityStatus')(
-            <Select style={{ width: '180px' }} placeholder="活动状态">
-              <Option value="0">进行中</Option>
-              <Option value="1">未开始</Option>
-              <Option value="2">已结束</Option>
-            </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          <AuthButton name="admin.taShareActivity.search" noRight={null}>
-            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-              搜索
-          </Button>
-          </AuthButton>
-          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-            重置
-            </Button>
-        </Form.Item>
-      </Form>
-      <AuthButton name="admin.taShareActivity.post" noRight={null}>
-        <Button type="danger" className={styles.addBtn} onClick={toEditActivity()}>新增</Button>
-      </AuthButton>
-      <Table
-        // onRow={record => {
-        //     return {
-        //       onClick: getActivityDetail(record.groupActivityId),
-        //     };
-        //   }}
-        style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
-      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
-      </div>
-      <Prompt message={location =>
-        location.pathname.startsWith("/activity/groupActivity")
-          ? true
-          : localStorage.removeItem("groupActivePageParams")} />
-    </>
-  )
-}
-const WrappedHeader = Form.create({ name: 'header' })(header);
-
-export default WrappedHeader

src/pages/activity/helpActivity/detailActivity.jsx → src/pages/activity/groupRoomActivity/detail.jsx

@@ -1,21 +1,17 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../../style/GoodsList.less';
-import apis from '../../../services/apis';
+import { Form, Input, Button, Icon, Select, Card, Radio, DatePicker, message, Upload } from 'antd';
+
+import apis from '@/services/apis';
 import moment from 'moment';
 import router from 'umi/router';
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
-import XForm, { FieldTypes } from '../../../components/XForm';
-import Wangedit from '../../../components/Wangedit/Wangedit'
-import request from '../../../utils/request'
-import yinhao from '../../../assets/yinhao.png'
-import ImageUploader from '../../../components/XForm/ImageUpload';
-import logo from '../../../assets/logo.svg';
-import touxiang from '../../../assets/touxiang.jpg';
-import poster1 from '../../../assets/poster1.png';
-import poster2 from '../../../assets/poster2.png';
-import xiaochengxu from '../../../assets/xiaochengxu.png';
+import BuildSelect from '@/components/SelectButton/BuildSelect'
+import request from '@/utils/request'
+import yinhao from '@/assets/yinhao.png'
+import logo from '@/assets/logo.svg';
+import touxiang from '@/assets/touxiang.jpg';
+import poster1 from '@/assets/poster1.png';
+import poster2 from '@/assets/poster2.png';
+import xiaochengxu from '@/assets/xiaochengxu.png';
 import AuthButton from '@/components/AuthButton';
 import Prompt from 'umi/prompt';
 
@@ -28,26 +24,42 @@ const formItemLayout = {
 };
 
 const cancelPage = () => {
-  router.push({
-    pathname: '/activity/helpActivity/list',
-  });
+  router.go('-1')
 }
 
-const getSignList = helpActivityId => {
+const getSignList = dynamicId => {
   router.push({
-    pathname: '/activity/helpActivity/signList',
+    pathname: '/activity/SignList',
     query: {
-      helpActivityId,
+      dynamicId,
     },
   });
 }
 
-const BasicForm = props => {
+const newQrcode = row => {
+  const x = new XMLHttpRequest();
+  const resourceUrl = row.qrCode
+  x.open('GET', resourceUrl, true);
+  x.responseType = 'blob';
+  x.onload = function (e) {
+    const url = window.URL.createObjectURL(x.response)
+    const a = document.createElement('a');
+    a.href = url;
+    a.style.display = 'none'
+    a.download = '活动二维码.png';
+    a.click();
+  }
+  x.send();
+}
 
+const BasicForm = props => {
   const detailData = props.detailData || {}
 
-  const { helpActivityId } = props
+  const radioOnChange = e => {
+    // setIsEnlist(e.target.value)
+  }
 
+  const { dynamicId } = props
   const handleSubmit = e => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
@@ -62,23 +74,22 @@ const BasicForm = props => {
           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 (helpActivityId) {
-          values.helpActivityId = helpActivityId
-          request({ ...apis.helpActivity.update, data: values }).then(data => {
+        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.helpActivity.add, data: { ...values } }).then((data) => {
+          request({ ...apis.activity.add, data: { ...values } }).then((data) => {
             message.info('保存成功')
             router.push({
-              pathname: '/activity/helpActivity/edithelpActivity',
+              pathname: '/activity/editActivity',
               query: {
-                helpActivityId: data.helpActivityId,
+                dynamicId: data.dynamicId,
               },
             });
             // router.go(-1)
@@ -105,29 +116,44 @@ const BasicForm = props => {
             ],
           })(<BuildSelect disabled />)}
         </Form.Item>
+        <Form.Item label="活动封面图1">
+          <img src={detailData.listImgUrl} height="210px" width="375px" />
+        </Form.Item>
+        <Form.Item label="活动封面图2">
+          <img src={detailData.bannerListImg} height="125px" width="375px" />
+        </Form.Item>
+        <Form.Item label="活动详情主图">
+          <img src={detailData.imgUrl} height="300px" width="375px" />
+        </Form.Item>
         <Form.Item label="活动标题">
           <span>{detailData.title}</span>
         </Form.Item>
-        <Form.Item label="助力详情主图">
-          <img src={detailData.img} height="300px" width="375px" />
+        <Form.Item label="活动时间">
+          <span>{`${moment(detailData.startDate).format('YYYY-MM-DD HH:mm')} —— ${moment(detailData.endDate).format('YYYY-MM-DD HH:mm')}`}</span>
         </Form.Item>
-        <Form.Item label="助力封面图1">
-          <img src={detailData.listImg} height="210px" width="375px" />
+        <Form.Item label="活动地点">
+          <span>{detailData.address}</span>
         </Form.Item>
-        <Form.Item label="助力封面图2">
-          <img src={detailData.bannerListImg} height="125px" width="375px" />
-        </Form.Item>
-        <Form.Item label="助力邀请人数">
+        <Form.Item label="活动人数">
           <span>{detailData.personNum}</span>
         </Form.Item>
-        <Form.Item label="助力次数">
-          <span>{detailData.helpNum === 0 ? '不限' : detailData.helpNum}</span>
+        <Form.Item label="阅读量">
+          <span>{detailData.pvNum}</span>
         </Form.Item>
-        <Form.Item label="活动时间">
-          <span>{`${moment(detailData.startDate).format('YYYY-MM-DD HH:mm:ss')} —— ${moment(detailData.endDate).format('YYYY-MM-DD HH:mm:ss')}`}</span>
+        <Form.Item label="转发量">
+          <span>{detailData.shareNum}</span>
+        </Form.Item>
+        <Form.Item label="收藏数">
+          <span>{detailData.saveNum}</span>
+        </Form.Item>
+        <Form.Item label="最大报名人数">
+          <span>{detailData.maxEnlistByPerson}</span>
         </Form.Item>
-        <Form.Item label="活动说明">
-          <img src={detailData.activityInstructions} height="300px" width="375px" />
+        <Form.Item label="活动详情">
+          <div style={{ maxHeight: '500px', overflowY: 'auto' }} dangerouslySetInnerHTML={{ __html: detailData.desc }}></div>
+        </Form.Item>
+        <Form.Item label="报名时间">
+          <span>{`${moment(detailData.enlistStart).format('YYYY-MM-DD HH:mm')} —— ${moment(detailData.enlistEnd).format('YYYY-MM-DD HH:mm')}`}</span>
         </Form.Item>
         <Form.Item label="权重">
           <span>{detailData.heavy}</span>
@@ -139,18 +165,17 @@ const BasicForm = props => {
 
 const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
 
-
 const Poster = (props) => {
-  const { helpActivityId } = props
+  const { dynamicId } = props
   const [inputValue, changeInput] = useState('')
   const [textAreaValue, changeTextArea] = useState('')
   const [imgValue, changeImg] = useState('')
   const [posterId, setPosterId] = useState('')
 
-  if (helpActivityId) {
-    console.log(helpActivityId, 'helpActivityId')
+  if (dynamicId) {
+    console.log(dynamicId, 'dynamicId')
     useEffect(() => {
-      request({ ...apis.activity.poster, params: { targetId: helpActivityId, targetType: 'helpActivity' } }).then((data) => {
+      request({ ...apis.activity.poster, params: { targetId: dynamicId, targetType: 'activity' } }).then((data) => {
         console.log(data, "2222")
         if (data.length > 0) {
           setPosterId(data[0].posterId)
@@ -176,15 +201,15 @@ const Poster = (props) => {
   }
 
   const submitPoster = () => {
-    if (helpActivityId) {
+    if (dynamicId) {
       if (posterId) {
-        request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: helpActivityId, targetType: 'helpActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+        request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: dynamicId, targetType: 'activity', 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: 'helpActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+        request({ ...apis.activity.addPoster, data: { targetId: dynamicId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
           setPosterId(data.posterId)
           message.info("保存成功")
         }).catch((err) => {
@@ -271,15 +296,16 @@ const Poster = (props) => {
 
 
 const Share = (props) => {
-  const { helpActivityId } = props
+  const { dynamicId } = props
+
   const [inputValue, changeInput] = useState('')
   const [imgValue, changeImg] = useState('')
   const [shareContentId, setShareContentId] = useState('')
 
-  if (helpActivityId) {
-    useEffect(() => {
-      request({ ...apis.activity.shareContent, params: { targetId: helpActivityId, targetType: 'helpActivity' }, }).then((data) => {
-        console.log(data, "2222")
+
+  useEffect(() => {
+    if (dynamicId) {
+      request({ ...apis.activity.shareContent, params: { targetId: dynamicId, targetType: 'activity' }, }).then((data) => {
         if (data.length > 0) {
           setShareContentId(data[0].shareContentId)
           changeImg(data[0].shareContentImg)
@@ -288,19 +314,20 @@ const Share = (props) => {
       }).catch((err) => {
         message.info(err.msg || err.message)
       })
-    }, [])
-  }
+    }
+  }, [])
+
 
   const submitShare = () => {
-    if (helpActivityId) {
+    if (dynamicId) {
       if (shareContentId) {
-        request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: helpActivityId, shareContentType: 'helpActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+        request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: dynamicId, shareContentType: 'activity', 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: 'helpActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+        request({ ...apis.activity.addShareContent, data: { targetId: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
           setShareContentId(data.shareContentId)
           message.info("保存成功")
         }).catch(err => {
@@ -344,12 +371,11 @@ const Share = (props) => {
  */
 const Edit = props => {
   const [tab, changeTab] = useState('basic')
-  const { helpActivityId } = props.location.query
+  const { dynamicId } = props.location.query
   const [detailData, setDetailData] = useState(false)
 
-  const getDynamicData = helpActivityId => {
-
-    request({ ...apis.helpActivity.details, params: { helpActivityId } }).then((data) => {
+  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)]
@@ -358,17 +384,18 @@ const Edit = props => {
     })
   }
 
-  useEffect(() => {
-
-    if (helpActivityId) {
 
-      getDynamicData(helpActivityId);
+  useEffect(() => {
+    if (dynamicId) {
+      getDynamicData(dynamicId);
     }
   }, [])
 
 
+  
+
   return (
-    <div>
+    <Card>
       <div>
         <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
           <Radio.Button value="basic">基本信息</Radio.Button>
@@ -377,28 +404,22 @@ const Edit = props => {
         </Radio.Group>
       </div>
       <div>
-        {tab === 'basic' && <Basic helpActivityId={helpActivityId} detailData={detailData} />}
-        {tab === 'poster' && <Poster helpActivityId={helpActivityId} />}
-        {tab === 'share' && <Share helpActivityId={helpActivityId} />}
+        {tab === 'basic' && <Basic dynamicId={dynamicId} detailData={detailData} />}
+        {tab === 'poster' && <Poster  dynamicId={dynamicId} />}
+        {tab === 'share' && <Share  dynamicId={dynamicId} />}
       </div>
       <div style={{ textAlign: 'center' }}>
-        <AuthButton name="admin.help.record" noRight={null}>
-          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) &&
-            <span
-              style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }}
-              onClick={getSignList.bind(this, detailData.helpActivityId)}>
-              <Button>助力记录</Button>
-            </span>}
+        <AuthButton name="admin.SignList.get" noRight={null}>
+          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, detailData.dynamicId)}><Button>报名记录</Button></span>}
+        </AuthButton>
+        <AuthButton name="admin.dymic.qrcode" noRight={null}>
+          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, detailData)}>{<Button>下载二维码</Button>}</span>}
         </AuthButton>
         <Button onClick={() => cancelPage()}>
           取消
           </Button>
       </div>
-      <Prompt message={location =>
-        location.pathname.startsWith("/activity/helpActivity")
-          ? true
-          : localStorage.removeItem("helpActivePageParams")} />
-    </div>
+    </Card>
   );
 }
 

src/pages/activity/groupRoomActivity/edit/Basic.jsx

@@ -0,0 +1,294 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, DatePicker, message } from 'antd';
+import router from 'umi/router';
+import apis from '@/services/apis';
+import moment from 'moment';
+import BuildSelect from '@/components/SelectButton/BuildSelect2';
+import Wangedit from '@/components/Wangedit/Wangedit';
+import request from '@/utils/request';
+import ImageUploader from '@/components/XForm/ImageUpload';
+
+const { RangePicker } = DatePicker;
+
+const formItemLayout = {
+  labelCol: { span: 6 },
+  wrapperCol: { span: 14 },
+};
+
+const cancelPage = () => {
+  router.go('-1');
+};
+
+const BasicForm = props => {
+  const [isEnlist, setIsEnlist] = useState(1);
+  const [activityStatus, setActivityStatus] = useState(1);
+  const [disable, setDisable] = useState(false);
+  const [data, setData] = useState(1);
+  const [showSignupTime, setShowSignupTime] = useState([]);
+
+  const radioOnChange = e => {
+    setIsEnlist(e.target.value);
+  };
+
+  const { dynamicId } = props;
+
+  // 查询详情
+  const getDynamicData = dynamicId => {
+    request({ ...apis.activity.details, params: { dynamicId } }).then(data => {
+      data.activityTime = [moment(data.startDate), moment(data.endDate)];
+      data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)];
+      // setSignupTime([moment(data.enlistStart), moment(data.enlistEnd)])
+      setData(data);
+      setIsEnlist(data.isEnlist);
+      setActivityStatus(data.activityStatus);
+      setDisable(data.activityStatus === 0);
+      props.form.setFieldsValue(data);
+    });
+  };
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    props.form.setFieldsValue({ isEnlist });
+    if (dynamicId) {
+      getDynamicData(dynamicId);
+    }
+  }, []);
+  const checkTime = () => {
+    function compareDate(dateTime1, dateTime2) {
+      return new Date(dateTime1) > new Date(dateTime2);
+    }
+    // 1）修改后的开始时间不得大于当前时间（会存在已经成功报名的用户）
+
+    // （2）修改后开始时间<当前时间<修改后结束时间：活动进行中
+
+    // （3）修改后结束时间<当前时间：活动已结束
+    if (showSignupTime[0]) {
+      // const date = data.signupTime
+      const nowDate = new Date();
+      // console.log(compareDate(nowDate, showSignupTime[0]))
+      if (compareDate(nowDate, showSignupTime[0])) {
+        return true;
+      } else {
+        return '修改后的开始时间不得大于当前时间（会存在已经成功报名的用户）';
+      }
+    }
+    return true;
+  };
+
+  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) {
+          const checks = checkTime();
+          if (checks != true) {
+            message.info(checks);
+            return;
+          }
+          console.log(data.enlistNum, values.personNum, '143');
+
+          if (data.enlistNum > values.personNum) {
+            message.info('活动人数必须大于已报名人数');
+            return;
+          }
+
+          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.push({
+                pathname: '/activity/editActivity',
+                query: {
+                  dynamicId: data.dynamicId,
+                },
+              });
+              // router.go(-1)
+            })
+            .catch(err => {
+              message.info(err.msg || err.message);
+            });
+        }
+      }
+    });
+  };
+  const changeTime = (value, date) => {
+    // console.log(value, data, '-----checkTime---------')
+    // console.log(props.form.getFieldsValue(), '--------time1-----------')
+    // let datas = data
+    // console.log(value, date, datas)
+    // datas.signupTime = date
+
+    // //   data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
+
+    // console.log(datas,'-------datas--------')
+    //   props.form.setFieldsValue(data)
+    setShowSignupTime(date);
+    // props.form.setFieldsValue(datas)
+    // // form.setFieldsValue
+    // console.log('-------1--------')
+  };
+
+  const { getFieldDecorator } = props.form;
+  return (
+    <>
+      <Form {...formItemLayout} onSubmit={handleSubmit}>
+        <Form.Item label="所属项目">
+          {getFieldDecorator('buildingId', {
+            rules: [
+              {
+                required: true,
+                message: '请选择所属项目',
+              },
+            ],
+          })(<BuildSelect disabled={disable} />)}
+        </Form.Item>
+        <Form.Item
+          label="活动封面图1"
+          help="建议图片尺寸：750px*420px，比例16:9,格式：jpg，用于：首页推荐/活动列表"
+        >
+          {getFieldDecorator('listImgUrl', {
+            rules: [
+              {
+                required: true,
+                message: '请选择活动封面图1',
+              },
+            ],
+          })(<ImageUploader />)}
+        </Form.Item>
+        <Form.Item
+          label="活动封面图2"
+          help="建议图片尺寸：750*250，比例3:1，格式：jpg，用于：项目详情页"
+        >
+          {getFieldDecorator('bannerListImg', {
+            rules: [
+              {
+                required: true,
+                message: '请选择活动封面图2',
+              },
+            ],
+          })(<ImageUploader />)}
+        </Form.Item>
+        <Form.Item
+          label="活动详情主图"
+          help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：普通活动详情"
+        >
+          {getFieldDecorator('imgUrl', {
+            rules: [
+              {
+                required: true,
+                message: '请选择活动详情主图',
+              },
+            ],
+          })(<ImageUploader />)}
+        </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>
+        {/* disabled={activityStatus === 0 ? true : false} */}
+        <Form.Item label="活动人数" help="当前活动最多可报名人数">
+          {getFieldDecorator('personNum', {
+            rules: [
+              {
+                required: true,
+                message: '请输入活动人数',
+              },
+              // {
+              //   min: data.personNum,min={data.personNum || 0}
+              //   message: '活动人数必须大于已报名人数',
+              // },
+            ],
+          })(<Input type="number" />)}
+        </Form.Item>
+        <Form.Item label="用户携带人数" help="每个用户最多可携带参与活动的人数">
+          {getFieldDecorator('maxEnlistByPerson', {
+            rules: [
+              {
+                required: true,
+                message: '请输入用户携带人数',
+              },
+            ],
+          })(<Input type="number" min={1} />)}
+        </Form.Item>
+        <Form.Item label="活动详情">{getFieldDecorator('desc')(<Wangedit />)}</Form.Item>
+        <Form.Item label="报名时间">
+          {getFieldDecorator('signupTime', {
+            rules: [
+              {
+                required: true,
+                message: '请选择报名时间',
+              },
+            ],
+          })(<RangePicker format="YYYY-MM-DD HH:mm" onChange={changeTime} />)}
+        </Form.Item>
+        <Form.Item label="权重">
+          {getFieldDecorator('heavy', {
+            rules: [
+              {
+                required: true,
+                message: '请输入权重',
+              },
+            ],
+          })(<Input type="number" style={{ width: 80 }} />)}
+          <span style={{ marginLeft: 30, color: 'grey' }}>数字越大越靠前</span>
+        </Form.Item>
+        <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
+          <Button type="primary" htmlType="submit">
+            确认
+          </Button>
+          &nbsp;&nbsp;&nbsp;&nbsp;
+          <Button onClick={() => cancelPage()}>取消</Button>
+        </Form.Item>
+      </Form>
+    </>
+  );
+};
+
+export default Form.create({ name: 'BasicForm' })(BasicForm);

src/pages/activity/groupRoomActivity/edit/Poster.jsx

@@ -0,0 +1,255 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Button, message } from 'antd';
+import router from 'umi/router';
+import apis from '@/services/apis';
+import request from '@/utils/request';
+import yinhao from '@/assets/yinhao.png';
+import ImageUploader from '@/components/XForm/ImageUpload';
+import touxiang from '@/assets/touxiang.jpg';
+import poster1 from '@/assets/poster1.png';
+import xiaochengxu from '@/assets/xiaochengxu.png';
+
+const { TextArea } = Input;
+
+const cancelPage = () => {
+  router.go('-1');
+};
+
+const Poster = props => {
+  const { dynamicId } = props;
+  const [inputValue, changeInput] = useState('');
+  const [textAreaValue, changeTextArea] = useState('');
+  const [imgValue, changeImg] = useState('');
+  const [posterId, setPosterId] = useState('');
+
+  useEffect(() => {
+    if (dynamicId) {
+      request({ ...apis.activity.poster, params: { targetId: dynamicId, targetType: 'activity' } })
+        .then(data => {
+          if (data.length > 0) {
+            setPosterId(data[0].posterId);
+            changeImg(data[0].posterImg);
+            changeTextArea(data[0].posterDescription);
+            changeInput(data[0].posterTitle);
+          }
+        })
+        .catch(err => {
+          message.info(err.msg || err.message);
+        });
+    }
+    // getMiniappName()
+  }, []);
+
+  // 获取小程序名称
+  // const [miniappName, setMiniappName] = useState('')
+  // function getMiniappName() {
+  //   request({ ...apis.building.getMiniappName }).then(res => {
+  //     console.log(res, "0000000000000")
+  //     setMiniappName(res)
+  //   })
+  // }
+
+  const submitPoster = () => {
+    if (dynamicId) {
+      if (posterId) {
+        request({
+          ...apis.activity.updatePoster,
+          urlData: { id: posterId },
+          data: {
+            targetId: dynamicId,
+            targetType: 'activity',
+            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: dynamicId,
+            targetType: 'activity',
+            posterImg: imgValue,
+            posterTitle: inputValue,
+            posterDescription: textAreaValue,
+          },
+        })
+          .then(data => {
+            setPosterId(data.posterId);
+            message.info('保存成功');
+          })
+          .catch(err => {
+            message.info(err.msg || err.message);
+          });
+      }
+    } else {
+      message.warn('请先保存基本信息数据');
+    }
+  };
+
+  return (
+    <div>
+      <div style={{ display: 'flex' }}>
+        <div
+          style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}
+        >
+          <div
+            style={{
+              width: '375px',
+              height: '700px',
+              backgroundColor: '#fff',
+              boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)',
+              position: 'relative',
+              margin: '0 auto',
+            }}
+          >
+            <img style={{ width: '100%', height: '300px' }} src={imgValue || poster1} alt="" />
+            <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
+              <img
+                style={{
+                  width: '70px',
+                  height: '70px',
+                  border: '4px solid #fff',
+                  borderRadius: '35px',
+                  marginLeft: '16px',
+                }}
+                src={touxiang}
+                alt=""
+              />
+              <span
+                style={{
+                  color: '#222',
+                  fontWeight: '600',
+                  margin: '24px 10px 0 14px',
+                  fontSize: '17px',
+                }}
+              >
+                喵喵
+              </span>
+              <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您参与</span>
+              <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',
+                WebkitLineClamp: '2',
+                WebkitBoxOrient: 'vertical',
+                overflow: 'hidden',
+                textOverflow: 'ellipsis',
+              }}
+            >
+              {inputValue || '海报标题'}
+            </p>
+
+            <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',
+                WebkitLineClamp: '3',
+                WebkitBoxOrient: 'vertical',
+                overflow: 'hidden',
+                textOverflow: 'ellipsis',
+              }}
+            >
+              {textAreaValue || '海报描述'}
+            </p>
+            <div
+              style={{
+                backgroundColor: '#f1f1f1',
+                padding: '22px 30px',
+                boxShadow: '0px 6px 12px -4px #dcdcdc',
+                position: 'relative',
+              }}
+            >
+              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>长按识别小程序码</p>
+              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>进入活动查看详情</p>
+              <img
+                style={{ width: '80px', position: 'absolute', right: '30px', top: '10px' }}
+                src={xiaochengxu}
+                alt=""
+              />
+            </div>
+          </div>
+          <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>
+            海报模板
+          </p>
+        </div>
+
+        <div>
+          <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+            <p
+              style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}
+            >
+              活动海报图
+            </p>
+            <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+          </div>
+          <p
+            style={{
+              fontSize: '0.5vw',
+              color: '#A9A9A9',
+              marginLeft: '230px',
+              marginBottom: '30px',
+            }}
+          >
+            建议图片尺寸：640*670px，比例64:67,格式：jpg，用于普通活动海报
+          </p>
+          <div
+            style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}
+          >
+            <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' }}
+            >
+              海报描述
+            </p>
+            <TextArea
+              rows={5}
+              maxLength={1024}
+              value={textAreaValue}
+              onChange={e => changeTextArea(e.target.value)}
+            />
+          </div>
+        </div>
+      </div>
+      <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}>
+        {' '}
+        确定
+      </Button>
+      <Button onClick={() => cancelPage()}>取消</Button>
+    </div>
+  );
+};
+
+export default Poster;

src/pages/activity/groupRoomActivity/edit/Share.jsx

@@ -0,0 +1,150 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Card } from 'antd';
+
+import router from 'umi/router';
+import apis from '@/services/apis';
+import moment from 'moment';
+import BuildSelect from '@/components/SelectButton/BuildSelect2';
+import Wangedit from '@/components/Wangedit/Wangedit';
+import request from '@/utils/request';
+import yinhao from '@/assets/yinhao.png';
+import ImageUploader from '@/components/XForm/ImageUpload';
+import logo from '@/assets/logo.png';
+import touxiang from '@/assets/touxiang.jpg';
+import poster1 from '@/assets/poster1.png';
+import poster2 from '@/assets/poster2.png';
+import xiaochengxu from '@/assets/xiaochengxu.png';
+
+const { TextArea } = Input;
+
+const cancelPage = () => {
+  router.go('-1');
+};
+
+const Share = props => {
+  const { dynamicId } = props;
+  const [inputValue, changeInput] = useState('');
+  const [imgValue, changeImg] = useState('');
+  const [shareContentId, setShareContentId] = useState('');
+
+  useEffect(() => {
+    if (dynamicId) {
+      request({
+        ...apis.activity.shareContent,
+        params: { targetId: dynamicId, targetType: 'activity' },
+      })
+        .then(data => {
+          if (data.length > 0) {
+            setShareContentId(data[0].shareContentId);
+            changeImg(data[0].shareContentImg);
+            changeInput(data[0].shareContentTitle);
+          }
+        })
+        .catch(err => {
+          message.info(err.msg || err.message);
+        });
+    }
+  }, [dynamicId]);
+
+  const submitShare = () => {
+    if (dynamicId) {
+      if (shareContentId) {
+        request({
+          ...apis.activity.updateShareContent,
+          urlData: { id: shareContentId },
+          data: {
+            targetId: dynamicId,
+            shareContentType: 'activity',
+            shareContentImg: imgValue,
+            shareContentTitle: inputValue,
+          },
+        })
+          .then(data => {
+            message.info('保存成功');
+          })
+          .catch(err => {
+            message.info(err.msg || err.message);
+          });
+      } else {
+        request({
+          ...apis.activity.addShareContent,
+          data: {
+            targetId: dynamicId,
+            shareContentType: 'activity',
+            shareContentImg: imgValue,
+            shareContentTitle: inputValue,
+          },
+        })
+          .then(data => {
+            setShareContentId(data.shareContentId);
+            message.info('保存成功');
+          })
+          .catch(err => {
+            message.info(err.msg || err.message);
+          });
+      }
+    } else {
+      message.warn('请先保存基本信息数据');
+    }
+  };
+
+  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' }}>
+          分享模板
+        </p>
+        <div>
+          <p
+            style={{
+              display: 'flex',
+              alignItems: 'center',
+              fontSize: '14px',
+              color: '#999',
+              margin: '0',
+              lineHeight: '0',
+            }}
+          >
+            <img src={logo} style={{ width: '22px', marginRight: '10px' }} alt="" />
+            橙蕉互动
+          </p>
+          <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>
+            {inputValue || '置业V客厅 精准获客平台'}
+          </p>
+          <img style={{ width: '200px', height: '160px' }} src={imgValue || poster2} alt="" />
+        </div>
+      </div>
+      <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+        <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' }}>
+          活动分享图
+        </p>
+        <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+      </div>
+      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>
+        建议图片尺寸：750*600px，比例5:4,格式：jpg，用于活动分享好友
+      </p>
+      <Button
+        type="primary"
+        htmlType="submit"
+        onClick={submitShare}
+        style={{ margin: '40px 40px 40px 220px' }}
+      >
+        {' '}
+        确定
+      </Button>
+      <Button onClick={() => cancelPage()}>取消</Button>
+    </div>
+  );
+};
+
+export default Share;

src/pages/activity/helpActivity/edithelpActivity.jsx → src/pages/activity/groupRoomActivity/edit/ind.jsx

@@ -1,168 +1,168 @@
 import React, { useState, useEffect } from 'react';
 import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../../style/GoodsList.less';
-import apis from '../../../services/apis';
-import moment from 'moment';
+
 import router from 'umi/router';
-import BuildSelect from '../../../components/SelectButton/BuildSelect2'
-import XForm, { FieldTypes } from '../../../components/XForm';
-import Wangedit from '../../../components/Wangedit/Wangedit'
-import request from '../../../utils/request'
-import yinhao from '../../../assets/yinhao.png'
-import ImageUploader from '../../../components/XForm/ImageUpload';
-import logo from '../../../assets/logo.svg';
-import touxiang from '../../../assets/touxiang.jpg';
-import poster1 from '../../../assets/poster1.png';
-import poster2 from '../../../assets/poster2.png';
-import xiaochengxu from '../../../assets/xiaochengxu.png'
-import Prompt from 'umi/prompt';
+import apis from '@/services/apis';
+import moment from 'moment';
+import BuildSelect from '@/components/SelectButton/BuildSelect2'
+import Wangedit from '@/components/Wangedit/Wangedit'
+import request from '@/utils/request'
+import yinhao from '@/assets/yinhao.png'
+import ImageUploader from '@/components/XForm/ImageUpload';
+import logo from '@/assets/logo.svg';
+import touxiang from '@/assets/touxiang.jpg';
+import poster1 from '@/assets/poster1.png';
+import poster2 from '@/assets/poster2.png';
+import xiaochengxu from '@/assets/xiaochengxu.png'
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const { TextArea } = Input;
 
+const formItemLayout = {
+  labelCol: { span: 6 },
+  wrapperCol: { span: 14 },
+};
+
 const cancelPage = () => {
   router.push({
-    pathname: '/activity/helpActivity/list',
+    pathname: '/activity/ActivityList',
   });
 }
 
-const header = props => {
+const BasicForm = props => {
   const [isEnlist, setIsEnlist] = useState(1)
-  // 新增成功后拿到返回的ID
-  const [helpId, setHelpId] = useState()
   const [activityStatus, setActivityStatus] = useState(1)
   const [disable, setDisable] = useState(false)
+  const [data, setData] = useState(1)
+  const [showSignupTime, setShowSignupTime] = useState([])
+
 
   const radioOnChange = e => {
-    // console.log(e.target.value)
     setIsEnlist(e.target.value)
   }
 
+  const { dynamicId } = props
 
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [data, setData] = useState({ channelNmae: [], result: [] })
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const { helpActivityId } = props
-  const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
-
-
-  // 详情
-  const getDynamicData = helpActivityId => {
-    request({ ...apis.helpActivity.details, params: { helpActivityId } }).then((data) => {
+  // 查询详情
+  const getDynamicData = dynamicId => {
+    request({ ...apis.activity.details, params: { dynamicId } }).then(data => {
+ 
       data.activityTime = [moment(data.startDate), moment(data.endDate)]
-      const num = data.helpNum > 0 ? 1 : 0
-      setIsEnlist(num)
+      data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
+      // setSignupTime([moment(data.enlistStart), moment(data.enlistEnd)])
+      setData(data)
+      setIsEnlist(data.isEnlist)
       setActivityStatus(data.activityStatus)
-      setDisable(data.activityStatus === 0 ? true : false)
-      data.isEnlist = num
+      setDisable(data.activityStatus === 0)
       props.form.setFieldsValue(data)
-      setDynamicData(data)
     })
   }
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-    // eslint-disable-next-line no-use-before-define
-    if (helpActivityId) {
-      getDynamicData(helpActivityId)
+    props.form.setFieldsValue({ isEnlist })
+    if (dynamicId) {
+      getDynamicData(dynamicId);
     }
   }, [])
+  const checkTime = () => {
+    function compareDate(dateTime1, dateTime2) {
+      return new Date(dateTime1) > new Date(dateTime2)
+    }
+    // 1）修改后的开始时间不得大于当前时间（会存在已经成功报名的用户）
 
-  // function addChannel(params) {
-  //   request({ ...apis.channelList.addChannel, data: { ...params } }).then((data) => {
-  //     setData(data)
-  // }).catch((err) => {
-  //     console.log(err)
-  //     message.info(err.msg || err.message)
-  // })
-  // }
+    // （2）修改后开始时间<当前时间<修改后结束时间：活动进行中
 
-  function compareDate(dateTime1, dateTime2) {
-    var formatDate1 = new Date(dateTime1)
-    var formatDate2 = new Date(dateTime2)
-    if (formatDate1 > formatDate2) {
-      return true;
-    }
-    else {
-      return false;
+    // （3）修改后结束时间<当前时间：活动已结束
+    if (showSignupTime[0]) {
+      // const date = data.signupTime
+      const nowDate = new Date()
+      // console.log(compareDate(nowDate, showSignupTime[0]))
+      if (compareDate(nowDate, showSignupTime[0])) {
+        return true
+      } else {
+        return '修改后的开始时间不得大于当前时间（会存在已经成功报名的用户）'
+      }
     }
+    return true
   }
 
-  function handleSubmit(e) {
+
+  const handleSubmit = e => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
-      if (!err) {
-        if (values.isEnlist === 0) {
-          values.helpNum = 0
-        }
 
-        // 判断助力人数不得超过200
-        if (values.personNum > 200) {
-          message.error('助力邀请人数不能超过200')
-          return
-        }
-        // 助力邀请人数>0
-        if (values.personNum <= 0) {
-          message.error('助力邀请人数大于0')
-          return
+      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');
         }
 
-        // 判断助力人数必须大于0
-        if (values.isEnlist === 1) {
-          if (values.helpNum <= 0) {
-            message.error('限制助力次数必须大于0')
+        console.log('submit data --->', values)
+        if (dynamicId) {
+          const checks = checkTime()
+          if (checks != true) {
+            message.info(checks)
             return
           }
-        }
-        const { activityTime, signupTime, ...submitValue } = values
-        const [startDate, endDate] = activityTime
-        console.log('startDate', activityTime)
-        submitValue.startDate = moment(startDate).format('YYYY-MM-DD HH:mm:ss');
-        submitValue.endDate = moment(endDate).format('YYYY-MM-DD HH:mm:ss');
-        // 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 (helpActivityId) {
-
-          const nowDate = new Date()
-          if (!compareDate(nowDate, startDate)) {
-
-            message.info("修改后的开始时间不得大于当前时间（会存在已经成功助力或者发起助力的用户）")
+          console.log(data.enlistNum,values.personNum,'143')
+
+          if (data.enlistNum > values.personNum) {
+            message.info('活动人数必须大于已报名人数')
             return
           }
 
-          submitValue.helpActivityId = helpActivityId
-          request({ ...apis.helpActivity.update, data: submitValue }).then((data) => {
-            message.info("保存成功")
-            // cancelPage()
+          values.dynamicId = dynamicId
+          request({ ...apis.activity.update, data: values }).then(data => {
+            message.info('保存成功')
+            // router.go(-1)
           }).catch((err) => {
-            // message.info(err.msg || err.message)
+            message.info(err.msg || err.message)
           })
         } else {
-          request({ ...apis.helpActivity.add, data: submitValue }).then((data) => {
+          request({ ...apis.activity.add, data: { ...values } }).then((data) => {
+            message.info('保存成功')
             router.push({
-              pathname: '/activity/helpActivity/edithelpActivity',
+              pathname: '/activity/editActivity',
               query: {
-                helpActivityId: data,
+                dynamicId: data.dynamicId,
               },
             });
-            message.info("保存成功")
-            // cancelPage()
+            // router.go(-1)
           }).catch((err) => {
-            // message.info(err.msg || err.message)
+            message.info(err.msg || err.message)
           })
         }
       }
     });
   }
+  const changeTime = (value, date) => {
+    // console.log(value, data, '-----checkTime---------')
+    // console.log(props.form.getFieldsValue(), '--------time1-----------')
+    // let datas = data
+    // console.log(value, date, datas)
+    // datas.signupTime = date
+
+    // //   data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
+
+    // console.log(datas,'-------datas--------')
+    //   props.form.setFieldsValue(data)
+    setShowSignupTime(date)
+    // props.form.setFieldsValue(datas)
+    // // form.setFieldsValue
+    // console.log('-------1--------')
+  }
 
   const { getFieldDecorator } = props.form;
-
   return (
     <>
-      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+      <Form {...formItemLayout} onSubmit={handleSubmit}>
         <Form.Item label="所属项目">
           {getFieldDecorator('buildingId', {
             rules: [
@@ -173,51 +173,46 @@ const header = props => {
             ],
           })(<BuildSelect disabled={disable} />)}
         </Form.Item>
-
-        <Form.Item label="活动标题">
-          {getFieldDecorator('title', {
+        <Form.Item label="活动封面图1" help="建议图片尺寸：750px*420px，比例16:9,格式：jpg，用于：首页推荐/活动列表">
+          {getFieldDecorator('listImgUrl', {
             rules: [
               {
                 required: true,
-                message: '请输入活动标题',
+                message: '请选择活动封面图1',
               },
             ],
-          })(<Input />)}
+          })(<ImageUploader />)}
         </Form.Item>
-
-        <Form.Item label="助力详情主图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：助力活动详情">
-          {getFieldDecorator('img', {
+        <Form.Item label="活动封面图2" help="建议图片尺寸：750*250，比例3:1，格式：jpg，用于：项目详情页">
+          {getFieldDecorator('bannerListImg', {
             rules: [
               {
                 required: true,
-                message: '助力详情主图不能为空',
+                message: '请选择活动封面图2',
               },
             ],
           })(<ImageUploader />)}
         </Form.Item>
-
-        <Form.Item label="助力封面图1" help="建议图片尺寸：750*420px，比例16:9,格式：jpg，用于：活动列表/首页推荐">
-          {getFieldDecorator('listImg', {
+        <Form.Item label="活动详情主图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：普通活动详情">
+          {getFieldDecorator('imgUrl', {
             rules: [
               {
                 required: true,
-                message: '助力封面图1不能为空',
+                message: '请选择活动详情主图',
               },
             ],
           })(<ImageUploader />)}
         </Form.Item>
-
-        <Form.Item label="助力封面图2" help="建议图片尺寸：750*250px，比例3:1,格式：jpg，用于：项目详情页">
-          {getFieldDecorator('bannerListImg', {
+        <Form.Item label="活动标题">
+          {getFieldDecorator('title', {
             rules: [
               {
                 required: true,
-                message: '助力封面图2不能为空',
+                message: '请输入活动标题',
               },
             ],
-          })(<ImageUploader />)}
+          })(<Input />)}
         </Form.Item>
-
         <Form.Item label="活动时间">
           {getFieldDecorator('activityTime', {
             rules: [
@@ -226,60 +221,59 @@ const header = props => {
                 message: '请选择活动时间',
               },
             ],
-          })(<RangePicker format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }} />)}
+          })(<RangePicker format="YYYY-MM-DD HH:mm" />)}
         </Form.Item>
-
-        <Form.Item label="助力邀请人数" min={1} max={10}>
+        <Form.Item label="活动地点">
+          {getFieldDecorator('address', {
+            rules: [
+              {
+                required: true,
+                message: '请输入活动地点',
+              },
+            ],
+          })(<Input />)}
+        </Form.Item>
+        {/* disabled={activityStatus === 0 ? true : false} */}
+        <Form.Item label="活动人数" help="当前活动最多可报名人数">
           {getFieldDecorator('personNum', {
             rules: [
               {
                 required: true,
                 message: '请输入活动人数',
               },
+              // {
+              //   min: data.personNum,min={data.personNum || 0}
+              //   message: '活动人数必须大于已报名人数',
+              // },
             ],
-          })(<Input type="number" disabled={activityStatus === 0 ? true : false} />)}
+          })(<Input type="number" />)}
         </Form.Item>
-
-        <Form.Item label="助力次数">
-          {getFieldDecorator('isEnlist', {
+        <Form.Item label="用户携带人数" help="每个用户最多可携带参与活动的人数">
+          {getFieldDecorator('maxEnlistByPerson', {
             rules: [
               {
                 required: true,
-                message: '请选择助力次数',
+                message: '请输入用户携带人数',
               },
             ],
-          })(
-            <Radio.Group onChange={(e) => radioOnChange(e)} disabled={activityStatus === 0 ? true : false}>
-              <Radio value={0}>不限制</Radio>
-              <Radio value={1}>限制</Radio>
-            </Radio.Group>,
-          )}
+          })(<Input type="number" min={1} />)}
         </Form.Item>
-        {
-          isEnlist === 1 && <Form.Item label=" " min={1} max={10}>
-            {getFieldDecorator('helpNum', {
-              rules: [
-                {
-                  required: true,
-                  message: '请输入助力人数',
-                },
-              ],
-            })(<Input type="number" placeholder="助力人数限制" />)}
-          </Form.Item>
-        }
-
-        <Form.Item label="活动说明" help="建议宽度：750px，高度不限，格式：jpg，用于活动详情">
-          {getFieldDecorator('activityInstructions', {
+        <Form.Item label="活动详情">
+          {getFieldDecorator('desc')(<Wangedit />)}
+        </Form.Item>
+        <Form.Item label="报名时间">
+          {getFieldDecorator('signupTime', {
             rules: [
               {
                 required: true,
-                message: '活动说明不能为空',
+                message: '请选择报名时间',
               },
             ],
-          })(<ImageUploader />)}
+          })(<RangePicker format="YYYY-MM-DD HH:mm" onChange={changeTime} />)}
         </Form.Item>
         <Form.Item label="权重">
           {getFieldDecorator('heavy', {
+
             rules: [
               {
                 required: true,
@@ -302,19 +296,18 @@ const header = props => {
   )
 }
 
-const Basic = Form.create({ name: 'header' })(header);
-
+const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
 
 const Poster = props => {
-  const { helpActivityId } = props
+  const { dynamicId } = props
   const [inputValue, changeInput] = useState('')
   const [textAreaValue, changeTextArea] = useState('')
   const [imgValue, changeImg] = useState('')
   const [posterId, setPosterId] = useState('')
 
   useEffect(() => {
-    if (helpActivityId) {
-      request({ ...apis.activity.poster, params: { targetId: helpActivityId, targetType: 'helpActivity' } }).then(data => {
+    if (dynamicId) {
+      request({ ...apis.activity.poster, params: { targetId: dynamicId, targetType: 'activity' } }).then(data => {
 
         if (data.length > 0) {
           setPosterId(data[0].posterId)
@@ -328,8 +321,8 @@ const Poster = props => {
     }
     // getMiniappName()
   }, [])
-
-  // // 获取小程序名称
+  
+  // 获取小程序名称
   // const [miniappName, setMiniappName] = useState('')
   // function getMiniappName() {
   //   request({ ...apis.building.getMiniappName }).then(res => {
@@ -339,17 +332,17 @@ const Poster = props => {
   // }
 
   const submitPoster = () => {
-    if (helpActivityId) {
+    if (dynamicId) {
       if (posterId) {
-        request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: helpActivityId, targetType: 'helpActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then(data => {
+        request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: dynamicId, targetType: 'activity', 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: 'helpActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then(data => {
+        request({ ...apis.activity.addPoster, data: { targetId: dynamicId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue } }).then(data => {
           setPosterId(data.posterId)
-          message.info("保存成功")
+          message.info('保存成功')
         }).catch(err => {
           message.info(err.msg || err.message)
         })
@@ -381,7 +374,7 @@ const Poster = props => {
             WebkitLineClamp: '2',
             WebkitBoxOrient: 'vertical',
             overflow: 'hidden',
-            textOverflow: 'ellipsis'
+            textOverflow: 'ellipsis',
           }}>{inputValue || '海报标题'}</p>
 
           <img src={yinhao} style={{ width: '30px', marginLeft: '20px' }} alt="" />
@@ -395,7 +388,7 @@ const Poster = props => {
             WebkitLineClamp: '3',
             WebkitBoxOrient: 'vertical',
             overflow: 'hidden',
-            textOverflow: 'ellipsis'
+            textOverflow: 'ellipsis',
           }}>{textAreaValue || '海报描述'}</p>
           <div style={{ backgroundColor: '#f1f1f1', padding: '22px 30px', boxShadow: '0px 6px 12px -4px #dcdcdc', position: 'relative' }}>
             <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>长按识别小程序码</p>
@@ -408,10 +401,10 @@ const Poster = props => {
 
       <div >
         <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>助力海报图</p>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动海报图</p>
           <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
         </div>
-        <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于助力活动海报</p>
+        <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px' }}>建议图片尺寸：640*670px，比例64:67,格式：jpg，用于普通活动海报</p>
         <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
           <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)} />
@@ -424,20 +417,22 @@ const Poster = props => {
       </div>
     </div>
     <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
-    <Button onClick={() => cancelPage()}>取消</Button>
+    <Button onClick={() => cancelPage()}>
+      取消
+    </Button>
   </div>
 }
 
-
 const Share = props => {
-  const { helpActivityId } = props
+  const { dynamicId } = props
   const [inputValue, changeInput] = useState('')
   const [imgValue, changeImg] = useState('')
   const [shareContentId, setShareContentId] = useState('')
 
   useEffect(() => {
-    if (helpActivityId) {
-      request({ ...apis.activity.shareContent, params: { targetId: helpActivityId, targetType: 'helpActivity' } }).then(data => {
+    if (dynamicId) {
+      request({ ...apis.activity.shareContent, params: { targetId: dynamicId, targetType: 'activity' } }).then(data => {
+
         if (data.length > 0) {
           setShareContentId(data[0].shareContentId)
           changeImg(data[0].shareContentImg)
@@ -447,18 +442,18 @@ const Share = props => {
         message.info(err.msg || err.message)
       })
     }
-  }, [])
+  }, [dynamicId])
 
   const submitShare = () => {
-    if (helpActivityId) {
+    if (dynamicId) {
       if (shareContentId) {
-        request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: helpActivityId, shareContentType: 'helpActivity', shareContentImg: imgValue, shareContentTitle: inputValue } }).then(data => {
+        request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: dynamicId, shareContentType: 'activity', 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: 'helpActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then(data => {
+        request({ ...apis.activity.addShareContent, data: { targetId: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue } }).then(data => {
           setShareContentId(data.shareContentId)
           message.info('保存成功')
         }).catch(err => {
@@ -475,8 +470,7 @@ const Share = props => {
       <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' }} alt="" />橙蕉互动
-        </p>
+          <img src={logo} style={{ width: '22px', marginRight: '10px' }} alt=""/>橙蕉互动</p>
         <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue || '置业V客厅 精准获客平台'}</p>
         <img style={{ width: '200px', height: '160px' }} src={imgValue || poster2} alt="" />
       </div>
@@ -486,12 +480,14 @@ const Share = props => {
       <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' }}>助力分享图</p>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动分享图</p>
       <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
     </div>
-    <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于助力活动分享好友</p>
+    <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于活动分享好友</p>
     <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
-    <Button onClick={() => cancelPage()}>取消</Button>
+    <Button onClick={() => cancelPage()}>
+      取消
+    </Button>
   </div>
 }
 
@@ -504,26 +500,7 @@ const Share = props => {
  */
 const Edit = props => {
   const [tab, changeTab] = useState('basic')
-  // 判断是否展示助力次数的输入框
-  // const [help, helpTab] = useState('1')
-  const { helpActivityId } = props.location.query
-  const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
-  
-  // 详情
-  const getDynamicData = id => {
-    request({ ...apis.helpActivity.details, params: { helpActivityId: id } }).then(data => {
-      setDynamicData(data)
-    })
-  }
-
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useEffect(() => {
-    // eslint-disable-next-line no-use-before-define
-    if (helpActivityId) {
-      getDynamicData(helpActivityId);
-    }
-  }, [])
-
+  const { dynamicId } = props.location.query
 
   return (
     <div>
@@ -535,15 +512,13 @@ const Edit = props => {
         </Radio.Group>
       </div>
       <div>
-        {tab === 'basic' && <Basic helpActivityId={helpActivityId} />}
-        {tab === 'poster' && <Poster helpActivityId={helpActivityId} />}
-        {tab === 'share' && <Share helpActivityId={helpActivityId} />}
+        {tab === 'basic' && <Basic dynamicId={dynamicId} />}
+        {tab === 'poster' && <Poster dynamicId={dynamicId}/>}
+        {tab === 'share' && <Share dynamicId={dynamicId}/>}
       </div>
-      <Prompt message={location =>
-        (location.pathname.startsWith('/activity/helpActivity')
-          ? true
-          : localStorage.removeItem('activePageParams'))} />
+    
     </div>
   );
 }
+
 export default Edit

src/pages/activity/groupRoomActivity/edit/index.jsx

@@ -0,0 +1,34 @@
+import React, { useState } from 'react';
+import { Radio, Card } from 'antd';
+import Basic from './Basic';
+import Poster from './Poster';
+import Share from './Share';
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  const [tab, changeTab] = useState('basic');
+  const { dynamicId } = props.location.query;
+
+  return (
+    <Card>
+      <div>
+        <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
+          <Radio.Button value="basic">基本信息</Radio.Button>
+          <Radio.Button value="poster">海报图片</Radio.Button>
+          <Radio.Button value="share">分享设置</Radio.Button>
+        </Radio.Group>
+      </div>
+      <div>
+        {tab === 'basic' && <Basic dynamicId={dynamicId} />}
+        {tab === 'poster' && <Poster dynamicId={dynamicId} />}
+        {tab === 'share' && <Share dynamicId={dynamicId} />}
+      </div>
+    </Card>
+  );
+};
+
+export default Edit;

src/pages/activity/groupRoomActivity/index.jsx

@@ -0,0 +1,331 @@
+import React, { useState, useEffect, useRef } from 'react';
+import {
+  Form,
+  Input,
+  Button,
+  Icon,
+  Typography,
+  message,
+  Table,
+  Pagination,
+  Modal,
+  DatePicker,
+  Card,
+} from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import Navigate from '@/components/Navigate';
+import SelectCity from '@/components/SelectButton/CitySelect';
+import BuildSelect from '@/components/SelectButton/BuildSelect';
+import apis from '@/services/apis';
+import request from '@/utils/request';
+import QueryTable from '@/components/QueryTable';
+
+const GroupRoomActivity = props => {
+  const ref = useRef();
+
+  const searchFields = [
+    {
+      name: 'cityId',
+      label: '城市',
+      placeholder: '请选择城市',
+      render: () => <SelectCity style={{ width: 160 }} />,
+    },
+    {
+      name: 'buildingId',
+      label: '项目',
+      placeholder: '请选择项目',
+      render: () => <BuildSelect style={{ width: 160 }} />,
+    },
+
+    {
+      name: 'title',
+      label: '标题',
+      placeholder: '请输入标题',
+    },
+    {
+      name: 'time',
+      label: '时间',
+      placeholder: '请选择时间',
+      type: 'datepicker',
+    },
+  ];
+
+  const toGroupRoomActivityDetail = dynamicId => () => {
+    router.push({
+      pathname: '/activity/groupRoomActivity/detail',
+      query: {
+        dynamicId,
+      },
+    });
+  };
+
+  // 跳转到编辑
+  const toGroupRoomActivityEdit = dynamicId => {
+    router.push({
+      pathname: '/activity/groupRoomActivity/edit',
+      query: {
+        dynamicId,
+      },
+    });
+  };
+
+  //   置顶
+  const topDynamic = row => () => {
+    const weight = Math.abs(row.weight - 1);
+    request({ ...apis.activity.weight, params: { dynamicId: row.dynamicId, weight } })
+      .then(data => {
+        message.info('操作成功！');
+        ref.current.reload();
+      })
+      .catch(err => {
+        console.log(err);
+        message.info(err.msg || err.message);
+      });
+  };
+
+  //   推首页
+  const homeDynamic = row => () => {
+    const home = Math.abs(row.home - 1);
+    request({ ...apis.activity.home, params: { dynamicId: row.dynamicId, home } })
+      .then(data => {
+        message.info('操作成功！');
+        ref.current.reload();
+      })
+      .catch(err => {
+        console.log(err);
+        message.info(err.msg || err.message);
+      });
+  };
+
+  //结束活动
+  const finishDynamic = row => {
+    Modal.confirm({
+      title:
+        '活动会被强制结束，小程序端无法再发起或参与此活动，如果不想让客户看到活动，请再点击取消发布按钮',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.activity.finish, data: { dynamicId: row.dynamicId, top: '' } })
+          .then(data => {
+            message.info('操作成功！');
+            ref.current.reload();
+          })
+          .catch(err => {
+            console.log(err);
+            message.info(err.msg || err.message);
+          });
+      },
+    });
+  };
+
+  // 发布活动
+  const sendDynamic = row => {
+    Modal.confirm({
+      title: '确定发布吗？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.activity.send, urlData: { id: row.dynamicId } })
+          .then(data => {
+            message.info('操作成功！');
+            ref.current.reload();
+          })
+          .catch(err => {
+            console.log(err);
+            message.info(err.msg || err.message);
+          });
+      },
+    });
+  };
+
+  // 取消活动
+  const cancelDynamic = row => {
+    Modal.confirm({
+      title: '活动会在小程序端隐藏，后台可以继续编辑重新发布',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.activity.cancel, urlData: { id: row.dynamicId } })
+          .then(data => {
+            message.info('操作成功！');
+            ref.current.reload();
+          })
+          .catch(err => {
+            console.log(err);
+            message.info(err.msg || err.message);
+          });
+      },
+    });
+  };
+
+  //   发布or取消发布
+  const sendOrPublicDynamic = row => {
+    if (row.status === 1) {
+      cancelDynamic(row);
+    } else {
+      sendDynamic(row);
+    }
+  };
+
+  const getJoinPeople = dynamicId => () => {
+    router.push({
+      pathname: '/activity/groupRoomActivity/registrationRecord',
+      query: {
+        dynamicId,
+      },
+    });
+  };
+
+  const columns = [
+    {
+      title: '活动标题',
+      dataIndex: 'title',
+      key: 'title',
+      align: 'center',
+      width: '20%',
+      render: (x, row) => (
+        <Navigate onClick={toGroupRoomActivityDetail(row.dynamicId)}>
+          <Typography.Text ellipsis>{row.title}</Typography.Text>
+        </Navigate>
+      ),
+    },
+    {
+      title: '活动时间',
+      dataIndex: 'startDate',
+      key: 'startDate',
+      align: 'center',
+      width: '15%',
+      // width: '20%',
+      render: (x, row) => (
+        <>
+          <span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format(
+            'YYYY-MM-DD',
+          )}`}</span>
+        </>
+      ),
+    },
+    {
+      title: '已参与人数',
+      dataIndex: 'count',
+      key: 'count',
+      align: 'center',
+      render: (x, row) => <Navigate onClick={getJoinPeople(row.dynamicId)}>{row.count}</Navigate>,
+    },
+    // {
+    //   title: '阅读量',
+    //   dataIndex: 'pvNum',
+    //   key: 'pvNum',
+    //   align: 'center',
+    //   // width: '10%',
+    // },
+    // {
+    //   title: '转发量',
+    //   dataIndex: 'shareNum',
+    //   key: 'shareNum',
+    //   align: 'center',
+    //   // width: '10%',
+    // },
+    // {
+    //   title: '收藏数',
+    //   dataIndex: 'saveNum',
+    //   key: 'saveNum',
+    //   align: 'center',
+    //   // width: '10%',
+    // },
+    {
+      title: '报名状态',
+      dataIndex: 'activityStatus',
+      key: 'activityStatus',
+      align: 'center',
+      render: activityStatus =>
+        activityStatus == 0 ? '进行中' : activityStatus == 1 ? '未开始' : '已结束',
+    },
+    {
+      title: '权重',
+      dataIndex: 'heavy',
+      key: 'heavy',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: withActions((x, row) => [
+        <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
+          <EditIcon
+            type={row.status === 1 ? 'cancel' : 'publish'}
+            text={row.status === 1 ? '取消发布' : '发布'}
+            onClick={() => sendOrPublicDynamic(row)}
+          />
+        </AuthButton>,
+
+        // //   <EditIcon type="look" text="查看详情" onClick={toGroupRoomActivityDetail(row.dynamicId)} />,
+
+        row.activityStatus === 0 ? (
+          <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
+            <EditIcon type="end" text="结束活动" onClick={finishDynamic.bind(this, row)} />
+          </AuthButton>
+        ) : null,
+
+        <AuthButton name="admin.buildingDynamic.tag" noRight={null}>
+          <EditIcon
+            type={row.weight === 1 ? 'cancel' : 'add'}
+            text={row.weight === 1 ? '取消标签' : '添加标签'}
+            onClick={topDynamic(row)}
+          />
+        </AuthButton>,
+
+        <EditIcon
+          type={row.home === 1 ? 'cancel' : 'top'}
+          text={row.home === 1 ? '取消推首页' : '推荐首页'}
+          onClick={homeDynamic(row)}
+        />,
+
+        //   <AuthButton name="admin.buildingDynamic.dataRecord" noRight={null}>
+        //     <EditIcon type="record" text="数据记录" onClick={toDataReacord(row.dynamicId)} />
+        //   </AuthButton>,
+
+        row.activityStatus === 0 || row.activityStatus === 1 ? (
+          <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
+            <EditIcon
+              type="edit"
+              text="编辑"
+              onClick={() => toGroupRoomActivityEdit(row.dynamicId, row.count)}
+            />
+          </AuthButton>
+        ) : null,
+      ]),
+    },
+  ];
+
+  const actionRender = () => {
+    return (
+      <Button type="primary" icon="plus" onClick={() => toGroupRoomActivityEdit()}>
+        新增
+      </Button>
+    );
+  };
+
+  return (
+    <QueryTable
+      ref={ref}
+      rowKey="dynamicId"
+      api={apis.activity.list}
+      searchFields={searchFields}
+      columns={columns}
+      postData={data => {
+        data.time && (data.time = `${moment(data.time).format('YYYY-MM-DDT00:00:00.000')}Z`);
+        return data;
+      }}
+      actionRender={actionRender}
+      // onPageChange={(pg) => setPage(pg)}
+    />
+  );
+};
+
+export default GroupRoomActivity;

src/pages/activity/groupRoomActivity/registrationRecord.jsx

@@ -0,0 +1,213 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Table, Card } from 'antd';
+
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '@/services/apis';
+import request from '@/utils/request';
+
+const { Option } = Select;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+
+const columns = [
+  {
+    title: '用户姓名',
+    dataIndex: 'name',
+    key: 'name',
+    align: 'center',
+  },
+  {
+    title: '手机号',
+    dataIndex: 'phone',
+    key: 'phone',
+    align: 'center',
+  },
+  {
+    title: '参与人数',
+    dataIndex: 'attendNum',
+    key: 'attendNum',
+    align: 'center',
+  },
+  {
+    title: '报名时间',
+    dataIndex: 'createDate',
+    key: 'createDate',
+    align: 'center',
+    render: (x, row) => (
+      <>
+        <span>{`${moment(row.createDate).format('YYYY-MM-DD')}`}</span>
+      </>
+    ),
+  },
+  {
+    title: '推广人员',
+    dataIndex: 'sharePersonName',
+    key: 'sharePersonName',
+    align: 'center',
+  },
+  {
+    title: '公司',
+    dataIndex: 'orgName',
+    key: 'orgName',
+    align: 'center',
+  },
+  {
+    title: '状态',
+    dataIndex: 'isCheckin',
+    key: 'isCheckin',
+    align: 'center',
+    render: (x, row) => (
+      <>
+        <span>{row.isCheckin === 1 ? '已签到' : '未签到'}</span>
+      </>
+    ),
+  },
+];
+
+const header = props => {
+  const [data, setData] = useState({ list: {} });
+  const [loading, setLoading] = useState(false);
+  
+  //   const [page, changePage] = useState({})
+  // 存入导入数据的值
+  const { getFieldDecorator, getFieldsValue } = props.form;
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    // eslint-disable-next-line no-use-before-define
+    getSignList({ pageNum: 1, pageSize: 10, dynamicId: props.location.query.dynamicId });
+  }, []);
+
+  // 查询列表
+  const getSignList = params => {
+    // eslint-disable-next-line no-shadow
+    setLoading(true)
+    request({ ...apis.activity.signList, params: { ...params } }).then(data => {
+     
+      setData(data);
+      setLoading(false)
+    });
+  };
+
+  const changePageNum = pageNumber => {
+    getSignList({ pageNum: pageNumber, pageSize: 10, dynamicId: props.location.query.dynamicId });
+  };
+
+  const toActivityList = () => {
+    router.go('-1')
+  };
+  // 提交事件
+  // eslint-disable-next-line no-shadow
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      getSignList({
+        pageNum: 1,
+        pageSize: 10,
+        dynamicId: props.location.query.dynamicId,
+        isCheckin: values.isCheckin,
+        name: values.name,
+        phone: values.phone,
+      });
+    });
+  };
+  // 重置搜索
+  function handleReset() {
+    props.form.resetFields();
+    getSignList({ pageNum: 1, pageSize: 10, dynamicId: props.location.query.dynamicId });
+  }
+  // eslint-disable-next-line class-methods-use-this
+  function exportHelp() {
+    const fieldsValue = getFieldsValue();
+    console.log('fieldsValue', fieldsValue);
+    request({
+      ...apis.activity.getTaActivityDynamicEnlistExport,
+      params: { ...fieldsValue, dynamicId: props.location.query.dynamicId },
+    })
+      .then(data => {
+        if (!data) {
+          return;
+        }
+        const url = window.URL.createObjectURL(new Blob([data]));
+        const link = document.createElement('a');
+        link.style.display = 'none';
+        link.href = url;
+        link.setAttribute('download', '报名列表.xlsx');
+        document.body.append(link);
+        link.click();
+      })
+      .catch(() => {});
+  }
+
+  return (
+    <Card>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('isCheckin')(
+            <Select style={{ width: '180px' }} placeholder="签到状态">
+              <Option value="0">未签到</Option>
+              <Option value="1">已签到</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('name')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="用户姓名"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('phone')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="手机号"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit">
+            搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+          </Button>
+        </Form.Item>
+        <Button style={{ position: 'absolute', right: '30px' }} onClick={toActivityList}>
+          返回
+        </Button>
+      </Form>
+
+      <div style={{ textAlign: 'right', margin: '6px 0 10px 0' }}>
+        {' '}
+        <Button
+          name="admin.activityDynamicEnlist.export.get"
+          noRight={null}
+          type="primary"
+          onClick={exportHelp}
+        >
+          导出
+        </Button>
+      </div>
+      <Table
+        dataSource={data.list.data}
+        columns={columns}
+        pagination={{ total: data.total, onChange: changePageNum }}
+        loading={loading}
+        rowKey="activity"
+      />
+      {/* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
+      </div> */}
+    </Card>
+  );
+};
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader;

src/pages/activity/helpActivity/helpActivityRecord.jsx

@@ -1,15 +0,0 @@
-import React from 'react';
-import DataRecord from '../dataRecord/index'
-import Prompt from 'umi/prompt';
-
-const header = props =>{
-    const id = props.location.query.id
-    // type:'help;',
-    return <><DataRecord  id = {id} activeType = "help"/>
-    <Prompt message={location =>
-        location.pathname.startsWith("/activity/helpActivity")
-          ? true
-          : localStorage.removeItem("helpActivePageParams")} /></>
-}
-
-export default header

src/pages/activity/helpActivity/helpRecord.jsx

@@ -1,547 +0,0 @@
-import React, { useState, useEffect } from 'react';
-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';
-import router from 'umi/router';
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
-import AuthButton from '@/components/AuthButton';
-
-
-const { Option } = Select;
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const { Meta } = Card;
-
-/**
- * 助力者弹框
- */
-class InviteTable extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      dataSource: { records: [] },
-      visibleData: { visible: false, helpId: '', realtyConsultant: '' },
-    }
-  }
-
-  // 挂载之后
-  componentDidMount() {
-    const { helpId } = this.state.visibleData
-    this.getList({ helpRecordInitiateId: helpId, pageNum: 1, pageSize: 5 })
-  }
-
-  componentDidUpdate(preProps, preState) {
-    const { helpId } = this.state.visibleData
-    if (this.props.visibleData.visible !== preState.visibleData.visible) {
-      this.getList({ helpRecordInitiateId: helpId, pageNum: 1, pageSize: 5 })
-      this.setState({ visibleData: this.props.visibleData });
-    }
-  }
-
-  // 弹框确定按钮
-  // eslint-disable-next-line react/sort-comp
-  handleOk() {
-    this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
-    this.props.onCancel()
-  }
-
-  // 弹框取消按钮
-  handleCancel() {
-    this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
-    this.props.onCancel()
-  }
-
-  getList(params) {
-    if (params.helpRecordInitiateId === '') {
-      return
-    }
-    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
-  exportHelp() {
-    request({ ...apis.helpActivity.gethelpRecordExport, responseType: 'blob', params: { helpRecordInitiateId: this.state.visibleData.helpId } })
-      .then(data => {
-        if (!data) {
-          return
-        }
-        const url = window.URL.createObjectURL(new Blob([data]))
-        const link = document.createElement('a')
-        link.style.display = 'none'
-        link.href = url
-        link.setAttribute('download', '助力者记录.xlsx')
-        document.body.append(link)
-        link.click()
-      }).catch(() => {
-
-      })
-  }
-
-
-  // 分页
-  // eslint-disable-next-line react/sort-comp
-  onChange(pageNum) {
-    const { helpId } = this.state.visibleData
-    this.getList({ helpRecordInitiateId: helpId, pageNum: 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',
-        render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-      },
-    ]
-    return (
-      <>
-        <Modal
-          title="助力者"
-          destroyOnClose="true"
-          width={900}
-          footer={null}
-          visible={this.state.visibleData.visible}
-          // onOk={() => this.handleOk()}
-          onCancel={e => this.handleCancel(e)}
-        >
-
-          <Button name="admin.HelpInitiateRecordSucceed.export.get" noRight={null} type="primary" onClick={() => this.exportHelp()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
-            导出
-      </Button>
-          <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
-        </Modal>
-      </>
-    );
-  }
-}
-
-
-/**
- * 核销弹框
- */
-class Verifier extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      verification: { verificationCode: '' },
-      visibleData: { visible: false, helpId: '', helpActivityId: '', helpRecordInitiateId: '', verificationCode: '' },
-    }
-  }
-
-  // 挂载之后
-  componentDidMount() {
-    const { helpId } = this.state.visibleData
-  }
-
-  componentDidUpdate(preProps, preState) {
-    const { helpId } = this.state.visibleData
-    if (this.props.visibleData.visible !== preState.visibleData.visible) {
-      // eslint-disable-next-line react/no-did-update-set-state
-      this.setState({ visibleData: { ...this.props.visibleData } })
-    }
-  }
-
-  // 弹框确定按钮
-  // eslint-disable-next-line react/sort-comp
-  handleOk() {
-    this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
-  }
-
-  // 弹框取消按钮
-  handleCancel() {
-    console.log('核销关闭');
-    // this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
-    this.props.onCancel()
-  }
-
-  // eslint-disable-next-line class-methods-use-this
-  audit(params) {
-    request({ ...apis.helpActivity.verification, params: { ...params } }).then(res => {
-      // eslint-disable-next-line no-undef
-      message.info('核销成功')
-      this.props.onSuccess({ pageNumber: 1, pageSize: 10, helpActivityId: this.props.visibleData.helpActivityId, status: 'helpSucceed' })
-    }).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) {
-    this.setState({ visibleData: { visible: true, helpId: this.props.visibleData.helpId, verificationCode: e.target.value } })
-  }
-
-  // eslint-disable-next-line class-methods-use-this
-  verification(e) {
-    this.audit({ helpRecordInitiateId: this.state.visibleData.helpId, verifyCode: this.state.visibleData.verificationCode })
-  }
-
-  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 style={{ marginLeft: '10px' }} onChange={this.verify.bind(this)} /></span>
-            <Button name="admin.helpInitiateRecordVerify.post" noRight={null} onClick={e => this.verification(e)} style={{ marginLeft: '80px', marginTop: '10px', backgroundColor: 'red' }}><span style={{ color: 'white' }}>立即核销</span></Button>
-          </div>
-        </Modal>
-      </>
-    );
-  }
-}
-
-/**
- *主体列表
- *
- * @param {*} props
- * @returns
- */
-function body(props) {
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [gInviteData, setGInviteData] = useState({ visible: false, helpId: '', realtyConsultant: '' })
-
-  // 核销码弹框
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [gVerifierData, setVerifierData] = useState({ visible: false, helpId: '', helpActivityId: '', helpRecordInitiateId: '', verificationCode: '' })
-
-  const { getFieldDecorator, getFieldsValue } = props.form
-
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [dataSource, setDataSource] = useState({ records: [] })
-  // 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, helpId: '', realtyConsultant: '' })
-
-
-  // 变更状态 ============= end
-
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const { helpActivityId } = props.location.query
-  useEffect(() => {
-    console.log('customerType', customerType)
-    getList({ pageNum: 1, pageSize: 10, status: customerType, helpActivityId })
-  }, [])
-
-  function getList(params) {
-    // 网路请求
-    request({ ...apis.helpActivity.record, params: { ...params } }).then(res => {
-      setDataSource(res)
-    }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
-    })
-  }
-
-  function displayNone() {
-    setGVisibleData({ visible: false, helpId: '', realtyConsultant: '' })
-  }
-
-  // 提交事件
-  function handleSubmit(e) {
-    // displayNone()
-
-
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        getList({ pageNum: 1, pageSize: 10, status: customerType, ...values, helpActivityId })
-      }
-    });
-  }
-
-  // Change 事件
-  function handleSelectChange(e) {
-    // eslint-disable-next-line no-console
-    console.log(e)
-  }
-
-  // 分页
-  function onChange(pageNum) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    getList({ pageNum: pageNum, pageSize: 10, status: customerType, helpActivityId })
-  }
-
-  // 助力成功/进行中/助力失败
-  function radioButtonHandleSizeChange(e) {
-    setGInviteData({ visible: false, helpId: '', realtyConsultant: '' })
-    setVerifierData({ visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' })
-    // displayNone()
-
-    const { value } = e.target
-    setCustomerType(value)
-    // setColumns(value === 'helpSucceed' ? privateColumns : publicColumns)
-    getList({ pageNum: 1, pageSize: 10, status: value, helpActivityId })
-  }
-
-  function handleReset() {
-    props.form.resetFields();
-    getList({ pageNum: 1, pageSize: 10, status: customerType, helpActivityId })
-  }
-
-  function toCustomerDateil(record) {
-    router.push({
-      pathname: '/customer/customerlist/customerDetail',
-      query: {
-        id: record.customerId,
-      },
-    });
-  }
-
-  function exportCustomer() {
-    const fieldsValue = getFieldsValue()
-    request({ ...apis.helpActivity.HelpInitiateRecordSucceed, responseType: 'blob', params: { ...fieldsValue, customerType, helpActivityId, condition: customerType } })
-      .then(response => {
-        download(response)
-      }).catch(error => {
-
-      })
-  }
-
-  function download(data) {
-    if (!data) {
-      return
-    }
-    const url = window.URL.createObjectURL(new Blob([data]))
-    const link = document.createElement('a')
-    link.style.display = 'none'
-    link.href = url
-    link.setAttribute('download', '助力记录.xlsx')
-    document.body.append(link)
-    link.click()
-  }
-
-  // 助力记录弹框
-  function helpRecord(row) {
-    setVerifierData({ visible: false, helpId: row.helpRecordInitiateId, elpRecordInitiateId: '', verificationCode: '' })
-    setGInviteData({ visible: true, helpId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
-  }
-  // 核销
-  function helpInitiateRecordVerify(row) {
-    // 关闭助力记录弹框
-    setGInviteData({ visible: false, helpId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
-
-    // 核销
-    setVerifierData({ visible: true, helpId: row.helpRecordInitiateId, helpActivityId: row.helpActivityId, elpRecordInitiateId: '', verificationCode: '' })
-  }
-  // 核销回调
-  function onSuccess(e) {
-    console.log('回调：', e)
-    getList(e)
-
-    // 关闭
-    onCancel()
-  }
-
-  function onCancel(e) {
-    // 核销
-    setVerifierData({ visible: false, helpId: '', helpActivityId: '', elpRecordInitiateId: '', verificationCode: '' })
-    // 助力者
-    setGInviteData({ visible: false, helpId: '', realtyConsultant: '' })
-  }
-
-  // 返回到首页
-  function returList(params) {
-    router.push({
-      pathname: '/activity/helpActivity/list',
-    });
-  }
-
-  const publicColumns = [
-    {
-      title: '发起者',
-      dataIndex: 'name',
-      key: 'name',
-      align: 'center',
-      width: '15%',
-    },
-    {
-      title: '发起者手机号',
-      dataIndex: 'phone',
-      key: 'phone',
-      align: 'center',
-      width: '10%',
-    },
-    {
-      title: '发起时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
-      align: 'center',
-      width: '15%',
-      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-    },
-    {
-      title: '助力者',
-      dataIndex: 'helpCount',
-      key: 'helpCount',
-      align: 'center',
-      width: '15%',
-      render: (text, record) => <a style={{ color: '#66B3FF' }} onClick={() => helpRecord(record)}>{record.helpCount}/{record.persionNumCount}</a>,
-    },
-  ]
-
-  const privateColumns = [
-    {
-      title: '发起者',
-      dataIndex: 'name',
-      key: 'name',
-      align: 'center',
-      width: '15%',
-      // render: (_, record) => <Avatar shape="square" src={customerType === 'helpSucceed' ? record.picture : record.avatarurl} size={64} icon="user" />,
-    },
-    {
-      title: '手机号',
-      dataIndex: 'phone',
-      key: 'phone',
-      align: 'center',
-      width: '10%',
-      // eslint-disable-next-line no-nested-ternary
-      // render: (_, record) => <><span>{customerType === 'helpSucceed' ? record.name : record.nickname}</span></>,
-    },
-    {
-      title: '发起时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
-      align: 'center',
-      width: '10%',
-      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-      // eslint-disable-next-line no-nested-ternary
-    },
-    {
-      title: '助力者',
-      dataIndex: 'helpCount',
-      key: 'helpCount',
-      align: 'center',
-      width: '15%',
-      render: (text, record) => <a style={{ color: '#66B3FF' }} onClick={() => helpRecord(record)}>{record.helpCount}人</a>,
-    },
-    {
-      title: '核销状态',
-      dataIndex: 'reportRecommendStatus',
-      key: 'reportRecommendStatus',
-      align: 'center',
-      width: '10%',
-      // eslint-disable-next-line no-nested-ternary
-      render: (text, records) => {
-        if (records.verificationStatus === 0 || records.verificationStatus === null) { return '未核销' }
-        if (records.verificationStatus === 1) { return '已核销' }
-      },
-    },
-    {
-      title: '操作',
-      align: 'center',
-      width: '25%',
-      render: (x, row) => (
-        <>
-          {row.verificationStatus === 0 &&
-            <AuthButton name="admin.SignList.get" noRight={null}>
-              <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={() => helpInitiateRecordVerify(row)}>核销</span>
-            </AuthButton>
-          }
-        </>
-      ),
-    },
-  ]
-
-  return (
-    <>
-      {console.log('customerType', customerType)}
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item>
-          {getFieldDecorator('tel')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="电话"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          <Button type="primary" htmlType="submit" >
-            搜索
-            </Button>
-          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-            重置
-            </Button>
-        </Form.Item>
-        <Button style={{ float: 'right' }} onClick={returList}>
-          返回
-        </Button>
-      </Form>
-      <Button name="admin.helpRecord.export.get" noRight={null} type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
-        导出
-      </Button>
-
-      <div style={{ margin: '20px 0' }}>
-        <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.Group>
-      </div>
-      {customerType === 'helpSucceed' ?
-        <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" />
-      }
-      <Verifier visibleData={gVerifierData} onSuccess={e => onSuccess(e)} onCancel={(e) => onCancel(e)} />
-      <InviteTable visibleData={gInviteData} onSuccess={e => onSuccess(e)} onCancel={(e) => onCancel(e)} />
-    </>
-  );
-}
-
-const WrappedBody = Form.create({ name: 'body' })(body);
-
-export default WrappedBody

src/pages/activity/helpActivity/list.jsx

@@ -1,372 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Pagination, Typography, Modal, DatePicker } from 'antd';
-import router from 'umi/router';
-import moment from 'moment';
-import AuthButton from '@/components/AuthButton';
-import withActions from '@/components/ActionList';
-import EditIcon from '@/components/EditIcon';
-import Navigate from '@/components/Navigate';
-import Prompt from 'umi/prompt';
-import SelectCity from '../../../components/SelectButton/CitySelect'
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
-import apis from '../../../services/apis';
-import request from '../../../utils/request';
-import styles from '../../style/GoodsList.less';
-
-const { Option } = Select;
-
-const header = props => {
-  const [data, setData] = useState({})
-  //   const [page, changePage] = useState({})
-
-  useEffect(() => {
-    if (localStorage.getItem("helpActivePageParams")) {
-      // props.form.setFieldsValue(JSON.parse(localStorage.getItem("helpActivePageParams")));
-      // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
-      const localStorageValue = JSON.parse(localStorage.getItem("helpActivePageParams"))
-      localStorageValue.startTime = localStorageValue.startTime ? moment(localStorageValue.startTime) : ''
-      localStorageValue.endTime = localStorageValue.endTime ? moment(localStorageValue.endTime) : ''
-
-      props.form.setFieldsValue(localStorageValue);
-      getList(JSON.parse(localStorage.getItem("helpActivePageParams")))
-    } else {
-      localStorage.setItem("helpActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));
-      getList({ pageNum: 1, pageSize: 10 });
-    }
-  }, [])
-
-  // 查询列表
-  const getList = (params) => {
-    request({ ...apis.helpActivity.list, params: { ...params } }).then((data) => {
-      console.log(data)
-      setData(data)
-    })
-  }
-
-
-  // 跳转到助力新增
-  const toEditGoods = (helpActivityId) => () => {
-    router.push({
-      pathname: '/activity/helpActivity/edithelpActivity',
-      query: {
-        helpActivityId
-      },
-    });
-  }
-
-  const getActivityDetail = (helpActivityId) => () => {
-    router.push({
-      pathname: '/activity/helpActivity/detailActivity',
-      query: {
-        helpActivityId,
-      },
-    });
-  }
-
-  const getJoinPeople = (helpActivityId) => () => {
-    router.push({
-      pathname: '/activity/helpActivity/helpRecord',
-      query: {
-        helpActivityId,
-      },
-    });
-  }
-
-
-  /**
-   *
-   *
-   * @param {*} props
-   * @returns
-   */
-
-  const columns = [
-    {
-      title: '活动标题',
-      dataIndex: 'title',
-      key: 'title',
-      align: 'center',
-      render: (x, row) => <Navigate onClick={getActivityDetail(row.helpActivityId)}><Typography.Text ellipsis>{row.title}</Typography.Text></Navigate>,
-    },
-    {
-      title: '活动时间',
-      dataIndex: 'startDate',
-      key: 'startDate',
-      align: 'center',
-      render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD HH:mm:ss')} —— ${moment(row.endDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-    },
-    {
-      title: '已参与人数',
-      dataIndex: 'enlistNum',
-      key: 'enlistNum',
-      align: 'center',
-      render: (x, row) => <><div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', width: '201px', title: 'content' }}>
-        <Navigate onClick={getJoinPeople(row.helpActivityId)}>{row.enlistNum}</Navigate>
-      </div></>,
-    },
-    {
-      title: '助力成功数',
-      dataIndex: 'succeedCount',
-      key: 'succeedCount',
-      align: 'center',
-    },
-    {
-      title: '状态',
-      dataIndex: 'isEnlist',
-      key: 'isEnlist',
-      align: 'center',
-      render: (text, records) => {
-        if (records.activityStatus === 1) { return '未开始' }
-        if (records.activityStatus === 0) { return '进行中' }
-        if (records.activityStatus === 2) { return '已结束' }
-      },
-    },
-    {
-      title: '权重',
-      dataIndex: 'heavy',
-      key: 'heavy',
-      align: 'center',
-    },
-    {
-      title: '操作',
-      dataIndex: 'handle',
-      key: 'handle',
-      align: 'center',
-      render: withActions((x, row) => [
-        <AuthButton name="admin.help.publish" noRight={null}>
-          <EditIcon type={row.status === 1 ? 'cancel' : 'publish'} text={row.status === 1 ? '取消发布' : '发布'} onClick={sendOrPublicDynamic.bind(this, row)} />
-        </AuthButton>,
-
-        row.activityStatus === 0 ?
-          <AuthButton name="admin.help.finish" noRight={null}>
-            <EditIcon type="end" text="结束活动" onClick={topDynamic(row, 2)} />
-          </AuthButton> : null,
-
-        <EditIcon type="look" text="查看详情" onClick={getActivityDetail(row.helpActivityId)} />,
-
-        <AuthButton name="admin.help.tag" noRight={null}>
-          <EditIcon type={row.weight === 1 ? 'cancel' : 'add'} text={row.weight === 1 ? '取消标签' : '添加标签'} onClick={topDynamic(row, 0)} />
-        </AuthButton>,
-
-        <AuthButton name="admin.help.top" noRight={null}>
-          <EditIcon type={row.isMain ? 'cancel' : 'top'} text={row.isMain ? '取消推首页' : '推荐首页'} onClick={topDynamic(row, 1)} />
-        </AuthButton>,
-
-        <AuthButton name="admin.helpActivity.dataRecord" noRight={null}>
-          <EditIcon type="record" text="数据记录" onClick={() => toDataReacord(row.helpActivityId)} />
-        </AuthButton>,
-
-        (row.activityStatus === 1 || row.activityStatus === 0) ?
-          <AuthButton name="admin.helpActivity.update.put" noRight={null}>
-            <EditIcon type="edit" text="编辑" onClick={toEditGoods(row.helpActivityId)} />
-          </AuthButton> : null,
-      ]),
-    },
-  ];
-
-  const toDataReacord = id => {
-    router.push({
-      pathname: '/activity/helpActivity/helpActivityRecord',
-      query: {
-        id,
-      },
-    });
-  }
-
-  const getSignList = helpActivityId => {
-    router.push({
-      pathname: '/activity/helpActivity/helpRecord',
-      query: {
-        helpActivityId,
-      },
-    });
-  }
-
-  const finishDynamic = (row) => {
-    Modal.confirm({
-      title: '结束以后将无法编辑, 是否继续?',
-      okText: '确定',
-      cancelText: '取消',
-      onOk() {
-        request({ ...apis.activity.finish, data: { dynamicId: row.dynamicId, top: "" } }).then((data) => {
-          console.log(data)
-          message.info('操作成功！')
-          getList(JSON.parse(localStorage.getItem("helpActivePageParams")))
-        }).catch((err) => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-      },
-    });
-  }
-
-  //   置顶
-  const topDynamic = (row, code) => () => {
-    const title = code === 2 ? '活动会被强制结束，小程序端无法再发起或参与此拼团，如果不想让客户看到活动，请再点击取消发布按钮' : '是否进行该操作'
-
-    Modal.confirm({
-      title: title,
-      okText: '确定',
-      cancelText: '取消',
-      onOk() {
-        request({ ...apis.helpActivity.top, data: { helpActivityId: row.helpActivityId, status: code } }).then((data) => {
-          console.log(data)
-          message.info('操作成功！')
-          getList(JSON.parse(localStorage.getItem("helpActivePageParams")))
-        }).catch((err) => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-      },
-    });
-  }
-
-  const sendOrPublicDynamic = (row) => {
-    if (row.status === 1) {
-      cancelDynamic(row)
-    } else {
-      sendDynamic(row)
-    }
-  }
-
-  // 取消活动
-  const cancelDynamic = (row) => {
-    Modal.confirm({
-      title: '活动会在小程序端隐藏，后台可以继续编辑重新发布',
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        request({ ...apis.helpActivity.cancel, urlData: { id: row.helpActivityId } }).then((data) => {
-          message.info('操作成功！')
-          getList(JSON.parse(localStorage.getItem("helpActivePageParams")))
-        }).catch((err) => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-      }
-    });
-  }
-
-  //发布活动
-  const sendDynamic = (row) => {
-    Modal.confirm({
-      title: '确定发布吗？',
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        request({ ...apis.helpActivity.send, urlData: { id: row.helpActivityId } }).then((data) => {
-          message.info('操作成功！')
-          getList(JSON.parse(localStorage.getItem("helpActivePageParams")))
-        }).catch(err => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-      }
-    });
-  }
-
-  const changePageNum = pageNumber => {
-    localStorage.setItem("helpActivePageParams", JSON.stringify({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() }));
-    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
-  }
-
-  // 提交事件
-  const handleSubmit = (e, props) => {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      const startDate = values.startTime === undefined ? null : moment(values.startTime).format('YYYY-MM-DD')
-      const endDate = values.endTime === undefined ? null : moment(values.endTime).format('YYYY-MM-DD')
-      // 删除时间会传默认值 Invalid date
-
-      if (!err) {
-        console.log('提交数据: ', values)
-        localStorage.setItem("helpActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10, ...values, endDate, startDate }));
-
-        getList({ pageNum: 1, pageSize: 10, ...values, endDate, startDate })
-      }
-    });
-  }
-  // 重置搜索
-  function handleReset() {
-    props.form.resetFields();
-    localStorage.setItem("helpActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));
-    getList({ pageNum: 1, pageSize: 10 })
-  }
-
-
-  const { getFieldDecorator } = props.form
-  return (
-
-    <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item>
-          {getFieldDecorator('cityId')(
-            <SelectCity />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('buildingId')(
-            <BuildSelect />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('title')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="请输入标题"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('startTime')(
-            <DatePicker placeholder="活动开始时间" />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('endTime')(
-            <DatePicker placeholder="活动结束时间" />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('activityStatus')(
-            <Select style={{ width: '180px' }} placeholder="活动状态">
-              <Option value="1">未开始</Option>
-              <Option value="0">进行中</Option>
-              <Option value="2">已结束</Option>
-            </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          <AuthButton name="admin.help.search" noRight={null}>
-            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-              搜索
-          </Button>
-          </AuthButton>
-          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-            重置
-            </Button>
-        </Form.Item>
-      </Form>
-      <AuthButton name="admin.help.add.post" noRight={null}>
-        <Button name="admin.helpActivity.add.post" noRight={null} type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
-      </AuthButton>
-      <Table
-        // onRow={record => {
-        //   return {
-        //     onClick: getActivityDetail(record.helpActivityId),
-        //   };
-        // }}
-        dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
-      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
-      </div>
-      <Prompt message={location =>
-        location.pathname.startsWith("/activity/helpActivity")
-          ? true
-          : localStorage.removeItem("helpActivePageParams")} />
-    </>
-  )
-}
-const WrappedHeader = Form.create({ name: 'header' })(header);
-
-export default WrappedHeader

src/pages/activity/helpActivity/signList.jsx

@@ -1,546 +0,0 @@
-import React, { useState, useEffect } from 'react';
-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';
-import router from 'umi/router';
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
-import AuthButton from '@/components/AuthButton';
-
-
-const { Option } = Select;
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const { Meta } = Card;
-
-/**
- * 助力者弹框
- */
-class InviteTable extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      dataSource: { records: [] },
-      visibleData: { visible: false, helpId: '', realtyConsultant: '' },
-    }
-  }
-
-  // 挂载之后
-  componentDidMount () {
-    const { helpId } = this.state.visibleData
-    this.getList({ helpRecordInitiateId: helpId, pageNumber: 1, pageSize: 5 })
-  }
-
-  componentDidUpdate (preProps, preState) {
-    const { helpId } = this.state.visibleData
-    if (this.props.visibleData.visible !== preState.visibleData.visible) {
-      this.getList({ helpRecordInitiateId: helpId, pageNumber: 1, pageSize: 5 })
-      this.setState({ visibleData: this.props.visibleData });
-    }
-  }
-
-  // 弹框确定按钮
-  // eslint-disable-next-line react/sort-comp
-  handleOk () {
-    this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
-    this.props.onCancel()
-  }
-
-  // 弹框取消按钮
-  handleCancel () {
-    this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
-    this.props.onCancel()
-  }
-
-  getList (params) {
-    if (params.helpRecordInitiateId === '') {
-      return
-    }
-    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
-  exportHelp() {
-    request({ ...apis.helpActivity.gethelpRecordExport, responseType: 'blob', params: { helpRecordInitiateId: this.state.visibleData.helpId } })
-      .then(data => {
-        if (!data) {
-          return
-        }
-        const url = window.URL.createObjectURL(new Blob([data]))
-        const link = document.createElement('a')
-        link.style.display = 'none'
-        link.href = url
-        link.setAttribute('download', '助力者记录.xlsx')
-        document.body.append(link)
-        link.click()
-      }).catch(() => {
-
-      })
-  }
-
-
-  // 分页
-  // eslint-disable-next-line react/sort-comp
-  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',
-        render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-      },
-    ]
-    return (
-      <>
-        <Modal
-          title="助力者"
-          destroyOnClose="true"
-          width={900}
-          footer={null}
-          visible={this.state.visibleData.visible}
-          // onOk={() => this.handleOk()}
-          onCancel={e => this.handleCancel(e)}
-        >
-
-      <Button name="admin.HelpInitiateRecordSucceed.export.get" noRight={null} type="primary" onClick={() => this.exportHelp()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
-        导出
-      </Button>
-          <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 = {
-      verification: { verificationCode: '' },
-      visibleData: { visible: false, helpId: '', helpActivityId: '', helpRecordInitiateId: '', verificationCode: '' },
-    }
-  }
-
-  // 挂载之后
-  componentDidMount () {
-    const { helpId } = this.state.visibleData
-  }
-
-  componentDidUpdate (preProps, preState) {
-    const { helpId } = this.state.visibleData
-    if (this.props.visibleData.visible !== preState.visibleData.visible) {
-      // eslint-disable-next-line react/no-did-update-set-state
-      this.setState({ visibleData: { ...this.props.visibleData } })
-    }
-  }
-
-  // 弹框确定按钮
-  // eslint-disable-next-line react/sort-comp
-  handleOk () {
-    this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
-  }
-
-  // 弹框取消按钮
-  handleCancel () {
-    console.log('核销关闭');
-    // this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
-    this.props.onCancel()
-  }
-
-  // eslint-disable-next-line class-methods-use-this
-  audit (params) {
-    request({ ...apis.helpActivity.verification, params: { ...params } }).then(res => {
-      // eslint-disable-next-line no-undef
-      message.info('核销成功')
-      this.props.onSuccess({ pageNumber: 1, pageSize: 10, helpActivityId: this.props.visibleData.helpActivityId, status: 'helpSucceed' })
-    }).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) {
-    this.setState({ visibleData: { visible: true, helpId: this.props.visibleData.helpId, verificationCode: e.target.value } })
-  }
-
-  // eslint-disable-next-line class-methods-use-this
-  verification(e) {
-    this.audit({ helpRecordInitiateId: this.state.visibleData.helpId, verifyCode: this.state.visibleData.verificationCode })
-  }
-
-  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 style={{marginLeft: '10px'}} onChange={this.verify.bind(this)}/></span>
-           <Button name="admin.helpInitiateRecordVerify.post" noRight={null} onClick={e => this.verification(e)} style={{ marginLeft: '80px', marginTop:'10px', backgroundColor:'red' }}><span style={{color:'white'}}>立即核销</span></Button>
-          </div>
-        </Modal>
-      </>
-    );
-  }
-}
-
-/**
- *主体列表
- *
- * @param {*} props
- * @returns
- */
-function body(props) {
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [gInviteData, setGInviteData] = useState({ visible: false, helpId: '', realtyConsultant: '' })
-
-  // 核销码弹框
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [gVerifierData, setVerifierData] = useState({ visible: false, helpId: '', helpActivityId: '', helpRecordInitiateId: '', verificationCode: '' })
-
-  const { getFieldDecorator, getFieldsValue } = props.form
-
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [dataSource, setDataSource] = useState({ records: [] })
-  // 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, helpId: '', realtyConsultant: '' })
-
-
-  // 变更状态 ============= end
-
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const { helpActivityId } = props.location.query
-  useEffect(() => {
-    console.log('customerType', customerType)
-    getList({ pageNumber: 1, pageSize: 10, status: customerType, helpActivityId })
-  }, [])
-
-  function getList(params) {
-    // 网路请求
-    request({ ...apis.helpActivity.record, params: { ...params } }).then(res => {
-      setDataSource(res)
-    }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
-    })
-  }
-
-  function displayNone() {
-    setGVisibleData({ visible: false, helpId: '', realtyConsultant: '' })
-  }
-
-  // 提交事件
-  function handleSubmit(e) {
-    // displayNone()
-
-
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        getList({ pageNum: 1, pageSize: 10, status: customerType, ...values, helpActivityId })
-      }
-    });
-  }
-
-  // Change 事件
-  function handleSelectChange(e) {
-    // eslint-disable-next-line no-console
-    console.log(e)
-  }
-
-  // 分页
-  function onChange(pageNum) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    getList({ pageNumber: pageNum, pageSize: 10, customerType })
-  }
-
-  // 助力成功/进行中/助力失败
-  function radioButtonHandleSizeChange(e) {
-    setGInviteData({ visible: false, helpId: '', realtyConsultant: '' })
-    setVerifierData({ visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' })
-    // displayNone()
-
-    const { value } = e.target
-    setCustomerType(value)
-    // setColumns(value === 'helpSucceed' ? privateColumns : publicColumns)
-    getList({ pageNumber: 1, pageSize: 10, status: value, helpActivityId })
-  }
-
-  function handleReset() {
-    props.form.resetFields();
-    getList({ pageNum: 1, pageSize: 10, status: customerType, helpActivityId })
-  }
-
-  function toCustomerDateil(record) {
-    router.push({
-      pathname: '/customer/customerlist/customerDetail',
-      query: {
-        id: record.customerId,
-      },
-    });
-  }
-
-  function exportCustomer () {
-    const fieldsValue = getFieldsValue()
-    request({ ...apis.helpActivity.HelpInitiateRecordSucceed, responseType: 'blob', params: { ...fieldsValue, customerType, helpActivityId, condition: customerType } })
-      .then(response => {
-        download(response)
-      }).catch(error => {
-
-      })
-  }
-
-  function download (data) {
-    if (!data) {
-      return
-    }
-    const url = window.URL.createObjectURL(new Blob([data]))
-    const link = document.createElement('a')
-    link.style.display = 'none'
-    link.href = url
-    link.setAttribute('download', '助力记录.xlsx')
-    document.body.append(link)
-    link.click()
-  }
-
-// 助力记录弹框
-function helpRecord(row) {
-  setVerifierData({ visible: false, helpId: row.helpRecordInitiateId, elpRecordInitiateId: '', verificationCode: '' })
-  setGInviteData({ visible: true, helpId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
-}
- // 核销
- function helpInitiateRecordVerify(row) {
-// 关闭助力记录弹框
-  setGInviteData({ visible: false, helpId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
-
-  // 核销
-  setVerifierData({ visible: true, helpId: row.helpRecordInitiateId, helpActivityId: row.helpActivityId, elpRecordInitiateId: '', verificationCode: '' })
- }
- // 核销回调
- function onSuccess(e) {
-   console.log('回调：', e)
-   getList(e)
-    
-   // 关闭
-   onCancel()
- }
-
- function onCancel(e) {
-  // 核销
-  setVerifierData({ visible: false, helpId: '', helpActivityId: '', elpRecordInitiateId: '', verificationCode: '' })
-  // 助力者
-  setGInviteData({ visible: false, helpId: '', realtyConsultant: '' })
- }
-
- // 返回到首页
- function returList(params) {
-  router.push({
-      pathname: '/activity/helpActivity/list',
-    });
-}
-
-  const publicColumns = [
-    {
-      title: '发起者',
-      dataIndex: 'name',
-      key: 'name',
-      align: 'center',
-      width: '15%',
-    },
-    {
-      title: '发起者手机号',
-      dataIndex: 'phone',
-      key: 'phone',
-      align: 'center',
-      width: '10%',
-    },
-    {
-      title: '发起时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
-      align: 'center',
-      width: '15%',
-      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-    },
-    {
-      title: '助力者',
-      dataIndex: 'helpCount',
-      key: 'helpCount',
-      align: 'center',
-      width: '15%',
-      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick={() => helpRecord(record)}>{record.helpCount}/{record.persionNumCount}</a>,
-    },
-  ]
-
-  const privateColumns = [
-    {
-      title: '发起者',
-      dataIndex: 'name',
-      key: 'name',
-      align: 'center',
-      width: '15%',
-      // render: (_, record) => <Avatar shape="square" src={customerType === 'helpSucceed' ? record.picture : record.avatarurl} size={64} icon="user" />,
-    },
-    {
-      title: '手机号',
-      dataIndex: 'phone',
-      key: 'phone',
-      align: 'center',
-      width: '10%',
-      // eslint-disable-next-line no-nested-ternary
-      // render: (_, record) => <><span>{customerType === 'helpSucceed' ? record.name : record.nickname}</span></>,
-    },
-    {
-      title: '发起时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
-      align: 'center',
-      width: '10%',
-      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-      // eslint-disable-next-line no-nested-ternary
-    },
-    {
-      title: '助力者',
-      dataIndex: 'helpCount',
-      key: 'helpCount',
-      align: 'center',
-      width: '15%',
-      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick={() => helpRecord(record)}>{record.helpCount}人</a>,
-    },
-    {
-      title: '核销状态',
-      dataIndex: 'reportRecommendStatus',
-      key: 'reportRecommendStatus',
-      align: 'center',
-      width: '10%',
-      // eslint-disable-next-line no-nested-ternary
-      render: (text, records) => {
-        if (records.verificationStatus === 0 || records.verificationStatus === null) { return '未核销' }
-        if (records.verificationStatus === 1) { return '已核销' }
-      },
-    },
-    {
-      title: '操作',
-      align: 'center',
-      width: '25%',
-      render: (x, row) => (
-        <>
-          {row.verificationStatus === 0 &&
-          <AuthButton name="admin.help.writeOff" noRight={null}>
-           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={() => helpInitiateRecordVerify(row)}>核销</span>
-          </AuthButton>
-        }
-        </>
-      ),
-    },
-  ]
-
-  return (
-    <>
-    {console.log('customerType', customerType)}
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item>
-          {getFieldDecorator('tel')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="电话"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-            <Button type="primary" htmlType="submit" >
-              搜索
-            </Button>
-            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
-            </Button>
-        </Form.Item>
-        <Button style={{ float: 'right' }} onClick={returList}>
-          返回
-        </Button>
-      </Form>
-      <Button name="admin.helpRecord.export.get" noRight={null} type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
-        导出
-      </Button>
-
-      <div style={{ margin: '20px 0' }}>
-          <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.Group>
-      </div>
-      {customerType === 'helpSucceed' ?
-        <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" />
-      }
-        <Verifier visibleData={gVerifierData} onSuccess={e => onSuccess(e)} onCancel={(e) => onCancel(e)} />
-       <InviteTable visibleData={gInviteData} onSuccess={e => onSuccess(e)} onCancel={(e) => onCancel(e)}/>
-    </>
-  );
-}
-
-const WrappedBody = Form.create({ name: 'body' })(body);
-
-export default WrappedBody

src/pages/activity/groupActivity/detailActivity.jsx → src/pages/activity/lookHouseActivity/detail.jsx

@@ -1,21 +1,17 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../../style/GoodsList.less';
-import apis from '../../../services/apis';
+import { Form, Input, Button, Icon, Select, Card, Radio, DatePicker, message, Upload } from 'antd';
+
+import apis from '@/services/apis';
 import moment from 'moment';
 import router from 'umi/router';
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
-import XForm, { FieldTypes } from '../../../components/XForm';
-import Wangedit from '../../../components/Wangedit/Wangedit'
-import request from '../../../utils/request'
-import yinhao from '../../../assets/yinhao.png'
-import ImageUploader from '../../../components/XForm/ImageUpload';
-import logo from '../../../assets/logo.svg';
-import touxiang from '../../../assets/touxiang.jpg';
-import poster1 from '../../../assets/poster1.png';
-import poster2 from '../../../assets/poster2.png';
-import xiaochengxu from '../../../assets/xiaochengxu.png';
+import BuildSelect from '@/components/SelectButton/BuildSelect'
+import request from '@/utils/request'
+import yinhao from '@/assets/yinhao.png'
+import logo from '@/assets/logo.svg';
+import touxiang from '@/assets/touxiang.jpg';
+import poster1 from '@/assets/poster1.png';
+import poster2 from '@/assets/poster2.png';
+import xiaochengxu from '@/assets/xiaochengxu.png';
 import AuthButton from '@/components/AuthButton';
 import Prompt from 'umi/prompt';
 
@@ -28,29 +24,42 @@ const formItemLayout = {
 };
 
 const cancelPage = () => {
+  router.go('-1')
+}
+
+const getSignList = dynamicId => {
   router.push({
-    pathname: '/activity/groupActivity/list',
+    pathname: '/activity/SignList',
+    query: {
+      dynamicId,
+    },
   });
 }
 
-const getSignList = groupActivityId => {
-    router.push({
-        pathname: '/activity/groupActivity/helpRecord',
-        query: {
-            groupActivityId,
-        },
-      });
+const newQrcode = row => {
+  const x = new XMLHttpRequest();
+  const resourceUrl = row.qrCode
+  x.open('GET', resourceUrl, true);
+  x.responseType = 'blob';
+  x.onload = function (e) {
+    const url = window.URL.createObjectURL(x.response)
+    const a = document.createElement('a');
+    a.href = url;
+    a.style.display = 'none'
+    a.download = '活动二维码.png';
+    a.click();
+  }
+  x.send();
 }
 
 const BasicForm = props => {
-  // const [activityStatus, setActivityStatus] = useState(1)
-  // const [disable, setDisable] = useState(false)
-  // const [detailData, setDetailData] = useState(false)
+  const detailData = props.detailData || {}
 
-  const { groupActivityId } = props
+  const radioOnChange = e => {
+    // setIsEnlist(e.target.value)
+  }
 
-  const detailData = props.detailData || {}
- 
+  const { dynamicId } = props
   const handleSubmit = e => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
@@ -65,23 +74,22 @@ const BasicForm = props => {
           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 (groupActivityId) {
-          values.groupActivityId = groupActivityId
-          request({ ...apis.groupActivity.update, data: values }).then(data => {
+        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.groupActivity.add, data: { ...values } }).then((data) => {
+          request({ ...apis.activity.add, data: { ...values } }).then((data) => {
             message.info('保存成功')
             router.push({
-              pathname: '/activity/groupActivity/edithelpActivity',
+              pathname: '/activity/editActivity',
               query: {
-                groupActivityId: data.groupActivityId,
+                dynamicId: data.dynamicId,
               },
             });
             // router.go(-1)
@@ -98,39 +106,54 @@ const BasicForm = props => {
     <>
       <Form {...formItemLayout} onSubmit={handleSubmit}>
         <Form.Item label="所属项目">
-        {getFieldDecorator('buildingId', {
-          initialValue: detailData.buildingId,
-          rules: [
-            {
-              required: true,
-              message: '请选择所属项目',
-            },
-          ],
-        })(<BuildSelect disabled/>)}
+          {getFieldDecorator('buildingId', {
+            initialValue: detailData.buildingId,
+            rules: [
+              {
+                required: true,
+                message: '请选择所属项目',
+              },
+            ],
+          })(<BuildSelect disabled />)}
         </Form.Item>
-        <Form.Item label="活动标题">
-          <span>{detailData.activityName}</span>
+        <Form.Item label="活动封面图1">
+          <img src={detailData.listImgUrl} height="210px" width="375px" />
         </Form.Item>
-        <Form.Item label="拼团详情主图">
-          <img src={detailData.mainImg} height="300px" width="375px" />
+        <Form.Item label="活动封面图2">
+          <img src={detailData.bannerListImg} height="125px" width="375px" />
         </Form.Item>
-        <Form.Item label="拼团封面图1">
-           <img src={detailData.listImg} height="210px" width="375px" />
+        <Form.Item label="活动详情主图">
+          <img src={detailData.imgUrl} height="300px" width="375px" />
         </Form.Item>
-        <Form.Item label="拼团封面图2">
-          <img src={detailData.bannerListImg} height="125px" width="375px" />
+        <Form.Item label="活动标题">
+          <span>{detailData.title}</span>
         </Form.Item>
         <Form.Item label="活动时间">
-      <span>{`${moment(detailData.startTime).format('YYYY-MM-DD HH:mm:ss')} —— ${moment(detailData.endTime).format('YYYY-MM-DD HH:mm:ss')}`}</span>
+          <span>{`${moment(detailData.startDate).format('YYYY-MM-DD HH:mm')} —— ${moment(detailData.endDate).format('YYYY-MM-DD HH:mm')}`}</span>
+        </Form.Item>
+        <Form.Item label="活动地点">
+          <span>{detailData.address}</span>
+        </Form.Item>
+        <Form.Item label="活动人数">
+          <span>{detailData.personNum}</span>
+        </Form.Item>
+        <Form.Item label="阅读量">
+          <span>{detailData.pvNum}</span>
         </Form.Item>
-        <Form.Item label="成团人数">
-            <span>{detailData.groupBuyPeople}</span>
+        <Form.Item label="转发量">
+          <span>{detailData.shareNum}</span>
         </Form.Item>
-        <Form.Item label="所需积分">
-            <span>{detailData.integral}</span>
+        <Form.Item label="收藏数">
+          <span>{detailData.saveNum}</span>
         </Form.Item>
-        <Form.Item label="活动说明">
-          <img src={detailData.descImg} height="300px" width="375px" />
+        <Form.Item label="最大报名人数">
+          <span>{detailData.maxEnlistByPerson}</span>
+        </Form.Item>
+        <Form.Item label="活动详情">
+          <div style={{ maxHeight: '500px', overflowY: 'auto' }} dangerouslySetInnerHTML={{ __html: detailData.desc }}></div>
+        </Form.Item>
+        <Form.Item label="报名时间">
+          <span>{`${moment(detailData.enlistStart).format('YYYY-MM-DD HH:mm')} —— ${moment(detailData.enlistEnd).format('YYYY-MM-DD HH:mm')}`}</span>
         </Form.Item>
         <Form.Item label="权重">
           <span>{detailData.heavy}</span>
@@ -143,16 +166,17 @@ const BasicForm = props => {
 const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
 
 const Poster = (props) => {
-  const { groupActivityId } = props
+  const { dynamicId } = props
   const [inputValue, changeInput] = useState('')
   const [textAreaValue, changeTextArea] = useState('')
   const [imgValue, changeImg] = useState('')
   const [posterId, setPosterId] = useState('')
 
-  if (groupActivityId) {
-    console.log(groupActivityId, 'groupActivityId')
+  if (dynamicId) {
+    console.log(dynamicId, 'dynamicId')
     useEffect(() => {
-      request({ ...apis.activity.poster, params: { targetId: groupActivityId, targetType: 'groupActivity' } }).then((data) => {
+      request({ ...apis.activity.poster, params: { targetId: dynamicId, targetType: 'activity' } }).then((data) => {
+        console.log(data, "2222")
         if (data.length > 0) {
           setPosterId(data[0].posterId)
           changeImg(data[0].posterImg)
@@ -164,7 +188,7 @@ const Poster = (props) => {
       })
       getMiniappName()
     }, [])
-  }else{
+  } else {
     getMiniappName()
   }
   // 获取小程序名称
@@ -177,15 +201,15 @@ const Poster = (props) => {
   }
 
   const submitPoster = () => {
-    if (helpActivityId) {
+    if (dynamicId) {
       if (posterId) {
-        request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: groupActivityId, targetType: 'groupActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+        request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: dynamicId, targetType: 'activity', 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: groupActivityId, targetType: 'groupActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+        request({ ...apis.activity.addPoster, data: { targetId: dynamicId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
           setPosterId(data.posterId)
           message.info("保存成功")
         }).catch((err) => {
@@ -272,14 +296,16 @@ const Poster = (props) => {
 
 
 const Share = (props) => {
-  const { groupActivityId } = props
+  const { dynamicId } = props
+
   const [inputValue, changeInput] = useState('')
   const [imgValue, changeImg] = useState('')
   const [shareContentId, setShareContentId] = useState('')
 
-  if (groupActivityId) {
-    useEffect(() => {
-      request({ ...apis.activity.shareContent, params: { targetId: groupActivityId, targetType: 'groupActivity' }, }).then((data) => {
+
+  useEffect(() => {
+    if (dynamicId) {
+      request({ ...apis.activity.shareContent, params: { targetId: dynamicId, targetType: 'activity' }, }).then((data) => {
         if (data.length > 0) {
           setShareContentId(data[0].shareContentId)
           changeImg(data[0].shareContentImg)
@@ -288,19 +314,20 @@ const Share = (props) => {
       }).catch((err) => {
         message.info(err.msg || err.message)
       })
-    }, [])
-  }
+    }
+  }, [])
+
 
   const submitShare = () => {
-    if (groupActivityId) {
+    if (dynamicId) {
       if (shareContentId) {
-        request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: groupActivityId, shareContentType: 'groupActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+        request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
           message.info("保存成功")
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
       } else {
-        request({ ...apis.activity.addShareContent, data: { targetId: groupActivityId, shareContentType: 'groupActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+        request({ ...apis.activity.addShareContent, data: { targetId: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
           setShareContentId(data.shareContentId)
           message.info("保存成功")
         }).catch(err => {
@@ -327,7 +354,7 @@ const Share = (props) => {
     </div>
     <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
       <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动分享图</p>
-      {imgValue === '' ? '无':<img src={imgValue} height="120px" height="150px" />}
+      {imgValue === '' ? '无' : <img src={imgValue} height="120px" height="150px" />}
     </div>
     {/* <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
     <Button onClick={() => cancelPage()}>
@@ -344,32 +371,31 @@ const Share = (props) => {
  */
 const Edit = props => {
   const [tab, changeTab] = useState('basic')
-  const { groupActivityId } = props.location.query
+  const { dynamicId } = props.location.query
   const [detailData, setDetailData] = useState(false)
 
-  useEffect(() => {
-    if (groupActivityId) {
-      getDynamicData(groupActivityId);
-    }
-  }, [])
-
-  // 查询详情
-  const getDynamicData = (groupActivityId) => {
-    request({ ...apis.groupActivity.details, urlData: {id: groupActivityId } }).then((data) => {
+  const getDynamicData = dynamicId => {
+    request({ ...apis.activity.details, params: { dynamicId } }).then((data) => {
       console.log(data)
-      data.activityTime = [moment(data.startTime), moment(data.endTime)]
+      data.activityTime = [moment(data.startDate), moment(data.endDate)]
+      data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
 
-      // setActivityStatus(data.activityStatus)
-      // setDisable(data.activityStatus === 0 ? true : false)
-      // props.form.setFieldsValue(data)
       setDetailData(data)
     })
   }
 
+
+  useEffect(() => {
+    if (dynamicId) {
+      getDynamicData(dynamicId);
+    }
+  }, [])
+
+
   
 
   return (
-    <div>
+    <Card>
       <div>
         <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
           <Radio.Button value="basic">基本信息</Radio.Button>
@@ -378,29 +404,22 @@ const Edit = props => {
         </Radio.Group>
       </div>
       <div>
-        {tab === 'basic' && <Basic groupActivityId={groupActivityId} detailData={detailData}/>}
-        {tab === 'poster' && <Poster groupActivityId={groupActivityId} />}
-        {tab === 'share' && <Share groupActivityId={groupActivityId} />}
+        {tab === 'basic' && <Basic dynamicId={dynamicId} detailData={detailData} />}
+        {tab === 'poster' && <Poster  dynamicId={dynamicId} />}
+        {tab === 'share' && <Share  dynamicId={dynamicId} />}
       </div>
-      <div style={{textAlign: 'center'}}>
-        <AuthButton name="admin.share.record" noRight={null}>
-          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && 
-            <span 
-              style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} 
-              onClick={getSignList.bind(this, detailData.groupActivityId)}>
-              <Button>拼团记录</Button>
-            </span>}
-          </AuthButton>
-          <Button onClick={() => cancelPage()}>
-            取消
+      <div style={{ textAlign: 'center' }}>
+        <AuthButton name="admin.SignList.get" noRight={null}>
+          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, detailData.dynamicId)}><Button>报名记录</Button></span>}
+        </AuthButton>
+        <AuthButton name="admin.dymic.qrcode" noRight={null}>
+          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, detailData)}>{<Button>下载二维码</Button>}</span>}
+        </AuthButton>
+        <Button onClick={() => cancelPage()}>
+          取消
           </Button>
       </div>
-      <Prompt message={location =>
-        location.pathname.startsWith("/activity/groupActivity")
-          ? true
-          : localStorage.removeItem("groupActivePageParams")} />
-    </div>
-    
+    </Card>
   );
 }
 

src/pages/activity/lookHouseActivity/edit/Basic.jsx

@@ -0,0 +1,294 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, DatePicker, message } from 'antd';
+import router from 'umi/router';
+import apis from '@/services/apis';
+import moment from 'moment';
+import BuildSelect from '@/components/SelectButton/BuildSelect2';
+import Wangedit from '@/components/Wangedit/Wangedit';
+import request from '@/utils/request';
+import ImageUploader from '@/components/XForm/ImageUpload';
+
+const { RangePicker } = DatePicker;
+
+const formItemLayout = {
+  labelCol: { span: 6 },
+  wrapperCol: { span: 14 },
+};
+
+const cancelPage = () => {
+  router.go('-1');
+};
+
+const BasicForm = props => {
+  const [isEnlist, setIsEnlist] = useState(1);
+  const [activityStatus, setActivityStatus] = useState(1);
+  const [disable, setDisable] = useState(false);
+  const [data, setData] = useState(1);
+  const [showSignupTime, setShowSignupTime] = useState([]);
+
+  const radioOnChange = e => {
+    setIsEnlist(e.target.value);
+  };
+
+  const { dynamicId } = props;
+
+  // 查询详情
+  const getDynamicData = dynamicId => {
+    request({ ...apis.activity.details, params: { dynamicId } }).then(data => {
+      data.activityTime = [moment(data.startDate), moment(data.endDate)];
+      data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)];
+      // setSignupTime([moment(data.enlistStart), moment(data.enlistEnd)])
+      setData(data);
+      setIsEnlist(data.isEnlist);
+      setActivityStatus(data.activityStatus);
+      setDisable(data.activityStatus === 0);
+      props.form.setFieldsValue(data);
+    });
+  };
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    props.form.setFieldsValue({ isEnlist });
+    if (dynamicId) {
+      getDynamicData(dynamicId);
+    }
+  }, []);
+  const checkTime = () => {
+    function compareDate(dateTime1, dateTime2) {
+      return new Date(dateTime1) > new Date(dateTime2);
+    }
+    // 1）修改后的开始时间不得大于当前时间（会存在已经成功报名的用户）
+
+    // （2）修改后开始时间<当前时间<修改后结束时间：活动进行中
+
+    // （3）修改后结束时间<当前时间：活动已结束
+    if (showSignupTime[0]) {
+      // const date = data.signupTime
+      const nowDate = new Date();
+      // console.log(compareDate(nowDate, showSignupTime[0]))
+      if (compareDate(nowDate, showSignupTime[0])) {
+        return true;
+      } else {
+        return '修改后的开始时间不得大于当前时间（会存在已经成功报名的用户）';
+      }
+    }
+    return true;
+  };
+
+  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) {
+          const checks = checkTime();
+          if (checks != true) {
+            message.info(checks);
+            return;
+          }
+          console.log(data.enlistNum, values.personNum, '143');
+
+          if (data.enlistNum > values.personNum) {
+            message.info('活动人数必须大于已报名人数');
+            return;
+          }
+
+          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.push({
+                pathname: '/activity/editActivity',
+                query: {
+                  dynamicId: data.dynamicId,
+                },
+              });
+              // router.go(-1)
+            })
+            .catch(err => {
+              message.info(err.msg || err.message);
+            });
+        }
+      }
+    });
+  };
+  const changeTime = (value, date) => {
+    // console.log(value, data, '-----checkTime---------')
+    // console.log(props.form.getFieldsValue(), '--------time1-----------')
+    // let datas = data
+    // console.log(value, date, datas)
+    // datas.signupTime = date
+
+    // //   data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
+
+    // console.log(datas,'-------datas--------')
+    //   props.form.setFieldsValue(data)
+    setShowSignupTime(date);
+    // props.form.setFieldsValue(datas)
+    // // form.setFieldsValue
+    // console.log('-------1--------')
+  };
+
+  const { getFieldDecorator } = props.form;
+  return (
+    <>
+      <Form {...formItemLayout} onSubmit={handleSubmit}>
+        <Form.Item label="所属项目">
+          {getFieldDecorator('buildingId', {
+            rules: [
+              {
+                required: true,
+                message: '请选择所属项目',
+              },
+            ],
+          })(<BuildSelect disabled={disable} />)}
+        </Form.Item>
+        <Form.Item
+          label="活动封面图1"
+          help="建议图片尺寸：750px*420px，比例16:9,格式：jpg，用于：首页推荐/活动列表"
+        >
+          {getFieldDecorator('listImgUrl', {
+            rules: [
+              {
+                required: true,
+                message: '请选择活动封面图1',
+              },
+            ],
+          })(<ImageUploader />)}
+        </Form.Item>
+        <Form.Item
+          label="活动封面图2"
+          help="建议图片尺寸：750*250，比例3:1，格式：jpg，用于：项目详情页"
+        >
+          {getFieldDecorator('bannerListImg', {
+            rules: [
+              {
+                required: true,
+                message: '请选择活动封面图2',
+              },
+            ],
+          })(<ImageUploader />)}
+        </Form.Item>
+        <Form.Item
+          label="活动详情主图"
+          help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：普通活动详情"
+        >
+          {getFieldDecorator('imgUrl', {
+            rules: [
+              {
+                required: true,
+                message: '请选择活动详情主图',
+              },
+            ],
+          })(<ImageUploader />)}
+        </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>
+        {/* disabled={activityStatus === 0 ? true : false} */}
+        <Form.Item label="活动人数" help="当前活动最多可报名人数">
+          {getFieldDecorator('personNum', {
+            rules: [
+              {
+                required: true,
+                message: '请输入活动人数',
+              },
+              // {
+              //   min: data.personNum,min={data.personNum || 0}
+              //   message: '活动人数必须大于已报名人数',
+              // },
+            ],
+          })(<Input type="number" />)}
+        </Form.Item>
+        <Form.Item label="用户携带人数" help="每个用户最多可携带参与活动的人数">
+          {getFieldDecorator('maxEnlistByPerson', {
+            rules: [
+              {
+                required: true,
+                message: '请输入用户携带人数',
+              },
+            ],
+          })(<Input type="number" min={1} />)}
+        </Form.Item>
+        <Form.Item label="活动详情">{getFieldDecorator('desc')(<Wangedit />)}</Form.Item>
+        <Form.Item label="报名时间">
+          {getFieldDecorator('signupTime', {
+            rules: [
+              {
+                required: true,
+                message: '请选择报名时间',
+              },
+            ],
+          })(<RangePicker format="YYYY-MM-DD HH:mm" onChange={changeTime} />)}
+        </Form.Item>
+        <Form.Item label="权重">
+          {getFieldDecorator('heavy', {
+            rules: [
+              {
+                required: true,
+                message: '请输入权重',
+              },
+            ],
+          })(<Input type="number" style={{ width: 80 }} />)}
+          <span style={{ marginLeft: 30, color: 'grey' }}>数字越大越靠前</span>
+        </Form.Item>
+        <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
+          <Button type="primary" htmlType="submit">
+            确认
+          </Button>
+          &nbsp;&nbsp;&nbsp;&nbsp;
+          <Button onClick={() => cancelPage()}>取消</Button>
+        </Form.Item>
+      </Form>
+    </>
+  );
+};
+
+export default Form.create({ name: 'BasicForm' })(BasicForm);

src/pages/activity/lookHouseActivity/edit/Poster.jsx

@@ -0,0 +1,255 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Button, message } from 'antd';
+import router from 'umi/router';
+import apis from '@/services/apis';
+import request from '@/utils/request';
+import yinhao from '@/assets/yinhao.png';
+import ImageUploader from '@/components/XForm/ImageUpload';
+import touxiang from '@/assets/touxiang.jpg';
+import poster1 from '@/assets/poster1.png';
+import xiaochengxu from '@/assets/xiaochengxu.png';
+
+const { TextArea } = Input;
+
+const cancelPage = () => {
+  router.go('-1');
+};
+
+const Poster = props => {
+  const { dynamicId } = props;
+  const [inputValue, changeInput] = useState('');
+  const [textAreaValue, changeTextArea] = useState('');
+  const [imgValue, changeImg] = useState('');
+  const [posterId, setPosterId] = useState('');
+
+  useEffect(() => {
+    if (dynamicId) {
+      request({ ...apis.activity.poster, params: { targetId: dynamicId, targetType: 'activity' } })
+        .then(data => {
+          if (data.length > 0) {
+            setPosterId(data[0].posterId);
+            changeImg(data[0].posterImg);
+            changeTextArea(data[0].posterDescription);
+            changeInput(data[0].posterTitle);
+          }
+        })
+        .catch(err => {
+          message.info(err.msg || err.message);
+        });
+    }
+    // getMiniappName()
+  }, []);
+
+  // 获取小程序名称
+  // const [miniappName, setMiniappName] = useState('')
+  // function getMiniappName() {
+  //   request({ ...apis.building.getMiniappName }).then(res => {
+  //     console.log(res, "0000000000000")
+  //     setMiniappName(res)
+  //   })
+  // }
+
+  const submitPoster = () => {
+    if (dynamicId) {
+      if (posterId) {
+        request({
+          ...apis.activity.updatePoster,
+          urlData: { id: posterId },
+          data: {
+            targetId: dynamicId,
+            targetType: 'activity',
+            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: dynamicId,
+            targetType: 'activity',
+            posterImg: imgValue,
+            posterTitle: inputValue,
+            posterDescription: textAreaValue,
+          },
+        })
+          .then(data => {
+            setPosterId(data.posterId);
+            message.info('保存成功');
+          })
+          .catch(err => {
+            message.info(err.msg || err.message);
+          });
+      }
+    } else {
+      message.warn('请先保存基本信息数据');
+    }
+  };
+
+  return (
+    <div>
+      <div style={{ display: 'flex' }}>
+        <div
+          style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}
+        >
+          <div
+            style={{
+              width: '375px',
+              height: '700px',
+              backgroundColor: '#fff',
+              boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)',
+              position: 'relative',
+              margin: '0 auto',
+            }}
+          >
+            <img style={{ width: '100%', height: '300px' }} src={imgValue || poster1} alt="" />
+            <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
+              <img
+                style={{
+                  width: '70px',
+                  height: '70px',
+                  border: '4px solid #fff',
+                  borderRadius: '35px',
+                  marginLeft: '16px',
+                }}
+                src={touxiang}
+                alt=""
+              />
+              <span
+                style={{
+                  color: '#222',
+                  fontWeight: '600',
+                  margin: '24px 10px 0 14px',
+                  fontSize: '17px',
+                }}
+              >
+                喵喵
+              </span>
+              <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您参与</span>
+              <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',
+                WebkitLineClamp: '2',
+                WebkitBoxOrient: 'vertical',
+                overflow: 'hidden',
+                textOverflow: 'ellipsis',
+              }}
+            >
+              {inputValue || '海报标题'}
+            </p>
+
+            <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',
+                WebkitLineClamp: '3',
+                WebkitBoxOrient: 'vertical',
+                overflow: 'hidden',
+                textOverflow: 'ellipsis',
+              }}
+            >
+              {textAreaValue || '海报描述'}
+            </p>
+            <div
+              style={{
+                backgroundColor: '#f1f1f1',
+                padding: '22px 30px',
+                boxShadow: '0px 6px 12px -4px #dcdcdc',
+                position: 'relative',
+              }}
+            >
+              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>长按识别小程序码</p>
+              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>进入活动查看详情</p>
+              <img
+                style={{ width: '80px', position: 'absolute', right: '30px', top: '10px' }}
+                src={xiaochengxu}
+                alt=""
+              />
+            </div>
+          </div>
+          <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>
+            海报模板
+          </p>
+        </div>
+
+        <div>
+          <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+            <p
+              style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}
+            >
+              活动海报图
+            </p>
+            <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+          </div>
+          <p
+            style={{
+              fontSize: '0.5vw',
+              color: '#A9A9A9',
+              marginLeft: '230px',
+              marginBottom: '30px',
+            }}
+          >
+            建议图片尺寸：640*670px，比例64:67,格式：jpg，用于普通活动海报
+          </p>
+          <div
+            style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}
+          >
+            <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' }}
+            >
+              海报描述
+            </p>
+            <TextArea
+              rows={5}
+              maxLength={1024}
+              value={textAreaValue}
+              onChange={e => changeTextArea(e.target.value)}
+            />
+          </div>
+        </div>
+      </div>
+      <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}>
+        {' '}
+        确定
+      </Button>
+      <Button onClick={() => cancelPage()}>取消</Button>
+    </div>
+  );
+};
+
+export default Poster;

src/pages/activity/lookHouseActivity/edit/Share.jsx

@@ -0,0 +1,150 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Card } from 'antd';
+
+import router from 'umi/router';
+import apis from '@/services/apis';
+import moment from 'moment';
+import BuildSelect from '@/components/SelectButton/BuildSelect2';
+import Wangedit from '@/components/Wangedit/Wangedit';
+import request from '@/utils/request';
+import yinhao from '@/assets/yinhao.png';
+import ImageUploader from '@/components/XForm/ImageUpload';
+import logo from '@/assets/logo.png';
+import touxiang from '@/assets/touxiang.jpg';
+import poster1 from '@/assets/poster1.png';
+import poster2 from '@/assets/poster2.png';
+import xiaochengxu from '@/assets/xiaochengxu.png';
+
+const { TextArea } = Input;
+
+const cancelPage = () => {
+  router.go('-1');
+};
+
+const Share = props => {
+  const { dynamicId } = props;
+  const [inputValue, changeInput] = useState('');
+  const [imgValue, changeImg] = useState('');
+  const [shareContentId, setShareContentId] = useState('');
+
+  useEffect(() => {
+    if (dynamicId) {
+      request({
+        ...apis.activity.shareContent,
+        params: { targetId: dynamicId, targetType: 'activity' },
+      })
+        .then(data => {
+          if (data.length > 0) {
+            setShareContentId(data[0].shareContentId);
+            changeImg(data[0].shareContentImg);
+            changeInput(data[0].shareContentTitle);
+          }
+        })
+        .catch(err => {
+          message.info(err.msg || err.message);
+        });
+    }
+  }, [dynamicId]);
+
+  const submitShare = () => {
+    if (dynamicId) {
+      if (shareContentId) {
+        request({
+          ...apis.activity.updateShareContent,
+          urlData: { id: shareContentId },
+          data: {
+            targetId: dynamicId,
+            shareContentType: 'activity',
+            shareContentImg: imgValue,
+            shareContentTitle: inputValue,
+          },
+        })
+          .then(data => {
+            message.info('保存成功');
+          })
+          .catch(err => {
+            message.info(err.msg || err.message);
+          });
+      } else {
+        request({
+          ...apis.activity.addShareContent,
+          data: {
+            targetId: dynamicId,
+            shareContentType: 'activity',
+            shareContentImg: imgValue,
+            shareContentTitle: inputValue,
+          },
+        })
+          .then(data => {
+            setShareContentId(data.shareContentId);
+            message.info('保存成功');
+          })
+          .catch(err => {
+            message.info(err.msg || err.message);
+          });
+      }
+    } else {
+      message.warn('请先保存基本信息数据');
+    }
+  };
+
+  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' }}>
+          分享模板
+        </p>
+        <div>
+          <p
+            style={{
+              display: 'flex',
+              alignItems: 'center',
+              fontSize: '14px',
+              color: '#999',
+              margin: '0',
+              lineHeight: '0',
+            }}
+          >
+            <img src={logo} style={{ width: '22px', marginRight: '10px' }} alt="" />
+            橙蕉互动
+          </p>
+          <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>
+            {inputValue || '置业V客厅 精准获客平台'}
+          </p>
+          <img style={{ width: '200px', height: '160px' }} src={imgValue || poster2} alt="" />
+        </div>
+      </div>
+      <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+        <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' }}>
+          活动分享图
+        </p>
+        <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+      </div>
+      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>
+        建议图片尺寸：750*600px，比例5:4,格式：jpg，用于活动分享好友
+      </p>
+      <Button
+        type="primary"
+        htmlType="submit"
+        onClick={submitShare}
+        style={{ margin: '40px 40px 40px 220px' }}
+      >
+        {' '}
+        确定
+      </Button>
+      <Button onClick={() => cancelPage()}>取消</Button>
+    </div>
+  );
+};
+
+export default Share;

src/pages/activity/lookHouseActivity/edit/ind.jsx

@@ -0,0 +1,524 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
+
+import router from 'umi/router';
+import apis from '@/services/apis';
+import moment from 'moment';
+import BuildSelect from '@/components/SelectButton/BuildSelect2'
+import Wangedit from '@/components/Wangedit/Wangedit'
+import request from '@/utils/request'
+import yinhao from '@/assets/yinhao.png'
+import ImageUploader from '@/components/XForm/ImageUpload';
+import logo from '@/assets/logo.png';
+import touxiang from '@/assets/touxiang.jpg';
+import poster1 from '@/assets/poster1.png';
+import poster2 from '@/assets/poster2.png';
+import xiaochengxu from '@/assets/xiaochengxu.png'
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+const formItemLayout = {
+  labelCol: { span: 6 },
+  wrapperCol: { span: 14 },
+};
+
+const cancelPage = () => {
+  router.push({
+    pathname: '/activity/ActivityList',
+  });
+}
+
+const BasicForm = props => {
+  const [isEnlist, setIsEnlist] = useState(1)
+  const [activityStatus, setActivityStatus] = useState(1)
+  const [disable, setDisable] = useState(false)
+  const [data, setData] = useState(1)
+  const [showSignupTime, setShowSignupTime] = useState([])
+
+
+  const radioOnChange = e => {
+    setIsEnlist(e.target.value)
+  }
+
+  const { dynamicId } = props
+
+  // 查询详情
+  const getDynamicData = dynamicId => {
+    request({ ...apis.activity.details, params: { dynamicId } }).then(data => {
+ 
+      data.activityTime = [moment(data.startDate), moment(data.endDate)]
+      data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
+      // setSignupTime([moment(data.enlistStart), moment(data.enlistEnd)])
+      setData(data)
+      setIsEnlist(data.isEnlist)
+      setActivityStatus(data.activityStatus)
+      setDisable(data.activityStatus === 0)
+      props.form.setFieldsValue(data)
+    })
+  }
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    props.form.setFieldsValue({ isEnlist })
+    if (dynamicId) {
+      getDynamicData(dynamicId);
+    }
+  }, [])
+  const checkTime = () => {
+    function compareDate(dateTime1, dateTime2) {
+      return new Date(dateTime1) > new Date(dateTime2)
+    }
+    // 1）修改后的开始时间不得大于当前时间（会存在已经成功报名的用户）
+
+    // （2）修改后开始时间<当前时间<修改后结束时间：活动进行中
+
+    // （3）修改后结束时间<当前时间：活动已结束
+    if (showSignupTime[0]) {
+      // const date = data.signupTime
+      const nowDate = new Date()
+      // console.log(compareDate(nowDate, showSignupTime[0]))
+      if (compareDate(nowDate, showSignupTime[0])) {
+        return true
+      } else {
+        return '修改后的开始时间不得大于当前时间（会存在已经成功报名的用户）'
+      }
+    }
+    return true
+  }
+
+
+  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) {
+          const checks = checkTime()
+          if (checks != true) {
+            message.info(checks)
+            return
+          }
+          console.log(data.enlistNum,values.personNum,'143')
+
+          if (data.enlistNum > values.personNum) {
+            message.info('活动人数必须大于已报名人数')
+            return
+          }
+
+          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.push({
+              pathname: '/activity/editActivity',
+              query: {
+                dynamicId: data.dynamicId,
+              },
+            });
+            // router.go(-1)
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        }
+      }
+    });
+  }
+  const changeTime = (value, date) => {
+    // console.log(value, data, '-----checkTime---------')
+    // console.log(props.form.getFieldsValue(), '--------time1-----------')
+    // let datas = data
+    // console.log(value, date, datas)
+    // datas.signupTime = date
+
+    // //   data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
+
+    // console.log(datas,'-------datas--------')
+    //   props.form.setFieldsValue(data)
+    setShowSignupTime(date)
+    // props.form.setFieldsValue(datas)
+    // // form.setFieldsValue
+    // console.log('-------1--------')
+  }
+
+  const { getFieldDecorator } = props.form;
+  return (
+    <>
+      <Form {...formItemLayout} onSubmit={handleSubmit}>
+        <Form.Item label="所属项目">
+          {getFieldDecorator('buildingId', {
+            rules: [
+              {
+                required: true,
+                message: '请选择所属项目',
+              },
+            ],
+          })(<BuildSelect disabled={disable} />)}
+        </Form.Item>
+        <Form.Item label="活动封面图1" help="建议图片尺寸：750px*420px，比例16:9,格式：jpg，用于：首页推荐/活动列表">
+          {getFieldDecorator('listImgUrl', {
+            rules: [
+              {
+                required: true,
+                message: '请选择活动封面图1',
+              },
+            ],
+          })(<ImageUploader />)}
+        </Form.Item>
+        <Form.Item label="活动封面图2" help="建议图片尺寸：750*250，比例3:1，格式：jpg，用于：项目详情页">
+          {getFieldDecorator('bannerListImg', {
+            rules: [
+              {
+                required: true,
+                message: '请选择活动封面图2',
+              },
+            ],
+          })(<ImageUploader />)}
+        </Form.Item>
+        <Form.Item label="活动详情主图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：普通活动详情">
+          {getFieldDecorator('imgUrl', {
+            rules: [
+              {
+                required: true,
+                message: '请选择活动详情主图',
+              },
+            ],
+          })(<ImageUploader />)}
+        </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>
+        {/* disabled={activityStatus === 0 ? true : false} */}
+        <Form.Item label="活动人数" help="当前活动最多可报名人数">
+          {getFieldDecorator('personNum', {
+            rules: [
+              {
+                required: true,
+                message: '请输入活动人数',
+              },
+              // {
+              //   min: data.personNum,min={data.personNum || 0}
+              //   message: '活动人数必须大于已报名人数',
+              // },
+            ],
+          })(<Input type="number" />)}
+        </Form.Item>
+        <Form.Item label="用户携带人数" help="每个用户最多可携带参与活动的人数">
+          {getFieldDecorator('maxEnlistByPerson', {
+            rules: [
+              {
+                required: true,
+                message: '请输入用户携带人数',
+              },
+            ],
+          })(<Input type="number" min={1} />)}
+        </Form.Item>
+        <Form.Item label="活动详情">
+          {getFieldDecorator('desc')(<Wangedit />)}
+        </Form.Item>
+        <Form.Item label="报名时间">
+          {getFieldDecorator('signupTime', {
+            rules: [
+              {
+                required: true,
+                message: '请选择报名时间',
+              },
+            ],
+          })(<RangePicker format="YYYY-MM-DD HH:mm" onChange={changeTime} />)}
+        </Form.Item>
+        <Form.Item label="权重">
+          {getFieldDecorator('heavy', {
+
+            rules: [
+              {
+                required: true,
+                message: '请输入权重',
+              },
+            ],
+          })(<Input type="number" style={{ width: 80 }} />)}<span style={{ marginLeft: 30, color: 'grey' }}>数字越大越靠前</span>
+        </Form.Item>
+        <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
+          <Button type="primary" htmlType="submit">
+            确认
+          </Button>
+          &nbsp;&nbsp;&nbsp;&nbsp;
+          <Button onClick={() => cancelPage()}>
+            取消
+          </Button>
+        </Form.Item>
+      </Form>
+    </>
+  )
+}
+
+const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
+
+const Poster = props => {
+  const { dynamicId } = props
+  const [inputValue, changeInput] = useState('')
+  const [textAreaValue, changeTextArea] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [posterId, setPosterId] = useState('')
+
+  useEffect(() => {
+    if (dynamicId) {
+      request({ ...apis.activity.poster, params: { targetId: dynamicId, targetType: 'activity' } }).then(data => {
+
+        if (data.length > 0) {
+          setPosterId(data[0].posterId)
+          changeImg(data[0].posterImg)
+          changeTextArea(data[0].posterDescription)
+          changeInput(data[0].posterTitle)
+        }
+      }).catch(err => {
+        message.info(err.msg || err.message)
+      })
+    }
+    // getMiniappName()
+  }, [])
+  
+  // 获取小程序名称
+  // const [miniappName, setMiniappName] = useState('')
+  // function getMiniappName() {
+  //   request({ ...apis.building.getMiniappName }).then(res => {
+  //     console.log(res, "0000000000000")
+  //     setMiniappName(res)
+  //   })
+  // }
+
+  const submitPoster = () => {
+    if (dynamicId) {
+      if (posterId) {
+        request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: dynamicId, targetType: 'activity', 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: dynamicId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue } }).then(data => {
+          setPosterId(data.posterId)
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
+      }
+    } else {
+      message.warn('请先保存基本信息数据')
+    }
+  }
+
+  return <div>
+    <div style={{ display: 'flex' }}>
+      <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
+        <div style={{ width: '375px', height: '700px', backgroundColor: '#fff', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
+          <img style={{ width: '100%', height: '300px' }} src={imgValue || poster1} alt="" />
+          <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
+            <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} src={touxiang} alt="" />
+            <span style={{ color: '#222', fontWeight: '600', margin: '24px 10px 0 14px', fontSize: '17px' }}>喵喵</span>
+            <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您参与</span>
+            <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',
+            WebkitLineClamp: '2',
+            WebkitBoxOrient: 'vertical',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+          }}>{inputValue || '海报标题'}</p>
+
+          <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',
+            WebkitLineClamp: '3',
+            WebkitBoxOrient: 'vertical',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+          }}>{textAreaValue || '海报描述'}</p>
+          <div style={{ backgroundColor: '#f1f1f1', padding: '22px 30px', boxShadow: '0px 6px 12px -4px #dcdcdc', position: 'relative' }}>
+            <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>长按识别小程序码</p>
+            <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>进入活动查看详情</p>
+            <img style={{ width: '80px', position: 'absolute', right: '30px', top: '10px' }} src={xiaochengxu} alt="" />
+          </div>
+        </div>
+        <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
+      </div>
+
+      <div >
+        <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动海报图</p>
+          <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+        </div>
+        <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px' }}>建议图片尺寸：640*670px，比例64:67,格式：jpg，用于普通活动海报</p>
+        <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
+          <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' }}>海报描述</p>
+          <TextArea rows={5} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+        </div>
+
+      </div>
+    </div>
+    <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
+    <Button onClick={() => cancelPage()}>
+      取消
+    </Button>
+  </div>
+}
+
+const Share = props => {
+  const { dynamicId } = props
+  const [inputValue, changeInput] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [shareContentId, setShareContentId] = useState('')
+
+  useEffect(() => {
+    if (dynamicId) {
+      request({ ...apis.activity.shareContent, params: { targetId: dynamicId, targetType: 'activity' } }).then(data => {
+
+        if (data.length > 0) {
+          setShareContentId(data[0].shareContentId)
+          changeImg(data[0].shareContentImg)
+          changeInput(data[0].shareContentTitle)
+        }
+      }).catch(err => {
+        message.info(err.msg || err.message)
+      })
+    }
+  }, [dynamicId])
+
+  const submitShare = () => {
+    if (dynamicId) {
+      if (shareContentId) {
+        request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue } }).then(data => {
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
+      } else {
+        request({ ...apis.activity.addShareContent, data: { targetId: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue } }).then(data => {
+          setShareContentId(data.shareContentId)
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
+      }
+    } else {
+      message.warn('请先保存基本信息数据')
+    }
+  }
+
+  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' }}>分享模板</p>
+      <div>
+        <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}>
+          <img src={logo} style={{ width: '22px', marginRight: '10px' }} alt=""/>橙蕉互动</p>
+        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue || '置业V客厅 精准获客平台'}</p>
+        <img style={{ width: '200px', height: '160px' }} src={imgValue || poster2} alt="" />
+      </div>
+    </div>
+    <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+      <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' }}>活动分享图</p>
+      <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+    </div>
+    <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于活动分享好友</p>
+    <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+    <Button onClick={() => cancelPage()}>
+      取消
+    </Button>
+  </div>
+}
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  const [tab, changeTab] = useState('basic')
+  const { dynamicId } = props.location.query
+
+  return (
+    <div>
+      <div>
+        <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
+          <Radio.Button value="basic">基本信息</Radio.Button>
+          <Radio.Button value="poster">海报图片</Radio.Button>
+          <Radio.Button value="share">分享设置</Radio.Button>
+        </Radio.Group>
+      </div>
+      <div>
+        {tab === 'basic' && <Basic dynamicId={dynamicId} />}
+        {tab === 'poster' && <Poster dynamicId={dynamicId}/>}
+        {tab === 'share' && <Share dynamicId={dynamicId}/>}
+      </div>
+    
+    </div>
+  );
+}
+
+export default Edit

src/pages/activity/lookHouseActivity/edit/index.jsx

@@ -0,0 +1,34 @@
+import React, { useState } from 'react';
+import { Radio, Card } from 'antd';
+import Basic from './Basic';
+import Poster from './Poster';
+import Share from './Share';
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  const [tab, changeTab] = useState('basic');
+  const { dynamicId } = props.location.query;
+
+  return (
+    <Card>
+      <div>
+        <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
+          <Radio.Button value="basic">基本信息</Radio.Button>
+          <Radio.Button value="poster">海报图片</Radio.Button>
+          <Radio.Button value="share">分享设置</Radio.Button>
+        </Radio.Group>
+      </div>
+      <div>
+        {tab === 'basic' && <Basic dynamicId={dynamicId} />}
+        {tab === 'poster' && <Poster dynamicId={dynamicId} />}
+        {tab === 'share' && <Share dynamicId={dynamicId} />}
+      </div>
+    </Card>
+  );
+};
+
+export default Edit;

src/pages/activity/lookHouseActivity/index.jsx

@@ -0,0 +1,331 @@
+import React, { useState, useEffect, useRef } from 'react';
+import {
+  Form,
+  Input,
+  Button,
+  Icon,
+  Typography,
+  message,
+  Table,
+  Pagination,
+  Modal,
+  DatePicker,
+  Card,
+} from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import Navigate from '@/components/Navigate';
+import SelectCity from '@/components/SelectButton/CitySelect';
+import BuildSelect from '@/components/SelectButton/BuildSelect';
+import apis from '@/services/apis';
+import request from '@/utils/request';
+import QueryTable from '@/components/QueryTable';
+
+const LookHouseActivity = props => {
+  const ref = useRef();
+
+  const searchFields = [
+    {
+      name: 'cityId',
+      label: '城市',
+      placeholder: '请选择城市',
+      render: () => <SelectCity style={{ width: 160 }} />,
+    },
+    {
+      name: 'buildingId',
+      label: '项目',
+      placeholder: '请选择项目',
+      render: () => <BuildSelect style={{ width: 160 }} />,
+    },
+
+    {
+      name: 'title',
+      label: '标题',
+      placeholder: '请输入标题',
+    },
+    {
+      name: 'time',
+      label: '时间',
+      placeholder: '请选择时间',
+      type: 'datepicker',
+    },
+  ];
+
+  const toLookHouseActivityDetail = dynamicId => () => {
+    router.push({
+      pathname: '/activity/lookHouseActivity/detail',
+      query: {
+        dynamicId,
+      },
+    });
+  };
+
+  // 跳转到编辑
+  const toLookHouseActivityEdit = dynamicId => {
+    router.push({
+      pathname: '/activity/lookHouseActivity/edit',
+      query: {
+        dynamicId,
+      },
+    });
+  };
+
+  //   置顶
+  const topDynamic = row => () => {
+    const weight = Math.abs(row.weight - 1);
+    request({ ...apis.activity.weight, params: { dynamicId: row.dynamicId, weight } })
+      .then(data => {
+        message.info('操作成功！');
+        ref.current.reload();
+      })
+      .catch(err => {
+        console.log(err);
+        message.info(err.msg || err.message);
+      });
+  };
+
+  //   推首页
+  const homeDynamic = row => () => {
+    const home = Math.abs(row.home - 1);
+    request({ ...apis.activity.home, params: { dynamicId: row.dynamicId, home } })
+      .then(data => {
+        message.info('操作成功！');
+        ref.current.reload();
+      })
+      .catch(err => {
+        console.log(err);
+        message.info(err.msg || err.message);
+      });
+  };
+
+  //结束活动
+  const finishDynamic = row => {
+    Modal.confirm({
+      title:
+        '活动会被强制结束，小程序端无法再发起或参与此活动，如果不想让客户看到活动，请再点击取消发布按钮',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.activity.finish, data: { dynamicId: row.dynamicId, top: '' } })
+          .then(data => {
+            message.info('操作成功！');
+            ref.current.reload();
+          })
+          .catch(err => {
+            console.log(err);
+            message.info(err.msg || err.message);
+          });
+      },
+    });
+  };
+
+  // 发布活动
+  const sendDynamic = row => {
+    Modal.confirm({
+      title: '确定发布吗？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.activity.send, urlData: { id: row.dynamicId } })
+          .then(data => {
+            message.info('操作成功！');
+            ref.current.reload();
+          })
+          .catch(err => {
+            console.log(err);
+            message.info(err.msg || err.message);
+          });
+      },
+    });
+  };
+
+  // 取消活动
+  const cancelDynamic = row => {
+    Modal.confirm({
+      title: '活动会在小程序端隐藏，后台可以继续编辑重新发布',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.activity.cancel, urlData: { id: row.dynamicId } })
+          .then(data => {
+            message.info('操作成功！');
+            ref.current.reload();
+          })
+          .catch(err => {
+            console.log(err);
+            message.info(err.msg || err.message);
+          });
+      },
+    });
+  };
+
+  //   发布or取消发布
+  const sendOrPublicDynamic = row => {
+    if (row.status === 1) {
+      cancelDynamic(row);
+    } else {
+      sendDynamic(row);
+    }
+  };
+
+  const getJoinPeople = dynamicId => () => {
+    router.push({
+      pathname: '/activity/lookHouseActivity/registrationRecord',
+      query: {
+        dynamicId,
+      },
+    });
+  };
+
+  const columns = [
+    {
+      title: '活动标题',
+      dataIndex: 'title',
+      key: 'title',
+      align: 'center',
+      width: '20%',
+      render: (x, row) => (
+        <Navigate onClick={toLookHouseActivityDetail(row.dynamicId)}>
+          <Typography.Text ellipsis>{row.title}</Typography.Text>
+        </Navigate>
+      ),
+    },
+    {
+      title: '活动时间',
+      dataIndex: 'startDate',
+      key: 'startDate',
+      align: 'center',
+      width: '15%',
+      // width: '20%',
+      render: (x, row) => (
+        <>
+          <span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format(
+            'YYYY-MM-DD',
+          )}`}</span>
+        </>
+      ),
+    },
+    {
+      title: '已参与人数',
+      dataIndex: 'count',
+      key: 'count',
+      align: 'center',
+      render: (x, row) => <Navigate onClick={getJoinPeople(row.dynamicId)}>{row.count}</Navigate>,
+    },
+    // {
+    //   title: '阅读量',
+    //   dataIndex: 'pvNum',
+    //   key: 'pvNum',
+    //   align: 'center',
+    //   // width: '10%',
+    // },
+    // {
+    //   title: '转发量',
+    //   dataIndex: 'shareNum',
+    //   key: 'shareNum',
+    //   align: 'center',
+    //   // width: '10%',
+    // },
+    // {
+    //   title: '收藏数',
+    //   dataIndex: 'saveNum',
+    //   key: 'saveNum',
+    //   align: 'center',
+    //   // width: '10%',
+    // },
+    {
+      title: '报名状态',
+      dataIndex: 'activityStatus',
+      key: 'activityStatus',
+      align: 'center',
+      render: activityStatus =>
+        activityStatus == 0 ? '进行中' : activityStatus == 1 ? '未开始' : '已结束',
+    },
+    {
+      title: '权重',
+      dataIndex: 'heavy',
+      key: 'heavy',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: withActions((x, row) => [
+        <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
+          <EditIcon
+            type={row.status === 1 ? 'cancel' : 'publish'}
+            text={row.status === 1 ? '取消发布' : '发布'}
+            onClick={() => sendOrPublicDynamic(row)}
+          />
+        </AuthButton>,
+
+        // //   <EditIcon type="look" text="查看详情" onClick={toLookHouseActivityDetail(row.dynamicId)} />,
+
+        row.activityStatus === 0 ? (
+          <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
+            <EditIcon type="end" text="结束活动" onClick={finishDynamic.bind(this, row)} />
+          </AuthButton>
+        ) : null,
+
+        <AuthButton name="admin.buildingDynamic.tag" noRight={null}>
+          <EditIcon
+            type={row.weight === 1 ? 'cancel' : 'add'}
+            text={row.weight === 1 ? '取消标签' : '添加标签'}
+            onClick={topDynamic(row)}
+          />
+        </AuthButton>,
+
+        <EditIcon
+          type={row.home === 1 ? 'cancel' : 'top'}
+          text={row.home === 1 ? '取消推首页' : '推荐首页'}
+          onClick={homeDynamic(row)}
+        />,
+
+        //   <AuthButton name="admin.buildingDynamic.dataRecord" noRight={null}>
+        //     <EditIcon type="record" text="数据记录" onClick={toDataReacord(row.dynamicId)} />
+        //   </AuthButton>,
+
+        row.activityStatus === 0 || row.activityStatus === 1 ? (
+          <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
+            <EditIcon
+              type="edit"
+              text="编辑"
+              onClick={() => toLookHouseActivityEdit(row.dynamicId, row.count)}
+            />
+          </AuthButton>
+        ) : null,
+      ]),
+    },
+  ];
+
+  const actionRender = () => {
+    return (
+      <Button type="primary" icon="plus" onClick={() => toLookHouseActivityEdit()}>
+        新增
+      </Button>
+    );
+  };
+
+  return (
+    <QueryTable
+      ref={ref}
+      rowKey="dynamicId"
+      api={apis.activity.list}
+      searchFields={searchFields}
+      columns={columns}
+      postData={data => {
+        data.time && (data.time = `${moment(data.time).format('YYYY-MM-DDT00:00:00.000')}Z`);
+        return data;
+      }}
+      actionRender={actionRender}
+      // onPageChange={(pg) => setPage(pg)}
+    />
+  );
+};
+
+export default SignupActivity;

src/pages/activity/lookHouseActivity/registrationRecord.jsx

@@ -0,0 +1,213 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Table, Card } from 'antd';
+
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '@/services/apis';
+import request from '@/utils/request';
+
+const { Option } = Select;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+
+const columns = [
+  {
+    title: '用户姓名',
+    dataIndex: 'name',
+    key: 'name',
+    align: 'center',
+  },
+  {
+    title: '手机号',
+    dataIndex: 'phone',
+    key: 'phone',
+    align: 'center',
+  },
+  {
+    title: '参与人数',
+    dataIndex: 'attendNum',
+    key: 'attendNum',
+    align: 'center',
+  },
+  {
+    title: '报名时间',
+    dataIndex: 'createDate',
+    key: 'createDate',
+    align: 'center',
+    render: (x, row) => (
+      <>
+        <span>{`${moment(row.createDate).format('YYYY-MM-DD')}`}</span>
+      </>
+    ),
+  },
+  {
+    title: '推广人员',
+    dataIndex: 'sharePersonName',
+    key: 'sharePersonName',
+    align: 'center',
+  },
+  {
+    title: '公司',
+    dataIndex: 'orgName',
+    key: 'orgName',
+    align: 'center',
+  },
+  {
+    title: '状态',
+    dataIndex: 'isCheckin',
+    key: 'isCheckin',
+    align: 'center',
+    render: (x, row) => (
+      <>
+        <span>{row.isCheckin === 1 ? '已签到' : '未签到'}</span>
+      </>
+    ),
+  },
+];
+
+const header = props => {
+  const [data, setData] = useState({ list: {} });
+  const [loading, setLoading] = useState(false);
+  
+  //   const [page, changePage] = useState({})
+  // 存入导入数据的值
+  const { getFieldDecorator, getFieldsValue } = props.form;
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    // eslint-disable-next-line no-use-before-define
+    getSignList({ pageNum: 1, pageSize: 10, dynamicId: props.location.query.dynamicId });
+  }, []);
+
+  // 查询列表
+  const getSignList = params => {
+    // eslint-disable-next-line no-shadow
+    setLoading(true)
+    request({ ...apis.activity.signList, params: { ...params } }).then(data => {
+     
+      setData(data);
+      setLoading(false)
+    });
+  };
+
+  const changePageNum = pageNumber => {
+    getSignList({ pageNum: pageNumber, pageSize: 10, dynamicId: props.location.query.dynamicId });
+  };
+
+  const toActivityList = () => {
+    router.go('-1')
+  };
+  // 提交事件
+  // eslint-disable-next-line no-shadow
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      getSignList({
+        pageNum: 1,
+        pageSize: 10,
+        dynamicId: props.location.query.dynamicId,
+        isCheckin: values.isCheckin,
+        name: values.name,
+        phone: values.phone,
+      });
+    });
+  };
+  // 重置搜索
+  function handleReset() {
+    props.form.resetFields();
+    getSignList({ pageNum: 1, pageSize: 10, dynamicId: props.location.query.dynamicId });
+  }
+  // eslint-disable-next-line class-methods-use-this
+  function exportHelp() {
+    const fieldsValue = getFieldsValue();
+    console.log('fieldsValue', fieldsValue);
+    request({
+      ...apis.activity.getTaActivityDynamicEnlistExport,
+      params: { ...fieldsValue, dynamicId: props.location.query.dynamicId },
+    })
+      .then(data => {
+        if (!data) {
+          return;
+        }
+        const url = window.URL.createObjectURL(new Blob([data]));
+        const link = document.createElement('a');
+        link.style.display = 'none';
+        link.href = url;
+        link.setAttribute('download', '报名列表.xlsx');
+        document.body.append(link);
+        link.click();
+      })
+      .catch(() => {});
+  }
+
+  return (
+    <Card>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('isCheckin')(
+            <Select style={{ width: '180px' }} placeholder="签到状态">
+              <Option value="0">未签到</Option>
+              <Option value="1">已签到</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('name')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="用户姓名"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('phone')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="手机号"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit">
+            搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+          </Button>
+        </Form.Item>
+        <Button style={{ position: 'absolute', right: '30px' }} onClick={toActivityList}>
+          返回
+        </Button>
+      </Form>
+
+      <div style={{ textAlign: 'right', margin: '6px 0 10px 0' }}>
+        {' '}
+        <Button
+          name="admin.activityDynamicEnlist.export.get"
+          noRight={null}
+          type="primary"
+          onClick={exportHelp}
+        >
+          导出
+        </Button>
+      </div>
+      <Table
+        dataSource={data.list.data}
+        columns={columns}
+        pagination={{ total: data.total, onChange: changePageNum }}
+        loading={loading}
+        rowKey="activity"
+      />
+      {/* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
+      </div> */}
+    </Card>
+  );
+};
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader;

src/pages/building/Developers/Edit.jsx

@@ -1,12 +1,14 @@
 import React, { useState, useEffect } from 'react';
-import { Input, Button, Card, Form,  notification } from 'antd';
+import { Input, Button, Card, Form,  notification,message } from 'antd';
 import router from 'umi/router';
 // import Styles from './style.less';
 import ImageUploader from '../../../components/XForm/ImageUpload';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
+import { fetch } from '@/utils/request';
 
-const formItemLayout = {
+
+  const formItemLayout = {
     labelCol: {
       xs: { span: 24 },
       sm: { span: 8 },
@@ -31,35 +33,69 @@ const formItemLayout = {
 
 function Edit(props) {
   const { getFieldDecorator } = props.form;
+  const { form, history } = props;
+  const updateBrandData = fetch(apis.brand.alterBrand);
+  const saveBrandData=fetch(apis.brand.addBrand);
+  const goBack = () => router.goBack(-1);
+  const {validateFields}=form;
+
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   let data = {};
-  const { id } = props.location.query;
+  const { brandId } = props.location.query;
 
-  useEffect(() => {
-    if (id) {
-      getById(id);
+
+  useEffect(()=>{
+    if (brandId) {
+      getById({brandId})
     }
-  }, [id]);
+  },[brandId])
+
 
+//增+改
   function handleSubmit(e) {
     e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        // 提交数据
-        submitData(values);
+    validateFields((err, values) => {
+      if (err) {
+        return;
+        //字符验证未填写---返回
+      }
+      if (brandId) {
+        updateBrandData({
+          data: {
+            ...values,
+          },
+          urlData: { id: brandId }
+        }).then(() => {
+          // setLoading(false);
+          message.success('数据更新成功');
+          goBack()
+        }).catch((err) => {
+          // setLoading(false);//loading消失
+          message.error(err.message || err);
+        })
+      } else {
+        saveBrandData({ data: values }).then(() => {
+          // setLoading(false);
+          message.success('数据保存成功');
+          goBack()
+        }).catch((err) => {
+          // setLoading(false);//loading消失
+          message.error(err.message || err);
+        })
       }
     });
-  }
 
+
+
+  }
   // 获取详情信息
-  function getById(currentId) {
-    request({ ...apis.buildingType.getById, urlData: { id: currentId } }).then(res => {
+  function getById(res) {
+    request({ ...apis.brand.getBrand, urlData: { id: res.brandId } }).then(res => {
       data = res;
       props.form.setFieldsValue(res);
     });
   }
-
   const openNotificationWithIcon = (type, message) => {
     notification[type]({
       message,
@@ -67,46 +103,41 @@ function Edit(props) {
     });
   };
 
-  function submitData(dataSources) {
-    if (id !== '') {
-      // 修改
-      updateType(dataSources);
-      return;
-    }
 
-    dataSources.status = 1;
-    dataSources.createDate = new Date();
-    request({ ...apis.buildingType.add, data: { ...dataSources } })
-      .then(() => {
-        // eslint-disable-next-line no-unused-expressions
-        openNotificationWithIcon('success', '操作成功');
-        router.go(-1);
-      })
-      .catch(err => {});
-  }
+//修改
+  // function submitData(dataSources) {
+  //   if (id !== '') {
+  //     // 修改
+  //     updateType(dataSources);
+  //     return;
+  //   }
+  //   dataSources.status = 1;
+  //   dataSources.createDate = new Date();
+  //   request({ ...apis.brand.alterBrand, data: { ...dataSources } })
+  //     .then(() => {
+  //       // eslint-disable-next-line no-unused-expressions
+  //       openNotificationWithIcon('success', '操作成功');
+  //       router.go(-1);
+  //     })
+  //     .catch(err => {});
+  // }
 
-  // 修改
-  function updateType(row) {
-    // const { url, method } = apis.buildingType.update
-    // const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(row.buildingTypeId)
-
-    // request({ url: tempUrl, method, data: { ...row } }).then(() => {
-    //   router.go(-1)
-    // })
-    request({ ...apis.buildingType.update, urlData: { id: row.buildingTypeId }, data: { ...row } })
-      .then(() => {
-        // eslint-disable-next-line no-unused-expressions
-        openNotificationWithIcon('success', '操作成功');
-        router.go(-1);
-      })
-      .catch(err => {});
-  }
+  //新增
+  // function updateType(row) {
+  //   request({ ...apis.brand.addBrand, urlData: { id: row.brandId }, data: { ...row } })
+  //     .then(() => {
+  //       // eslint-disable-next-line no-unused-expressions
+  //       openNotificationWithIcon('success', '操作成功');
+  //       router.go(-1);
+  //     })
+  //     .catch(err => {});
+  // }
 
   return (
     <Card>
       <Form {...formItemLayout} onSubmit={handleSubmit}>
       <Form.Item label="开发商名称">
-          {getFieldDecorator('name', {
+          {getFieldDecorator('brandName', {
             rules: [
               {
                 required: true,
@@ -116,17 +147,17 @@ function Edit(props) {
           })(<Input style={{width:200}}/>)}
         </Form.Item>
         <Form.Item label="开发商索引">
-          {getFieldDecorator('ind', {
+          {getFieldDecorator('indexLetter', {
             rules: [{ required: true, message: '请输入开发商索引' }],
           })(<Input style={{width:200}}/>)}
         </Form.Item>
         <Form.Item label="品牌宣传图">
-          {getFieldDecorator('img', {
+          {getFieldDecorator('brandImg', {
             rules: [{ required: true, message: '请上传品牌宣传图' }],
         })(<ImageUploader />)}
         </Form.Item>
         <Form.Item label="开发商简介">
-          {getFieldDecorator('buildingTypeName', {
+          {getFieldDecorator('brandRemark', {
             rules: [{ required: true, message: '请输入开发商简介' }],
           })(<Input.TextArea style={{width:400}} placeholder="120字内的简介"/>)}
         </Form.Item>

src/pages/building/Developers/index.jsx

@@ -1,40 +1,66 @@
-import React, { useMemo, useRef, useCallback, useState } from 'react'
-import {Button} from 'antd'
+import React, { useMemo, useRef, useCallback, useState, useEffect } from 'react'
+import {Button,message} from 'antd'
 import apis from '@/services/apis'
 import AuthButton from '@/components/AuthButton';
 import QueryTable from '@/components/QueryTable'
 import getTableColumns from './tableColumns'
 import { router } from 'umi';
+import { fetch} from '@/utils/request';
+import request from '@/utils/request'
 import getSearchFields from './searchFields'//searchbox
 
 export default (props) => {
   const ref = useRef()
   const [page, setPage] = useState({current: 1, pageSize: 10})
   const toEdit = useCallback((row) => {
-    //
     router.push({
       pathname: '/building/Developers/Edit',
       query: {
-        id: row?.id || undefined,
+        brandId: row?.brandId || undefined,
       },
-    });
+    });            
   }, [])
 
-  const onDelete = useCallback((row) => {}, [])//格式
-  const searchFields = useMemo(getSearchFields, [])//搜索框
+ 
+
+//编辑
+  // const onEdit =useCallback((row,brandId)=>{
+  //   request({
+  //     ...apis.brand.alterBrand,
+  //     urlData: { id: brandId },
+  //     data:{ ...row}
+  // }).then((data) => {
+  //     setNewsData(data)
+  // }).catch((err) => {
+  //   message.error(err.msg || err.message)
+  // })
+  // },[])
 
+//删除
+  const onDelete = useCallback((row,brandId) => {
+    request({ ...apis.brand.deleBrand, urlData: { id: brandId }, data: { ...row, } }).then((data) => {
+      ref.current.reload();//调用ref对象都有current对象
+      message.info('操作成功！')
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }, [])//格式
+  const searchFields = useMemo(getSearchFields, [])//搜索框
+    
   const tableColumns = useMemo(() => {
     return getTableColumns({
-      page,//可无
+      page,//
       onEdit:(e)=>toEdit(e),
       onDelete,
+      // onEdit,
     })
   }, [page])
 
   const actionRender = () => {
     return (
-      //name 名字错误
-      <AuthButton name="admin.tdBuildingType.add" noRight={null}>
+      //name
+      <AuthButton name="admin.brand.addBrand" noRight={null}>
         <Button type="primary" icon="plus" onClick={toEdit} >
           新增
         </Button>
@@ -45,9 +71,9 @@ export default (props) => {
   return (
     <>
       <QueryTable
-      //搜索组件
-        rowKey="buildingId"
-        api={apis.building.getList}
+        ref={ref}//绑定到table
+        rowKey="brandId"
+        api={apis.brand.list}
         columns={tableColumns}
         actionRender={actionRender}
         searchFields={searchFields}

src/pages/building/Developers/searchFields.js

@@ -2,7 +2,7 @@
 export default () => [
 
   {
-    name: 'name',
+    name: 'brandName',
     label: '开发商名称',
     placeholder: '请输入开发商名称',
   },

src/pages/building/Developers/tableColumns.js

@@ -1,53 +1,39 @@
 import { router } from 'umi'
-import { Button, Badge } from 'antd'
+import React, { useState, useEffect } from 'react';
+
+import { Button, Badge, message } from 'antd'
 import moment from 'moment'
 import OperButton from '@/components/OperButton'
 import AuthButton from '@/components/AuthButton'
 import withActions from '@/components/ActionList'
+import { getImgURL } from '@/utils/image';
+import request, { apis } from '@/utils/request'
 
-export default ({page, onEdit, onDelete}) => [
+export default ({page,getBrandData, onEdit, onDelete}) => [
   {
     title: '开发商索引字母',
-    key: '#',
+    dataIndex:'indexLetter',
+    key: 'indexLetter',
     align: 'center',
-    render: (t, r, index) => (page.current - 1) * page.pageSize + index + 1,//可无
   },
   {
     title: '开发商名称',
-    dataIndex: 'name',
-    key: 'name',
+    dataIndex: 'brandName',
+    key: 'brandName',
     align: 'center',
   },
   {
     title: '品牌宣传图',
-    dataIndex: 'image',
-    key: 'image',
+    dataIndex: 'brandImg',
+    key: 'brandImg',
     align: 'center',
-    render: (_, row) => {
-      if (row.image) {
-        return <img src={row.image} width={128} height={72} style={{borderRadius: '4px'}} alt="" />
-      }
-      return null
-    }
+    render:(_,record)=> <img src={getImgURL(record.brandImg)} style={{width:'165px',height:'104px'}}/>,
   },
   {
     title: '简介',
-    dataIndex: 'buildingName',
-    key: 'buildingName',
+    dataIndex: 'brandRemark',
+    key: 'brandRemark',
     align: 'center',
-    // render: (t, row) => (
-    //   <AuthButton name="admin.building.update" noRight={t}>
-    //     <Button
-    //       type="link"
-    //       onClick={() => router.push({
-    //         pathname: '/building/list/add',
-    //         query: {
-    //           id: row.buildingId,
-    //         },
-    //       })}
-    //     >{t}</Button>
-    //   </AuthButton>
-    // )
   },
   {
     title: '操作',
@@ -57,11 +43,11 @@ export default ({page, onEdit, onDelete}) => [
       <AuthButton name="admin.building.public" noRight={null}>
         <OperButton onClick={() => onEdit(row)}>编辑</OperButton>
       </AuthButton>,
-      <AuthButton name="admin.building.delete" noRight={null}>
+      <AuthButton name="admin.brabd.delete" noRight={null}>
         <OperButton.Confirm
           title="确认删除?"
           content="删除之后不可恢复"
-          onClick={() => onDelete(row)}
+          onClick={()=>onDelete(row,row.brandId)}
         >删除</OperButton.Confirm>
       </AuthButton>
     ], {noMargin: true})

src/pages/home/Recommend/index.jsx

@@ -14,22 +14,16 @@ import { fromPairs } from 'lodash';
 import { backgroundColor } from 'echarts/lib/theme/dark';
 
 
-// const a={
-//   /**
-//  *
-//  *
-//  * @param {*} props
-//  * @returns
-//  */
-
-// }
-// let(dataIndex){
-//   render(){
-//     return(
-//       <h1><input type="datetime-local" name="ckassname" id="" /></h1>
-//     )
-//   }
-// }
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+
+
+
 
 function Recommend() {
   const [exportLoding,setExportLoding] = useState(false)
@@ -70,6 +64,9 @@ function Recommend() {
 
     })
   }
+  function back(){
+    window.history.back(-1)
+  }
 
   function download(data) {
     if (!data) {
@@ -165,13 +162,7 @@ function Recommend() {
 
 
  const searchFields=[
-  // {
-  //   name:'builidingId',
-  //   label:'用户',
-  //   placeholder:'选择用户',
-  //   render:()=><BuildSelect style={{width:160}}/>
 
-  // },
   {
     name: 'project',
     label: '意向项目',
@@ -193,12 +184,11 @@ function Recommend() {
     label: '类型',
     placeholder: '类型',
     type: 'select',
-    placeholder:'全部',//错误
     options: [
-      {label: '全部'},
-      {label: '买房',value:1},
-      {label: '租房', value: 2},
-      {label: '海外', value: 3}
+      {label: '全部',value:''},
+      {label: '买房',value: '1'},
+      {label: '租房', value: '2'},
+      {label: '海外', value: '3'}
     ]
   },
   {
@@ -208,10 +198,10 @@ function Recommend() {
     type: 'select',
     placeholder:'全部',//错误
     options: [
-      {label: '全部'},
-      {label: '待回访', value: 0},
-      {label: '已回访', value: 1},
-      {label: '无效', value: 2}
+      {label: '全部',value:''},
+      {label: '待回访', value: '0'},
+      {label: '已回访', value: '1'},
+      {label: '无效', value: '2'}
     ]
   },
   ]
@@ -228,7 +218,7 @@ function Recommend() {
       <QueryTable
           rowKey="recommendCustomer"
           // recommendCustomer
-          api={apis.homeload.houseSchr}
+          api={apis.searchHouse.list}
           searchFields={searchFields}
           columns={columns}
           actionRender={actionRender}

src/pages/staff/Organization/index.jsx

@@ -1,144 +1,140 @@
-import React, { Component } from 'react';
-import { Card, Tree } from 'antd';
-const { DirectoryTree } = Tree;
-
-// function Organization(props) {
-  
-
-
-//   return (
-//     <>
-//      组织架构
-//     </>
-//   );
-// }
-
-
-// export default Organization
-
 
+import React, { Component,useState } from 'react';
+import { Card, Tree,Icon } from 'antd';
+import { render } from 'preact';
+import { turn } from 'cli-table';
+const { DirectoryTree,TreeNode } = Tree;
 const treeData = [
   {
-    title: '江苏XX软件集团',
-    key: '0-0',
-    children: [
-      {
-        title: '南京123电子科技有限公司',
-        key: '0-0-1',
-
-        // isLeaf: true,
-        children: [
-          {
-            title: '秦淮区分公司',
-            key: '0-0-1-0',
-            // isLeaf: true,
-            children: [
-              {
-                title: '制造一区',
-                key: '0-0-1-1',
-                isLeaf: true,
-              },
-              {
-                title: '总裁办公室',
-                key: '0-0-1-2',
-                isLeaf: true,
-              },
-              {
-                title: '工艺部',
-                key: '0-0-1-3',
-                isLeaf: true,
-              },
-              {
-                title: '技术部',
-                key: '0-0-1-4',
-                isLeaf: true,
-              },
-            ]
-          },
-        ]
-      },
-      {
-        title: '苏州￥￥科技股份有限公司',
-        key: '0-0-0',
-        isLeaf: true,
-      },
-      {
-        title: '宿迁ABC电商服务有限公司',
-        key: '0-0-0-1',
-        isLeaf: true,
-      },
-    ],
-  },
-  //---------------
-  {
-    title: '系统管理',
-    key: '0-2',
-    children: [
-      {
-        title: '机器设置',
-        key: '0-2-0',
-        isLeaf: true,
-      },
+    value:'江苏省公安厅',
+    defaultValue:'0',
+    parentKey:'0',
+    isEditable:false,
+    key:'0',
+    children:[
       {
-        title: '散热设置',
-        key: '0-2-1',
-        // isLeaf: true,
-        children:[
-          {
-            title:'一号风扇',
-            key:'0-2-1-0'
-          },
-          {
-            title:'二号风扇',
-            key:'0-2-1-1'
-          },
-        ]
+        value:'南京分局',
+        key:'0-1',
+        defaultValue: "0-1",
+        isEditable: false,
       },
       {
-        title: '广播设置',
-        key: '0-2-2',
-        isLeaf: true,
+        value:'苏州分局',
+        key:'0-2',
+        defaultValue: "0-2",
+        isEditable: false,
       },
     ],
   },
 ];
 
-const Demo = () => {
-  const onSelect = (keys, info) => {
-    console.log('Trigger Select', keys, info);
-  };
 
-  const onExpand = () => {
-    console.log('Trigger Expand');
+const expandedKeyArr=['0'];
+
+
+export default function TreeDemo() {
+  const[data,setData]=useState(treeData)//获取值，及时更新被修改的值。变量
+  const renderTreeNodes=(data)=>{
+    let nodeArr=data.map((item)=>{//遍历数据
+      item.title=(//修改
+        <div style={{display:'flex', minWidth: '100px'}}>
+          <span style={{ flex: 'auto' }}>{item.value}</span>
+          <span style={{ width: '6em', flex: 'none',marginLeft:'20px' }}>
+            {/* 编辑 */}
+            <Icon type="edit" onClick={()=>onDelete(item.key)} /> 
+            {/* 添加 */}
+            <Icon type="diff" onClick={()=>onAdd(item.key)} />
+            {/* 删除 */}
+            <Icon type="delete"  onClick={()=>onEdit(item.key)}/>
+          </span>
+        </div>
+      )
+      if(item.children){//如果有子项就返回下面组件
+        return(
+          <TreeNode title={item.title} key={item.key} dataRef={item}>
+            {renderTreeNodes(item.children)}
+            {/* 重新渲染节点 */}
+          </TreeNode>//title 接收的 ReactNode类型数据 自定义
+        )
+      }
+      //返回
+      return <TreeNode title={item.title} key={item.key} />
+    })
+      return nodeArr
+  };
+//添加
+  const onAdd=(key)=>{
+    // useState 里面数据是不能变的对象。需要slice返回一个新的数组
+    addNode(key.treeData);//添加节点 树形
+    setData(treeData.slice()) //设置 子项
+  }
+  //编辑
+  const onEdit=(key)=>{
+    editNode(key,treeData);
+    setData(treeData.slice());
   };
+  const editNode=(key,data)=>
+    data.forEach((item)=>{
+      if (item.key===key) {
+        item.isEditable=true;//可编辑状态更改
+      }else{
+        item.isEditable=false;
+      }
+      item.value=item.defaultValue;//当某子项处于编辑状态，改变数据，点击其他时候，此项变成不可编辑
+      if (item.children) {
+        editNode(key,item.children);
+      }
+    })  
 
+    //删除
+    const onDelete = (key) => {
+      deleteNode(key, treeData);
+      setData(treeData.slice());
+    };
+    const deleteNode = (key, data) =>
+      data.forEach((item, index) => {
+        if (item.key === key) {
+          data.splice(index, 1);//从某个位置开始删除元素
+          return;
+        } else {
+          if (item.children) {
+            deleteNode(key, item.children);
+          }
+        }
+      });
+
+  const addNode=(key,data)=>
+    data.forEach((item)=>{
+      if(item.key===key){//如果拿到的key相同则判断子项
+        if (item.children) {
+          item.children.push({
+            value:"请输入内容",
+            key:key+Math.random(100),//随机唯一的key
+          });
+        }
+        return;
+      }
+      if (item.children) {
+        addNode(key,item.children)//子项
+      }
+    })
   return (
-    <DirectoryTree
-      multiple
-      defaultExpandAll
-      onSelect={onSelect}
-      onExpand={onExpand}
-      treeData={treeData}
-    />
+    <div>
+      <Card style={{width:'90%'}}>
+        <Tree 
+        switcherIcon={<Icon type="down-square" theme="filled" />}
+        // icon={<Icon type="carry-out" />}
+        style={{paddingLeft:'60px'}} 
+        treeData={treeData}  >
+        {renderTreeNodes(data)}
+        </Tree>
+        {/* 渲染被更新 */}
+      </Card>
+    </div>
   );
-};
+}
+
+
+
 
 
-class Treetest extends Component {
-    // constructor(props) {
-    //     super(props);
-    //     //react定义数据
-    //     this.state = {
-    //     }
-    // }
-    render() {
-        return (
-          <div>
-            <Card style={{width:'60%'}}>
-              <DirectoryTree  treeData={treeData} />
-            </Card>
-          </div>
-        )
-    }
-}
-export default  Treetest;

src/pages/staff/staff/Edit/index.jsx

@@ -234,7 +234,7 @@ const StaffEdit = (props) => {
       value: userData.roleIds,
     },
     {
-      label: '授权项目',
+      label: '授权项目', //改成组织机构
       name: 'buildingId',
       render: <BuildingSelection userData={userData} />,
       value: userData.buildingId,
@@ -306,7 +306,7 @@ const StaffEdit = (props) => {
 
 
   return <Card>
-            <XForm onChange={console.log} onSubmit={handleSubmit} fields={fields.filter(Boolean)} onCancel={() => router.go(-1)}></XForm>
+            <XForm  onSubmit={handleSubmit} fields={fields.filter(Boolean)} onCancel={() => router.go(-1)}></XForm>
 
         </Card>
 }

src/pages/staff/staff/Edit/index1.jsx

@@ -0,0 +1,317 @@
+import React, { useState, useEffect } from 'react';
+
+import { Input, Card, message, Radio, Select, Modal } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import BuildSelect from '@/components/SelectButton/BuildSelect'
+import router from 'umi/router';
+import { FieldTypes, createForm } from '@/components/XForm';
+import Wangedit from '@/components/Wangedit/Wangedit'
+// import channels from './channelList.less';
+// import Tagss from '../components/Tagss.jsx';
+import apis from '@/services/apis';
+import request from '@/utils/request'
+import BuildingSelection from '../components/BuildingSelection'
+
+const { TextArea } = Input;
+const { Option } = Select;
+let consultantChecked = false;
+
+const setExtraData = (data) => {
+  consultantChecked = data.isConsultant
+}
+
+const handleFormValueChange = (props, changedValues, allValues) => {
+    setExtraData(allValues)
+}
+
+const XForm = createForm({ onValuesChange: handleFormValueChange })
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const StaffEdit = (props) => {
+  const userId = props.location.query.userId
+  const [userData, setUserData] = useState({})
+  const [tagData, setTagData] = useState([])
+  const [roleData, setRoleData] = useState([])
+  const [buildData, setBuildData] = useState([])
+  const [visible, setVisible] = useState(false)
+
+  const getTagList = () => {
+    request({ ...apis.staff.taTags, params: { pageNum: 1, pageSize: 999 } }).then((data) => {
+      setTagData(data.records)
+    })
+  }
+
+  const getRoleList = () => {
+    request({ ...apis.role.getRoleList, params: { pageNum: 1, pageSize: 999 } }).then((data) => {
+      console.log(data)
+      setRoleData(data.records)
+    })
+  }
+
+  //获取项目列表
+  const getBuildList = e => {
+    request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).then(data => {
+        setBuildData(data)
+    })
+  }
+
+  // 查询列表
+  const getUserData = (userId) => {
+    request({ ...apis.staff.getTaUser, urlData: { id: userId } }).then((data) => {
+      consultantChecked = data.isConsultant
+      setUserData(data)
+    })
+  }
+
+  if(userData.buildingIds && buildData.length > 0 && !consultantChecked){
+      const newBuildings = userData.buildingIds.filter(x => buildData.filter(it => it.buildingId === x)[0])
+      userData.buildingIds = newBuildings
+  }
+
+  if(userData.roleIds && roleData.length > 0){
+    const newRoleIds = userData.roleIds.filter(x => roleData.filter(it => it.roleId === x)[0])
+      userData.roleIds = newRoleIds
+  }
+
+  useEffect(() => {
+    getTagList();
+    getRoleList();
+    getBuildList();
+    if (userId) {
+      getUserData(userId);
+    }
+  }, [])
+
+  const tagsChange = (value) => {
+    console.log(`selected ${value}`);
+  }
+
+  const handleSubmit = val => {
+    if (userId) {
+      request({ ...apis.staff.updateTaUser, urlData: { id: userId }, data: val, }).then((data) => {
+        console.log(data, "tauser")
+        message.info("保存成功")
+        router.go(-1)
+      }).catch(error => {
+        // message.info(error.message)
+      })
+    } else {
+      request({ ...apis.staff.addTaUser, data: val, }).then((data) => {
+        console.log(data, "tauser")
+        message.info("保存成功")
+        router.go(-1)
+      }).catch(error => {
+        // message.info(error.message)
+      })
+    }
+  }
+
+  const photoBeforeUpload = (file) => {
+    // const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+    // if (!isJpgOrPng) {
+    //   message.error('请上传 JPG/PNG 格式的图片!');
+    // }
+    console.log(file.size, file.size / 1024)
+    const isLt100k = (file.size / 1024) < 100;
+    if (!isLt100k) {
+      message.error('请上传小于100k的图片!');
+    }
+    return isLt100k;
+  }
+
+  //授权项目改变
+  const consultantBuildingChange =(e) => {
+    if(userData.isConsultant){
+      request({ ...apis.staff.check, params: { userId: userData.userId, personId: userData.consultantPersonId, buildingId: userData.buildingId } }).then(res => {
+        if(res.length > 0){
+          Modal.confirm({
+            title: '此置业顾问下有私客，是否转移私客？',
+            okText: '确认',
+            cancelText: '取消',
+            onOk () {
+              setVisible(true)
+            },
+          });
+        }
+     })
+    }
+  }
+
+   //迁移私客成功回调
+   const moveSuccess = (e) => {
+    setVisible(false)
+  }
+
+  const fields = [
+
+
+    
+    // {
+    //   label: '姓名',
+    //   name: 'userName',
+    //   type: FieldTypes.Text,
+    //   value: userData.userName,
+    //   rules: [
+    //     { required: true, message: '请输入姓名' },
+    //   ]
+    // },
+    // {
+    //   label: '公司',
+    //   name: 'orgName',
+    //   type: FieldTypes.Text,
+    //   placeholder: '请输入公司名称',
+    //   value: userData.orgName,
+    //   rules: [
+    //     { required: true, message: '请输入公司名称' },
+    //   ]
+    // },
+    // {
+    //   label: '部门',
+    //   name: 'department',
+    //   type: FieldTypes.Text,
+    //   placeholder: '请输入部门',
+    //   value: userData.department,
+    //   rules: [
+    //     { required: true, message: '请输入部门' },
+    //   ]
+    // },
+    // {
+    //   label: '职位',
+    //   name: 'position',
+    //   type: FieldTypes.Text,
+    //   placeholder: '请输入职位',
+    //   value: userData.position,
+    //   rules: [
+    //     { required: true, message: '请输入职位' },
+    //   ]
+    // },
+    // {
+    //   label: '是否置业顾问',
+    //   name: 'isConsultant',
+    //   type: FieldTypes.Switch,
+    //   value: userData.isConsultant,
+    //   props: {disabled: userData.isConsultant},
+    // },
+    // {
+    //   label: '电话',
+    //   name: 'phone',
+    //   type: FieldTypes.Text,
+    //   placeholder: '请输入电话号码',
+    //   value: userData.phone,
+    //   rules: [
+    //     {
+    //         required: true,
+    //         pattern: new RegExp('^1[0-9]{10}$'),
+    //         message: '请输入正确的电话号码',
+    //     },
+    //   ]
+    // },
+    // {
+    //   label: '登录名',
+    //   name: 'loginName',
+    //   type: FieldTypes.Text,
+    //   placeholder: '请输入登录名',
+    //   value: userData.loginName,
+    //   // hidden: () => consultantChecked,
+    //   help: '默认密码：123456',
+    // },
+    // {
+    //   label: '角色',
+    //   name: 'roleIds',
+    //   render: <Select
+    //     mode="multiple"
+    //     style={{ width: '100%' }}
+    //     placeholder="请选择标签"
+    //     onChange={tagsChange} >
+    //     {roleData.map(item => (
+    //       <Select.Option key={item.roleId} value={item.roleId}>
+    //         {item.roleName}
+    //       </Select.Option>
+    //     ))}
+    //   </Select>,
+    //   value: userData.roleIds,
+    // },
+    // {
+    //   label: '授权项目',
+    //   name: 'buildingId',
+    //   render: <BuildingSelection userData={userData} />,
+    //   value: userData.buildingId,
+    //   hidden: () => !consultantChecked,
+    //   rules: [
+    //     { required: true, message: '请选择授权项目' },
+    //   ]
+    // },
+    // {
+    //   label: '授权项目',
+    //   name: 'buildingIds',
+    //   render: <Select
+    //     mode="multiple"
+    //     showSearch
+    //     style={{ width: '100%' }}
+    //     placeholder="请选择授权项目"
+    //     filterOption={(input, option) =>
+    //       option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    //     }
+    //     >
+    //     {buildData.map(item => (
+    //       <Select.Option key={item.buildingId} value={item.buildingId}>
+    //         {item.buildingName}
+    //       </Select.Option>
+    //     ))}
+    //   </Select>,
+    //   value: userData.buildingIds,
+    //   hidden: () => consultantChecked,
+    //   rules: [
+    //     { required: true, message: '请选择授权项目' },
+    //   ]
+    // },
+    // {
+    //   label: '置业顾问头像',
+    //   name: 'photo',
+    //   type: FieldTypes.ImageUploader,
+    //   extra: '建议图片尺寸：320*320px，比例1:1,格式：jpg，用于置业顾问头像,限制大小：100k',
+    //   value: userData.photo,
+    //   beforeUpload: (e) => photoBeforeUpload(e),
+    //   rules: [
+    //     { required: true, message: '请选择头像' },
+    //   ]
+    // },
+    // {
+    //   label: '简介',
+    //   name: 'description',
+    //   render: <TextArea  ></TextArea>,
+    //   value: userData.description
+    //   // className={channels.inpuitTxt}
+    // },
+    // {
+    //   label: '状态',
+    //   name: 'status',
+    //   render: <Radio.Group initialValue="1" buttonStyle="solid">
+    //     <Radio.Button value="9">禁用</Radio.Button>
+    //     <Radio.Button value="1">启用</Radio.Button>
+    //   </Radio.Group>,
+    //   value: userData.status != null ? userData.status.toString() : "1"
+    // },
+    // {
+    //   label: '权重',
+    //   name: 'weight',
+    //   type: FieldTypes.Number,
+    //   render: <Input type="number" style={{ width: 150}} />,
+    //   value: userData.weight,
+    //   help: '数字越大越靠前',
+    // },
+  ]
+
+
+  return <Card>
+            <XForm  onSubmit={handleSubmit} fields={fields} onCancel={() => router.go(-1)}></XForm>
+
+        </Card>
+}
+
+export default StaffEdit

src/services/apis.js

@@ -44,6 +44,42 @@ export default {
       logout: true,
       action: 'signout',
     },
+  },
+  //品牌开发商
+  brand:{
+    //查询
+    list:{
+      method:'GET',
+      url:`${prefix}/brand`,
+      action:'admin.brand.get'
+    },
+    //添加
+    addBrand:{
+      method:'POST',
+      url:`${prefix}/brand`,
+      action:'admin.brand.post'
+    },
+    //shanchu
+    deleBrand:{
+      method:'DELETE',
+      url:`${prefix}/brand/:id`,
+      action:'admin.brand.id.delete',
+    },
+    // 获取详情数据
+    getBrand:{
+      method:'GET',
+      url:`${prefix}/brand/:id`,
+      action:'admin.brand.id.get',
+    },
+    //修改
+    alterBrand:{
+      method:'PUT',
+      url:`${prefix}/brand/:id`,
+      action:'admin.brand.id.put'
+    }
+    
+    
+
   },
   building: {
     getList: {
@@ -208,15 +244,33 @@ export default {
       action: 'admin.taNewsType.get',
     }
   },
-  //预加 帮我找房
-  homeload: {
-    houseSchr:{
+  // 帮我找房
+  searchHouse: {
+    //查询
+    list:{
       method: 'GET',
-      url: `${prefix}/home/Recommend/searchHouse`,
-      action: 'admin.home.Recommend.searchHouse.get',
-      // action: 'admin.customer.recommend.recommender.get',
-
+      url: `${prefix}/searchHouse`,
+      action: 'admin.searchHouse.get',
+    },
+    //根据ID查询
+    IdHouse:{
+      method:'GET',
+      url:`${prefix}/searchHouse/:id`,
+      action:'admin.searchHouse.id.get',  
+    },
+    //修改
+    alterHouse:{
+      method:'PUT',
+      url:`${prefix}/searchHouse/:id`,
+      action:'admin.searchHouse.id.put',
+    },
+    //回访
+    savingHouse:{
+      method:'POST',
+      url:`${prefix}/searchHouse`,
+      action:''
     }
+
   },
 
   customer: {
@@ -311,12 +365,6 @@ export default {
       action: 'admin.customer.recommend.recommender.export.get',
     },
 
-    // //recommender
-    // homeRecommendrecommenderExport: { // 导出数据（home   推荐客户 预加）
-    //   method: 'GET',
-    //   url: `${prefix}/home/recommend/recommender/export`,
-    //   action: 'admin.home.recommend.recommender.export.get',
-    // },
     customerRecommendReportExport: { // 导出数据（报备客户）
       method: 'GET',
       url: `${prefix}/customer/recommend/report/export`,

src/utils/request.js

@@ -68,6 +68,7 @@ request.interceptors.request.use((url, options) => {
 });
 
 request.interceptors.response.use(async (response, options) => {
+  
   if (response && response.status) {
     if (response.status != 200) {
       const errorText = codeMessage[response.status] || response.statusText;
@@ -81,6 +82,7 @@ request.interceptors.response.use(async (response, options) => {
     } else {
       // console.log('response.headers: ', response.headers)
       // console.log('response.headers.Content-Type: ', response.headers.get('Content-Type'))
+      console.log(response,'response')
       if (response.headers.get('Content-Type') === 'application/octet-stream;charset=utf-8') {
         return await response.clone().blob();
       }
@@ -89,8 +91,9 @@ request.interceptors.response.use(async (response, options) => {
       if (response.url.indexOf('gaode_amap') !== -1) {
         return await response.clone().json();
       }
-
+      console.log(response,'response')
       const { code, data, message } = await response.clone().json();
+     
       if (code != 1000) {
         if (code === 1001) {
           // notification.error({
@@ -99,6 +102,7 @@ request.interceptors.response.use(async (response, options) => {
           // });
           // throw new Error('请登录系统');
         } else {
+          console.log(code, data, message ,'code, data, message ')
           notification.error({
             message: message || '请求错误',
             // description: message,