jiayufei 4 rokov pred
rodič
commit
9be91d0cf9

+ 2 - 2
src/views/modules/account-config/account-config-server.js

@@ -5,6 +5,6 @@
 
 // export const urlAcount = 'http://118.24.244.213:8808'; // 线上
 // export const urlAcount = 'http://apipre.tjyourong.com.cn'; // 预生产
-// export const urlAcount = 'http://192.168.1.43:8808'; // 子安
-export const urlAcount = 'http://139.186.165.84:8808'; // 测试
+export const urlAcount = 'http://192.168.1.43:8808'; // 子安
+// export const urlAcount = 'http://139.186.165.84:8808'; // 测试
 // export const urlAcount = 'http://192.168.1.8:8080'; // 学超

+ 10 - 0
src/views/modules/account-config/account-config.vue

@@ -16,6 +16,15 @@
                     >
                         <acount-search class="acount-search-class" :appId.sync="acountId" :multiple="false" request="1,3"></acount-search>
                     </a-form-item>
+                    <a-form-item label="素材类型">
+                        <a-select v-model="creativeStatus" style="width: 100px">
+                            <a-select-option :value="2">不限</a-select-option>
+                            <a-select-option value="CREATIVE_IMAGE_MODE_VIDEO_VERTICAL">竖版视频</a-select-option>
+                            <a-select-option value="CREATIVE_IMAGE_MODE_LARGE">大图横图</a-select-option>
+                            <a-select-option value="CREATIVE_IMAGE_MODE_LARGE_VERTICAL">大图竖图</a-select-option>
+                            <a-select-option value="CREATIVE_IMAGE_MODE_UNION_SPLASH">开屏</a-select-option>
+                        </a-select>
+                    </a-form-item>
                     <a-form-item label="状态">
                         <a-select v-model="searchStatus" style="width: 100px">
                             <a-select-option :value="2">不限</a-select-option>
@@ -303,6 +312,7 @@ export default {
                 }
             ],
             searchStatus: 0,
+            creativeStatus: 2,
             controlLoading: true,
             adBudgetShowTitle: false,
             budgetVisible: false,

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

@@ -853,7 +853,7 @@
                                 <a-radio-button :value="1">启用</a-radio-button>
                             </a-radio-group>
                         </a-form-model-item>
-                        <a-form-model-item v-if="isTomatoStatus" label="创意展现">
+                        <a-form-model-item label="创意展现">
                             <a-radio-group v-model="configForm.creativeDisplayMode" button-style="solid">
                                 <a-radio-button value="CREATIVE_DISPLAY_MODE_CTR">优选模式</a-radio-button>
                                 <a-radio-button value="CREATIVE_DISPLAY_MODE_RANDOM">轮播模式</a-radio-button>
@@ -898,7 +898,7 @@
                                 allow-clear
                             />
                         </a-form-model-item>
-                        <a-form-model-item v-if="isTomatoStatus" label="创意展现">
+                        <a-form-model-item label="创意展现">
                             <a-radio-group v-model="configForm.creativeDisplayMode" button-style="solid">
                                 <a-radio-button value="CREATIVE_DISPLAY_MODE_CTR">优选模式</a-radio-button>
                                 <a-radio-button value="CREATIVE_DISPLAY_MODE_RANDOM">轮播模式</a-radio-button>
@@ -951,7 +951,7 @@
                                 <a-radio-button :value="1">启用</a-radio-button>
                             </a-radio-group>
                         </a-form-model-item>
-                        <a-form-model-item v-if="isTomatoStatus" label="创意展现">
+                        <a-form-model-item label="创意展现">
                             <a-radio-group v-model="configForm.creativeDisplayMode" button-style="solid">
                                 <a-radio-button value="CREATIVE_DISPLAY_MODE_CTR">优选模式</a-radio-button>
                                 <a-radio-button value="CREATIVE_DISPLAY_MODE_RANDOM">轮播模式</a-radio-button>
