Forráskód Böngészése

Merge branch 'feature/work-test' of http://git.tjyourong.com.cn/ctop/adsp-vue into feature/work-test

朱鑫波 3 éve
szülő
commit
43226b7fae

+ 6 - 1
src/views/modules/account-config/account-config.vue

@@ -645,13 +645,18 @@ export default {
                 state: checked ? 0 : 1,
                 creativeImageMode: this.creativeStatus === 2 ? '' : this.creativeStatus,
                 accountId: data.accountId,
-                creativeImageMode: data.creativeImageMode
+                creativeImageMode: data.creativeImageMode,
+                adDeliveryRange:'UNIVERSAL'
             };
             const forDate = new FormData();
             forDate.append('id', paramsData.id);
             forDate.append('state', paramsData.state);
             forDate.append('accountId', paramsData.accountId);
             forDate.append('creativeImageMode', paramsData.creativeImageMode);
+            if (data.inventoryCatalog == 'UNIVERSAL') {
+                forDate.append('adDeliveryRange',paramsData.adDeliveryRange)
+            }
+            
             putAction(urlAcount + '/bytedance-api/advertiser/aiBytedanceAdvertiserStrategy/updStaById', forDate).then(result => {
                 if (result.code === 0) {
                     this.$message.success(result.message);

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

@@ -2775,7 +2775,7 @@ export default {
                 this.originalityStatus = true;
                 this.pictureStatus = false;
                 this.creativeImageShow = true;
-                this.configForm.creativeImageMode.push('CREATIVE_IMAGE_MODE_VIDEO_VERTICAL');
+                this.configForm.creativeImageMode = 'CREATIVE_IMAGE_MODE_VIDEO_VERTICAL';
                 // this.configForm.creativeImageMode = this.configForm.creativeImageMode.toString();
             }
             else if(e.target.value === 'd'){
@@ -2786,7 +2786,7 @@ export default {
                 this.pictureStatus = false;
                 this.creativeImageShow = false;
                 this.configForm.creativeImageMode = [];
-                this.configForm.creativeImageMode.push('CREATIVE_IMAGE_MODE_VIDEO_VERTICAL');
+                this.configForm.creativeImageMode.push('CREATIVE_IMAGE_MODE_VIDEO_VERTICAL','CREATIVE_IMAGE_MODE_VIDEO','CREATIVE_IMAGE_MODE_LARGE');
                 // this.configForm.creativeImageMode = this.configForm.creativeImageMode.toString();
             }
             this.configForm.adUnionVideoType = '';

+ 1 - 1
src/views/modules/advertiser/ProjectList.vue

@@ -151,7 +151,7 @@
           <div v-else>-</div>
         </span>
         <span slot="mediaId" slot-scope="text">
-          {{ text == '1' || text == '3' ? '头条' : '快手' }}
+          {{ text == '1' || text == '3' ? '头条' :text == '2' || text=='4'?'快手' :text=='5'?'千川':'磁力金牛'}}
         </span>
 
         <span slot="action" slot-scope="text, record">

+ 1 - 1
src/views/modules/advertiser/ProjectMemberList.vue

@@ -53,7 +53,7 @@
       >
         <span slot="maxBid" slot-scope="maxBid">{{ maxBid / 1000 }}</span>
         <span slot="mediaId" slot-scope="mediaId">{{
-          mediaId == 1 ? '头条' : mediaId == 2 ? '快手' : mediaId == 3 ? '头条内广' : '快手内广'
+          mediaId == 1 ? '头条' : mediaId == 2 ? '快手' : mediaId == 3 ? '头条内广' : mediaId == 4 ? '快手内广':mediaId== 5 ? '千川' :'磁力金牛'
         }}</span>
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">{{ noTitleKey == 'myProject' ? '查看成员' : '账号绑定' }}</a>

+ 12 - 9
src/views/modules/advertiser/modules/ProjectModal.vue

@@ -9,6 +9,8 @@
             <a-radio-button value="2">快手</a-radio-button>
             <a-radio-button value="3">头条内广</a-radio-button>
             <a-radio-button value="4">快手内广</a-radio-button>
+            <a-radio-button value="5">千川</a-radio-button>
+            <a-radio-button value="6">磁力金牛</a-radio-button>
           </a-radio-group>
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="项目名称">
@@ -20,7 +22,7 @@
           </j-tree-select>
         </a-form-item>-->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商"
-          v-show="model.mediaId == '2' || model.mediaId == '4'">
+          v-show="model.mediaId == '2' || model.mediaId == '4'|| model.mediaId == '6'">
           <a-select optionFilterProp="children" showSearch :filterOption="filterOption"
             v-decorator="['supplierCode', validatorRules.supplierCode]">
             <a-select-option :value="item.supplierCode" v-for="(item, index) of supplierList" :key="index">
@@ -46,16 +48,16 @@
             </a-select-option>
           </a-select>
         </a-form-item>
-        <a-form-item v-if="model.mediaId == '1' || model.mediaId == '3' || maxBidShow" :labelCol="labelCol"
+        <a-form-item v-if="model.mediaId == '1' || model.mediaId == '3'|| model.mediaId == '5' || maxBidShow" :labelCol="labelCol"
           :wrapperCol="wrapperCol" label="最高出价">
           <a-input placeholder="请输入最高出价" v-decorator="['maxBid', validatorRules.maxBid]" addonAfter="元" />
         </a-form-item>
-        <a-form-item v-if="model.mediaId == '1' || model.mediaId == '3'" :labelCol="labelCol" :wrapperCol="wrapperCol"
+        <a-form-item v-if="model.mediaId == '1' || model.mediaId == '3'|| model.mediaId == '5'" :labelCol="labelCol" :wrapperCol="wrapperCol"
           label="最高转化出价">
           <a-input placeholder="最高转化出价" v-decorator="['maxDeepCpaBid']" addonAfter="元" />
         </a-form-item>
-        <div v-show="model.mediaId == '2' || model.mediaId == '4'">
-          <div v-if="model.mediaId == '2' || model.mediaId == '4'">
+        <div v-show="model.mediaId == '2' || model.mediaId == '4'|| model.mediaId == '6'">
+          <div v-if="model.mediaId == '2' || model.mediaId == '4'|| model.mediaId == '6'">
              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优化目标">
             <a-select @change="bidTypeChange($event)" @deselect="bidtypedeselect"
               v-decorator="['bidType', { rules: [{ required: true, message: '请选择优化目标' }],}]"
@@ -437,7 +439,7 @@
         }
 
         // var params = { ...record }
-        if (record.mediaId == '2' || record.mediaId == '4') {
+        if (record.mediaId == '2' || record.mediaId == '4' ||  record.mediaId == '6') {
           console.log(record)
           var params = { ...record }
           params.bidType = record.bidType == null || record.bidType == '' ? [] : JSON.parse(record.bidType)
@@ -581,7 +583,7 @@
         } else {
           this.form.validateFields((err, values) => {
             if (!err) {
-              that.confirmLoading = true
+              
               let httpurl = ''
               let method = ''
               if (!this.model.id) {
@@ -593,7 +595,7 @@
               }
               var data = values.advertiserId
               let formData = Object.assign(this.model, values)
-                if (this.model.mediaId == 1 || this.model.mediaId == 3) {
+                if (this.model.mediaId == 1 || this.model.mediaId == 3|| this.model.mediaId == 5) {
                   this.ocpxActionTypeArray = [];
                   this.depthArray = [];
                   formData.bidType = [];
@@ -602,13 +604,14 @@
               if (this.maxBidShow) {
                 formData.maxBid = formData.maxBid * 1000
               }else{
-               if (this.model.mediaId == 1 || this.model.mediaId == 3) {
+               if (this.model.mediaId == 1 || this.model.mediaId == 3|| this.model.mediaId == 5) {
                 formData.maxBid = formData.maxBid * 1000
                }else{
                  formData.maxBid = 0
                }
                 
               }
+              that.confirmLoading = true
               // formData.maxBid = formData.maxBid * 1000
               formData.maxDeepCpaBid = formData.maxDeepCpaBid * 1000
               //时间格式化

+ 5 - 5
src/views/modules/advertiser/modules/projectListModal.vue

@@ -17,7 +17,7 @@
         </a-form-item>
 
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商"
-          v-if="model.mediaId == '2' || model.mediaId == '4'">
+          v-if="model.mediaId == '2' || model.mediaId == '4'|| model.mediaId == '6'">
           <a-select optionFilterProp="children" showSearch :filterOption="filterOption"
             v-decorator="['supplierCode', validatorRules.supplierCode]">
             <a-select-option :value="item.supplierCode" v-for="(item, index) of supplierList" :key="index">
@@ -42,7 +42,7 @@
             </a-select-option>
           </a-select>
         </a-form-item>
-        <a-form-item v-if="model.mediaId == '1' || model.mediaId == '3' || maxBidShow" :labelCol="labelCol"
+        <a-form-item v-if="model.mediaId == '1' || model.mediaId == '3'|| model.mediaId == '5' || maxBidShow" :labelCol="labelCol"
           :wrapperCol="wrapperCol" label="最高出价">
           <a-input placeholder="请输入最高出价" v-decorator="['maxBid', validatorRules.maxBid]" addonAfter="元" />
         </a-form-item>
@@ -413,7 +413,7 @@
         // else if (this.request == '2,4') {
         //         params.type = 'kuaishou'
         //       }
-        if (record.mediaId == '2' || record.mediaId == '4') {
+        if (record.mediaId == '2' || record.mediaId == '4' || record.mediaId == '6') {
           var params = { ...record }
           params.bidType = record.bidType == null || record.bidType == '' ? [] : JSON.parse(record.bidType)
           let odx =  params.bidType.indexOf(2)
@@ -541,7 +541,7 @@
         var isEvery = '';
         var deepIsEvery = '';
         // 触发表单验证
-        if (this.model.mediaId == 2 || this.model.mediaId == 4) {
+        if (this.model.mediaId == 2 || this.model.mediaId == 4 ||this.model.mediaId == 6) {
            isEvery = this.ocpxActionTypeArray.every((item, i) => {
           return "maxValue" in item && item.maxValue != "" && item.maxValue * 1000 >= 0 && item.maxValue * 1000 <= 999999 * 1000
         })
@@ -579,7 +579,7 @@
               let formData = Object.assign(this.model, values)
               console.log(formData);
               //   if(this.model.mediaId)
-              if (this.model.mediaId == 2 || this.model.mediaId == 4) {
+              if (this.model.mediaId == 2 || this.model.mediaId == 4 || this.model.mediaId == 6) {
                 if (this.maxBidShow) {
                 if (formData.maxBid) {
                 formData.maxBid = formData.maxBid * 1000