Merge branch 'zjl_adjust_check_0125' into 'master'

调整人工审单权限

See merge request !4

app/Http/Controllers/OrderCountController.php

@@ -81,7 +81,7 @@ Class OrderCountController extends Controller
         $useremail= $request->user->email;
 
         // 菜单
-        $menuconfig = DB::table('config')->where('config_id', 5)->first();
+        $menuconfig = DB::table('config')->where('config_title', '订单系统')->first();
         $menus = [];
         if ($menuconfig && !($menus = json_decode($menuconfig->config_data)))
             $menus = [];

config/perm.php

@@ -2,7 +2,7 @@
 	return [
 		// 菜单权限
 		'订单管理' => [
-			'订单列表' => ['orderlist_check', 'export', 'adjust_price', 'check_order', 'cancel_order', 'check_account', 'order_send', 'send_invoice', 'update_address', 'update_invoice', 'check_test_order', 'check_offline_order'],
+			'订单列表' => ['orderlist_check', 'export', 'check_order', 'cancel_order', 'check_account', 'order_send', 'send_invoice', 'update_address', 'update_invoice', 'check_test_order', 'check_offline_order'],
 
 			'订单统计' => ['ordercount_check'],
 		],

resources/views/detail/content.blade.php

@@ -413,7 +413,7 @@
         <p style="padding-left: 5px;">操作</p>
         <div class="tabs-box">
             <!-- 判断操作权限 -->
-            @if (($role == 1 || $role ==2) && $order_info['status'] == 1 && in_array('adjust_price', $userPerms)) 
+            @if (($role == 1 || $role ==2) && $order_info['status'] == 1 && in_array('check_order', $userPerms)) 
                 <a class="btn btn-success" href="{{URL('change', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">人工审单</a>
             @endif
                 <!-- <a href="{:U('account', 'order_id='.$order_info['order_id'])}" class="btn btn-default">账期设置</a> -->