魏志佳 %!s(int64=4) %!d(string=hai) anos
pai
achega
66dee5b69d

+ 29 - 29
src/views/modules/autoLaunch/setDirectional.vue

@@ -21,7 +21,7 @@
                         </div>
                         <div class="input-item">
                             <a-form-item>
-                                <a-select v-decorator="['appId', { rules: [{ required: true, message: '请选择目标应用' }] }]" showSearch allowClear
+                                <a-select v-decorator="['appIds', { rules: [{ required: true, message: '请选择目标应用' }] }]" showSearch allowClear
                                     placeholder="选择应用目标" optionFilterProp="children" style="width: 500px"  mode='multiple' :maxTagCount='1'
                                    :filterOption="filterOption">
                                     <!-- <a-select-option value="0">请选择目标应用</a-select-option> -->
@@ -582,7 +582,7 @@
             <a-radio-button value="1" v-show="strategyInfo.marketingGoal == 4||strategyInfo.marketingGoal == 5">JS布玛</a-radio-button>
             <a-radio-button value="2" v-show="strategyInfo.marketingGoal == 4||strategyInfo.marketingGoal == 5">Xpath</a-radio-button>
             <a-radio-button value="3"
-              v-show="strategyInfo.marketingGoal == 2&&(getPlatForm(getData('appId'))==1||getPlatForm(getData('appId'))==2)">应用-SDK
+              v-show="strategyInfo.marketingGoal == 2">应用-SDK
             </a-radio-button>
             <a-radio-button value="7" v-show="strategyInfo.marketingGoal == 2">应用-API</a-radio-button>
           </a-radio-group>
@@ -621,27 +621,27 @@ let ageArr=[
        
     },
     {
-        value:'18',
+        value:18,
         title:'	18-23岁',
          checked:false,
     },
     {
-        value:'24',
+        value:24,
         title:'24-30岁',
          checked:false,
     },
     {
-        value:'31',
+        value:31,
         title:'31-40岁',
         checked:false,
     },
     {
-        value:'41',
+        value:41,
         title:'41-49岁',
         checked:false,
     },
     {
-        value:'50',
+        value:50,
         title:'50岁+',
         checked:false,
     },
@@ -922,7 +922,7 @@ export default {
                 if(e.target.value=='1' || e.target.value=='2'){
                     this.retargetTabChange();
                     this.tabKey=e.target.value
-                }else if(e.target.vaule=='3'){
+                }else if(e.target.value=='3'){
                     this.retargetTabChange();
                     this.tabKey='1'
                 }
@@ -1014,7 +1014,7 @@ export default {
         
         //获取表单的某一个属性值
         getFormData(className) {
-        return this.form.getFieldValue(className)
+            return this.form.getFieldValue(className)
         },
         dateChange(date, dateString) {
         // console.log(date,dateString)
@@ -1113,11 +1113,12 @@ export default {
                         values.beginTime=this.dateRange[0].format('YYYY-MM-DD');
                         values.endTime= this.dateRange[1].format('YYYY-MM-DD');
                     }
-
+                    
                     values.agesRange=this.agesRange
                     values.region=this.region
-
-                    
+                    values.convertId=this.convertId
+                    values.excludePopulation=this.excludeSelectedKeys
+                    values.population=this.incluedSelectedKeys
                     console.log('Received values of form: ', values)
                     let params=[];
                 
@@ -1149,12 +1150,12 @@ export default {
         },
 
         getPlatForm(appId) {
-            // if (appId) {
-            //     var data = this.appList.filter(item => {
-            //         return item.appId == appId
-            //     })
-            //     return data[0].platform
-            // }
+            if (appId) {
+                var data = this.appList.filter(item => {
+                    return item.appId == appId
+                })
+                return data[0].platform
+            }
         },
 
         convertChange() {
@@ -1179,21 +1180,20 @@ export default {
         showConvert() {
             this.convertChange()
             if (this.strategyInfo.marketingGoal == 2) {
-            if (this.getData('appId')) {
-                this.convert = true
-                if (this.getPlatForm(this.getData('appId')) == 1 || this.getPlatForm(this.getData('appId')) == 2) {
+                if (this.getData('appIds')) {
+                    this.convert = true
+                    if (this.getPlatForm(this.getData('appId')) == 1 || this.getPlatForm(this.getData('appId')) == 2) {
+                        this.convertType = '3'
+                    } else {
+                        this.convertType = '7'
+                    }
 
-                this.convertType = '3'
                 } else {
-                this.convertType = '7'
+                    this.$message.error('请选择应用')
                 }
-
             } else {
-                this.$message.error('请选择应用')
-            }
-            } else {
-            this.convert = true
-            this.convertType = '1'
+                this.convert = true
+                this.convertType = '1'
             }
             this.getConvertList()
         },

+ 2 - 5
src/views/modules/earlyWarningRules/index.vue

@@ -312,16 +312,13 @@ export default {
     filters:{
         handleMediaType(val){
             switch (val) {
-                case 1:
-                    return '头条'
-                    break;
-            
+               
                 case 2:
                     return '快手'
                     break;
             
                 case 3:
-                    return '头条内广'
+                    return '头条'
                     break;
             
                 case 4:

+ 1 - 1
src/views/modules/earlyWarningRules/useRuleList.vue

@@ -461,7 +461,7 @@ export default {
           break
 
         case 3:
-          return '头条内广'
+          return '头条'
           break
 
         case 4: