2
0

3 Commitit 86fc9ee2a5 ... e010adf098

Tekijä SHA1 Viesti Päivämäärä
  jiayufei e010adf098 middle 头条 账户配置 3 vuotta sitten
  jiayufei 8f2a9e974f 批量2.0 修改 出价不能大于 3000 3 vuotta sitten
  jiayufei 75e6efaa55 middle merge work 代码 3 vuotta sitten

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

@@ -3,8 +3,8 @@
  * @author jiayufei
  */
 
-export const urlAcount = 'http://118.24.244.213:8808'; // 线上
+// 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://139.186.165.84:8808'; // 测试
 // export const urlAcount = 'http://192.168.1.8:8080'; // 学超

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

@@ -79,6 +79,13 @@
                 </div>
                 <div class="separate-module-con">
                     <p class="rock-title">广告组信息</p>
+                    <a-form-model-item label="营销链路">
+                        <a-radio-group v-model="configForm.addOne" button-style="solid">
+                            <a-radio-button value="APP" disabled>品牌认知</a-radio-button>
+                            <a-radio-button value="LINK" disabled>用户意向</a-radio-button>
+                            <a-radio-button value="SHOP">行动转化</a-radio-button>
+                        </a-radio-group>
+                    </a-form-model-item>
                     <a-form-model-item label="推广目标">
                         <a-radio-group :disabled="modalTitle === 'edit'" v-model="configForm.campaignLandingType" button-style="solid">
                             <a-radio-button value="APP">应用</a-radio-button>
@@ -187,6 +194,14 @@
                             <a-radio-button value="EXTERNAL_URL">落地页</a-radio-button>
                         </a-radio-group>
                     </a-form-model-item>
+                     <div v-if="configForm.adDownloadType === 'DOWNLOAD_URL'">
+                        <a-form-model-item label="优先应用商店下载">
+                            <a-radio-group v-model="configForm.addTwo" button-style="solid">
+                                <a-radio-button value="1">启用</a-radio-button>
+                                <a-radio-button value="2">不启用</a-radio-button>
+                            </a-radio-group>
+                        </a-form-model-item>
+                    </div>
                     <div v-if="configForm.adDownloadType === 'EXTERNAL_URL'">
                         <a-form-model-item label="落地页链接" prop="adExternalUrl" key="arr">
                             <a-input
@@ -198,25 +213,6 @@
                             />
                         </a-form-model-item>
                     </div>
-                    <!-- <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="下载链接" prop="adDownloadUrl">
-                        <a-input
-                            class="common-input-long"
-                            :disabled="modalTitle === 'edit'"
-                            v-model="configForm.adDownloadUrl"
-                            placeholder="请输入下载链接"
-                            allow-clear
-                            @change="handleDownloadLink"
-                        />
-                    </a-form-model-item>
-                    <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="应用包名" prop="adPackage">
-                        <a-input
-                            class="common-input-long"
-                            :disabled="modalTitle === 'edit'"
-                            v-model="configForm.adPackage"
-                            placeholder="请输入应用包名"
-                            allow-clear
-                        />
-                    </a-form-model-item> -->
                     <a-form-model-item label="直达链接内容">
                         <a-input
                             class="common-input-long"
@@ -302,8 +298,8 @@
                             @change="handleAdverPosition"
                         >
                             <a-radio-button value="a">系统优选广告位</a-radio-button>
-                            <a-radio-button value="b">按媒体指定位置</a-radio-button>
-                            <a-radio-button value="c">按场景指定位置</a-radio-button>
+                            <a-radio-button value="b">首选媒体</a-radio-button>
+                            <!-- <a-radio-button value="c">按场景指定位置</a-radio-button> -->
                         </a-radio-group>
                     </a-form-model-item>
                     <div class="adver-position-radio">
@@ -347,7 +343,7 @@
                                 </a-tooltip>
                             </a-radio-button>
                             <a-radio-button value="ORIGINAL_VIDEO">原生</a-radio-button>
-                            <a-radio-button value="SPLASH_VIDEO">开屏</a-radio-button>
+                            <a-radio-button value="SPLASH_VIDEO" disabled>开屏</a-radio-button>
                         </a-radio-group>
                     </a-form-model-item>
                 </div>
@@ -821,6 +817,12 @@
                 </div>
                 <div class="separate-module-con">
                     <p class="rock-title">创意信息</p>
