shenwu 2 年之前
父节点
当前提交
29b1f4eec8

+ 5 - 5
src/pages/launchSystemNew/launchManage/localAd/targeting/index.tsx

@@ -21,7 +21,7 @@ function Targeting() {
     })
     const [oldsearchData, setOldsearchData] = useState<any>(null)
     // api方法
-    const list: FnAjax<ListData<any>> = useAjax((params) => getsysTargetingList(params))
+    const list: FnAjax<ListData<any>|any> = useAjax((params) => getsysTargetingList(params),{formatResult:true})
     const create = useAjax((params) => createsysTargeting(params))
     // 初始获取列表
     useEffect(() => {
@@ -56,12 +56,12 @@ function Targeting() {
         <TableData
             columns={tableConfig}
             ajax={list}
-            dataSource={list?.data?.records}
+            dataSource={list?.data?.data?.records}
             loading={list?.loading}
             scroll={{ y: 600 }}
-            total={list?.data?.total}
-            page={list?.data?.current}
-            pageSize={list?.data?.size}
+            total={list?.data?.data?.total}
+            page={list?.data?.data?.current}
+            pageSize={list?.data?.data?.size}
             leftChild={<>
                 <Row gutter={[10, 10]}>
                     <Col span={24}><Button type='primary' onClick={() => {

+ 6 - 4
src/pages/launchSystemNew/launchManage/localAd/targeting/modal.tsx

@@ -60,26 +60,28 @@ function AdModal(props: Props) {
                         break;
                     case 'ageType'://年龄处理
                         if (newValues[key] === '1') {
-                            newValues.targeting.age = {
+                            newValues.targeting.age = [{
                                 min: newValues.age_min,
                                 max: newValues.age_max
-                            }
+                            }]
                         }
                         delete newValues[key]
                         delete newValues.age_min
                         delete newValues.age_max
                         break;
                     case 'gender'://性别
-                        newValues[key] !== '0' && (newValues.targeting.gender = newValues[key])
+                        newValues[key] !== '0' && (newValues.targeting.gender = [newValues[key]])
                         delete newValues[key]
                         break;
                     case 'educationType'://学历
                         newValues[key] === '1' && (newValues.targeting.education = newValues.education)
                         delete newValues[key]
+                        delete newValues['education']
                         break;
                     case 'maritalStatusType'://婚恋
                         newValues[key] === '1' && (newValues.targeting.maritalStatus = newValues.maritalStatus)
                         delete newValues[key]
+                        delete newValues['maritalStatus']
                         break;
                     case 'customAudienceType'://定向人群
                         break;
@@ -131,7 +133,7 @@ function AdModal(props: Props) {
                         delete newValues.network
                         break;
                     case 'devicePriceType'://手机价格
-                        newValues[key] === '1' && (newValues.targeting.network = newValues.network)
+                        newValues[key] === '1' && (newValues.targeting.devicePrice = newValues.devicePrice)
                         delete newValues[key]
                         delete newValues.devicePrice
                         break;

+ 3 - 1
src/services/launchAdq/index.d.ts

@@ -474,7 +474,9 @@ export interface ListData<T> {
   size: number;
   total: number;
 }
-
+export interface Data<T>{
+  data:T
+}
 /**==============================================================================创意形式=======================================================================================*/
 /**创意形式列表*/
 export interface AdcreativeTemplateList {