Explorar el Código

修改渠道号

朱鑫波 hace 3 años
padre
commit
4cbf8d6fac

+ 40 - 47
src/views/modules/account-config/components/configuration-modal.vue

@@ -292,7 +292,7 @@
                             <a-radio-button value="a">系统优选广告位</a-radio-button>
                             <a-radio-button value="b">首选媒体</a-radio-button>
                             <!-- <a-radio-button value="c">按场景指定位置</a-radio-button> -->
-                            <a-radio-button value="d">通投智选</a-radio-button>
+                            <!-- <a-radio-button value="d">通投智选</a-radio-button> -->
                         </a-radio-group>
                     </a-form-model-item>
                     <div class="adver-position-radio">
@@ -800,7 +800,7 @@
                             <span>元</span>
                         </a-form-model-item>
                     </div>
-                    <div v-if="deepExternalShow">
+                    <!-- <div v-if="deepExternalShow">
                         <a-form-model-item label="深度优化方式" prop="deepExternal">
                             <a-radio-group @change="adDeepBidTypeChange" v-model="configForm.adDeepBidType" button-style="solid">
                                 <a-radio-button value="DEEP_BID_MIN" >自定义双出价</a-radio-button>
@@ -816,16 +816,9 @@
                             :step="0.01"
                             placeholder="请输入"
                         /> 元
-                            <!-- <a-input-number
-                                class="common-input"
-                                v-model="configForm.adDeepCpabid"
-                                :min="0.1"
-                                :max="10000"
-                                :step="0.01"
-                                placeholder="请输入"
-                            /> 元 -->
+                            
                         </a-form-model-item>
-                    </div>
+                    </div> -->
                 </div>
                 <!-- <div class="separate-module-con">
                     <p class="rock-title">第三方检测链接</p>
@@ -1157,7 +1150,7 @@
                         </a-form-model-item>
                     </div>
                     <div v-else>
-                        <a-form-model-item label="创意内容" v-if="creativeImageShow">
+                        <a-form-model-item label="创意内容">
                             <a-radio-group v-model="configForm.creativeImageMode" button-style="solid"  @change="handleChangeCreativeType">
                                 <a-radio-button value="CREATIVE_IMAGE_MODE_VIDEO_VERTICAL">竖版视频</a-radio-button>
                                 <a-radio-button value="CREATIVE_IMAGE_MODE_VIDEO" :disabled="pictureStatus">横版视频</a-radio-button>
@@ -1166,9 +1159,9 @@
                                 <a-radio-button value="CREATIVE_IMAGE_MODE_LARGE_VERTICAL" :disabled="pictureStatus">大图竖图</a-radio-button>
                             </a-radio-group>
                         </a-form-model-item>
-                        <a-form-model-item label="创意内容" v-else="creativeImageShow">      
+                        <!-- <a-form-model-item label="创意内容" v-else="creativeImageShow">      
                                 <radio-check v-model="configForm.creativeImageMode" :options="creativeImageModeArr"></radio-check>
-                        </a-form-model-item>
+                        </a-form-model-item> -->
                         <a-form-model-item label="创意组件" prop="componentId" key="componentIdkey" 
                         v-if="configForm.creativeImageMode!='CREATIVE_IMAGE_MODE_LARGE'&&configForm.creativeImageMode!='CREATIVE_IMAGE_MODE_LARGE_VERTICAL'&&configForm.adverPosition != 'a'">
                             <a-input
@@ -2790,9 +2783,9 @@ export default {
                 this.isTAwemeStatus = true;
                 this.originalityStatus = true;
                 this.pictureStatus = false;
-                this.creativeImageShow = false;
-                this.configForm.creativeImageMode = [];
-                this.configForm.creativeImageMode.push('CREATIVE_IMAGE_MODE_VIDEO_VERTICAL');
+                // this.creativeImageShow = false;
+                // this.configForm.creativeImageMode = [];
+                // this.configForm.creativeImageMode.push('CREATIVE_IMAGE_MODE_VIDEO_VERTICAL');
                 // this.configForm.creativeImageMode = this.configForm.creativeImageMode.toString();
             }
             this.configForm.adUnionVideoType = '';
@@ -2976,24 +2969,24 @@ export default {
                                             }
                                             this.configForm.adConvertType = updateResult[0].convert_type;
                                             this.optimizationOption = updateResult[0].external_actions;