+                    <a-form-model-item v-if="!configForm.adUnionVideoType" label="使用抖音号投放">
+                        <a-radio-group v-model="configForm.addThree" button-style="solid">
+                            <a-radio-button value="1">不使用</a-radio-button>
+                            <a-radio-button value="2">使用</a-radio-button>
+                        </a-radio-group>
+                    </a-form-model-item>
                     <a-form-model-item label="创意方式">
                         <a-radio-group v-model="configForm.creativeMaterialMode" button-style="solid">
                             <a-radio-button value="STATIC_ASSEMBLE" :disabled="modalTitle === 'edit'">程序化创意</a-radio-button>
@@ -848,7 +850,7 @@
                                 </a-select-option>
                             </a-select>
                         </a-form-model-item>
-                        <a-form-model-item label="来源" prop="creativeSource">
+                        <a-form-model-item v-if="configForm.adDownloadType === 'EXTERNAL_URL'" label="来源" prop="creativeSource">
                             <a-input
                                 class="common-input-long"
                                 placeholder="请输入来源"
@@ -870,30 +872,18 @@
                                 <a-radio-button value="b">启用</a-radio-button>
                             </a-radio-group>
                         </a-form-model-item>
-                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="自动生成视频素材">
+                        <a-form-model-item label="自动生成视频素材">
                             <a-radio-group v-model="configForm.creativeIsPresentedVideo" button-style="solid">
                                 <a-radio-button :value="0">不启用</a-radio-button>
                                 <a-radio-button :value="1">启用</a-radio-button>
                             </a-radio-group>
                         </a-form-model-item>
-                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="最优创意衍生计划">
+                        <a-form-model-item v-if="configForm.adDownloadType === 'EXTERNAL_URL'" label="最优创意衍生计划">
                             <a-radio-group v-model="configForm.creativeGenerateDerivedAd" button-style="solid">
                                 <a-radio-button :value="0">不启用</a-radio-button>
                                 <a-radio-button :value="1">启用</a-radio-button>
                             </a-radio-group>
                         </a-form-model-item>
-                        <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>
-                            </a-radio-group>
-                        </a-form-model-item>
-                        <div v-if="configForm.creativeDisplayMode === 'CREATIVE_DISPLAY_MODE_CTR'" class="adver-position-radio">
-                            选择优选模式,系统会自动对效果好的创意进行展示量倾斜,创意效果越好展示量越高
-                        </div>
-                        <div v-if="configForm.creativeDisplayMode === 'CREATIVE_DISPLAY_MODE_RANDOM'" class="adver-position-radio">
-                            使用创意轮播,系统将平分各创意展现机会,便于广告主比较各创意投放效果
-                        </div>
                     </div>
                     <div v-else-if="configForm.adUnionVideoType === 'ORIGINAL_VIDEO'">
                         <a-form-model-item label="创意内容">
@@ -919,7 +909,7 @@
                                 </a-select-option>
                             </a-select>
                         </a-form-model-item>
-                        <a-form-model-item label="来源" prop="creativeSource">
+                        <a-form-model-item v-if="configForm.adDownloadType === 'EXTERNAL_URL'" label="来源" prop="creativeSource">
                             <a-input
                                 class="common-input-long"
                                 placeholder="请输入来源"
@@ -935,18 +925,18 @@
                                 allow-clear
                             />
                         </a-form-model-item>
-                        <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>
+                         <a-form-model-item label="自动生成视频素材">
+                            <a-radio-group v-model="configForm.creativeIsPresentedVideo" button-style="solid">
+                                <a-radio-button :value="0">不启用</a-radio-button>
+                                <a-radio-button :value="1">启用</a-radio-button>
+                            </a-radio-group>
+                        </a-form-model-item>
+                        <a-form-model-item v-if="configForm.adDownloadType === 'EXTERNAL_URL'" label="最优创意衍生计划">
+                            <a-radio-group v-model="configForm.creativeGenerateDerivedAd" button-style="solid">
+                                <a-radio-button :value="0">不启用</a-radio-button>
+                                <a-radio-button :value="1">启用</a-radio-button>
                             </a-radio-group>
                         </a-form-model-item>
-                        <div v-if="configForm.creativeDisplayMode === 'CREATIVE_DISPLAY_MODE_CTR'" class="adver-position-radio">
-                            选择优选模式,系统会自动对效果好的创意进行展示量倾斜,创意效果越好展示量越高
-                        </div>
-                        <div v-if="configForm.creativeDisplayMode === 'CREATIVE_DISPLAY_MODE_RANDOM'" class="adver-position-radio">
-                            使用创意轮播,系统将平分各创意展现机会,便于广告主比较各创意投放效果
-                        </div>
                     </div>
                     <div v-else-if="configForm.adUnionVideoType === 'SPLASH_VIDEO'">
                         <a-form-model-item label="创意内容">