@@ -1027,6 +1027,20 @@
                                 <a-icon class="examin-form-icon" type="delete" @click="handleDelOrigin(item)"/>
                             </a-form-model-item>
                         </div>
+                        <a-form-model-item v-if="isTomatoStatus" label="行动号召" prop="creativeCallToAction" key="SPLASH_VIDEO_ONE">
+                            <a-select
+                                class="common-input-long"
+                                v-model="configForm.creativeCallToAction"
+                            >
+                                <a-select-option
+                                    v-for="(item, index) in creativeOptions"
+                                    :key="index + 1"
+                                    :value="item"
+                                >
+                                    {{ item }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-model-item>
                         <a-form-model-item v-if="isTAwemeStatus" label="行动号召">
                             <a-radio-group v-model="configForm.creativeEnablePersonalAction" button-style="solid">
                                 <a-radio-button :value="true">开启智能优选</a-radio-button>
@@ -1100,7 +1114,7 @@
                                 <a-radio-button :value="0">开启</a-radio-button>
                             </a-radio-group>
                         </a-form-model-item>
-                        <a-form-model-item v-if="isTomatoStatus" label="创意展现">
+                        <a-form-model-item label="创意展现">
                             <a-radio-group v-model="configForm.creativeDisplayMode" button-style="solid">
                                 <a-radio-button value="CREATIVE_DISPLAY_MODE_CTR">优选模式</a-radio-button>
                                 <a-radio-button value="CREATIVE_DISPLAY_MODE_RANDOM">轮播模式</a-radio-button>
@@ -1689,7 +1703,7 @@ export default {
                 creativeCallToAction: undefined, // 行动号召
                 creativeLabel: undefined // 倡议标签
             },
-            isTomatoStatus: true,
+            isTomatoStatus: false,
             isTAwemeStatus: true
         };
     },
@@ -1951,21 +1965,26 @@ export default {
                 else {
                     this.isTAwemeStatus = false;
                 }
+                if (newVal.length === 1 && newVal[0] === 'INVENTORY_TOMATO_NOVEL') {
+                    this.isTomatoStatus = true;
+                    this.configForm.creativeImageMode = 'CREATIVE_IMAGE_MODE_VIDEO_VERTICAL';
+                }
+                else {
+                    this.isTomatoStatus = false;
+                }
                 if (newVal.length === 1 && newVal[0] === 'INVENTORY_UNION_SLOT') {
+                    this.configForm.creativeImageMode = 'CREATIVE_IMAGE_MODE_VIDEO_VERTICAL';
                     this.configForm.adUnionVideoType = 'REWARDED_VIDEO';
-                    this.$nextTick(() => {
-                        this.configForm.creativeEnablePersonalAction = true;
-                    });
+                    // this.$nextTick(() => {
+                    //     this.configForm.creativeEnablePersonalAction = true;
+                    // });
                     this.configForm.adAudiencePackageId = undefined;
                     this.packageMessageDetail = [];
                     this.selectiveList = selectiveListUpdate.filter(item => item.delivery_range === 'UNION');
-                    // if (this.configForm.adDirectionalFlag === 'choice') {
-                    //    this.selectiveList = selectiveListUpdate.filter(item => item.delivery_range === 'UNION');
-                    // }
                 }
                 else {
                     this.configForm.adUnionVideoType = '';
-                    this.configForm.creativeEnablePersonalAction = '';
+                    // this.configForm.creativeEnablePersonalAction = '';
                     this.configForm.adAudiencePackageId = undefined;
                     this.packageMessageDetail = [];
                     this.handleGetAdAudiencePackage();
@@ -1973,6 +1992,7 @@ export default {
             }
             else {
                 this.isTAwemeStatus = true;
+                this.isTomatoStatus = false;
                 this.configForm.adUnionVideoType = '';
                 this.configForm.adAudiencePackageId = undefined;
                 this.packageMessageDetail = [];