|
@@ -123,8 +123,8 @@ function CreativeModal(props: Props) {
|
|
delete newValues.dataShow //删除数据开关
|
|
delete newValues.dataShow //删除数据开关
|
|
delete newValues.actionBtn //删除行动开关
|
|
delete newValues.actionBtn //删除行动开关
|
|
console.log('newValues=>2', newValues)
|
|
console.log('newValues=>2', newValues)
|
|
- if(!newValues.adcreativeElements){
|
|
|
|
- newValues.adcreativeElements={}
|
|
|
|
|
|
+ if (!newValues.adcreativeElements) {
|
|
|
|
+ newValues.adcreativeElements = {}
|
|
}
|
|
}
|
|
callback(newValues)
|
|
callback(newValues)
|
|
})
|
|
})
|
|
@@ -244,7 +244,12 @@ function CreativeModal(props: Props) {
|
|
setConversionList(newObj)
|
|
setConversionList(newObj)
|
|
|
|
|
|
states = { ...states, sj_show: true }
|
|
states = { ...states, sj_show: true }
|
|
- values = { ...values, conversionDataType: newObj.conversion_data_type[0].value, conversionTargetType: newObj.conversion_target_type[0].value }
|
|
|
|
|
|
+ if (newObj.conversion_data_type) {
|
|
|
|
+ values = { ...values, conversionDataType: newObj.conversion_data_type[0].value }
|
|
|
|
+ }
|
|
|
|
+ if (newObj.conversion_target_type) {
|
|
|
|
+ values = { ...values, conversionTargetType: newObj.conversion_target_type[0].value }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
//行动按钮组件存在
|
|
//行动按钮组件存在
|
|
if (states.xd_show) {
|
|
if (states.xd_show) {
|
|
@@ -381,6 +386,7 @@ function CreativeModal(props: Props) {
|
|
form.setFieldsValue(obj)
|
|
form.setFieldsValue(obj)
|
|
}
|
|
}
|
|
}, [dataInfo, adcreative_template_list, adcreative_template])
|
|
}, [dataInfo, adcreative_template_list, adcreative_template])
|
|
|
|
+ console.log(conversionList)
|
|
return <Modal
|
|
return <Modal
|
|
visible={visible}
|
|
visible={visible}
|
|
title={type === 'add' ? '新建创意' : type === 'look' ? '创意详情' : '编辑创意'}
|
|
title={type === 'add' ? '新建创意' : type === 'look' ? '创意详情' : '编辑创意'}
|
|
@@ -689,7 +695,7 @@ function CreativeModal(props: Props) {
|
|
</Radio.Group>
|
|
</Radio.Group>
|
|
</Form.Item>
|
|
</Form.Item>
|
|
</div>
|
|
</div>
|
|
- {conversionDataType === 'CONVERSION_DATA_ADMETRIC' && <div style={{ display: 'flex' }}>
|
|
|
|
|
|
+ {conversionList?.conversion_target_type && conversionDataType === 'CONVERSION_DATA_ADMETRIC' && <div style={{ display: 'flex' }}>
|
|
<p style={{ marginBottom: 5, marginLeft: 177 }}><strong style={{ marginRight: 20 }}>转化行为</strong></p>
|
|
<p style={{ marginBottom: 5, marginLeft: 177 }}><strong style={{ marginRight: 20 }}>转化行为</strong></p>
|
|
<Form.Item name='conversionTargetType'>
|
|
<Form.Item name='conversionTargetType'>
|
|
<Radio.Group>
|
|
<Radio.Group>
|