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
Email Patches
Plain Diff
Browse Files
Authored by
zhangxiaoru
9 years ago
Commit
b25feae0569c69281295900b74fb0d3ce9e15c66
1 parent
bfd69fdb
favorite
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
9 additions
and
12 deletions
apps/home/controllers/favorite.js
apps/home/controllers/myCurrency.js
apps/home/controllers/suggest.js
apps/home/models/suggest.js
apps/home/views/action/suggest.hbs
apps/product/controllers/recom.js
public/js/home/favorite.page.js
public/scss/home/_favorite.css
public/scss/me/_fav.css
apps/home/controllers/favorite.js
View file @
b25feae
...
...
@@ -27,10 +27,12 @@ const favorite = (req, res) => {
};
let
favProduct
=
(
req
,
res
,
next
)
=>
{
let
uid
=
req
.
user
.
uid
;
let
uid
=
req
.
user
.
uid
||
5987341
;
let
page
=
req
.
query
.
page
||
1
;
let
limit
=
10
;
console
.
log
(
uid
)
favoriteModel
.
favProduct
(
uid
,
page
,
limit
).
then
((
result
)
=>
{
if
(
typeof
(
result
.
total
)
===
'undefined'
&&
typeof
(
result
.
more
)
===
'undefined'
)
{
...
...
@@ -45,7 +47,7 @@ let favProduct = (req, res, next) => {
};
let
favfavBrand
=
(
req
,
res
,
next
)
=>
{
let
uid
=
req
.
user
.
uid
;
let
uid
=
req
.
user
.
uid
||
8039759
;
let
page
=
req
.
query
.
page
||
1
;
let
limit
=
10
;
...
...
apps/home/controllers/myCurrency.js
View file @
b25feae
...
...
@@ -14,8 +14,6 @@ const myCurrency = (req, res, next) => {
let
uid
=
req
.
user
.
uid
||
8039759
;
let
contentCode
=
'05afedf76886d732573f10f7451a1703'
;
// let gender = req.query.gender || '3,3';
myCurrencyModel
.
myCurrency
(
uid
,
contentCode
).
then
(
result
=>
{
res
.
render
(
'currency-new'
,
{
...
...
apps/home/controllers/suggest.js
View file @
b25feae
...
...
@@ -21,7 +21,7 @@ const suggestData = (req, res, next) => {
module
:
'home'
,
page
:
'suggest'
,
pageHeader
:
_
.
assign
(
headerModel
.
setNav
({
navTitle
:
'
有货币
'
navTitle
:
'
意见反馈
'
}),
{
navBtn
:
false
}),
...
...
apps/home/models/suggest.js
View file @
b25feae
...
...
@@ -21,7 +21,7 @@ const suggestData = (udid, page, limit) => {
page
:
page
,
limit
:
limit
}).
then
((
result
)
=>
{
// console.log(result)
if
(
result
&&
result
.
code
===
200
)
{
_
.
forEach
(
result
.
data
.
list
,
function
(
data
)
{
...
...
@@ -31,7 +31,6 @@ const suggestData = (udid, page, limit) => {
none
:
data
.
is_reliable
===
0
});
});
return
camelCase
(
result
.
data
.
list
);
}
else
{
logger
.
error
(
'收藏商品 cood 不是 200'
);
...
...
apps/home/views/action/suggest.hbs
View file @
b25feae
...
...
@@ -16,7 +16,7 @@
<div
class=
"suggest-item"
data-id=
"
{{
id
}}
"
>
{{#if
coverImage
}}
<div
class=
"suggest-item-img"
>
<img
class=
"lazy"
data-original=
"
{{
coverImage
}}
"
alt=
""
/>
<img
class=
"lazy"
data-original=
"
{{
coverImage
Url
}}
"
alt=
""
/>
</div>
{{/if}}
<h2>
{{
filterContent
}}
</h2>
...
...
apps/product/controllers/recom.js
View file @
b25feae
...
...
@@ -19,7 +19,6 @@ const mayLike = (req, res, next) => {
if
(
channel
===
1
||
channel
===
2
)
{
mayLikeModel
.
mayLike
(
uid
,
page
,
limit
,
gender
,
udid
,
recPos
,
channel
).
then
((
result
)
=>
{
console
.
log
(
recPos
);
res
.
render
(
'recom/goods'
,
Object
.
assign
({
layout
:
false
...
...
public/js/home/favorite.page.js
View file @
b25feae
...
...
@@ -97,7 +97,6 @@ function loadData($parent, url, page) {
$parent
.
closest
(
'.fav-type'
).
find
(
'.fav-null-box'
).
removeClass
(
'hide'
);
window
.
rePosFooter
();
}
else
if
(
data
.
more
===
true
)
{
console
.
log
(
0
);
// 处理data等于end时如果loadingMask存在且没有hide样式的情况
if
(
$loadingMask
&&
!
$loadingMask
.
hasClass
(
'hide'
))
{
...
...
public/scss/home/_favorite.css
View file @
b25feae
...
...
@@ -345,6 +345,6 @@
position
:
absolute
;
top
:
50%
;
left
:
0
;
margin-top
:
-1
rem
;
margin-top
:
9.5
rem
;
}
}
...
...
public/scss/me/_fav.css
View file @
b25feae
...
...
@@ -350,6 +350,6 @@
position
:
absolute
;
top
:
50%
;
left
:
0
;
margin-top
:
-1
rem
;
margin-top
:
9.5
rem
;
}
}
...
...
Please
register
or
login
to post a comment