朱鑫波 3 vuotta sitten
vanhempi
commit
330268f137

+ 2 - 0
src/utils/request.js

@@ -21,6 +21,8 @@ else if (process.env.NODE_ENV === 'production') {
 	// 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://gateway.tjyourong.com.cn/jeecg-boot'; // 生产环境
+	
 }
 const service = axios.create({
 	// baseURL: '/jeecg-boot', // api base_url

+ 0 - 1
src/views/dashboard/Analysis.vue

@@ -343,7 +343,6 @@
         this.loading = !this.loading
       }, 1000)
       this.initLogInfo()
-      console.log(localStorage.getItem('roleCode'),345678901222)
     },
     methods: {
       initLogInfo() {

+ 108 - 112
src/views/modules/autoLaunch/material-test/creatMaterialTest.vue

@@ -946,6 +946,89 @@ li.chouzhen.first:before {
                                         </a-form-item>
                                     </a-col>
                                 </a-row>
+                                <a-row :gutter="16" v-if="groupTypeData">
+                                    <a-col
+                                        :span="16"
+                                        v-if="
+                                            (getFormData('formOptimize', 'ocpxActionType') == 180 ||
+                                                getFormData('formOptimize', 'ocpxActionType') == 53) &&
+                                                groupTypeData &&
+                                                groupTypeData.deepConversionTypes.length > 0
+                                        "
+                                    >
+                                        <a-form-item label="深度转化目标">
+                                            <a-select
+                                                v-decorator="['deepConversionType']"
+                                                allowClear
+                                                style="width:300px"
+                                            >
+                                                <a-select-option
+                                                    :value="items.deepConversionType"
+                                                    v-for="(items, index) of groupTypeData.deepConversionTypes"
+                                                    :key="index"
+                                                >
+                                                    {{ items.desc }}</a-select-option
+                                                >
+                                            </a-select>
+                                        </a-form-item>
+                                        <!-- <a-form-item label="深度转化目标">
+                                            <a-select
+                                                style="width:300px"
+                                                size="default"
+                                                allowClear
+                                                v-decorator="['deepConversionType']"
+                                            >
+                                                <a-select-option :value="3">
+                                                    付费
+                                                </a-select-option>
+                                                <a-select-option :value="7">
+                                                    次日留存
+                                                </a-select-option>
+                                                <a-select-option :value="10">
+                                                    完件
+                                                </a-select-option>
+                                                <a-select-option :value="11">
+                                                    授信
+                                                </a-select-option>
+                                                <a-select-option :value="13">
+                                                    添加购物车
+                                                </a-select-option>
+                                                <a-select-option :value="14">
+                                                    提交订单
+                                                </a-select-option>
+                                                <a-select-option :value="15">
+                                                    购买
+                                                </a-select-option>
+                                                <a-select-option :value="44">
+                                                    有效线索
+                                                </a-select-option>
+                                                <a-select-option :value="92">
+                                                    付费roi
+                                                </a-select-option>
+                                            </a-select>
+                                        </a-form-item> -->
+                                    </a-col>
+                                </a-row>
+                                <a-row :gutter="16" v-if="groupTypeData">
+                                    <a-col
+                                        :span="16"
+                                        v-if="
+                                            (getFormData('formOptimize', 'ocpxActionType') == 180 ||
+                                                getFormData('formOptimize', 'ocpxActionType') == 53) &&
+                                                groupTypeData &&
+                                                groupTypeData.deepConversionTypes.length > 0
+                                        "
+                                    >
+                                        <a-form-item label="深度转化出价">
+                                            <a-input style="width:300px" v-decorator="['deepConversionBid']"> </a-input>
+                                            <br />
+                                            <span style="color:red"
+                                                >单出价请输入单数字,阶梯出价请用/隔开 例如10/12,区间出价请用-链接
+                                                例如20-25</span
+                                            >
+                                        </a-form-item>
+                                    </a-col>
+                                </a-row>
                             </a-form>
                         </a-card>
                         <a-card class="search-box step-jump" title="创意信息">
@@ -1051,64 +1134,6 @@ li.chouzhen.first:before {
                                         </a-form-item>
                                     </a-col>
                                 </a-row>
-                                <!-- <a-row :gutter="16">
-                                <a-col :span="16">
-                                    <a-form-item label="关联封面数">
-                                        <a-input-number
-                                            style="width:200px"
-                                            :max="imageCntMax"
-                                            :step="1"
-                                            :min="1"
-                                            v-decorator="[
-                                                'imageCnt',
-                                                {
-                                                    initialValue: 5,
-                                                    rules: [{ required: true, message: '请填写关联封面数' }]
-                                                }
-                                            ]"
-                                            @change="setImageCnt"
-                                        />
-                                    </a-form-item>
-                                </a-col>
-                            </a-row> -->
-                                <!-- <a-row :gutter="16" v-if="getFormData('formOriginality', 'unitType') != 7">
-                                <a-col :span="16">
-                                    <a-form-item label="自定义组上限">
-                                        <a-input-number
-                                            v-decorator="[
-                                                'customUnitCnt',
-                                                {
-                                                    initialValue: 400,
-                                                    rules: [{ required: true, message: '请填写自定义组上限' }]
-                                                }
-                                            ]"
-                                            style="width: 100%"
-                                            placeholder="仅支持输入自然数"
-                                            :max="customUnitCntMax"
-                                            :precision="0"
-                                        />
-                                    </a-form-item>
-                                </a-col>
-                            </a-row> -->
-                                <!-- <a-row :gutter="16" v-if="getFormData('formOriginality', 'unitType') != 4">
-                                <a-col :span="16">
-                                    <a-form-item label="程序化组上限">
-                                        <a-input-number
-                                            v-decorator="[
-                                                'programUnitCnt',
-                                                {
-                                                    initialValue: 60,
-                                                    rules: [{ required: true, message: '请填写程序化组上限' }]
-                                                }
-                                            ]"
-                                            style="width: 100%"
-                                            placeholder="仅支持输入自然数"
-                                            :max="60"
-                                            :precision="0"
-                                        />
-                                    </a-form-item>
-                                </a-col>
-                            </a-row> -->
                                 <a-row :gutter="16">
                                     <a-col :span="16">
                                         <a-form-item label="单计划组数量">
@@ -1148,56 +1173,6 @@ li.chouzhen.first:before {
                                         </a-form-item>
                                     </a-col>
                                 </a-row>
-                                <!-- 
-                            <a-row :gutter="16">
-                                <a-col :span="16">
-                                    <a-form-item label="素材类型">
-                                        <a-radio-group
-                                            button-style="solid"
-                                            v-decorator="[
-                                                'channelType',
-                                                { rules: [{ required: true }], initialValue: 2 }
-                                            ]"
-                                        >
-                                            <a-radio-button :value="2">不限</a-radio-button>
-                                            <a-radio-button :value="0">内部</a-radio-button>
-                                            <a-radio-button :value="1">素造</a-radio-button>
-                                        </a-radio-group>
-                                    </a-form-item>
-                                </a-col>
-                            </a-row>
-                            <a-row :gutter="16">
-                                <a-col :span="16">
-                                    <a-form-item label="素材挖掘">
-                                        <a-radio-group
-                                            button-style="solid"
-                                            v-decorator="[
-                                                'assetMining',
-                                                { rules: [{ required: true }], initialValue: 1 }
-                                            ]"
-                                        >
-                                            <a-radio-button :value="1">开启</a-radio-button>
-                                            <a-radio-button :value="0">关闭</a-radio-button>
-                                        </a-radio-group>
-                                    </a-form-item>
-                                </a-col>
-                            </a-row>
-                            <a-row :gutter="16">
-                                <a-col :span="16">
-                                    <a-form-item label="智能抽帧">
-                                        <a-radio-group
-                                            button-style="solid"
-                                            v-decorator="[
-                                                'smartCover',
-                                                { rules: [{ required: true }], initialValue: 1 }
-                                            ]"
-                                        >
-                                            <a-radio-button :value="1">开启</a-radio-button>
-                                            <a-radio-button :value="0">关闭</a-radio-button>
-                                        </a-radio-group>
-                                    </a-form-item>
-                                </a-col>
-                            </a-row> -->
                                 <a-row :gutter="16">
                                     <a-col :span="16">
                                         <a-form-item label="行动号召">
