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
biao
9 years ago
Commit
dea72e1a346147db353a36eebad3e3cf7a403b97
2 parents
1be684e4
79911d46
Merge branch 'release/4.4' of
http://git.dev.yoho.cn/web/yohobuy
into release/4.4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
1 deletions
yohobuy/www.yohobuy.com/application/models/Product/Shop.php
yohobuy/www.yohobuy.com/application/models/Product/Shop.php
View file @
dea72e1
...
...
@@ -101,7 +101,6 @@ class ShopModel
array
(
'href'
=>
''
,
'name'
=>
$data
[
'brandIntro'
][
'brandName'
],
'title'
=>
$data
[
'brandIntro'
][
'brandName'
])
)
);
//print_r($result['opts']);
$sort
=
self
::
getSort
(
$res
[
'sort'
],
$parameters
[
'options'
][
'misort'
],
$shopId
);
$searchCondition
[
'userInput'
]
=
empty
(
$searchCondition
[
'userInput'
])
?
array
()
:
$searchCondition
[
'userInput'
];
$param
=
array_merge
(
$searchCondition
[
'userInput'
],
array
(
'navBar'
=>
1
));
...
...
Please
register
or
login
to post a comment