Merge branch 'zjl_fake_data_20180319' into 'master'

调整人工审单权限

See merge request !20

resources/views/orderlist/content.blade.php

@@ -246,10 +246,9 @@
                             <td>
                                 <div class="btn-group btn-group-xs">
 	                                    <a class="btn btn-primary" href="{{URL('details', ['order_id'=>$v['order_id']])}}">详情</a>
-                                        <!-- 管理员和经理显示 -->
-                                        @if ($role == 1 || $role == 2) 
+                                        <!-- 管理员和经理显示 $role = 1 || 2 -->
+                                        @if (in_array('check_order', $userPerms))
     	                                    <a class="btn btn-success" href="{{URL('change', ['order_id'=>$v['order_id']])}}">人工审单</a>
-    	                                    <!-- <a class="btn btn-success" href="{{URL('check', ['order_id'=>$v['order_id']])}}">审单</a> -->
                                         @endif
                                 </div>
                             </td>