Merge branch 'zjl_erp_20190923' into development

resources/views/detail/content.blade.php

@@ -754,7 +754,7 @@
         @if (!isset($_REQUEST['tags']) && $action_name != 'changeOrder' && $action_name != 'sendSales')
             <p style="padding-left: 5px;">操作</p>
             <div class="tabs-box">
-                @if (in_array($order_info['status'], [1, 2, 4]) && in_array('cancel_order', $userPerms))
+                @if (in_array($order_info['status'], [1, 2, 3, 4]) && in_array('cancel_order', $userPerms))
                     <!-- <a href="{{URL('cancelPay', ['order_id'=>$order_info['order_id']])}}" class="btn btn-danger">取消订单</a> -->
                     <a class="btn btn-danger input-cancel-reason" href="javascript:;" data-oid="{{$order_info['order_id']}}" data-type="2">取消订单</a> 
                 @endif