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

src/pages/launchSystemV3/tencentAdPutIn/create/Target/generateTarget.tsx

@@ -72,14 +72,15 @@ const GenerateTarget: React.FC<Props> = ({ target, visible, onChange, onClose })
                     let lData = lChildren.find(item => item.value.toString() === r[1])
                     let lName = lData?.title
                     let lRegionsL = lChildren.map(item => item.value)
+                    console.log('target?.targeting?.regions', target?.targeting)
                     return {
                         ...target,
                         targetingName: `${regionsData?.title}无${rName}${lName}+` + target.targetingName,
                         targeting: {
                             ...(target?.targeting || {}),
                             geoLocation: {
-                                locationTypes: (target?.targeting?.locationTypes || locationTypes),
-                                regions: [...((target?.targeting?.regions || zhongguo) as number[]).filter(item => item !== regions), ...regionsL.filter(item => item.toString() !== r[0]), ...lRegionsL.filter(item => item.toString() !== r[1])]
+                                locationTypes: (target?.targeting?.geoLocation?.locationTypes || locationTypes),
+                                regions: [...((target?.targeting?.geoLocation?.regions || zhongguo) as number[]).filter(item => item !== regions), ...regionsL.filter(item => item.toString() !== r[0]), ...lRegionsL.filter(item => item.toString() !== r[1])]
                             }
                         }
                     }
@@ -90,8 +91,8 @@ const GenerateTarget: React.FC<Props> = ({ target, visible, onChange, onClose })
                         targeting: {
                             ...(target?.targeting || {}),
                             geoLocation: {
-                                locationTypes: (target?.targeting?.locationTypes || locationTypes),
-                                regions: [...((target?.targeting?.regions || zhongguo) as number[]).filter(item => item !== regions), ...regionsL.filter(item => item.toString() !== r[0])]
+                                locationTypes: (target?.targeting?.geoLocation?.locationTypes || locationTypes),
+                                regions: [...((target?.targeting?.geoLocation?.regions || zhongguo) as number[]).filter(item => item !== regions), ...regionsL.filter(item => item.toString() !== r[0])]
                             }
                         }
                     }