Commit abc3e829 by 朱继来

Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_action_log_20180521

parents e5cb40aa 04a2b5ec
Showing with 5 additions and 1 deletions
......@@ -99,7 +99,7 @@
time_end = $('input[name="time_end"]').val(),
// order_type_a = $('#order_type_a').data('default'),
order_pay_type = $('#order_pay_type').data('default'),
order_status = $('#order_status').data('default'),
order_status = $('#order_status').val(),
shipping_name = $('#shipping_name').data('default'),
order_send = $('#order_send').data('default'),
order_source_pf = $('#order_source_pf').data('default'),
......@@ -127,6 +127,10 @@
time_end = Date.parse(time_end) / 1000 + (24*60*60-1);
}
if (order_status == null) {
order_status = '';
}
if (test_order.is(':checked')) {
test_order = 1;
} else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment