Browse Source

从接口添加字段

liuxiaona 2 years ago
parent
commit
9feb56a2fa

+ 0 - 1
.idea/workspace.xml

2
 <project version="4">
2
 <project version="4">
3
   <component name="ChangeListManager">
3
   <component name="ChangeListManager">
4
     <list default="true" id="326b77ef-a0bc-4d8a-bd1c-34c4541ee400" name="Changes" comment="">
4
     <list default="true" id="326b77ef-a0bc-4d8a-bd1c-34c4541ee400" name="Changes" comment="">
5
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
       <change beforePath="$PROJECT_DIR$/project/src/components/dataBoard/playletData.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/dataBoard/playletData.vue" afterDir="false" />
5
       <change beforePath="$PROJECT_DIR$/project/src/components/dataBoard/playletData.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/dataBoard/playletData.vue" afterDir="false" />
7
       <change beforePath="$PROJECT_DIR$/project/src/components/dataBoard/throwPerson/throwPersonPuton.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/dataBoard/throwPerson/throwPersonPuton.vue" afterDir="false" />
6
       <change beforePath="$PROJECT_DIR$/project/src/components/dataBoard/throwPerson/throwPersonPuton.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/dataBoard/throwPerson/throwPersonPuton.vue" afterDir="false" />
8
       <change beforePath="$PROJECT_DIR$/project/src/components/dataBoard/throwPerson/throwPersonSon.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/dataBoard/throwPerson/throwPersonSon.vue" afterDir="false" />
7
       <change beforePath="$PROJECT_DIR$/project/src/components/dataBoard/throwPerson/throwPersonSon.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/dataBoard/throwPerson/throwPersonSon.vue" afterDir="false" />

+ 4 - 4
project/src/components/dataBoard/playletData.vue

149
         { prop: 'fans_increase', label: "新增粉丝数" },
149
         { prop: 'fans_increase', label: "新增粉丝数" },
150
         { prop: 'new_user_cost', label: "新增粉丝成本" },
150
         { prop: 'new_user_cost', label: "新增粉丝成本" },
151
 
151
 
152
-        { prop: 'charge_user_cost', label: "充值总人数", },
153
-        { prop: 'charge_user_cost', label: "当日首充人数", },
154
-        { prop: 'charge_user_cost', label: "总充值次数", },
155
-        { prop: 'charge_user_cost', label: "新用户首日充值次数", },
152
+        { prop: 'new_user_charge_uv_count', label: "充值总人数", },
153
+        { prop: 'new_user_charge_uv', label: "当日首充人数", },
154
+        { prop: 'new_user_charge_pv_count', label: "总充值次数", },
155
+        { prop: 'new_user_charge_pv', label: "新用户首日充值次数", },
156
 
156
 
157
         { prop: 'new_user_charge_uv', label: "充值人数" },
157
         { prop: 'new_user_charge_uv', label: "充值人数" },
158
         { prop: 'new_user_charge_pv', label: "充值次数" },
158
         { prop: 'new_user_charge_pv', label: "充值次数" },

+ 6 - 6
project/src/components/dataBoard/throwPerson/throwPersonPuton.vue

16
           <img src="@/assets/img/icon/roi@2x.png" v-if="item.prop == 'first_day_roi'" style="height:14px" class="titleIcon" alt="">
16
           <img src="@/assets/img/icon/roi@2x.png" v-if="item.prop == 'first_day_roi'" style="height:14px" class="titleIcon" alt="">
17
           <img src="@/assets/img/icon/总毛利润额@2x.png" v-if="item.prop == 'profile'" style="height:14px" class="titleIcon" alt="">
17
           <img src="@/assets/img/icon/总毛利润额@2x.png" v-if="item.prop == 'profile'" style="height:14px" class="titleIcon" alt="">
18
           <img src="@/assets/img/icon/回本率@2x.png" v-if="item.prop == 'recall_rate'" style="height:16px" class="titleIcon" alt="">
18
           <img src="@/assets/img/icon/回本率@2x.png" v-if="item.prop == 'recall_rate'" style="height:16px" class="titleIcon" alt="">
19
-          <img src="@/assets/img/iconNew/企微成本@2x.png" v-if="item.prop == 'qwcb'" style="height:12px" class="titleIcon" alt="">
20
-          <img src="@/assets/img/iconNew/充值用户成本@2x.png" v-if="item.prop == 'shouri'" style="height:15px" class="titleIcon" alt="">
19
+          <img src="@/assets/img/iconNew/企微成本@2x.png" v-if="item.prop == 'qw_cost'" style="height:12px" class="titleIcon" alt="">
20
+          <img src="@/assets/img/iconNew/充值用户成本@2x.png" v-if="item.prop == 'new_cost'" style="height:15px" class="titleIcon" alt="">
21
           <span>{{item.label}}</span>
21
           <span>{{item.label}}</span>
22
         </div>
22
         </div>
23
         <div class="dataItem-data">{{dataInfo&&(dataInfo[item.prop]||dataInfo[item.prop]==0)?$formatNum(dataInfo[item.prop]):'-'}}</div>
23
         <div class="dataItem-data">{{dataInfo&&(dataInfo[item.prop]||dataInfo[item.prop]==0)?$formatNum(dataInfo[item.prop]):'-'}}</div>
74
           label:'回本率',
74
           label:'回本率',
75
         },
75
         },
76
         {
76
         {
77
-          prop:'qwcb',
77
+          prop:'qw_cost',
78
           label:'企微成本',
78
           label:'企微成本',
79
         },
79
         },
80
         {
80
         {
81
-          prop:'shouri',
81
+          prop:'new_cost',
82
           label:'用户首日下单成本',
82
           label:'用户首日下单成本',
83
         },
83
         },
