Merge branch 'develop' of http://git.zanxiangnet.com/wjx/ad-manage

src/pages/adMonitor/adMonitorList/components/Details.tsx

@@ -134,7 +134,7 @@ const Details: React.FC<Props> = ({ data, onClose, visible }) => {
                             bodyStyle={{ padding: '12px 16px' }}
                             gutter={[0, 12]}
                             columns={columnsList()}
-                            dataSource={getListForAd?.data?.data?.records}
+                            dataSource={getListForAd?.data?.data?.records?.map((item: any, index: number) => ({ ...item, id: Number(queryList.pageNum.toString() + index.toString()) }))}
                             loading={getListForAd?.loading}
                             ajax={getListForAd}
                             leftChild={

src/pages/adMonitor/adMonitorList/components/box.tsx

@@ -21,8 +21,8 @@ function Box(props: { b: any }) {
                         <Space style={{ maxWidth: 300, display: 'flex', flexFlow: 'row wrap', margin: '10px 0' }}>
                             {
                                 image_list?.length > 0 ?
-                                    image_list?.map((img: string | undefined) => {
-                                        return <img src={img} key={img} width={image_list?.length === 1 ? 200 : image_list?.length === 3 ? 70 : image_list?.length === 4 ? 100 : 70} />
+                                    image_list?.map((img: string | undefined, index: number) => {
+                                        return <img src={img} key={index} width={image_list?.length === 1 ? 200 : image_list?.length === 3 ? 70 : image_list?.length === 4 ? 100 : 70} />
                                     }) :
                                     image ?
                                         <img src={image} key={image} width={200} />

src/pages/launchSystemNew/adq/ad/index.tsx

@@ -16,6 +16,7 @@ import SetEarlyWarning from '@/components/EarlyWarning/setEarlyWarning'
 import CrowdPackModal from '../../components/crowdPackModal'
 import './index.less'
 import AdIdSearch from './adIdSearch'
+import Details from '@/pages/adMonitor/adMonitorList/components/Details'
 
 type Props = {
     accountId?: string,
@@ -638,7 +639,7 @@ const Ad: React.FC<Props> = (props) => {
                 getList({ ...queryFrom, pageNum: current, pageSize })
             }}
         />
-        {detailShow && <PlanDetail visible={detailShow} onClose={() => { setDetailShow(false) }} data={detailData} />}
+        {detailShow && <Details visible={detailShow} onClose={() => { setDetailShow(false) }} data={{ adgroup_id: detailData.adgroupId, account_id: detailData.accountId }} />}
         {czjlShow && <Modal
             visible={czjlShow}
             onCancel={() => { setCzjlShow(false) }}

src/pages/launchSystemNew/adq/ad/tableConfig.tsx

@@ -252,7 +252,7 @@ function tableConfig(
             }
         },
         {
-            title: '单位时间消耗速度',
+            title: '广告详情',
             dataIndex: 'costSpeed',
             key: 'costSpeed',
             align: 'center',