|
@@ -581,7 +581,6 @@ export default {
|
|
|
//tab切换页的函数
|
|
|
callback(key) {
|
|
|
console.log(key);
|
|
|
-<<<<<<< HEAD
|
|
|
this.tabkey=key;
|
|
|
this.loading=true
|
|
|
if(key=='group'){
|
|
@@ -591,14 +590,6 @@ export default {
|
|
|
}else if(key=='plan'){
|
|
|
this.getplanList({})
|
|
|
this.columns=planColumns;
|
|
|
-=======
|
|
|
- if(key=='plan'){
|
|
|
- this.columns=planColumns;
|
|
|
- }else if(key=='group'){
|
|
|
- this.columns=columns;
|
|
|
- let params = {};
|
|
|
- this.refreshCampaignList();
|
|
|
->>>>>>> 70a50f0c31548bd676fb38afe4a43a220737f9e6
|
|
|
}else if(key=='idea'){
|
|
|
this.columns=ideaColumns;
|
|
|
let params = {};
|
|
@@ -927,7 +918,6 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
-<<<<<<< HEAD
|
|
|
getplanList(params){
|
|
|
|
|
|
getAction(this.url.planList,params).then((res)=>{
|
|
@@ -980,18 +970,6 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
-=======
|
|
|
- refreshCreativeList(params){
|
|
|
- getAction(this.url.creativeList, params).then(res => {
|
|
|
- console.log(res);
|
|
|
- if (res.success) {
|
|
|
- this.data = res.result.records;
|
|
|
- } else {
|
|
|
- console.log(res.message);
|
|
|
- }
|
|
|
- })
|
|
|
- }
|
|
|
->>>>>>> 70a50f0c31548bd676fb38afe4a43a220737f9e6
|
|
|
},
|
|
|
mounted() {
|
|
|
console.log(this);
|