Yansen 5 gadus atpakaļ
vecāks
revīzija
a170cfe95b

+ 87
- 4
src/pages/activity/drainage/components/Basic.jsx Parādīt failu

57
                 <Form.Item label="扫码查看" >
57
                 <Form.Item label="扫码查看" >
58
                     <img src={data.qrcode || ''} alt="" style={{ width: '100px' }} />
58
                     <img src={data.qrcode || ''} alt="" style={{ width: '100px' }} />
59
                 </Form.Item>
59
                 </Form.Item>
60
-                <Form.Item label="首页背景图" help="建议尺寸:750*1206px,格式:jpg;内容区大小:750*1150">
60
+                <Form.Item label="首页背景图" help="建议尺寸:640*1234px,格式:jpg;内容区大小:640*1040px(画面最上和最下部分分别预留640*97px的空间不要放置文字、logo等关键性内容,小屏手机该部分的画面会被遮挡)">
61
                     {getFieldDecorator('indexBackgroundImg',
61
                     {getFieldDecorator('indexBackgroundImg',
62
                         {
62
                         {
63
                             initialValue: data.indexBackgroundImg,
63
                             initialValue: data.indexBackgroundImg,
73
                             <ImageUploader />,
73
                             <ImageUploader />,
74
                         )}
74
                         )}
75
                 </Form.Item>
75
                 </Form.Item>
76
-                <Form.Item label="活动规则图" help="建议尺寸:750*1206px,格式:jpg">
76
+                <Form.Item label="活动规则图" help="建议尺寸:640*1234px,格式:jpg;内容区大小:640*1040px(画面最上和最下部分分别预留640*97px的空间不要放置文字、logo等关键性内容,小屏手机该部分的画面会被遮挡)">
77
                     {getFieldDecorator('activityRulesImg',
77
                     {getFieldDecorator('activityRulesImg',
78
                         {
78
                         {
79
                             initialValue: data.activityRulesImg,
79
                             initialValue: data.activityRulesImg,
81
                             <ImageUploader />,
81
                             <ImageUploader />,
82
                         )}
82
                         )}
83
                 </Form.Item>
83
                 </Form.Item>
84
-                <Form.Item label="助力页背景图" help="建议尺寸:750*1206px,格式:jpg;内容区大小:750*1150">
84
+                <Form.Item label="助力页背景图" help="建议尺寸:640*1234px,格式:jpg;内容区大小:640*1040px(画面最上和最下部分分别预留640*97px的空间不要放置文字、logo等关键性内容,小屏手机该部分的画面会被遮挡)">
85
                     {getFieldDecorator('helpBackgroundImg',
85
                     {getFieldDecorator('helpBackgroundImg',
86
                         {
86
                         {
87
                             initialValue: data.helpBackgroundImg,
87
                             initialValue: data.helpBackgroundImg,
89
                             <ImageUploader />,
89
                             <ImageUploader />,
90
                         )}
90
                         )}
91
                 </Form.Item>
91
                 </Form.Item>
92
-                <Form.Item label="排行榜背景图" help="建议尺寸:750*1206px,格式:jpg;内容区大小:750*1150">
92
+                <Form.Item label="排行榜背景图" help="建议尺寸:640*1234px,格式:jpg;内容区大小:640*1040px(画面最上和最下部分分别预留640*97px的空间不要放置文字、logo等关键性内容,小屏手机该部分的画面会被遮挡)">
93
                     {getFieldDecorator('rankingBackgroundImg',
93
                     {getFieldDecorator('rankingBackgroundImg',
94
                         {
94
                         {
95
                             initialValue: data.rankingBackgroundImg,
95
                             initialValue: data.rankingBackgroundImg,
97
                             <ImageUploader />,
97
                             <ImageUploader />,
98
                         )}
98
                         )}
99
                 </Form.Item>
99
                 </Form.Item>
100
+                
101
+                
102
+                <Form.Item label="邀请好友按钮图" help="尺寸: 191*47px,格式:png, 背景透明, 图片上需带有 邀请好友 字样">
103
+                    {getFieldDecorator('inviteBtnImg',
104
+                        {
105
+                            initialValue: data.inviteBtnImg,
106
+                        })(
107
+                            <ImageUploader width="191" height="47" />,
108
+                        )}
109
+                </Form.Item>
110
+                
111
+                <Form.Item label="活动规则按钮图" help="尺寸: 191*47px,格式:png, 背景透明, 图片上需带有 活动规则 字样">
112
+                    {getFieldDecorator('ruleBtnImg',
113
+                        {
114
+                            initialValue: data.ruleBtnImg,
115
+                        })(
116
+                            <ImageUploader width="191" height="47" />,
117
+                        )}
118
+                </Form.Item>
119
+                
120
+                <Form.Item label="我要参加按钮图" help="尺寸: 191*47px,格式:png, 背景透明, 图片上需带有 我要参加 字样">
121
+                    {getFieldDecorator('joinBtnImg',
122
+                        {
123
+                            initialValue: data.joinBtnImg,
124
+                        })(
125
+                            <ImageUploader width="191" height="47" />,
126
+                        )}
127
+                </Form.Item>
128
+                
129
+                <Form.Item label="查看排名按钮图" help="尺寸: 191*47px,格式:png, 背景透明, 图片上需带有 查看排名 字样">
130
+                    {getFieldDecorator('topBtnImg',
131
+                        {
132
+                            initialValue: data.topBtnImg,
133
+                        })(
134
+                            <ImageUploader width="191" height="47" />,
135
+                        )}
136
+                </Form.Item>
137
+                
138
+                <Form.Item label="返回首页按钮图" help="尺寸: 191*47px,格式:png, 背景透明, 图片上需带有 返回首页 字样">
139
+                    {getFieldDecorator('homeBtnImg',
140
+                        {
141
+                            initialValue: data.homeBtnImg,
142
+                        })(
143
+                            <ImageUploader width="191" height="47" />,
144
+                        )}
145
+                </Form.Item>
146
+                
147
+                <Form.Item label="帮他助力按钮图" help="尺寸: 191*47px,格式:png, 背景透明, 图片上需带有 帮他助力 字样">
148
+                    {getFieldDecorator('helpBtnImg',
149
+                        {
150
+                            initialValue: data.helpBtnImg,
151
+                        })(
152
+                            <ImageUploader width="191" height="47" />,
153
+                        )}
154
+                </Form.Item>
155
+                
156
+                <Form.Item label="返回按钮图" help="尺寸: 191*47px,格式:png, 背景透明, 图片上需带有 返回 字样">
157
+                    {getFieldDecorator('backBtnImg',
158
+                        {
159
+                            initialValue: data.backBtnImg,
160
+                        })(
161
+                            <ImageUploader width="191" height="47" />,
162
+                        )}
163
+                </Form.Item>
164
+                
165
+                <Form.Item label="生成海报按钮图" help="尺寸: 60*60px,格式:png, 背景透明, 图片上需带有 生成海报 字样">
166
+                    {getFieldDecorator('posterBtnImg',
167
+                        {
168
+                            initialValue: data.posterBtnImg,
169
+                        })(
170
+                            <ImageUploader width="60" height="60" />,
171
+                        )}
172
+                </Form.Item>
173
+                
174
+                <Form.Item label="项目详情按钮图" help="尺寸: 60*60px,格式:png, 背景透明, 图片上需带有 项目详情 字样">
175
+                    {getFieldDecorator('buildingBtnImg',
176
+                        {
177
+                            initialValue: data.buildingBtnImg,
178
+                        })(
179
+                            <ImageUploader width="60" height="60" />,
180
+                        )}
181
+                </Form.Item>
182
+
100
                 <Form.Item label="上榜人数限制">
183
                 <Form.Item label="上榜人数限制">
101
                     <Row>
184
                     <Row>
102
                         <Col span={6}>
185
                         <Col span={6}>

+ 10
- 3
src/pages/activity/drainage/components/ImageUpload.jsx Parādīt failu

57
                 <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? 'loading' : 'plus'} />
57
                 <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? 'loading' : 'plus'} />
58
             </div>
58
             </div>
59
         );
59
         );
60
+
60
         // width: 150px;
61
         // width: 150px;
61
         // height: 241px;
62
         // height: 241px;
62
-        const value = this.props.value;
63
+        const boundStyle = {
64
+            width: `${this.props.width || 150}px`,
65
+            height: `${this.props.height || 150}px`,
66
+            marginTop: '10px',
67
+        }
68
+        
69
+        const { value } = this.props;
63
         return (
70
         return (
64
             <>
71
             <>
65
-                {!(this.state.imageUrl || value) && <div style={{ width: '150px', height: '241px', marginTop: '10px' }}> <Upload
72
+                {!(this.state.imageUrl || value) && <div style={boundStyle}> <Upload
66
                     listType="picture-card"
73
                     listType="picture-card"
67
                     className="avatar-uploader avatar-newupdate"
74
                     className="avatar-uploader avatar-newupdate"
68
                     showUploadList={false}
75
                     showUploadList={false}
77
                 </Upload>
84
                 </Upload>
78
                 </div>
85
                 </div>
79
                 }
86
                 }
80
-                {(this.state.imageUrl || value) && <div className="uploadbox">
87
+                {(this.state.imageUrl || value) && <div className="uploadbox" style={boundStyle}>
81
                     <img className="img" src={this.state.imageUrl || value} alt="avatar" style={{ width: '100%' }} ></img>
88
                     <img className="img" src={this.state.imageUrl || value} alt="avatar" style={{ width: '100%' }} ></img>
82
 
89
 
83
                     <Upload
90
                     <Upload

+ 8
- 1
src/pages/activity/drainage/components/style.less Parādīt failu

49
     border:1px solid rgba(156,156,156,1);
49
     border:1px solid rgba(156,156,156,1);
50
   }
50
   }
51
   .avatar-update{
51
   .avatar-update{
52
-    width: 36px;
52
+    width: 100%;
53
+    text-align: center;
53
     position: absolute;
54
     position: absolute;
54
     bottom: 0;
55
     bottom: 0;
55
     left: 50%;
56
     left: 50%;
56
     transform: translate(-50%, 0);
57
     transform: translate(-50%, 0);
57
     // margin: 0 auto;
58
     // margin: 0 auto;
59
+
60
+    .ant-upload {
61
+      width: 100%;
62
+      text-align: center;
63
+      background-color: rgba(0,0,0,0.2);
64
+    }
58
   }
65
   }
59
 }
66
 }
60
 }
67
 }

+ 8
- 0
src/pages/carouselFigure/editAdvertising.jsx Parādīt failu

229
         {
229
         {
230
           label: '直播活动详情',
230
           label: '直播活动详情',
231
           value: 'live',
231
           value: 'live',
232
+        },
233
+        {
234
+          label: '其它',
235
+          value: 'others',
232
         }],
236
         }],
233
         value: data.contentType,
237
         value: data.contentType,
234
         rules: [
238
         rules: [
281
         {
285
         {
282
           label: '直播活动详情',
286
           label: '直播活动详情',
283
           value: 'live',
287
           value: 'live',
288
+        },
289
+        {
290
+          label: '其它',
291
+          value: 'others',
284
         }],
292
         }],
285
         value: data.contentType,
293
         value: data.contentType,
286
         rules: [
294
         rules: [