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

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-vue

zhuxinbo 4 лет назад
Родитель
Сommit
926e51052f

+ 35 - 35
src/views/modules/BatchCreate/TouTiaoBatch.vue

@@ -581,18 +581,18 @@ export default {
         rowSelection(){
             return {
                 onChange: (selectedRowKeys, selectedRows) => {
-                    console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+                    // console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
                     this.selectedRowKeys=selectedRowKeys;
                     this.selectedRows=selectedRows;
                 },
                 onSelect: (record, selected, selectedRows) => {
-                    console.log(record, selected, selectedRows);
+                    // console.log(record, selected, selectedRows);
                     this.modifyTableData=selectedRows;
 
                     this.selectedRows=selectedRows;
                 },
                 onSelectAll: (selected, selectedRows, changeRows) => {
-                    console.log(selected, selectedRows, changeRows);
+                    // console.log(selected, selectedRows, changeRows);
                     this.modifyTableData=selectedRows
                     this.selectedRows=selectedRows;
                 },
@@ -610,11 +610,11 @@ export default {
         // table里的函数在上
 
         accountIDChange(val){
-            console.log(val);
+            // console.log(val);
             let currentData=this.treeData.filter((item)=>{
                 return item.value==val
             })
-            console.log(currentData);
+            // console.log(currentData);
             if(currentData.length>0){
                 this.accountID=undefined;
                 this.openID=val
@@ -624,14 +624,14 @@ export default {
         },
 
         filterOption(input, option){
-            console.log(input, option)
+            // console.log(input, option)
             return (
                 option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
             );
         },
         //tab切换页的函数
         callback(key) {
-            console.log(key);
+            // console.log(key);
             this.tabkey=key;
 
             // this.columns=[];
@@ -703,7 +703,7 @@ export default {
         },
         //输入框查询事件
         onSearch(value){
-            console.log('input--'+value);
+            // console.log('input--'+value);
         },
         //查询按钮事件
         search(){
@@ -755,7 +755,7 @@ export default {
         },
         //点击分页
         sort(pagination, filters, sorter, { currentDataSource }){
-            console.log(pagination, filters, sorter)
+            // console.log(pagination, filters, sorter)
             // if(sorter.order == 'ascend'){
             //     this.HttpPost(sorter.columnKey+'+')
             // }else if(sorter.order == 'descend'){
@@ -771,7 +771,7 @@ export default {
         //状态改变
         switchChange(text,record){
 
-            console.log(text,record);
+            // console.log(text,record);
             let recordData=JSON.parse(JSON.stringify(record))
 
            if(this.tabkey=='group'){
@@ -782,7 +782,7 @@ export default {
                    ids:`${ids}`,
                    status:status,
                })).then((res)=>{
-                   console.log(res);
+                //    console.log(res);
                    if(res.success){
                        this.data=[];
                        this.refreshCampaignList({
@@ -812,7 +812,7 @@ export default {
                    ids:`${ids}`,
                    status:status,
                })).then((res)=>{
-                   console.log(res);
+                //    console.log(res);
                    if(res.success){
                        this.data=[];
                        this.refreshCreativeList({
@@ -838,7 +838,7 @@ export default {
         },
         //批量操作下的启动 删除 暂停
         optChange(value){
-            console.log(value)
+            // console.log(value)
             this.optValue=value;
         },
         editGroupStatus(url){
@@ -953,7 +953,7 @@ export default {
         },
         //取消删除
         cancel(e) {
-            console.log(e);
+            // console.log(e);
             // this.$message.error('删除成功');
         },
         //预算里 取消按钮点击
@@ -968,13 +968,13 @@ export default {
         },
         //单选按钮改变事件
         radioChange(e) {
-            console.log('radio checked', e.target.value,this.radioValue);
+            // console.log('radio checked', e.target.value,this.radioValue);
         },
         totalbudgetChange(val){
-            console.log(this.inputValue,'------',val)
+            // console.log(this.inputValue,'------',val)
         },
         budgetChange(e,record){
-            console.log(e.target.value,'------',record);
+            // console.log(e.target.value,'------',record);
             this.xiugaiData.push(JSON.parse(JSON.stringify(record)))
             if(this.typeValue=='预算'){
                 if(e.target.value ){
@@ -1018,9 +1018,9 @@ export default {
         },
         //批量修改出价和预算的弹出框确定
         modifyChangeOk(e) {
-            console.log(e);
+            // console.log(e);
             this.offerPriceVisiable = false;
-            console.log(this.inputValue);
+            // console.log(this.inputValue);
             if(this.modifyRulesValue=='separately'){
 
                 let batchArr=[...this.xiugaiData];
@@ -1055,7 +1055,7 @@ export default {
         },
         batchEditHttp(type,params){
             postAction(`/ctop/byteDanceAdvertisePlan/batchEdit/${type}`,params).then((res)=>{
-                console.log(res);
+                // console.log(res);
                 if(res.success){
                     if(res.result.length>0){
                         this.modifyTableData=[]
@@ -1076,7 +1076,7 @@ export default {
         },
         //修改规则的改变
         modifyRulesChange(e){
-            console.log(e.target.value)
+            // console.log(e.target.value)
             this.modifyRulesValue=e.target.value
             if(e.target.value=='total'){
                 this.inputValue=''
@@ -1085,10 +1085,10 @@ export default {
             }
         },
         //更改文字提示的父节点
-        getPopupContainer(){
-            console.log(this);
-            return this.$el
-        },
+        // getPopupContainer(){
+        //     // console.log(this);
+        //     return this.$el
+        // },
 
         //点击修改广告名
         // changecampaignName(text,record){
@@ -1096,7 +1096,7 @@ export default {
         // },
 
         onCellChange(key, dataIndex, value) {
-            console.log(key, dataIndex, value)
+            // console.log(key, dataIndex, value)
             
                 const dataSource = [...this.data];
                 const target = dataSource.find(item => item.key === key);
@@ -1176,7 +1176,7 @@ export default {
 
                 }
             
-            console.log(this.data)
+            // console.log(this.data)
         },
 
 
@@ -1188,12 +1188,12 @@ export default {
 
         copyPlanOk(e) {
             this.copyPlanVisiable = false;
-            console.log(this.copyNum,'---',this.copyGroup)
+            // console.log(this.copyNum,'---',this.copyGroup)
         },
         refreshCampaignList(params){
             // this.loading=true
           getAction(this.url.campaignList, params).then(res => {
-            console.log(res);
+            // console.log(res);
             if (res.success) {
                 this.ipagination.total = res.result.total
                 this.loading = false;
@@ -1204,7 +1204,7 @@ export default {
                 this.selectedRows=[];
                 this.selectedRowKeys=[];
             } else {
-              console.log(res.message);
+            //   console.log(res.message);
               this.selectedRows=[];
                 this.selectedRowKeys=[];
             }
@@ -1214,7 +1214,7 @@ export default {
 
             getAction(this.url.planList,params).then((res)=>{
                 this.data=[]
-                console.log(res)
+                // console.log(res)
                 if(res.success){
 
                     this.ipagination.total = res.result.total
@@ -1224,7 +1224,7 @@ export default {
                     })
 
                     this.data = res.result.records;
-                    console.log(this.data)
+                    // console.log(this.data)
                     this.selectedRowKeys=[];
                 }
             })
@@ -1232,7 +1232,7 @@ export default {
 
         refreshCreativeList(params){
             getAction(this.url.creativeList, params).then(res => {
-                console.log(res);
+                // console.log(res);
                 if (res.success) {
                     this.ipagination.total = res.result.total
                     this.loading = false;
@@ -1242,7 +1242,7 @@ export default {
                     this.data = res.result.records;
 
                 } else {
-                    console.log(res.message);
+                    // console.log(res.message);
                 }
             })
         },
@@ -1282,7 +1282,7 @@ export default {
         },
     },
     mounted() {
-        console.log(this);
+        
 
         // let params = {}
         // // this.dateString=[moment().format("YYYY-MM-DD"),moment().format("YYYY-MM-DD")]

+ 6 - 6
src/views/modules/BatchCreate/crowedPackage.vue

@@ -452,7 +452,7 @@ export default {
             console.log(this.accountId)
         },
         treeSearch(){
-            console.log(arguments);
+            // console.log(arguments);
         },
         treeSelect(){
             // console.log(arguments);
@@ -466,16 +466,16 @@ export default {
         },
         //日期改变
         dateChange(date, dateString) {
-            console.log(date, dateString);
+            // console.log(date, dateString);
             this.dateValue=date;
         },
         //按名字搜索
         onSearch(value) {
-            console.log(value);
+            // console.log(value);
         },
         //批量操作
         batchChange(val){
-            console.log(val)
+            // console.log(val)
             this.batchValue=val
         },
         //查询按钮
@@ -511,7 +511,7 @@ export default {
         },
         //匹配类型
         matchChange(val){
-            console.log(val)
+            // console.log(val)
         },
         //上传人群包--选择已有的人群分组
         showGroupPage(){
@@ -525,7 +525,7 @@ export default {
         },
  
         filterOption(input, option){
-            console.log(input, option)
+            // console.log(input, option)
             return (
                 option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
                 );

+ 17 - 17
src/views/modules/BatchCreate/linkMultiSelect.vue

@@ -73,7 +73,7 @@
           
           let childrensArr = Array.from(this.$refs.mycheckBox.children)
           setTimeout(() => {
-            console.log(val, index)
+            // console.log(val, index)
             // console.log(val.data.checked)
             if (index == 1 || this.clickKey == 1) {
                 this.$refs.mycheckBox.style.width = '100%'
@@ -82,7 +82,7 @@
                         parentCode:val.data.code,
                         level:this.maxLayers
                     }).then((res)=>{
-                        console.log(res);
+                        // console.log(res);
                         if(res.success){
                             if(res.data.length>0){
                                 res.data.forEach((item,index)=>{
@@ -91,7 +91,7 @@
                                     item.checked=val.data.checked;
                                     item.indeterminates=false;
                                 })
-                                console.log(this.checkedShowList)
+                                // console.log(this.checkedShowList)
                                 this.checkedShowList.forEach((ele)=>{
                                   res.data.forEach((item)=>{
                                       if(ele.code==item.code){
@@ -133,7 +133,7 @@
                         parentCode:val.data.code,
                         level:this.maxLayers
                     }).then((res)=>{
-                        console.log(res);
+                        // console.log(res);
                         if(res.success){
                             if(res.data.length>0){
                                 res.data.forEach((item,index)=>{
@@ -192,7 +192,7 @@
                         parentCode:val.data.code,
                         level:this.maxLayers
                     }).then((res)=>{
-                        console.log(res);
+                        // console.log(res);
                         if(res.success){
                             if(res.data.length>0){
                                 res.data.forEach((item,index)=>{
@@ -230,7 +230,7 @@
                     this.listArr2.forEach((ele,i)=>{                       
                       if(ele.code==val.data.parentCode){
                           ind=i
-                          console.log(ind)
+                          // console.log(ind)
                       }                                           
                     })      
                     if(ind>-1){
@@ -242,7 +242,7 @@
                     this.listArr1.forEach((element,num)=>{                        
                       if(element.code==this.listArr2[ind].parentCode){
                           z=num
-                          console.log(ind)
+                          // console.log(ind)
                       }
                         
                     })      
@@ -286,7 +286,7 @@
                     this.listArr2.forEach((element,num)=>{
                         if(item.code==this.listArr3[ind].parentCode){
                             ind=num
-                            console.log(ind)
+                            // console.log(ind)
                         }                        
                     })    
                     if(ind>-1){
@@ -303,7 +303,7 @@
                             
                             if(item.code==this.listArr2[ind].parentCode){
                                 z=num
-                                console.log(z)
+                                // console.log(z)
                             }
                             
                         })      
@@ -346,7 +346,7 @@
       
       
       deleteItem(item){
-          console.log(item);
+          // console.log(item);
           let val='';
           this.checkedShowList.forEach((ele,index)=>{
               if(ele.code==item.code){
@@ -365,7 +365,7 @@
               })  
           }
           if(item.level==2){
-              console.log('------------------------------------');
+              // console.log('------------------------------------');
               let childList=this.checkedShowList.filter((element,index) => {
                   return element.parentCode==item.parentCode;
               });
@@ -422,7 +422,7 @@
       },
 
       getCheckedList(val){
-        console.log(val);
+        // console.log(val);
         if(val.curLayerNum==1){
           if(val.checkList.length>0){
             this.checkedShowList=this.checkedShowList.filter((item)=>{
@@ -521,7 +521,7 @@
             this.checkedShowList=this.checkedShowList.filter((item)=>{
               return item.parentCode!=val.currentList[0].parentCode
             })
-            console.log(this.checkedShowList)
+            // console.log(this.checkedShowList)
             val.checkList.forEach((ele)=>{
               var result = this.checkedShowList.some(item => {
                 if(item.code == ele){
@@ -537,7 +537,7 @@
               }
              
             })
-            console.log(this.checkedShowList)
+            // console.log(this.checkedShowList)
           }else if(val.checkList.length==0){
             this.checkedShowList=this.checkedShowList.filter((item)=>{
               return item.parentCode!=val.currentList[0].parentCode
@@ -569,7 +569,7 @@
                 parentCode:0,
                 level:this.maxLayers
             }).then((res)=>{
-                console.log(res);
+                // console.log(res);
                 if(res.success){
                     res.data.forEach((item,index)=>{
                         item.value=item.code
@@ -661,9 +661,9 @@
       padding: 0 15px;
       border-bottom: 1px solid #ccc;
       position: relative;
-      .clear{
+      .clearAllBtn{
           position: absolute;
-          top: 0px;
+          top: 3px;
           right: 0;
       }
     }

+ 16 - 3
src/views/modules/BatchCreate/newCreate.vue

@@ -251,7 +251,7 @@
             </div>
             <div class="input-item">
               <a-form-item>
-                <a-input v-model="createTip" @keyup.enter="onSubmit"></a-input>
+                <!-- <a-input v-model="createTip" @keyup.enter="onSubmit"></a-input>
                 <div v-if="createTipList.length>0">
                   <template v-for="(tag, index) in createTipList">
                     <a-tooltip v-if="tag.length > 20" :key="tag" :title="tag">
@@ -263,8 +263,12 @@
                       {{ tag }}
                     </a-tag>
                   </template>
-                </div>
+                </div> -->
+
 
+                 <a-select mode="tags" style="width: 100%" placeholder="按空格生成标签" v-model="createTipList" :token-separators="[' ']" >
+                  
+                </a-select>
               </a-form-item>
             </div>
           </div>
@@ -352,7 +356,7 @@
         <!-- <div class="moduler-title">计划名称</div> -->
         <div class="opt">
           <a-button type="default" style="margin-right:15px" @click="goBack">取消</a-button>
-          <a-button type="primary" style="margin-right:15px" @click="goSave" :loading="loading">保存并关闭</a-button>
+          <a-button type="danger" style="margin-right:15px" @click="goSave" :loading="loading">保存并关闭</a-button>
         </div>
       </div>
     </a-form>
@@ -467,6 +471,9 @@
       material
     },
     methods: {
+      handleChange(){
+        console.log(this.createTipList)
+      },
       handleOk(e) {
           this.$router.replace('/modules/BatchCreate/TouTiaoBatch')
           this.$bus.$emit('remove', '/modules/BatchCreate/newCreate')
@@ -703,6 +710,12 @@
 </script>
 
 <style lang="scss">
+.newCreate{
+  .ant-btn-danger {
+    background-color: #ff4d4f !important; 
+  }
+}
+
   .ant-tooltip-inner,
   .ant-tooltip,
   .ant-tooltip-arrow::before {

+ 35 - 35
src/views/modules/BatchCreate/newDirectedPackage.vue

@@ -66,9 +66,9 @@
                     text-align: left;
                     position: relative;
                     
-                    .clear{
+                    .clearAllBtn{
                         position: absolute;
-                        top: 5px;
+                        top: 3px;
                         right: 0;
                     }
                 }
@@ -693,7 +693,7 @@
                                                 <span>类目词:{{}}</span>
                                                 <span>关键词:{{}}</span>
                                             </span>
-                                            <a-button type='link' class="action_right_btn">清空</a-button>
+                                            <a-button type='link' class="action_right_btn clearAllBtn">清空</a-button>
                                         </div>
                                         <div class="action_right_bottom">
                                             <div class="action_right_option">
@@ -1104,14 +1104,14 @@ export default {
     },
     watch: {
         id(n,o){
-            console.log(n,o)      
+            // console.log(n,o)      
             if(n!=o){                      
                 this.title='修改定向包';
                 this.editId=this.id
                 getAction('/ctop/audiencePackage/queryById',{
                     id:this.editId
                 }).then((res)=>{
-                    console.log(res);
+                    // console.log(res);
                     this.form.setFieldsValue({
                         name:res.result.name,
                         landingType:res.result.landingType,
@@ -1359,7 +1359,7 @@ export default {
             return {
                 // selectedRowKeys: this.incluedSelectedRowKeys,
                 onChange: (selectedRowKeys, selectedRows) => {
-                    console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+                    // console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
                     this.incluedSelectedRowKeys = selectedRowKeys;
                     
                 },
@@ -1375,7 +1375,7 @@ export default {
             return {
                 // selectedRowKeys: this.excludeSelectedRowKeys,
                 onChange: (selectedRowKeys, selectedRows) => {
-                    console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+                    // console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
                     // this.selectedRowKeys = selectedRowKeys;
                     this.excludeSelectedRowKeys = selectedRowKeys;
                 },
@@ -1395,14 +1395,14 @@ export default {
         },
         // 自定义人群的--同时定向排除tab切换事件
         retargetTabChange(tabkey){
-            console.log(tabkey)
+            // console.log(tabkey)
             this.retargetDataAll=[];
             this.loading=true;
             if(this.accountInfo.value){
                 getAction('/ctop/audience/list',{
                     accountId:this.accountInfo.value
                 }).then((res)=>{
-                    console.log(res)
+                    // console.log(res)
                     this.loading=false;
                     if(res.success){
                         res.data.forEach((item)=>{
@@ -1422,12 +1422,12 @@ export default {
             // }
         },
         onSelectChange(selectedRowKeys) {
-            console.log('selectedRowKeys changed: ', selectedRowKeys);
+            // console.log('selectedRowKeys changed: ', selectedRowKeys);
             this.selectedRowKeys = selectedRowKeys;
         },
         // 自定义人群的改变
         retargetTableChange(pagination, filters, sorter){
-            console.log(pagination);
+            // console.log(pagination);
         },
           // 自定义人群下的 定向排除
         directLogicChange(val){
@@ -1437,14 +1437,14 @@ export default {
         
         // 只能放量改变
         zhinengChange(e){
-            console.log(e.target.value,this.getFormData('autoExtendEnabled'));
+            // console.log(e.target.value,this.getFormData('autoExtendEnabled'));
             // this.form.setFieldsValue({
             //     autoExtendEnabled:e.target.value
             // })
         },
         //文章分类改变
         articleTypeChange(e){
-            console.log(e)
+            // console.log(e)
             // if(e.target.value=''){
             //     this.articleCategory=[];
             //     this.articleChecked=[];
@@ -1530,69 +1530,69 @@ export default {
 
         //地域里的受众人群的位置
         regionPeopleChange(e){
-            console.log(e.target.value,this.regionPeopleValue)
+            // console.log(e.target.value,this.regionPeopleValue)
         },
         //获取选中的城市
         getSelectedCityArr(val){
-            console.log(val);
+            // console.log(val);
             this.city=[];
             this.city=val;
         },
         // 获取选中的区县
         getSelectedCountyArr(val){
-            console.log(val)
+            // console.log(val)
             this.city=[];
             this.city=val;
         },
         //省市的tab切换
         cityTabChange(key){
-            console.log(key)
+            // console.log(key)
         },
         //商圈的tab改变
         businessTabChange(key){
-            console.log(key)
+            // console.log(key)
         },
 
         //商圈的联动改变
 
         businessChange(val){
-            console.log(val)
+            // console.log(val)
         },
         //地图的搜索事件
         MapSearch(val){
-            console.log(val)
+            // console.log(val)
         },
 
         //行为场景
         actionSceneChange(value){
-            console.log(value)
+            // console.log(value)
         },
 
         //行为下的 类目搜索框
         TaxonomicSearch(value){
-            console.log(value);
+            // console.log(value);
             this.TaxonomicValue=value
         },
         //行为下的 关键词搜索框
         keyWordSearch(value){
-            console.log(value);
+            // console.log(value);
             this.keyWordValue=value
         },
         //获取智能放量定向的值
         getAutoExtendEnabled(val){
-            console.log(val)
+            // console.log(val)
             this.autoExtendTargets=[];
             this.autoExtendTargets.push(...val)
         },
         //获取手机品牌的值
         getDeviceBrand(val){
-            console.log(val);
+            // console.log(val);
             this.deviceBrand=[];
             this.deviceBrand.push(...val)
         },
         //获取文章分类的值
         getArticleCategory(val){
-            console.log(val)
+            // console.log(val)
             this.articleCategory=[];
             this.articleCategory.push(...val)
         },
@@ -1645,7 +1645,7 @@ export default {
         //定向包处理事件
         getValuehandle(){
             let formData=this.form.getFieldsValue()
-            console.log(formData)
+            // console.log(formData)
             if(this.launchPrice=='custom'){
                 formData['launchPrice']=this.launchPriceArr
             }
@@ -1683,15 +1683,15 @@ export default {
 
         //应用按钮
         applicatiSubmit(){
-            console.log('submit!', this.form);
+            // console.log('submit!', this.form);
             if(this.getFormData('name')){ 
                 let formData=this.form.getFieldsValue()
-                console.log(formData)
+                // console.log(formData)
                 if(this.launchPrice=='custom'){
                     formData['launchPrice']=this.launchPriceArr
                 }
                 if(!this.regionValue!='NONE'){
-                    console.log('需要处理地域的值');
+                    // console.log('需要处理地域的值');
                     formData['city']=this.city
                 }
                 let userinfo=localStorage.getItem('pro__Login_Userinfo')
@@ -1793,14 +1793,14 @@ export default {
             }
         })
         let accountInfo = localStorage.getItem('accountInfo')
-        console.log(accountInfo)
+        // console.log(accountInfo)
         if (accountInfo!=null) {
             this.accountInfo = JSON.parse(accountInfo)
             if(this.accountInfo.value){
                 getAction('/ctop/audience/list',{
                     accountId:this.accountInfo.value
                 }).then((res)=>{
-                console.log(res)
+                // console.log(res)
                 if(res.success){
                         res.data.forEach((item)=>{
                             item.key=item.custom_audience_id                           
@@ -1812,11 +1812,11 @@ export default {
                 })
             }
         }
-        console.log(this.accountInfo)
+        // console.log(this.accountInfo)
 
         this.platformArr=JSON.parse(JSON.stringify(platformArr))
         // this.platformArr = [...platformArr]
-        console.log(this.$route.query,this.id)
+        // console.log(this.$route.query,this.id)
 
         if(this.$route.query.id||this.id){
             this.title='修改定向包';
@@ -1824,7 +1824,7 @@ export default {
             getAction('/ctop/audiencePackage/queryById',{
                 id:this.editId
             }).then((res)=>{
-                console.log(res);
+                // console.log(res);
                 this.form.setFieldsValue({
                     name:res.result.name,
                     landingType:res.result.landingType,

+ 12 - 3
src/views/modules/BatchCreate/newGroup.vue

@@ -96,7 +96,7 @@
             </div>
             <div class="creatBody">
                 <a-button type='default' class="goback" @click="goback">返回</a-button>
-                <a-button type='danger' @click="nextHandle">创建并下一步</a-button>
+                <a-button type='danger' @click="nextHandle" :loading='nextLoading'>创建并下一步</a-button>
             </div>
         </div>
     </div>
@@ -115,6 +115,7 @@ const formItemLayout = {
 export default {
     data() {
         return {
+            nextLoading:false,
             tabKey:'create',
             accountID:undefined,
             treeData:[],
@@ -244,7 +245,8 @@ export default {
            if(this.accountID){
                 this.form.validateFields((err, values) => {
                     if (!err) {
-                        console.log('Received values of form: ', values);
+                        this.nextLoading=true;
+                        // console.log('Received values of form: ', values);
                         if(values.budgetMode== "BUDGET_MODE_INFINITE" ){
                             postAction('/ctop/byteDanceCampaign/add',qs.stringify({
                                 accountId:this.accountID,
@@ -252,6 +254,7 @@ export default {
                             })).then(res=>{
                                 console.log(res)
                                 if(res.success){
+                                    this.nextLoading=false;
                                     this.$message.success('广告组创建成功,2s后将跳转到新建计划页面');
                                     values.id=res.campaign_id;
                                     values.accountId=this.accountID
@@ -317,7 +320,13 @@ export default {
     // },
 }
 </script>
-
+<style lang="scss">
+.newGroup{
+  .ant-btn-danger {
+    background-color: #ff4d4f !important; 
+  }
+}
+</style>
 <style lang="scss" scoped>
 .newGroup{
     ul, li {

+ 36 - 18
src/views/modules/BatchCreate/newPlan.vue

@@ -591,7 +591,7 @@
                 />
  
                 <span style="margin-left:5px">元</span>
-                <span style="margin-left:20px">请填入必填字段,获取建议出价</span>
+                <!-- <span style="margin-left:20px">请填入必填字段,获取建议出价</span> -->
                 <a-tooltip>
                   <template slot="title">
                     <span style="font-weight:600">建议出价获取方式:</span>
@@ -620,7 +620,7 @@
               <a-form-item>
                 <a-input-number :min='4' :max="10000" :step="0.1" v-decorator="['bid', ]"  style="width:200px"/>
                 <span style="margin-left:5px">元</span>
-                <span style="margin-left:20px">请填入必填字段,获取建议出价</span>
+                <!-- <span style="margin-left:20px">请填入必填字段,获取建议出价</span> -->
                 <a-tooltip>
                   <template slot="title">
                     <span style="font-weight:600">建议出价获取方式:</span>
@@ -645,7 +645,7 @@
               <a-form-item>
                 <a-input-number :min='4' :max="10000" :step="0.1" v-decorator="['bid', ]" style="width:200px" />
                 <span style="margin-left:5px">元</span>
-                <span style="margin-left:20px">请填入必填字段,获取建议出价</span>
+                <!-- <span style="margin-left:20px">请填入必填字段,获取建议出价</span> -->
                 <a-tooltip>
                   <template slot="title">
                     <span style="font-weight:600">建议出价获取方式:</span>
@@ -685,7 +685,7 @@
                 />
                 <a-input-number :max="10000" :step="0.1" v-decorator="['cpaBid', ]" v-else />
                 <span style="margin-left:5px">元</span>
-                <span style="margin-left:20px">请填入必填字段,获取建议出价</span>
+                <!-- <span style="margin-left:20px">请填入必填字段,获取建议出价</span> -->
                 <a-tooltip>
                   <template slot="title">
                     <span style="font-weight:600">建议出价获取方式:</span>
@@ -743,8 +743,8 @@
         <!-- <div class="moduler-title">计划名称</div> -->
         <div class="opt">
           <a-button type="default" style="margin-right:15px" @click="goBack">取消</a-button>
-          <a-button type="primary" style="margin-right:15px" @click="goPlanShow">保存并关闭</a-button>
-          <a-button type="danger" @click="goNext">保存并新建创意</a-button>
+          <a-button type="primary" style="margin-right:15px" @click="goPlanShow" :loading="goPlanShowloading">保存并关闭</a-button>
+          <a-button type="danger"  @click="goNext"  :loading="goNextloading">保存并新建创意</a-button>
         </div>
       </div>
     </a-form>
@@ -770,6 +770,8 @@ export default {
   },
   data() {
     return {
+      goNextloading:false,
+      goPlanShowloading:false,
       groupInfo: {},
       accountInfo:{},
       form: this.$form.createForm(this),
@@ -857,7 +859,7 @@ export default {
     },
     // 转化目标类型
     convertTypeChange(e){
-      console.log(e.target.value,);
+      // console.log(e.target.value,);
       this.convertList.forEach((item)=>{
         if(item.convert_type==e.target.value){
           this.currentConvertType=item
@@ -877,7 +879,7 @@ export default {
     },
     //  转化目标显示
     SelectConversionTarget() {
-        console.log(this.groupInfo)
+        // console.log(this.groupInfo)
         let downloadType=this.getFormData('downloadType');
         let downloadUrl=this.getFormData('downloadUrl');
         let externalUrl=this.getFormData('externalUrl');
@@ -894,7 +896,7 @@ export default {
             appType,
             
           })).then(res=>{
-            console.log(res)
+            // console.log(res)
             if(res.success){
               // if(res.result.data){
               //     res.result.data.list.forEach((item)=>{
@@ -929,7 +931,7 @@ export default {
       return this.form.getFieldValue(className)
     },
     dateChange(date, dateString) {
-      console.log(date,dateString)
+      // console.log(date,dateString)
       this.form.getFieldDecorator('startTime')
       this.form.getFieldDecorator('endTime')
       this.form.setFieldsValue({
@@ -950,7 +952,7 @@ export default {
       getAction('/ctop/audiencePackage/list', {
         userId,
       }).then((res) => {
-        console.log(res)
+        // console.log(res)
         if (res.success) {
           this.directeArr = res.result.records
         }
@@ -958,7 +960,7 @@ export default {
     },
     // 定向包改变
     directeChange(val) {
-      console.log(val)
+      // console.log(val)
       // let currentDirect=this.directeArr.filter((item)=>{
       //   return item.id==val
       // });
@@ -976,7 +978,7 @@ export default {
       }, 1)
     },
     handleOk(e) {
-      console.log(e)
+      // console.log(e)
       this.visible = false
     },
     // 验证网址
@@ -1054,8 +1056,9 @@ export default {
         if (this.validatorName()) {
           this.form.validateFieldsAndScroll((err, values) => {
             if (!err) {
-              console.log('Received values of form: ', values)
-              console.log(this.names)
+              this.goPlanShowloading=true;
+              // console.log('Received values of form: ', values)
+              // console.log(this.names)
               values.accountId = this.groupInfo.accountId
               values.campaignId = this.groupInfo.id;
               values.convertId = this.convertId;
@@ -1071,6 +1074,7 @@ export default {
               }).then((res) => {
                 console.log(res)
                 if (res.success) {
+                  this.goPlanShowloading=false;
                   if(res.code==0){
                      this.$message.success('广告计划创建成功,2s后将跳转到头条批量页面')
                     let planInfo=JSON.stringify({...values,...this.directPackageValue,names:this.names,landingType: this.groupInfo.landingType,})
@@ -1079,7 +1083,11 @@ export default {
                        this.$router.replace(`/modules/BatchCreate/TouTiaoBatch`)
                     },2000)
                   }else{
-                    this.$message.error(res.message)
+                    if(res.message='convert_id is required'){
+                        this.$message.error('转化方式必须选择!')
+                    }else{
+                      this.$message.error(res.message)
+                    }
                   }
                  
                 } else {
@@ -1105,8 +1113,10 @@ export default {
         if (this.validatorName()) {
           this.form.validateFieldsAndScroll((err, values) => {
             if (!err) {
-              console.log('Received values of form: ', values)
-              console.log(this.names)
+
+              // console.log('Received values of form: ', values)
+              // console.log(this.names)
+              this.goNextloading=true;
               values.accountId = this.groupInfo.accountId
               values.campaignId = this.groupInfo.id;
               values.convertId = this.convertId;
@@ -1126,6 +1136,7 @@ export default {
               }).then((res) => {
                 console.log(res)
                 if (res.success) {
+                  this.goNextloading=false;
                   if(res.code==0){
                      this.$message.success('广告计划创建成功,2s后将跳转到新建创意页面')
                     let planInfo=JSON.stringify(res.result)
@@ -1256,6 +1267,13 @@ export default {
 }
 </script>
 <style lang="scss">
+.newPlan{
+  .ant-btn-danger {
+    background-color: #ff4d4f !important; 
+  }
+}
+
+
 .ant-tooltip-inner,
 .ant-tooltip,
 .ant-tooltip-arrow::before {

+ 8 - 8
src/views/modules/BatchCreate/singleLayerSelecte.vue

@@ -22,7 +22,7 @@
       <div class="selectRight">
         <div class="title">
           已选
-          <a-button class="clear" type="link" @click="clearAll">清空</a-button>
+          <a-button class="clearAllBtn" type="link" @click="clearAll">清空</a-button>
         </div>
         <div class="selectBox1">
           <span class="selectListitem" v-for="(item,index) in checkedShowList" :key="index">
@@ -82,7 +82,7 @@ export default {
                 })
                  if (this.checked.length) {
                     this.checkedList = this.checked;
-                    console.log(this.checkedList,this.plainOptions)
+                    // console.log(this.checkedList,this.plainOptions)
                     this.checkedList.forEach((ele, i) => {
                         this.plainOptions.forEach((item, index) => {
                             if (item.value == ele) {
@@ -105,7 +105,7 @@ export default {
     //手机品牌多选的事件
     checkGroupChange(checkedList) {
         this.checkedShowList = []
-        console.log(checkedList)
+        // console.log(checkedList)
         this.indeterminate = !!checkedList.length && checkedList.length < this.plainOptions.length
         this.checkAll = checkedList.length === this.plainOptions.length
         checkedList.forEach((ele, i) => {
@@ -119,7 +119,7 @@ export default {
 
     },
     onCheckAllChange(e) {
-    console.log(e.target.checked,this.valueOptions)
+    // console.log(e.target.checked,this.valueOptions)
       Object.assign(this, {
         checkedList: e.target.checked ? this.valueOptions : [],
         indeterminate: false,
@@ -135,13 +135,13 @@ export default {
       if (!e.target.checked) {
         this.checkedShowList = []
       }
-      console.log(this.checkedList)
+      // console.log(this.checkedList)
         // this.$emit('getCheckedList', this.checkedList)
 
     },
 
     deleteItem(item) {
-      console.log(item)
+      // console.log(item)
       let val = ''
       this.plainOptions.forEach((ele, index) => {
         if (ele.label == item) {
@@ -211,9 +211,9 @@ export default {
       text-align: left;
       position: relative;
       border-radius: 5px 5px 0 0;
-      .clear {
+      .clearAllBtn{
         position: absolute;
-        top: 5px;
+        top: 3px;
         right: 0;
       }
     }