Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
media-resource
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨昕
media-resource
Commits
58876bf4
Commit
58876bf4
authored
Aug 20, 2020
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加控制权限页面
parent
fdf2f6e1
Pipeline
#10760
passed with stages
in 40 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
75 additions
and
17 deletions
+75
-17
MediaController.php
app/Http/Controllers/Web/MediaController.php
+17
-6
MediaRoute.php
app/Http/Routes/Web/MediaRoute.php
+1
-0
MediaModel.php
app/Model/MediaModel.php
+4
-8
media_category.json
public/media_category.json
+4
-3
control.blade.php
resources/views/admin/control.blade.php
+49
-0
No files found.
app/Http/Controllers/Web/MediaController.php
View file @
58876bf4
...
...
@@ -31,18 +31,20 @@ class MediaController extends Controller
'sort'
=>
''
,
'page_size'
=>
'integer'
,
'start_time'
=>
'date'
,
'end_time'
=>
'date'
,
'end_time'
=>
'date'
,
'category_id'
=>
''
]);
$medias
=
MediaModel
::
mediaList
(
$request
);
return
view
(
'admin.media.media_list'
,
[
'medias'
=>
$medias
,
'start_time'
=>
substr
(
$request
->
start_time
,
0
,
10
),
'end_time'
=>
substr
(
$request
->
end_time
,
0
,
10
),
'media_name'
=>
$request
->
media_name
,
'media_id'
=>
$request
->
media_id
,
'STATUS'
=>
[
'启用'
,
'停用'
],
'start_time'
=>
substr
(
$request
->
start_time
,
0
,
10
),
'end_time'
=>
substr
(
$request
->
end_time
,
0
,
10
),
'media_name'
=>
$request
->
media_name
,
'media_id'
=>
$request
->
media_id
,
'STATUS'
=>
[
'启用'
,
'停用'
],
'category_id'
=>
$request
->
category_id
]);
}
...
...
@@ -157,4 +159,13 @@ class MediaController extends Controller
}
/**
*
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public
function
media_command
(){
return
view
(
'admin.control'
);
}
}
app/Http/Routes/Web/MediaRoute.php
View file @
58876bf4
...
...
@@ -15,6 +15,7 @@ class MediaRoute extends AuthenRoute
public
function
map
(
Registrar
$router
,
$callback
){
parent
::
map
(
$router
,
function
()
use
(
$router
){
$router
->
resource
(
'media_model'
,
'MediaController'
);
$router
->
get
(
'media_command'
,
'MediaController@media_command'
);
});
}
...
...
app/Model/MediaModel.php
View file @
58876bf4
...
...
@@ -63,14 +63,16 @@ class MediaModel extends Eloquent
$aggregate
[][
'$match'
][
'_id'
]
=
$request
->
media_id
;
}
if
(
isset
(
$request
->
category_id
)
&&
!
empty
(
$request
->
category_id
)){
$aggregate
[][
'$match'
][
'media_type_id'
]
=
$request
->
category_id
;
}
// $aggregate[]['$match']['_id'] = 'mda-864371b9a82d1e21';
if
(
isset
(
$request
->
media_name
)
&&
!
empty
(
$request
->
media_name
)){
$aggregate
[][
'$match'
][
'media_name'
]
=
[
'$regex'
=>
addslashes
(
$request
->
media_name
)
];
}
if
(
isset
(
$request
->
username
)
&&
!
empty
(
$request
->
username
)){
$aggregate
[][
'$match'
][
'username'
]
=
$request
->
username
;
}
...
...
@@ -80,18 +82,12 @@ class MediaModel extends Eloquent
}
if
(
isset
(
$request
->
start_time
)
&&
!
empty
(
$request
->
start_time
)){
$start_time
=
new
UTCDateTime
(
strtotime
(
$request
->
start_time
)
*
1000
);
$aggregate
[][
'$match'
][
'start_time'
]
=
[
'$gt'
=>
$start_time
];
}
if
(
isset
(
$request
->
end_time
)
&&
!
empty
(
$request
->
end_time
)){
$end_time
=
new
UTCDateTime
(
strtotime
(
$request
->
end_time
)
*
1000
);;
$aggregate
[][
'$match'
][
'end_time'
]
=
[
'$lt'
=>
$end_time
];
}
...
...
public/media_category.json
View file @
58876bf4
...
...
@@ -15,11 +15,11 @@
"pid"
:
0
,
"name"
:
"媒体资源上传"
,
"icon"
:
""
,
"link"
:
"/m
anager
"
,
"slug"
:
"m
anager
"
,
"link"
:
"/m
edia_command
"
,
"slug"
:
"m
edia_command
"
,
"description"
:
""
,
"show"
:
1
,
"sort"
:
2
,
"key_name"
:
"m
anager_media
"
,
"key_name"
:
"m
edia_command
"
,
"son"
:
[]
}]
\ No newline at end of file
resources/views/admin/control.blade.php
0 → 100644
View file @
58876bf4
<!DOCTYPE html>
<html>
@include('admin.common.commonMedia')
<body>
<!--====================================================
MAIN NAVBAR
======================================================-->
@include('admin.common.header')
<!--====================================================
PAGE CONTENT
======================================================-->
<div
class=
"page-content d-flex align-items-stretch"
>
<!--***** SIDE NAVBAR *****-->
@include('admin.common.left')
<div
class=
"content-inner"
>
<div
class=
"control"
>
模块开发中
</div>
</div>
</div>
<!--Global Javascript -->
@include('admin.common.foot')
<style>
.control
{
text-align
:
center
;
line-height
:
200px
;
min-height
:
200px
;
font-size
:
20px
;
}
</style>
</body>
</html>
\ No newline at end of file
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