Ver Fonte

Merge branch 'work-adver' into feature/work-test

liubei@c-top.com.cn há 3 anos atrás
pai
commit
5ba2a68d63

+ 28 - 11
src/views/modules/advertiser/AdvertiserList.vue

@@ -94,11 +94,14 @@
         :loading="loading"
         @change="handleTableChange"
       >
-      <span slot="maxBid" slot-scope="text,record">{{ record.maxBid == 0? '-': record.maxBid / 1000 }}</span>
+      <span slot="maxBid" slot-scope="text,record">{{ record.maxBid == 0? '-': (record.maxBid / 1000).toFixed(2) }}</span>
       <span slot="ocpxActionType" slot-scope="text,record">
         <div v-if="!!record.ocpxActionTypeArray&&record.ocpxActionTypeArray.length>0">
           <span v-for="(item, index)  in record.ocpxActionTypeArray" :key="index"
-            >{{item.ocpxName}}({{(item.maxValue / 1000).toFixed(2)}})<br></span
+            >{{item.ocpxName}}({{(item.maxValue / 1000).toFixed(2)}})<br>
+            <!-- <span v-if="item instanceof Object">{{item.ocpxName}}({{(item.maxValue / 1000).toFixed(2)}})<br></span>
+            <span v-else>{{(item / 1000).toFixed(2)}}</span> -->
+            </span
           >
         </div>
         <div v-else>-</div>
@@ -118,7 +121,7 @@
         <span slot="bidType" slot-scope="text">
           <div v-if="text && JSON.parse(text).length > 0">
             <span v-for="(item, index) of JSON.parse(text)" :key="index"
-              >{{ item | bidType }}{{ index == JSON.parse(text).length - 1 ? '' : ',' }}</span
+              >{{ item | bidType }}{{ index == JSON.parse(text).length - 1 ? '' : '' }}</span
             >
           </div>
           <div v-else>-</div>
@@ -268,6 +271,14 @@ const projectColumns = [
     dataIndex: 'advertiserId_dictText',
   },
   {
+    title: '优化目标',
+    align: 'center',
+    dataIndex: 'bidType',
+    scopedSlots: {
+      customRender: 'bidType',
+    },
+  },
+  {
     title: '最高出价(元)',
     align: 'center',
     dataIndex: 'maxBid',
@@ -283,14 +294,7 @@ const projectColumns = [
   //     customRender: 'maxDeepCpaBid',
   //   },
   // },
-  {
-    title: '优化目标',
-    align: 'center',
-    dataIndex: 'bidType',
-    scopedSlots: {
-      customRender: 'bidType',
-    },
-  },
+  
   {
     title: '转化目标(出价/元)',
     align: 'center',
@@ -402,6 +406,19 @@ export default {
       },
     }
   },
+  filters: {
+    bidType(sta) {
+      var data = {
+        null: '-',
+        1: 'CPM',
+        2: '点击数',
+        6: 'OCPC',
+        10: 'OCPM',
+        12: "最大转化数"
+      }
+      return data[sta]
+    },
+  },
   computed: {
     importExcelUrl: function () {
       return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`

+ 12 - 11
src/views/modules/advertiser/ProjectList.vue

@@ -120,7 +120,7 @@
         :loading="loading"
         @change="handleTableChange"
       >
-        <span slot="maxBid" slot-scope="text,record">{{ record.maxBid == 0? '-': record.maxBid / 1000 }}</span>
+        <span slot="maxBid" slot-scope="text,record">{{ record.maxBid == 0? '-': (record.maxBid / 1000).toFixed(2) }}</span>
         <!-- <span slot="maxDeepCpaBid" slot-scope="text">{{ text / 1000 }}</span> -->
         <span slot="ocpxActionType" slot-scope="text,record">
           <div v-if="!!record.ocpxActionTypeArray&&record.ocpxActionTypeArray.length>0">
@@ -205,6 +205,14 @@ export default {
           dataIndex: 'advertiserId_dictText',
         },
         {
+          title: '优化目标',
+          align: 'center',
+          dataIndex: 'bidType',
+          scopedSlots: {
+            customRender: 'bidType',
+          },
+        },
+        {
           title: '最高出价(元)',
           align: 'center',
           dataIndex: 'maxBid',
@@ -220,14 +228,7 @@ export default {
         //     customRender: 'maxDeepCpaBid',
         //   },
         // },
-        {
-          title: '优化目标',
-          align: 'center',
-          dataIndex: 'bidType',
-          scopedSlots: {
-            customRender: 'bidType',
-          },
-        },
+       
         {
           title: '转化目标(出价/元)',
           align: 'center',
@@ -306,10 +307,10 @@ export default {
       var data = {
         null: '-',
         1: 'CPM',
-        2: 'CPC',
+        2: '点击数',
         6: 'OCPC',
         10: 'OCPM',
-        12: "最大转化"
+        12: "最大转化"
       }
       return data[sta]
     },