@@ -1539,7 +1514,7 @@ export default {
                 }
             },
             //优化目标参数
-            groupTypeData: {},
+            groupTypeData: null,
             //创意信息参数
             optimizeVisible: false,
             adposition: 1,
@@ -2145,7 +2120,6 @@ export default {
                             )
                         )
                         data.platformOs = data.appInfoArray[0].platform > 2 ? 2 : 1
-
                         this.formTargetApp.setFieldsValue(pick(data, 'platformOs'))
                         setTimeout(() => {
                             if (data.platformOs == 1) {
@@ -2223,7 +2197,6 @@ export default {
                                 })
                             }
                         })
-
                         this.multipleBidDataDrawer = data.appInfoArray.map(item => {
                             return {
                                 ...item,
@@ -2235,6 +2208,17 @@ export default {
                         for (let i = 0; i < this.multipleBidDataDrawer.length; i++) {
                             let params = {}
                             params.accountId = this.multipleBidDataDrawer[i].accountId
+                            if (i == 0) {
+                                this.getAction('/kuaishou/batch/getIsActivate', {
+                                    accountId: params.accountId,
+                                    appId: this.multipleBidDataDrawer[i].appId,
+                                    campaignType: 2
+                                }).then(res => {
+                                    if (res.success) {
+                                        this.groupTypeData = res.result
+                                    }
+                                })
+                            }
                             this.getAction('/kuaishou/batch/getAppList', params).then(res => {
                                 if (res.success) {
                                     this.multipleBidDataDrawer[i].appListAll = res.result.map((item, index) => {
@@ -2822,11 +2806,23 @@ export default {
         onCellChange(key, dataIndex, value) {
             const dataSource = [...this.multipleBidDataDrawer]
             const target = dataSource.find(item => item.accountId === key)
+            const index = dataSource.findIndex(item => item.accountId === key)
             if (target) {
                 target[dataIndex] = typeof value === 'object' ? value.target.value : value
                 if (dataIndex == 'appId') {
                     this.$nextTick(() => {
                         if (value) {
+                            if (index === 0) {
+                                this.getAction('/kuaishou/batch/getIsActivate', {
+                                    accountId: key,
+                                    appId: value,
+                                    campaignType: 2
+                                }).then(res => {
+                                    if (res.success) {
+                                        this.groupTypeData = res.result
+                                    }
+                                })
+                            }
                             this.$nextTick(() => {
                                 target['appVersion'] = target['appList'].filter(item => {
                                     return item.appId == value
@@ -2855,7 +2851,7 @@ export default {
                 }
                 setTimeout(() => {
                     this.multipleBidDataDrawer = dataSource
-                },100)
+                }, 100)
             }
         },
         addApplication() {},

+ 21 - 8
src/views/modules/autoLaunch/material-test/index.vue

@@ -366,6 +366,19 @@
                         >单出价请输入单数字,阶梯出价请用/隔开 例如10/12,区间出价请用-链接 例如20-25</span
                     >
                 </a-form-item>
+                <a-form-item
+                    label="深度转化出价"
+                    v-if="modifyPriceDetail.deepConversionBid && modifyPriceDetail.deepConversionBid != ''"
+                    ><a-input
+                        style="width:200px;ime-mode:disabled"
+                        v-decorator="['deepConversionBid', { rules: [{ required: true, validator: cpaBidValid }] }]"
+                    >
+                    </a-input>
+                    <br />
+                    <span style="color:red"
+                        >单出价请输入单数字,阶梯出价请用/隔开 例如10/12,区间出价请用-链接 例如20-25</span
+                    >
+                </a-form-item>
             </a-form>
         </a-modal>
 
@@ -1407,14 +1420,14 @@ export default {
         handleGetTableList(data) {
             let paramsData = {
                 strategyName: data.strategyName,
-                // startTime:
-                //     data.timeRange && data.timeRange.length === 2
-                //         ? moment(data.timeRange[0]).format('YYYY-MM-DD')
-                //         : null,
-                // endTime:
-                //     data.timeRange && data.timeRange.length === 2
-                //         ? moment(data.timeRange[1]).format('YYYY-MM-DD')
-                //         : null,
+                startDate:
+                    data.timeRange && data.timeRange.length === 2
+                        ? moment(data.timeRange[0]).format('YYYY-MM-DD')
+                        : null,
+                endDate:
+                    data.timeRange && data.timeRange.length === 2
+                        ? moment(data.timeRange[1]).format('YYYY-MM-DD')
+                        : null,
                 pageNo: this.ipagination.current,
                 pageSize: this.ipagination.pageSize
             }

+ 5 - 2
src/views/user/Login.vue

@@ -15,7 +15,8 @@
           <a-form-item>
             <a-select v-model="creativeTag" @change="setData">
               <a-select-option value="huichuang">北京主公司</a-select-option>
-              <a-select-option value="jiaoyang">北京分公司</a-select-option>
+              <a-select-option value="jiaoyang">北京分公司1</a-select-option>
+              <a-select-option value="juyi">北京分公司2</a-select-option>
             </a-select>
             <div id="wx_reg" style="display: flex; justify-content: center; margin-top: 15px"></div>
             <div style="display: flex; justify-content: center; color: red; font-size: 16px">
@@ -289,8 +290,10 @@ export default {
     setData() {
       if (this.creativeTag == 'huichuang') {
         this.appId = 'ww24b8a47826f5875f'
-      } else {
+      } else if (this.creativeTag == 'jiaoyang'){
         this.appId = 'wwef2e51064c0ac897'
+      }else if(this.creativeTag == 'juyi'){
+        this.appId = 'ww460c4ae74efe25c9'
       }
       this.$nextTick(() => {
         var url = ''

+ 3 - 2
vue.config.js

@@ -80,7 +80,7 @@ module.exports = {
 				// target: 'http://192.168.1.219:8081', //请求本地 需要jeecg-boot后台项目  赵西安
 				// target: 'http://192.168.1.193:8080', //请求本地 需要jeecg-boot后台项目  李煜一
 				// target: 'http://192.168.1.193:31012', //请求本地 需要jeecg-boot后台项目  李煜一
-				//  target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
+				 target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
 				// target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
 				// target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目
 				//  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目
@@ -88,8 +88,9 @@ module.exports = {
 				// target:'http://118.24.244.213:8804',
 				// target: 'http://192.168.1.43:9090', // 子安
 				// target: 'http://192.168.1.8:8806', // 学超
-				target:'http://139.186.165.84:8806', //测试
+				// target:'http://139.186.165.84:8806', //测试
 				// target:'http://apipre.tjyourong.com.cn', //预生产
+        // target:'http://gateway.tjyourong.com.cn/',
 
 				ws: false,