Skip to content

朱继来 / 后台订单管理

Go to a project
Commit a2944af9 by 朱继来
Options

Merge branch 'zjl_self_order_20180502' into development

parents c42dd9e4 c1e68635
Inline Side-by-side
Showing with 2 additions and 11 deletions
resources/views/orderlist/content.blade.php
......@@ -259,7 +259,7 @@
if (in_array($v['status'], [-1, 1, 2])) {
echo '不需同步';
} else {
echo $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>';
}
?>
</td>
......
resources/views/selfOrder/content.blade.php
......@@ -155,7 +155,6 @@
<th class="pl30">支付方式</th>
<th class="pl30">绑定客服</th>
<th class="pl30">发货状态</th>
<th class="pl30">同步状态</th>
<th class="pl30">下单时间</th>
<th class="pl30">操作</th>
</tr>
......@@ -230,15 +229,7 @@
echo $shippingStatus;
?>
</td>
<td class="show-list">
<?php
if (in_array($v['status'], [-1, 1, 2])) {
echo '不需同步';
} else {
echo $v['erp_order_id'] ? '<span class="list-text-success"><b>已同步</b></span>' : '<span class="list-text-checking"><b>未同步</b></span>';
}
?>
</td>
<td class="show-list">{{$username != 'vpadmin@ichunt.com' ? date('Y-m-d H:i:s', $v['create_time']) : date('Y-m-d', $v['create_time'])}}</td>
<td>
<div class="btn-group btn-group-xs">
......
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