魏超 5 年前
父节点
当前提交
d778bd86fc

+ 3
- 3
src/pages/activity/ActivityList.jsx 查看文件

@@ -138,7 +138,7 @@ const header = props => {
138 138
       render: (x, row) => (
139 139
         <>
140 140
           <AuthButton name="admin.SignList.get" noRight={null}>
141
-          {(row.activityStatus === 0 || row.activityStatus === 2) && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' ? '报名记录' : ''}{ (row.isEnlist==1)  && <Icon type="snippets" className={styles.shoppingCart} />}</span>}
141
+          {(row.activityStatus === 0 || row.activityStatus === 2) && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, row.dynamicId)}>报名记录{<Icon type="snippets" className={styles.shoppingCart} />}</span>}
142 142
           </AuthButton>
143 143
           <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
144 144
             <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>
@@ -150,7 +150,7 @@ const header = props => {
150 150
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{row.weight === 1 ? '取消标签' : '添加标签'}<Icon type="vertical-align-top" className={styles.edit} /></span>
151 151
             {(row.activityStatus === 0 || row.activityStatus === 1) && <span style={{ color: '#FF925C',marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
152 152
           </AuthButton>
153
-      {(row.activityStatus === 0 || row.activityStatus === 2) &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>{row.isEnlist === 1 && '下载二维码'} {row.isEnlist === 1 && <Icon type="qrcode" className={styles.shoppingCart} />}</span>}
153
+      {(row.activityStatus === 0 || row.activityStatus === 2) &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>{'下载二维码'} {<Icon type="qrcode" className={styles.shoppingCart} />}</span>}
154 154
         </>
155 155
       ),
156 156
     },
@@ -166,7 +166,7 @@ const header = props => {
166 166
 
167 167
   const finishDynamic = row => {
168 168
     Modal.confirm({
169
-      title: '活动会被强制结束,小程序端无法再发起或参与此拼团,如果不想让客户看到活动,请再点击取消发布按钮',
169
+      title: '活动会被强制结束,小程序端无法再发起或参与此活动,如果不想让客户看到活动,请再点击取消发布按钮',
170 170
       okText: '确定',
171 171
       cancelText: '取消',
172 172
       onOk () {

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

@@ -199,7 +199,7 @@ const BasicForm = props => {
199 199
               message: '请输入权重',
200 200
             },
201 201
           ],
202
-        })(<Input type="number" disabled={activityStatus===0 ? true : false} style={{ width: 80}}/>)}<span style={{ marginLeft: 30, color:'grey'}}>数字越大越靠前</span>
202
+        })(<Input type="number" style={{ width: 80}}/>)}<span style={{ marginLeft: 30, color:'grey'}}>数字越大越靠前</span>
203 203
         </Form.Item>
204 204
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
205 205
           <Button type="primary" htmlType="submit">

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

@@ -161,7 +161,7 @@ const Edit = props => {
161 161
         label: '权重',
162 162
         name: 'heavy',
163 163
         type: FieldTypes.Number,
164
-        render: <Input type="number" style={{ width: 80}}/>,
164
+        render: <Input type="number" style={{ width: 80}} />,
165 165
         value: dynamicData.heavy,
166 166
         rules: [
167 167
           { required: true, message: '请输入权重' },

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

@@ -144,7 +144,7 @@ const header = props => {
144 144
               message: '请选择所属项目',
145 145
             },
146 146
           ],
147
-        })(<BuildSelect />)}
147
+        })(<BuildSelect disabled={disable}/>)}
148 148
         </Form.Item>
149 149
 
150 150
         <Form.Item label="活动标题">
@@ -199,7 +199,7 @@ const header = props => {
199 199
               message: '请选择活动时间',
200 200
             },
201 201
           ],
202
-        })(<RangePicker format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
202
+        })(<RangePicker disabled={activityStatus===0 ? true : false} format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
203 203
         </Form.Item>
204 204
 
205 205
         <Form.Item label="助力邀请人数" min={1} max={10}>
@@ -210,7 +210,7 @@ const header = props => {
210 210
               message: '请输入活动人数',
211 211
             },
212 212
           ],
213
-        })(<Input type="number" />)}
213
+        })(<Input type="number" disabled={activityStatus===0 ? true : false}/>)}
214 214
         </Form.Item>
215 215
 
216 216
         <Form.Item label="助力次数">
@@ -222,7 +222,7 @@ const header = props => {
222 222
             },
223 223
           ],
224 224
         })(
225
-          <Radio.Group onChange={(e) => radioOnChange(e)}>
225
+          <Radio.Group onChange={(e) => radioOnChange(e)} disabled={activityStatus===0 ? true : false}>
226 226
             <Radio value={0}>不限制</Radio>
227 227
             <Radio value={1}>限制</Radio>
228 228
           </Radio.Group>,
@@ -259,7 +259,7 @@ const header = props => {
259 259
               message: '请输入权重',
260 260
             },
261 261
           ],
262
-        })(<Input type="number" disabled={activityStatus===0 ? true : false} style={{ width: 80}}/>)}<span style={{ marginLeft: 30, color:'grey'}}>数字越大越靠前</span>
262
+        })(<Input type="number" style={{ width: 80}}/>)}<span style={{ marginLeft: 30, color:'grey'}}>数字越大越靠前</span>
263 263
         </Form.Item>
264 264
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
265 265
           <Button type="primary" htmlType="submit">

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

@@ -288,7 +288,7 @@ function AddBuilding(props) {
288 288
               </Select>,
289 289
             )}
290 290
           </Form.Item>
291
-          <Form.Item label="项目视频" help="视频仅支持mp4格式,建议尺寸:1920*1080,比例16:9">
291
+          <Form.Item label="项目视频" help="视频仅支持mp4格式,建议图片尺寸:750*600,比例5:4,用于楼盘详情">
292 292
             {getFieldDecorator('videoUrl')(
293 293
               // disabled={fileUploadDisabled}
294 294
               <FileUpload accept=".mp4" beforeUpload={fileUploadBeforeUpload} label="上传视频" size={1} />,