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

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

@@ -1,7 +1,7 @@
 
 import { useAjax } from '@/Hook/useAjax'
 import { AdStatusEnum, PromotedObjectType } from '@/services/launchAdq/enum'
-import { Col, Row, Input, Select, message, Space, Button, Popconfirm, Switch, notification, Modal, Tooltip, Typography, Tag, Popover, Checkbox } from 'antd'
+import { Col, Row, Input, Select, message, Space, Button, Popconfirm, Switch, notification, Modal, Tooltip, Checkbox } from 'antd'
 import React, { useEffect, useCallback, useState } from 'react'
 import TableData from '../../components/TableData'
 import tableConfig from './tableConfig'
@@ -44,7 +44,7 @@ type Props = {
 const Ad: React.FC<Props> = (props) => {
 
     /***********************/
-    let { accountId, adAccountId, userId, tableIdClick, queryParmas, Ts } = props
+    let { accountId, userId, queryParmas, Ts } = props
     const [selectedRows, setSelectedRows] = useState<any[]>([])
     const [update, setUpdate] = useState<{ visible: boolean, title: string }>({ visible: false, title: '' })
     const [model, setModel] = useState(true)
@@ -522,10 +522,8 @@ const Ad: React.FC<Props> = (props) => {
                 }
             }}
             onChange={(props: any) => {
-                let { sortData, pagination } = props
+                let { pagination } = props
                 let { current, pageSize } = pagination
-                // console.log(pagination)
-                // console.log({...queryFrom, pageNum: current, pageSize })
                 set_queryFrom({ ...queryFrom, pageNum: current, pageSize })
                 getList({ ...queryFrom, pageNum: current, pageSize })
             }}

src/pages/launchSystemNew/launchManage/createAd/ad/modal/wechat.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useState } from 'react'
-import { Modal, Form, Input, Divider, Select, Radio, DatePicker, Switch, Checkbox, message, Tooltip, Row, Col, Space, TimePicker, Button } from 'antd'
+import { Modal, Form, Input, Divider, Select, Radio, DatePicker, Switch, Checkbox, Tooltip, Row, Col, Space, TimePicker, Button } from 'antd'
 import { BidModeEnum, OptimizationGoalEnum, BidStrategyEnum, AdStatus, GoalRoasEnum } from '@/services/launchAdq/enum'
 import { ModalConfig } from '../index'
 import moment from 'moment';

src/pages/launchSystemNew/launchManage/createAd/index.tsx

@@ -58,7 +58,6 @@ const CreateAd: React.FC = () => {
     })
     const [launchMode, setLaunchMode] = useState<number>(Number(localStorage.getItem('LAUNCHMODE')) || 1) // 投放模式 1 现在投放模式  2 创量模式
     const [accountCreateLogs, setAccountCreateLogs] = useState<{ adAccountId: number, id: number, userActionSetsList?: any[], productList?: any, conversionList?: any, customAudienceList?: any, excludedCustomAudienceList?: any, pageList?: any, coldStartAudienceList?: any[] }[]>([])  // 账户
-    const { currentUser }: any = useModel('@@initialState', model => ({ currentUser: model.initialState?.currentUser }))
     const [goodsVisible, setGoodsVisible] = useState<boolean>(false) // 选择商品弹窗控制
     const [sourceVisible, setSourceVisible] = useState<boolean>(false) // 选择数据源弹窗控制
     const [idVisible, setIdVisible] = useState<boolean>(false) // 选择转化ID弹窗控制
@@ -585,7 +584,7 @@ const CreateAd: React.FC = () => {
                 data.push(obj)
             })
         })
-        if (['OPTIMIZATIONGOAL_FOLLOW', 'OPTIMIZATIONGOAL_PAGE_SCAN_CODE'].includes(newQueryForm.sysAdgroup.optimizationGoal) && !newQueryForm.sysAdgroup.depthConversionEnabled) {
+        if (['OPTIMIZATIONGOAL_FOLLOW', 'OPTIMIZATIONGOAL_PAGE_SCAN_CODE'].includes(newQueryForm.sysAdgroup.optimizationGoal) && !(newQueryForm.sysAdgroup.deepConversionSpec && Object.keys(newQueryForm.sysAdgroup.deepConversionSpec).length > 0)) {
             Modal.confirm({
                 title: '请注意',
                 icon: <ExclamationCircleFilled />,
@@ -601,6 +600,7 @@ const CreateAd: React.FC = () => {
             setTableData(data)
         } 
     }
+    console.log('---->', queryForm)
 
     const submit = (props: { campaignName: string, count?: number }) => {
         let newQueryForm = JSON.parse(JSON.stringify(queryForm))