Bladeren bron

Merge branch 'master' into feature/work-test

朱鑫波 3 jaren geleden
bovenliggende
commit
434db5fee1

+ 6 - 6
src/views/modules/account-config/account-config.vue

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

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

@@ -804,7 +804,7 @@
                         <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">
@@ -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="请输入应用名"
@@ -2859,12 +2859,15 @@ 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 && 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;
                    }
@@ -2878,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.1;
             }else{
                 this.adDeepCpabidShow = true;
+                this.configForm.adDeepCpabid = 0.1;
             }
         },
         handleGetDetailList() {
@@ -2982,7 +2985,7 @@ export default {
                                                     }
                                                     }
                                                 });
-                                                if (detailData.adDeepBidType == 'AUTO_MIN_SECOND_STAGE') {
+                                                if (detailData.adDeepBidType == 'DEEP_BID_PACING') {
                                                         this.adDeepCpabidShow = false;
                                                         this.configForm.adDeepCpabid = 0.1
                                                     }else{
@@ -2990,6 +2993,7 @@ export default {
                                                     }
                                                 this.configForm.adDeepBidType = detailData.adDeepBidType;
                                                 this.configForm.adDeepCpabid = detailData.adDeepCpabid;
+                                                console.log( this.configForm.adDeepBidType, this.configForm.adDeepCpabid);
                                         
                                         })
                                     
@@ -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()
             // }