Merge branch 'zjl_adjust_20180911' into development

resources/views/detail/content.blade.php

@@ -340,7 +340,8 @@
                 </table>
                 </table>
             @endif
             @endif
             
             
-            @if (!empty($order_shipping_info))
+            <!-- 订单或发票物流 -->
+            @if (!empty($order_shipping_info) || !empty($order_invoice_shipping_info))
                 <table class="table table-bordered table-hover">
                 <table class="table table-bordered table-hover">
                     <tr class="caption">
                     <tr class="caption">
                         <th colspan="8" style="text-align: center; background: #f9f9f9;">
                         <th colspan="8" style="text-align: center; background: #f9f9f9;">
@@ -348,6 +349,7 @@
                         </th>
                         </th>
                     </tr>
                     </tr>
                     
                     
+                    @if (!empty($order_shipping_info))
                     <tr> 
                     <tr> 
                         <th width="5%">订单物流</th>
                         <th width="5%">订单物流</th>
                         <th width="5%">快递公司：</th>  
                         <th width="5%">快递公司：</th>  
@@ -369,6 +371,7 @@
                             <a class="btn btn-xs btn-success view-shipping" data-type="1">查看物流轨迹</a>
                             <a class="btn btn-xs btn-success view-shipping" data-type="1">查看物流轨迹</a>
                         </td>
                         </td>
                     </tr>
                     </tr>
+                    @endif
 
 
                     @if (!empty($order_invoice_shipping_info))
                     @if (!empty($order_invoice_shipping_info))
                         <tr> 
                         <tr> 
@@ -622,7 +625,8 @@
                 <a class="btn btn-default self_express" href="javascript:;" data-id="{{$order_info['order_id']}}" class="btn btn-default">填写快递单</a>
                 <a class="btn btn-default self_express" href="javascript:;" data-id="{{$order_info['order_id']}}" class="btn btn-default">填写快递单</a>
                 @endif
                 @endif
                 
                 
-                @if ($order_info['status'] >= 4 && in_array('self_order_invoice_express', $userPerms))
+                <!-- 订单状态大于4，且处于开票状态，且存在权限 -->
+                @if ($order_info['status'] >= 4 && $order_invoice_info['inv_type'] > 1 && 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>