@@ -1019,60 +1009,21 @@
                                 <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 v-if="isTAwemeStatus" label="卡片主图">
-                            <a-upload
-                                name="avatar"
-                                list-type="picture-card"
-                                class="avatar-uploader"
-                                :show-upload-list="false"
-                                :before-upload="beforeUpload"
-                            >
-                                <div v-if="imageUrl" class="upload-img-class" @mouseover="handleChangeActive">
-                                    <div class="img-flex-url">
-                                        <img :src="imageUrl" alt="avatar"/>
-                                    </div>
-                                    <!-- TODO 划过图片显示覆盖层 -->
-                                    <!-- <div v-if="isCoverImgDiv" class="cover-img-div" @mouseleave="handleRemoveActive">
-                                        <a-icon class="delete-icon-class" type="delete" @click.stop="handleDeleteImg"/>
-                                    </div> -->
-                                </div>
-                                <div v-else>
-                                    <a-icon type="plus" style="margin-top: 10px;"/>
-                                    <div class="ant-upload-text">Upload</div>
-                                </div>
-                            </a-upload>
-                            <span class="especial-label">*</span>
-                        </a-form-model-item>
-                        <a-form-model-item v-if="isTAwemeStatus" label="卡片标题" prop="creativeProductDescription">
-                            <a-input
+                        <a-form-model-item label="创意组件" prop="creativeActionText">
+                            <a-select
                                 class="common-input-long"
-                                placeholder="请输入卡片标题"
-                                v-model="configForm.creativeProductDescription"
-                                allow-clear
-                            />
-                        </a-form-model-item>
-                        <a-form-model-item v-if="isTAwemeStatus" label="推广卖点">
-                            <a-button type="primary" @click="handleAddOrigin">
-                                <a-icon type="plus" />推广卖点
-                            </a-button>
-                            <span class="especial-label">*</span>
-                        </a-form-model-item>
-                        <div v-if="isTAwemeStatus" class="adver-position-radio">
-                            <a-form-model-item
-                                v-for="(item, index) in configForm.defaultFormList"
-                                :key="item.id"
-                                class="examin-form-model"
-                                :prop="'defaultFormList.' + index + '.value'"
-                                :rules="[
-                                    {required: true, message: '请输入', trigger: 'blur'},
-                                    {min: 6, max: 9, message: '请输入6-9个字', trigger: 'blur'},
-                                ]"
+                                v-model="configForm.creativeActionText"
                             >
-                                <a-input class="common-input-long" v-model="item.value" placeholder="请输入" allow-clear/>
-                                <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="creativeActionText" key="SPLASH_VIDEO_ONE">
+                                <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="configForm.adDownloadType === 'EXTERNAL_URL'" label="行动号召" prop="creativeActionText" key="SPLASH_VIDEO_ONE">
                             <a-select
                                 class="common-input-long"
                                 v-model="configForm.creativeActionText"
@@ -1086,30 +1037,7 @@
                                 </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>
-                                <a-radio-button :value="false">关闭智能优选</a-radio-button>
-                            </a-radio-group>
-                            <span class="especial-label">*</span>
-                        </a-form-model-item>
-                        <div v-if="isTAwemeStatus" class="adver-position-radio">
-                            <a-form-model-item prop="creativeCallToAction">
-                                <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>
-                        </div>
-                        <a-form-model-item label="来源" :prop="getSource">
+                        <a-form-model-item v-if="configForm.adDownloadType === 'EXTERNAL_URL'" label="来源" :prop="getSource">
                             <a-input
                                 class="common-input-long"
                                 placeholder="请输入来源"
@@ -1135,13 +1063,13 @@
                             />
                         </a-form-model-item>
                         <div v-if="subTitleMsgStatus" style="width: 500px;color: #f00;margin-left: 140px">{{ subTitleMsg }}</div>
-                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="自动生成视频素材">
+                        <a-form-model-item label="自动生成视频素材">
                             <a-radio-group v-model="configForm.creativeIsPresentedVideo" button-style="solid">
                                 <a-radio-button :value="0">不启用</a-radio-button>
                                 <a-radio-button :value="1">启用</a-radio-button>
                             </a-radio-group>
                         </a-form-model-item>
-                        <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="最优创意衍生计划">
+                        <a-form-model-item v-if="configForm.adDownloadType === 'EXTERNAL_URL'" label="最优创意衍生计划">
                             <a-radio-group v-model="configForm.creativeGenerateDerivedAd" button-style="solid">
                                 <a-radio-button :value="0">不启用</a-radio-button>
                                 <a-radio-button :value="1">启用</a-radio-button>
