fi'x

config/routes.js

@@ -201,6 +201,24 @@ export default [
                 hideInMenu: true,
                 component: './Live/LiveActivity/add',
               },
+
+              {
+                path: '/Live/video/List',
+                name: '视频',
+                component: './Live/video/List',
+              },
+              {
+                path: '/Live/video/Edit',
+                name: '编辑视频',
+                hideInMenu: true,
+                component: './Live/video/Edit',
+              },
+              // {
+              //   path: '/Live/video/add',
+              //   name: '新增活动',
+              //   hideInMenu: true,
+              //   component: './Live/video/add',
+              // },
               
               // {
               //   path: '/staff/Staff/Edit',

src/components/Share/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import { Button, Form, Input } from 'antd'
+import { Button, Form, Input, message } from 'antd'
 import ImageUpload from '@/components/XForm/ImageUpload'
 import { fetch, apis } from '@/utils/request'
 
@@ -33,8 +33,8 @@ const ShareForm = (props) => {
         return
       }
 
-      const request = formData.shareContentId ? updateData : saveData
-      const urlData = formData.shareContentId ? { id: formData.shareContentId } : undefined
+      const request = formData?.shareContentId ? updateData : saveData
+      const urlData = formData?.shareContentId ? { id: formData.shareContentId } : undefined
       const data = {
         targetId,
         shareContentType: targetType,

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

@@ -0,0 +1,181 @@
+import React, { useState, useEffect } from 'react';
+import {
+  Form,
+  Input,
+  Button,
+  Icon,
+  Select,
+  Card,
+  Radio,
+  DatePicker,
+  message,
+  Upload,
+  InputNumber,
+} from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import moment from 'moment';
+import router from 'umi/router';
+import FileUpload from '@/components/XForm/FileUpload';
+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 CitySelect3 from '@/components/SelectButton/CitySelect3';
+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 = '';
+
+const header = props => {
+  console.log(props);
+
+  const { id } = props.location.query;
+
+  const [data, setData] = useState({});
+
+  // 查询详情
+  const getData = () => {
+    request({ ...apis.video.getDetail, urlData: { id } }).then(data => {
+      data.videoUrl = [data.videoUrl];
+      setData(data);
+    });
+  };
+
+  useEffect(() => {
+    if (id) {
+      getData(id);
+    }
+  }, []);
+
+  const cancelPage = () => {
+    router.go('-1');
+  };
+
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      console.log(values, 'values');
+      if (!err) {
+        values.videoUrl = values?.videoUrl[0];
+        if (id) {
+          request({
+            ...apis.video.updata,
+            urlData: { id: id },
+            data: values,
+          })
+            .then(data => {
+              message.info('保存成功');
+              cancelPage();
+            })
+            .catch(err => {
+              message.info(err.msg || err.message);
+            });
+        } else {
+          request({
+            ...apis.video.save,
+            data: values,
+          })
+            .then(data => {
+              message.info('保存成功');
+              cancelPage();
+            })
+            .catch(err => {
+              message.info(err.msg || err.message);
+            });
+        }
+      }
+    });
+  }
+
+  // 视频文件上传前 回调
+  const fileUploadBeforeUpload = (file, fileList) => {
+    return new Promise((resolve, reject) => {
+      if (file.type === 'video/mp4' || file.type === '.mp4') {
+        // setVideoImage(true)
+        resolve(file);
+      } else {
+        notification.error({ message: '项目视频，仅支持MP4格式' });
+        reject();
+      }
+    });
+  };
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <Card>
+      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+        <Form.Item label="所属城市">
+          {getFieldDecorator('cityId', {
+            initialValue: data.cityId,
+            rules: [{ required: true, message: ' 请输入所属城市' }],
+          })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')} />)}
+        </Form.Item>
+
+        <Form.Item label="所属楼盘">
+          {getFieldDecorator('buildingId', {
+            initialValue: data.buildingId,
+          })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')} />)}
+        </Form.Item>
+
+        <Form.Item label="主图" help="建议尺寸：750px*600px，比例5:4，格式：jpg，用于：列表和详情">
+          {getFieldDecorator('videImg', {
+            initialValue: data.videImg,
+            rules: [{ required: true, message: '请上传主图' }],
+          })(<ImageUpload />)}
+        </Form.Item>
+
+        <Form.Item label="视频标题">
+          {getFieldDecorator('name', {
+            initialValue: data.name,
+            rules: [{ required: true, message: '请输入视频标题' }],
+          })(<Input maxLength={20} placeholder="请输入视频标题" />)}
+        </Form.Item>
+
+        <Form.Item label="简介">
+          {getFieldDecorator('remark', {
+            initialValue: data.remark,
+            rules: [{ required: true, message: '请输入简介' }],
+          })(<Input.TextArea row={4} />)}
+        </Form.Item>
+
+        <Form.Item label="视频">
+          {getFieldDecorator('videoUrl', {
+            initialValue: data.videoUrl || null,
+            rules: [{ required: true, message: '请上传视频' }],
+          })(
+            <FileUpload
+              accept=".mp4"
+              beforeUpload={fileUploadBeforeUpload}
+              //   label="上传视频"
+              size={1}
+            />,
+          )}
+        </Form.Item>
+
+        <Form.Item label="权重">
+          {getFieldDecorator('weight', {
+            initialValue: data.weight,
+            rules: [{ required: true, message: '请设置权重' }],
+          })(<InputNumber placeholder="权重越大越靠前" style={{ width: '150px' }} />)}
+        </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>
+    </Card>
+  );
+};
+
+const VideoEdit = Form.create({ name: 'header' })(header);
+
+export default VideoEdit;

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

