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

src/pages/activity/editActivity.jsx

@@ -108,27 +108,25 @@ const BasicForm = props => {
           ],
         })(<BuildSelect disabled={disable}/>)}
         </Form.Item>
-        <Form.Item label="活动详情图">
-          {getFieldDecorator('detailImgUrl', {
+        <Form.Item label="活动封面图1" help="建议图片尺寸：750px*420px，比例16:9,格式：jpg，用于活动列表">
+          {getFieldDecorator('listImgUrl', {
           rules: [
             {
               required: true,
-              message: '请选择活动详情图',
+              message: '请选择活动封面图1',
             },
           ],
         })(<ImageUploader />)}
-          <span>建议图片尺寸：750px*560px</span>
         </Form.Item>
-        <Form.Item label="活动列表图">
+        <Form.Item label="活动详情主图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于普通活动详情">
           {getFieldDecorator('imgUrl', {
           rules: [
             {
               required: true,
-              message: '请选择活动列表图',
+              message: '请选择活动详情主图',
             },
           ],
         })(<ImageUploader />)}
-          <span>建议图片尺寸：750px*560px</span>
         </Form.Item>
         <Form.Item label="活动标题">
         {getFieldDecorator('title', {
@@ -342,6 +340,7 @@ const Edit = props => {
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于普通活动海报</p>
           <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)} />
@@ -419,7 +418,7 @@ const Edit = props => {
         <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: '250px' }}>图片比例: 5:4</p>
+      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于活动分享好友</p>
       <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
       <Button onClick={() => router.go(-1)}>取消</Button>
     </div>

src/pages/activity/groupActivity/editGroupActivity.jsx

@@ -86,24 +86,34 @@ const Edit = props => {
         ]
       },
       {
-        label: '活动主图',
+        label: '拼团详情主图',
         name: 'mainImg',
         type: FieldTypes.ImageUploader,
         value: dynamicData.mainImg,
         rules: [
-          { required: true, message: '请输入活动主图' },
+          { required: true, message: '请输入拼团详情主图' },
         ],
-        help: '建议尺寸375*312px',
+        help: '建议图片尺寸：750*600px，比例5:4,格式：jpg，用于拼团活动详情',
       },
       {
-        label: '活动列表图',
-        name: 'detailImg',
+        label: '拼团封面图1',
+        name: 'listImg',
         type: FieldTypes.ImageUploader,
-        value: dynamicData.detailImg,
+        value: dynamicData.listImg,
         rules: [
-          { required: true, message: '请输入活动列表图' },
+          { required: true, message: '请输入拼团封面图1' },
         ],
-        help: '建议尺寸375*312px',
+        help: '建议图片尺寸：750*420px，比例16:9,格式：jpg，用于活动列表',
+      },
+      {
+        label: '拼团封面图2',
+        name: 'bannerListImg',
+        type: FieldTypes.ImageUploader,
+        value: dynamicData.bannerListImg,
+        rules: [
+          { required: true, message: '请输入拼团封面图2' },
+        ],
+        help: '建议图片尺寸：670*224px，比例3:1,格式：jpg，用于首页底部活动轮播',
       },
       {
         label: '活动时间',
@@ -285,6 +295,7 @@ const Edit = props => {
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于拼团活动海报</p>
           <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)} />
@@ -362,7 +373,7 @@ const Edit = props => {
         <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: '250px' }}>图片比例: 5:4</p>
+      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于拼团活动分享好友</p>
       <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
       <Button onClick={() => router.go(-1)}>取消</Button>
     </div>

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -154,12 +154,34 @@ const header = props => {
         })(<Input />)}
         </Form.Item>
 
-        <Form.Item label="活动主图" help="建议尺寸375*312px">
+        <Form.Item label="助力详情主图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于助力活动详情">
           {getFieldDecorator('img', {
           rules: [
             {
               required: true,
-              message: '活动主图不能为空',
+              message: '助力详情主图不能为空',
+            },
+          ],
+        })(<ImageUploader />)}
+        </Form.Item>
+
+        <Form.Item label="助力封面图1" help="建议图片尺寸：750*420px，比例16:9,格式：jpg，用于活动列表">
+          {getFieldDecorator('listImg', {
+          rules: [
+            {
+              required: true,
+              message: '助力封面图1不能为空',
+            },
+          ],
+        })(<ImageUploader />)}
+        </Form.Item>
+
+        <Form.Item label="助力封面图2" help="建议图片尺寸：670*224px，比例3:1,格式：jpg，用于首页底部活动轮播">
+          {getFieldDecorator('bannerListImg', {
+          rules: [
+            {
+              required: true,
+              message: '助力封面图2不能为空',
             },
           ],
         })(<ImageUploader />)}
