فهرست منبع

移动文件位置备份

朱鑫波 3 سال پیش
والد
کامیت
44ce29b4c5

+ 2 - 2
src/utils/request.js

@@ -21,9 +21,9 @@ else if (process.env.NODE_ENV === 'debug') {
 else if (process.env.NODE_ENV === 'production') {
 	// axios.defaults.baseURL = 'http://apipre.tjyourong.com.cn/jeecg-boot'; // 预生产
 	// axios.defaults.baseURL = 'http://gateway.tjyourong.com.cn/jeecg-boot';//测试
-	axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot'; // 生产环境
+	// axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot'; // 生产环境
 	// axios.defaults.baseURL = 'http://gateway.tjyourong.com.cn/jeecg-boot'; // 测试环境
-	// axios.defaults.baseURL = 'http://192.168.0.195:9999/jeecg-boot'; // 测试环境
+	axios.defaults.baseURL = 'http://192.168.0.195:9999/jeecg-boot'; // 测试环境
 	// axios.defaults.baseURL = 'http://192.168.1.134:9999/jeecg-boot'; // 泽宇环境
 
 }

+ 54 - 76
src/views/modules/autoLaunch/trusteeship/creatMaterialTest.vue

@@ -800,77 +800,12 @@
                                                     'ocpxActionType',
                                                     { rules: [{ required: true, message: '转化目标必选' }] },
                                                 ]"
+                                                @change="getDeepTypesList"
                                             >
-                                                <a-select-option :value="2">行为数</a-select-option>
-                                                <!-- v-if="getFormData('campaignType') == 2 && groupTypeData.isActivate == 1 -->
-                                                <a-select-option :value="180">激活</a-select-option>
                                                 <a-select-option
-                                                    :value="53"
-                                                    v-if="groupTypeData && groupTypeData.isFormSubmit == '1'"
-                                                    >表单提交</a-select-option
-                                                >
-
-                                                <a-select-option
-                                                    :value="394"
-                                                    v-if="groupTypeData && groupTypeData.isOrderSubmit == '1'"
-                                                    >订单提交</a-select-option
-                                                >
-                                                <a-select-option
-                                                    :value="348"
-                                                    v-if="groupTypeData && groupTypeData.isValidClue == '1'"
-                                                    >使用有效线索</a-select-option
-                                                >
-                                                <a-select-option
-                                                    :value="383"
-                                                    v-if="groupTypeData && groupTypeData.isCreditGrant == '1'"
-                                                    >授信出价</a-select-option
-                                                >
-                                                <a-select-option
-                                                    :value="384"
-                                                    v-if="groupTypeData && groupTypeData.isWanJian == '1'"
-                                                    >完件出价</a-select-option
-                                                >
-                                                <a-select-option
-                                                    :value="190"
-                                                    v-if="groupTypeData && groupTypeData.isPurchase == '1'"
-                                                    >付费出价</a-select-option
-                                                >
-                                                <a-select-option
-                                                    :value="191"
-                                                    v-if="groupTypeData && groupTypeData.isFirstdayRoi == '1'"
-                                                    >首日ROI</a-select-option
-                                                >
-                                                <a-select-option
-                                                    :value="396"
-                                                    v-if="groupTypeData && groupTypeData.isRegister == '1'"
-                                                    >注册优化目标</a-select-option
-                                                >
-
-                                                <a-select-option
-                                                    :value="324"
-                                                    v-if="groupTypeData && groupTypeData.isAppInvoked == '1'"
-                                                    >唤起应用</a-select-option
-                                                >
-                                                <a-select-option
-                                                    :value="715"
-                                                    v-if="groupTypeData && groupTypeData.isAddWechat == '1'"
-                                                    >微信复制优化目标</a-select-option
-                                                >
-                                                <a-select-option
-                                                    :value="716"
-                                                    v-if="groupTypeData && groupTypeData.isMultiConversion == '1'"
-                                                    >多转化事件</a-select-option
-                                                >
-                                                <a-select-option
-                                                    :value="717"
-                                                    v-if="groupTypeData && groupTypeData.isAdWatchTimes == '1'"
-                                                    >广告观看次数</a-select-option
-                                                >
-
-                                                <a-select-option
-                                                    :value="773"
-                                                    v-if="groupTypeData && groupTypeData.isKeyAction == '1'"
-                                                    >关键行为</a-select-option
+                                                    :value="items.ocpx_action_type"
+                                                    v-for="items in ocpxActionList"
+                                                    >{{ items.name }}</a-select-option
                                                 >
                                             </a-select>
                                         </a-form-item>
