Browse Source

Merge branch 'master' into develop

zhengxy 2 years ago
parent
commit
35286ca4c9

+ 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.390c91c6aef34321821b44c314eb5539.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.f04749156be4b69488cb.js></script><script type=text/javascript src=./static/js/app.3c86f0646945763ac887.js></script></body></html>
10
+      })();</script><link href=./static/css/app.2ca5c924cde4f45dc52414b64ffac175.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.2f88e8dbca13225301fe.js></script><script type=text/javascript src=./static/js/app.3c86f0646945763ac887.js></script></body></html>

+ 1 - 1
project/src/components/orderManage/charge.vue

@@ -165,7 +165,7 @@ export default {
165 165
         { prop: "ad_report_action_type", label: "回传类型", },
166 166
         { prop: "ad_report_order_status", label: "下单回传结果", },
167 167
         { prop: "ad_report_purchase_status", label: "付费回传结果", },
168
-        { prop: "detial", label: "操作", },
168
+        // { prop: "detial", label: "操作", },
169 169
       ],
170 170
       height: '',
171 171
       trendX: [],

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


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


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


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