Merge branch 'zjl_iteration_20191226'

resources/views/detail/content.blade.php

@@ -490,10 +490,10 @@
                         @if (empty($_REQUEST['tags']))
                             <th>备注</th>
                         @endif
-
-                        <th>
-
-                        </th>
+                        
+                        @if ($order_info['order_goods_type'] == 1)
+                            <th></th>
+                        @endif
 
                         <?php 
                             if ($action_name == 'changeOrder' && count($order_items_info) > 1 && in_array($order_info['status'], [1, 2])) {
@@ -566,17 +566,17 @@
                             @if (empty($_REQUEST['tags']))
                             <td class="remarks">
                                 @if(!empty($v['remarks']))
-                                     {{$v['remarks']}} 
-                                    
+                                     {{$v['remarks']}}      
                                 @endif
-
                             </td>
                             @endif
-
-                            <td>
-                                <!-- <button type="button" class="btn btn-success btn-xs remarks">编辑</button> -->
-                                <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>
+                            
+                            @if ($order_info['order_goods_type'] == 1)
+                                <td>
+                                    <!-- <button type="button" class="btn btn-success btn-xs remarks">编辑</button> -->
+                                    <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]))
                                 <td><a class="btn btn-danger deletegoods" href="javascript:;" data-id="{{$v['rec_id']}}">删除</a></td>