瀏覽代碼

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

liubei@c-top.com.cn 3 年之前
父節點
當前提交
1b59eeee28

+ 7 - 0
src/views/modules/Statistics/kuaishouReport/accountReport.vue

@@ -1510,6 +1510,13 @@ export default {
                     element.fixed = false
                 })
             }
+            let arr = JSON.stringify(this.columns)
+            postAction('/toutiao/videoReportDaily/saveOrUpdateColumnJson', {
+                json: arr,
+                columnType: 2
+            }).then(res => {
+                // console.log(res)
+            })
         },
         tableHandle() {
             // this.listNum = [...this.columns]

+ 7 - 0
src/views/modules/Statistics/kuaishouReport/videoReport.vue

@@ -733,6 +733,13 @@ export default {
                     element.fixed = false
                 })
             }
+            let arr = JSON.stringify(this.columns)
+            postAction('/toutiao/videoReportDaily/saveOrUpdateColumnJson', {
+                json: arr,
+                columnType: 4
+            }).then(res => {
+                // console.log(res)
+            })
         },
         // 日期的开关
         //打开日期框

+ 15 - 15
src/views/modules/autoLaunch/channelManage/channelDetailList.vue

@@ -594,21 +594,21 @@ let detailColumns = [
         align: 'center',
         key: 'channelName'
     },
-    {
-        title: '使用范围',
-        dataIndex: 'usageRange',
-        customRender: function(text) {
-            if (text == 1) {
-                return '账户'
-            } else if (text == 2) {
-                return '项目'
-            } else {
-                return text
-            }
-        },
-        align: 'center',
-        key: 'usageRange'
-    },
+    // {
+    //     title: '使用范围',
+    //     dataIndex: 'usageRange',
+    //     customRender: function(text) {
+    //         if (text == 1) {
+    //             return '账户'
+    //         } else if (text == 2) {
+    //             return '项目'
+    //         } else {
+    //             return text
+    //         }
+    //     },
+    //     align: 'center',
+    //     key: 'usageRange'
+    // },
     // {
     //     title: '项目名称',
     //     dataIndex: 'projectName',

+ 9 - 6
src/views/modules/autoLaunchRevision/createLaunch.vue

@@ -1642,7 +1642,7 @@ li.chouzhen.first:before {
                         </a-form-item>
                     </a-col>
                 </a-row>
-                <a-row :gutter="16" v-if="channelData && channelData.channel.isHaveItem">
+                <a-row :gutter="16" v-if="channelData && channelData.channel.isHaveItem>-1">
                     <a-col :span="16">
                         <a-form-item>
                             <span slot="label">
@@ -2684,7 +2684,7 @@ li.chouzhen.first:before {
                 </a-select>
             </a-form-item>
         </a-modal>
-        <a-modal v-model="lookChannelVisible" :footer="null" :width="1000">
+        <a-modal v-model="lookChannelVisible" :footer="null" :width="1000" :zIndex="1000000">
             <a-table
                 :columns="TTcolumns"
                 :dataSource="lookChannelList"
@@ -2692,11 +2692,11 @@ li.chouzhen.first:before {
                 :loading="lookChannelLoading"
                 bordered
                 size="middle"
-                style="word-break: break-all;font-size:16px;font-weight:600"
+                style="word-break: break-all;font-size:16px;font-weight:600;margin-top: 20px;"
                 id="outTable"
                 ref="accountTable"
                 rowKey="id"
-                :scroll="{ x: 1500 }"
+                :scroll="{x:1400}"
             >
             </a-table>
         </a-modal>
@@ -3688,10 +3688,13 @@ export default {
                 if (res.success) {
                     Promise.all([formProjectData, formOptimizeData, formMaterialData])
                         .then(res => {
+                            console.log(res, this.formInformaData)
                             if (
                                 !this.showCreativeData ||
                                 this.showCheckPerson.length === 0 ||
-                                this.multipleBidData.length === 0
+                                this.multipleBidData.length === 0 ||
+                                !this.formInformaData.campaignName || 
+                                !this.formInformaData.groupName
                             ) {
                                 this.$message.error('请填写完整')
                                 return
@@ -4084,7 +4087,7 @@ export default {
                 if (this.appDetail.schemaUri) {
                     this.uriCheck = true
                 }
-                if (this.channelData && this.channelData.channel.isHaveItem) {
+                if (this.channelData && this.channelData.channel.isHaveItem>-1) {
                     this.useChannel = true
                 }
                 this.appDetailMiddle = JSON.parse(JSON.stringify(this.appDetail))

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

@@ -2174,15 +2174,15 @@ export default {
       return this.form.getFieldValue(className)
     },
     bidCheck(rule, value, callback) {
-      if (value < 0.2 || value > this.maxBid) {
-        callback('不得低于0.2元,不得高于项目最高出价' + this.maxBid + '元')
+      if (value < 0.2) {
+        callback('不得低于0.2元')
       } else {
         callback()
       }
     },
     cpaBidCheck(rule, value, callback) {
-      if (value < 1 || value > this.maxBid) {
-        callback('不得低于1元,不得高于项目最高出价' + this.maxBid + '元')
+      if (value < 1) {
+        callback('不得低于1元')
       } else {
         callback()
       }

+ 1 - 1
vue.config.js

@@ -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,