@@ -921,11 +856,11 @@
                                                 style="width: 300px"
                                             >
                                                 <a-select-option
-                                                    :value="items.deepConversionType"
-                                                    v-for="(items, index) of groupTypeData.deepConversionTypes"
+                                                    :value="items.event_type"
+                                                    v-for="(items, index) of deepTypesList"
                                                     :key="index"
                                                 >
-                                                    {{ items.desc }}</a-select-option
+                                                    {{ items.name }}</a-select-option
                                                 >
                                             </a-select>
                                         </a-form-item>
@@ -1400,6 +1335,8 @@ export default {
             disabled: false,
             retargetDataAll: [],
             changeAppIdVisible: true,
+            ocpxActionList: [],
+            deepTypesList: [],
         }
     },
     computed: {
@@ -1456,7 +1393,8 @@ export default {
                         })
                     }
                 })
-                this.getIsActivate(null)
+                // this.getIsActivate(null)
+                this.getOcpxActionList(null)
             }
         },
         activeKey: function (n, o) {
@@ -1539,6 +1477,38 @@ export default {
     methods: {
         ...mapGetters(['userInfo']),
         moment,
+        getOcpxActionList(value) {
+            var params = {}
+            params.accountId = this.accountIds
+            params.campaignType = this.getFormData('formProject', 'campaignType')
+            params.sceneCategory = 2
+            params.sceneIds = this.getFormData('formProject', 'sceneIds')
+            params.appId = value ? value : null
+
+            this.postDataAction('/kuaishou/batch/conversionInfos', params).then((res) => {
+                if (res.success) {
+                    this.ocpxActionList = res.result.data.ocpx_types
+                }
+            })
+        },
+        getDeepTypesList(data) {
+            if (!!data) {
+                var params = {}
+                params.accountId = localStorage.getItem('campaignAccountId')
+                params.sceneCategory = 0
+                params.campaignType = localStorage.getItem('campaignType')
+                params.sceneIds = this.getFormData('formProject', 'sceneIds')
+                params.appId = this.getFormData('formTargetApp', 'appId')
+                params.ocpxActionType = data
+                this.postDataAction('/kuaishou/batch/deepTypes', params).then((res) => {
+                    if (res.success) {
+                        this.deepTypesList = res.result.data.deep_types
+                    }
+                })
+            } else {
+                this.deepTypesList = []
+            }
+        },
         changeData(data) {
             if (data.length > 1 && data.findIndex((item) => item == 1) == 0) {
                 data.splice(
@@ -1550,6 +1520,7 @@ export default {
             } else if (data.length == 0) {
                 data.push(1)
             }
+            this.getOcpxActionList(null)
         },
         changeCampaign(e) {
             console.log(e.target.value)
@@ -1687,7 +1658,8 @@ export default {
                     this.formTargetApp.setFieldsValue({ siteId: undefined })
                 }
             })
-            this.getIsActivate(e)
+            // this.getIsActivate(e)
+            this.getOcpxActionList(e)
             if (e) {
                 var data = this.appList.filter((item) => item.appId == e)[0]
                 this.formDirectional.setFieldsValue({ platformOs: data.platform == 1 || data.platform == 2 ? 1 : 2 })
@@ -1787,7 +1759,10 @@ export default {
                                     this.formTargetApp.setFieldsValue(pick(data, 'appStore'))
                                 }, 500)
                             }
-                            this.getIsActivate(data.appId)
+                            this.getOcpxActionList(data.appId)
+                            setTimeout(() => {
+                                this.getDeepTypesList(data.ocpxActionType)
+                            }, 100)
                             this.getAction('/kuaishou/batch/getPageList', {
                                 accountId: this.accountIds,
                                 appId: data.appId,
@@ -1801,7 +1776,10 @@ export default {
                             setTimeout(() => {
                                 this.formTargetApp.setFieldsValue(pick(data, 'webUri'))
                             })
-                            this.getIsActivate(null)
+                            this.getOcpxActionList(null)
+                            setTimeout(() => {
+                                this.getDeepTypesList(data.ocpxActionType)
+                            }, 100)
                         }
 
                         this.people =

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

@@ -411,26 +411,10 @@
           :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }"
           v-if="item.bidType == 10"
         >
-          <a-select v-model="item.ocpxActionType">
-            <a-select-option :value="2">行为数</a-select-option>
-            <a-select-option :value="180" v-if=" allForm.groupTypeData.isActivate == '1'"
-              >激活</a-select-option
-            >
-            <a-select-option
-              :value="53"
-              v-if=" allForm.groupTypeData.isFormSubmit == '1'"
-              >表单提交</a-select-option
-            >
-
-            <a-select-option :value="394" v-if="allForm.groupTypeData.isOrderSubmit == '1'">订单提交</a-select-option>
-            <a-select-option :value="348" v-if="allForm.groupTypeData.isValidClue == '1'">使用有效线索</a-select-option>
-            <a-select-option :value="383" v-if="allForm.groupTypeData.isCreditGrant == '1'">授信出价</a-select-option>
-            <a-select-option :value="384" v-if="allForm.groupTypeData.isWanJian == '1'">完件出价</a-select-option>
-            <a-select-option :value="190" v-if="allForm.groupTypeData.isPurchase == '1'">付费出价</a-select-option>
-            <a-select-option :value="191" v-if="allForm.groupTypeData.isFirstdayRoi == '1'">首日ROI</a-select-option>
-            <a-select-option :value="396" v-if="allForm.groupTypeData.isRegister == '1'">注册优化目标</a-select-option>
-            <a-select-option :value="773" v-if="allForm.groupTypeData.isKeyAction == '1'">关键行为</a-select-option>
-            <a-select-option :value="324" v-if="allForm.groupTypeData.isAppInvoked == '1'">唤起应用</a-select-option>
+          <a-select v-model="item.ocpxActionType" @change="getDeepTypesList" allowClear>
+            <a-select-option :value="items.ocpx_action_type" v-for="items in ocpxActionList"
+                >{{items.name}}</a-select-option
+              >
           </a-select>
         </a-form-item>
         <a-form-item
@@ -438,17 +422,16 @@
           :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
           :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }"
           v-if="
-            (item.ocpxActionType == 180 || item.ocpxActionType == 53) &&
-            allForm.groupTypeData.deepConversionTypes.length > 0
+            (item.ocpxActionType == 180 || item.ocpxActionType == 53) && deepTypesList.length > 0
           "
         >
           <a-select v-model="item.deepConversionType" allowClear>
             <a-select-option
-              :value="items.deepConversionType"
-              v-for="(items, index) of allForm.groupTypeData.deepConversionTypes"
+              :value="items.event_type"
+              v-for="(items, index) of deepTypesList"
               :key="index"
             >
-              {{ items.desc }}</a-select-option
+              {{ items.name }}</a-select-option
             >
           </a-select>
         </a-form-item>
@@ -1415,7 +1398,18 @@ export default {
         scheduleTime: '1',
         scheduleTimeData:
           '000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
-        group: [],
+        group: [{
+          bidType: 10,
+          // bid: '',
+          // cpaBid: '',
+          showTipCheck: false,
+          deepConversionBidCheck: false,
+          // unitName: '',
+          unitNameCheck: false,
+          deepConversionType: '',
+          deepConversionBid: '',
+          ocpxActionType: 2,
+        }],
         groupTypeData: null,
         fail: [],
         success: [],
@@ -1442,6 +1436,8 @@ export default {
       cunTitleList: [],
       createCount: 0,
       tongbuLoading: false,
+      ocpxActionList: [],
+      deepTypesList: []
     }
   },
   computed: {
@@ -1470,6 +1466,39 @@ export default {
     },
   },
   methods: {
+    getOcpxActionList(value){
+      var params = {}
+      params.accountId = localStorage.getItem('campaignAccountId')
+      params.sceneCategory = 0
+      params.campaignType = localStorage.getItem('campaignType')
+      params.sceneIds = this.allForm.allianceAccount == '1' ? this.allForm.sceneId : [5]
+      params.appId = value?value:null
+
+      this.postDataAction('/kuaishou/batch/conversionInfos', params).then(res=>{
+        if(res.success){
+          this.ocpxActionList = res.result.data.ocpx_types
+        }
+      })
+    },
+    getDeepTypesList(data){
+      if(!!data){
+        var params = {}
+        params.accountId = localStorage.getItem('campaignAccountId')
+        params.sceneCategory = 0
+        params.campaignType = localStorage.getItem('campaignType')
+        params.sceneIds = this.allForm.allianceAccount == '1' ? this.allForm.sceneId : [5]
+        params.appId = this.getData('appId')
+        params.ocpxActionType = data
+        this.postDataAction('/kuaishou/batch/deepTypes', params).then(res=>{
+          if(res.success){
+            this.deepTypesList = res.result.data.deep_types
+          }
+        })
+      }else{
+        this.deepTypesList = []
+      }
+     
+    },
     descriptionchange(val, index) {
       this.$nextTick(() => {
           this.descriptionList[index].value = val.replace(/\s*/g, '').trim()
@@ -1894,6 +1923,7 @@ export default {
       } else if (data.length == 0) {
         data.push(1)
       }
+      this.getOcpxActionList()
     },
     selectAllVideo() {
       this.checkVideo = this.dataSource.map((item) => {
@@ -2528,7 +2558,7 @@ export default {
     handleChange(value) {
       //   this.$refs.population.getAppList(value)
       this.getSiteList(value)
-      this.getIsActivate(value)
+      this.getOcpxActionList(value)
     },
     handleChangeMould(value) {
       if (value) {
@@ -2753,20 +2783,22 @@ export default {
     },
   },
   mounted: function () {
+    this.getOcpxActionList()
+    this.getDeepTypesList(2)
     this.step = localStorage.getItem('step')
     this.getTemplate(localStorage.getItem('campaignAccountId'))
     this.getAppList()
     // this.getCampaignList()
     this.campaignType = localStorage.getItem('campaignType')
     this.getMould()
-    getAction('/kuaishou/batch/getIsActivate', {
-      accountId: localStorage.getItem('campaignAccountId'),
-    }).then((res) => {
-      if (res.success) {
-        this.allForm.groupTypeData = res.result
-        this.addGroup()
-      }
-    })
+    // getAction('/kuaishou/batch/getIsActivate', {
+    //   accountId: localStorage.getItem('campaignAccountId'),
+    // }).then((res) => {
+    //   if (res.success) {
+    //     this.allForm.groupTypeData = res.result
+    //     // this.addGroup()
+    //   }
+    // })
     getAction('/kuaishou/batch/getWhiteList', {
       accountId: localStorage.getItem('campaignAccountId'),
     }).then((res) => {

+ 2 - 2
src/views/modules/policy-management/policy-management-server.js

@@ -3,9 +3,9 @@
  * @author jiayufei
  */
 
- export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
+//  export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 //  export const urlAcount = 'http://192.168.1.43:9999'; // 子安
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
-//  export const urlAcount = 'http://192.168.0.195:9999'; // 学超
+ export const urlAcount = 'http://192.168.0.195:9999'; // 学超
  

+ 2 - 2
src/views/modules/settlement-account/settlement-account-server.js

@@ -3,9 +3,9 @@
  * @author jiayufei
  */
 
- export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
+//  export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 // export const urlAcount = 'http://192.168.1.43:9999'; // 子安
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
-// export const urlAcount = 'http://192.168.0.195:9999'; // 学超
+export const urlAcount = 'http://192.168.0.195:9999'; // 学超
  

+ 2 - 2
src/views/modules/settlement-information/settlement-information-server.js

@@ -3,9 +3,9 @@
  * @author jiayufei
  */
 
- export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
+//  export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 //  export const urlAcount = 'http://192.168.1.43:9999'; // 子安
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
-// const urlAcount = 'http://192.168.0.195:9999'; // 学超
+export const urlAcount = 'http://192.168.0.195:9999'; // 学超
  

+ 2 - 2
vue.config.js

@@ -97,7 +97,7 @@ module.exports = {
       '/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:7001', //请求本地 需要jeecg-boot后台项目  蒙蒙
+        // target: 'http://192.168.1.3:7001', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.1.62:7001', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.6.162:9806', //请求本地 需要jeecg-boot后台项目  祚云
@@ -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,