Merge branch 'zjl_create_order_20180813' into development

resources/views/detail/content.blade.php

@@ -434,7 +434,6 @@
             </table>
             </table>
         </div>
         </div>
 
 
-
         <div class="tabs-box order-total">
         <div class="tabs-box order-total">
             <div>
             <div>
                 <table>
                 <table>
@@ -580,7 +579,7 @@
                     <a class="btn btn-success self-check" data-id="{{$order_info['order_id']}}" class="btn btn-default">审单</a>
                     <a class="btn btn-success self-check" data-id="{{$order_info['order_id']}}" class="btn btn-default">审单</a>
                 @endif
                 @endif
 
 
-                @if (in_array($order_info['status'], [2, 3, 4]) && in_array('self_order_cancel', $userPerms))
+                @if (in_array($order_info['status'], [2, 3, 4]) && !$extend && in_array('self_order_cancel', $userPerms))
                 <a class="btn btn-default self_cancel" href="javascript:;" data-id="{{$order_info['order_id']}}" class="btn btn-default">取消订单</a> 
                 <a class="btn btn-default self_cancel" href="javascript:;" data-id="{{$order_info['order_id']}}" class="btn btn-default">取消订单</a> 
                 @endif
                 @endif