Browse Source

Merge branch 'master' into develop

zhengxy 1 year ago
parent
commit
8c46e92a78

+ 1 - 1
index.html

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

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

176
         },
176
         },
177
         {
177
         {
178
           prop: 'first_roi',
178
           prop: 'first_roi',
179
-          label: '首日首单ROI',
179
+          label: '首ROI',
180
         },
180
         },
181
         {
181
         {
182
           prop: 'profile',
182
           prop: 'profile',
229
       desCol: [
229
       desCol: [
230
         { prop: "playletTitle", label: "剧集", min_width: 160, fixed: 'left' },
230
         { prop: "playletTitle", label: "剧集", min_width: 160, fixed: 'left' },
231
         { prop: "official_account_name", label: "公众号", min_width: 220 },
231
         { prop: "official_account_name", label: "公众号", min_width: 220 },
232
-        { prop: "account_name", label: "投放账号", min_width: 160 },
233
         { prop: "user_list_show", label: "使用客服", min_width: 260 },
232
         { prop: "user_list_show", label: "使用客服", min_width: 260 },
233
+        { prop: "account_name", label: "投放账号", min_width: 160 },
234
+        { prop: "balance", label: "账户余额", },
234
         { prop: "user_name", label: "投手", min_width: 160 },
235
         { prop: "user_name", label: "投手", min_width: 160 },
235
-        { prop: "start_date", label: "开始日期", min_width: 160 },
236
-        { prop: "end_date", label: "截止日期", min_width: 160 },
237
         { prop: "cost", label: "累计消耗", sort: true },
236
         { prop: "cost", label: "累计消耗", sort: true },
238
-        { prop: "pay_money", label: "累计充值" },
239
-        { prop: "scan_follow_total", label: "企微粉丝人数" },
237
+        { prop: "first_day_roi", label: "首日ROI", notes: '首日ROI=当日新用户充值之和/累计消耗' },
238
+        { prop: "first_roi", label: "首充ROI", },
240
         { prop: "qw_cost", label: "企微成本" },
239
         { prop: "qw_cost", label: "企微成本" },
241
         { prop: "new_cost", label: "用户首日下单成本", min_width: 160 },
240
         { prop: "new_cost", label: "用户首日下单成本", min_width: 160 },
242
-        { prop: "balance", label: "账户余额", },
243
-        { prop: "first_day_roi", label: "首日ROI", notes: '首日ROI=当日新用户充值之和/累计消耗' },
244
-        { prop: "first_roi", label: "首日首单ROI", },
241
+        { prop: "scan_follow_total", label: "企微粉丝人数" },
245
         { prop: "profile", label: "总毛利额", notes: '总毛利额=累计充值-累计消耗' },
242
         { prop: "profile", label: "总毛利额", notes: '总毛利额=累计充值-累计消耗' },
246
         { prop: "recall_rate", label: "回本率%", notes: '回本率=累计充值/累计消耗' },
243
         { prop: "recall_rate", label: "回本率%", notes: '回本率=累计充值/累计消耗' },
244
+        { prop: "start_date", label: "开始日期", min_width: 160 },
245
+        { prop: "end_date", label: "截止日期", min_width: 160 },
246
+        { prop: "pay_money", label: "累计充值" },
247
         { prop: "three_days_rate", label: "3天倍率" },
247
         { prop: "three_days_rate", label: "3天倍率" },
248
         { prop: "seven_days_rate", label: "7天倍率" },
248
         { prop: "seven_days_rate", label: "7天倍率" },
249
         { prop: "day3_charge", label: "3天充值金额" },
249
         { prop: "day3_charge", label: "3天充值金额" },

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


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


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


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