Merge branch 'zjl_order_refund_20201208'

app/Http/Controllers/WebController.php

@@ -390,7 +390,7 @@ class WebController extends Controller
 
 
         $perm = new PermController; 
         $perm = new PermController; 
         $data['sale_list'] = $perm->getUserByDepartmentId(Config('perm_args.sales_department_id')); // 获取所有的销售
         $data['sale_list'] = $perm->getUserByDepartmentId(Config('perm_args.sales_department_id')); // 获取所有的销售
-        $data['role']      = $perm->getUserRole($request);
+        // $data['role']      = $perm->getUserRole($request);
 
 
         return view('web', $data);
         return view('web', $data);
     }
     }

resources/views/web/orderServiceDetails.blade.php

@@ -148,7 +148,9 @@
 	</div>
 	</div>
 	@elseif ($order_service->service_status == 2)
 	@elseif ($order_service->service_status == 2)
 	<div class="layui-btn-container" style="text-align: center; margin: 20px 0;">
 	<div class="layui-btn-container" style="text-align: center; margin: 20px 0;">
+		@if (in_array('orderServiceList_audit', $userPerms))
 			<a class="layui-btn layui-btn-normal act_submit" data-id="{{ $order_service->id }}" data-type="3">审核</a>
 			<a class="layui-btn layui-btn-normal act_submit" data-id="{{ $order_service->id }}" data-type="3">审核</a>
+		@endif
 		<a class="layui-btn layui-btn-danger act_submit" data-id="{{ $order_service->id }}" data-type="-1">取消</a>
 		<a class="layui-btn layui-btn-danger act_submit" data-id="{{ $order_service->id }}" data-type="-1">取消</a>
 	</div>
 	</div>
 	@endif
 	@endif

resources/views/web/orderServiceList.blade.php

@@ -125,12 +125,14 @@
 		<a class="btn btn-xs btn-outline btn-warning" lay-event="submit">提交</a>
 		<a class="btn btn-xs btn-outline btn-warning" lay-event="submit">提交</a>
 		<a class="btn btn-xs btn-outline btn-danger" lay-event="cancel">取消</a>
 		<a class="btn btn-xs btn-outline btn-danger" lay-event="cancel">取消</a>
 	@{{# } else if (d.service_status == 2) { }}
 	@{{# } else if (d.service_status == 2) { }}
-		<?php if (in_array($role, [1, 2])) { ?>
+		<?php if (in_array('orderServiceList_audit', $userPerms)) { ?>
 			<a class="btn btn-xs btn-outline btn-success" lay-event="audit">审核</a>
 			<a class="btn btn-xs btn-outline btn-success" lay-event="audit">审核</a>
-		<a class="btn btn-xs btn-outline btn-danger" lay-event="cancel">取消</a>
 		<?php } ?>
 		<?php } ?>
+		<a class="btn btn-xs btn-outline btn-danger" lay-event="cancel">取消</a>
 	@{{# } else if (d.service_status == 3 && d.refund_status != 3) { }}
 	@{{# } else if (d.service_status == 3 && d.refund_status != 3) { }}
+		<?php if (in_array('orderServiceList_confirm_refund', $userPerms)) { ?>
 			<a class="btn btn-xs btn-outline btn-success" lay-event="confirm">确认退款</a>
 			<a class="btn btn-xs btn-outline btn-success" lay-event="confirm">确认退款</a>
+		<?php } ?>
 	@{{# } }}
 	@{{# } }}
 </script>
 </script>