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

src/pages/launchSystemNew/components/dataSourceModal/index.tsx

@@ -13,6 +13,7 @@ import columns from './tableConfig'
  * @returns 
  */
 interface Props {
+    promotedObjectType?: string
     visible?: boolean,
     onClose?: () => void,
     onChange?: (data: any) => void,
@@ -21,7 +22,7 @@ interface Props {
 const DataSourceModal: React.FC<Props> = (props) => {
 
     /************************/
-    const { visible, onClose, data: data1, onChange } = props
+    const { visible, onClose, data: data1, onChange, promotedObjectType } = props
     const [tableData, setTableData] = useState<any[]>([])//table数据
     const [selectAdz, setSelectAdz] = useState<number>(1)   // 选择广告主
     const [data, setData] = useState<any>(data1)
@@ -40,7 +41,7 @@ const DataSourceModal: React.FC<Props> = (props) => {
 
     // 获取数据源
     const getList = (params: number[]) => {
-        getDataSource.run(params).then(res => {
+        getDataSource.run({ accountIds: params, promotedObjectType }).then(res => {
             console.log('res===>', res)
             if (res && Object.keys(res)?.indexOf(params[0].toString()) !== -1) {
                 setTableData(res[params[0]]?.map((item: { userActionSetId: string }) => ({ ...item, id: item?.userActionSetId })))

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

@@ -116,7 +116,7 @@ function WeChatAdModal(props: Props) {
                         if (newValues[key] === 'DEEP_CONVERSION_WORTH') { // 优化 ROI
                             deepConversionSpec.deepConversionWorthSpec = {
                                 goal: newValues.goal,
-                                expectedroi: newValues.deepBidAmount
+                                expectedRoi: newValues.deepBidAmount
                             }
                         } else if (newValues[key] === 'DEEP_CONVERSION_BEHAVIOR') { // 优化转化行为
                             deepConversionSpec.deepConversionBehaviorSpec = {
@@ -226,7 +226,7 @@ function WeChatAdModal(props: Props) {
                                 depthConversionEnabled: true,
                                 deepConversionType: dataInfo[key]?.deepConversionType,
                                 goal: dataInfo[key]?.deepConversionWorthSpec?.goal,
-                                deepBidAmount: dataInfo[key]?.deepConversionWorthSpec?.expectedroi,
+                                deepBidAmount: dataInfo[key]?.deepConversionWorthSpec?.expectedRoi,
                             }
                         } else if (dataInfo[key]?.deepConversionType === 'DEEP_CONVERSION_BEHAVIOR') {
                             formData = {

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

@@ -635,7 +635,7 @@ const CreateAd: React.FC = () => {
                                                     <div className={style.accName} style={{ fontWeight: 800 }}>{item.adAccountId}</div>
                                                     {
                                                         item?.userActionSetsList?.map((pack: { name: string, type: string, id: number }, index1: number) => {
-                                                            return <div className={style.accCon} key={pack.id}> <span className={style.title}>{pack.name}{' > '}{pack.type}</span> <CloseOutlined className={style.close} onClick={() => {
+                                                            return <div className={style.accCon} key={pack.id}> <span className={style.title}>{pack.name}{' > '}{pack.type?.replace('USER_ACTION_SET_TYPE_', '')}</span> <CloseOutlined className={style.close} onClick={() => {
                                                                 sourceDel(index, index1)
                                                             }} /></div>
                                                         })
@@ -805,7 +805,7 @@ const CreateAd: React.FC = () => {
         {/* 选择商品 */}
         {goodsVisible && <GoodsModal visible={goodsVisible} data={accountCreateLogs} onClose={() => setGoodsVisible(false)} onChange={(e) => { setAccountCreateLogs(e); setGoodsVisible(false); clearData() }} />}
         {/* 选择数据源 */}
-        {sourceVisible && <DataSourceModal visible={sourceVisible} data={accountCreateLogs} onClose={() => setSourceVisible(false)} onChange={(e) => { setAccountCreateLogs(e); setSourceVisible(false); clearData() }} />}
+        {sourceVisible && <DataSourceModal visible={sourceVisible} promotedObjectType={queryForm.promotedObjectType} data={accountCreateLogs} onClose={() => setSourceVisible(false)} onChange={(e) => { setAccountCreateLogs(e); setSourceVisible(false); clearData() }} />}
         {/* 选择转化ID */}
         {idVisible && <IdModal visible={idVisible} data={accountCreateLogs} onClose={() => setIdVisible(false)} onChange={(e) => { setAccountCreateLogs(e); setSourceVisible(false); clearData() }} />}
         {/* 选择ADQ落地页 */}

src/services/launchAdq/createAd.ts

@@ -78,7 +78,7 @@ export async function synGoodsApi(data: number[]) {
  * @param data
  * @returns
  */
-export async function getDataSourceApi(data: number[]) {
+export async function getDataSourceApi(data: { accountIds: number[], promotedObjectType?: string }) {
   return request(api + `/adq/userActionSets/allByAccount`, {
     method: 'POST',
     data