Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
朱继来
/
后台订单管理
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
6fff29ed
authored
Nov 10, 2018
by
朱继来
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'zjl_adjust_20181026' into development
parents
cbbc3f46
092d0dbb
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
8 deletions
app/Http/Controllers/AddOrderController.php
app/Http/Controllers/OrderController.php
app/Http/Controllers/OrderCountController.php
app/Http/Controllers/WebController.php
app/Http/Controllers/AddOrderController.php
View file @
6fff29ed
...
...
@@ -90,9 +90,13 @@ Class AddOrderController extends Controller
$perm
=
new
PermController
;
// 用户角色
$role
=
$perm
->
getUserRole
(
$request
);
// 获取权限菜单
if
(
$request
->
user
->
email
!=
'admin@ichunt.com'
&&
$request
->
user
->
userId
!=
1000
)
$menus
=
$perm
->
getPermMenu
(
$request
,
$menus
);
if
(
$role
!=
1
)
{
$menus
=
$perm
->
getPermMenu
(
$menus
,
$request
->
user
->
userId
);
}
$data
=
[
'header'
=>
$request
->
user
->
header
,
...
...
app/Http/Controllers/OrderController.php
View file @
6fff29ed
...
...
@@ -324,9 +324,13 @@ Class OrderController extends Controller
$perm
=
new
PermController
;
// 用户角色
$role
=
$perm
->
getUserRole
(
$request
);
// 获取权限菜单
if
(
$request
->
user
->
email
!=
'admin@ichunt.com'
&&
$request
->
user
->
userId
!=
1000
)
$menus
=
$perm
->
getPermMenu
(
$request
,
$menus
);
if
(
$role
!=
1
)
{
$menus
=
$perm
->
getPermMenu
(
$menus
,
$request
->
user
->
userId
);
}
$data
=
[
'header'
=>
$request
->
user
->
header
,
...
...
app/Http/Controllers/OrderCountController.php
View file @
6fff29ed
...
...
@@ -89,9 +89,13 @@ Class OrderCountController extends Controller
$perm
=
new
PermController
;
// 用户角色
$role
=
$perm
->
getUserRole
(
$request
);
// 获取权限菜单
if
(
$request
->
user
->
email
!=
'admin@ichunt.com'
&&
$request
->
user
->
userId
!=
1000
)
$menus
=
$perm
->
getPermMenu
(
$request
,
$menus
);
if
(
$role
!=
1
)
{
$menus
=
$perm
->
getPermMenu
(
$menus
,
$request
->
user
->
userId
);
}
$data
=
[
'header'
=>
$request
->
user
->
header
,
...
...
app/Http/Controllers/WebController.php
View file @
6fff29ed
...
...
@@ -69,9 +69,13 @@ class WebController extends Controller
$perm
=
new
PermController
();
// 用户角色
$role
=
$perm
->
getUserRole
(
$request
);
// 获取权限菜单
if
(
$request
->
user
->
email
!=
'admin@ichunt.com'
&&
$request
->
user
->
userId
!=
1000
)
$menus
=
$perm
->
getPermMenu
(
$request
,
$menus
);
if
(
$role
!=
1
)
{
$menus
=
$perm
->
getPermMenu
(
$menus
,
$request
->
user
->
userId
);
}
$data
=
[
'header'
=>
$request
->
user
->
header
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment