Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into v3.5

src/pages/activity/ActivityList.jsx

@@ -17,23 +17,23 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const header = props => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState({ list: [], total: 0 })
-//   const [page, changePage] = useState({})
+  //   const [page, changePage] = useState({})
 
- // 查询列表
- const getList = params => {
-  request({ ...apis.activity.list, params: { ...params } }).then(data => {
+  // 查询列表
+  const getList = params => {
+    request({ ...apis.activity.list, params: { ...params } }).then(data => {
       console.log(data)
       setData(data)
-  })
-}
+    })
+  }
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10 });
   }, [])
 
-// 跳转到编辑商品
-const toEditGoods = dynamicId => () => {
+  // 跳转到编辑商品
+  const toEditGoods = dynamicId => () => {
     router.push({
       pathname: '/activity/editActivity',
       query: {
@@ -47,7 +47,7 @@ const toEditGoods = dynamicId => () => {
     const resourceUrl = row.qrCode
     x.open('GET', resourceUrl, true);
     x.responseType = 'blob';
-    x.onload = function(e) {
+    x.onload = function (e) {
       const url = window.URL.createObjectURL(x.response)
       const a = document.createElement('a');
       a.href = url;
@@ -59,7 +59,7 @@ const toEditGoods = dynamicId => () => {
   }
 
 
-  function download(data) {
+  function download (data) {
     if (!data) {
       return
     }
@@ -136,13 +136,13 @@ const toEditGoods = dynamicId => () => {
             <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>
+            {row.activityStatus != 0 && <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 == 1 && <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>
+            <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.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
           </AuthButton>
           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>下载二维码<Icon type="qrcode" className={styles.shoppingCart} /></span>
@@ -152,81 +152,81 @@ const toEditGoods = dynamicId => () => {
   ];
 
   const getSignList = dynamicId => {
-      router.push({
-          pathname: '/activity/SignList',
-          query: {
-              dynamicId,
-          },
-        });
+    router.push({
+      pathname: '/activity/SignList',
+      query: {
+        dynamicId,
+      },
+    });
   }
 
   const finishDynamic = row => {
-      Modal.confirm({
-          title: '结束以后将无法编辑, 是否继续?',
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-              request({ ...apis.activity.finish, data: { dynamicId: row.dynamicId, top: '' } }).then(data => {
-                  console.log(data)
-                  message.info('操作成功！')
-                  getList({ pageNum: 1, pageSize: 10 })
-              }).catch(err => {
-                  console.log(err)
-                  message.info(err.msg || err.message)
-              })
-          },
-        });
-  }
-
-//   置顶
-  const topDynamic = row => () => {
-      const weight = Math.abs(row.weight - 1)
-      request({ ...apis.activity.weight, params: { dynamicId: row.dynamicId, weight } }).then(data => {
+    Modal.confirm({
+      title: '结束以后将无法编辑, 是否继续?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk () {
+        request({ ...apis.activity.finish, data: { dynamicId: row.dynamicId, top: '' } }).then(data => {
           console.log(data)
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 })
-      }).catch(err => {
+        }).catch(err => {
           console.log(err)
           message.info(err.msg || err.message)
-      })
+        })
+      },
+    });
+  }
+
+  //   置顶
+  const topDynamic = row => () => {
+    const weight = Math.abs(row.weight - 1)
+    request({ ...apis.activity.weight, params: { dynamicId: row.dynamicId, weight } }).then(data => {
+      console.log(data)
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10 })
+    }).catch(err => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
   }
 
   const sendOrPublicDynamic = row => {
-      if (row.status === 1) {
-          cancelDynamic(row)
-      } else {
-          sendDynamic(row)
-      }
+    if (row.status === 1) {
+      cancelDynamic(row)
+    } else {
+      sendDynamic(row)
+    }
   }
 
   // 取消活动
   const cancelDynamic = row => {
-      request({ ...apis.activity.cancel, urlData: { id: row.dynamicId } }).then(data => {
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10 })
-      }).catch(err => {
-          console.log(err)
-          message.info(err.msg || err.message)
-      })
+    request({ ...apis.activity.cancel, urlData: { id: row.dynamicId } }).then(data => {
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10 })
+    }).catch(err => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
   }
 
   // 发布活动
   const sendDynamic = row => {
-      request({ ...apis.activity.send, urlData: { id: row.dynamicId } }).then(data => {
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10 });
-      }).catch(err => {
-          console.log(err)
-          message.info(err.msg || err.message)
-      })
+    request({ ...apis.activity.send, urlData: { id: row.dynamicId } }).then(data => {
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10 });
+    }).catch(err => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
   }
 
   const changePageNum = pageNumber => {
-      getList({ pageNum: pageNumber, pageSize: 10 })
+    getList({ pageNum: pageNumber, pageSize: 10 })
   }
 
   // 提交事件
-const handleSubmit = (e, props) => {
+  const handleSubmit = (e, props) => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
@@ -236,8 +236,8 @@ const handleSubmit = (e, props) => {
     });
   }
 
-   // 重置搜索
-   function handleReset() {
+  // 重置搜索
+  function handleReset () {
     props.form.resetFields();
   }
 
@@ -285,16 +285,16 @@ const handleSubmit = (e, props) => {
             搜索
           </Button>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
+            重置
             </Button>
         </Form.Item>
       </Form>
       <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
       </AuthButton>
-      <Table dataSource={data.list} columns={columns} pagination={false} rowKey="activityList"/>
+      <Table dataSource={data.list} columns={columns} pagination={false} rowKey="activityList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-       <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} />
       </div>
     </>
   )

src/pages/integralMall/exchangeRecords.jsx

@@ -30,6 +30,7 @@ function record(props) {
   const getList = (params) => {
     request({ ...apis.integralMall.taPointsExchange, params: { ...params },}).then((data) => {
         setData(data)
+        console.log("data:",data)
     })
   }
 

src/services/apis.js

@@ -612,7 +612,6 @@ export default {
       method: 'POST',
       action: 'admin.taBuildingReport.add.post',
     },
-
     documentVerifylist:{
       url: `${prefix}/documentVerify`,
       method: 'GET',
@@ -628,9 +627,6 @@ export default {
       method: 'PUT',
       action: 'admin.documentVerify.id.put',
     },
-// /admin/documentVerify  查询审核列表，参数 pageNum, pageSize, name, tel
-// /documentVerify/{id}   根据id查询详情
-// /admin/documentVerify/{id} 根据Id修改
   },
   staff: {
     taUser: {