朱鑫波 4 vuotta sitten
vanhempi
commit
ab5d7a6338

+ 25 - 11
src/views/modules/autoLaunch/configLaunchInfo.vue

@@ -883,7 +883,7 @@
                         </a-form-item>
                         </div>
                     </div>
-                    <div class="row-item" v-if="whiteList.creative_category_switch">
+                    <div class="row-item" v-if="whiteList.creative_category_switch==1">
                         <div class="hint-item"></div>
                         <div class="label-item">
                         <div class="text-item">创意标签</div>
@@ -2192,7 +2192,7 @@ export default {
                     
                     this.accountId=res.result.accountId;
                     this.description=res.result.description
-                    res.result.creativeCategory=res.result.creativeCategory?[parseInt(res.result.creativeCategory/10000),parseInt(res.result.creativeCategory/100),res.result.creativeCategory]:[]
+                    
                     //  res.result.creativeTag=res.result.creativeTag?res.result.creativeTag:[]
                     new Promise((resolve,reject)=>{
                         getAction('/kuaishou/batch/getIsActivate', {
@@ -2206,13 +2206,24 @@ export default {
                     }).then(r=>{
 
                     
-                    this.form.setFieldsValue({
-                        ...res.result,
-                        creativeTag:res.result.creativeTag?JSON.parse(res.result.creativeTag):[],
-                        useAppMarket:res.result.useAppMarket==1?true:false,
-                        isOpen:res.result.isOpen?res.result.isOpen:0,
-                        cpaBid:res.result.cpaBid/1000,
-                        appId:res.singleAppid?JSON.parse(res.result.appIdArray)[0]:JSON.parse(res.result.appIdArray)
+                    // this.form.setFieldsValue({
+                    //     ...res.result,
+                    //     creativeTag:res.result.creativeTag?JSON.parse(res.result.creativeTag):[],
+                    //     useAppMarket:res.result.useAppMarket==1?true:false,
+                    //     isOpen:res.result.isOpen?res.result.isOpen:0,
+                    //     cpaBid:res.result.cpaBid/1000,
+                    //     appId:res.singleAppid?JSON.parse(res.result.appIdArray)[0]:JSON.parse(res.result.appIdArray)
+                    // })
+                    this.$nextTick(()=>{
+                        res.result.creativeCategory=res.result.creativeCategory?[parseInt(res.result.creativeCategory/10000),parseInt(res.result.creativeCategory/100),res.result.creativeCategory]:[]
+                        this.form.setFieldsValue({
+                             ...res.result,
+                            creativeTag:res.result.creativeTag?JSON.parse(res.result.creativeTag):[],
+                            useAppMarket:res.result.useAppMarket==1?true:false,
+                            isOpen:res.result.isOpen?res.result.isOpen:0,
+                            cpaBid:res.result.cpaBid/1000,
+                            appId:res.singleAppid?JSON.parse(res.result.appIdArray)[0]:JSON.parse(res.result.appIdArray)
+                        })
                     })
                     if((this.getFormData('ocpxActionType') == 180 || this.getFormData('ocpxActionType') == 53) && this.groupTypeData.deepConversionTypes&&this.groupTypeData.deepConversionTypes.length > 0){
                         setTimeout(()=>{
@@ -2330,8 +2341,11 @@ export default {
         if(this.$route){
             let editRecordId=this.$route.query.id;
             if(editRecordId){
-                this.editRecordId=editRecordId;
-                this.editEchoPage()
+                this.$nextTick(()=>{
+                    this.editRecordId=editRecordId;
+                    this.editEchoPage()
+                })
+               
             }
         }
     },

+ 9 - 4
src/views/modules/kuaishouapp/newBatch/index.vue

@@ -634,7 +634,9 @@ li.chouzhen.first:before {
               <div style="display: flex; justify-content: space-between; margin-bottom: 100px">
                 <a-button type="primary" @click="checkAppIds"> 预览应用/链接 </a-button>
                 <div>
-                  <a-button type="primary" style="margin-right: 15px" @click="handleSubmit" :loading="sumbitLoading"> 预览广告组 </a-button>
+                  <a-button type="primary" style="margin-right: 15px" @click="handleSubmit" :loading="sumbitLoading">
+                    预览广告组
+                  </a-button>
                   <a-button @click="clearAllData"> 清空配置 </a-button>
                 </div>
               </div>
@@ -2462,7 +2464,7 @@ export default {
       templateName: '',
       groupCount: 0,
       showCount: false,
-      sumbitLoading:false
+      sumbitLoading: false,
     }
   },
   computed: {
@@ -3502,7 +3504,7 @@ export default {
       if (sum > dataCount) {
         this.$message.error('最多选择' + dataCount + '个素材')
         this.checkVideo = []
-        this.sumContent = this.sumContent - 50
+        this.sumContent = this.sumContent - this.dataSource.length
 
         if (this.activeTwo == 0) {
           this.checkVideoAll[this.ipagination.current - 1] = this.checkVideo
@@ -3859,7 +3861,6 @@ export default {
       e.preventDefault()
       this.form.validateFields((err, values) => {
         if (!err) {
-         
           var params = {}
           params.batchId = new Date().getTime()
           if (this.getData('newClick', 'form') == '2') {
@@ -4470,6 +4471,10 @@ export default {
           // console.log('Received values of form: ', values)
           var params = { ...values }
           params.id = this.campaignTemplateId
+            ? this.campaignTemplateId == 'edit'
+              ? null
+              : this.campaignTemplateId
+            : null
           params.accountId = this.accountId
           params.systemType = this.getData('systemType', 'form')
           params.campaignType = this.getData('campaignType', 'form')

+ 1 - 1
src/views/system/modules/UserModal.vue

@@ -7,7 +7,7 @@
     :closable="true"
     @close="handleCancel"
     :visible="visible"
-    style="height: calc(100% - 55px);overflow: auto;padding-bottom: 53px;">
+   >
 
     <template slot="title">
       <div style="width: 100%;">