Merge branch 'zjl_fake_data_20180319' into 'master'

调整excel导出js的bug

See merge request !18

public/js/order.js

@@ -102,12 +102,12 @@
                     test_order         = $('input[name=test_order]');
 
                     if (test_order.length) {
-                        if (!order_contain && !time_start && !time_end && !order_type_a && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag && !test_order.is(':checked')) {
+                        if (!order_contain && !time_start && !time_end && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag && !test_order.is(':checked')) {
                             layer.msg('请选择筛选条件，再导出！');
                             return false;
                         }
                     } else {
-                        if (!order_contain && !time_start && !time_end && !order_type_a && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag) {
+                        if (!order_contain && !time_start && !time_end && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag) {
                             layer.msg('请选择筛选条件，再导出！');
                             return false;
                         }