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

src/pages/activity/editActivity.jsx

@@ -337,7 +337,7 @@ const Edit = props => {
 
         <div >
           <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动海报图</p>
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
           <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于普通活动海报</p>
@@ -415,7 +415,7 @@ const Edit = props => {
         <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
       </div>
       <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动分享图</p>
         <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
       </div>
       <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于活动分享好友</p>

src/pages/activity/groupActivity/editGroupActivity.jsx

@@ -292,7 +292,7 @@ const Edit = props => {
 
         <div >
           <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>拼团海报图</p>
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
           <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于拼团活动海报</p>
@@ -370,7 +370,7 @@ const Edit = props => {
         <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
       </div>
       <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>拼团分享图</p>
         <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
       </div>
       <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于拼团活动分享好友</p>

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -396,7 +396,7 @@ const Edit = props => {
 
         <div >
           <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>助力海报图</p>
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
           <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于助力活动海报</p>
@@ -474,7 +474,7 @@ const Edit = props => {
         <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
       </div>
       <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>助力分享图</p>
         <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
       </div>
       <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于助力活动分享好友</p>

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

@@ -141,7 +141,7 @@ const Poster = props => {
       </div>
       <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>
+          <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>

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

@@ -84,7 +84,7 @@ const Share = props => {
       <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
     </div>
     <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
-      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>楼盘分享图</p>
       <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
     </div>
     <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于楼盘分享好友</p>

src/pages/integralMall/editGoods.jsx

@@ -40,11 +40,18 @@ const header = props => {
       ]
     },
     {
-      label: '商品图片',
+      label: '商品封面图',
       name: 'imgUrl',
       type: FieldTypes.ImageUploader,
       value: goodsData.imgUrl,
-      help: '建议图片尺寸：164px*164px',
+      help: '建议图片尺寸：320*320px，比例1:1,格式：jpg，用于商品封面图',
+    },
+    {
+      label: '商品主图',
+      name: 'detailImgUrl',
+      type: FieldTypes.ImageUploader,
+      value: goodsData.detailImgUrl,
+      help: '建议图片尺寸：750*750px，比例1:1,格式：jpg，用于商品主图',
     },
     {
       label: '商品名称',

src/pages/news/list/editNewsList.jsx

@@ -64,11 +64,11 @@ const { TextArea } = Input;
         ]
       },
       {
-        label: '资讯列表图',
+        label: '资讯列表',
         name: 'newsImg',
         type: FieldTypes.ImageUploader,
         value: dynamicData.newsImg,
-        help: '建议图片尺寸：660px*416px',
+        help: '建议图片尺寸：320*256px，比例5:4,格式：jpg，用于资讯列表',
       },
       {
         label: '资讯标题',
@@ -215,9 +215,10 @@ const { TextArea } = Input;
 
         <div >
           <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>资讯海报图</p>
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于资讯海报</p>
           <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)} />
@@ -290,10 +291,10 @@ const { TextArea } = Input;
         <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
       </div>
       <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>资讯分享好友图</p>
         <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
       </div>
-      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '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>