Merge branch 'yyc_order_cancel' into development

resources/views/detail/content.blade.php

@@ -576,7 +576,7 @@
             <p style="padding-left: 5px;">操作</p>
             <div class="tabs-box">
                 <!-- 判断状态和权限 -->
-                @if ($order_info['status'] == 2 && in_array('self_order_cancel', $userPerms))
+                @if (in_array($order_info['status'], [2, 3, 4]) && 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> 
                 @endif