添加快递信息

app/Http/Controllers/OrderController.php

@@ -1409,6 +1409,7 @@ Class OrderController extends Controller
             'order_pay_log'               => $temp['data']['order_pay_log'],
             'order_pay_log'               => $temp['data']['order_pay_log'],
             'order_price_info'            => $temp['data']['order_price_info'],
             'order_price_info'            => $temp['data']['order_price_info'],
             'order_temp_info'             => $temp['data']['order_temp_info'],
             'order_temp_info'             => $temp['data']['order_temp_info'],
+            'order_shipping_inside'       => $temp['data']['order_shipping_inside'],
             'actionLog'                   => $actionLog,
             'actionLog'                   => $actionLog,
         ];
         ];
 
 

resources/views/detail/content.blade.php

@@ -544,9 +544,9 @@
                 @if (in_array($order_info['status'], [4, 8]) && in_array('self_order_invoice_express', $userPerms))
                 @if (in_array($order_info['status'], [4, 8]) && in_array('self_order_invoice_express', $userPerms))
                 <a class="btn btn-default self_invoice_express" data-id="{{$order_info['order_id']}}" href="javascript:;" class="btn btn-default">填写发票快递</a>
                 <a class="btn btn-default self_invoice_express" data-id="{{$order_info['order_id']}}" href="javascript:;" class="btn btn-default">填写发票快递</a>
                 @endif           
                 @endif           
-             
             </div>
             </div>
 
 
+            <!-- 快递公司 -->
             @if ($shippings) 
             @if ($shippings) 
                 <script>
                 <script>
                     var shippings = '{!! json_encode($shippings) !!}';
                     var shippings = '{!! json_encode($shippings) !!}';
@@ -554,13 +554,35 @@
                     var shippings_info = eval('('+shippings+')');
                     var shippings_info = eval('('+shippings+')');
                 </script>
                 </script>
             @endif
             @endif
+        @endif
         
         
+        @if (!empty($order_shipping_inside))
+            <p>物流信息</p>
+            <div class="tabs-box">
+                <table class="table table-bordered table-hover">
+                    <thead>
+                        <tr>
+                            <th>物流时间</th>
+                            <th>物流信息</th>
+                        </tr>
+                    </thead>
+
+                    <tbody>
+                        @foreach ($order_shipping_inside as $v) 
+                            <tr>
+                                <td>{{date('Y-m-d H:i:s', $v['create_time'])}}</td>
+                                <td>{{$v['info']}}</td>
+                            </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
         @endif
         @endif
         
         
-        <!-- 二期处理 -->
+        @if (!empty($actionLog))
             <p>操作记录</p>
             <p>操作记录</p>
             <div class="tabs-box">
             <div class="tabs-box">
-            <table class="table table-bordered table-hover log">
+                <table class="table table-bordered table-hover">
                     <thead>
                     <thead>
                     <tr>
                     <tr>
                         <th>操作时间</th>
                         <th>操作时间</th>
@@ -569,7 +591,6 @@
                     </tr>
                     </tr>
                     </thead>
                     </thead>
                     <tbody>      
                     <tbody>      
-                    @if (!empty($actionLog))
                         @foreach ($actionLog as $v)
                         @foreach ($actionLog as $v)
                             <tr>
                             <tr>
                                 <td>{{date('Y-m-d H:i:s', $v->create_time)}}</td>
                                 <td>{{date('Y-m-d H:i:s', $v->create_time)}}</td>
@@ -577,12 +598,10 @@
                                 <td>{{$v->event}}</td>
                                 <td>{{$v->event}}</td>
                             </tr>
                             </tr>
                         @endforeach                   
                         @endforeach                   
-                    @else
-                        <tr><td colspan="3">无操作记录</td></tr>
-                    @endif
                     </tbody>
                     </tbody>
                 </table>
                 </table>
             </div>
             </div>
+        @endif
     </div>
     </div>
 
 
 <script>
 <script>