Commit 6d5e60c4 by 朱继来

temp

parent 14cfcd96
Showing with 14 additions and 5 deletions
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
<th>支付方式</th> <th>支付方式</th>
<th>支付类型</th> <th>支付类型</th>
<th>支付状态</th> <th>支付状态</th>
<th>支付时间</th>
</tr> </tr>
<tr> <tr>
...@@ -161,6 +162,8 @@ ...@@ -161,6 +162,8 @@
} }
?> ?>
</td> </td>
<td>{{ $order_info['pay_time'] ? date('Y-m-d H:i:s', $order_info['pay_time']) : '' }}</td>
</tr> </tr>
</table> </table>
...@@ -186,6 +189,7 @@ ...@@ -186,6 +189,7 @@
</tr> </tr>
<tr> <tr>
<th>订单编号</th> <th>订单编号</th>
<th>京东订单编号</th>
<th>会员账号</th> <th>会员账号</th>
<th>收货人</th> <th>收货人</th>
<th>联系电话/手机</th> <th>联系电话/手机</th>
...@@ -197,9 +201,8 @@ ...@@ -197,9 +201,8 @@
@endif @endif
</tr> </tr>
<tr> <tr>
<td> <td>{{$order_info['order_sn']}}</td>
{{$order_info['order_sn']}} <td>{{ $order_temp_info['jd_order_id'] }}</td>
</td>
<td> <td>
@if ($user_mobile) @if ($user_mobile)
...@@ -496,7 +499,10 @@ ...@@ -496,7 +499,10 @@
<th>小计</th> <th>小计</th>
<th>货期</th> <th>货期</th>
<th>供应商</th>
@if ($user_info['mobile'] != '15011111111')
<th>供应商</th>
@endif
<?php <?php
if ($action_name == 'changeOrder' && count($order_items_info) > 1 && in_array($order_info['status'], [1, 2])) { if ($action_name == 'changeOrder' && count($order_items_info) > 1 && in_array($order_info['status'], [1, 2])) {
...@@ -533,7 +539,10 @@ ...@@ -533,7 +539,10 @@
@endif @endif
<td>{{$v['delivery_time']}}</td> <td>{{$v['delivery_time']}}</td>
<td>{{$v['supplier_name']}}</td>
@if ($user_info['mobile'] != '15011111111')
<td>{{$v['supplier_name']}}</td>
@endif
@if ($action_name == 'changeOrder' && count($order_items_info) > 1 && in_array($order_info['status'], [1, 2])) @if ($action_name == 'changeOrder' && count($order_items_info) > 1 && in_array($order_info['status'], [1, 2]))
<td><a class="btn btn-danger deletegoods" href="javascript:;" data-id="{{$v['rec_id']}}">删除</a></td> <td><a class="btn btn-danger deletegoods" href="javascript:;" data-id="{{$v['rec_id']}}">删除</a></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