合并

src/pages/activity/ActivityList.jsx

       render: (x, row) => (
         <>
           <AuthButton name="admin.SignList.get" noRight={null}>
-          {(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>}
+          {(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>}
           </AuthButton>
           <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
             <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{row.weight === 1 ? '取消标签' : '添加标签'}<Icon type="vertical-align-top" className={styles.edit} /></span>
             {(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>}
           </AuthButton>
-      {(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>}
+      {(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>}
         </>
       ),
     },
 
   const finishDynamic = row => {
     Modal.confirm({
-      title: '活动会被强制结束，小程序端无法再发起或参与此拼团，如果不想让客户看到活动，请再点击取消发布按钮',
+      title: '活动会被强制结束，小程序端无法再发起或参与此活动，如果不想让客户看到活动，请再点击取消发布按钮',
       okText: '确定',
       cancelText: '取消',
       onOk () {

src/pages/activity/editActivity.jsx

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

src/pages/activity/groupActivity/editGroupActivity.jsx

         label: '权重',
         name: 'heavy',
         type: FieldTypes.Number,
-        render: <Input type="number" style={{ width: 80}}/>,
+        render: <Input type="number" style={{ width: 80}} />,
         value: dynamicData.heavy,
         rules: [
           { required: true, message: '请输入权重' },

src/pages/activity/helpActivity/edithelpActivity.jsx

               message: '请选择所属项目',
             },
           ],
-        })(<BuildSelect />)}
+        })(<BuildSelect disabled={disable}/>)}
         </Form.Item>
 
         <Form.Item label="活动标题">
               message: '请选择活动时间',
             },
           ],
-        })(<RangePicker format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+        })(<RangePicker disabled={activityStatus===0 ? true : false} format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
         </Form.Item>
 
         <Form.Item label="助力邀请人数" min={1} max={10}>
               message: '请输入活动人数',
             },
           ],
-        })(<Input type="number" />)}
+        })(<Input type="number" disabled={activityStatus===0 ? true : false}/>)}
         </Form.Item>
 
         <Form.Item label="助力次数">
             },
           ],
         })(
-          <Radio.Group onChange={(e) => radioOnChange(e)}>
+          <Radio.Group onChange={(e) => radioOnChange(e)} disabled={activityStatus===0 ? true : false}>
             <Radio value={0}>不限制</Radio>
             <Radio value={1}>限制</Radio>
           </Radio.Group>,
               message: '请输入权重',
             },
           ],
-        })(<Input type="number" disabled={activityStatus===0 ? true : false} style={{ width: 80}}/>)}<span style={{ marginLeft: 30, color:'grey'}}>数字越大越靠前</span>
+        })(<Input type="number" style={{ width: 80}}/>)}<span style={{ marginLeft: 30, color:'grey'}}>数字越大越靠前</span>
         </Form.Item>
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
           <Button type="primary" htmlType="submit">

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

       data.videoImage = [{ imgType: 'videoImage', url: data.videoImage, orderNo: 1 }]
     }
 
-    if (res.buildingTransport) {
-      res.buildingTransport = res.buildingTransport.filter(f => f.delete === true).map(x => ({ tagName: x }))
+    if (data.buildingTransport) {
+      data.buildingTransport = data.buildingTransport.filter(f => f.delete === true).map(x => x.tagName).join(',')
     }
-    if (res.buildingMall) {
-      res.buildingMall = res.buildingMall.filter(f => f.delete === true).map(x => ({ tagName: x }))
+    if (data.buildingMall) {
+      data.buildingMall = data.buildingMall.filter(f => f.delete === true).map(x => x.tagName).join(',')
     }
-    if (res.buildingEdu) {
-      res.buildingEdu = res.buildingEdu.filter(f => f.delete === true).map(x => ({ tagName: x }))
+    if (data.buildingEdu) {
+      data.buildingEdu = data.buildingEdu.filter(f => f.delete === true).map(x => x.tagName).join(',')
     }
-    if (res.buildingHospital) {
-      res.buildingHospital = res.buildingHospital.filter(f => f.delete === true).map(x => ({ tagName: x }))
+    if (data.buildingHospital) {
+      data.buildingHospital = data.buildingHospital.filter(f => f.delete === true).map(x => x.tagName).join(',')
     }
-    if (res.buildingBank) {
-      res.buildingBank = res.buildingBank.filter(f => f.delete === true).map(x => ({ tagName: x }))
+    if (data.buildingBank) {
+      data.buildingBank = data.buildingBank.filter(f => f.delete === true).map(x => x.tagName).join(',')
     }
-    if (res.buildingRestaurant) {
-      res.buildingRestaurant = res.buildingRestaurant.filter(f => f.delete === true).map(x => ({ tagName: x }))
+    if (data.buildingRestaurant) {
+      data.buildingRestaurant = data.buildingRestaurant.filter(f => f.delete === true).map(x => x.tagName).join(',')
     }
 
     const api = data.buildingId === undefined ? apis.building.addBuilding : apis.building.updateBuilding
               </Select>,
             )}
           </Form.Item>
-          <Form.Item label="项目视频" help="视频仅支持mp4格式，建议尺寸：1920*1080，比例16:9">
+          <Form.Item label="项目视频" help="视频仅支持mp4格式，建议图片尺寸：750*600，比例5:4，用于楼盘详情">
             {getFieldDecorator('videoUrl')(
               // disabled={fileUploadDisabled}
               <FileUpload accept=".mp4" beforeUpload={fileUploadBeforeUpload} label="上传视频" size={1} />,

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

     const { inputValue } = this.state;
 
     const tags = this.getTags()
-    if (inputValue && tags.indexOf(inputValue) === -1) {
+    const tagList = tags.map(x => x.tagName)
+    if (inputValue && tagList.indexOf(inputValue) === -1) {
       // 如果有新的值，就把这个值追加到 tags 原本值的后面，在通过onChange事件传递出去
+      console.log(tags.concat([{ tagName: inputValue, delete: true }]))
       this.toggleOnChange(tags.concat([{ tagName: inputValue, delete: true }]))
     }