Explorar el Código

'合并master'0

魏志佳 hace 4 años
padre
commit
bb95d2bd7b

BIN
jiaoyang2021-01-30.zip


+ 1 - 0
src/views/modules/advertiser/ProjectMemberList.vue

@@ -805,6 +805,7 @@ export default {
       params.projectId = this.record.projectId
       params.projectName = this.record.projectName
       params.systemType = this.systemType == '4' ? this.systemTypeName : this.systemType
+      
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {

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

@@ -2011,21 +2011,6 @@ export default {
                     }
                     
             
-<<<<<<< HEAD
-=======
-                    this.incluedSelectedRowKeys=res.result.population?JSON.parse(res.result.population):[]
-                    this.excludeSelectedRowKeys=res.result.excludePopulation?JSON.parse(res.result.excludePopulation):[]
-                    let selectedRow=[]
-                    // incluedSelectedRowKeys.forEach(item=>{
-                    //     selectedRow.push({
-                    //         accountId:this.accountId,
-                    //         key:item,
-                    //         id:item,
-                    //     })
-                       
-                    // })
-
->>>>>>> master
                     
                     this.incluedSelectedRowKeys=res.result.population?JSON.parse(res.result.population):[]
                     this.excludeSelectedRowKeys=res.result.excludePopulation?JSON.parse(res.result.excludePopulation):[]