-                                            this.optimizationOption.forEach(element => {
-                                                    if (element.convert_id == detailData.adConvertId) {
-                                                    if ("deep_external_actions" in element) {
-                                                        this.deepExternalShow = true;
+                                            // this.optimizationOption.forEach(element => {
+                                            //         if (element.convert_id == detailData.adConvertId) {
+                                            //         if ("deep_external_actions" in element) {
+                                            //             this.deepExternalShow = true;
                                                         
-                                                    }else{
-                                                        this.deepExternalShow = false;
-                                                    }
-                                                    }
-                                                });
-                                                if (detailData.adDeepBidType == 'AUTO_MIN_SECOND_STAGE') {
-                                                        this.adDeepCpabidShow = false;
-                                                        this.configForm.adDeepCpabid = 0
-                                                    }else{
-                                                        this.adDeepCpabidShow = true;
-                                                    }
-                                                this.configForm.adDeepBidType = detailData.adDeepBidType;
-                                                this.configForm.adDeepCpabid = detailData.adDeepCpabid;
+                                            //         }else{
+                                            //             this.deepExternalShow = false;
+                                            //         }
+                                            //         }
+                                            //     });
+                                                // if (detailData.adDeepBidType == 'AUTO_MIN_SECOND_STAGE') {
+                                                //         this.adDeepCpabidShow = false;
+                                                //         this.configForm.adDeepCpabid = 0
+                                                //     }else{
+                                                //         this.adDeepCpabidShow = true;
+                                                //     }
+                                                // this.configForm.adDeepBidType = detailData.adDeepBidType;
+                                                // this.configForm.adDeepCpabid = detailData.adDeepCpabid;
                                         
                                         })
                                     
@@ -3242,16 +3235,16 @@ export default {
                                 this.creativeTag = detailData.adKeywords;
                             })
                         }
-                        this.$nextTick(()=>{
-                            // this.configForm.creativeImageMode = detailData.creativeImageMode
-                            if (detailData.inventoryCatalog == 'UNIVERSAL') {
-                                this.creativeImageShow = false;
-                                this.configForm.creativeImageMode = detailData.creativeImageMode.split(',')
-                            }else{
-                                this.creativeImageShow = true
-                                this.configForm.creativeImageMode = detailData.creativeImageMode
-                            }
-                        })
+                        // this.$nextTick(()=>{
+                        //     // this.configForm.creativeImageMode = detailData.creativeImageMode
+                        //     if (detailData.inventoryCatalog == 'UNIVERSAL') {
+                        //         this.creativeImageShow = false;
+                        //         this.configForm.creativeImageMode = detailData.creativeImageMode.split(',')
+                        //     }else{
+                        //         this.creativeImageShow = true
+                        //         this.configForm.creativeImageMode = detailData.creativeImageMode
+                        //     }
+                        // })
                         this.configForm.adInterestActionMode = detailData.adInterestActionMode;
                         this.configForm.creativeDisplayMode = detailData.creativeDisplayMode;
                         this.configForm.creativeIsPresentedVideo = detailData.creativeIsPresentedVideo;
