Browse Source

Merge branch 'master' into develop

zhengxy 1 year ago
parent
commit
6a769b112d

+ 1 - 1
index.html

@@ -7,4 +7,4 @@
7 7
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
8 8
         var s = document.getElementsByTagName("script")[0];
9 9
         s.parentNode.insertBefore(hm, s);
10
-      })();</script><link href=./static/css/app.233c0731e6604bcc4fb3850bb5545eb4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.4e1c8a63966720306003.js></script><script type=text/javascript src=./static/js/app.6e95f112d5e2156e0b1a.js></script></body></html>
10
+      })();</script><link href=./static/css/app.3668e93ce1142f625233abaee13a70b1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.6dc26a62a11c0f4fccc2.js></script><script type=text/javascript src=./static/js/app.6e95f112d5e2156e0b1a.js></script></body></html>

+ 7 - 0
project/src/components/dataBoard/throwPerson/throwPersonPuton.vue

@@ -39,6 +39,8 @@
39 39
               class="titleIcon" alt="">
40 40
             <img src="@/assets/img/icon/roi@2x.png" v-if="item.prop == 'first_day_roi'" style="height:14px"
41 41
               class="titleIcon" alt="">
42
+            <img src="@/assets/img/icon/roi@2x.png" v-if="item.prop == 'first_roi'" style="height:14px"
43
+              class="titleIcon" alt="">
42 44
             <img src="@/assets/img/icon/总毛利润额@2x.png" v-if="item.prop == 'profile'" style="height:14px"
43 45
               class="titleIcon" alt="">
44 46
             <img src="@/assets/img/icon/回本率@2x.png" v-if="item.prop == 'recall_rate'" style="height:16px"
@@ -169,6 +171,10 @@ export default {
169 171
           label: '首日ROI',
170 172
         },
171 173
         {
174
+          prop: 'first_roi',
175
+          label: '首日首单ROI',
176
+        },
177
+        {
172 178
           prop: 'profile',
173 179
           label: '总毛利润额',
174 180
         },
@@ -230,6 +236,7 @@ export default {
230 236
         { prop: "qw_cost", label: "企微成本" },
231 237
         { prop: "new_cost", label: "用户首日下单成本", min_width: 160 },
232 238
         { prop: "first_day_roi", label: "首日ROI", notes: '首日ROI=当日新用户充值之和/累计消耗' },
239
+        { prop: "first_roi", label: "首日首单ROI", },
233 240
         { prop: "profile", label: "总毛利额", notes: '总毛利额=累计充值-累计消耗' },
234 241
         { prop: "recall_rate", label: "回本率%", notes: '回本率=累计充值/累计消耗' },
235 242
         { prop: "three_days_rate", label: "3天倍率" },

+ 7 - 0
project/src/components/dataBoard/throwPerson/throwPersonSon.vue

@@ -18,6 +18,8 @@
18 18
               class="titleIcon" alt="">
19 19
             <img src="@/assets/img/icon/roi@2x.png" v-if="item.prop == 'sum_roi'" style="height:14px" class="titleIcon"
20 20
               alt="">
21
+            <img src="@/assets/img/icon/roi@2x.png" v-if="item.prop == 'first_roi'" style="height:14px" class="titleIcon"
22
+              alt="">
21 23
             <img src="@/assets/img/icon/总毛利润额@2x.png" v-if="item.prop == 'sum_profit'" style="height:14px"
22 24
               class="titleIcon" alt="">
23 25
             <img src="@/assets/img/icon/回本率@2x.png" v-if="item.prop == 'sum_recover_rate'" style="height:14px"
@@ -112,6 +114,10 @@ export default {
112 114
           label: '首日ROI',
113 115
         },
114 116
         {
117
+          prop: 'first_roi',
118
+          label: '首日首单ROI',
119
+        },
120
+        {
115 121
           prop: 'new_cost',
116 122
           label: '用户首日下单成本',
117 123
         },
@@ -146,6 +152,7 @@ export default {
146 152
         { prop: "charge_total", label: "累计充值", sort: true },
147 153
         { prop: "qw_cost", label: "企微成本", sort: true },
148 154
         { prop: "roi", label: "首日ROI", notes: '首日ROI=当日新用户充值之和/累计消耗', sort: true },
155
+        { prop: "first_roi", label: "首日首单ROI", },
149 156
         { prop: "new_cost", label: "用户首日下单成本", sort: true, min_width: 160 },
150 157
         { prop: "unique_new_cost", label: "用户首日下单成本(去重)", min_width: 190 },
151 158
         { prop: "new_user_charge_total", label: "新用户首日下单金额", min_width: 190 },

File diff suppressed because it is too large
+ 1 - 1
static/css/app.233c0731e6604bcc4fb3850bb5545eb4.css


File diff suppressed because it is too large
+ 1 - 0
static/js/17.b570b9b063077f5d189a.js


File diff suppressed because it is too large
+ 0 - 1
static/js/17.ee713303e4de665854a8.js


File diff suppressed because it is too large
+ 1 - 1
static/js/manifest.4e1c8a63966720306003.js