Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuywap-node
·
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
毕凯
7 years ago
Commit
23757450bc6642da8a9b8e9048100a561d6417a6
2 parents
f7e0ae20
0dfd473e
Merge branch 'hotfix/individuation' into 'gray'
Hotfix/individuation See merge request
!1386
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
apps/activity/controllers/tide.js
apps/activity/models/tide.js
apps/activity/controllers/tide.js
View file @
2375745
...
...
@@ -9,6 +9,9 @@ exports.category = (req, res, next) => {
let
uid
=
req
.
user
.
uid
||
req
.
query
.
uid
;
let
params
=
{
uid
:
uid
,
port
:
1
,
channel
:
req
.
query
.
channel
,
season
:
req
.
query
.
season
,
isApp
:
req
.
yoho
.
isApp
,
scene
:
req
.
query
.
scene
||
1
};
...
...
@@ -42,6 +45,9 @@ exports.shop = (req, res, next) => {
let
uid
=
req
.
user
.
uid
||
req
.
query
.
uid
;
let
params
=
{
uid
:
uid
,
port
:
1
,
channel
:
req
.
query
.
channel
,
season
:
req
.
query
.
season
,
isApp
:
req
.
yoho
.
isApp
,
scene
:
req
.
query
.
scene
||
1
};
...
...
apps/activity/models/tide.js
View file @
2375745
...
...
@@ -78,7 +78,9 @@ class TideModel extends global.yoho.BaseModel {
crmRecommendShop
(
params
)
{
return
this
.
get
({
data
:
Object
.
assign
({
method
:
'app.product.crmRecommend.shop'
method
:
'app.product.crmRecommend.shop'
,
imageType
:
2
,
imageSize
:
'314*352'
,
},
params
)
});
}
...
...
@@ -121,7 +123,7 @@ class TideModel extends global.yoho.BaseModel {
});
}
if
(
shopInfo
.
shopId
||
_
.
get
(
res
[
1
],
'data.productList'
,
[]).
length
)
{
if
(
shopInfo
.
imageUrl
||
_
.
get
(
res
[
1
],
'data.productList'
,
[]).
length
)
{
tide
.
shopInfo
.
push
({
title
:
'# 为你精选 #'
,
shopInfo
:
shopInfo
,
...
...
Please
register
or
login
to post a comment