liubei@c-top.com.cn 3 роки тому
батько
коміт
67c45eebe0

+ 4 - 4
src/views/modules/stockWatch/modules/new-keepManage/account-newkeepManage.vue

@@ -392,7 +392,7 @@
                         align: 'center',
                         width: 300,
                     }, {
-                        title: '花费',
+                        title: '消耗(元)',
                         dataIndex: 'charge',
                         key: 'charge',
                         align: 'center',
@@ -411,10 +411,10 @@
                         sorter: (a, b) => a.activation - b.activation,
                     }, {
                         title: '激活成本',
-                        dataIndex: 'activationCost',
-                        key: 'activationCost',
+                        dataIndex: 'actionCost',
+                        key: 'actionCost',
                         align: 'center',
-                        sorter: (a, b) => a.activationCost - b.activationCost,
+                        sorter: (a, b) => a.actionCost - b.actionCost,
                     }, {
                         title: '操作建议',
                         dataIndex: 'operationAgree',

+ 5 - 5
src/views/modules/stockWatch/modules/new-keepManage/acountProjectData.js

@@ -900,11 +900,11 @@ export const KScustomFields= [
       specificFields: [
         {
           title: '消耗(元)',
-          dataIndex: 'cost',
+          dataIndex: 'totalCost',
           width:150,
           tip: '广告在投放期间的花费总额',
           align: 'center',
-          scopedSlots: { customRender: 'cost' },
+          scopedSlots: { customRender: 'totalCost' },
           
         },{
             title: '激活数',
@@ -1070,12 +1070,12 @@ export const KScustomFields= [
       specificFields: [
         {
           title: '消耗(元)',
-          dataIndex: 'cost',
+          dataIndex: 'charge',
           width:150,
           tip: '广告在投放期间的花费总额',
           align: 'center',
-          scopedSlots: { customRender: 'cost' },
-          
+          scopedSlots: { customRender: 'charge' },
+          sorter:(a, b) => a.activation - b.activation,
         },{
             title: '激活数',
             dataIndex: 'activation',

+ 6 - 6
src/views/modules/stockWatch/modules/new-keepManage/new-keep-data.js

@@ -34,7 +34,7 @@
                  fixed: 'left',
              },
              {
-                 title: '花费',
+                 title: '消耗(元)',
                  dataIndex: 'totalCost',
                  align: 'center',
                  width: 100,
@@ -99,7 +99,7 @@
                 fixed: 'left',
             },
             {
-                title: '花费',
+                title: '消耗(元)',
                 dataIndex: 'totalCost',
                 scopedSlots: { customRender: 'totalCost' },
                 align: 'center',
@@ -163,7 +163,7 @@
                 fixed: 'left',
             },
             {
-                title: '花费',
+                title: '消耗(元)',
                 dataIndex: 'totalCost',
                 scopedSlots: { customRender: 'totalCost' },
                 align: 'center',
@@ -213,7 +213,7 @@
                 align: 'center',
                 width:350,
                 },{
-                title: '花费',
+                title: '消耗(元)',
                 dataIndex: 'charge',
                 align: 'center',
                 sorter: (a, b) => a.charge - b.charge,
@@ -229,9 +229,9 @@
                 sorter: (a, b) => a.activation - b.activation,
                 },{
                 title: '激活成本',
-                dataIndex: 'activationCost',
+                dataIndex: 'actionCost',
                 align: 'center',
-                sorter: (a, b) => a.activationCost - b.activationCost,
+                sorter: (a, b) => a.actionCost - b.actionCost,
                 },{
                     title: '操作建议',
                     dataIndex: 'operationAgree',

+ 16 - 5
src/views/modules/stockWatch/modules/new-keepManage/personal-keepManage.vue

@@ -59,7 +59,12 @@
                                         src="@/assets/upred.png" alt="">
                                     <span style="color: red;">{{todayCompare}}</span>
                                 </span>
-                               
+                                <a-tooltip placement="top">
+                                    <template slot="title">
+                                        <span>截止此时今日消耗与昨日同时刻消耗的对比</span>
+                                    </template>
+                                    <a-icon style="margin-left: 10px;" type="question-circle" />
+                                </a-tooltip>
                             </li>
                             <li>
                                <span style="margin-left: 28px;">消耗: </span>{{timeCost  | formatNum}}
@@ -77,6 +82,12 @@
                                         src="@/assets/upred.png" alt="">
                                     <span style="color: red;">{{timeCompare}}</span>
                                 </span>
+                                <a-tooltip placement="top">
+                                    <template slot="title">
+                                        <span>所选时间段内的消耗与相邻的同长度的时间段对比</span>
+                                    </template>
+                                    <a-icon style="margin-left: 10px;" type="question-circle" />
+                                </a-tooltip>
                             </li>
                             <li>
                                 <span style="margin-left: 15px;">月消耗: </span>{{monthCost | formatNum}}
@@ -238,7 +249,7 @@
                     align: "center",
                     dataIndex: 'userNum'
                     },{
-                    title: '花费',
+                    title: '消耗(元)',
                     align: "center",
                     dataIndex: 'totalCost',
                     sorter: (a, b) => a.totalCost - b.totalCost,
@@ -449,7 +460,7 @@
                 scopedSlots: { customRender: 'balance' },
                 align: 'center',
             }, {
-                    title: '花费',
+                    title: '消耗(元)',
                     align: "center",
                     dataIndex: 'totalCost'
                     }, {
@@ -522,7 +533,7 @@
                     align: "center",
                     dataIndex: 'userNum',
                     }, {
-                    title: '花费',
+                    title: '消耗(元)',
                     align: "center",
                     dataIndex: 'totalCost'
                     }, {
@@ -588,7 +599,7 @@
                 scopedSlots: { customRender: 'balance' },
                 align: 'center',
             }, {
-                    title: '花费',
+                    title: '消耗(元)',
                     align: "center",
                     dataIndex: 'totalCost'
                     }, {