合并

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -35,7 +35,6 @@ const Edit = props => {
   if (helpActivityId) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
-      alert(helpActivityId)
       // eslint-disable-next-line no-use-before-define
       getDynamicData(helpActivityId);
     }, [])

src/pages/activity/helpActivity/list.jsx

@@ -13,7 +13,7 @@ import AuthButton from '@/components/AuthButton';
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
-const header = (props) => {
+const header = props => {
   const [ data, setData ] = useState({})
 //   const [page, changePage] = useState({})
 
@@ -89,26 +89,37 @@ const toEditGoods = (helpActivityId) => () => {
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x,row) => (
+      render: (x, row) => (
         <>
+          {row.status === 1 &&
           <AuthButton name="admin.SignList.get" noRight={null}>
-            <span style={{ color: '#1990FF', cursor: 'pointer'}} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? "助力记录" : ""}<Icon type="snippets" className={styles.shoppingCart} /></span>
-          </AuthButton>
-          <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this,row)}>{ row.status === 1 ? '取消发布' : '发布' }<Icon type="close-circle" className={styles.edit} /></span>
-          </AuthButton>
-          <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
-            {row.isEnlist != 2 && <span style={{ color: '#1990FF', 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>
-            {row.isEnlist != 2 && <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>}
-          </AuthButton>
+        
+            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.dynamicId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+          </AuthButton> }
+
+          {row.status === 0 &&
+           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
+                      <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
+                      <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            </AuthButton>
+          }
+
+          {row.status === 2 &&
+        <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
+           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.dynamicId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+           <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+        </AuthButton>
+          }
         </>
-      )
+      ),
     },
   ];
-  
   const getSignList = (dynamicId) => {
       router.push({
           pathname: '/activity/helpActivity/helpRecord',
@@ -137,9 +148,8 @@ const toEditGoods = (helpActivityId) => () => {
   }
   
 //   置顶
-  const topDynamic = (row) => () => {
-      const weight = Math.abs(row.weight - 1)
-      request({ ...apis.activity.weight, params: {dynamicId: row.dynamicId, weight} }).then((data) => {
+  const topDynamic = (row, code) => () => {
+      request({ ...apis.helpActivity.top, data: { helpActivityId: row.helpActivityId, status: code } }).then((data) => {
           console.log(data)
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 })
@@ -149,13 +159,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/services/apis.js

@@ -699,6 +699,11 @@ export default {
     method: 'put',
     action: 'admin.taRole.get',
   },
+  top: {
+    url: `${prefix}/top/update`,
+    method: 'post',
+    action: 'admin.taRole.get',
+  },
  },
  third: {
   thirdPartyMiniapp: {