Pārlūkot izejas kodu

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-vue

jiayufei 4 gadi atpakaļ
vecāks
revīzija
5ff52ec351

+ 2 - 2
src/utils/request.js

@@ -15,9 +15,9 @@ else if (process.env.NODE_ENV == 'debug') {
 } 
 else if (process.env.NODE_ENV == 'production') { 
   
-  // axios.defaults.baseURL = 'http://192.168.1.251/jeecg-boot';
+  axios.defaults.baseURL = 'http://apipre.tjyourong.com.cn/jeecg-boot';//预生产
   // axios.defaults.baseURL = 'http://139.186.165.84:8806/jeecg-boot';     
-  axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot';
+  // axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot';//生产环境
 }
 const service = axios.create({
 //   baseURL: '/jeecg-boot', // api base_url

+ 77 - 26
src/views/modules/autoLaunch/configLaunchInfo.vue

@@ -74,25 +74,25 @@
                 </a-form-item>
                 </div>
             </div>  
-            <!-- <div class="row-item">
+            <div class="row-item">
                 <div class="hint-item"> </div>
                 <div class="label-item">
                 <div class="text-item"></div>
                 </div>
                 <div class="input-item">
                 <a-form-item>                
-                   <a-tag color="#2db7f5" @click="getChangeAll('定向包', 'form', 'campaignName')"
-                >+定向包</a-tag
+                   <a-tag color="#2db7f5" @click="getChangeAll('日期', 'form', 'campaignName')"
+                >+日期</a-tag
               >
-              <a-tag color="#2db7f5" @click="getChangeAll('应用包名', 'form', 'campaignName')"
+              <!-- <a-tag color="#2db7f5" @click="getChangeAll('应用包名', 'form', 'campaignName')"
                 >+应用包名</a-tag
               >
               <a-tag color="#2db7f5" @click="getChangeAll('自定义', 'form', 'campaignName')"
                 >+自定义</a-tag
-              >
+              > -->
                 </a-form-item>
                 </div>
-            </div>   -->
+            </div>  
                         
             <div class="row-item">
                 <div class="hint-item"> </div>
@@ -154,24 +154,26 @@
                 <div class="text-item"></div>
                 </div>
                 <div class="input-item">
-                <a-form-item>                
+                <a-form-item>            
+                <a-tag color="#2db7f5" @click="getChangeAll('日期', 'form', 'groupName')">+日期</a-tag>
+                <a-tag color="#2db7f5" @click="getChangeAll('素材名称', 'form', 'groupName')">+素材名称</a-tag>    
                    <!-- <a-tag color="#2db7f5" @click="getChangeAll('定向包', 'form', 'groupName')"
                 >+定向包</a-tag
               > -->
               <!-- <a-tag color="#2db7f5" @click="getChangeAll('日期', 'form', 'groupName')">+日期</a-tag>
               <a-tag color="#2db7f5" @click="getChangeAll('标号', 'form', 'groupName')">+标号</a-tag> -->
-              <!-- <a-tag color="#2db7f5" @click="getChangeAll('应用包名', 'form', 'groupName')"
+              <a-tag color="#2db7f5" @click="getChangeAll('应用包名', 'form', 'groupName')"
                 >+应用包名</a-tag
-              > -->
+              >
                <a-tag color="#2db7f5" @click="getChangeAll('创意制作方式', 'form', 'groupName')"
                 >+创意制作方式</a-tag
               >
                <a-tag color="#2db7f5" @click="getChangeAll('广告位置', 'form', 'groupName')"
                 >+广告位置</a-tag
               >
-               <a-tag color="#2db7f5" @click="getChangeAll('自定义', 'form', 'groupName')"
+               <!-- <a-tag color="#2db7f5" @click="getChangeAll('自定义', 'form', 'groupName')"
                 >+自定义</a-tag
-              >
+              > -->
                 </a-form-item>
                 </div>
             </div>  
@@ -1076,7 +1078,7 @@
                         </div>    
                     </div>
                     
-                    <div class="row-item" v-if="getFormData('bidType')==10">
+                    <div class="row-item" v-if="getFormData('bidType')==10&&getFormData('ocpxActionType')!= 191">
                         <div class="hint-item">
                         </div>
                         <div class="label-item">
@@ -1100,6 +1102,31 @@
                                 >请输入点击出价,不少于0.1元,不超过10000元</span>
                         </div>    
                     </div>
+                    <div class="row-item" v-if="getFormData('bidType')==10&&getFormData('ocpxActionType') == 191">
+                        <div class="hint-item">
+                        </div>
+                        <div class="label-item">
+                            <div class="text-item">ROI系数</div>
+                            <div class="required-item"></div>
+                        </div>
+                        <div class="input-item">
+                            <a-form-item>
+                                <a-input-number
+                                    style="width:200px"
+                                    :max="100"
+                                    :min="0"
+                                    :step="0.01"
+                                    v-decorator="['roiRatio', { rules: [{ required: true, message: 'ROI系数必填' }] }]"
+                                />
+                                <span style="margin-left:5px">元</span>
+                              
+                            </a-form-item>
+                                <span
+                                class="tip"
+                                v-if="getFormData('cpaBid')<0.1"
+                                >请输入点击出价,不少于0.1元,不超过10000元</span>
+                        </div>    
+                    </div>
                     
                     <div class="row-item" v-if="(getFormData('ocpxActionType') == 180 || getFormData('ocpxActionType') == 53) && groupTypeData.deepConversionTypes && groupTypeData.deepConversionTypes.length > 0 ">
                         <div class="hint-item">
@@ -1568,7 +1595,7 @@
     <a-modal v-model="convert" title="选择转化目标">
         <template slot="footer">
           <a-button key="back" @click="convert=false">取消</a-button>
-          <a-button key="submit" type="primary" @click="convert=false">
+          <a-button key="submit" type="primary" @click="convertOk">
             确定
           </a-button>
         </template>
@@ -2011,6 +2038,16 @@ export default {
             },
     },
     methods: {
+        convertOk() {
+            var dataLink = []
+            dataLink = this.convertList.filter((item) => {
+                return item.convert_id == this.convertId.key
+            })
+            if (dataLink.length > 0) {
+                this.form.setFieldsValue({ clickTrackUrl: dataLink[0].click_url })
+                this.convert = false
+            }
+        },
         getDataType(type, dataList) {
             getAction('/kuaishou/batch/getTargetList', { tagType: type }).then((res) => {
                 if (res.success) {
@@ -2500,14 +2537,18 @@ export default {
                         this.loading=false;
                         if(res.success){
                             res.result.forEach((ele)=>{
-                                ele.key=ele.orientationId   
-                                ele.id= ele.orientationId 
-                                ele.name=ele.orientationName+"("+ele.orientationId+")"
-                                // ele.accountName=this.accountInfo.title
-                                ele.accountId=this.accountId               
+                               
+                                    ele.key=ele.orientationId   
+                                    ele.id= ele.orientationId 
+                                    ele.name=ele.orientationName+"("+ele.orientationId+")"
+                                    // ele.accountName=this.accountInfo.title
+                                    ele.accountId=this.accountId            
                             })
                             // this.retargetData=res.data;
                             this.retargetDataAll=[...this.retargetDataAll,...res.result];
+                            this.retargetDataAll = this.retargetDataAll.filter(item=>{
+                                return item.populationType !== 7
+                            })
                             
                         }
                     })
@@ -2693,7 +2734,7 @@ export default {
                     values.agesRange=this.agesRange[0]==1?JSON.stringify([]):JSON.stringify(this.agesRange)
                     values.region=JSON.stringify(this.region);
                     
-                    values.convertId=this.convertId==''?undefined:this.convertId;
+                    values.convertId=this.convertId==''?undefined:this.convertId.key;
                     values.appInterest = JSON.stringify(values.appInterest)
                     
                     if (this.appType == '2') {
@@ -2735,9 +2776,13 @@ export default {
                     }
                     if(values.cpaBid){
                         values.cpaBid=parseInt(values.cpaBid*1000)
+                    }else{
+                        values.cpaBid=0
                     }
                     if(values.deepConversionBid){
                         values.deepConversionBid=parseInt(values.deepConversionBid*1000)
+                    }else{
+                        values.deepConversionBid=0
                     }
                  
                     if(values.creativeCategory&&values.creativeCategory.length>0){
@@ -3067,7 +3112,8 @@ export default {
                             devicePrice:res.result.devicePrice?JSON.parse(res.result.devicePrice):[],
                             useAppMarket:res.result.useAppMarket==1?true:false,
                             campaignDayBudget:res.result.campaignDayBudget?res.result.campaignDayBudget/1000:null,
-                            unitDayBudget:res.result.unitDayBudget?res.result.unitDayBudget/1000:null
+                            unitDayBudget:res.result.unitDayBudget?res.result.unitDayBudget/1000:null,
+                            
                            
                         })
                     },0)
@@ -3079,7 +3125,8 @@ export default {
                             schemaUri:res.result.schemaUri,
                             appId:res.result.singleAppid?JSON.parse(res.result.appIdArray)[0]:JSON.parse(res.result.appIdArray),
                             
-                            appInterest:res.result.appInterest
+                            appInterest:res.result.appInterest,
+                            roiRatio:res.result.roiRatio?res.result.roiRatio:null,
                         })
                         
                     },100)
@@ -3186,15 +3233,19 @@ export default {
                 this.loading=false;
                 if(res.success){
                     res.result.forEach((ele)=>{
-                        ele.key=ele.orientationId   
-                        ele.id= ele.orientationId 
-                        ele.name=ele.orientationName+"("+ele.orientationId+")"
-                        ele.accountName=this.accountInfo.title
-                        ele.accountId=this.accountId               
+                            ele.key=ele.orientationId   
+                            ele.id= ele.orientationId 
+                            ele.name=ele.orientationName+"("+ele.orientationId+")"
+                            ele.accountName=this.accountInfo.title
+                            ele.accountId=this.accountId    
+                                  
                     })
                     // this.retargetData=res.data;
                     // this.retargetDataAll=[...this.retargetDataAll,...res.result];
                      this.retargetDataAll=[...res.result];
+                    this.retargetDataAll = this.retargetDataAll.filter(item=>{
+                        return item.populationType !== 7
+                    })
                     
                 }
             })

+ 12 - 2
src/views/modules/autoLaunch/configLaunchList.vue

@@ -48,8 +48,11 @@
                         </a-spin>    
                         
                     </span>
-                    <span slot="cpaBid" slot-scope="text">
-                        {{text/1000}}
+                    <span slot="cpaBid" slot-scope="text,record">
+                        {{text==0?record.roiRatio:text/1000}}
+                    </span>
+                    <span slot="ocpxActionType" slot-scope="text">
+                        {{text|ocpxActionType}}
                     </span>
                     <span slot="authName" slot-scope="text">
                         <!-- <a href="javascript:;" >{{text}}</a> -->
@@ -179,6 +182,13 @@ const strategyColumns = [
     scopedSlots: { customRender: 'createTime' },
         
   },
+    {
+        title: '转化目标',
+        dataIndex: 'ocpxActionType',
+        align: 'center',    
+        scopedSlots: { customRender: 'ocpxActionType' },
+        // sorter:() => {}
+    },
   {
         title: '出价',
         dataIndex: 'cpaBid',

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

@@ -70,6 +70,20 @@
         <a-button type="primary" @click="addApplication" :loading="tongbuLoading"> 刷新应用</a-button>
       </a-form-item>
       <a-form-item
+        label="调起链接"
+        :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
+        :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }"
+        v-if="campaignType == '2'"
+      >
+        <a-switch default-checked v-model="uriCheck"/>
+        <span style="color:red"> 需加白使用</span>
+        <div v-if="uriCheck">
+            <a-input placeholder="请填写链接" v-decorator="['schemaUri', { rules: [{ message:'链接不能为空'}] }]" />
+        </div>
+      </a-form-item>
+
+     
+      <a-form-item
         label="转化类型"
         :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
         :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }"
@@ -1121,6 +1135,7 @@ export default {
 
   data() {
     return {
+      uriCheck: false,
       templateLoading: false,
       dataOne: [],
       actionBarTextList: [],

+ 1 - 1
vue.config.js

@@ -69,7 +69,7 @@ module.exports = {
     proxy: {
       '/jeecg-boot': {
           // target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
-          // target: 'http://192.168.1.3:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+          target: 'http://192.168.1.3:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.1.62:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云