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
512a12a2
Commit
512a12a2
authored
Sep 01, 2020
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改编辑媒资页面
parent
0301b12e
Pipeline
#11020
passed with stages
in 46 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
24 deletions
+31
-24
MediaController.php
app/Http/Controllers/Web/MediaController.php
+2
-4
MediaModel.php
app/Model/MediaModel.php
+1
-1
media_edit.blade.php
resources/views/admin/media/media_edit.blade.php
+26
-18
media_list.blade.php
resources/views/admin/media/media_list.blade.php
+2
-1
No files found.
app/Http/Controllers/Web/MediaController.php
View file @
512a12a2
...
...
@@ -47,7 +47,8 @@ class MediaController extends Controller
'STATUS'
=>
[
'启用'
,
'停用'
],
'category_id'
=>
$request
->
category_id
,
'appid'
=>
$request
->
appid
,
'page_size'
=>
$request
->
page_size
'page_size'
=>
$request
->
page_size
,
'username'
=>
$request
->
username
,
]);
}
...
...
@@ -66,12 +67,9 @@ class MediaController extends Controller
$media
=
handler_drive
(
function
()
use
(
$request
,
$id
){
return
MediaModel
::
getMediaDetail
(
$id
);
});
$media_types
=
MediaCategoryModel
::
get
()
->
toArray
();
return
view
(
'admin.media.media_edit'
,
[
'media'
=>
$media
,
'media_types'
=>
$media_types
]);
}
...
...
app/Model/MediaModel.php
View file @
512a12a2
...
...
@@ -75,7 +75,7 @@ class MediaModel extends Eloquent
}
if
(
isset
(
$request
->
username
)
&&
!
empty
(
$request
->
username
)){
$aggregate
[][
'$match'
][
'username'
]
=
$request
->
username
;
$aggregate
[][
'$match'
][
'username'
]
=
[
'$regex'
=>
addslashes
(
$request
->
username
)
]
;
}
if
(
isset
(
$request
->
description
)
&&
!
empty
(
$request
->
description
)){
...
...
resources/views/admin/media/media_edit.blade.php
View file @
512a12a2
...
...
@@ -54,24 +54,26 @@
</div>
</div>
<div
class=
"form-group"
>
<label
for=
"exampleSelect1"
>
媒资类别
</label>
<select
class=
"form-control"
id=
"exampleSelect1"
name=
"media_type"
>
@foreach($media_types as $media_type)
@if($media_type['name'] == $media['media_type'])
<option
value=
"{{$media_type['_id']}}"
selected
>
{{$media_type['name']}}
</option>
@else
<option
value=
"{{$media_type['_id']}}"
>
{{$media_type['name']}}
</option>
@endif
<div
class=
"form-group"
>
<label
for=
"media_name"
>
添加人:
</label>
<div
class=
"input-group "
>
<div
class=
"input-group-addon"
><i
class=
"icon iconfont icon-title"
>

</i></div>
<input
type=
"text"
class=
"form-control"
name=
"username"
id=
"username"
placeholder=
"添加人"
value=
"{{$media['username']}}"
disabled
>
</div>
</div>
@endforeach
<div
class=
"form-group"
>
<label
for=
"media_type"
>
媒资类别
</label>
<div
class=
"input-group "
>
<div
class=
"input-group-addon"
><i
class=
"icon iconfont icon-title"
>

</i></div>
<input
type=
"text"
class=
"form-control"
id=
"media_type"
placeholder=
"媒资类别"
value=
"{{$media['media_type']}}"
disabled
>
</div>
</select>
</div>
{{--
<div
class=
"form-group"
>
--}}
{{--
<label
for=
"mobile"
>
电话号码
</label>
--}}
{{--
<div
class=
"input-group "
>
--}}
...
...
@@ -82,7 +84,7 @@
{{--
</div>
--}}
<div
class=
"form-group"
>
<label
for=
"m
obile
"
>
媒资视频链接
</label>
<label
for=
"m
edia_url
"
>
媒资视频链接
</label>
<div
class=
"input-group "
>
<div
class=
"input-group-addon"
><i
class=
"iconfont"
>

</i></div>
<input
type=
"text"
class=
"form-control"
name=
"media_url"
id=
"media_url"
disabled
value=
"{{$media['media_url']}}"
...
...
@@ -91,16 +93,22 @@
</div>
<div
class=
"form-group"
>
<label
class=
"access-key"
>
公钥
</label>
<textarea
class=
"form-control"
name=
"access_key"
id=
"access-key"
rows=
"5"
placeholder=
"公钥"
>
{{$media['access_key']}}
</textarea>
</div>
{{--
<div
class=
"form-group"
>
--}}
{{--
<label
class=
"access-key"
>
公钥
</label>
--}}
{{--
<textarea
class=
"form-control"
name=
"access_key"
id=
"access-key"
rows=
"5"
placeholder=
"公钥"
>
{{$media['access_key']}}
</textarea>
--}}
{{--
</div>
--}}
<div
class=
"form-group"
>
<label
class=
"secret-key"
>
私钥
</label>
<textarea
disabled
class=
"form-control"
name=
"secret_key"
id=
"secret-key"
rows=
"5"
placeholder=
"私钥"
>
{{$media['secret_key']}}
</textarea>
</div>
<div
class=
"form-group"
>
<label
for=
"description"
>
描述
</label>
<input
type=
"text"
class=
"form-control"
name=
"description"
id=
"description"
value=
"{{$media['description']}}"
placeholder=
"描述"
>
</div>
<button
type=
"submit"
onclick=
"registerUser();"
class=
"btn btn-general btn-blue mr-2"
>
确认
</button>
<button
type=
"reset"
onclick=
"cancle()"
class=
"btn btn-general btn-white"
>
取消
</button>
</form>
...
...
resources/views/admin/media/media_list.blade.php
View file @
512a12a2
...
...
@@ -38,6 +38,7 @@
<form>
<input
type=
"text"
name=
"media_name"
class=
"form-input"
placeholder=
"请输入媒资名称"
value=
"{{$media_name}}"
autocomplete=
"off"
>
<input
type=
"text"
name=
"username"
class=
"form-input"
placeholder=
"请输入创建人"
value=
"{{$username}}"
autocomplete=
"off"
>
<input
type=
"text"
style=
"width: 200px;"
name=
"media_id"
class=
"form-input"
placeholder=
"请输入媒资编号"
value=
"{{$media_id}}"
autocomplete=
"off"
>
<input
class=
"form-input"
name=
"start_time"
data-toggle=
"start_time"
autocomplete=
"off"
value=
"{{$start_time}}"
placeholder=
"请输入开始时间"
/>
<input
class=
"form-input"
name=
"end_time"
data-toggle=
"end_time"
autocomplete=
"off"
value=
"{{$end_time}}"
placeholder=
"请输入结束时间"
/>
...
...
@@ -97,7 +98,7 @@
<div
class=
"page"
>
<div>
{{$medias->appends(['media_name'=>$media_name,'start_time'=>$start_time,'end_time'=>$end_time,'media_id'=>$media_id,'category_id'=>$category_id,'appid' => $appid ,'page_size' => $page_size])->links()}}
{{$medias->appends(['media_name'=>$media_name,'
username' => $username,'
start_time'=>$start_time,'end_time'=>$end_time,'media_id'=>$media_id,'category_id'=>$category_id,'appid' => $appid ,'page_size' => $page_size])->links()}}
</div>
</div>
</div>
...
...
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