Procházet zdrojové kódy

项目配置提交

朱鑫波 před 3 roky
rodič
revize
7999f00f04

+ 92 - 33
src/views/modules/autoLaunch/configProject/creatConfig.vue

@@ -298,7 +298,7 @@ li.chouzhen.first:before {
                                             @click="getChangeAll('日期', 'formInformation', 'campaignName')"
                                             >+日期</a-tag
                                         >
-                                        <a-tag
+                                        <!-- <a-tag
                                             color="#2db7f5"
                                             @click="getChangeAll('渠道号', 'formInformation', 'campaignName')"
                                             >+渠道号</a-tag
@@ -307,7 +307,7 @@ li.chouzhen.first:before {
                                             color="#2db7f5"
                                             @click="getChangeAll('横竖版', 'formInformation', 'campaignName')"
                                             >+横竖版</a-tag
-                                        >
+                                        > -->
                                         <a-tag
                                             color="#2db7f5"
                                             @click="getChangeAll('时分', 'formInformation', 'campaignName')"
@@ -496,7 +496,16 @@ li.chouzhen.first:before {
                                             :disabled="!projectId"
                                             >选择定向包 ></a-button
                                         >
-                                        <p v-if="$route.query.id" style="margin:0">重新选择定向包将会重新选取</p>
+                                        <a-tooltip>
+                                            <template slot="title">
+                                                当编辑定向包时,需要重新选择定向包
+                                            </template>
+                                            <a-icon
+                                                type="question-circle"
+                                                v-if="$route.query.id"
+                                                style="margin-left:20px"
+                                            />
+                                        </a-tooltip>
                                     </div>
                                 </a-form-item>
                                 <a-form-item label="" v-bind="tailFormItemLayout">
@@ -992,7 +1001,7 @@ li.chouzhen.first:before {
                                             ]"
                                         >
                                         </a-input>
-                                        <br>
+                                        <br />
                                         <span style="color:red"
                                             >单出价请输入单数字,阶梯出价请用/隔开 例如10/12,区间出价请用-链接
                                             例如20-25</span
@@ -1005,7 +1014,7 @@ li.chouzhen.first:before {
                                 <a-col :span="16">
                                     <a-form-item label="深度转化出价">
                                         <a-input style="width:300px" v-decorator="['deepConversionBid']"> </a-input>
-                                         <br>
+                                        <br />
                                         <span style="color:red"
                                             >单出价请输入单数字,阶梯出价请用/隔开 例如10/12,区间出价请用-链接
                                             例如20-25</span
@@ -1446,12 +1455,13 @@ li.chouzhen.first:before {
             <div style="display: flex">
                 <a-input placeholder="输入定向包名称关键词" style="width:60%" v-model="searchTemplate" />
                 <a-button type="primary" :style="{ marginRight: '8px', marginLeft: '8px' }" @click="getTargetPerson()">
-                    搜索
+                    查询
                 </a-button>
                 <a-button
                     @click="
                         searchTemplate = null
                         ipagination.current = 1
+                        checkPerson = checkPersonElse
                         getTargetPerson()
                     "
                 >
@@ -1468,7 +1478,7 @@ li.chouzhen.first:before {
                         :key="index"
                     >
                         <div slot="extra">
-                            <a-checkbox :value="item.id"></a-checkbox>
+                            <a-checkbox :value="item.id" @change="setData(item.id)"></a-checkbox>
                         </div>
 
                         <div class="card-main-case">
@@ -2141,6 +2151,8 @@ export default {
             personList: [],
             checkPerson: [],
             checkPersonAll: [],
+            checkPersonElse: [],
+            checkPersonOne: '',
             showCheckPerson: [],
             sumContent: 0,
             searchTemplate: '',
@@ -2423,8 +2435,13 @@ export default {
                         } else {
                             this.dayBudgetType = '1'
                         }
-
-                        if (data.deepConversionType && data.deepConversionBid && data.deepConversionBid == '0') {
+                        data.deepConversionType =
+                            data.deepConversionType && data.deepConversionType != ''
+                                ? data.deepConversionType
+                                : undefined
+                        data.deepConversionBid =
+                            data.deepConversionBid && data.deepConversionBid != '' ? data.deepConversionBid : undefined
+                        if (data.deepConversionType && data.deepConversionBid && data.deepConversionBid != '') {
                             if (res.result.deepConversionBid.includes('/')) {
                                 let bidArr = res.result.deepConversionBid.split('/')
                                 for (let index = 0; index < bidArr.length; index++) {
@@ -2460,6 +2477,7 @@ export default {
                         } else {
                             data.cpaBid = data.cpaBid / 1000 + ''
                         }
+                        console.log(data.deepConversionBid,data.deepConversionType)
                         this.formOptimize.setFieldsValue(
                             pick(data, 'bidType', 'ocpxActionType', 'deepConversionType', 'cpaBid', 'deepConversionBid')
                         )
@@ -2523,7 +2541,7 @@ export default {
                             }
                         })
                         this.checkPerson = JSON.parse(data.templateIdArray)
-                        this.checkPersonAll = [JSON.parse(data.templateIdArray)]
+                        this.checkPersonElse = JSON.parse(data.templateIdArray)
                         this.postDataAction('/kuaishouDirectionalPackage/getProjectTargetByIds', {
                             ids: this.checkPerson
                         }).then(res => {
@@ -2678,6 +2696,8 @@ export default {
                     )
                     params.singleAppid = 1
                     params.actionBarText = params.actionBarText.join()
+                    params.deepConversionType = params.deepConversionType ? params.deepConversionType : ''
+                    params.deepConversionBid = params.deepConversionBid ? params.deepConversionBid : ''
                     if (this.$route.query.id) {
                         params.id = this.$route.query.id
                     }
@@ -2837,43 +2857,69 @@ export default {
                 }
             })
         },
+        setData(data) {
+            this.checkPersonOne = data
+        },
         setVideoData(data) {
             //  checkPerson: [],
             // checkPersonAll: [],
-            for (let i = 0; i < this.ipagination.current; i++) {
-                this.checkPersonAll.push([])
+            if (data.findIndex(item => item === this.checkPersonOne) > -1) {
+                this.checkPersonElse.push(...data)
+                this.checkPersonElse = [...new Set(this.checkPersonElse)]
+            } else {
+                data.findIndex(item => item === this.checkPersonOne) > -1
+                this.checkPersonElse.splice(
+                    this.checkPersonElse.findIndex(item => item === this.checkPersonOne),
+                    1
+                )
             }
-            this.checkPersonAll[this.ipagination.current - 1] = data
+            // for (let i = 0; i < this.ipagination.current; i++) {
+            //     this.checkPersonAll.push([])
+            // }
+            // this.checkPersonAll[this.ipagination.current - 1] = data
 
-            var sum = 0
-            for (let i = 0; i < this.checkPersonAll.length; i++) {
-                sum += this.checkPersonAll[i].length
-            }
+            // var sum = 0
+            // for (let i = 0; i < this.checkPersonAll.length; i++) {
+            //     sum += this.checkPersonAll[i].length
+            // }
 
-            this.sumContent = sum
+            this.sumContent = this.checkPersonElse.length
             var dataCount = 20
-            if (sum > dataCount) {
+            if (this.sumContent > dataCount) {
                 this.$message.error('最多选择' + dataCount + '个定向')
                 this.checkPerson.pop()
+                this.checkPersonElse.splice(
+                    this.checkPersonElse.findIndex(item => item === this.checkPersonOne),
+                    1
+                )
                 this.sumContent--
 
-                this.checkPersonAll[this.ipagination.current - 1] = this.checkPerson
+                // this.checkPersonAll[this.ipagination.current - 1] = this.checkPerson
             }
         },
         cancel() {},
         removeVideoMaterial(index, id) {
             this.showCheckPerson.splice(index, 1)
+            let indexElse = this.checkPerson.findIndex(item => {
+                item == id
+            })
+            this.checkPerson.splice(indexElse, 1)
             // id
-
-            for (let i = 0; i < this.checkPersonAll.length; i++) {
-                if (this.checkPersonAll[i].length > 0) {
-                    for (let j = 0; j < this.checkPersonAll[i].length; j++) {
-                        if (this.checkPersonAll[i][j] == id) {
-                            this.checkPersonAll[i].splice(j, 1)
-                        }
-                    }
-                }
-            }
+            this.checkPersonElse.splice(
+                this.checkPersonElse.findIndex(item => {
+                    item == id
+                }),
+                1
+            )
+            // for (let i = 0; i < this.checkPersonAll.length; i++) {
+            //     if (this.checkPersonAll[i].length > 0) {
+            //         for (let j = 0; j < this.checkPersonAll[i].length; j++) {
+            //             if (this.checkPersonAll[i][j] == id) {
+            //                 this.checkPersonAll[i].splice(j, 1)
+            //             }
+            //         }
+            //     }
+            // }
 
             // this.materialList[index].photoArr.splice(indexMaterial, 1)
         },
@@ -2883,7 +2929,8 @@ export default {
             this.ipagination.current = current
             this.ipagination.pageSize = pageSize
 
-            this.checkPerson = this.checkPersonAll[current - 1]
+            // this.checkPerson = this.checkPersonAll[current - 1]
+            this.checkPerson = this.checkPersonElse
 
             this.getTargetPerson()
         },
@@ -3067,14 +3114,20 @@ export default {
 
         //目标人群选择
         targetPersonCheck() {
-            this.checkPerson = this.checkPersonAll[0]
+            // this.checkPerson = this.checkPersonAll[0]
+            this.checkPersonElse = this.showCheckPerson.map(item => {
+                return item.id
+            })
+            this.checkPerson = this.checkPersonElse
             this.ipagination.current = 1
             this.sumContent = this.showCheckPerson.length
             this.targetPersonVisible = true
+            this.searchTemplate = ''
             this.getTargetPerson()
         },
         submitPerson() {
-            var dataAll = tqFun(this.checkPersonAll)
+            // var dataAll = tqFun(this.checkPersonAll)
+            let dataAll = this.checkPersonElse
             this.checkPerson = dataAll
             this.personLoading = true
             if (this.checkPerson.length > 0) {
@@ -3127,6 +3180,12 @@ export default {
         },
         closePerson(form) {
             this.targetPersonVisible = false
+            this.sumContent = 0
+            if (this.showCheckPerson.lenght > 0) {
+            } else {
+                this.checkPersonAll = []
+                this.checkPersonElse = []
+            }
             this.checkPerson = []
         },
         getTargetPerson() {

+ 34 - 19
src/views/modules/autoLaunch/configProject/index.vue

@@ -403,13 +403,23 @@
                         v-decorator="['cpaBid', { rules: [{ required: true, validator: cpaBidValid }] }]"
                     >
                     </a-input>
+                    <br>
+                    <span style="color:red"
+                        >单出价请输入单数字,阶梯出价请用/隔开 例如10/12,区间出价请用-链接 例如20-25</span
+                    >
                 </a-form-item>
-                <a-form-item label="深度转化出价" v-if="modifyPriceDetail.deepConversionType"
+                <a-form-item
+                    label="深度转化出价"
+                    v-if="modifyPriceDetail.deepConversionBid && modifyPriceDetail.deepConversionBid != ''"
                     ><a-input
                         style="width:200px;ime-mode:disabled"
                         v-decorator="['deepConversionBid', { rules: [{ required: true, validator: cpaBidValid }] }]"
                     >
                     </a-input>
+                    <br>
+                    <span style="color:red"
+                        >单出价请输入单数字,阶梯出价请用/隔开 例如10/12,区间出价请用-链接 例如20-25</span
+                    >
                 </a-form-item>
             </a-form>
         </a-modal>
@@ -432,10 +442,10 @@
                 @click="againAccount"
                 :loading="againLoading"
                 style="float: right;
-                        position: absolute;
-                        top: 75px;
-                        right: 25px;
-                        z-index: 100;"
+                    position: absolute;
+                    top: 75px;
+                    right: 25px;
+                    z-index: 100;"
                 >重新匹配</a-button
             >
             <a-table
@@ -852,6 +862,7 @@ export default {
                 if (res.success) {
                     this.modifyPriceVisible = true
                     this.modifyPriceDetail = { ...res.result, projectName: item.projectName, id: item.id }
+                    console.log(this.modifyPriceDetail)
                     this.$nextTick(() => {
                         let cpaBid = ''
                         let changeBid = res.result.bidType === 2 ? res.result.bid : res.result.cpaBid
@@ -870,22 +881,26 @@ export default {
                         } else {
                             cpaBid = changeBid / 1000
                         }
-                        let deepConversionBid = ''
-                        if ((res.result.deepConversionBid + '').includes('/')) {
-                            let bidArr = res.result.deepConversionBid.split('/')
-                            for (let index = 0; index < bidArr.length; index++) {
-                                bidArr[index] = bidArr[index] / 1000
-                            }
-                            deepConversionBid = bidArr.join('/')
-                        } else if ((res.result.deepConversionBid + '').includes('-')) {
-                            let bidArr = res.result.deepConversionBid.split('-')
-                            for (let index = 0; index < bidArr.length; index++) {
-                                bidArr[index] = bidArr[index] / 1000
+
+                        let deepConversionBid = undefined
+                        if (res.result.deepConversionBid && res.result.deepConversionBid != '') {
+                            if ((res.result.deepConversionBid + '').includes('/')) {
+                                let bidArr = res.result.deepConversionBid.split('/')
+                                for (let index = 0; index < bidArr.length; index++) {
+                                    bidArr[index] = bidArr[index] / 1000
+                                }
+                                deepConversionBid = bidArr.join('/')
+                            } else if ((res.result.deepConversionBid + '').includes('-')) {
+                                let bidArr = res.result.deepConversionBid.split('-')
+                                for (let index = 0; index < bidArr.length; index++) {
+                                    bidArr[index] = bidArr[index] / 1000
+                                }
+                                deepConversionBid = bidArr.join('-')
+                            } else {
+                                deepConversionBid = res.result.deepConversionBid / 1000
                             }
-                            deepConversionBid = bidArr.join('-')
-                        } else {
-                            deepConversionBid = res.result.deepConversionBid / 1000
                         }
+
                         this.priceForm.setFieldsValue({
                             cpaBid: cpaBid,
                             deepConversionBid: deepConversionBid