@@ -3735,9 +3728,9 @@ export default {
             paramsFormData.copywritingNumber = paramsFormData.copywritingNumber?paramsFormData.copywritingNumber:0
             paramsFormData.userId = this.userInfo().id;
             console.log(paramsFormData.creativeImageMode);
-            if (typeof paramsFormData.creativeImageMode == 'object'){
-                paramsFormData.creativeImageMode = paramsFormData.creativeImageMode.toString()
-            }
+            // if (typeof paramsFormData.creativeImageMode == 'object'){
+            //     paramsFormData.creativeImageMode = paramsFormData.creativeImageMode.toString()
+            // }
             console.log(paramsFormData);
             
             this.$refs.ruleForm.validate(valid => {

+ 17 - 10
src/views/modules/advertiser/modules/ProjectModal.vue

@@ -54,8 +54,9 @@
           label="最高转化出价">
           <a-input placeholder="最高转化出价" v-decorator="['maxDeepCpaBid']" addonAfter="元" />
         </a-form-item>
-        <div v-if="model.mediaId == '2' || model.mediaId == '4'">
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优化目标">
+        <div v-show="model.mediaId == '2' || model.mediaId == '4'">
+          <div v-if="model.mediaId == '2' || model.mediaId == '4'">
+             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优化目标">
             <a-select @change="bidTypeChange($event)" @deselect="bidtypedeselect"
               v-decorator="['bidType', { rules: [{ required: true, message: '请选择优化目标' }],}]"
               mode="multiple">
@@ -65,6 +66,8 @@
               <a-select-option :value="12">最大转化数</a-select-option>
             </a-select>
           </a-form-item>
+          </div>
+         
           <div v-if="Array.isArray(getFormFieldValue('bidType'))">
             <a-form-item label="转化目标" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="
                 getFormFieldValue('bidType').findIndex((item) => item == 10) > -1 ||
@@ -347,19 +350,23 @@
         console.log(this.ocpxActionTypeArray);
         console.log(e);
         
-        if (e.target.value == '2' || e.target.value == '4') {
-         console.log(this.model);
+        if (e.target.value == 1 || e.target.value == 3) {
+        //  console.log(this.model.bidType);
          this.$nextTick(()=>{
-           this.form.setFieldsValue(
-              pick(
-                this.model,
-                'bidType'
-              )
-            )
+           this.form.setFieldsValue({maxBid:this.model.maxBid,bidType:this.model.bidType})
          })
           
           // this.form.maxBid = this.model.maxBid ? this.model.maxBid / 1000 : 0
           // console.log(this.form.getFieldValue('maxBid'));
+        }else{
+          this.$nextTick(()=>{
+            this.form.setFieldsValue({bidType:this.model.bidType})
+          })
+          setTimeout(()=>{
+            this.form.setFieldsValue({ocpxActionType:this.model.ocpxActionType})
+          },100)
+          console.log(this.model.bidType);
+          
         }
         console.log(`checked = ${e.target.value}`)
         // this.form.resetFields([])

+ 32 - 4
src/views/modules/advertiser/modules/projectListModal.vue

@@ -463,9 +463,11 @@
           });
 
           this.showDian = true
+         
         } else {
           var { ocpxActionType, bidType, ...params } = record
           this.showDian = false
+          
         }
         this.form.resetFields()
         this.model = Object.assign({}, params)
@@ -536,13 +538,28 @@
       },
       handleOk() {
         const that = this
+        var isEvery = '';
+        var deepIsEvery = '';
         // 触发表单验证
-        let isEvery = this.ocpxActionTypeArray.every((item, i) => {
+        if (this.model.mediaId == 2 || this.model.mediaId == 4) {
+           isEvery = this.ocpxActionTypeArray.every((item, i) => {
           return "maxValue" in item && item.maxValue != "" && item.maxValue * 1000 >= 0 && item.maxValue * 1000 <= 999999 * 1000
         })
-        let deepIsEvery = this.depthArray.every((event, i) => {
+         deepIsEvery = this.depthArray.every((event, i) => {
           return "deepValue" in event && event.deepValue != "" && event.deepValue * 1000 >= 0 && event.deepValue * 1000 <= 999999 * 1000
         })
+        }else{
+        isEvery = true;
+        deepIsEvery = true;
+        this.ocpxActionTypeArray = [];
+        this.depthArray = [];
+        }
+        // let isEvery = this.ocpxActionTypeArray.every((item, i) => {
+        //   return "maxValue" in item && item.maxValue != "" && item.maxValue * 1000 >= 0 && item.maxValue * 1000 <= 999999 * 1000
+        // })
+        // let deepIsEvery = this.depthArray.every((event, i) => {
+        //   return "deepValue" in event && event.deepValue != "" && event.deepValue * 1000 >= 0 && event.deepValue * 1000 <= 999999 * 1000
+        // })
         if (!isEvery || !deepIsEvery) {
           this.$message.warning('请输入0~999999之间的最高价')
         } else {
@@ -562,13 +579,24 @@
               let formData = Object.assign(this.model, values)
               console.log(formData);
               //   if(this.model.mediaId)
-              if (this.maxBidShow) {
+              if (this.model.mediaId == 2 || this.model.mediaId == 4) {
+                if (this.maxBidShow) {
                 if (formData.maxBid) {
                 formData.maxBid = formData.maxBid * 1000
-              }
+                }
               }else{
                 formData.maxBid = 0
               }
+              }else{
+                formData.maxBid = formData.maxBid * 1000
+              }
+              // if (this.maxBidShow) {
+              //   if (formData.maxBid) {
+              //   formData.maxBid = formData.maxBid * 1000
+              // }
+              // }else{
+              //   formData.maxBid = 0
+              // }
              
               if (formData.maxDeepCpaBid) {
                 formData.maxDeepCpaBid = formData.maxDeepCpaBid * 1000

+ 21 - 18
src/views/modules/autoLaunchRevision/createLaunch.vue

@@ -1642,7 +1642,7 @@ li.chouzhen.first:before {
                         </a-form-item>
                     </a-col>
                 </a-row>
-                <a-row :gutter="16" v-if="channelData && channelData.channel.isHaveItem">
+                <a-row :gutter="16" v-if="channelData && channelData.channel.isHaveItem>-1">
                     <a-col :span="16">
                         <a-form-item>
                             <span slot="label">
@@ -2696,7 +2696,7 @@ li.chouzhen.first:before {
                 id="outTable"
                 ref="accountTable"
                 rowKey="id"
-                :scroll="{ x: 1500 }"
+                :scroll="{x:1400}"
             >
             </a-table>
         </a-modal>
@@ -2792,17 +2792,17 @@ let interestVideoOptions = []
 let TTcolumns = [
     {
         title: '渠道号',
-        dataIndex: 'channelCode',
-        scopedSlots: { customRender: 'channelCode' },
+        dataIndex: 'channel_code',
+        scopedSlots: { customRender: 'channel_code' },
         align: 'center',
-        key: 'channelCode'
+        key: 'channel_code'
     },
     {
         title: '渠道号名称',
-        dataIndex: 'channelName',
-        scopedSlots: { customRender: 'channelName' },
+        dataIndex: 'channel_name',
+        scopedSlots: { customRender: 'channel_name' },
         align: 'center',
-        key: 'channelName'
+        key: 'channel_name'
     },
     {
         title: '下载链接',
@@ -2814,26 +2814,26 @@ let TTcolumns = [
     },
     {
         title: '调起链接',
-        dataIndex: 'schemaUri',
-        scopedSlots: { customRender: 'schemaUri' },
+        dataIndex: 'schema_uri',
+        scopedSlots: { customRender: 'schema_uri' },
         align: 'center',
-        key: 'schemaUri',
+        key: 'schema_uri',
         width: 300
     },
     {
         title: '第三方点击监测链接',
-        dataIndex: 'clickTrackUrl',
-        scopedSlots: { customRender: 'clickTrackUrl' },
+        dataIndex: 'click_track_url',
+        scopedSlots: { customRender: 'click_track_url' },
         align: 'center',
-        key: 'clickTrackUrl',
+        key: 'click_track_url',
         width: 300
     },
     {
         title: '第三方actionBar监测链接',
-        dataIndex: 'actionbarClickUrl',
-        scopedSlots: { customRender: 'actionbarClickUrl' },
+        dataIndex: 'actionbar_click_url',
+        scopedSlots: { customRender: 'actionbar_click_url' },
         align: 'center',
-        key: 'actionbarClickUrl',
+        key: 'actionbar_click_url',
         width: 300
     }
 ]
@@ -3688,10 +3688,13 @@ export default {
                 if (res.success) {
                     Promise.all([formProjectData, formOptimizeData, formMaterialData])
                         .then(res => {
+                            console.log(res, this.formInformaData)
                             if (
                                 !this.showCreativeData ||
                                 this.showCheckPerson.length === 0 ||
-                                this.multipleBidData.length === 0
+                                this.multipleBidData.length === 0 ||
+                                !this.formInformaData.campaignName || 
+                                !this.formInformaData.groupName
                             ) {
                                 this.$message.error('请填写完整')
                                 return

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

@@ -2174,14 +2174,14 @@ export default {
       return this.form.getFieldValue(className)
     },
     bidCheck(rule, value, callback) {
-      if (value < 0.2 || value > this.maxBid) {
-        callback('不得低于0.2元,不得高于项目最高出价' + this.maxBid + '元')
+      if (value < 0.2) {
+        callback('不得低于0.2元')
       } else {
         callback()
       }
     },
     cpaBidCheck(rule, value, callback) {
-      if (value < 1 ) {
+      if (value < 1) {
         callback('不得低于1元')
       } else {
         callback()

+ 1 - 1
vue.config.js

@@ -119,7 +119,7 @@ module.exports = {
         // target:'http://gateway.tjyourong.com.cn', //测试
         // target:'http://apipre.tjyourong.com.cn', //预生产
         // target: 'http://192.168.1.134:7001', //请求本地 需要jeecg-boot后台项目  周泽宇
-        target:'http://192.168.0.195:9999/',
+        // target:'http://192.168.0.195:9999/',
         // target:'http://gateway.tjyourong.com.cn/',//测试
 
         ws: false,