Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
fashion_group
Project
Project
Details
Activity
Releases
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
章建武
fashion_group
Commits
d304f8a0
Commit
d304f8a0
authored
Jun 08, 2020
by
章建武
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dep
parent
4000046d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
7 deletions
+11
-7
ArticleController.php
app/Http/Controllers/Index/ArticleController.php
+5
-0
GroupCultureController.php
app/Http/Controllers/Index/GroupCultureController.php
+0
-1
index.blade.php
resources/views/Index/group_culture/index.blade.php
+6
-6
No files found.
app/Http/Controllers/Index/ArticleController.php
View file @
d304f8a0
...
@@ -37,16 +37,19 @@ class ArticleController extends Controller
...
@@ -37,16 +37,19 @@ class ArticleController extends Controller
$news_center
=
ArticleInfo
::
query
()
$news_center
=
ArticleInfo
::
query
()
->
where
(
'type'
,
'='
,
1
)
->
where
(
'type'
,
'='
,
1
)
->
where
(
'language_type'
,
'='
,
$language_type
)
->
where
(
'language_type'
,
'='
,
$language_type
)
->
where
(
'status'
,
'='
,
0
)
->
orderBy
(
'num'
,
'desc'
)
->
orderBy
(
'num'
,
'desc'
)
->
first
();
->
first
();
$news_center2
=
ArticleInfo
::
query
()
$news_center2
=
ArticleInfo
::
query
()
->
where
(
'type'
,
'='
,
4
)
->
where
(
'type'
,
'='
,
4
)
->
where
(
'language_type'
,
'='
,
$language_type
)
->
where
(
'language_type'
,
'='
,
$language_type
)
->
where
(
'status'
,
'='
,
0
)
->
orderBy
(
'num'
,
'desc'
)
->
orderBy
(
'num'
,
'desc'
)
->
first
();
->
first
();
$group_news1
=
ArticleInfo
::
query
()
->
where
(
'type'
,
'='
,
NewsType
::
GROUP_NEWS
)
$group_news1
=
ArticleInfo
::
query
()
->
where
(
'type'
,
'='
,
NewsType
::
GROUP_NEWS
)
->
orderBy
(
'num'
,
'asc'
)
->
orderBy
(
'num'
,
'asc'
)
->
where
(
'language_type'
,
'='
,
$language_type
)
->
where
(
'language_type'
,
'='
,
$language_type
)
->
where
(
'status'
,
'='
,
0
)
->
limit
(
3
)
->
get
();
->
limit
(
3
)
->
get
();
$group_news2
=
ArticleInfo
::
query
()
$group_news2
=
ArticleInfo
::
query
()
...
@@ -58,10 +61,12 @@ class ArticleController extends Controller
...
@@ -58,10 +61,12 @@ class ArticleController extends Controller
->
limit
(
2
)
->
get
();
->
limit
(
2
)
->
get
();
// dd($language_type);
// dd($language_type);
$item_trends
=
ArticleInfo
::
query
()
->
where
(
'type'
,
'='
,
NewsType
::
ITEM_TRENDS
)
$item_trends
=
ArticleInfo
::
query
()
->
where
(
'type'
,
'='
,
NewsType
::
ITEM_TRENDS
)
->
where
(
'status'
,
'='
,
0
)
->
where
(
'language_type'
,
'='
,
$language_type
)
->
where
(
'language_type'
,
'='
,
$language_type
)
->
orderBy
(
'num'
,
'asc'
)
->
orderBy
(
'num'
,
'asc'
)
->
limit
(
2
)
->
get
();
->
limit
(
2
)
->
get
();
$item_trends2
=
ArticleInfo
::
query
()
->
where
(
'type'
,
'='
,
NewsType
::
ITEM_TRENDS
)
$item_trends2
=
ArticleInfo
::
query
()
->
where
(
'type'
,
'='
,
NewsType
::
ITEM_TRENDS
)
->
where
(
'status'
,
'='
,
0
)
->
where
(
'language_type'
,
'='
,
$language_type
)
->
where
(
'language_type'
,
'='
,
$language_type
)
// ->whereNotIn('id', $item_trends->pluck('id')->toArray())
// ->whereNotIn('id', $item_trends->pluck('id')->toArray())
->
orderBy
(
'num'
,
'asc'
)
->
orderBy
(
'num'
,
'asc'
)
...
...
app/Http/Controllers/Index/GroupCultureController.php
View file @
d304f8a0
...
@@ -57,7 +57,6 @@ class GroupCultureController extends Controller
...
@@ -57,7 +57,6 @@ class GroupCultureController extends Controller
$data1
=
GroupCulture
::
query
()
->
where
(
'type'
,
'='
,
1
)
->
where
(
$where
)
->
orderBy
(
'id'
,
'desc'
)
->
first
();
$data1
=
GroupCulture
::
query
()
->
where
(
'type'
,
'='
,
1
)
->
where
(
$where
)
->
orderBy
(
'id'
,
'desc'
)
->
first
();
$data2
=
GroupCulture
::
query
()
->
where
(
'type'
,
'='
,
2
)
->
where
(
$where
)
->
orderBy
(
'id'
,
'desc'
)
->
first
();
$data2
=
GroupCulture
::
query
()
->
where
(
'type'
,
'='
,
2
)
->
where
(
$where
)
->
orderBy
(
'id'
,
'desc'
)
->
first
();
$data3
=
GroupCulture
::
query
()
->
where
(
'type'
,
'='
,
3
)
->
where
(
$where
)
->
orderBy
(
'id'
,
'desc'
)
->
first
();
$data3
=
GroupCulture
::
query
()
->
where
(
'type'
,
'='
,
3
)
->
where
(
$where
)
->
orderBy
(
'id'
,
'desc'
)
->
first
();
return
view
(
'Index.group_culture.index'
)
return
view
(
'Index.group_culture.index'
)
->
with
(
compact
(
'data1'
))
->
with
(
compact
(
'data1'
))
->
with
(
compact
(
'data2'
))
->
with
(
compact
(
'data2'
))
...
...
resources/views/Index/group_culture/index.blade.php
View file @
d304f8a0
...
@@ -23,13 +23,13 @@
...
@@ -23,13 +23,13 @@
<div class="
culture
-
item1
-
b
">
<div class="
culture
-
item1
-
b
">
<ul class="
clearfix
">
<ul class="
clearfix
">
@if(
$language_type
== 1)
@if(
$language_type
== 1)
<li class="
culture
-
item1
-
b1
"><a href="
{{
route
(
'enfashion_city'
)}}
"><p>
Fashion and city
</p><img src="
{{
$data1
->
url
}}{{
$data1
->
pic_path
}}
"></a></li>
<li class="
culture
-
item1
-
b1
"><a href="
{{
route
(
'enfashion_city'
)}}
"><p>
{
{$data1->title}
}
</p><img src="
{{
$data1
->
url
}}{{
$data1
->
pic_path
}}
"></a></li>
<li class="
culture
-
item1
-
b2
"><a href="
{{
route
(
'enfashion_safety'
)
}}
"><p>
Fashion and safet
y</p><img src="
{{
$data2
->
url
}}{{
$data2
->
pic_path
}}
"></a></li>
<li class="
culture
-
item1
-
b2
"><a href="
{{
route
(
'enfashion_safety'
)
}}
"><p>
{
{$data2->title}
}
y</p><img src="
{{
$data2
->
url
}}{{
$data2
->
pic_path
}}
"></a></li>
<li class="
culture
-
item1
-
b3
"><a href="
{{
route
(
'enpublic_welfare'
)
}}
"><p>
Fashion and public welfare
</p><img src="
{{
$data3
->
url
}}{{
$data3
->
pic_path
}}
"></a></li>
<li class="
culture
-
item1
-
b3
"><a href="
{{
route
(
'enpublic_welfare'
)
}}
"><p>
{
{$data3->title}
}
</p><img src="
{{
$data3
->
url
}}{{
$data3
->
pic_path
}}
"></a></li>
@else
@else
<li class="
culture
-
item1
-
b1
"><a href="
{{
route
(
'fashion_city'
)}}
"><p>
时尚与城市
</p><img src="
{{
$data1
->
url
}}{{
$data1
->
pic_path
}}
"></a></li>
<li class="
culture
-
item1
-
b1
"><a href="
{{
route
(
'fashion_city'
)}}
"><p>
{
{$data1->title}
}
</p><img src="
{{
$data1
->
url
}}{{
$data1
->
pic_path
}}
"></a></li>
<li class="
culture
-
item1
-
b2
"><a href="
{{
route
(
'fashion_safety'
)
}}
"><p>
时尚与安全
</p><img src="
{{
$data2
->
url
}}{{
$data2
->
pic_path
}}
"></a></li>
<li class="
culture
-
item1
-
b2
"><a href="
{{
route
(
'fashion_safety'
)
}}
"><p>
{
{$data2->title}
}
</p><img src="
{{
$data2
->
url
}}{{
$data2
->
pic_path
}}
"></a></li>
<li class="
culture
-
item1
-
b3
"><a href="
{{
route
(
'public_welfare'
)
}}
"><p>
时尚与公益
</p><img src="
{{
$data3
->
url
}}{{
$data3
->
pic_path
}}
"></a></li>
<li class="
culture
-
item1
-
b3
"><a href="
{{
route
(
'public_welfare'
)
}}
"><p>
{
{$data3->title}
}
</p><img src="
{{
$data3
->
url
}}{{
$data3
->
pic_path
}}
"></a></li>
@endif
@endif
</ul>
</ul>
...
...
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