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
王水玲
7 years ago
Commit
343d850647f545a7ec7027ce0f28469c2513ca95
1 parent
0dfa9a1b
活动模版bug 修改
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
8 deletions
apps/activity/models/feature.js
apps/activity/views/partial/feature/product-old-style.hbs
public/scss/feature/_product.css
apps/activity/models/feature.js
View file @
343d850
...
...
@@ -107,10 +107,15 @@ class featureModel extends global.yoho.BaseModel {
if
(
data
&&
data
.
floors
)
{
data
.
floors
.
forEach
(
f
=>
{
if
(
f
.
component
&&
f
.
component
[
0
]
&&
f
.
component
[
0
].
type
===
'productGroup'
)
{
f
.
component
[
0
].
isStyle2
=
_
.
get
(
f
,
'component[0].newStyle'
)
===
'2'
&&
_
.
get
(
f
,
'component[0].numOfOneRow'
)
===
'2'
;
// eslint-disable-line
}
if
(
f
.
component
&&
f
.
component
[
0
]
&&
f
.
component
[
0
].
type
===
'productGroup'
&&
f
.
component
[
0
].
defaultSkns
)
{
sknsArr
.
push
(
self
.
_getProductBySkns
(
f
.
component
[
0
],
self
.
ctx
));
f
.
component
[
0
].
isStyle2
=
_
.
get
(
f
,
'component[0].newStyle'
)
===
'2'
&&
_
.
get
(
f
,
'component[0].numOfOneRow'
)
===
'2'
;
// eslint-disable-line
f
.
component
[
0
].
newStyle
=
_
.
get
(
f
,
'component[0].newStyle'
)
===
'1'
;
}
...
...
@@ -121,7 +126,6 @@ class featureModel extends global.yoho.BaseModel {
limit
:
'60'
},
f
.
component
[
0
].
searchCondition
||
{});
f
.
component
[
0
].
isStyle2
=
_
.
get
(
f
,
'component[0].newStyle'
)
===
'2'
&&
_
.
get
(
f
,
'component[0].numOfOneRow'
)
===
'2'
;
// eslint-disable-line
f
.
component
[
0
].
newStyle
=
_
.
get
(
f
,
'component[0].newStyle'
)
===
'1'
;
}
...
...
apps/activity/views/partial/feature/product-old-style.hbs
View file @
343d850
...
...
@@ -30,12 +30,10 @@
</div>
{{/
isEqualOr
}}
{{#
isEqualOr
..
/
showVipPrice
'1'
}}
{{#
unless
..
/
isStyle2
}}
<div
class=
"vipprice"
style=
"
{{#if
..
/
vipFontColor
}}
color:
{{
..
/
vipFontColor
}}
;
{{/if}}{{#if
..
/
vipBgColor
}}
background:
{{
..
/
vipBgColor
}}
;
{{/if}}
"
>
<span
class=
"vip-price-text"
>
VIP价
</span>
<span
class=
"vip-price-val"
>
¥
{{
vipprice
}}
</span>
</div>
{{/
unless
}}
<div
class=
"vipprice"
style=
"
{{#if
..
/
vipFontColor
}}
color:
{{
..
/
vipFontColor
}}
;
{{/if}}{{#if
..
/
vipBgColor
}}
background:
{{
..
/
vipBgColor
}}
;
{{/if}}
"
>
<span
class=
"vip-price-text"
>
VIP价
</span>
<span
class=
"vip-price-val"
>
¥
{{
vipprice
}}
</span>
</div>
{{/
isEqualOr
}}
</div>
</a>
...
...
public/scss/feature/_product.css
View file @
343d850
...
...
@@ -309,5 +309,9 @@
height
:
369px
;
}
}
.vipprice
{
display
:
none
;
}
}
}
...
...
Please
register
or
login
to post a comment