合并

src/pages/activity/ActivityList.jsx

@@ -147,7 +147,7 @@ const header = props => {
             {row.activityStatus === 0 && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={finishDynamic.bind(this, row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
           </AuthButton>
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{row.weight === 1 ? '取消添加标签' : '添加标签'}<Icon type="vertical-align-top" 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>}

src/pages/activity/groupActivity/editGroupActivity.jsx

@@ -32,6 +32,9 @@ const Edit = props => {
   const { groupActivityId } = props.location.query
   const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
   const [scoreData, setScoreData] = useState({})
+  const [activityStatus, setActivityStatus] = useState({})
+  const [disable, setDisable] = useState(false)
+
   useEffect(() => {
     request(apis.groupActivity.avgScore).then((data) => {
       setScoreData(data);
@@ -46,6 +49,8 @@ const Edit = props => {
     const getDynamicData = (groupActivityId) => {
       request({ ...apis.groupActivity.details, urlData: { id: groupActivityId } }).then((data) => {
         setDynamicData(data)
+        setActivityStatus(data.activityStatus)
+        setDisable(data.activityStatus === 0 ? true : false)
       })
     }
   }
@@ -65,7 +70,7 @@ const Edit = props => {
       {
         label: '选择项目',
         name: 'buildingId',
-        render: <BuildSelect />,
+        render: <BuildSelect disabled={disable}/>,
         value: dynamicData.buildingId,
         rules: [
           { required: true, message: '请选择项目' },
@@ -90,12 +95,22 @@ const Edit = props => {
         ],
         help: '建议尺寸375*312px',
       },
+      {
+        label: '活动列表图',
+        name: 'detailImg',
+        type: FieldTypes.ImageUploader,
+        value: dynamicData.detailImg,
+        rules: [
+          { required: true, message: '请输入活动列表图' },
+        ],
+        help: '建议尺寸375*312px',
+      },
       {
         label: '活动时间',
         name: 'activityTime',
         type: FieldTypes.RangePicker,
         value: dynamicData.startTime != null ? [moment(dynamicData.startTime, 'YYYY-MM-DD HH:mm'), moment(dynamicData.endTime, 'YYYY-MM-DD HH:mm')] : null,
-        props: { showTime: { format: 'HH:mm' } },
+        props: { showTime: { format: 'HH:mm' }, disabled: activityStatus === 0 ? true : false },
         rules: [
           { required: true, message: '请选择活动时间' },
         ],
@@ -105,6 +120,7 @@ const Edit = props => {
         name: 'groupBuyPeople',
         type: FieldTypes.Text,
         value: dynamicData.groupBuyPeople,
+        props: {disabled: activityStatus === 0 ? true : false },
         help: '注：成团所需人数',
         rules: [
           { required: true, message: '请输入成团人数' },
@@ -115,6 +131,7 @@ const Edit = props => {
         name: 'integral',
         type: FieldTypes.Text,
         value: dynamicData.integral,
+        props: {disabled: activityStatus === 0 ? true : false },
         help: '注：用户平均积分' + scoreData.averageScore,
         rules: [
           { required: true, message: '请输入所需积分' },
@@ -130,6 +147,17 @@ const Edit = props => {
         ],
         help: '建议宽度:335px,高度不限',
       },
+      {
+        label: '权重',
+        name: 'heavy',
+        type: FieldTypes.Number,
+        render: <Input type="number" style={{ width: 80}}/>,
+        value: dynamicData.heavy,
+        rules: [
+          { required: true, message: '请输入权重' },
+        ],
+        help: '数字越大越靠前',
+      },
     ]
 
     const handleSubmit = val => {

src/pages/activity/groupActivity/list.jsx

@@ -101,43 +101,27 @@ const header = props => {
           {row.activityStatus === 0 &&
             <AuthButton name="admin.taShareActivity.finish.put" noRight={null}><span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span></AuthButton>
           }
-          {row.activityStatus === 0 &&
+          {(row.activityStatus === 0 || row.activityStatus === 2)&&
             <AuthButton name="admin.taShareSuccessRecord.get" noRight={null}>
               <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span>
             </AuthButton>
           }
-          {row.activityStatus === 0 &&
+          {
+            <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>
+            </AuthButton>
+          }
+          {
             <AuthButton name="admin.taShareActivity.list.get" noRight={null}>
-              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{row.weight === 1 ? '取消置顶' : '置顶'}<Icon type="vertical-align-top" className={styles.edit} /></span>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{row.weight === 1 ? '取消标签' : '添加标签'}<Icon type="vertical-align-top" className={styles.edit} /></span>
               <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{row.sort === true ? '取消推荐首页' : '推荐首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
             </AuthButton>}
 
-          {row.activityStatus === 1 &&
+          {(row.activityStatus === 0 || row.activityStatus === 1) &&
             <AuthButton name="admin.taShareActivity.update.put" noRight={null}>
               <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditActivity(row.groupActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
             </AuthButton>
           }
-          {row.activityStatus === 1 &&
-            <AuthButton name="admin.taShareActivity.finish.put" noRight={null}>
-              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
-            </AuthButton>
-          }
-          {row.activityStatus === 1 &&
-            <AuthButton name="admin.taShareActivity.weight.put" noRight={null}>
-              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{row.weight === 1 ? '取消置顶' : '置顶'}<Icon type="vertical-align-top" className={styles.edit} /></span>
-              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{row.sort === true ? '取消推荐首页' : '推荐首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
-            </AuthButton>
-          }
-
-          {row.activityStatus === 2 &&
-            <AuthButton><span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span></AuthButton>
-          }
-          {row.activityStatus === 2 &&
-            <AuthButton name="admin.taShareActivity.weight.put" noRight={null}>
-              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{row.weight === 1 ? '取消置顶' : '置顶'}<Icon type="vertical-align-top" className={styles.edit} /></span>
-              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{row.sort === true ? '取消推荐首页' : '推荐首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
-            </AuthButton>
-          }
         </>
       ),
     },
@@ -193,21 +177,28 @@ const header = props => {
     })
   }
 
-  //首页推荐
-  const recommendGroupActivity = (row, code) => () => {
-    request({ ...apis.groupActivity.top, data: { groupActivityId: row.groupActivityId, sort: row.sort } }).then((data) => {
-      console.log(data)
+  const sendOrPublicDynamic = row => {
+    if (row.status === 1) {
+      cancelDynamic(row)
+    } else {
+      sendDynamic(row)
+    }
+  }
+
+  // 取消活动
+  const cancelDynamic = row => {
+    request({ ...apis.groupActivity.cancel, urlData: { id: row.groupActivityId } }).then(data => {
       message.info('操作成功！')
-      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
-    }).catch((err) => {
+      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue()  })
+    }).catch(err => {
       console.log(err)
       message.info(err.msg || err.message)
     })
   }
 
-  //发布活动
-  const sendDynamic = (row) => {
-    request({ ...apis.activity.send, urlData: { id: row.dynamicId } }).then((data) => {
+  // 发布活动
+  const sendDynamic = row => {
+    request({ ...apis.groupActivity.send, urlData: { id: row.groupActivityId } }).then(data => {
       message.info('操作成功！')
       getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
     }).catch(err => {
@@ -216,6 +207,18 @@ const header = props => {
     })
   }
 
+  //首页推荐
+  const recommendGroupActivity = (row, code) => () => {
+    request({ ...apis.groupActivity.top, data: { groupActivityId: row.groupActivityId, sort: row.sort } }).then((data) => {
+      console.log(data)
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+
   const changePageNum = pageNumber => {
     getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
   }

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -22,6 +22,8 @@ const { TextArea } = Input;
 
 const header = props => {
   const [isEnlist, setIsEnlist] = useState(1)
+  const [activityStatus, setActivityStatus] = useState(1)  
+  const [disable, setDisable] = useState(false)
 
   const radioOnChange = e => {
     // console.log(e.target.value)
@@ -42,6 +44,8 @@ const header = props => {
           data.activityTime = [moment(data.startDate), moment(data.endDate)]
           const num = data.helpNum > 0 ? 1 : 0
           setIsEnlist(num)
+          setActivityStatus(data.activityStatus)
+          setDisable(data.activityStatus === 0 ? true : false)
           data.isEnlist = num
           props.form.setFieldsValue(data)
           setDynamicData(data)
@@ -140,7 +144,7 @@ const header = props => {
               message: '请选择所属项目',
             },
           ],
-        })(<BuildSelect />)}
+        })(<BuildSelect disabled={disable} />)}
         </Form.Item>
 
         <Form.Item label="活动标题">
@@ -165,6 +169,17 @@ const header = props => {
         })(<ImageUploader />)}
         </Form.Item>
 
+        <Form.Item label="活动列表图" help="建议尺寸375*312px">
+          {getFieldDecorator('detailImg', {
+          rules: [
+            {
+              required: true,
+              message: '活动主图不能为空',
+            },
+          ],
+        })(<ImageUploader />)}
+        </Form.Item>
+
         <Form.Item label="活动时间">
         {getFieldDecorator('activityTime', {
           rules: [
@@ -173,7 +188,7 @@ const header = props => {
               message: '请选择活动时间',
             },
           ],
-        })(<RangePicker format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+        })(<RangePicker format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }} disabled={activityStatus===0 ? true : false}/>)}
         </Form.Item>
 
         <Form.Item label="助力邀请人数" min={1} max={10}>
@@ -184,7 +199,7 @@ const header = props => {
               message: '请输入活动人数',
             },
           ],
-        })(<Input type="number" />)}
+        })(<Input type="number" disabled={activityStatus===0 ? true : false}/>)}
         </Form.Item>
 
         <Form.Item label="助力次数">
@@ -196,7 +211,7 @@ const header = props => {
             },
           ],
         })(
-          <Radio.Group onChange={(e) => radioOnChange(e)}>
+          <Radio.Group disabled={activityStatus===0 ? true : false} onChange={(e) => radioOnChange(e)}>
             <Radio value={0}>不限制</Radio>
             <Radio value={1}>限制</Radio>
           </Radio.Group>,
@@ -211,7 +226,7 @@ const header = props => {
                  message: '请输入助力人数',
                },
              ],
-           })(<Input type="number" placeholder="助力人数限制"/>)}
+           })(<Input type="number" placeholder="助力人数限制" disabled={activityStatus===0 ? true : false}/>)}
            </Form.Item>
          }
 
