Browse Source

云选订单手动补单调整

shensong00 2 weeks ago
parent
commit
190118fcdd

+ 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.b00e80d8e881d57bbde3a59da063d666.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.db701752edd2c9f17e0f.js></script><script type=text/javascript src=./static/js/app.4f3a4b5187a0f9f076e0.js></script></body></html>
10
+      })();</script><link href=./static/css/app.02877b0737e121ed95e6160721b4e298.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.c0a612113b0b12fd621e.js></script><script type=text/javascript src=./static/js/app.b3f79b184c74815d4f55.js></script></body></html>

+ 2 - 2
project/src/components/dataBoard/yxOrderData.vue

@@ -49,7 +49,7 @@
49 49
               <template>
50 50
                 <span v-if="row.ad_report_order_status == '成功' && row.supplement_status == 0" class="c-A5A5A5 pointer fWeight600 disabled">已回传</span>
51 51
                 <span v-else-if="row.ad_report_order_status == '成功' && row.supplement_status == 1" class="c-A5A5A5 pointer fWeight600 disabled">已补单</span>
52
-                <span v-else-if="row.order_status != 4 && row.predict_commission_fee > 0" class="c-00B38A pointer fWeight600" @click="onClickReport(row)">补单</span>
52
+                <span v-else-if="row.order_status != 4 && (row.predict_commission_fee > 0 || row.payment_amount >= 1000)" class="c-00B38A pointer fWeight600" @click="onClickReport(row)">补单</span>
53 53
               </template>
54 54
             </div>
55 55
 
@@ -126,7 +126,7 @@ export default {
126 126
         { prop: "payment_amount", label: "实际支付金额"},
127 127
         { prop: "predict_commission_fee", label: "预估佣金" },
128 128
         { prop: "payed_time", label: "支付时间", min_width: 160 },
129
-        { prop: "predict_report_time", label: "预估回传时间", min_width: 160 },
129
+        // { prop: "predict_report_time", label: "预估回传时间", min_width: 160 },
130 130
         { prop: "order_status_desc", label: "订单状态"},
131 131
         // { prop: "goods_name", label: "商品名称"},
132 132
         { prop: "account_id", label: "投放账户", },

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


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


File diff suppressed because it is too large
+ 1 - 1
static/js/84.6d60b81f83907ad75ddf.js


File diff suppressed because it is too large
+ 1 - 1
static/js/85.04359412c2fd2d234226.js


File diff suppressed because it is too large
+ 1 - 1
static/js/86.07c1726c8db18140ef61.js


File diff suppressed because it is too large
+ 1 - 1
static/js/87.5aceacae970d49f14edd.js


File diff suppressed because it is too large
+ 1 - 1
static/js/88.660858bd3d85e66e7bc6.js


File diff suppressed because it is too large
+ 1 - 1
static/js/89.d47fb74265f250048ddc.js


File diff suppressed because it is too large
+ 1 - 1
static/js/90.421df8357acc973a7197.js


File diff suppressed because it is too large
+ 1 - 1
static/js/91.1a65eb077263a0f7fd3a.js


File diff suppressed because it is too large
+ 1 - 1
static/js/92.750788b508ea8eba91f5.js


File diff suppressed because it is too large
+ 1 - 1
static/js/93.ce7d82bed7fb46062df4.js


File diff suppressed because it is too large
+ 1 - 1
static/js/94.cfabccc5a92e0c2df7d4.js


File diff suppressed because it is too large
+ 1 - 1
static/js/95.31c505146c9367e0a8b2.js


File diff suppressed because it is too large
+ 1 - 1
static/js/96.dc3a05a5af23ff234bae.js


File diff suppressed because it is too large
+ 1 - 1
static/js/97.0bc0a4e4e5072088bca9.js


File diff suppressed because it is too large
+ 1 - 1
static/js/98.1d45a41a0b8dfc65f228.js


File diff suppressed because it is too large
+ 1 - 1
static/js/99.6559016864b42fa4de5d.js


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


File diff suppressed because it is too large
+ 2 - 2
static/js/app.4f3a4b5187a0f9f076e0.js


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