Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yoho-blk
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
1
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
姜枫
2016-08-23 14:44:59 +0800
Commit
62deb03ee40a54852eefe6fc5d2deccd65b61f6a
1 parent
8c6533a6
fix style
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletions
apps/product/controllers/shop.js
apps/product/models/shop-service.js
apps/product/controllers/shop.js
View file @
62deb03
...
...
@@ -105,6 +105,7 @@ const shop = {
q
.
order
=
q
.
order
||
's_n_desc'
;
q
.
page
=
parseInt
(
q
.
page
||
1
,
10
);
// q.yh_channel = channel;
ShopData
.
getShopHeadData
(
domain
,
shopId
,
uid
).
then
(
result
=>
{
...
...
apps/product/models/shop-service.js
View file @
62deb03
...
...
@@ -170,7 +170,7 @@ const ShopService = {
if
(
!
info
.
isFavorite
&&
brandInfo
.
isFavorite
===
'Y'
)
{
favType
=
'brand'
;
}
info
.
isFavorite
=
info
.
isFavorite
||
(
brandInfo
.
isFavorite
===
'Y'
)
info
.
isFavorite
=
info
.
isFavorite
||
(
brandInfo
.
isFavorite
===
'Y'
)
;
info
.
banner
=
info
.
banner
||
info
.
brandBanner
;
}
info
.
favType
=
favType
;
...
...
Please
register
or
login
to post a comment