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

config/routes.js

@@ -266,7 +266,7 @@ export default [
 
               {
                 path: '/activity/lookHouseActivity',
-                name: '看房团',
+                name: '一键带看',
                 component: './activity/lookHouseActivity',
               },
               {

src/components/Poster/Form.jsx

@@ -37,8 +37,8 @@ const PosterForm = (props) => {
         return
       }
 
-      const request = formData.posterId ? updateData : saveData
-      const urlData = formData.posterId ? { id: formData.posterId } : undefined
+      const request = formData?.posterId ? updateData : saveData
+      const urlData = formData?.posterId ? { id: formData.posterId } : undefined
       const data = {
         targetId,
         targetType,

src/pages/activity/SignupActivity/detail.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Card, Radio, DatePicker, message, Upload } from 'antd';
+import { Form, Input, Button, Tabs, Select, Card, Radio, DatePicker, message, Upload } from 'antd';
 
 import apis from '@/services/apis';
 import moment from 'moment';
@@ -17,12 +17,11 @@ import { getImgURL } from '@/utils/image';
 import Share from '@/components/Share';
 import Poster from '@/components/Poster';
 
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-const { TextArea } = Input;
+const { TabPane } = Tabs
 
 const formItemLayout = {
-  labelCol: { span: 6 },
-  wrapperCol: { span: 14 },
+  labelCol: { span: 4 },
+  wrapperCol: { span: 18 },
 };
 
 const cancelPage = () => {
@@ -110,7 +109,7 @@ const BasicForm = props => {
   const { getFieldDecorator } = props.form;
   return (
     <>
-      <Form {...formItemLayout} onSubmit={handleSubmit}>
+      <Form {...formItemLayout} onSubmit={handleSubmit} style={{maxWidth: '1000px'}}>
         <Form.Item label="所属项目">
           {getFieldDecorator('buildingId', {
             initialValue: detailData.buildingId,
@@ -122,12 +121,12 @@ const BasicForm = props => {
             ],
           })(<BuildSelect disabled />)}
         </Form.Item>
-        <Form.Item label="活动封面图1">
+        <Form.Item label="活动封面图">
           <img src={getImgURL(detailData.listImgUrl)} height="210px" width="375px" />
         </Form.Item>
-        <Form.Item label="活动封面图2">
+        {/* <Form.Item label="活动封面图2">
           <img src={getImgURL(detailData.bannerListImg)} height="125px" width="375px" />
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item label="活动详情主图">
           <img src={getImgURL(detailData.imgUrl)} height="300px" width="375px" />
         </Form.Item>
@@ -186,7 +185,7 @@ const BasicForm = props => {
             </span>
           )}
         </AuthButton>
-        <AuthButton name="admin.dymic.qrcode" noRight={null}>
+        {/* <AuthButton name="admin.dymic.qrcode" noRight={null}>
           {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && (
             <span
               style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }}
@@ -195,7 +194,7 @@ const BasicForm = props => {
               {<Button>下载二维码</Button>}
             </span>
           )}
-        </AuthButton>
+        </AuthButton> */}
         <Button onClick={() => cancelPage()}>取消</Button>
       </div>
     </>
@@ -211,7 +210,6 @@ const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
  * @returns
  */
 const Edit = props => {
-  const [tab, changeTab] = useState('basic');
   const { dynamicId } = props.location.query;
   const [detailData, setDetailData] = useState(false);
 
@@ -232,44 +230,20 @@ const Edit = props => {
   }, []);
 
   const target = { id: dynamicId, type: 'activity' };
+
   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} detailData={detailData} />}
-
-        {tab === 'poster' && <Poster target={target} />}
-        {tab === 'share' && <Share target={target} />}
-      </div>
-      {/* <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> */}
+      <Tabs defaultActiveKey="1">
+        <TabPane tab="基础信息" key="1">
+          <Basic dynamicId={dynamicId} detailData={detailData} />
+        </TabPane>
+        <TabPane tab="海报图片" key="2">
+          <Poster target={target} />
+        </TabPane>
+        <TabPane tab="分享设置" key="3">
+          <Share target={target} />
+        </TabPane>
+      </Tabs>
     </Card>
   );
 };

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

@@ -11,8 +11,8 @@ import ImageUploader from '@/components/XForm/ImageUpload';
 const { RangePicker } = DatePicker;
 
 const formItemLayout = {
-  labelCol: { span: 6 },
-  wrapperCol: { span: 14 },
+  labelCol: { span: 4 },
+  wrapperCol: { span: 18 },
 };
 
 const cancelPage = () => {
@@ -133,7 +133,7 @@ const BasicForm = props => {
   const { getFieldDecorator } = props.form;
   return (
     <>
-      <Form {...formItemLayout} onSubmit={handleSubmit}>
+      <Form {...formItemLayout} onSubmit={handleSubmit} style={{maxWidth: '1000px'}}>
         <Form.Item label="所属项目">
           {getFieldDecorator('buildingId', {
             rules: [
@@ -145,8 +145,8 @@ const BasicForm = props => {
           })(<BuildSelect disabled={disable} />)}
         </Form.Item>
         <Form.Item
-          label="活动封面图1"
-          help="建议图片尺寸：750px*420px，比例16:9,格式：jpg，用于：首页推荐/活动列表"
+          label="活动封面图"
+          help="建议图片尺寸：690px*388px，比例16:9,格式：jpg"
         >
           {getFieldDecorator('listImgUrl', {
             rules: [
@@ -157,7 +157,7 @@ const BasicForm = props => {
             ],
           })(<ImageUploader />)}
         </Form.Item>
-        <Form.Item
+        {/* <Form.Item
           label="活动封面图2"
           help="建议图片尺寸：750*250，比例3:1，格式：jpg，用于：项目详情页"
         >
@@ -169,10 +169,10 @@ const BasicForm = props => {
               },
             ],
           })(<ImageUploader />)}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item
           label="活动详情主图"
-          help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：普通活动详情"
+          help="建议图片尺寸：750*415px，比例16:9,格式：jpg，用于：普通活动详情"
         >
           {getFieldDecorator('imgUrl', {
             rules: [

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

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

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

@@ -1,9 +1,12 @@
 import React, { useState } from 'react';
-import { Radio, Card } from 'antd';
+import { Tabs, Card } from 'antd';
 import Basic from './Basic';
 // import Poster from './Poster';
 import Share from '@/components/Share';
 import Poster from '@/components/Poster'
+
+const { TabPane } = Tabs
+
 const type= 'dymic'
 /**
  *
@@ -12,23 +15,22 @@ const type= 'dymic'
  * @returns
  */
 const Edit = props => {
-  const [tab, changeTab] = useState('basic');
   const { dynamicId } = props.location.query;
   const target = { id:dynamicId, type: 'activity' }
+
   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} type={type}/>}
-        {tab === 'poster' && <Poster target={target} />}
-        {tab === 'share' && <Share target={target} />}
-      </div>
+      <Tabs defaultActiveKey="1">
+        <TabPane tab="基础信息" key="1">
+          <Basic dynamicId={dynamicId} type={type}/>
+        </TabPane>
+        <TabPane tab="海报图片" key="2">
+          <Poster target={target} />
+        </TabPane>
+        <TabPane tab="分享设置" key="3">
+          <Share target={target} />
+        </TabPane>
+      </Tabs>
     </Card>
   );
 };

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

@@ -160,8 +160,8 @@ const BasicForm = props => {
           })(<BuildSelect disabled={disable} />)}
         </Form.Item>
         <Form.Item
-          label="活动封面图1"
-          help="建议图片尺寸：750px*420px，比例16:9,格式：jpg，用于：首页推荐/活动列表"
+          label="活动封面图"
+          help="建议图片尺寸：690*388px，比例16:9,格式：jpg，用于：首页推荐/活动列表"
         >
           {getFieldDecorator('listImgUrl', {
             rules: [
@@ -172,7 +172,7 @@ const BasicForm = props => {
             ],
           })(<ImageUploader />)}
         </Form.Item>
-        <Form.Item
+        {/* <Form.Item
           label="活动封面图2"
           help="建议图片尺寸：750*250，比例3:1，格式：jpg，用于：项目详情页"
         >
@@ -184,10 +184,10 @@ const BasicForm = props => {
               },
             ],
           })(<ImageUploader />)}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item
           label="活动详情主图"
-          help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：普通活动详情"
+          help="建议图片尺寸：750*415px，比例16:9,格式：jpg，用于：普通活动详情"
         >
           {getFieldDecorator('imgUrl', {
             rules: [
@@ -243,7 +243,7 @@ const BasicForm = props => {
             ],
           })(<Input type="number" />)}
         </Form.Item>
-        <Form.Item label="用户携带人数" help="每个用户最多可携带参与活动的人数">
+        {/* <Form.Item label="用户携带人数" help="每个用户最多可携带参与活动的人数">
           {getFieldDecorator('maxEnlistByPerson', {
             rules: [
               {
@@ -252,7 +252,7 @@ const BasicForm = props => {
               },
             ],
           })(<Input type="number" min={1} />)}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item label="活动详情">{getFieldDecorator('desc')(<Wangedit />)}</Form.Item>
         <Form.Item label="报名时间">
           {getFieldDecorator('signupTime', {

src/pages/activity/liveActivity/add/index.jsx

@@ -1,182 +0,0 @@
-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.push({
-            pathname: '/activity/liveActivity/list/index',
-          });
-        }).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>
-      <Prompt message={location =>
-        location.pathname.startsWith("/activity/liveActivity")
-          ? true
-          : localStorage.removeItem("liveActivePageParams")} />
-    </>
-  )
-}
-
-const WrappedHeader = Form.create({ name: 'header' })(header);
-
-export default WrappedHeader

src/pages/activity/liveActivity/edit/components/BuildSelect/BuildSelect.jsx

@@ -1,65 +0,0 @@
-import React, { useState, useEffect, useRef } from 'react';
-import { Select } from 'antd';
-import apis from '../../../../../../services/apis';
-import request from '../../../../../../utils/request'
-
-const { Option } = Select;
-
-function usePrevious(props) {
-  const ref = useRef();
-  useEffect(() => {
-    ref.current = props;
-  });
-  return ref.current;
-}
-
-/**
- *
- *
- * @param {*} props
- * @returns
- */
-const BuildingSelect = props => {
-  const [data, setData] = useState([])
-  const [value, setValue] = useState([])
-  console.log('props', props.cityId());
-  useEffect(() => {
-    getBuildList();
-  }, [props.cityId()])
-
-
-  const getBuildList = e => {
-    request({ ...apis.building.buildingSelect, params: { cityId: props.cityId(), pageNum: 1, pageSize: 999 } }).then(data => {
-        setData(data)
-        checkValue(data)
-        // 默认选中第一个
-    })
-  }
-
-
-  const checkValue = (data) => {
-    if (props.value) {
-      const tempData = data.filter(f => f.buildingId == props.value)
-      const va = (tempData.length > 0) ? props.value : '项目已下线，请重新选择项目'
-      props.onChange(va)
-
-    }
-  }
-
-  return (
-      <Select
-      showSearch
-      value={props.value}
-      style={{ width: '300px' }}
-      placeholder="请选择项目"
-      onChange={props.onChange}
-      filterOption={(input, option) =>
-        option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      }>
-          {data.map(building => (
-            <Option key={building.buildingId} value={building.buildingId}>{building.buildingName}</Option>
-          ))}
-      </Select>
-  )
-}
-export default BuildingSelect

src/pages/activity/liveActivity/edit/components/HelpDoc/index.jsx

@@ -1,109 +0,0 @@
-import React, { PureComponent } from 'react'
-import { Modal, Row, Col } from 'antd'
-import EnDash from '../EnDash'
-
-import Style from './style.less'
-import HotBlock from '../HotBlock'
-
-const dataset = [
-  {
-    label: '(0)',
-    value: 0,
-  },
-  {
-    label: '(1)',
-    value: 1,
-  },
-  {
-    label: '(2)',
-    value: 2,
-  },
-  {
-    label: '(3)',
-    value: 3,
-  },
-  {
-    label: '(4)',
-    value: 4,
-  },
-  {
-    label: '(5)',
-    value: 5,
-  },
-  {
-    label: '(6~10)',
-    value: 8,
-  },
-  {
-    label: '(11~20)',
-    value: 15,
-  },
-  {
-    label: '(21~30)',
-    value: 25,
-  },
-  {
-    label: '(31~40)',
-    value: 35,
-  },
-  {
-    label: '(41~50)',
-    value: 45,
-  },
-  {
-    label: '(51~100)',
-    value: 80,
-  },
-  {
-    label: '(101~200)',
-    value: 150,
-  },
-  {
-    label: '(200以上)',
-    value: 201,
-  },
-]
-
-function Cell(props) {
-  return (
-    <Row type="flex" align="middle" gutter={20}>
-      <Col span={2}>{props.left}</Col>
-      <Col span={12}><EnDash /></Col>
-      <Col span={6}>{props.right}</Col>
-    </Row>
-  )
-}
-
-export default function HelpDoc(props) {
-  return (
-    <Modal footer={null} title="相关说明" visible={props.visible} onCancel={props.onCancel} width={800}>
-      <div className={Style.article}>
-        <div className={Style.section}>
-          <div className={Style.title}>1.图例解释：</div>
-          <div>
-            <Cell left="1号楼" right="楼栋/幢" />
-            <Cell left="2单元" right="单元" />
-            <Cell left="3楼" right="楼层" />
-            <Cell left="301" right="房号" />
-            <Cell left="1人" right="预选人数" />
-            <Cell left="234万" right="价格" />
-            <Cell left="A户型" right="户型名" />
-          </div>
-        </div>
-        <div className={Style.section}>
-          <div className={Style.title}>2.预选人数（热度）：</div>
-          <div>每有一位客户预选此房源，热度自动增加1，热度越大说明想购买此房源的用户越多，认筹摇号购买难度越大。</div>
-        </div>
-        <div className={Style.section}>
-          <div className={Style.title}>3.热度指标:</div>
-          <div className={Style.subtitle}>颜色越深代表热度越高。黑底白字代表房源未发布,未发布房源用户不会看到。</div>
-          <div className={Style.flex}>
-            {
-              dataset.map((block) => (<div className={Style['flex-item']} key={block.value}><HotBlock number={block.value}>{block.label}</HotBlock></div>))
-            }
-          </div>
-        </div>
-      </div>
-    </Modal>
-  );
-}

src/pages/activity/liveActivity/edit/components/HelpDoc/style.less

@@ -1,36 +0,0 @@
-.article {
-    .section {
-        font-size: 16px;
-        line-height: 1.8em;
-        color: #666;
-
-        & + .section {
-            margin-top: 24px;
-        }
-    }
-
-    .title {
-        font-size: 18px;
-        line-height: 2em;
-        color: #333;
-    }
-
-    .subtitle {
-        font-size: 14px;
-        line-height: 1.6em;
-        color: #999;
-    }
-
-    .flex {
-        display: flex;
-        flex-wrap: wrap;
-
-        .flex-item {
-            margin-top: 16px;
-            margin-right: 8px;
-            flex: none;
-            width: 100px;
-            text-align: center;
-        }
-    }
-}

src/pages/activity/liveActivity/edit/components/base.jsx

@@ -1,206 +0,0 @@
-import React, { useState, useEffect } from 'react';
-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';
-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 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 liveActivityId = props.liveActivityId.liveId
-  console.log(liveActivityId)
-  const [ liveActivityData, setLiveActivityData ] = useState({})
-  const [showHelp, setShowHelp] = useState(false)
-
-  if(liveActivityId){
-    useEffect(() => {
-      getLiveActivityData(liveActivityId);
-    },[])
-
-  // 查询列表
-  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 = () =>{
-    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"
-  }
-
-  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) => {
-      console.log(values, 'values');
-      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("直播结束时间大于开始时间")
-          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)
-        })
-      }
-    });
-  }
-
-  const { getFieldDecorator } = props.form;
-
-  return (
-    <>
-      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
-        <Form.Item label="所属城市">
-          {getFieldDecorator('cityId', {
-            initialValue: liveActivityData.cityId,
-            rules: [{ required: true, message: ' 请输入所属城市' }],
-          })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')}/>)}
-        </Form.Item>
-        <Form.Item label="所属楼盘">
-          {getFieldDecorator('buildingId', {
-            initialValue: liveActivityData.buildingId,
-          })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
-        </Form.Item>
-        <Form.Item label="直播活动标题">
-          {getFieldDecorator('liveActivityTitle', {
-            initialValue: liveActivityData.liveActivityTitle,
-            rules: [{ required: true, message: '请输入直播活动标题' }],
-          })(<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' }}/>)}
-        </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' }}/>)}
-        </Form.Item>
-        <Form.Item label="直播小程序">
-          {getFieldDecorator('liveApp', {
-              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'}}/>)}
-          <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="封面图2" help="建议尺寸：750*250px，比例3:1，格式：jpg，用于：项目详情页">
-              {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>      
-        <Form.Item label="权重">
-              {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>)}
-        </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 Base = Form.create({ name: 'header' })(header);
-
-export default Base

src/pages/activity/liveActivity/edit/components/poster.jsx

@@ -1,167 +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 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 xiaochengxu from '../../../../../assets/xiaochengxu.png'
-import ImageUploader from '../../../../../components/XForm/ImageUpload';
-import poster1 from '../../../../../assets/poster1.png';
-import poster2 from '../../../../../assets/poster2.png';
-import Styles from './style.less';
-import apis from '../../../../../services/apis';
-
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-const { TextArea } = Input;
-
-const Poster = props => {
-  const [inputValue, changeInput] = useState('')
-  const [textAreaValue, changeTextArea] = useState('')
-  const [imgValue, changeImg] = useState('')
-  const [posterId, setPosterId] = useState('')
-
-  const [building, setBuilding] = useState({ buildingImg: [{ url: '' }] })
-  const liveActivityId = props.liveActivityId.liveId
-  if (liveActivityId) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    useEffect(() => {
-      request({
-        ...apis.activity.poster,
-        params: { targetId: liveActivityId, targetType: 'live' },
-      }).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)
-      })
-
-      // getById(salesBatchId)
-      getMiniappName()
-    }, [])
-  }
-
-  // 获取详情信息
-  function getById(currentId) {
-
-    request({ ...apis.building.buildingGetById, urlData: { id: currentId } }).then(res => {
-      setBuilding(res)
-      console.log('getById: ', res)
-    })
-  }
-  // 获取小程序名称
-  const [miniappName, setMiniappName] = useState('')
-  function getMiniappName() {
-
-    request({ ...apis.building.getMiniappName }).then(res => {
-    
-      setMiniappName(res)
-     
-    })
-  }
-
-  const submitPoster = () => {
-    if (liveActivityId) {
-      if (!imgValue) {
-        message.error('请选择海报图片')
-        return
-      }
-
-      if (posterId) {
-        request({
-          ...apis.activity.updatePoster,
-          urlData: { id: posterId },
-          data: { targetId: liveActivityId, targetType: 'live', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue },
-        }).then(() => {
-          message.info('保存成功')
-        }).catch(err => {
-          message.info(err.msg || err.message)
-        })
-      } else {
-        request({
-          ...apis.activity.addPoster,
-          data: { targetId: liveActivityId, targetType: 'live', 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: '600px', backgroundColor: '#fff', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
-          <img style={{ width: '100%', height: '560px' }} src={imgValue ? imgValue : poster1} alt="" />
-
-          {/* <p className={Styles.tagLabel}>
-            {
-              building.buildingTag && building.buildingTag.map(item => <span>{item.tagName}</span>)
-            }
-          </p> */}
-          {/* <p style={{
-            margin: '10px 20px', fontSize: '20px', color: '#222', fontWeight: '600',
-            display: '-webkit-box', lineClamp: '3', height: '36px', lineHeight: '36px',
-            WebkitLineClamp: '1',
-            WebkitBoxOrient: 'vertical',
-            overflow: 'hidden',
-            textOverflow: 'ellipsis',
-          }}>{inputValue || (building.buildingName || '海报标题')}</p>
-          <p style={{ color: '#999', padding: ' 0 20px' }}><span style={{ color: '#fd0d0c', fontSize: '24px', marginLeft: '6px' }}>{building.price} </span><span style={{ color: '#fd0d0c', fontSize: '20px' }}></span></p>
-          <img src={yinhao} style={{ width: '30px', marginLeft: '22px' }} 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'}}>进入<span style={{margin:'0 5px',fontSize:'18px',color:'#333',fontWeight:'600'}}>{miniappName||'置业V顾问'}</span>房源列表</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', alignItems: 'center', width: '100%' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>
-          <span style={{marginLeft:'135px', color: '#999'}}>请上传制作好的海报图片用于置业顾问或用户保存分享到朋友圈，可随时更新</span>
-        </p>
-        </div>
-        <div style={{ display: 'flex', width: '100%', margin: '30px 0' }}>
-          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}><span style={{ color: 'red' }}>*</span> 海报图片</p>
-          <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
-        </div>
-        <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议尺寸：640*960px，比例2::3，格式：jpg，文件小于300KB，用于：吸引用户扫码进入直播活动页</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={() => router.go(-1)}>取消</Button>
-  </div>
-}
-
-export default Poster

src/pages/activity/liveActivity/edit/components/share.jsx

@@ -1,118 +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 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 apis from '../../../../../services/apis';
-
-const Share = props => {
-  const [inputValue, changeInput] = useState('')
-  const [imgValue, changeImg] = useState('')
-  const [shareContentId, setShareContentId] = useState('')
-  const liveActivityId = props.liveActivityId.liveId
-  if (liveActivityId) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    useEffect(() => {
-      request({
-        ...apis.activity.shareContent,
-        params: { targetId: liveActivityId, targetType: 'live' },
-      }).then(data => {
-        if (data.length > 0) {
-          setShareContentId(data[0].shareContentId)
-          changeImg(data[0].shareContentImg)
-          changeInput(data[0].shareContentTitle)
-        }
-        // else{
-        //   changeInput("诚挚邀您在线选房购房~");
-        //   request({ ...apis.house.getTaSalesBatch, urlData: {id: salesBatchId} }).then((data) => {
-        //     changeImg(data.aerialViewImg);
-        // })
-        // }
-      }).catch(err => {
-        message.info(err.msg || err.message)
-      })
-      getMiniappName();
-    }, [])
-  }
-
-  // 获取小程序名称
-  const [miniappName, setMiniappName] = useState('')
-  function getMiniappName() {
-
-    request({ ...apis.building.getMiniappName }).then(res => {
-    
-      setMiniappName(res)
-     
-    })
-  }
-
-  const submitShare = () => {
-    if (liveActivityId) {
-      if (shareContentId) {
-        request({
-          ...apis.activity.updateShareContent,
-          urlData: { id: shareContentId },
-          data: { targetId: liveActivityId, shareContentType: 'live', shareContentImg: imgValue,shareContentTitle: inputValue },
-        }).then(data => {
-          message.info('保存成功')
-        }).catch(err => {
-          message.info(err.msg || err.message)
-        })
-       } else {
-        request({
-          ...apis.activity.addShareContent,
-          data: { targetId: liveActivityId, shareContentType: 'live', 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', alignItems: 'center', width: '100%' }}>
-      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>
-        <span style={{marginLeft:'135px', color: '#999'}}>请上传制作好的分享图片用于置业顾问或用户分享房源列表页面到好友或群</span>
-      </p>
-    </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>
-      <div>
-        <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}>
-          <img src={logo} style={{ width: '22px', marginRight: '10px' }} />
-            {miniappName}
-        </p>
-        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{miniappName ? miniappName : '置业V客厅 精准获客平台'}</p>
-        <img style={{ width: '200px', height: '160px' }} src={imgValue ? 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={() => router.go(-1)}>取消</Button>
-  </div>
-}
-
-export default Share

src/pages/activity/liveActivity/edit/components/shareRecord.jsx

@@ -1,153 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload, Table, Pagination } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import moment from 'moment';
-import router from 'umi/router';
-import apis from '../../../../../services/apis';
-import BuildSelect from '../../../../../components/SelectButton/BuildSelect';
-import AuthButton from '@/components/AuthButton';
-import styles from './style.less';
-import request from '../../../../../utils/request';
-
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-const { TextArea } = Input;
-
-const header = (props) => {
-  const [ data, setData ] = useState({})
-  const [page, changePage] = useState({})
-  const liveActivityId = props.liveActivityId.liveId
-
-  useEffect(() => {
-    getList({ pageNum: 1, pageSize: 10, liveActivityId : liveActivityId});
-  },[])
-
-  // 查询列表
-  const getList = (params) => {
-    request({ ...apis.taliveActivity.taLiveShare, params: { ...params },}).then((data) => {
-        console.log(data)
-        setData(data)
-    })
-  }
-  
-  const columns = [
-    {
-      title: '头像',
-      align: 'center',
-      render: (text, records) => <img src={records.photoOravatar} width={50} height={50} />,
-    },
-    {
-      title: '昵称',
-      dataIndex: 'nameOrnick',
-      key: 'nameOrnick',
-      align: 'center',
-    },
-    {
-      title: '姓名',
-      dataIndex: 'name',
-      key: 'name',
-      align: 'center',
-    },
-    {
-      title: '手机号',
-      dataIndex: 'phone',
-      key: 'phone',
-      align: 'center',
-    },
-    {
-      title: '身份',
-      dataIndex: 'personType',
-      key: 'personType',
-      align: 'center',
-      render: (personType) => <span>{ personType === 'Realty Consultant' ? '置业顾问' : personType === 'customer' || personType === 'estate agent' ? '用户' : '游客' }</span>
-    },
-    {
-      title: '分享时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
-      align: 'center',
-      render: (x, row) => <><span>{moment(row.createDate).format('YYYY-MM-DD hh:mm:ss')}</span></>
-    },
-    {
-      title: '分享方式',
-      dataIndex: 'shareType',
-      key: 'shareType',
-      align: 'center',
-      render: (x, row) => <span>{ row.tagertType == 'livePost' ? '海报分享' : '小程序分享' }</span>
-    },
-    {
-      title: '分享内容',
-      dataIndex: 'liveActivityTitle',
-      key: 'liveActivityTitle',
-      align: 'center',
-      render: (x, row) => <span>直播活动{ row.liveActivityTitle }的活动详情</span>
-    },
-  ];
-  
-  const changePageNum = (pageNumber) => {
-      getList({ pageNum: pageNumber, pageSize: 10, liveActivityId : liveActivityId, ...props.form.getFieldsValue() })
-  }
-
-  // 提交事件
-const handleSubmit = (e, props) => {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        console.log('提交数据: ', values)
-        getList({ pageNum: 1, pageSize: 10, liveActivityId : liveActivityId,  ...values })
-      }
-    });
-  }
-
-   //重置搜索
-   function handleReset() {
-    props.form.resetFields();
-  }
-
-  const { getFieldDecorator } = props.form
-  return (
-
-    <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item>
-          {getFieldDecorator('shareType')(
-            <Select style={{ width: '180px' }} placeholder="分享方式">
-              <Option value="livePost">海报分享</Option>
-              <Option value="liveApp">小程序分享</Option>
-            </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('personType')(
-            <Select style={{ width: '180px' }} placeholder="身份">
-              <Option value="Realty Consultant">置业顾问</Option>
-              <Option value="customer">用户</Option>
-            </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('phone')(
-            <Input placeholder="手机号"/>
-          )}
-        </Form.Item>
-        <Form.Item>
-        <AuthButton name="admin.extendContent.search" noRight={null}>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-            搜索
-          </Button>
-          </AuthButton>
-          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
-            </Button>
-        </Form.Item>
-      </Form>
-      <span>共筛选出{data.total}条记录</span>
-      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
-      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
-      </div>
-    </>
-  )
-}
-const ShareRecord = Form.create({ name: 'header' })(header);
-
-export default ShareRecord

src/pages/activity/liveActivity/edit/components/style.less

@@ -1,97 +0,0 @@
-.SubmitButton {
-  background: #3a91d5;
-  border-radius: 7px;
-  border: 0px;
-}
-.SelectFrom {
-  width: 180px;
-  background: #ffffff;
-  border-radius: 7px;
-  border: 1px solid #dbdbdb;
-}
-.addButton {
-  border-radius: 4px;
-  border: 0px;
-  margin: 10px 0px;
-}
-.cardText {
-  font-size: 0.106rem;
-  color: #333;
-  display: flex;
-  align-items: center;
-  position: relative;
-  margin-bottom: 0.08rem; 
-}
-
-.recommderTag{
-  position: absolute;
-  color: #fff;
-  line-height: 0.28rem;
-  width: 0.54rem;
-  background-color: rgba(0,0,0,0.4);
-  text-align: center;
-  border-radius: 12px 0 12px 0;
-  font-size: 0.09rem;
-}
-.cardItem{
-  font-size: 0.106rem;
-  font-weight: 400;
-  color: #666;
-  display: flex;
-  align-items: center;  
-  margin-bottom: 0.08rem;
-  .title{
-    display: inline-block;
-    width: 0.58rem;
-  
-    min-width: 0.58rem;
-    justify-content: space-between;
-    text-align: justify;
-    text-align-last:justify
-  }
-  
-}
-.cardText{
-  font-size: 0.106rem;
-  font-weight: 400;
-  color: #666;
-  display: flex;
-  align-items: center;  
-  margin-bottom: 0.08rem;
-  .title{
-    display: inline-block;
-    width: 0.58rem;
-  
-    min-width: 0.58rem;
-    justify-content: space-between;
-    text-align: justify;
-    text-align-last:justify
-  }
-  
-}
-.ediText {
-  font-size: 0.106rem;
-  color: #ff925c;
-  position: absolute;
-  right: 0;
-
-}
-
-
-.address { 
-  width: 400px;
-  height: 24px; 
-  text-overflow: ellipsis; 
-  white-space: nowrap;
-  overflow: hidden;
-}
-.cover{
-  width: 100%;
-
-  padding-bottom: 56.25%;
-  background-size: 100% 100% !important;
- 
-  border-radius: 12px 12px 0 0;
-  
-    // height: '14vw';
-}

src/pages/activity/liveActivity/edit/components/visitRecord.jsx

@@ -1,154 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload, Table, Pagination } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import moment from 'moment';
-import router from 'umi/router';
-import apis from '../../../../../services/apis';
-import BuildSelect from '../../../../../components/SelectButton/BuildSelect';
-import AuthButton from '@/components/AuthButton';
-import styles from './style.less';
-import request from '../../../../../utils/request';
-
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-const { TextArea } = Input;
-
-const header = (props) => {
-  const [ data, setData ] = useState({})
-  // const [page, changePage] = useState({})
-  const liveActivityId = props.liveActivityId.liveId
-
-  useEffect(() => {
-    getList({ pageNum: 1, pageSize: 10, liveActivityId : liveActivityId});
-  },[])
-
-  // 查询列表
-  const getList = (params) => {
-    request({ ...apis.taliveActivity.taLiveVisit, liveActivityId : liveActivityId, params: { ...params },}).then((data) => {
-        console.log(data)
-        setData(data)
-    })
-  }
-  
-  const columns = [
-    {
-      title: '头像',
-      align: 'center',
-      render: (text, records) => <img src={records.photoOravatar} width={50} height={50} />,
-    },
-    {
-      title: '昵称',
-      dataIndex: 'nameOrnick',
-      key: 'nameOrnick',
-      align: 'center',
-    },
-    {
-      title: '姓名',
-      dataIndex: 'name',
-      key: 'name',
-      align: 'center',
-    },
-    {
-      title: '手机号',
-      dataIndex: 'phone',
-      key: 'phone',
-      align: 'center',
-    },
-    {
-      title: '身份',
-      dataIndex: 'sharePersonType',
-      key: 'sharePersonType',
-      align: 'center',
-      render: (sharePersonType) => <span>{ sharePersonType == 'Realty Consultant' ? '置业顾问' : sharePersonType == 'customer' || sharePersonType === 'estate agent'? '用户' : '游客' }</span>
-    },
-    {
-      title: '访问时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
-      align: 'center',
-      render: (x, row) => <><span>{moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}</span></>
-    },
-    // {
-    //   title: '进入场景',
-    //   dataIndex: 'sceneName',
-    //   key: 'sceneName',
-    //   align: 'center',
-    //   render: (x, row) => <span>{ row.sceneName === 'mini_program_code' ? '扫码进入' : row.sceneName === 'search' ? '自主进入' : '小程序分享进入' }</span>
-    // },
-    {
-      title: '访问内容',
-      dataIndex: 'liveActivityTitle',
-      key: 'liveActivityTitle',
-      align: 'center',
-      render: (x, row) => <span>直播活动{ row.liveActivityTitle }的活动详情</span>
-    },
-  ];
-  
-  const changePageNum = (pageNumber) => {
-      getList({ pageNum: pageNumber, pageSize: 10, liveActivityId : liveActivityId, ...props.form.getFieldsValue() })
-  }
-
-  // 提交事件
-const handleSubmit = (e, props) => {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        console.log('提交数据: ', values)
-        getList({ pageNum: 1, pageSize: 10, liveActivityId: liveActivityId, ...values})
-      }
-    });
-  }
-
-   //重置搜索
-   function handleReset() {
-    props.form.resetFields();
-  }
-
-  const { getFieldDecorator } = props.form
-  return (
-
-    <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        {/* <Form.Item>
-          {getFieldDecorator('sceneType')(
-            <Select style={{ width: '180px' }} placeholder="进入场景">
-              <Option value="mini_program_code">扫码进入</Option>
-              <Option value="share">小程序分享进入</Option>
-              <Option value="search">自主进入</Option>
-            </Select>,
-          )}
-        </Form.Item> */}
-        <Form.Item>
-          {getFieldDecorator('personType')(
-            <Select style={{ width: '180px' }} placeholder="身份">
-              <Option value="Realty Consultant">置业顾问</Option>
-              <Option value="customer">用户</Option>
-              <Option value="drift">游客</Option>
-            </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('phone')(
-            <Input placeholder="手机号"/>
-          )}
-        </Form.Item>
-        <Form.Item>
-        <AuthButton name="admin.extendContent.search" noRight={null}>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-            搜索
-          </Button>
-          </AuthButton>
-          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
-            </Button>
-        </Form.Item>
-      </Form>
-      <span>共筛选出{data.total}条记录</span>
-      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
-      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
-      </div>
-    </>
-  )
-}
-const VisitRecord = Form.create({ name: 'header' })(header);
-export default VisitRecord

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

@@ -1,87 +0,0 @@
-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 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 Prompt from 'umi/prompt';
-
-
-const { Option } = Select
-const { TabPane } = Tabs;
-
-const formItemLayout = {
-  labelCol: {
-    xs: { span: 24 },
-    sm: { span: 2 },
-  },
-  wrapperCol: {
-    xs: { span: 24 },
-    sm: { span: 16 },
-  },
-};
-
-function openNotificationWithIcon(type, message) {
-  notification[type]({
-    message,
-    description:
-      '',
-  });
-}
-
-function EditHouse(props) {
-  const {liveActivityId} = props.location.query.id;
-  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)
-  }
-
-  // building 回调
-  function buildingOnSuccess(e) {
-    setBuildingData(e)
-  }
-
-  function housTabChange(e) {
-    setHouseId(e.houseId)
-    setTab('preselectionRecord')
-  }
-
-  const liveId = liveActivity.liveActivityId || (props.location.query && props.location.query.id)
-  console.log(liveId)
-  return (
-    <>
-      <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>
-        <Radio.Button value="shareRecord">分享记录</Radio.Button>
-        <Radio.Button value="visitRecord">分享访问记录</Radio.Button>
-      </Radio.Group>
-      <div style={{ marginTop: '20px' }}>
-        { (tab === 'base' && <Base liveActivityId={{ liveId }} onSuccess={e => buildingOnSuccess(e)}/>)} 
-        { (tab === 'poster' && <Poster liveActivityId={{ liveId }}/>)}
-        { (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")} />
-    </>
-  )
-}
-
-const WrappedEditHouseForm = Form.create({ name: 'editHouse' })(EditHouse);
-
-export default WrappedEditHouseForm

src/pages/activity/liveActivity/list/index.jsx

@@ -1,323 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Pagination, Modal, DatePicker, 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 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';
-import Navigate from '@/components/Navigate';
-// import SaleBatchListHelpDoc from '../edit/components/SalesBatchListHelpDoc';
-
-const { Option } = Select;
-
-const header = props => {
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  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 getList = params => {
-    request({ ...apis.taliveActivity.taLiveActivity, params: { ...params } }).then(data => {
-      console.log(data)
-      setData(data)
-    })
-  }
-
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useEffect(() => {
-
-    if (localStorage.getItem("liveActivePageParams")) {
-      props.form.setFieldsValue(JSON.parse(localStorage.getItem("liveActivePageParams")));
-      // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
-
-      getList(JSON.parse(localStorage.getItem("liveActivePageParams")))
-    } else {
-      localStorage.setItem("liveActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));
-      getList({ pageNum: 1, pageSize: 10 });
-    }
-   
-  }, [])
-
-  // 跳转到编辑
-  const toAddLive = rowData => () => {
-    if(rowData) {
-      router.push({
-      pathname: '/activity/liveActivity/edit',
-      query: {
-        id: rowData.liveActivityId,
-        buildingId: rowData.buildingId,
-      },
-    });
-      return
-    }
-    router.push({
-      pathname: '/activity/liveActivity/add',
-    });
-  }
-
-  const toDataReacord = rowData => () => {
-  
-      router.push({
-      pathname: '/activity/liveActivity/liveActivityRecord',
-      query: {
-        id: rowData.liveActivityId,
-      },
-    });
-  }
-
-  function openNotificationWithIcon(type, message) {
-    notification[type]({
-      message,
-      description:
-        '',
-    });
-  }
-
-  
-  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(JSON.parse(localStorage.getItem("liveActivePageParams")))
-        }).catch((err) => {
-          // message.info(err.msg)
-        })
-      },
-    });
-
-    
-  }
-
-  /**
-   *
-   *
-   * @param {*} props
-   * @returns
-   */
-  const columns = [
-    {
-      title: '直播活动标题',
-      dataIndex: 'liveActivityTitle',
-      key: 'liveActivityTitle',
-      align: 'center',
-      render:  (x, row) => <Navigate onClick={toAddLive(row)}>{row.liveActivityTitle}</Navigate>,
-    },
-    {
-      title: '所属城市',
-      dataIndex: 'cityName',
-      key: 'cityName',
-      align: 'center',
-    },
-    {
-      title: '所属楼盘',
-      dataIndex: 'buildingName',
-      key: 'buildingName',
-      align: 'center',
-    },
-    {
-      title: '直播开始时间',
-      dataIndex: 'liveStartDate',
-      key: 'liveStartDate',
-      align: 'center',
-      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></>,
-    },
-    {
-      title: '权重',
-      dataIndex: 'weight',
-      key: 'weight',
-      align: 'center',
-    },
-    {
-      title: '发布状态',
-      dataIndex: 'status',
-      key: 'status',
-      align: 'center',
-      render: status => <><span>{status == 0 ? '未发布' : '已发布'}</span></>,
-    },
-    {
-      title: '新增人',
-      dataIndex: 'createName',
-      key: 'createName',
-      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: 'updateName',
-      key: 'updateName',
-      align: 'center',
-    },
-    {
-      title: '修改时间',
-      dataIndex: 'updateDate',
-      key: 'updateDate',
-      align: 'center',
-      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>,
- 
-        <AuthButton name="admin.live.detail.get" noRight={null}>
-          <EditIcon type="look" text="查看详情" onClick={toAddLive(record)} />
-        </AuthButton>,
-      ]),
-    },
-  ];
-  const getSignList = dynamicId => {
-    router.push({
-      pathname: '/activity/SignList',
-      query: {
-        dynamicId,
-      },
-    });
-  }
-
-  const changePageNum = pageNumber => {
-    localStorage.setItem("liveActivePageParams", JSON.stringify({ 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)
-    },
-  };
-
-  // 提交事件
-  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("liveActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10, ...values }));
-        getList({ pageNum: 1, pageSize: 10, ...values })
-      }
-    });
-  }
-
-  // 重置搜索
-  function handleReset () {
-    props.form.resetFields();
-    setTime('')
-    localStorage.setItem("liveActivePageParams", 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('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 />,
-          )}
-        </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.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.live.add.post" noRight={null}>
-        <Button type="danger" className={styles.addBtn} onClick={toAddLive()}>新增</Button>
-      </AuthButton>
-      <AuthButton name="admin.live.del" noRight={null}>
-        <Button type="primary" className={styles.addBtn} onClick={toDelLiveActivity()} style={{marginLeft:'30px'}}>删除</Button>
-      </AuthButton><br/>
-      <span>共筛选出{data.total}条记录</span>
-      <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}/>
-      </div>
-      {/* <SaleBatchListHelpDoc visible={showHelp} onCancel={() => setShowHelp(false)} /> */}
-      <Prompt message={location =>
-        location.pathname.startsWith("/activity/liveActivity")
-          ? true
-          : localStorage.removeItem("liveActivePageParams")} />
-    </>
-  )
-}
-const WrappedHeader = Form.create({ name: 'header' })(header);
-
-export default WrappedHeader

