فهرست منبع

Merge branch 'feature/middle-jyf' into feature/work-test

jiayufei 3 سال پیش
والد
کامیت
1cadd1c2a9
2فایلهای تغییر یافته به همراه30 افزوده شده و 17 حذف شده
  1. 28 15
      src/views/modules/account-config/components/configuration-modal.vue
  2. 2 2
      vue.config.js

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

@@ -94,9 +94,9 @@
                         </a-radio-group>
                     </a-form-model-item>
                     <a-form-model-item label="广告类型">
-                        <a-radio-group :disabled="modalTitle === 'edit'" v-model="configForm.advertisingType" button-style="solid">
-                            <a-radio-button value="1">信息流广告</a-radio-button>
-                            <a-radio-button value="2">搜索广告</a-radio-button>
+                        <a-radio-group :disabled="modalTitle === 'edit'" v-model="configForm.adCampaignType" button-style="solid">
+                            <a-radio-button value="FEED">信息流广告</a-radio-button>
+                            <a-radio-button value="SEARCH" disabled>搜索广告</a-radio-button>
                         </a-radio-group>
                     </a-form-model-item>
                 </div>
@@ -1001,7 +1001,7 @@
                                 <a-radio-button value="CREATIVE_IMAGE_MODE_LARGE_VERTICAL" :disabled="pictureStatus">大图竖图</a-radio-button>
                             </a-radio-group>
                         </a-form-model-item>
-                        <a-form-model-item label="创意组件" prop="componentId">
+                        <a-form-model-item label="创意组件" prop="componentId" key="componentIdkey">
                             <a-input
                                 class="common-input-long"
                                 placeholder="请输入创意组件"