@@ -225,6 +240,16 @@ const header = props => {
           ],
         })(<ImageUploader />)}
         </Form.Item>
+        <Form.Item label="权重">
+        {getFieldDecorator('heavy', {
+          rules: [
+            {
+              required: true,
+              message: '请输入权重',
+            },
+          ],
+        })(<Input type="number" disabled={activityStatus===0 ? true : false} 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/helpActivity/list.jsx

@@ -91,40 +91,30 @@ const toEditGoods = (helpActivityId) => () => {
       align: 'center',
       render: (x, row) => (
         <>
-          {row.activityStatus === 0 &&
+          {(row.activityStatus === 0 || row.activityStatus === 2) &&
           <AuthButton name="admin.helpRecord.get">
              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" style={{color:'#bebebe'}}   className={styles.shoppingCart} /></span>
           </AuthButton>}
+          {
+            <AuthButton name="admin.top.update.post" 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>
+            </AuthButton>
+          }
           {row.activityStatus === 0 &&
+            <AuthButton name="admin.top.update.post" noRight={null}>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" style={{color:'#bebebe'}} className={styles.edit} /></span> </AuthButton>
+          }
+          {
           <AuthButton name="admin.top.update.post" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" style={{color:'#bebebe'}} className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top"  style={{color:'#bebebe'}} className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消标签' : '添加标签' }<Icon type="vertical-align-top"  style={{color:'#bebebe'}} className={styles.edit} /></span>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" style={{color:'#bebebe'}} className={styles.edit} /></span>
           </AuthButton> }
 
-          {row.activityStatus === 1 &&
+          {(row.activityStatus === 1 || row.activityStatus === 0) &&
           <AuthButton name="admin.helpActivity.update.put" noRight={null}>
             <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" style={{color:'#bebebe'}} className={styles.edit} /></span>
           </AuthButton>
           }
-          {row.activityStatus === 1 &&
-           <AuthButton name="admin.top.update.post" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" style={{color:'#bebebe'}} className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" style={{color:'#bebebe'}} className={styles.edit} /></span>
-            </AuthButton>
-          }
-
-          {row.activityStatus === 2 &&
-          <AuthButton name="admin.helpRecord.get" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" style={{color:'#bebebe'}} className={styles.shoppingCart} /></span>
-          </AuthButton>
-          }
-           {row.activityStatus === 2 &&
-        <AuthButton name="admin.top.update.post" noRight={null}>
-           <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" style={{color:'#bebebe'}} className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" style={{color:'#bebebe'}} className={styles.edit} /></span>
-        </AuthButton>
-          }
         </>
       ),
     },
@@ -168,13 +158,13 @@ const toEditGoods = (helpActivityId) => () => {
       })
   }
   
-  // const sendOrPublicDynamic = (row) => {
-  //     if (row.status === 1) {
-  //         cancelDynamic(row)
-  //     } else {
-  //         sendDynamic(row)
-  //     }
-  // }
+  const sendOrPublicDynamic = (row) => {
+      if (row.status === 1) {
+          cancelDynamic(row)
+      } else {
+          sendDynamic(row)
+      }
+  }
   
   // 取消活动
   const cancelDynamic = (row) => {

src/pages/channel/channelList.jsx

@@ -72,12 +72,6 @@ const columns = [
     key: 'recommendCount',
     align: 'center',
   },
-  {
-    title: '邀请经纪人',
-    dataIndex: 'inviteCount',
-    key: 'inviteCount',
-    align: 'center',
-  },
   {
     title: '操作',
     dataIndex: '',

src/pages/news/list/editNewsList.jsx

@@ -64,7 +64,7 @@ const { TextArea } = Input;
         ]
       },
       {
-        label: '资讯图片',
+        label: '资讯列表图',
         name: 'newsImg',
         type: FieldTypes.ImageUploader,
         value: dynamicData.newsImg,

src/services/apis.js

@@ -775,6 +775,16 @@ export default {
     method: 'post',
     action: 'admin.top.update.post',
   },
+  cancel: {
+    method: 'PUT',
+    url: `${prefix}/helpActivity/cancel/:id`,
+    action: 'admin.helpActivity.update.put',
+  },
+  send: {
+    url: `${prefix}/helpActivity/send/:id`,
+    method: 'PUT',
+    action: 'admin.helpActivity.update.put',
+  },
   record: {
     url: `${prefix}/helpRecord`,
     method: 'get',
@@ -837,6 +847,16 @@ export default {
     method: 'put',
     action: 'admin.taShareActivity.finish.put',
   },
+  send: {
+    url: `${prefix}/taShareActivity/send/:id`,
+    method: 'PUT',
+    action: 'admin.taShareActivity.finish.put',
+  },
+  cancel: {
+    method: 'PUT',
+    url: `${prefix}/taShareActivity/cancel/:id`,
+    action: 'admin.taShareActivity.finish.put',
+  },
   top: {
     url: `${prefix}/taShareActivity/weight`,
     method: 'put',