Bladeren bron

Merge branch 'test-2' into V1.1.5

魏志佳 4 jaren geleden
bovenliggende
commit
61482c2e66
1 gewijzigde bestanden met toevoegingen van 8 en 8 verwijderingen
  1. 8 8
      src/views/modules/autoLaunch/configLaunchInfo.vue

+ 8 - 8
src/views/modules/autoLaunch/configLaunchInfo.vue

@@ -843,11 +843,11 @@
                         </a-form-item>
                         </div>
                     </div>
-                    <div class="row-item"  v-if="whiteList.actionbar_click_url_switch&&getFormData('generalTrack')==1">
+                    <!-- <div class="row-item"  v-if="whiteList.actionbar_click_url_switch&&getFormData('generalTrack')==1">
                         <div class="hint-item"></div>
                         <div class="label-item">
                         <div class="text-item">第三方ActionBar点击监控链接</div>
-                        <!-- <div class="required-item"></div> -->
+                        <div class="required-item"></div>
                         </div>
                         <div class="input-item">
                             <a-form-item  >
@@ -864,7 +864,7 @@
                                 <span style="color: red; position: relative; top: -10px">仅加白使用</span>
                             </a-form-item>        
                         </div>
-                    </div>
+                    </div> -->
                     <div class="row-item" v-if="whiteList.creative_category_switch==1">
                         <div class="hint-item"></div>
                         <div class="label-item">
@@ -1652,7 +1652,7 @@ export default {
             
             // this.getPageList(val)
             if(this.getFormData('singleAppid')==0){
-                if(val.indexOf(0)>-1){
+                if(val&&val.indexOf(0)>-1){
                     let appidArr=this.appList.map(item=>{
                         return item.appId
                     })
@@ -2094,9 +2094,9 @@ export default {
                 appId:undefined,
                 platformOs:e.target.value
             })
-            if(this.getFormData('campaignType')==2 || this.getFormData('campaignType')==7){
-                this.appIdChange(this.getFormData('appId'))
-            }
+            // if(this.getFormData('campaignType')==2 || this.getFormData('campaignType')==7){
+            //     this.appIdChange(this.getFormData('appId'))
+            // }
             
             if(this.sysType==1){
                 this.appList=this.appListAll.filter(item=>{
@@ -2194,7 +2194,7 @@ export default {
                     this.description=res.result.description
                     
                     //  res.result.creativeTag=res.result.creativeTag?res.result.creativeTag:[]
-
+                    this.sysType=res.result.platformOs
                     let fngetIsActivate=new Promise((resolve,reject)=>{
                         getAction('/kuaishou/batch/getIsActivate', {
                             accountId: this.accountId