Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHO-ACTIVITY-PHP
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
hf
2015-11-04 05:15:35 +0800
Commit
99cce7badaf4893c7f261b0d7a5bd1d1a977269d
2 parents
258a20ff
c4464395
Merge branch 'develop' of
http://git.dev.yoho.cn/web/yohobuy
into develop
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
yohobuy/m.yohobuy.com/application/models/Category/Class.php
yohobuy/m.yohobuy.com/application/models/Product/List.php
yohobuy/m.yohobuy.com/application/models/Category/Class.php
View file @
99cce7b
...
...
@@ -46,7 +46,7 @@ class ClassModel
$oneClass
=
array
();
$item
=
array
();
foreach
(
$data
[
'data'
]
as
$k
=>
$v
)
{
$oneClass
=
array
(
'name'
=>
ucfirst
(
$k
),
'ca'
=>
array
());
$oneClass
=
array
(
'name'
=>
ucfirst
(
rtrim
(
$k
,
's'
)
),
'ca'
=>
array
());
foreach
(
$v
as
$val
)
{
$item
=
array
();
...
...
yohobuy/m.yohobuy.com/application/models/Product/List.php
View file @
99cce7b
...
...
@@ -89,7 +89,7 @@ class ListModel
// 获取品牌banner的数据, 有缓存1小时
$bannerData
=
BrandData
::
getBrandBanner
(
$id
);
if
(
isset
(
$bannerData
[
'data'
][
'banner'
]))
{
$result
[
'banner'
]
=
Helpers
::
getImageUrl
(
$bannerData
[
'data'
][
'banner'
],
640
,
75
);
$result
[
'banner'
]
=
Helpers
::
getImageUrl
(
$bannerData
[
'data'
][
'banner'
],
640
,
150
);
}
return
$result
;
...
...
Please
register
or
login
to post a comment