Merge branch 'zjl_self_refund_20190605'

resources/views/returnDetails/content.blade.php

@@ -143,8 +143,8 @@
                 </div>                          
             </div>
             
-            <!-- 管理员、经理、自营客服主管审核 && 待审核状态 -->
-            @if (in_array($role, [1, 2, 10]) && $return['status'] == 1)
+            <!-- 管理员、经理、自营客服主管及助理审核 && 待审核状态 -->
+            @if (in_array($role, [1, 2, 10, 11]) && $return['status'] == 1)
                 <div class="text-center" style="margin-bottom: 10px;">
                     <button class="btn btn-info return-check" style="margin-right: 10px;" data-type="2" data-id="{{ $return['return_id'] }}">审核通过</button>
                     <button class="btn btn-danger return-check" data-type="-2" data-id="{{ $return['return_id'] }}">驳回</button>