Просмотр исходного кода

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

jiayufei 3 лет назад
Родитель
Сommit
26cb0b5e3f

+ 6 - 5
src/views/modules/autoLaunch/auto-copy-library/auto-copy-library.vue

@@ -48,8 +48,8 @@
                         />
                     </a-form-item>
                     <a-form-item class="form-handle-btn">
-                        <a-button type="default" class="reset-class" @click="handleResetList">重置</a-button>
-                        <a-button type="primary" class="reset-class" @click="handleQueryList">查询</a-button>
+                        <a-button type="default" class="reset-class" icon="reload" @click="handleResetList">重置</a-button>
+                        <a-button type="primary" class="reset-class" icon="search" @click="handleQueryList">查询</a-button>
                         <a-button type="primary" @click="handleAddAccountConfig">新增文案</a-button>
                     </a-form-item>
                 </a-row>
@@ -330,7 +330,6 @@ export default {
                 this.$message.error('请选择账户');
                 return;
             }
-            // this.editShowAccountList
             let paramsData = new FormData();
             paramsData.append('accountIds', [...this.advertisingAccount, ...this.editShowAccountList]);
             if (this.copywritingType === 'add') {
@@ -353,6 +352,9 @@ export default {
             postAction(url, data).then(result => {
                 if (result.code === 200) {
                     this.$message.success(result.message);
+                    this.advertisingAccount = [];
+                    this.fileList = [];
+                    this.editShowAccountList = [];
                     this.causeVisible = false;
                     this.currencyPag = {
                         page: 1,
@@ -367,7 +369,6 @@ export default {
                 console.log(error, 'eeee');
             }).finally(() => {
                 this.confirmLoading = false;
-                this.editShowAccountList = [];
             });
         },
         handleCauseCancel() {
@@ -477,7 +478,7 @@ export default {
         },
         handleLaunchData(date, dateString) {
             this.configForm.launchDateRange = dateString;
-        },
+        }
     }
 }
 </script>

+ 28 - 0
src/views/modules/autoLaunch/configLaunchInfo.vue

@@ -1654,6 +1654,20 @@
                             </a-radio-group>
                         </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="['ctop_ai_kuaishou_advertiser_strategy', { 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>
              
@@ -1883,6 +1897,7 @@ export default {
     },
     data() {
         return {
+            getProjectIdAccount: '',
             checkCpaBidBloon:false,
             appType: '0',
             uriCheck: false,
@@ -2076,6 +2091,7 @@ export default {
                 //         })
                 //     }
                 // })
+                this.handleGetAcoountId(newValue);
                 this.getAppList()
                 let editRecordId=this.$route.query.id;
                 if(editRecordId){
@@ -2152,6 +2168,18 @@ export default {
     },
     methods: {
         ...mapGetters(['userInfo']),
+        handleGetAcoountId(list) {
+            getAction('/estimatePeopleNumber/getProjectId', {accountId: list}).then(result => {
+                if (result.code === 0) {
+                    this.getProjectIdAccount = result.result && Number(result.result);
+                }
+                else {
+                    this.$message.error(result.message);
+                }
+            }).catch(error => {
+                console.log(error, 'eeee');
+            });
+        },
         keyDown(event){
             if((event.keyCode>=96&&event.keyCode<=105)||(event.keyCode>=109&&event.keyCode<=111)||event.keyCode==46||event.keyCode==45||(event.keyCode>=48&&event.keyCode<=57)){
                 

+ 1 - 1
src/views/modules/autoLaunch/material-pool/material.vue

@@ -39,7 +39,7 @@ export default {
                 },
                 {
                     key: 'autoCopyLibrary',
-                    tab: '文案库'
+                    tab: '文案库管理'
                 }
             ]
         }

+ 2 - 2
vue.config.js

@@ -116,9 +116,9 @@ module.exports = {
         // target:'http://118.24.244.213:8804',
         // 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后台项目  周泽宇
+        // target: 'http://192.168.1.134:7001', //请求本地 需要jeecg-boot后台项目  周泽宇
 
         // target:'http://gateway.tjyourong.com.cn/',//测试