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
Email Patches
Plain Diff
Browse Files
Authored by
yangyang
9 years ago
Commit
d3f74f18e00c4b2c82a9f64741f2a40112719e81
1 parent
de083ca8
修改小bug
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
6 deletions
yohobuy/www.yohobuy.com/application/models/Product/Brands.php
yohobuy/www.yohobuy.com/application/modules/Product/controllers/Index.php
yohobuy/www.yohobuy.com/application/modules/Product/controllers/Sale.php
yohobuy/www.yohobuy.com/application/models/Product/Brands.php
View file @
d3f74f1
...
...
@@ -95,9 +95,8 @@ class BrandsModel {
$bannerImg
=
Helpers
::
getImageUrl
(
$bannerImg
[
'data'
][
'banner'
],
''
,
150
);
}
// 根据品牌Id获取品牌(简介)、收藏
if
(
isset
(
$uid
))
{
$intro
=
BrandData
::
getBrandIntro
(
$brandId
,
$uid
);
}
$intro
=
BrandData
::
getBrandIntro
(
$brandId
,
$uid
);
$is_favorite
=
false
;
$shopName
=
false
;
if
(
isset
(
$intro
[
'data'
])){
...
...
yohobuy/www.yohobuy.com/application/modules/Product/controllers/Index.php
View file @
d3f74f1
<?php
use
Action\WebAction
;
use
Product\BrandsModel
;
use
LibModels\Web\Product\BrandData
;
class
IndexController
extends
WebAction
{
...
...
yohobuy/www.yohobuy.com/application/modules/Product/controllers/Sale.php
View file @
d3f74f1
...
...
@@ -14,7 +14,6 @@ class SaleController extends WebAction
{
//获取专区ID
$specialsaleId
=
$this
->
param
(
'specialsaleId'
);
$specialsaleId
=
1
;
//测试数据
$specialInfo
=
SaleData
::
getSpecial
(
$specialsaleId
);
$special
=
$specialInfo
[
'data'
];
...
...
@@ -61,7 +60,7 @@ class SaleController extends WebAction
//传促销id
if
(
!
empty
(
$special
[
'ispromotion'
])){
//
$condition['promotion'] = $special['ispromotion'];
$condition
[
'promotion'
]
=
$special
[
'ispromotion'
];
}
else
{
$condition
[
'promotion'
]
=
$promotion
;
}
...
...
Please
register
or
login
to post a comment