Merge branch 'master' into dev

src/pages/activity/drainage/DrainageList.jsx

@@ -332,7 +332,6 @@ const header = props => {
  
     return <Form {...formItemLayout} onSubmit={handleSubmit}>
       <span style={{ color: '#ef273a' }}>发布后请到资源位管理中关联资源位图，否则客户看不到</span>
-
       <Form.Item label="是否投放小程序端" help='选择是后,该活动可投放至小程序的轮播位以及开屏广告'>
         {getFieldDecorator('isMiniapp', {
           initialValue: formsDate.isMiniapp ? 1 : 0,

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

@@ -57,7 +57,7 @@ function Basic(props) {
                 <Form.Item label="扫码查看" >
                     <img src={data.qrcode || ''} alt="" style={{ width: '100px' }} />
                 </Form.Item>
-                <Form.Item label="首页背景图" help="建议尺寸：750*1206px，格式:jpg；内容区大小：750*1150">
+                <Form.Item label="首页背景图" help="建议尺寸：640*1234px，格式:jpg；内容区大小：640*1040px（画面最上和最下部分分别预留640*97px的空间不要放置文字、logo等关键性内容，小屏手机该部分的画面会被遮挡）">
                     {getFieldDecorator('indexBackgroundImg',
                         {
                             initialValue: data.indexBackgroundImg,
@@ -73,7 +73,7 @@ function Basic(props) {
                             <ImageUploader />,
                         )}
                 </Form.Item>
-                <Form.Item label="活动规则图" help="建议尺寸：750*1206px，格式:jpg">
+                <Form.Item label="活动规则图" help="建议尺寸：640*1234px，格式:jpg；内容区大小：640*1040px（画面最上和最下部分分别预留640*97px的空间不要放置文字、logo等关键性内容，小屏手机该部分的画面会被遮挡）">
                     {getFieldDecorator('activityRulesImg',
                         {
                             initialValue: data.activityRulesImg,
@@ -81,7 +81,7 @@ function Basic(props) {
                             <ImageUploader />,
                         )}
                 </Form.Item>
-                <Form.Item label="助力页背景图" help="建议尺寸：750*1206px，格式:jpg；内容区大小：750*1150">
+                <Form.Item label="助力页背景图" help="建议尺寸：640*1234px，格式:jpg；内容区大小：640*1040px（画面最上和最下部分分别预留640*97px的空间不要放置文字、logo等关键性内容，小屏手机该部分的画面会被遮挡）">
                     {getFieldDecorator('helpBackgroundImg',
                         {
                             initialValue: data.helpBackgroundImg,
@@ -89,7 +89,7 @@ function Basic(props) {
                             <ImageUploader />,
                         )}
                 </Form.Item>
-                <Form.Item label="排行榜背景图" help="建议尺寸：750*1206px，格式:jpg；内容区大小：750*1150">
+                <Form.Item label="排行榜背景图" help="建议尺寸：640*1234px，格式:jpg；内容区大小：640*1040px（画面最上和最下部分分别预留640*97px的空间不要放置文字、logo等关键性内容，小屏手机该部分的画面会被遮挡）">
                     {getFieldDecorator('rankingBackgroundImg',
                         {
                             initialValue: data.rankingBackgroundImg,
@@ -97,6 +97,89 @@ function Basic(props) {
                             <ImageUploader />,
                         )}
                 </Form.Item>
+                
+                
+                <Form.Item label="邀请好友按钮图" help="尺寸: 191*47px，格式:png, 背景透明, 图片上需带有 邀请好友 字样">
+                    {getFieldDecorator('inviteBtnImg',
+                        {
+                            initialValue: data.inviteBtnImg,
+                        })(
+                            <ImageUploader width="191" height="47" />,
+                        )}
+                </Form.Item>
+                
+                <Form.Item label="活动规则按钮图" help="尺寸: 191*47px，格式:png, 背景透明, 图片上需带有 活动规则 字样">
+                    {getFieldDecorator('ruleBtnImg',
+                        {
+                            initialValue: data.ruleBtnImg,
+                        })(
+                            <ImageUploader width="191" height="47" />,
+                        )}
+                </Form.Item>
+                
+                <Form.Item label="我要参加按钮图" help="尺寸: 191*47px，格式:png, 背景透明, 图片上需带有 我要参加 字样">
+                    {getFieldDecorator('joinBtnImg',
+                        {
+                            initialValue: data.joinBtnImg,
+                        })(
+                            <ImageUploader width="191" height="47" />,
+                        )}
+                </Form.Item>
+                
+                <Form.Item label="查看排名按钮图" help="尺寸: 191*47px，格式:png, 背景透明, 图片上需带有 查看排名 字样">
+                    {getFieldDecorator('topBtnImg',
+                        {
+                            initialValue: data.topBtnImg,
+                        })(
+                            <ImageUploader width="191" height="47" />,
+                        )}
+                </Form.Item>
+                
+                <Form.Item label="返回首页按钮图" help="尺寸: 191*47px，格式:png, 背景透明, 图片上需带有 返回首页 字样">
+                    {getFieldDecorator('homeBtnImg',
+                        {
+                            initialValue: data.homeBtnImg,
+                        })(
+                            <ImageUploader width="191" height="47" />,
+                        )}
+                </Form.Item>
+                
+                <Form.Item label="帮他助力按钮图" help="尺寸: 191*47px，格式:png, 背景透明, 图片上需带有 帮他助力 字样">
+                    {getFieldDecorator('helpBtnImg',
+                        {
+                            initialValue: data.helpBtnImg,
+                        })(
+                            <ImageUploader width="191" height="47" />,
+                        )}
+                </Form.Item>
+                
+                <Form.Item label="返回按钮图" help="尺寸: 191*47px，格式:png, 背景透明, 图片上需带有 返回 字样">
+                    {getFieldDecorator('backBtnImg',
+                        {
+                            initialValue: data.backBtnImg,
+                        })(
+                            <ImageUploader width="191" height="47" />,
+                        )}
+                </Form.Item>
+                
+                <Form.Item label="生成海报按钮图" help="尺寸: 60*60px，格式:png, 背景透明, 图片上需带有 生成海报 字样">
+                    {getFieldDecorator('posterBtnImg',
+                        {
+                            initialValue: data.posterBtnImg,
+                        })(
+                            <ImageUploader width="60" height="60" />,
+                        )}
+                </Form.Item>
+                
+                <Form.Item label="项目详情按钮图" help="尺寸: 60*60px，格式:png, 背景透明, 图片上需带有 项目详情 字样">
+                    {getFieldDecorator('buildingBtnImg',
+                        {
+                            initialValue: data.buildingBtnImg,
+                        })(
+                            <ImageUploader width="60" height="60" />,
+                        )}
+                </Form.Item>
+
                 <Form.Item label="上榜人数限制">
                     <Row>
                         <Col span={6}>

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

@@ -57,12 +57,19 @@ class ImageUpload extends React.Component {
                 <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? 'loading' : 'plus'} />
             </div>
         );
+
         // width: 150px;
         // height: 241px;
-        const value = this.props.value;
+        const boundStyle = {
+            width: `${this.props.width || 150}px`,
+            height: `${this.props.height || 150}px`,
+            marginTop: '10px',
+        }
+        
+        const { value } = this.props;
         return (
             <>
-                {!(this.state.imageUrl || value) && <div style={{ width: '150px', height: '241px', marginTop: '10px' }}> <Upload
+                {!(this.state.imageUrl || value) && <div style={boundStyle}> <Upload
                     listType="picture-card"
                     className="avatar-uploader avatar-newupdate"
                     showUploadList={false}
@@ -77,7 +84,7 @@ class ImageUpload extends React.Component {
                 </Upload>
                 </div>
                 }
-                {(this.state.imageUrl || value) && <div className="uploadbox">
+                {(this.state.imageUrl || value) && <div className="uploadbox" style={boundStyle}>
                     <img className="img" src={this.state.imageUrl || value} alt="avatar" style={{ width: '100%' }} ></img>
 
                     <Upload

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

@@ -49,12 +49,19 @@
     border:1px solid rgba(156,156,156,1);
   }
   .avatar-update{
-    width: 36px;
+    width: 100%;
+    text-align: center;
     position: absolute;
     bottom: 0;
     left: 50%;
     transform: translate(-50%, 0);
     // margin: 0 auto;
+
+    .ant-upload {
+      width: 100%;
+      text-align: center;
+      background-color: rgba(0,0,0,0.2);
+    }
   }
 }
 }

src/pages/carouselFigure/editAdvertising.jsx

@@ -229,6 +229,10 @@ const createEditor = () => {
         {
           label: '直播活动详情',
           value: 'live',
+        },
+        {
+          label: '其它',
+          value: 'others',
         }],
         value: data.contentType,
         rules: [
@@ -281,6 +285,10 @@ const createEditor = () => {
         {
           label: '直播活动详情',
           value: 'live',
+        },
+        {
+          label: '其它',
+          value: 'others',
         }],
         value: data.contentType,
         rules: [

src/pages/channel/brokerList.jsx

@@ -103,10 +103,12 @@ const header = props => {
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [queryData, setQueryData] = useState({})
+
+  const channelId = props.location.query.id
   //   const [page, changePage] = useState({})
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-    getListBroker({ channelId: props.location.query.id, pageNum: 1, pageSize: 10 })
+    getListBroker({ channelId, pageNum: 1, pageSize: 10 })
   }, [])
 
   function getListBroker(params) {
@@ -121,12 +123,12 @@ const header = props => {
 
   // 搜索
   function queryList() {
-    getListBroker({ ...queryData, pageNum: 1, pageSize: 10, channelId: props.location.query.id })
+    getListBroker({ ...queryData, pageNum: 1, pageSize: 10, channelId })
   }
   // 分页
   function onChange(pageNumber) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    getListBroker({ pageNum: pageNumber, pageSize: 10 })
+    getListBroker({ pageNum: pageNumber, pageSize: 10, channelId })
   }
   //   // 获取input的值
   //   function onInputChangeName (e) {
@@ -153,14 +155,14 @@ const header = props => {
       console.log('values', values)
       if (!err) {
         console.log('values', values)
-        getListBroker({ ...queryData, pageNum: 1, pageSize: 10, channelId: props.location.query.id, name: values.name, phone: values.phone })
+        getListBroker({ ...queryData, pageNum: 1, pageSize: 10, channelId, name: values.name, phone: values.phone })
       }
     });
   }
 
   function handleReset() {
     props.form.resetFields();
-    getListBroker({ pageNum: 1, pageSize: 10, channelId: props.location.query.id })
+    getListBroker({ pageNum: 1, pageSize: 10, channelId })
   }
   const { getFieldDecorator } = props.form;
   return (

src/pages/h5SampleManager/h5Sample/addH5.jsx

@@ -216,12 +216,12 @@ const header = props => {
                     <Button type="primary" htmlType="submit">保存</Button>
             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             <Button onClick={() => router.go(-1)}>取消</Button>
+
                 </Form.Item>
                 <Row>
                     <Col span={7}></Col>
                     <Col span={17}><span style={{ color: '#ef273a' }}>发布后请到资源位管理中关联资源位图，否则客户看不到</span></Col>
                 </Row>
-                
             </Form>
             <Modal
                 title="新增成功"