Sfoglia il codice sorgente

Merge branch 'kuaishou-type'

朱鑫波 4 anni fa
parent
commit
6ce518e792
2 ha cambiato i file con 165 aggiunte e 16 eliminazioni
  1. 164 15
      src/views/modules/autoLaunch/configLaunchInfo.vue
  2. 1 1
      vue.config.js

+ 164 - 15
src/views/modules/autoLaunch/configLaunchInfo.vue

@@ -34,11 +34,11 @@
                 <div class="input-item">
                     <a-form-item >
                         <a-radio-group   v-decorator="['campaignType',{initialValue:2 }]" @change="campaignTypeChange">
-                            <a-radio-button :value="2">提升应用安装</a-radio-button>
+                            <a-radio-button :value="2" :disabled="editRecordId!==''">提升应用安装</a-radio-button>
                             <a-radio-button :value="3" :disabled='true'>获取电商下单</a-radio-button>                                   
                             <a-radio-button :value="4" :disabled='true'>推广品牌活动</a-radio-button>                                   
-                            <a-radio-button :value="5" :disabled='true'>收集销售线索</a-radio-button>                                   
-                            <a-radio-button :value="7" :disabled='true'>提高应用活跃</a-radio-button>                                   
+                            <a-radio-button :value="5" :disabled="editRecordId!==''">收集销售线索</a-radio-button>                                   
+                            <a-radio-button :value="7" :disabled="editRecordId!==''">提高应用活跃</a-radio-button>                                   
                         </a-radio-group>
                     </a-form-item>
                 </div>
@@ -216,7 +216,7 @@
 
             
         </div>
-        <div class="moduler">
+        <div class="moduler" v-if="getData('campaignType') === 2">
                 <div class="moduler-title">目标应用</div>
                 <div class="ad-range">
                     <div class="row-item" >
@@ -346,6 +346,122 @@
                 </div>        
              
         </div>
+        <div class="moduler" v-if="getData('campaignType') === 5">
+                <div class="moduler-title">链接</div>
+                <div class="ad-range">
+                    <div class="row-item">
+                        <div class="hint-item"></div>
+                        <div class="label-item">
+                        <div class="text-item">链接</div>
+                        <div class="required-item"></div>
+                        </div>
+                        <div class="input-item">
+                            <a-form-item>
+                                <a-input placeholder="请填写链接" v-decorator="['url', { rules: [{ required: true,message:'链接不能为空'}] }]" />
+                            </a-form-item>
+                        
+                        </div>
+                    </div>
+
+                    <div class="row-item" v-if="getFormData('campaignType') == 2||getFormData('campaignType') == 4||getFormData('campaignType') == 5">
+                        <div class="hint-item"></div>
+                        <div class="label-item">
+                        <div class="text-item">转化追踪</div>
+                        <!-- <div class="required-item"></div> -->
+                        </div>
+                        <div class="input-item">
+                            <a-form-item  >
+                                <span v-if="convertId&&!convert" style="display:block;font-size:16px">已选择转化目标: {{convertId.label}}</span>
+                                <a-button type="primary" @click="showConvert">{{convertId?'更换转化目标':'选择转化目标'}}</a-button>
+                            </a-form-item>
+                            <div style="margin-top:10px">
+                                <a-form-item v-if="sysType==1" >
+
+                                    <a-checkbox v-decorator="[
+                                    'useAppMarket',
+                                    {
+                                        valuePropName: 'checked',
+                                        initialValue: false,
+                                    },
+                                    ]">
+                                    优先从系统应用商店下载
+                                    </a-checkbox>
+                                </a-form-item>
+                                <a-form-item  v-if="sysType==1&&getData('useAppMarket')">
+                                    请勾选投放应用已上架的应用商店(默认全选)
+                                    <a-checkbox-group v-model="appStore">
+                                    <a-checkbox value="huawei">华为</a-checkbox>
+                                    <a-checkbox value="oppo">OPPO</a-checkbox>
+                                    <a-checkbox value="vivo">VIVO</a-checkbox>
+                                    <a-checkbox value="xiaomi">小米</a-checkbox>
+                                    <a-checkbox value="meizu">魅族</a-checkbox>
+                                    <a-checkbox value="smartisan">锤子</a-checkbox>
+                                    </a-checkbox-group>
+                                </a-form-item>
+                            </div>
+                        </div>
+                    </div>
+
+                </div>        
+             
+        </div>
+        <div class="moduler" v-if="getData('campaignType') === 7">
+            <div class="moduler-title">链接</div>
+            <div class="row-item">
+                <div class="hint-item"></div>
+                <div class="label-item">
+                <div class="text-item">选择应用</div>
+                <div class="required-item"></div>
+                </div>
+                <div class="input-item">
+                    <a-form-item>
+                        <a-select v-decorator="['appId', { rules: [{ required: true, message: '请选择目标应用' }] }]" showSearch allowClear
+                            placeholder="选择应用目标" optionFilterProp="children" style="width: 500px"  
+                            :filterOption="filterOption" @change="appIdChange">
+                            <a-select-option v-for="appModel in appList" :key="appModel.appId" :value="appModel.appId">
+                                {{ appModel.appName }}&#12288;&nbsp;&#12288; {{ appModel.appVersion }}&#12288;&#12288;&#12288;{{
+                                appModel.platform | platform
+                                }}
+                            </a-select-option>
+                        </a-select>
+                        <a-button type="primary" @click="addApplication" style="margin-left:10px" :loading="tongbuLoading">刷新应用</a-button>
+                    </a-form-item>
+                
+                </div>
+            </div>
+
+
+                <div class="row-item">
+                    <div class="hint-item"></div>
+                    <div class="label-item">
+                    <div class="text-item">调起链接</div>
+                    <div class="required-item"></div>
+                    </div>
+                    <div class="input-item">
+                        <a-form-item>
+                            <a-input placeholder="请填写链接" v-decorator="['schemaUri', { rules: [{ required: true,message:'链接不能为空'}] }]" />
+                        </a-form-item>
+                    </div>
+                </div>
+
+
+                <div class="row-item">
+                    <div class="hint-item"></div>
+                    <div class="label-item">
+                    <div class="text-item">H5链接</div>
+                    <div class="required-item"></div>
+                    </div>
+                    <div class="input-item">
+                        <a-form-item>
+                            <a-input placeholder="请填写H5链接" v-decorator="['url', { rules: [{ required: true,message:'H5链接不能为空'}] }]" />
+                        </a-form-item>
+                    
+                    </div>
+                </div>
+
+      
+             
+        </div>
         <div class="moduler">
             <div class="moduler-title">用户定向
             <!-- <div style="margin-left:30px;position:relative;top:-2px">
