Merge branch 'zjl_exception_20181221' into development

bd6b8ce5 · 朱继来 · 88eafc49 · 49979369 · bd6b8ce5
Commit bd6b8ce5 authored Jan 15, 2019 by 朱继来
Showing with 1 additions and 1 deletions
resources/views/detail/content.blade.php
--- a/resources/views/detail/content.blade.php
+++ b/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> -->
                @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>
                @endif