@@ -1600,7 +1600,7 @@ export default {
                 dpLinkEndIndex: 2,
                 accountBudgetMode: '1', // 预算方式
                 campaignLandingType: 'APP', // 推广目标
-                advertisingType: '1', // 广告类型
+                adCampaignType: 'FEED', // 广告类型
                 campaignName: '', // 广告组名称
                 adName: '', // 广告计划名称
                 campaignCnt: 1, // 广告组计划数量
@@ -1940,6 +1940,7 @@ export default {
                 if (newVal.length === 1 && newVal[0] === 'INVENTORY_UNION_SLOT') {
                     this.configForm.creativeImageMode = 'CREATIVE_IMAGE_MODE_VIDEO_VERTICAL';
                     this.configForm.adUnionVideoType = 'REWARDED_VIDEO';
+                    this.configForm.creativePlayableUrl = 'a';
                     // this.$nextTick(() => {
                     //     this.configForm.creativeEnablePersonalAction = true;
                     // });
@@ -1948,6 +1949,7 @@ export default {
                     this.selectiveList = selectiveListUpdate.filter(item => item.delivery_range === 'UNION');
                 }
                 else {
+                    this.configForm.creativeDownloadStatus = 1;
                     this.configForm.adUnionVideoType = '';
                     // this.configForm.creativeEnablePersonalAction = '';
                     this.configForm.adAudiencePackageId = undefined;
@@ -2378,6 +2380,7 @@ export default {
         },
         handleAdverPosition(e) {
             this.$refs['ruleForm'].clearValidate(['creativeSource']);
+            this.$refs['ruleForm'].clearValidate(['componentId']);
             if (e.target.value === 'a') {
                 this.configForm.radioChangeValue = '';
                 this.configForm.checkboxChangeValue = [];
@@ -2417,11 +2420,13 @@ export default {
             if (defaultValue === 'DOWNLOAD_URL') {
                 this.configForm.adExternalUrl = '';
                 this.configForm.adOpenUrl = '';
+                this.configForm.adDownloadMode = 'DEFAULT';
                 // this.$refs.ruleForm.clearValidate(['adExternalUrl']);
             }
             else if (defaultValue === 'EXTERNAL_URL') {
                 // this.configForm.adDownloadUrl = '';
                 // this.configForm.adPackage = '';
+                this.configForm.adDownloadMode = '';
                 this.configForm.adConvertId = '';
                 this.configForm.adAppType = '';
                 // this.$refs.ruleForm.clearValidate(['adDownloadUrl']);
@@ -2524,7 +2529,7 @@ export default {
                         this.configForm.accountBudget = detailData.accountBudget;
                         this.configForm.adDirectionalFlag = detailData.adDirectionalFlag;
                         this.configForm.campaignLandingType = detailData.campaignLandingType;
-                        this.configForm.advertisingType = detailData.advertisingType || '1';
+                        this.configForm.adCampaignType = detailData.adCampaignType;
                         this.configForm.campaignName = detailData.campaignName || '';
                         this.configForm.dpLinkIndexUsed = detailData.dpLinkIndexUsed;
                         if (detailData.dpLinkIndexUsed === 1) {
@@ -3030,14 +3035,14 @@ export default {
                     return;
                 }
             }
-            if (paramsFormData.checkboxChangeValue.length === 1 && paramsFormData.checkboxChangeValue[0] === 'INVENTORY_UNION_SLOT') {
-                paramsFormData.adDeliveryRange = 'UNION';
-                paramsFormData.creativeDownloadStatus = null;
-            }
-            else {
-                paramsFormData.adDeliveryRange = 'DEFAULT';
-                paramsFormData.creativeDownloadStatus = 1
-            }
+            // if (paramsFormData.checkboxChangeValue.length === 1 && paramsFormData.checkboxChangeValue[0] === 'INVENTORY_UNION_SLOT') {
+            //     paramsFormData.adDeliveryRange = 'UNION';
+            //     paramsFormData.creativeDownloadStatus = null;
+            // }
+            // else {
+            //     paramsFormData.adDeliveryRange = 'DEFAULT';
+            //     paramsFormData.creativeDownloadStatus = 1;
+            // }
             if (paramsFormData.adDirectionalFlag === 'choice' && !paramsFormData.adAudiencePackageId) {
                 this.$message.error('请选择已有定向包');
                 return;
@@ -3084,13 +3089,21 @@ export default {
             }
             if (paramsFormData.adverPosition === 'a') {
                 paramsFormData.inventoryCatalog = 'SMART';
-                paramsFormData.smartInventory = 'SMART';
+                paramsFormData.creativeSmartInventory = 'SMART';
             }
             else if (paramsFormData.adverPosition === 'b') {
                 if (!paramsFormData.checkboxChangeValue.length) {
                     this.$message.error('请选择媒体指定位置');
                     return;
                 }
+                if (paramsFormData.checkboxChangeValue.length === 1 && paramsFormData.checkboxChangeValue[0] === 'INVENTORY_UNION_SLOT') {
+                    paramsFormData.adDeliveryRange = 'UNION';
+                    paramsFormData.creativeDownloadStatus = null;
+                }
+                else {
+                    paramsFormData.adDeliveryRange = 'DEFAULT';
+                    paramsFormData.creativeDownloadStatus = 1;
+                }
                 paramsFormData.creativeInventoryTypes = paramsFormData.checkboxChangeValue;
             }
             else if (paramsFormData.adverPosition === 'c') {

+ 2 - 2
vue.config.js

@@ -114,9 +114,9 @@ module.exports = {
         //  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
         // target:'http://118.24.244.213:8804',
-        // target: 'http://192.168.1.43:9999', // 子安
+        target: 'http://192.168.1.43:9999', // 子安
         // target: 'http://192.168.1.8:8806', // 学超
-        target:'http://gateway.tjyourong.com.cn', //测试
+        // target:'http://gateway.tjyourong.com.cn', //测试
         // target:'http://apipre.tjyourong.com.cn', //预生产
         // target: 'http://192.168.1.134:7001', //请求本地 需要jeecg-boot后台项目  周泽宇