Browse Source

Merge branch 'feature/work-test' of http://git.tjyourong.com.cn/ctop/adsp-vue into feature/work-test

朱鑫波 3 years ago
parent
commit
63921f6c5b

+ 8 - 14
src/views/modules/account-config/account-config.vue

@@ -434,20 +434,14 @@ 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 : '-';
-           }
+            return val ? this.creativeImageOption.filter(item => item.id === val)[0].value : '-';
+
+        //    if (record.inventoryCatalog == 'UNIVERSAL') {
+           
+        //     return  record.inventoryCatalog != null && record.inventoryCatalog == 'UNIVERSAL' ?'通投智选' : '-'
+        //    }else{
+              
+        //    }
                 
             
             

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

@@ -800,7 +800,7 @@
                             <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>
@@ -818,7 +818,7 @@
                         /> 元
                             
                         </a-form-model-item>
-                    </div> -->
+                    </div>
                 </div>
                 <!-- <div class="separate-module-con">
                     <p class="rock-title">第三方检测链接</p>
@@ -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();
 
@@ -2858,9 +2859,11 @@ export default {
             }
         },
         handleConvertChange(e) {
+            console.log(e);
             this.optimizationOption.forEach(element => {
+                console.log(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;
                    }else{
                     this.deepExternalShow = false;
@@ -2877,7 +2880,7 @@ export default {
         adDeepBidTypeChange(e){
             if (e.target.value == 'AUTO_MIN_SECOND_STAGE') {
                 this.adDeepCpabidShow = false;
-                this.configForm.adDeepCpabid = 0;
+                this.configForm.adDeepCpabid = 0.1;
             }else{
                 this.adDeepCpabidShow = true;
             }
@@ -2969,24 +2972,24 @@ 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 == 'AUTO_MIN_SECOND_STAGE') {
+                                                        this.adDeepCpabidShow = false;
+                                                        this.configForm.adDeepCpabid = 0.1
+                                                    }else{
+                                                        this.adDeepCpabidShow = true;
+                                                    }
+                                                this.configForm.adDeepBidType = detailData.adDeepBidType;
+                                                this.configForm.adDeepCpabid = detailData.adDeepCpabid;
                                         
                                         })
                                     
@@ -3279,10 +3282,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{