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

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

@@ -1,6 +1,6 @@
 import { useAjax } from "@/Hook/useAjax"
 import { copyAdAdApi } from "@/services/launchAdq/adq"
-import { Checkbox, DatePicker, Form, InputNumber, message, Modal, notification, Radio, Space, TimePicker } from "antd"
+import { Checkbox, DatePicker, Form, InputNumber, message, Modal, notification, Radio, Select, Space, Switch, TimePicker } from "antd"
 import React, { useState } from "react"
 import moment from "moment"
 import { getTimeSeriesList } from "./const"
@@ -52,6 +52,9 @@ const Copy: React.FC<Props> = (props) => {
 
             delete newValues?.date
             delete newValues?.dateType
+            if(newValues?.bidAmount){
+                newValues.bidAmount = newValues.bidAmount * 100
+            }
             console.log(newValues);
             copyAdAd.run({ ...newValues, adgroupIds: selectedRows.map((item: { adgroupId: number }) => item.adgroupId) }).then(res => {
                 if (res) {
@@ -74,7 +77,6 @@ const Copy: React.FC<Props> = (props) => {
         // Can not select days before today and today
         return current && current < moment().startOf('day');
     };
-
     return <Modal
         title="复制广告"
         visible={visible}
@@ -93,7 +95,7 @@ const Copy: React.FC<Props> = (props) => {
                 date: moment().startOf('day'),
                 timeSeries: getTimeSeriesList(),
                 firstDayBeginTime: moment('2023-02-24 00:00:00'),
-                copyCount: 1
+                copyCount: 1,
             }}
         >
             <Form.Item label={<strong>投放日期</strong>} name='dateType'>
@@ -143,9 +145,23 @@ const Copy: React.FC<Props> = (props) => {
                     </Form.Item>}
                 </Space>
             </Form.Item>
+            <Form.Item label={<strong>广告出价</strong>} name={"bidAmount"}>
+                        <InputNumber  min={0} placeholder="价格 元"/>
+            </Form.Item>
+            <Form.Item label={<strong>广告启停</strong>} name={"configuredStatus"}>
+                        <Select style={{width:100}}>
+                            <Select.Option key={null} value={null}>默认</Select.Option>
+                            <Select.Option key={"AD_STATUS_NORMAL"} value={"AD_STATUS_NORMAL"}>开启</Select.Option>
+                            <Select.Option key={"AD_STATUS_SUSPEND"} value={"AD_STATUS_SUSPEND"}>关闭</Select.Option>
+                        </Select>
+            </Form.Item>
+            <Form.Item label={<strong>是否复制创意</strong>} name={"isCopyAdcreative"} valuePropName="checked" >
+                <Switch checkedChildren="是" unCheckedChildren="否"  />
+            </Form.Item>
             <Form.Item label={<strong>复制数量</strong>} name='copyCount' rules={[{ required: true, message: '请输入复制数量' }]}>
                 <InputNumber min={1} />
             </Form.Item>
+
         </Form>
     </Modal>
 }

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

@@ -151,6 +151,13 @@ function tableConfig(tableIdClick: (props: {
             width: 400,
             ellipsis: true,
         },
+        {
+            title: '操作参数',
+            dataIndex: 'requestJson',
+            key: 'requestJson',
+            width: 400,
+            ellipsis: true,
+        },
     ]
 }