@@ -1159,23 +1087,11 @@
                                 <a-radio-button :value="0">开启</a-radio-button>
                             </a-radio-group>
                         </a-form-model-item>
-                        <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>
-                            </a-radio-group>
-                        </a-form-model-item>
-                        <div v-if="configForm.creativeDisplayMode === 'CREATIVE_DISPLAY_MODE_CTR'" class="adver-position-radio">
-                            选择优选模式,系统会自动对效果好的创意进行展示量倾斜,创意效果越好展示量越高
-                        </div>
-                        <div v-if="configForm.creativeDisplayMode === 'CREATIVE_DISPLAY_MODE_RANDOM'" class="adver-position-radio">
-                            使用创意轮播,系统将平分各创意展现机会,便于广告主比较各创意投放效果
-                        </div>
                     </div>
                 </div>
                 <div class="separate-module-con">
                     <p class="rock-title">创意分类</p>
-                    <a-form-model-item label="创意分类" prop="creativeThirdIndustryIds">
+                    <a-form-model-item label="创意分类">
                         <a-cascader
                             v-model="configForm.creativeThirdIndustryIds"
                             class="common-input-long"
@@ -1195,7 +1111,7 @@
                             @change="handleEnterChang"
                         >
                         </a-select>
-                        <span class="especial-label">*</span>
+                        <!-- <span class="especial-label">*</span> -->
                     </a-form-model-item>
                     <div class="adver-position-radio">
                         <div class="creative-label-content">
@@ -1654,6 +1570,9 @@ export default {
                 creativeThirdIndustryIds: [{required: true, message: '请选择', trigger: 'change'}]
             },
             configForm: {
+                addOne: 'SHOP',
+                addTwo: '2',
+                addThree: '1',
                 collocationPlay: 'a',
                 adUnionVideoType: '',
                 creativeWebUrl: '',
@@ -3157,18 +3076,18 @@ export default {
                 this.$message.error('请选择投放时段');
                 return;
             }
-            if (this.isTAwemeStatus && !this.urlResult) {
-                this.$message.error('请上传图片');
-                return;
-            }
-            if (this.isTAwemeStatus && !paramsFormData.defaultFormList.length) {
-                this.$message.error('请添加卖点');
-                return;
-            }
-            if (!this.creativeTag.length) {
-                this.$message.error('请添加标签');
-                return;
-            }
+            // if (this.isTAwemeStatus && !this.urlResult) {
+            //     this.$message.error('请上传图片');
+            //     return;
+            // }
+            // if (this.isTAwemeStatus && !paramsFormData.defaultFormList.length) {
+            //     this.$message.error('请添加卖点');
+            //     return;
+            // }
+            // if (!this.creativeTag.length) {
+            //     this.$message.error('请添加标签');
+            //     return;
+            // }
             if (this.campaignStatus) {
                 return;
             }

+ 2 - 3
src/views/modules/kuaishouapp/batchCreation/creat/creatUnit.vue

@@ -520,7 +520,7 @@
             :disabled="getData('cpaBid')==null||getData('cpaBid') == ''"
           ></a-input-number>
           <span style="color: red" v-if="item.deepConversionBidCheck"
-            >深度转化目标成本必须高于优化目标成本,且不得高于3000元</span
+            >深度转化目标成本必须高于优化目标成本</span
           >
         </a-form-item>
         <a-form-item
@@ -2084,8 +2084,7 @@ export default {
     },
     deep_conversion_bidTip(index) {
       if (
-        this.allForm.group[index].deepConversionBid < this.getData('cpaBid') ||
-        this.allForm.group[index].deepConversionBid > 3000
+        this.allForm.group[index].deepConversionBid < this.getData('cpaBid')
       ) {
         this.allForm.group[index].deepConversionBidCheck = true
       } else {

+ 2 - 2
src/views/modules/material/videoMaterial.vue

@@ -2273,7 +2273,7 @@ export default {
 				dataIndex: 'relationCount'
 			}
 		],
-		materiaModalType: '1',
+		materiaModalType: '2',
 		materialUseDetailList: {},
 		usageDetailsStatus: false,
       ruleForm:{
@@ -2673,7 +2673,7 @@ export default {
 		this.materiaDataKuaishou = [];
 		this.materiaDataTotalKuaishou = 0;
 		this.defaultCurrentKuaishou = 1;
-		this.materiaModalType = '1';
+		this.materiaModalType = '2';
 		this.usageDetailsStatus = false;
 	},
 	handleUsageDetails(data) {