瀏覽代碼

提交代码

朱鑫波 3 年之前
父節點
當前提交
569b916b9e

+ 7 - 1
src/views/modules/Statistics/yicheStatistics/dayStatistics.vue

@@ -124,7 +124,7 @@ th div {
             bordered
             id="outTable"
             :pagination="ipagination"
-            :scroll="{ x: 2000 }"
+            :scroll="{ x: 2400 }"
             :loading="loading"
           >
           </a-table>
@@ -293,6 +293,12 @@ const columns = [
     dataIndex: 'activationRatio',
     align: 'center',
     scopedSlots: { customRender: 'activationRatio' }
+  },
+  {
+    title: '关键行为数',
+    dataIndex: 'keyAction',
+    align: 'center',
+    scopedSlots: { customRender: 'keyAction' }
   }
 ]
 const columnsThree = [

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

@@ -19,6 +19,7 @@
             optionFilterProp="children"
             :filterOption="filterOption"
             style="width:100%"
+            disabled
           >
             <a-select-option :value="item.userId" v-for="(item, index) of options" :key="index">
               {{ item.realName }}

+ 21 - 19
src/views/modules/autoLaunch/trusteeship/creatMaterialTest.vue

@@ -844,8 +844,8 @@
                                         :span="16"
                                         v-if="
                                             (getFormData('formOptimize', 'ocpxActionType') == 180 ||
-                                                getFormData('formOptimize', 'ocpxActionType') == 53) && 
-                                                deepTypesList.length > 0
+                                                getFormData('formOptimize', 'ocpxActionType') == 53) &&
+                                            deepTypesList.length > 0
                                         "
                                     >
                                         <a-form-item label="深度转化目标">
@@ -870,8 +870,8 @@
                                         :span="16"
                                         v-if="
                                             (getFormData('formOptimize', 'ocpxActionType') == 180 ||
-                                                getFormData('formOptimize', 'ocpxActionType') == 53) && 
-                                                deepTypesList.length > 0
+                                                getFormData('formOptimize', 'ocpxActionType') == 53) &&
+                                            deepTypesList.length > 0
                                         "
                                     >
                                         <a-form-item label="深度转化出价">
@@ -1380,19 +1380,21 @@ export default {
             if (this.$route.query.id) {
                 return
             } else {
-                this.descriptionList = [{ value: '' }]
-                this.getAction('/kuaishou/batch/getAppList', { accountId: n }).then((res) => {
-                    if (res.success) {
-                        this.appList = res.result.map((item, index) => {
-                            return {
-                                ...item,
-                                key: index,
-                            }
-                        })
-                    }
-                })
-                // this.getIsActivate(null)
-                this.getOcpxActionList(null)
+                if (!!n) {
+                    this.descriptionList = [{ value: '' }]
+                    this.getAction('/kuaishou/batch/getAppList', { accountId: n }).then((res) => {
+                        if (res.success) {
+                            this.appList = res.result.map((item, index) => {
+                                return {
+                                    ...item,
+                                    key: index,
+                                }
+                            })
+                        }
+                    })
+                    // this.getIsActivate(null)
+                    this.getOcpxActionList(null)
+                }
             }
         },
         activeKey: function (n, o) {
@@ -1492,9 +1494,9 @@ export default {
         getDeepTypesList(data) {
             if (!!data) {
                 var params = {}
-                params.accountId = localStorage.getItem('campaignAccountId')
+                params.accountId = this.accountIds
                 params.sceneCategory = 0
-                params.campaignType = localStorage.getItem('campaignType')
+                params.campaignType = this.getFormData('formProject', 'campaignType')
                 params.sceneIds = this.getFormData('formProject', 'sceneIds')
                 params.appId = this.getFormData('formTargetApp', 'appId')
                 params.ocpxActionType = data

+ 6 - 0
src/views/modules/autoLaunchRevision/createLaunch.vue

@@ -2947,6 +2947,7 @@ export default {
             useChannel: false,
             channelData: null,
             convertId: null,
+            convertCunId: null,
             convertList: [],
             convertType: '1',
             convert: false,
@@ -3561,6 +3562,7 @@ export default {
                                 : [{ value: res.result.description }]
                         res.result.sceneId = JSON.parse(res.result.sceneId)
                         data.actionBarText = data.actionBarText.split(',')
+                        this.convertCunId = !!data.convertId?{key:data.convertId,label:data.convertId}:null
                         this.showCreativeData = pick(
                             data,
                             'unitType',
@@ -3835,6 +3837,8 @@ export default {
                             params.clickTrackUrl = this.multipleBidData[0].clickTrackUrl
                             params.actionbarClickUrl = this.multipleBidData[0].actionbarClickUrl
 
+                            params.convertId = this.convertCunId?this.convertCunId.key:''
+
                             if (this.$route.query.id) {
                                 params.id = this.$route.query.id
                                 this.postDataAction('/auto/aiKuaishouAccountAutoStrategy/edit', params).then(res => {
@@ -4148,6 +4152,7 @@ export default {
                         this.formTargetApp.setFieldsValue({ appStore: this.appDetailMiddle.appStore })
                     }, 200)
                 })
+                this.convertId = this.convertCunId
             }
             this.getAppList()
         },
@@ -4160,6 +4165,7 @@ export default {
                     this.multipleBidData = JSON.parse(JSON.stringify(this.multipleBidDataDrawer))
                     this.targetAppVisible = false
                     this.multipleBidDataDrawer = []
+                    this.convertCunId = this.convertId
 
                     this.checkPersonElse = []
                     this.checkPerson = []

+ 2 - 0
src/views/modules/kuaishouapp/batchCreation/creat/creatUnit.vue

@@ -352,6 +352,7 @@
         label="场景广告位"
         :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
         :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }"
+        v-if="allForm.allianceAccount == '1'"
       >
         <checkBoxGroup
           :options="[
@@ -359,6 +360,7 @@
             { label: '上下滑大屏广告', value: 6 },
             { label: '视频播放页广告', value: 3 },
             { label: '激励视频广告位', value: 24 },
+            { label: '快手联盟优选', value: 10 },
           ]"
           v-model="allForm.sceneId"
           @change="changeData"

+ 8 - 1
src/views/modules/material/videoMaterial.vue

@@ -522,6 +522,13 @@ a {
         >{{ checkAll ? '取消 ( ' + checkArr.length + ' )' : '全选' }}</a-button
       >
       <a-button
+        @click="onCheckAllChange"
+        v-if="
+          active == '0'
+        "
+        >{{ checkAll ? '取消 ( ' + checkArr.length + ' )' : '全选' }}</a-button
+      >
+      <a-button
         v-if="
           queryParam.productId &&
           active == '1' &&
@@ -4105,7 +4112,7 @@ export default {
     callbackTwo(key) {
       this.checkAll = false
       this.checkArr = []
-
+      
       if (key == '3') {
         this.url.list = '/ctop/materialInfo/effiMaterialInfo'
         this.queryParam = {}

+ 1 - 1
src/views/modules/settlement-information/settlement-information.less

@@ -46,7 +46,7 @@
     }
 }
 ::v-deep .information-modal-class {
-    width: 750px !important;
+    width: 750px;
     .upload-txt-rules {
         margin: 0;
     }

文件差異過大導致無法顯示
+ 698 - 406
src/views/modules/settlement-information/settlement-information.vue