Skip to content

朱继来 / 后台订单管理

Go to a project
Commit f27a1624 by 朱继来
Options

Merge branch 'zjl_iteration_20191226'

parents 5a1230a8 64dab078
Inline Side-by-side
Showing with 12 additions and 12 deletions
resources/views/detail/content.blade.php
...@@ -490,10 +490,10 @@ ...@@ -490,10 +490,10 @@
@if (empty($_REQUEST['tags'])) @if (empty($_REQUEST['tags']))
<th>备注</th> <th>备注</th>
@endif @endif
<th> @if ($order_info['order_goods_type'] == 1)
<th></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])) {
...@@ -566,17 +566,17 @@ ...@@ -566,17 +566,17 @@
@if (empty($_REQUEST['tags'])) @if (empty($_REQUEST['tags']))
<td class="remarks"> <td class="remarks">
@if(!empty($v['remarks'])) @if(!empty($v['remarks']))
{{$v['remarks']}} {{$v['remarks']}}
@endif @endif
</td> </td>
@endif @endif
<td> @if ($order_info['order_goods_type'] == 1)
<!-- <button type="button" class="btn btn-success btn-xs remarks">编辑</button> --> <td>
<button type="button" class="btn btn-success btn-xs edit-item" data-id="{{$v['rec_id']}}" data-batch="{{$v['batch']}}" data-bid="{{$v['buyer_id']}}" data-remarks="{{$v['remarks']}}">编辑</button> <!-- <button type="button" class="btn btn-success btn-xs remarks">编辑</button> -->
</td> <button type="button" class="btn btn-success btn-xs edit-item" data-id="{{$v['rec_id']}}" data-batch="{{$v['batch']}}" data-bid="{{$v['buyer_id']}}" data-remarks="{{$v['remarks']}}">编辑</button>
</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