Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuywap-node-activity
·
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
杨延青
2020-03-06 15:39:19 +0800
Commit
30a5d714f83462d6296ad3e9e7a8f3945502f379
2 parents
f21317a6
b47544ea
Merge branch 'feature/tagPrice' into 'release/6.9.22'
fix saleprice cover See merge request
!24
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
2 deletions
apps/activity/models/feature.js
apps/activity/models/individuation.js
apps/activity/views/partial/feature/product-item-1.hbs
apps/activity/views/partial/feature/product-item-2.hbs
public/scss/feature/product.scss
apps/activity/models/feature.js
View file @
30a5d71
...
...
@@ -90,6 +90,15 @@ class featureModel extends global.yoho.BaseModel {
obj
.
brandurl
=
`
//m.yohobuy.com/product/index/brand?domain=${val.brand_domain}&openby:yohobuy={"action":"go.brand","params":{"brand_id":${val.brand_id}}}`; // eslint-disable-line
}
if
(
!
_
.
isEmpty
(
val
.
cover_info
))
{
let
{
share_content
}
=
val
.
cover_info
;
Object
.
assign
(
obj
,
{
saleprice
:
share_content
,
salesPriceClass
:
'share-price'
});
}
resList
[
val
.
product_skn
]
=
obj
;
});
});
...
...
apps/activity/models/individuation.js
View file @
30a5d71
...
...
@@ -27,6 +27,15 @@ let _getProduct = function(o, type) {
type
:
type
||
'yoho'
};
if
(
!
_
.
isEmpty
(
o
.
cover_info
))
{
let
{
share_content
}
=
o
.
cover_info
;
Object
.
assign
(
res
,
{
sales_price
:
share_content
,
salesPriceClass
:
'share-price'
});
}
plan
=
_
.
sortBy
(
plan
,
item
=>
{
return
+
item
.
show_begin_time
;
});
...
...
apps/activity/views/partial/feature/product-item-1.hbs
View file @
30a5d71
...
...
@@ -48,7 +48,7 @@
<div
class=
"new-price"
style=
"
{{#if
conf
.
salePriceBgColor
}}
background:
{{
conf
.
salePriceBgColor
}}
;
{{/if}}{{#if
conf
.
priceFontColor
}}
color:
{{
conf
.
priceFontColor
}}
;
{{/if}}
; text-align: left;"
>
<span
class=
"sale-price"
{{#if
conf
.
priceFontColor
}}
<span
class=
"sale-price
{{
salesPriceClass
}}
"
{{#if
conf
.
priceFontColor
}}
style=
"color:
{{
conf
.
priceFontColor
}}
;"
{{/if}}
>
¥
{{
saleprice
}}
</span>
{{#if
marketprice
}}
<span
class=
"market-price"
{{#if
conf
.
priceFontColor
}}
...
...
apps/activity/views/partial/feature/product-item-2.hbs
View file @
30a5d71
...
...
@@ -27,7 +27,7 @@
<div
class=
"new-price"
style=
"
{{#if
conf
.
salePriceBgColor
}}
background:
{{
conf
.
salePriceBgColor
}}
;
{{/if}}{{#if
conf
.
priceFontColor
}}
color:
{{
conf
.
priceFontColor
}}
;
{{/if}}
; text-align: left;"
>
<span
class=
"sale-price"
{{#if
conf
.
priceFontColor
}}
<span
class=
"sale-price
{{
salesPriceClass
}}
"
{{#if
conf
.
priceFontColor
}}
style=
"color:
{{
conf
.
priceFontColor
}}
;"
{{/if}}
>
¥
{{
saleprice
}}
</span>
{{#if
marketprice
}}
<span
class=
"market-price"
{{#if
conf
.
priceFontColor
}}
...
...
public/scss/feature/product.scss
View file @
30a5d71
...
...
@@ -239,6 +239,10 @@
color
:
#fff
;
}
>
.share-price
{
margin-left
:
25%
;
}
>
.market-price
{
margin-left
:
6px
;
font-size
:
18px
;
...
...
Please
register
or
login
to post a comment