shenwu преди 1 година
родител
ревизия
207194bcf2
променени са 1 файла, в които са добавени 0 реда и са изтрити 19 реда
  1. 0 19
      src/pages/launchSystemNew/launchManage/createAd/index.tsx

+ 0 - 19
src/pages/launchSystemNew/launchManage/createAd/index.tsx

@@ -131,24 +131,6 @@ const CreateAd: React.FC = () => {
                 }).filter((item: any, index: number, self: any) => self.findIndex((i: any) => i.id == item.id) === index)
                 setAccountCreateLogs(adCreateLogsData)
 
-<<<<<<< HEAD
-                let type: 1 | 2 | 3 = 1
-                if (sysPageId && pageId) {
-                    type = 1
-                } else if (sysPageId) {
-                    if (adCreateLogs?.every((item: { sysAdcreative: { adcreativeTemplateId: number }, sysPageId: number }) => item.sysAdcreative.adcreativeTemplateId === adcreativeTemplateId && (item.sysPageId === sysPageId))) {
-                        type = 2
-                    } else {
-                        type = 1
-                    }
-                } else {
-                    if (adCreateLogs?.every((item: { sysAdcreative: { adcreativeTemplateId: number }, pageId: number }) => item.sysAdcreative.adcreativeTemplateId === adcreativeTemplateId)) {
-                        type = 2
-                    } else {
-                        type = 1
-                    }
-                }
-=======
                 let type:0| 1 | 2 = putModel
                 // if (sysPageId && pageId) {
                 //     type = 0
@@ -165,7 +147,6 @@ const CreateAd: React.FC = () => {
                 //         type = 0
                 //     }
                 // }
->>>>>>> d6702315621bb99938dd4c7b8c716a7be5d5d627
                 setLaunchMode(type)
 
                 /** 本地落地页处理 */