Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
2
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
hf
10 years ago
Commit
ab8c06a3d196f0014a85529f77b4eecf05499c78
2 parents
11a92e3f
92762cc2
Merge branch 'develop' of
http://git.dev.yoho.cn/web/yohobuy
into develop
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
template/m.yohobuy.com/partials/layout/use.phtml
yohobuy/m.yohobuy.com/application/modules/Product/controllers/Index.php
template/m.yohobuy.com/partials/layout/use.phtml
View file @
ab8c06a
...
...
@@ -164,6 +164,7 @@
{{#if searchPage}}
<script>
seajs.use('js/index/search');
seajs.use('js/index/footer');
</script>
{{/if}}
...
...
yohobuy/m.yohobuy.com/application/modules/Product/controllers/Index.php
View file @
ab8c06a
...
...
@@ -117,7 +117,7 @@ class IndexController extends AbstractAction
$data
[
'showDownloadApp'
]
=
true
;
// 从搜索页过来的,显示搜索框, 和进入品牌引导信息
if
(
$from
===
'search'
)
{
$data
[
'goodList'
]
=
Product\ListModel
::
getBrandData
(
$condition
,
$title
);
$data
[
'goodList'
]
=
array
(
);
$data
[
'goodList'
][
'brandWay'
]
=
false
;
$data
[
'goodList'
][
'search'
][
'default'
]
=
$query
;
$data
[
'goodList'
][
'search'
][
'url'
]
=
Helpers
::
url
(
''
,
null
,
'search'
);
...
...
@@ -125,7 +125,7 @@ class IndexController extends AbstractAction
// 品牌一览过来的展示品牌介绍和LOGO
else
{
$data
[
'brandHome'
]
=
Product\ListModel
::
getBrandIntro
(
$brandIds
[
0
],
$uid
,
$title
);
$data
[
'goodList'
]
=
Product\ListModel
::
getBrandData
(
$condition
,
$title
);
$data
[
'goodList'
]
=
array
(
);
}
$data
[
'goodList'
]
+=
$condition
;
...
...
Please
register
or
login
to post a comment