src/pages/activity/liveActivity/list/liveActivityRecord.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:'live',
-    return <><DataRecord id ={id} activeType="live"/>
-    <Prompt message={location =>
-        location.pathname.startsWith("/activity/liveActivity")
-          ? true
-          : localStorage.removeItem("liveActivePageParams")} />
-          </>
-}
-
-export default header

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

@@ -164,8 +164,8 @@ const BasicForm = props => {
           })(<BuildSelect disabled={disable} />)}
         </Form.Item>
         <Form.Item
-          label="活动封面图1"
-          help="建议图片尺寸：750px*420px，比例16:9,格式：jpg，用于：首页推荐/活动列表"
+          label="活动封面图"
+          help="建议图片尺寸：690px*388px，比例16:9,格式：jpg，用于：首页推荐/活动列表"
         >
           {getFieldDecorator('listImgUrl', {
             rules: [
@@ -176,7 +176,7 @@ const BasicForm = props => {
             ],
           })(<ImageUploader />)}
         </Form.Item>
-        <Form.Item
+        {/* <Form.Item
           label="活动封面图2"
           help="建议图片尺寸：750*250，比例3:1，格式：jpg，用于：项目详情页"
         >
@@ -188,10 +188,10 @@ const BasicForm = props => {
               },
             ],
           })(<ImageUploader />)}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item
           label="活动详情主图"
-          help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：普通活动详情"
+          help="建议图片尺寸：750*415px，比例16:9,格式：jpg，用于：普通活动详情"
         >
           {getFieldDecorator('imgUrl', {
             rules: [
@@ -247,7 +247,7 @@ const BasicForm = props => {
             ],
           })(<Input type="number" />)}
         </Form.Item>
-        <Form.Item label="用户携带人数" help="每个用户最多可携带参与活动的人数">
+        {/* <Form.Item label="用户携带人数" help="每个用户最多可携带参与活动的人数">
           {getFieldDecorator('maxEnlistByPerson', {
             rules: [
               {
@@ -256,7 +256,7 @@ const BasicForm = props => {
               },
             ],
           })(<Input type="number" min={1} />)}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item label="活动详情">{getFieldDecorator('desc')(<Wangedit />)}</Form.Item>
         <Form.Item label="报名时间">
           {getFieldDecorator('signupTime', {

src/pages/building/Edit/SpecialRoom/index.jsx

@@ -37,28 +37,28 @@ export default (props) => {
   }
 
   useEffect(() => {
-    getList({ pageNum: 1, pageSize: 10 });
+    getList({ pageNum: 1, pageSize: 20 });
   }, []);
 
   const onChangePageNum = pageNumber => {
-    getList({ pageNum: pageNumber, pageSize: 10 });
+    getList({ pageNum: pageNumber, pageSize: 20 });
   };
 
   const onSuccess = () => {
-    // setVisible(false);
-    // getList();
+    setVisible({visible:false})
+    getList({ pageNum: 1, pageSize: 10 });
   };
   function onDelete(record) {
-    // request({ ...apis.paorama.delete, urlData: { id: record.panoramaId } })
-    //   .then(res => {
-    //     notification.success({ message: '删除成功' });
-    //     getList();
-    //   })
-    //   .catch(err => {
-    //     notification.error({
-    //       message: err.message,
-    //     });
-    //   });
+    request({ ...apis.building.deletebuildingSpecialRoom, urlData: { id: record.specialRoomId } })
+      .then(res => {
+        notification.success({ message: '删除成功' });
+        getList({ pageNum: 1, pageSize: 10 });
+      })
+      .catch(err => {
+        notification.error({
+          message: err.message,
+        });
+      });
   }
 
   function onEdit(data) {
@@ -71,7 +71,7 @@ export default (props) => {
       <div>
         <Button type="primary" onClick={() => setVisible({visible:true})}>新增特价房</Button>
       </div>
-      <Form visibleData={visible} onCancel={() => setVisible({visible:false})} onSuccess={onSuccess}  />
+      <Form visibleData={visible} buildingId={id} onCancel={() => setVisible({visible:false})} onSuccess={onSuccess}  />
       <List data={data} buildingId={id} loading={loading} onChangePageNum={onChangePageNum} onDelete={onDelete} onEdit={onEdit}/>
     </div>
   )

src/pages/customer/Recommend/audit.jsx

@@ -107,7 +107,7 @@ function body(props) {
 
   return (
     <Card>
-      <Form {...tailFormItemLayout} onSubmit={e => handleSubmit(e)} style={{ width: '800px', margin: 'auto' }}>
+      <Form {...tailFormItemLayout} onSubmit={e => handleSubmit(e)} style={{ maxWidth: '1000px' }}>
         <Form.Item label="客户ID" style={{ display: 'none' }}>
           {getFieldDecorator('customerId')(
             <Input
@@ -217,13 +217,15 @@ function body(props) {
           </Row>
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
-          <Button type="primary" className={Styles.SubmitButton} htmlType="submit" >
+          <Button type="primary" htmlType="submit" >
             审核通过
           </Button>
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          <Button onClick={() => submitDate({ verifyStatus: '2' })}>
+          <Button type="danger" ghost style={{marginLeft: '4em'}} onClick={() => submitDate({ verifyStatus: '2' })}>
             驳回
           </Button>
+          <Button style={{marginLeft: '4em'}} onClick={() => router.goBack(-1)}>
+            取消
+          </Button>
         </Form.Item>
       </Form>