Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_iteration_20181127

resources/views/detail/content.blade.php

@@ -587,7 +587,7 @@
                 @endif
                 
                 <!-- 已发货之后的状态 -->
-                @if ($order_info['status'] >= 4)
+                @if ($order_info['status'] == 10)
                     <a href="{{URL('invShipping', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">寄送发票</a>
                 @endif
                
@@ -614,7 +614,7 @@
                 @endif
 
                 @if ($order_info['status'] == 4 && in_array('self_order_express', $userPerms))
-                <a class="btn btn-default self_express" href="javascript:;" data-id="{{$order_info['order_id']}}">填写快递单</a>
+                <!-- <a class="btn btn-default self_express" href="javascript:;" data-id="{{$order_info['order_id']}}">填写快递单</a> -->
                 @endif
                 
                 <!-- 订单状态大于4，且处于开票状态，且存在权限 -->