瀏覽代碼

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

weiximei 5 年之前
父節點
當前提交
762717e8f1

+ 2
- 2
src/pages/activity/editActivity.jsx 查看文件

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

+ 2
- 2
src/pages/activity/groupActivity/editGroupActivity.jsx 查看文件

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

+ 2
- 2
src/pages/activity/helpActivity/edithelpActivity.jsx 查看文件

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

+ 1
- 1
src/pages/building/list/add/components/poster.jsx 查看文件

141
       </div>
141
       </div>
142
       <div >
142
       <div >
143
         <div style={{ display: 'flex', width: '100%', margin: '30px 0' }}>
143
         <div style={{ display: 'flex', width: '100%', margin: '30px 0' }}>
144
-          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}><span style={{ color: 'red' }}>*</span> 海报图</p>
144
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}><span style={{ color: 'red' }}>*</span> 楼盘海报图</p>
145
           <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
145
           <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
146
         </div>
146
         </div>
147
         <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸:750*600px,比例5:4,格式:jpg,用于楼盘海报</p>
147
         <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸:750*600px,比例5:4,格式:jpg,用于楼盘海报</p>

+ 1
- 1
src/pages/building/list/add/components/share.jsx 查看文件

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

+ 9
- 2
src/pages/integralMall/editGoods.jsx 查看文件

40
       ]
40
       ]
41
     },
41
     },
42
     {
42
     {
43
-      label: '商品图',
43
+      label: '商品封面图',
44
       name: 'imgUrl',
44
       name: 'imgUrl',
45
       type: FieldTypes.ImageUploader,
45
       type: FieldTypes.ImageUploader,
46
       value: goodsData.imgUrl,
46
       value: goodsData.imgUrl,
47
-      help: '建议图片尺寸:164px*164px',
47
+      help: '建议图片尺寸:320*320px,比例1:1,格式:jpg,用于商品封面图',
48
+    },
49
+    {
50
+      label: '商品主图',
51
+      name: 'detailImgUrl',
52
+      type: FieldTypes.ImageUploader,
53
+      value: goodsData.detailImgUrl,
54
+      help: '建议图片尺寸:750*750px,比例1:1,格式:jpg,用于商品主图',
48
     },
55
     },
49
     {
56
     {
50
       label: '商品名称',
57
       label: '商品名称',

+ 6
- 5
src/pages/news/list/editNewsList.jsx 查看文件

64
         ]
64
         ]
65
       },
65
       },
66
       {
66
       {
67
-        label: '资讯列表',
67
+        label: '资讯列表',
68
         name: 'newsImg',
68
         name: 'newsImg',
69
         type: FieldTypes.ImageUploader,
69
         type: FieldTypes.ImageUploader,
70
         value: dynamicData.newsImg,
70
         value: dynamicData.newsImg,
71
-        help: '建议图片尺寸:660px*416px',
71
+        help: '建议图片尺寸:320*256px,比例5:4,格式:jpg,用于资讯列表',
72
       },
72
       },
73
       {
73
       {
74
         label: '资讯标题',
74
         label: '资讯标题',
215
 
215
 
216
         <div >
216
         <div >
217
           <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
217
           <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
218
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图</p>
218
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>资讯海报图</p>
219
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
219
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
220
           </div>
220
           </div>
221
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸:750*600px,比例5:4,格式:jpg,用于资讯海报</p>
221
           <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
222
           <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
222
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
223
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
223
             <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
224
             <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
290
         <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
291
         <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
291
       </div>
292
       </div>
292
       <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
293
       <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
293
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图</p>
294
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>资讯分享好友图</p>
294
         <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
295
         <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
295
       </div>
296
       </div>
296
-      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '250px' }}>图片比例: 5:4</p>
297
+      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>建议图片尺寸:750*600px,比例5:4,格式:jpg,用于资讯分享好友</p>
297
       <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
298
       <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
298
       <Button onClick={() => router.go(-1)}>取消</Button>
299
       <Button onClick={() => router.go(-1)}>取消</Button>
299
     </div>
300
     </div>