Merge branch 'zjl_create_order_20180813' into development

public/js/add_order.js

@@ -436,6 +436,7 @@
                             datax.address_mobile = $('input[name=address_mobile]').val();
                         } else { // 联营、自营线上订单
                             var tax_id = $('.tax_id').val();
+                            var inv_type = $('input[name=inv_type]:checked').val();
                             var user_coupon_id = $('.user_coupon_id').val();
 
                             if (!address_id) {
@@ -443,7 +444,7 @@
                                 return false;
                             }
 
-                            if (!tax_id) {
+                            if (inv_type && !tax_id) {
                                 layer.msg('请选择发票信息');
                                 return false;
                             }