Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 76fc29a2 by 朱继来
Options

Merge branch 'zjl_adjust_20181008' into development

parents ac69327c 0d295072
Inline Side-by-side
Showing with 33 additions and 31 deletions
resources/views/orderlist/content.blade.php
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
<th class="pl30">订单类型</th> <th class="pl30">订单类型</th>
<th class="pl30">支付方式</th> <th class="pl30">支付方式</th>
<th class="pl30">推送业务员</th> <th class="pl30">推送业务员</th>
<th class="pl30">发货状态</th> <th class="pl30">订单来源</th>
<th class="pl30">同步状态</th> <th class="pl30">同步状态</th>
<th class="pl30">收货人</th> <th class="pl30">收货人</th>
<th class="pl30">下单时间</th> <th class="pl30">下单时间</th>
...@@ -256,34 +256,17 @@ ...@@ -256,34 +256,17 @@
<td class="show-list"><?php print_r(App\Http\Controllers\getSalesName($v['sale_id'])); ?></td> <td class="show-list"><?php print_r(App\Http\Controllers\getSalesName($v['sale_id'])); ?></td>
<td class="show-list"> <td class="show-list"><?php echo App\Http\Controllers\getOrderSource($v['order_id']); ?></td>
<?php
$shipping = App\Http\Controllers\getShipping($v['order_id']);
$shippingStatus = '';
$shippingNo = '';
if ($shipping) {
foreach ($shipping as $s) {
switch ($s->status) {
case 0:
case 1: $shippingStatus .= '已配送, '; break;
case 2: $shippingStatus .= '已签收, '; break;
default: $shippingStatus .= '未配送, '; break;
}
$shippingNo .= $s->shipping_no ? $s->shipping_no.', ' : '';
}
$shippingStatus = substr($shippingStatus, 0, -2);
}
echo $shippingStatus;
?>
</td>
<td class="show-list"> <td class="show-list">
<?php <?php
if (in_array($v['status'], [-1, 1, 2])) { if ($v['order_pay_type'] == 3) { // 账期订单待付款状态下显示未同步
$statusLimit = [-1, 1];
} else {
$statusLimit = [-1, 1, 2];
}
if (in_array($v['status'], $statusLimit)) {
echo '不需同步'; echo '不需同步';
} else { } else {
echo $v['erp_order_id'] != '' && $v['erp_order_id'] != '-' ? '<span class="list-text-success"><b>已同步</b></span>' : '<span class="list-text-checking"><b>未同步</b></span>'; echo $v['erp_order_id'] != '' && $v['erp_order_id'] != '-' ? '<span class="list-text-success"><b>已同步</b></span>' : '<span class="list-text-checking"><b>未同步</b></span>';
...@@ -395,13 +378,32 @@ ...@@ -395,13 +378,32 @@
<td class="table-list-title">优惠金额</td> <td class="table-list-title">优惠金额</td>
<td class="table-list-content"><?php echo App\Http\Controllers\getCoupon($v['order_id']); ?></td> <td class="table-list-content"><?php echo App\Http\Controllers\getCoupon($v['order_id']); ?></td>
</tr> </tr>
<?php
$shipping = App\Http\Controllers\getShipping($v['order_id']);
$shippingStatus = '';
$shippingNo = '';
if ($shipping) {
foreach ($shipping as $s) {
switch ($s->status) {
case 0:
case 1: $shippingStatus .= '已配送, '; break;
case 2: $shippingStatus .= '已签收, '; break;
default: $shippingStatus .= '未配送, '; break;
}
$shippingNo .= $s->shipping_no ? $s->shipping_no.', ' : '';
}
$shippingStatus = substr($shippingStatus, 0, -2);
}
?>
<tr> <tr>
<td class="table-list-title">快递单号</td> <td class="table-list-title">快递单号</td>
<td class="table-list-content">{{$shippingNo ? substr($shippingNo, 0, -2) : ''}}</td> <td class="table-list-content">{{$shippingNo ? substr($shippingNo, 0, -2) : ''}}</td>
<td class="table-list-title">订单来源</td> <td class="table-list-title">发货状态</td>
<td class="table-list-content"> <td class="table-list-content">{{$shippingStatus}}</td>
<?php echo App\Http\Controllers\getOrderSource($v['order_id']); ?>
</td>
</tr> </tr>
</table> </table>
</td> </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