@@ -808,6 +924,21 @@
                                 <a-select-option :value="396" v-if="
                                     groupTypeData.isRegister == '1'
                                 ">注册优化目标</a-select-option>
+
+
+                                <a-select-option :value="324" v-if="
+                                    groupTypeData.isAppInvoked == '1'
+                                ">唤起应用</a-select-option>
+                                <a-select-option :value="715" v-if="
+                                    groupTypeData.isAddWechat == '1'
+                                ">微信复制优化目标</a-select-option>
+                                <a-select-option :value="716" v-if="
+                                    groupTypeData.isMultiConversion == '1'
+                                ">多转化事件</a-select-option>
+                                <a-select-option :value="717" v-if="
+                                    groupTypeData.isAdWatchTimes == '1'
+                                ">广告观看次数</a-select-option>
+                                
                             </a-select>
 
                            
@@ -2306,8 +2437,18 @@ export default {
                     //     values.beginTime=this.dateRange[0].format('YYYY-MM-DD');
                     //     values.endTime= this.dateRange[1].format('YYYY-MM-DD');
                     // }
-                    values.appIdArray=values.appId instanceof Array?JSON.stringify(values.appId):JSON.stringify([values.appId])
-                    values.appId=undefined;
+                    if(this.getData('campaignType') === 2 ) {
+                        values.appIdArray=values.appId instanceof Array?JSON.stringify(values.appId):JSON.stringify([values.appId])
+                        values.appId=undefined;
+                    }else if(this.getData('campaignType') === 7){
+                        values.appIdArray=values.appId instanceof Array?JSON.stringify(values.appId):JSON.stringify([values.appId])
+                        values.appId=undefined;
+                        values.singleAppid = 1
+                    }else {
+                        values.singleAppid = 1
+                        values.appIdArray=JSON.stringify([])
+                    }
+                    values.appId = undefined
                     values.agesRange=this.agesRange[0]==1?JSON.stringify([]):JSON.stringify(this.agesRange)
                     values.region=JSON.stringify(this.region);
                     
@@ -2542,13 +2683,17 @@ export default {
         // 获取行动号召按钮
         getActionBarText(){
             this.actionBarTextList=[]
-            getAction('/kuaishou/batch/getActionBarTextByType', {
-              type:this.getFormData('campaignType')
-            }).then((res) => {
-            if (res.success) {
-                this.actionBarTextList = res.result
-            }
+            let that = this
+            setTimeout(()=>{
+                getAction('/kuaishou/batch/getActionBarTextByType', {
+                type:that.getFormData('campaignType')
+                }).then((res) => {
+                if (res.success) {
+                    that.actionBarTextList = res.result
+                }
+                })
             })
+            
 
             
         },
@@ -2644,10 +2789,10 @@ export default {
                         this.form.setFieldsValue({
                              ...res.result,
                             creativeTag:res.result.creativeTag?JSON.parse(res.result.creativeTag):[],
-                            useAppMarket:res.result.useAppMarket==1?true:false,
+                            
                             isOpen:res.result.isOpen?res.result.isOpen:0,
                             cpaBid:res.result.cpaBid/1000,
-                            appId:res.singleAppid?JSON.parse(res.result.appIdArray)[0]:JSON.parse(res.result.appIdArray),
+                            
                             deviceBrand:res.result.deviceBrand?JSON.parse(res.result.deviceBrand):[],
                             devicePrice:res.result.devicePrice?JSON.parse(res.result.devicePrice):[],
                            
@@ -2658,8 +2803,12 @@ export default {
                     },0)
                     setTimeout(()=>{
                          this.form.setFieldsValue({
-                             androidOsv:res.result.androidOsv?res.result.androidOsv:3,
+                            androidOsv:res.result.androidOsv?res.result.androidOsv:3,
                             iosOsv:res.result.iosOsv?res.result.iosOsv:6,
+                            url:res.result.url,
+                            schemaUri:res.result.schemaUri,
+                            appId:res.result.singleAppid?JSON.parse(res.result.appIdArray)[0]:JSON.parse(res.result.appIdArray),
+                            useAppMarket:res.result.useAppMarket==1?true:false,
                         })
                         
                     },100)

+ 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.8:8081', //请求本地 需要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.188:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云