@@ -0,0 +1,179 @@
+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 apis from '@/services/apis';
+import request from '@/utils/request';
+import QueryTable from '@/components/QueryTable';
+import { getImgURL } from '@/utils/image';
+import OperButton from '@/components/OperButton';
+
+const Video = props => {
+  const ref = useRef();
+
+  // 跳转到编辑
+  const toVideoEdit = row => {
+    router.push({
+      pathname: '/Live/video/Edit',
+      query: {
+        id: row?.videoId,
+      },
+    });
+  };
+
+
+  const onPublish = row => {
+    const buidingStatus = row.status === 1 ? 2 : 1;
+    request({ ...apis.video.publish, urlData: { id: row.videoId } })
+      .then(() => {
+        message.success( '操作成功');
+        // setLoading(false);
+        ref.current.reload();
+      })
+      .catch(err => {
+        console.error(err);
+        message.error( '操作失败');
+      });
+  };
+
+  const onDelete = row => {
+
+    request({ ...apis.video.delete, urlData: { id: row.videoId } })
+      .then(() => {
+        message.success( '删除成功');
+        // setLoading(false);
+        ref.current.reload();
+      })
+      .catch(err => {
+        console.error(err);
+        message.error( '操作失败');
+      });
+  };
+
+  const searchFields = [
+    {
+      name: 'title',
+      label: '视频标题',
+      placeholder: '请输入标题',
+    },
+  ];
+
+  const columns = [
+    {
+      title: '视频标题',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+      width: '20%',
+      render: (x, row) => (
+        <Navigate onClick={() => toVideoEdit(row)}>
+          <Typography.Text ellipsis>{x}</Typography.Text>
+        </Navigate>
+      ),
+    },
+    {
+      title: '视频主图',
+      dataIndex: 'videImg',
+      key: 'videImg',
+      align: 'center',
+      render: (x, row) => (
+        <img src={getImgURL(x)} width={128} height={72} style={{ borderRadius: '4px' }} alt="" />
+      ),
+    },
+
+    {
+      title: '阅读人数',
+      dataIndex: 'lookNum',
+      key: 'lookNum',
+      align: 'center',
+    },
+    {
+      title: '归属楼盘',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+    },
+
+    {
+      title: '权重',
+      dataIndex: 'weight',
+      key: 'weight',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: withActions((x, row) => [
+        <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
+          <OperButton onClick={() => toVideoEdit(row)}>编辑</OperButton>
+          {/* <EditIcon
+        type="edit"
+        text="编辑"
+        onClick={() => toSignupActivityEdit(row.dynamicId, row.count)}
+      /> */}
+        </AuthButton>,
+
+        <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
+          <OperButton onClick={() => onPublish(row)}>
+            {row.isPublish ? '取消发布' : '发布'}
+          </OperButton>
+          {/* <EditIcon
+            type={row.isPublish ? 'cancel' : 'publish'}
+            text={row.isPublish ? '取消发布' : '发布'}
+            onClick={() => sendOrPublicDynamic(row)}
+          /> */}
+        </AuthButton>,
+
+        <AuthButton name="admin.building.delete" noRight={null}>
+          <OperButton.Confirm
+            title="确认删除?"
+            content="删除之后不可恢复"
+            onClick={() => onDelete(row)}
+          >
+            删除
+          </OperButton.Confirm>
+        </AuthButton>,
+      ]),
+    },
+  ];
+
+  const actionRender = () => {
+    return (
+      <Button type="primary" icon="plus" onClick={() => toVideoEdit()}>
+        新增
+      </Button>
+    );
+  };
+
+  return (
+    <QueryTable
+      ref={ref}
+      rowKey="videoId"
+      api={apis.video.list}
+      searchFields={searchFields}
+      columns={columns}
+      actionRender={actionRender}
+      // onPageChange={(pg) => setPage(pg)}
+    />
+  );
+};
+
+export default Video;

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