@@ -377,6 +399,7 @@ const Edit = props => {
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于助力活动海报</p>
           <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)} />
@@ -454,7 +477,7 @@ const Edit = props => {
         <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: '250px' }}>图片比例: 5:4</p>
+      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于助力活动分享好友</p>
       <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
       <Button onClick={() => router.go(-1)}>取消</Button>
     </div>

src/pages/building/list/add/components/base.jsx

@@ -271,14 +271,14 @@ function AddBuilding(props) {
               <FileUpload accept=".mp4" beforeUpload={fileUploadBeforeUpload} label="上传视频"/>,
             )}
           </Form.Item>
-          <Form.Item label="项目主图" help="建议图片尺寸：640px*360px">
+          <Form.Item label="楼盘主图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于楼盘详情">
             {getFieldDecorator('avatarImage', {
               rules: [{ required: true, message: '请选择项目主图' }],
             })(
               <ImageListUpload />,
             )}
           </Form.Item>
-          <Form.Item label="列表图" help="建议图片尺寸：640px*360px">
+          <Form.Item label="楼盘封面图" help="建议图片尺寸：670*377px，比例16:9,格式：jpg，用于楼盘列表">
             {getFieldDecorator('listImage', {
               rules: [{ required: true, message: '请选择列表图' }],
             })(

src/pages/building/list/add/components/poster.jsx

@@ -140,10 +140,11 @@ const Poster = props => {
         <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
       </div>
       <div >
-        <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+        <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'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于楼盘海报</p>
         <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
           <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
           <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />

src/pages/building/list/add/components/share.jsx

@@ -87,7 +87,7 @@ const Share = props => {
       <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: '250px' }}>图片比例: 5:4</p>
+    <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于楼盘分享好友</p>
     <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
     <Button onClick={() => router.go(-1)}>取消</Button>
   </div>

src/pages/carouselFigure/editAdvertising.jsx

@@ -77,11 +77,11 @@ import SelectGroup from './SelectGroup';
         value: data.buildingId,
       },
       {
-        label: '商品图片',
+        label: '开屏广告',
         name: 'image',
         type: FieldTypes.ImageUploader,
         value: data.image,
-        help: '建议图片尺寸：640px*960px',
+        help: '建议图片尺寸：640*960px，比例2:3,格式：jpg，用于开屏广告',
       },
       {
         label: '标题',

src/pages/carouselFigure/editCarousel.jsx

@@ -28,15 +28,19 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
   let helpVisible = false
   let groupVisible = false
   let buildingId = ''
+  let locationType = false
 
   const setExtraData = data => {
+    console.log(data, 'data');
     contentVisible = data.contentType === 'other';
     activityVisible = data.contentType === 'activity';
     newsVisible = data.contentType === 'news';
     helpVisible = data.contentType === 'help';
     groupVisible = data.contentType === 'group';
-
+    
     buildingId = data.buildingId
+    locationType = data.showPosition === 'mall';
+    console.log(locationType, 'locationType');
   }
 
     
@@ -81,11 +85,11 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
           value: data.buildingId,
         },
         {
-          label: '商品图片',
+          label: locationType ? '积分商城轮播图' : '首页轮播图',
           name: 'image',
           type: FieldTypes.ImageUploader,
           value: data.image,
-          help: '建议图片尺寸：640px*330px',
+          help: locationType ? '建议图片尺寸：750*420px，比例16:9,格式：jpg，用于积分商城banner轮播':'建议图片尺寸：750*600px，比例5:4,格式：jpg，用于首页顶部banner轮播',
         },
         {
           label: '标题',

src/pages/staff/list/editStaff.jsx

@@ -191,10 +191,10 @@ const Edit = (props) => {
       value: userData.buildingId
     },
     {
-      label: '头像',
+      label: '置业顾问头像',
       name: 'photo',
       type: FieldTypes.ImageUploader,
-      extra: '建议图片大小 640 * 640',
+      extra: '建议图片尺寸：320*320px，比例1:1,格式：jpg，用于置业顾问头像',
       value: userData.photo,
       rules: [
         { required: true, message: '请选择头像' },

src/pages/system/editPolicy.jsx

@@ -48,11 +48,11 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         value: policyData.cityId,
       },
       {
-        label: '政策图片',
+        label: '购房政策封面图',
         name: 'policyImg',
         type: FieldTypes.ImageUploader,
         value: policyData.policyImg,
-        help: '建议图片尺寸：660px*416px',
+        help: '建议图片尺寸：220*176px，比例5:4,格式：jpg，用于购房百科列表',
       },
       {
         label: '政策标题',