Merge branch 'zjl_iteration_20181127' into development

app/Model/OrderModel.php

@@ -82,6 +82,8 @@ class OrderModel extends Model
                             $query->where('o.order_sn', '=', $map['order_contain']);
                         } else if ($map['order_type'] == 2) { // 型号名称
                             $query->where('it.goods_name', '=', $map['order_contain']);
+                        } else if ($map['order_type'] == 3) { // 发票抬头
+                            $query->where('i.tax_title', '=', $map['order_contain']);
                         } else { // 会员账号
                             if (preg_match('/@/', $map['order_contain'])) {
                                 $query->where('u.email', '=', $map['order_contain']);

resources/views/erpOrder/content.blade.php

@@ -220,7 +220,7 @@
 
                         <!-- 点击展示内容 -->
                         <tr class="show-other-content">
-                            <td colspan="10">
+                            <td colspan="11">
                                 <table class="table table-hover table-bordered">
                                     <tr>
                                         <td class="table-list-title">订单编号</td>