Kaynağa Gözat

Merge branch 'feature/work-test'

liubei@c-top.com.cn 3 yıl önce
ebeveyn
işleme
7e1c1444b6

+ 3 - 9
src/views/modules/account-config/account-config.vue

@@ -434,16 +434,10 @@ export default {
         
         ...mapGetters(['nickname', 'avatar', 'userInfo']),
         handleChangeCreativeImage(val,record) {
-            let orrr = []
+           
+
            if (record.inventoryCatalog == 'UNIVERSAL') {
-            // this.creativeImageOption.forEach(item=>{
-            //    val.split(',').forEach(element => {
-            //        if (item.id == element) {
-            //            orrr.push(item.value)
-                       
-            //        }
-            //    });
-            // })
+           
             return  record.inventoryCatalog != null && record.inventoryCatalog == 'UNIVERSAL' ?'通投智选' : '-'
            }else{
                return val ? this.creativeImageOption.filter(item => item.id === val)[0].value : '-';

+ 45 - 33
src/views/modules/account-config/components/configuration-modal.vue

@@ -800,11 +800,11 @@
                             <span>元</span>
                         </a-form-model-item>
                     </div>
-                    <!-- <div v-if="deepExternalShow">
+                    <div v-if="deepExternalShow">
                         <a-form-model-item label="深度优化方式" prop="deepExternal">
                             <a-radio-group @change="adDeepBidTypeChange" v-model="configForm.adDeepBidType" button-style="solid">
                                 <a-radio-button value="DEEP_BID_MIN" >自定义双出价</a-radio-button>
-                                <a-radio-button value="AUTO_MIN_SECOND_STAGE" >自动优化</a-radio-button>
+                                <a-radio-button value="DEEP_BID_PACING" >自动优化</a-radio-button>
                             </a-radio-group>
                         </a-form-model-item>
                          <a-form-model-item v-if="adDeepCpabidShow" label="深度转化出价" prop="adDeepCpabid">
@@ -818,7 +818,7 @@
                         /> 元
                             
                         </a-form-model-item>
-                    </div> -->
+                    </div>
                 </div>
                 <!-- <div class="separate-module-con">
                     <p class="rock-title">第三方检测链接</p>
@@ -875,7 +875,7 @@
                                 allow-clear
                             />
                         </a-form-model-item>
-                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'&&configForm.adverPosition != 'a'" label="应用名" prop="creativeAppName" key="creativeAppName24">
+                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="应用名" prop="creativeAppName" key="creativeAppName24">
                             <a-input
                                 class="common-input-long"
                                 placeholder="请输入应用名"
@@ -944,7 +944,7 @@
                                 allow-clear
                             />
                         </a-form-model-item>
-                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'&&configForm.adverPosition != 'a'" label="应用名" prop="creativeAppName" key="creativeAppName23">
+                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="应用名" prop="creativeAppName" key="creativeAppName23">
                             <a-input
                                 class="common-input-long"
                                 placeholder="请输入应用名"
@@ -1009,7 +1009,7 @@
                                 allow-clear
                             />
                         </a-form-model-item>
-                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'&&configForm.adverPosition != 'a'" label="应用名" prop="creativeAppName" key="creativeAppName25">
+                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="应用名" prop="creativeAppName" key="creativeAppName25">
                             <a-input
                                 class="common-input-long"
                                 placeholder="请输入应用名"
@@ -1096,7 +1096,7 @@
                                 allow-clear
                             />
                         </a-form-model-item>
-                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'&&configForm.adverPosition != 'a'" label="应用名" prop="creativeAppName" key="creativeAppName26">
+                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="应用名" prop="creativeAppName" key="creativeAppName26">
                             <a-input
                                 class="common-input-long"
                                 placeholder="请输入应用名"
@@ -1193,7 +1193,7 @@
                                 allow-clear
                             />
                         </a-form-model-item>
-                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'&&configForm.adverPosition != 'a'" label="应用名" prop="creativeAppName" key="creativeAppName26">
+                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="应用名" prop="creativeAppName" key="creativeAppName26">
                             <a-input
                                 class="common-input-long"
                                 placeholder="请输入应用名"
@@ -1773,7 +1773,7 @@ export default {
             },
             configForm: {
                 adDeepBidType:'DEEP_BID_MIN',
-                adDeepCpabid:0,
+                adDeepCpabid:0.1,
                 copywritingNumber: undefined,
                 marketingPurpose: 'CONVERSION',
                 componentId: '',
@@ -2140,6 +2140,7 @@ export default {
 
         },
         handleSelectValue(data) {
+            this.deepExternalShow = false;
             this.configForm.accountId = data.id;
             // this.$refs['ruleForm'].resetFields();
 
@@ -2860,8 +2861,13 @@ export default {
         handleConvertChange(e) {
             this.optimizationOption.forEach(element => {
                 if (element.convert_id == e) {
-                   if ("deep_external_actions" in element) {
+                   if ("deep_external_actions" in element && element.deep_external_actions != null ) {
                        this.deepExternalShow = true;
+                       this.$nextTick(()=>{
+                        this.configForm.adDeepBidType = 'DEEP_BID_MIN';
+                        this.configForm.adDeepCpabid = 0.1;
+                       })
+                       
                    }else{
                     this.deepExternalShow = false;
                    }
@@ -2875,11 +2881,11 @@ export default {
             // })
         },
         adDeepBidTypeChange(e){
-            if (e.target.value == 'AUTO_MIN_SECOND_STAGE') {
+            if (e.target.value == 'DEEP_BID_PACING') {
                 this.adDeepCpabidShow = false;
-                this.configForm.adDeepCpabid = 0;
             }else{
                 this.adDeepCpabidShow = true;
+                this.configForm.adDeepCpabid = 0.1;
             }
         },
         handleGetDetailList() {
@@ -2969,24 +2975,25 @@ export default {
                                             }
                                             this.configForm.adConvertType = updateResult[0].convert_type;
                                             this.optimizationOption = updateResult[0].external_actions;
-                                            // this.optimizationOption.forEach(element => {
-                                            //         if (element.convert_id == detailData.adConvertId) {
-                                            //         if ("deep_external_actions" in element) {
-                                            //             this.deepExternalShow = true;
+                                            this.optimizationOption.forEach(element => {
+                                                    if (element.convert_id == detailData.adConvertId) {
+                                                    if ("deep_external_actions" in element && element.deep_external_actions != null ) {
+                                                        this.deepExternalShow = true;
                                                         
-                                            //         }else{
-                                            //             this.deepExternalShow = false;
-                                            //         }
-                                            //         }
-                                            //     });
-                                                // if (detailData.adDeepBidType == 'AUTO_MIN_SECOND_STAGE') {
-                                                //         this.adDeepCpabidShow = false;
-                                                //         this.configForm.adDeepCpabid = 0
-                                                //     }else{
-                                                //         this.adDeepCpabidShow = true;
-                                                //     }
-                                                // this.configForm.adDeepBidType = detailData.adDeepBidType;
-                                                // this.configForm.adDeepCpabid = detailData.adDeepCpabid;
+                                                    }else{
+                                                        this.deepExternalShow = false;
+                                                    }
+                                                    }
+                                                });
+                                                if (detailData.adDeepBidType == 'DEEP_BID_PACING') {
+                                                        this.adDeepCpabidShow = false;
+                                                        this.configForm.adDeepCpabid = 0.1
+                                                    }else{
+                                                        this.adDeepCpabidShow = true;
+                                                    }
+                                                this.configForm.adDeepBidType = detailData.adDeepBidType;
+                                                this.configForm.adDeepCpabid = detailData.adDeepCpabid;
+                                                console.log( this.configForm.adDeepBidType, this.configForm.adDeepCpabid);
                                         
                                         })
                                     
@@ -3279,10 +3286,7 @@ export default {
                 }
             });
             // this.optimizationOption.forEach(element => {
-            //                 console.log(element);
-            //                 console.log(detailData.adConvertId);
             //                     if (element.convert_id == detailData.adConvertId) {
-            //                         console.log(1111111);
             //                     if ("deep_external_actions" in element) {
             //                         this.deepExternalShow = true;
             //                     }else{
@@ -3727,7 +3731,15 @@ export default {
             paramsFormData.adKeywords = this.creativeTag;
             paramsFormData.copywritingNumber = paramsFormData.copywritingNumber?paramsFormData.copywritingNumber:0
             paramsFormData.userId = this.userInfo().id;
-            console.log(paramsFormData.creativeImageMode);
+            if (this.deepExternalShow == false) {
+                paramsFormData.adDeepBidType = '';
+                // this.$delete(paramsFormData,'adDeepBidType')
+                this.$delete(paramsFormData,'adDeepCpabid')
+            }
+            if (this.adDeepCpabidShow == false) {
+                paramsFormData.adDeepCpabid = 0.1
+                // this.$delete(paramsFormData,'adDeepCpabid')
+            }
             // if (typeof paramsFormData.creativeImageMode == 'object'){
             //     paramsFormData.creativeImageMode = paramsFormData.creativeImageMode.toString()
             // }