Merge branch 'zjl_self_refund_20190605' into development

resources/views/detail/content.blade.php

@@ -808,7 +808,7 @@
                 <!-- <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
                 @endif
 
 
-                @if (in_array($order_info['status'], [7, 8]) && in_array('self_order_refund', $userPerms))
+                @if (in_array($order_info['status'], [7, 8, 10]) && in_array('self_order_refund', $userPerms))
                     <a href="/return/{{$order_info['order_id']}}?tags=self" class="btn btn-info order_refund">退货申请</a>
                     <a href="/return/{{$order_info['order_id']}}?tags=self" class="btn btn-info order_refund">退货申请</a>
                 @endif
                 @endif