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
王水玲
6 years ago
Commit
5e393dc8220f9dcfa3273142d4824d2105fe8c66
1 parent
33a9336d
商品组优化
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
13 deletions
apps/activity/models/individuation.js
apps/activity/views/partial/feature/product-new-style.hbs
apps/activity/views/partial/feature/product-old-item.hbs
apps/activity/views/partial/feature/product-old-style.hbs
public/scss/feature/product.scss
apps/activity/models/individuation.js
View file @
5e393dc
...
...
@@ -41,7 +41,7 @@ let _getProduct = function(o) {
if
(
effectPlan
.
length
&&
time
>
effectPlan
[
0
].
show_begin_time
&&
effectPlan
[
0
].
show_status
===
'1'
)
{
// eslint-disable-line
o
.
curPlanPrice
=
effectPlan
[
0
].
current_saleprice
;
_
.
assign
(
{
curPlanPrice
:
effectPlan
[
0
].
current_saleprice
},
res
);
_
.
assign
(
res
,
{
curPlanPrice
:
effectPlan
[
0
].
current_saleprice
}
);
}
}
...
...
apps/activity/views/partial/feature/product-new-style.hbs
View file @
5e393dc
...
...
@@ -23,15 +23,15 @@
<span
class=
"brand-name"
{{#if
fontColor
}}
style=
"color:
{{
fontColor
}}
;"
{{/if}}
></span>
</a>
<div
class=
"sales-imgs-new"
>
{{#if
leftDownImg
}}
<img
class=
"leftdownimg lazy"
data-original=
"
{{
image2
leftDownImg
q
=
85
}}
"
>
{{/if}}
{{#
isEqualOr
isAdvance
'1'
}}
<div
class=
"advance"
style=
"background-image: url(
{{
advanceBgImg
}}
);"
>
<img
src=
"
{{
advanceBgImg
}}
"
class=
"img-seat"
>
<span
class=
"advance-price"
></span>
</div>
{{/
isEqualOr
}}
{{#if
leftDownImg
}}
<img
class=
"leftdownimg lazy"
data-original=
"
{{
image2
leftDownImg
q
=
85
}}
"
>
{{/if}}
</div>
</div>
</a>
...
...
apps/activity/views/partial/feature/product-old-item.hbs
View file @
5e393dc
...
...
@@ -9,9 +9,6 @@
{{/if}}
<img
class=
"product-detail-img lazy"
data-original=
"
{{
image2
productimg
q
=
85
}}
"
>
<div
class=
"sales-imgs-old"
>
{{#if
conf
.
leftDownImg
}}
<img
class=
"leftdownimg lazy"
data-original=
"
{{
image2
conf
.
leftDownImg
q
=
85
}}
"
>
{{/if}}
{{#
isEqualOr
conf
.
isAdvance
'1'
}}
{{#if
curPlanPrice
}}
<div
class=
"advance"
style=
"background-image: url(
{{
conf
.
advanceBgImg
}}
);"
>
...
...
@@ -20,6 +17,9 @@
</div>
{{/if}}
{{/
isEqualOr
}}
{{#if
conf
.
leftDownImg
}}
<img
class=
"leftdownimg lazy"
data-original=
"
{{
image2
conf
.
leftDownImg
q
=
85
}}
"
>
{{/if}}
</div>
</div>
{{#
isEqualOr
conf
.
showPrdName
'1'
}}
...
...
apps/activity/views/partial/feature/product-old-style.hbs
View file @
5e393dc
...
...
@@ -19,16 +19,16 @@
<img
class=
"rigtopimg"
src=
"
{{
image2
rigTopImg
q
=
85
}}
"
>
{{/if}}
<img
class=
"product-detail-img lazy"
src=
""
>
<div
class=
"sales-imgs-old"
>
{{#if
leftDownImg
}}
<img
class=
"leftdownimg lazy"
data-original=
"
{{
image2
leftDownImg
q
=
85
}}
"
>
{{/if}}
<div
class=
"sales-imgs-old sales-product-pool"
>
{{#
isEqualOr
isAdvance
'1'
}}
<div
class=
"advance"
style=
"background-image: url(
{{
advanceBgImg
}}
);"
>
<img
src=
"
{{
advanceBgImg
}}
"
class=
"img-seat"
>
<span
class=
"advance-price"
>
¥299
</span>
<span
class=
"advance-price"
></span>
</div>
{{/
isEqualOr
}}
{{#if
leftDownImg
}}
<img
class=
"leftdownimg lazy"
data-original=
"
{{
image2
leftDownImg
q
=
85
}}
"
>
{{/if}}
</div>
</div>
{{#
isEqualOr
showPrdName
'1'
}}
...
...
public/scss/feature/product.scss
View file @
5e393dc
...
...
@@ -189,10 +189,17 @@
}
}
.sales-product-pool
{
.advance
{
display
:
none
;
}
}
.leftdownimg
{
width
:
auto
;
max-width
:
100%
;
height
:
26px
;
margin-top
:
10px
;
}
.advance
{
...
...
@@ -201,7 +208,6 @@
max-width
:
100%
;
background-size
:
contain
;
background-repeat
:
no-repeat
;
margin-top
:
10px
;
text-align
:
right
;
display
:
inline-block
;
position
:
relative
;
...
...
Please
register
or
login
to post a comment