shenwu 2 年 前
コミット
80cb662cfc

+ 15 - 15
src/pages/launchSystemNew/launchManage/adAuthorize/index.tsx

@@ -1,16 +1,18 @@
 
 import HocError from '@/Hoc/HocError'
-import { Card, Col, Modal, Row, Table, Tag, Input, message } from 'antd'
+import { Card, Col, Modal, Row, Table, Tag, Input, message, Space } from 'antd'
 import React, { useCallback, useEffect, useState } from 'react'
 import { columnsMp } from './tableConfig'
 import { useModel } from 'umi'
 import { useAjax } from '@/Hook/useAjax'
 import { putAdAccountApi } from '@/services/launchAdq/adAuthorize'
 import style from './index.less'
+import TableData from '../../components/TableData'
 
 /** 投放管理 */
 const AdAuthorize: React.FC = () => {
     const { getAdAccount } = useModel('useLaunchAdq.useAdAuthorize')
+    const [queryValue, setQueryValue] = useState('')
     const [remarkData, set_remarkData] = useState<{
         visible: boolean,
         remark: string,
@@ -28,7 +30,7 @@ const AdAuthorize: React.FC = () => {
     const remark = useCallback(() => {
         if (remarkData.remark && remarkData.data) {
             putRemark.run(remarkData.data.id, remarkData.remark).then(res => {
-                set_remarkData({...remarkData,visible:false,remark:'',data:null})
+                set_remarkData({ ...remarkData, visible: false, remark: '', data: null })
                 getAdAccount.refresh()
             })
         } else {
@@ -37,21 +39,19 @@ const AdAuthorize: React.FC = () => {
 
     }, [getAdAccount, remarkData])
     const edit = useCallback((data) => {
-        set_remarkData({ ...remarkData, visible: true, data,remark:data.remark})
+        set_remarkData({ ...remarkData, visible: true, data, remark: data.remark })
     }, [remarkData])
     return <Card>
-        <Table dataSource={getAdAccount?.data?.data} loading={getAdAccount?.loading} columns={columnsMp(edit)} size="small" bordered
-            scroll={{ x: 2000 }}
-            pagination={{
-                position: ['bottomRight'],
-                total: getAdAccount?.data?.data?.length,//总共多少条数据,服务器给,设置后分页自动计算页数
-                showTotal: (total) => <Tag color="cyan">总共{total}数据</Tag>,
-                showSizeChanger: true,
-                showLessItems: true,
-                defaultCurrent: 1,
-                defaultPageSize: 20,//默认初始的每页条数
-            }}
-            rowKey={(row) => row.id}
+        <TableData
+            ajax={getAdAccount}
+            dataSource={getAdAccount?.data?.data}
+            loading={getAdAccount?.loading}
+            columns={() => columnsMp(edit)}
+            size="small"
+            scroll={{ x: 2000, y: 600 }}
+            leftChild={<Space>
+                <Input placeholder="广告主ID" style={{ width: 150 }} allowClear value={queryValue} onChange={(e) => { }} />
+            </Space>}
         />
         {remarkData.visible && <Modal
             visible={remarkData.visible}

+ 4 - 2
src/pages/launchSystemNew/launchManage/createAd/creative/modal/index.tsx

@@ -357,8 +357,10 @@ function CreativePup(props: Props) {
                         }
                     })
                 })
-                /*****暂时排除激励和banner有问题******/ 
-                newArr = newArr.filter((item: { adcreativeTemplateId: number })=>item.adcreativeTemplateId !== 910 && item.adcreativeTemplateId !== 925)
+                /*****暂时排除激励和banner有问题******/
+                if (siteSet.some((i: string) => i === 'SITE_SET_MOMENTS')) {
+                    newArr = newArr.filter((item: { adcreativeTemplateId: number }) => item.adcreativeTemplateId !== 910 && item.adcreativeTemplateId !== 925)
+                }
                 set_adcreative_template_list(newArr)
             })
         }