Skip to content

朱继来 / 后台订单管理

Go to a project
Commit d5ff5d5a by 朱继来
Options

Merge branch 'zjl_iteration_20181127' into development

parents 089fdaf6 72370760
Inline Side-by-side
Showing with 3 additions and 1 deletions
app/Model/OrderModel.php
...@@ -82,6 +82,8 @@ class OrderModel extends Model ...@@ -82,6 +82,8 @@ class OrderModel extends Model
$query->where('o.order_sn', '=', $map['order_contain']); $query->where('o.order_sn', '=', $map['order_contain']);
} else if ($map['order_type'] == 2) { // 型号名称 } else if ($map['order_type'] == 2) { // 型号名称
$query->where('it.goods_name', '=', $map['order_contain']); $query->where('it.goods_name', '=', $map['order_contain']);
} else if ($map['order_type'] == 3) { // 发票抬头
$query->where('i.tax_title', '=', $map['order_contain']);
} else { // 会员账号 } else { // 会员账号
if (preg_match('/@/', $map['order_contain'])) { if (preg_match('/@/', $map['order_contain'])) {
$query->where('u.email', '=', $map['order_contain']); $query->where('u.email', '=', $map['order_contain']);
......
resources/views/erpOrder/content.blade.php
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
<!-- 点击展示内容 --> <!-- 点击展示内容 -->
<tr class="show-other-content"> <tr class="show-other-content">
<td colspan="10"> <td colspan="11">
<table class="table table-hover table-bordered"> <table class="table table-hover table-bordered">
<tr> <tr>
<td class="table-list-title">订单编号</td> <td class="table-list-title">订单编号</td>
......
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