@@ -90,7 +90,7 @@ const BasicForm = props => {
           values.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
         }
 
-        console.log('submit data --->', values);
+        values.type = type
         if (dynamicId) {
           const checks = checkTime();
           if (checks != true) {
@@ -103,12 +103,12 @@ const BasicForm = props => {
             message.info('活动人数必须大于已报名人数');
             return;
           }
-          values.type = type
+          
           values.dynamicId = dynamicId;
           request({ ...apis.activity.update, data: values })
             .then(data => {
               message.info('保存成功');
-              // router.go(-1)
+              router.go(-1)
             })
             .catch(err => {
               message.info(err.msg || err.message);
@@ -117,13 +117,7 @@ const BasicForm = props => {
           request({ ...apis.activity.add, data: { ...values } })
             .then(data => {
               message.info('保存成功');
-              router.push({
-                pathname: '/activity/editActivity',
-                query: {
-                  dynamicId: data.dynamicId,
-                },
-              });
-              // router.go(-1)
+              router.go(-1)
             })
             .catch(err => {
               message.info(err.msg || err.message);
@@ -133,20 +127,7 @@ const BasicForm = props => {
     });
   };
   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;

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

@@ -1,524 +0,0 @@
-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.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/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/SignupActivity/edit/index.jsx

@@ -1,9 +1,9 @@
 import React, { useState } from 'react';
 import { Radio, Card } from 'antd';
 import Basic from './Basic';
-import Poster from './Poster';
-import Share from './Share';
-
+// import Poster from './Poster';
+import Share from '@/components/Share';
+import Poster from '@/components/Poster'
 const type= 'dymic'
 /**
  *
@@ -14,7 +14,7 @@ const type= 'dymic'
 const Edit = props => {
   const [tab, changeTab] = useState('basic');
   const { dynamicId } = props.location.query;
-
+  const target = { id:dynamicId, type: 'activity' }
   return (
     <Card>
       <div>
@@ -26,8 +26,8 @@ const Edit = props => {
       </div>
       <div>
         {tab === 'basic' && <Basic dynamicId={dynamicId} type={type}/>}
-        {tab === 'poster' && <Poster dynamicId={dynamicId} />}
-        {tab === 'share' && <Share dynamicId={dynamicId} />}
+        {tab === 'poster' && <Poster target={target} />}
+        {tab === 'share' && <Share target={target} />}
       </div>
     </Card>
   );

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

@@ -1,524 +0,0 @@
-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.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/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/groupRoomActivity/edit/index.jsx

@@ -1,8 +1,11 @@
 import React, { useState } from 'react';
 import { Radio, Card } from 'antd';
 import Basic from './Basic';
-import Poster from './Poster';
-import Share from './Share';
+// import Poster from './Poster';
+import Share from '@/components/Share';
+import Poster from '@/components/Poster'
+
+const type= 'house'
 /**
  *
  *
@@ -12,7 +15,7 @@ import Share from './Share';
 const Edit = props => {
   const [tab, changeTab] = useState('basic');
   const { dynamicId } = props.location.query;
-
+  const target = { id:dynamicId, type: 'activity' }
   return (
     <Card>
       <div>
@@ -23,9 +26,9 @@ const Edit = props => {
         </Radio.Group>
       </div>
       <div>
-        {tab === 'basic' && <Basic dynamicId={dynamicId} />}
-        {tab === 'poster' && <Poster dynamicId={dynamicId} />}
-        {tab === 'share' && <Share dynamicId={dynamicId} />}
+        {tab === 'basic' && <Basic dynamicId={dynamicId} type={type}/>}
+        {tab === 'poster' && <Poster target={target} />}
+        {tab === 'share' && <Share target={target} />}
       </div>
     </Card>
   );

src/pages/activity/groupRoomActivity/index.jsx

@@ -24,6 +24,8 @@ import apis from '@/services/apis';
 import request from '@/utils/request';
 import QueryTable from '@/components/QueryTable';
 
+const type= 'house'
+
 const GroupRoomActivity = props => {
   const ref = useRef();
 
@@ -54,9 +56,9 @@ const GroupRoomActivity = props => {
     },
   ];
 
-  const toGroupRoomActivityDetail = dynamicId => () => {
+  const toSignupActivityDetail = dynamicId => () => {
     router.push({
-      pathname: '/activity/groupRoomActivity/detail',
+      pathname: '/activity/SignupActivity/detail',
       query: {
         dynamicId,
       },
@@ -64,9 +66,9 @@ const GroupRoomActivity = props => {
   };
 
   // 跳转到编辑
-  const toGroupRoomActivityEdit = dynamicId => {
+  const toSignupActivityEdit = dynamicId => {
     router.push({
-      pathname: '/activity/groupRoomActivity/edit',
+      pathname: '/activity/SignupActivity/edit',
       query: {
         dynamicId,
       },
@@ -173,7 +175,7 @@ const GroupRoomActivity = props => {
 
   const getJoinPeople = dynamicId => () => {
     router.push({
-      pathname: '/activity/groupRoomActivity/registrationRecord',
+      pathname: '/activity/SignupActivity/registrationRecord',
       query: {
         dynamicId,
       },
@@ -188,7 +190,7 @@ const GroupRoomActivity = props => {
       align: 'center',
       width: '20%',
       render: (x, row) => (
-        <Navigate onClick={toGroupRoomActivityDetail(row.dynamicId)}>
+        <Navigate onClick={toSignupActivityDetail(row.dynamicId)}>
           <Typography.Text ellipsis>{row.title}</Typography.Text>
         </Navigate>
       ),
@@ -264,7 +266,7 @@ const GroupRoomActivity = props => {
           />
         </AuthButton>,
 
-        // //   <EditIcon type="look" text="查看详情" onClick={toGroupRoomActivityDetail(row.dynamicId)} />,
+        // //   <EditIcon type="look" text="查看详情" onClick={toSignupActivityDetail(row.dynamicId)} />,
 
         row.activityStatus === 0 ? (
           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
@@ -295,7 +297,7 @@ const GroupRoomActivity = props => {
             <EditIcon
               type="edit"
               text="编辑"
-              onClick={() => toGroupRoomActivityEdit(row.dynamicId, row.count)}
+              onClick={() => toSignupActivityEdit(row.dynamicId, row.count)}
             />
           </AuthButton>
         ) : null,
@@ -305,7 +307,7 @@ const GroupRoomActivity = props => {
 
   const actionRender = () => {
     return (
-      <Button type="primary" icon="plus" onClick={() => toGroupRoomActivityEdit()}>
+      <Button type="primary" icon="plus" onClick={() => toSignupActivityEdit()}>
         新增
       </Button>
     );
@@ -320,6 +322,7 @@ const GroupRoomActivity = props => {
       columns={columns}
       postData={data => {
         data.time && (data.time = `${moment(data.time).format('YYYY-MM-DDT00:00:00.000')}Z`);
+        data.type=type
         return data;
       }}
       actionRender={actionRender}

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

@@ -1,524 +0,0 @@
-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

@@ -1,8 +1,11 @@
 import React, { useState } from 'react';
 import { Radio, Card } from 'antd';
 import Basic from './Basic';
-import Poster from './Poster';
-import Share from './Share';
+// import Poster from './Poster';
+import Share from '@/components/Share';
+import Poster from '@/components/Poster'
+
+const type= 'look'
 /**
  *
  *
@@ -12,7 +15,7 @@ import Share from './Share';
 const Edit = props => {
   const [tab, changeTab] = useState('basic');
   const { dynamicId } = props.location.query;
-
+  const target = { id:dynamicId, type: 'activity' }
   return (
     <Card>
       <div>
@@ -23,9 +26,9 @@ const Edit = props => {
         </Radio.Group>
       </div>
       <div>
-        {tab === 'basic' && <Basic dynamicId={dynamicId} />}
-        {tab === 'poster' && <Poster dynamicId={dynamicId} />}
-        {tab === 'share' && <Share dynamicId={dynamicId} />}
+        {tab === 'basic' && <Basic dynamicId={dynamicId} type={type}/>}
+        {tab === 'poster' && <Poster target={target} />}
+        {tab === 'share' && <Share target={target} />}
       </div>
     </Card>
   );

src/pages/activity/lookHouseActivity/index.jsx

@@ -24,6 +24,8 @@ import apis from '@/services/apis';
 import request from '@/utils/request';
 import QueryTable from '@/components/QueryTable';
 
+const type= 'look'
+
 const LookHouseActivity = props => {
   const ref = useRef();
 
@@ -54,9 +56,9 @@ const LookHouseActivity = props => {
     },
   ];
 
-  const toLookHouseActivityDetail = dynamicId => () => {
+  const toSignupActivityDetail = dynamicId => () => {
     router.push({
-      pathname: '/activity/lookHouseActivity/detail',
+      pathname: '/activity/SignupActivity/detail',
       query: {
         dynamicId,
       },
@@ -64,9 +66,9 @@ const LookHouseActivity = props => {
   };
 
   // 跳转到编辑
-  const toLookHouseActivityEdit = dynamicId => {
+  const toSignupActivityEdit = dynamicId => {
     router.push({
-      pathname: '/activity/lookHouseActivity/edit',
+      pathname: '/activity/SignupActivity/edit',
       query: {
         dynamicId,
       },
@@ -173,7 +175,7 @@ const LookHouseActivity = props => {
 
   const getJoinPeople = dynamicId => () => {
     router.push({
-      pathname: '/activity/lookHouseActivity/registrationRecord',
+      pathname: '/activity/SignupActivity/registrationRecord',
       query: {
         dynamicId,
       },
@@ -188,7 +190,7 @@ const LookHouseActivity = props => {
       align: 'center',
       width: '20%',
       render: (x, row) => (
-        <Navigate onClick={toLookHouseActivityDetail(row.dynamicId)}>
+        <Navigate onClick={toSignupActivityDetail(row.dynamicId)}>
           <Typography.Text ellipsis>{row.title}</Typography.Text>
         </Navigate>
       ),
@@ -264,7 +266,7 @@ const LookHouseActivity = props => {
           />
         </AuthButton>,
 
-        // //   <EditIcon type="look" text="查看详情" onClick={toLookHouseActivityDetail(row.dynamicId)} />,
+        // //   <EditIcon type="look" text="查看详情" onClick={toSignupActivityDetail(row.dynamicId)} />,
 
         row.activityStatus === 0 ? (
           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
@@ -295,7 +297,7 @@ const LookHouseActivity = props => {
             <EditIcon
               type="edit"
               text="编辑"
-              onClick={() => toLookHouseActivityEdit(row.dynamicId, row.count)}
+              onClick={() => toSignupActivityEdit(row.dynamicId, row.count)}
             />
           </AuthButton>
         ) : null,
@@ -305,7 +307,7 @@ const LookHouseActivity = props => {
 
   const actionRender = () => {
     return (
-      <Button type="primary" icon="plus" onClick={() => toLookHouseActivityEdit()}>
+      <Button type="primary" icon="plus" onClick={() => toSignupActivityEdit()}>
         新增
       </Button>
     );
@@ -320,6 +322,7 @@ const LookHouseActivity = props => {
       columns={columns}
       postData={data => {
         data.time && (data.time = `${moment(data.time).format('YYYY-MM-DDT00:00:00.000')}Z`);
+        data.type=type
         return data;
       }}
       actionRender={actionRender}

src/pages/news/list/Edit.jsx

@@ -1,25 +1,16 @@
-import React, { useMemo, useRef, useEffect, useState } from 'react';
+import React from 'react';
 // import { PageHeaderWrapper } from '@ant-design/pro-layout'
-import { Button, notification, Spin, Modal, message, Card, Tabs } from 'antd';
-import { router } from 'umi';
-import QueryTable from '@/components/QueryTable';
-import request from '@/utils/request';
-import apis from '@/services/apis';
+import { Card, Tabs } from 'antd';
 import Basic from './compents/Basic'
-import Poster from './compents/Poster'
-import Share from './compents/Share'
-import SelectCity from '@/components/SelectButton/CitySelect';
-import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect';
-import BuildSelect from '@/components/SelectButton/BuildSelect';
-import moment from 'moment';
-import OperButton from '@/components/OperButton';
-import AuthButton from '@/components/AuthButton';
-import withActions from '@/components/ActionList';
+import Share from '@/components/Share';
+import Poster from '@/components/Poster'
 
 const { TabPane } = Tabs;
 
 export default props => {
     const newsId = props.location.query.newsId
+
+    const target = { id:newsId, type: 'news' }
 //   const [dynamicData, setDynamicData] = useState({});
 
 //   useEffect(() => {
@@ -53,10 +44,11 @@ export default props => {
         </TabPane>
 
         <TabPane tab="海报图片" key="2">
-        <Poster newsId={newsId} />
+        <Poster target={target} />
+      
         </TabPane>
         <TabPane tab="分享设置" key="3">
-        <Share newsId={newsId} />
+        <Share target={target} />
         </TabPane>
       </Tabs>
     </Card>

src/services/apis.js

@@ -201,7 +201,6 @@ export default {
       method: 'DELETE',
       action: 'admin.marketing.id.delete',
     },
-
   },
   buildingType: {
     getList: {
@@ -2170,4 +2169,39 @@ export default {
       action: 'admin.institution.list.get',
     },
   },
+
+  // 视频
+  video: {
+    list: {
+      method: 'GET',
+      url: `${prefix}/video`,
+      action: 'admin.video.get',
+    },
+    getDetail: {
+      method: 'GET',
+      url: `${prefix}/video/:id`,
+      action: 'admin.video.get.id',
+    },
+    save: {
+      method: 'POST',
+      url: `${prefix}/video`,
+      action: 'admin.video.post',
+    },
+    updata: {
+      method: 'PUT',
+      url: `${prefix}/video/:id`,
+      action: 'admin.video.id.put',
+    },
+    publish: {
+      method: 'PUT',
+      url: `${prefix}/publish/:id`,
+      action: 'admin.publish.id.put',
+    },
+    delete: {
+      method: 'DELETE',
+      url: `${prefix}/video/:id`,
+      action: 'admin.publish.id.put',
+    },
+   
+  },
 };