8 Commits d8363bd453 ... 1694ae152e

Tác giả SHA1 Thông báo Ngày
  jiayufei 1694ae152e test 账户配置 头条 3 năm trước cách đây
  jiayufei 0dc26dfa24 Merge branch 'feature/middle-jyf' into feature/work-test 3 năm trước cách đây
  jiayufei 275750e9d9 master 账户配置 头条 3 năm trước cách đây
  jiayufei 1f70f33dd0 Merge branch 'feature/middle-jyf' 3 năm trước cách đây
  jiayufei 4e04ccba7a master 账户配置 头条 3 năm trước cách đây
  朱鑫波 24afc6b5e2 Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-vue 3 năm trước cách đây
  朱鑫波 990ff4355e 修改智能投放程序化创意上限 3 năm trước cách đây
  jiayufei 77e6461638 master 账户配置 头条 3 năm trước cách đây

+ 2 - 2
src/utils/request.js

@@ -20,8 +20,8 @@ else if (process.env.NODE_ENV === 'debug') {
 }
 else if (process.env.NODE_ENV === 'production') {
 	// axios.defaults.baseURL = 'http://apipre.tjyourong.com.cn/jeecg-boot'; // 预生产
-    axios.defaults.baseURL = 'http://gateway.tjyourong.com.cn/jeecg-boot';//测试
-	// axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot'; // 生产环境
+    // axios.defaults.baseURL = 'http://gateway.tjyourong.com.cn/jeecg-boot';//测试
+	axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot'; // 生产环境
 }
 const service = axios.create({
 	// baseURL: '/jeecg-boot', // api base_url

+ 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'; // 学超

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

@@ -870,12 +870,12 @@
                                 <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-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> -->
                     </div>
                     <div v-else-if="configForm.adUnionVideoType === 'ORIGINAL_VIDEO'">
                         <a-form-model-item label="创意内容">
@@ -923,11 +923,11 @@
                                 <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-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-radio-group> -->
                         </a-form-model-item>
                     </div>
                     <div v-else-if="configForm.adUnionVideoType === 'SPLASH_VIDEO'">
@@ -972,12 +972,12 @@
                                 <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 === 'DOWNLOAD_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> -->
                         <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>
@@ -1055,12 +1055,12 @@
                                 <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-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> -->
                         <a-form-model-item label="广告评论">
                             <a-radio-group v-model="configForm.creativeIsCommentDisable" button-style="solid">
                                 <a-radio-button :value="1">关闭</a-radio-button>
@@ -1097,7 +1097,6 @@
                             @change="handleEnterChang"
                         >
                         </a-select>
-                        <!-- <span class="especial-label">*</span> -->
                     </a-form-model-item>
                     <div class="adver-position-radio">
                         <div class="creative-label-content">
@@ -1571,7 +1570,7 @@ export default {
                 creativeDisplayMode: 'CREATIVE_DISPLAY_MODE_CTR',
                 creativeAppName: undefined,
                 creativeIsPresentedVideo: 0,
-                creativeGenerateDerivedAd: 0,
+                // creativeGenerateDerivedAd: 0,
                 creativeIsCommentDisable: 0,
                 creativeDownloadStatus: 1,
                 creativeSubTitle: '',
@@ -2729,7 +2728,7 @@ export default {
                         this.configForm.adInterestActionMode = detailData.adInterestActionMode;
                         this.configForm.creativeDisplayMode = detailData.creativeDisplayMode;
                         this.configForm.creativeIsPresentedVideo = detailData.creativeIsPresentedVideo;
-                        this.configForm.creativeGenerateDerivedAd = detailData.creativeGenerateDerivedAd;
+                        // this.configForm.creativeGenerateDerivedAd = detailData.creativeGenerateDerivedAd;
                         this.configForm.creativeIsCommentDisable = detailData.creativeIsCommentDisable;
                         this.configForm.creativeDownloadStatus = detailData.creativeDownloadStatus;
                         this.configForm.creativeSubTitle = detailData.creativeSubTitle;

+ 17 - 3
src/views/modules/autoLaunch/configLaunchInfo.vue

@@ -1358,10 +1358,10 @@
                         <div class="input-item">
                         <a-form-item>
                             <a-input-number
-                                v-decorator="['programUnitCnt',{ initialValue:60, rules: [{ required: true, message: '请填写程序化组上限' }] } ]"
+                                v-decorator="['programUnitCnt',{ initialValue:300, rules: [{ required: true, message: '请填写程序化组上限' }] } ]"
                                 style="width: 100%"
                                 placeholder="仅支持输入自然数"
-                                :max="60"
+                                :max="300"
                                 :precision="0"
                             />
                         </a-form-item>                       
@@ -1669,6 +1669,20 @@
                         </a-form-item>
                         </div>
                     </div> 
+                    <div class="row-item">
+                        <div class="hint-item"> </div>
+                        <div class="label-item">
+                        <div class="text-item">是否开启系统优选</div>
+                        </div>
+                        <div class="input-item">
+                        <a-form-item>  
+                            <a-radio-group v-decorator="['systemOptimization', { initialValue: 0 }]" :disabled="getProjectIdAccount !== 458">
+                                <a-radio-button :value="0">否</a-radio-button>
+                                <a-radio-button :value="1">是</a-radio-button>                            
+                            </a-radio-group>
+                        </a-form-item>
+                        </div>
+                    </div> 
                 </div>
              
         </div>
@@ -1901,7 +1915,7 @@ export default {
             checkCpaBidBloon:false,
             appType: '0',
             uriCheck: false,
-            programUnitCnt:60,
+            programUnitCnt:300,
             customUnitCnt:400,
             customUnitCntMax:400,
             budgetType:'1',