Explorar o código

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

zhuxinbo %!s(int64=4) %!d(string=hai) anos
pai
achega
2a0a3ee62e

+ 3 - 2
src/views/modules/BatchCreate/TouTiaoBatch.vue

@@ -1199,14 +1199,15 @@ export default {
                 this.ipagination.total = res.result.total
                 this.loading = false;
                 res.result.records.forEach((item)=>{
-                        item.key=item.id
+                    item.key=item.id
                 })
                 this.data = res.result.records;
                 this.selectedRows=[];
                 this.selectedRowKeys=[];
+                this.$message.success(res.message)
             } else {
             //   console.log(res.message);
-              this.selectedRows=[];
+                this.selectedRows=[];
                 this.selectedRowKeys=[];
             }
           })

+ 2 - 1
src/views/modules/BatchCreate/directedPackage.vue

@@ -209,6 +209,7 @@ export default {
             }).then((res)=>{
                 console.log(res);
                 this.dataSource=res.result.records;
+                this.ipagination.total=res.result.total
             })
         },
         search(){
@@ -242,7 +243,7 @@ export default {
             }).then((res)=>{
                 console.log(res);
                 this.dataSource=res.result.records;
-                this
+                this.ipagination.total=res.result.total
             })
         },
     },

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

@@ -22,7 +22,7 @@
     </div>
 
     <div class="rightBox">
-      <div class="title">已选<a-button class="clear" type="link" @click="clearAll">清空</a-button></div>
+      <div class="title">已选<a-button class="clearAllBtn" type="link" @click="clearAll">清空</a-button></div>
       <div class="linkMulti_list">
           <div class="selectBox1">
             <span class="selectListitem" v-for="(item,index) in checkedShowList" :key='index'>{{item.name}}<a-icon type="close" id="close" @click="deleteItem(item)" /></span>

+ 1 - 2
src/views/modules/BatchCreate/newDirectedPackage.vue

@@ -1116,8 +1116,7 @@ export default {
                         name:res.result.name,
                         landingType:res.result.landingType,
                         deliveryRange:res.result.deliveryRange,
-                        gender:res.result.gender,
-                        
+                        gender:res.result.gender,                       
                         filterConvertedUsers:res.result.filterConvertedUsers,
                     })
                     if(res.result.landingType=='APP_ANDROID'){

+ 15 - 13
src/views/modules/BatchCreate/newPlan.vue

@@ -245,7 +245,7 @@
             </div>
           </div>
           <!-- 应用推广下的转化目标 -->
-          <div class="row-item" v-if="isShowConversionTarget&&groupInfo.landingType=='APP'">
+          <div class="row-item" v-if="isShowConversionTarget&&groupInfo.landingType=='APP'&&getFormData('launchTarget')=='CONVERT_AMOUNT'">
             <div class="hint-item"></div>
             <div class="label-item">
               <div class="text-item">转化跟踪方式</div>
@@ -260,7 +260,7 @@
               </a-form-item>
             </div>
           </div>
-          <div class="row-item"  v-if="isShowConversionTarget&&groupInfo.landingType=='APP'&&convertType">
+          <div class="row-item"  v-if="isShowConversionTarget&&groupInfo.landingType=='APP'&&convertType&&getFormData('launchTarget')=='CONVERT_AMOUNT'">
             <div class="hint-item"></div>
             <div class="label-item">
               <div class="text-item">选择转化目标</div>
@@ -285,7 +285,7 @@
           </div>
            <!--  线索收集下的转化目标 -->
           
-          <div class="row-item" v-if="isShowConversionTarget&&groupInfo.landingType=='LINK'">
+          <div class="row-item" v-if="isShowConversionTarget&&groupInfo.landingType=='LINK'&&getFormData('launchTarget')=='CONVERT_AMOUNT'">
             <div class="hint-item"></div>
             <div class="label-item">
               <div class="text-item">转化跟踪方式</div>
@@ -300,7 +300,7 @@
               </a-form-item>
             </div>
           </div>
-          <div class="row-item"  v-if="isShowConversionTarget&&groupInfo.landingType=='LINK'&&convertType">
+          <div class="row-item"  v-if="isShowConversionTarget&&groupInfo.landingType=='LINK'&&convertType&&getFormData('launchTarget')=='CONVERT_AMOUNT'">
             <div class="hint-item"></div>
             <div class="label-item">
               <div class="text-item">选择转化目标</div>
@@ -1122,7 +1122,7 @@ export default {
           this.form.validateFieldsAndScroll((err, values) => {
             if (!err) {
 
-              // console.log('Received values of form: ', values)
+              console.log('Received values of form: ', values)
               // console.log(this.names)
               this.goNextloading=true;
               values.accountId = this.groupInfo.accountId
@@ -1135,14 +1135,16 @@ export default {
               if(this.getFormData('scheduleTime')!=''){
                   values.scheduleTime=this.scheduleTimeData
               }
-              if(this.getFormData('launchTarget')=='CLICK_AMOUNT'){
-                 
-                    values.pricing='PRICING_CPC'
-              }else if(val.target.value=='SHOW_AMOUNT'){               
-                    values.pricing='PRICING_CPM'
-              }else if(val.target.value=='CONVERT_AMOUNT'){             
-                    values.pricing='PRICING_OCPM'                 
+
+              if(this.getFormData('launchTarget')=='CLICK_AMOUNT'){               
+                  values.pricing='PRICING_CPC'
+              }else if(this.getFormData('launchTarget')=='SHOW_AMOUNT'){               
+                  values.pricing='PRICING_CPM'
+              }else if(this.getFormData('launchTarget')=='CONVERT_AMOUNT'){             
+                  values.pricing='PRICING_OCPM'                 
               }
+
+
               postAction('/ctop/byteDanceAdvertisePlan/add', {
                 names: this.names,
                 landingType: this.groupInfo.landingType,
@@ -1175,7 +1177,7 @@ export default {
               })
             }else{
               console.log(err)
-              this.$message.error(err)
+              // this.$message.error(err)
             }
           })
         }