Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_form_resubmit_20191113

app/Http/Controllers/OrderController.php

@@ -383,8 +383,8 @@ Class OrderController extends Controller
         $info = $this->getOrderInfo($request, 1);
         $info['title'] = '订单列表';
 
-        // 若为京东自营、自营客服角色，则跳转到自营列表
-        if (in_array($info['role'], [6, 7, 11, 12])) {
+        // 若为京东自营、自营客服等角色，则跳转到自营列表
+        if (in_array($info['role'], Config('perm_args.self_roles'))) {
             return redirect('self_order');
         }
 

config/perm_args.php

@@ -64,4 +64,7 @@ return [
 		(object)['userId'=>1582, 'name'=>'滕欢欢', 'status'=>0],
 	],
 
+	// 自营角色 无法查看联营订单
+	'self_roles' => [6, 7, 10, 11, 12],
+
 ];