Browse Source

Merge branch 'master' into develop

zhengxy 1 year ago
parent
commit
ae79255495

+ 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.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>
10
+      })();</script><link href=./static/css/app.df1a6228c22cdf5b7b1dc35c67c310fb.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.4378fa40f8dd671beb4d.js></script><script type=text/javascript src=./static/js/app.6e95f112d5e2156e0b1a.js></script></body></html>

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

@@ -238,6 +238,8 @@ export default {
238 238
         { prop: "first_roi", label: "首充ROI", },
239 239
         { prop: "qw_cost", label: "企微成本" },
240 240
         { prop: "new_cost", label: "用户首日下单成本", min_width: 160 },
241
+        { prop: "first_charge", label: "首日首单充值金额", min_width: 160 },
242
+        { prop: "first_day_pay", label: "首日充值金额", min_width: 160 },
241 243
         { prop: "scan_follow_total", label: "企微粉丝人数" },
242 244
         { prop: "profile", label: "总毛利额", notes: '总毛利额=累计充值-累计消耗' },
243 245
         { prop: "recall_rate", label: "回本率%", notes: '回本率=累计充值/累计消耗' },

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


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


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


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