活动

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: '请输入所需积分' },

src/pages/activity/groupActivity/list.jsx

@@ -101,18 +101,23 @@ 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>
+          }
           {row.activityStatus === 0 &&
             <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>
@@ -193,21 +198,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 +228,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/services/apis.js

@@ -832,6 +832,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',