Merge branch 'zjl_exception_20181221' into development

resources/views/detail/content.blade.php

@@ -662,7 +662,7 @@
                 @endif
 
                 @if (in_array($order_info['status'], array(3, 4, 7)))
-                    <a href="{{URL('refund', ['order_id'=>$order_info['order_id']])}}" class="btn btn-info">退货退款</a>
+                    <a href="{{URL('refund', ['order_id'=>$order_info['order_id']])}}" class="btn btn-info order_refund">退货退款</a>
                 @endif
                 
                 <!-- 已发货之后的状态 -->
@@ -818,7 +818,14 @@
     </div>
 </div>
 
-
 <script>
+    // 退款申请已处理或已拒绝，则隐藏退款按钮
+    var refund = "{{!empty($order_refund_info) && ($order_refund_info['status'] == -1 || $order_refund_info['status'] == 10) ? false : true}}";
+    if (refund) {
+        $('.order_refund').show();
+    } else {
+        $('.order_refund').hide();
+    }
+
     $.lie.order.details();
 </script>    
\ No newline at end of file