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
fe2045cc
Commit
fe2045cc
authored
Aug 20, 2020
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
店铺统一传值appid
parent
482a3c3e
Pipeline
#10767
passed with stages
in 41 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
10 deletions
+28
-10
MediaController.php
app/Http/Controllers/Web/MediaController.php
+4
-2
header.blade.php
resources/views/admin/common/header.blade.php
+16
-3
left.blade.php
resources/views/admin/common/left.blade.php
+3
-2
index.blade.php
resources/views/admin/index.blade.php
+2
-1
media_list.blade.php
resources/views/admin/media/media_list.blade.php
+3
-2
No files found.
app/Http/Controllers/Web/MediaController.php
View file @
fe2045cc
...
...
@@ -32,7 +32,8 @@ class MediaController extends Controller
'page_size'
=>
'integer'
,
'start_time'
=>
'date'
,
'end_time'
=>
'date'
,
'category_id'
=>
''
'category_id'
=>
''
,
'appid'
=>
''
]);
$medias
=
MediaModel
::
mediaList
(
$request
);
...
...
@@ -44,7 +45,8 @@ class MediaController extends Controller
'media_name'
=>
$request
->
media_name
,
'media_id'
=>
$request
->
media_id
,
'STATUS'
=>
[
'启用'
,
'停用'
],
'category_id'
=>
$request
->
category_id
'category_id'
=>
$request
->
category_id
,
'appid'
=>
$request
->
appid
,
]);
}
...
...
resources/views/admin/common/header.blade.php
View file @
fe2045cc
...
...
@@ -134,7 +134,15 @@
{{--
<hr>
--}}
{{--
</li>
--}}
<li>
<a
rel=
"nofollow"
href=
"/web/logout"
class=
"dropdown-item"
>
<a
rel=
"nofollow"
href=
"/web/admin"
class=
"dropdown-item"
>
<div
class=
"notification"
>
<div
class=
"notification-content"
><i
class=
"fa fa-cog"
></i>
切换店铺
</div>
</div>
</a>
</li>
<li>
<a
rel=
"nofollow"
href=
"javascript:;"
class=
"dropdown-item"
onclick=
"logout();"
>
<div
class=
"notification"
>
<div
class=
"notification-content"
><i
class=
"fa fa-power-off"
></i>
退出
</div>
</div>
...
...
@@ -247,4 +255,10 @@
</nav>
</header>
<script
src=
"{{ asset('xadmin/js/language_002.js')}}"
></script>
\ No newline at end of file
<script>
function
logout
()
{
$
.
removeCookie
(
'media_category_id'
)
$
.
removeCookie
(
'appid'
)
window
.
location
.
href
=
"/web/logout"
;
}
</script>
resources/views/admin/common/left.blade.php
View file @
fe2045cc
...
...
@@ -11,7 +11,7 @@
<div
class=
"avatar"
><img
src=
" {{ asset('xadmin/img/avatar-1.jpg')}}"
alt=
"..."
class=
"img-fluid rounded-circle"
></div>
<div
class=
"title"
>
<h1
class=
"h4"
>
<?=
getAdmin
()
->
name
?>
</h1>
<h1
class=
"h4"
>
<?=
\Illuminate\Support\Facades\Auth
::
user
()
->
name
?>
</h1>
</div>
</div>
<hr>
...
...
@@ -170,7 +170,8 @@
function
redirectTo
(
url
){
var
category_id
=
$
.
cookie
(
'media_category_id'
);
window
.
location
.
href
=
url
+
'?category_id='
+
category_id
;
var
appid
=
$
.
cookie
(
'appid'
);
window
.
location
.
href
=
url
+
'?category_id='
+
category_id
+
'&appid='
+
appid
;
}
</script>
resources/views/admin/index.blade.php
View file @
fe2045cc
...
...
@@ -44,7 +44,7 @@
<li>
<a
rel=
"nofollow"
href=
"#"
class=
"dropdown-item"
>
<div
class=
"notification"
>
<div
class=
"notification-content"
><i
class=
"fa fa-
power-off
"
></i>
切换店铺
</div>
<div
class=
"notification-content"
><i
class=
"fa fa-
cog
"
></i>
切换店铺
</div>
</div>
</a>
</li>
...
...
@@ -117,6 +117,7 @@
<script>
function
important_task
(
url
,
category_id
,
appid
){
$
.
cookie
(
'media_category_id'
,
category_id
)
$
.
cookie
(
'appid'
,
appid
)
window
.
location
.
href
=
url
+
'?category_id='
+
category_id
+
'&appid='
+
appid
;
}
</script>
...
...
resources/views/admin/media/media_list.blade.php
View file @
fe2045cc
...
...
@@ -41,7 +41,8 @@
<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=
"请输入结束时间"
/>
<input
type=
"hidden"
name=
"category_id"
value=
"{{$category_id}}"
>
<input
type=
"hidden"
name=
"appid"
value=
"{{$appid}}"
>
<button
type=
"submit"
class=
"btn btn-primary"
>
搜索
</button>
</form>
<span
style=
"display: inline-block;height: 40px;line-height: 40px; float: right"
>
共{{$medias->total()}}条
</span>
...
...
@@ -96,7 +97,7 @@
<div
class=
"page"
>
<div>
{{$medias->appends(['media_name'=>$media_name,'start_time'=>$start_time,'end_time'=>$end_time,'media_id'=>$media_id])->links()}}
{{$medias->appends(['media_name'=>$media_name,'start_time'=>$start_time,'end_time'=>$end_time,'media_id'=>$media_id
,'category_id'=>$category_id,'appid' => $appid
])->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