Merge branch 'zjl_exception_20181221' into development

resources/views/detail/content.blade.php

@@ -661,7 +661,7 @@
                     <!-- <a href="{{URL('send', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">订单发货</a> -->
                     <!-- <a href="{{URL('send', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">订单发货</a> -->
                 @endif
                 @endif
 
 
-                @if (in_array($order_info['status'], array(3, 4, 7)))
+                @if (in_array($order_info['status'], array(3, 4, 7))  && in_array('order_refund', $userPerms))
                     <a href="{{URL('refund', ['order_id'=>$order_info['order_id']])}}" class="btn btn-info order_refund">退货退款</a>
                     <a href="{{URL('refund', ['order_id'=>$order_info['order_id']])}}" class="btn btn-info order_refund">退货退款</a>
                 @endif
                 @endif