84
       ],
84
       ],
102
         { prop: "end_date", label: "截止日期", min_width: 160 },
102
         { prop: "end_date", label: "截止日期", min_width: 160 },
103
         { prop: "cost", label: "累计消耗" },
103
         { prop: "cost", label: "累计消耗" },
104
         { prop: "pay_money", label: "累计充值" },
104
         { prop: "pay_money", label: "累计充值" },
105
-        { prop: "pay_money", label: "企微成本" },
106
-        { prop: "pay_money", label: "用户首日下单成本" , min_width: 160},
105
+        { prop: "qw_cost", label: "企微成本" },
106
+        { prop: "new_cost", label: "用户首日下单成本" , min_width: 160},
107
         { prop: "first_day_roi", label: "首日ROI", notes: '首日ROI=当日新用户充值之和/累计消耗' },
107
         { prop: "first_day_roi", label: "首日ROI", notes: '首日ROI=当日新用户充值之和/累计消耗' },
108
         { prop: "profile", label: "总毛利额", notes: '总毛利额=累计充值-累计消耗' },
108
         { prop: "profile", label: "总毛利额", notes: '总毛利额=累计充值-累计消耗' },
109
         { prop: "recall_rate", label: "回本率%", notes: '回本率=累计充值/累计消耗' },
109
         { prop: "recall_rate", label: "回本率%", notes: '回本率=累计充值/累计消耗' },

+ 6 - 6
project/src/components/dataBoard/throwPerson/throwPersonSon.vue

15
           <img src="@/assets/img/icon/roi@2x.png" v-if="item.prop == 'sum_roi'" style="height:14px" class="titleIcon" alt="">
15
           <img src="@/assets/img/icon/roi@2x.png" v-if="item.prop == 'sum_roi'" style="height:14px" class="titleIcon" alt="">
16
           <img src="@/assets/img/icon/总毛利润额@2x.png" v-if="item.prop == 'sum_profit'" style="height:14px" class="titleIcon" alt="">
16
           <img src="@/assets/img/icon/总毛利润额@2x.png" v-if="item.prop == 'sum_profit'" style="height:14px" class="titleIcon" alt="">
17
           <img src="@/assets/img/icon/回本率@2x.png" v-if="item.prop == 'sum_recover_rate'" style="height:14px" class="titleIcon" alt="">
17
           <img src="@/assets/img/icon/回本率@2x.png" v-if="item.prop == 'sum_recover_rate'" style="height:14px" class="titleIcon" alt="">
18
-          <img src="@/assets/img/iconNew/企微成本@2x.png" v-if="item.prop == 'qwcb'" style="height:12px" class="titleIcon" alt="">
19
-          <img src="@/assets/img/iconNew/充值用户成本@2x.png" v-if="item.prop == 'shouri'" style="height:15px" class="titleIcon" alt="">
18
+          <img src="@/assets/img/iconNew/企微成本@2x.png" v-if="item.prop == 'qw_cost'" style="height:12px" class="titleIcon" alt="">
19
+          <img src="@/assets/img/iconNew/充值用户成本@2x.png" v-if="item.prop == 'new_cost'" style="height:15px" class="titleIcon" alt="">
20
           <span>{{item.label}}</span>
20
           <span>{{item.label}}</span>
21
         </div>
21
         </div>
22
         <div class="dataItem-data">{{dataInfo&&(dataInfo[item.prop]||dataInfo[item.prop]==0)?$formatNum(dataInfo[item.prop]):'-'}}</div>
22
         <div class="dataItem-data">{{dataInfo&&(dataInfo[item.prop]||dataInfo[item.prop]==0)?$formatNum(dataInfo[item.prop]):'-'}}</div>
79
           label:'累计充值',
79
           label:'累计充值',
80
         },
80
         },
81
         {
81
         {
82
-          prop:'qwcb',
82
+          prop:'qw_cost',
83
           label:'企微成本',
83
           label:'企微成本',
84
         },
84
         },
85
         {
85
         {
86
-          prop:'shouri',
86
+          prop:'new_cost',
87
           label:'用户首日下单成本',
87
           label:'用户首日下单成本',
88
         },
88
         },
89
         {
89
         {
105
         { prop: "app_num", label: "投放公众号数", min_width: 160, sort: true },
105
         { prop: "app_num", label: "投放公众号数", min_width: 160, sort: true },
106
         { prop: "day_paid", label: "累计消耗",sort: true },
106
         { prop: "day_paid", label: "累计消耗",sort: true },
107
         { prop: "charge_total", label: "累计充值",sort: true },
107
         { prop: "charge_total", label: "累计充值",sort: true },
108
-        { prop: "charge_total", label: "企微成本",sort: true },
109
-        { prop: "charge_total", label: "用户首日下单成本",sort: true, min_width: 160 },
108
+        { prop: "qw_cost", label: "企微成本",sort: true },
109
+        { prop: "new_cost", label: "用户首日下单成本",sort: true, min_width: 160 },
110
         { prop: "roi", label: "首日ROI", notes: '首日ROI=当日新用户充值之和/累计消耗',sort: true },
110
         { prop: "roi", label: "首日ROI", notes: '首日ROI=当日新用户充值之和/累计消耗',sort: true },
111
         { prop: "profit", label: "总毛利额", notes: '总毛利额=累计充值-累计消耗',sort: true },
111
         { prop: "profit", label: "总毛利额", notes: '总毛利额=累计充值-累计消耗',sort: true },
112
         { prop: "recover_rate", label: "回本率%", notes: '回本率=累计充值/累计消耗',sort: true },
112
         { prop: "recover_rate", label: "回本率%", notes: '回本率=累计充值/累计消耗',sort: true },