Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuy-node
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
1
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
71fe8e03c8a39f9fce516bd7c15e4aa3a0061022
1 parent
b2cc7761
食品类 尺码改规格
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
22 additions
and
13 deletions
apps/cart/models/cart-helper.js
apps/cart/models/cart-service.js
apps/cart/views/action/order-ensure.hbs
apps/home/models/orders-service.js
apps/home/models/returns.js
apps/home/views/action/home/orders/order-detail.hbs
apps/home/views/action/returns/returns-apply.hbs
apps/home/views/action/returns/returns-detail.hbs
apps/home/views/action/returns/returns.hbs
apps/home/views/partial/home/orders/order-block.hbs
mix/mix/cart/cart-item.hbs
public/hbs/cart/select-color-panel.hbs
public/js/cart/cart-api.js
apps/cart/models/cart-helper.js
View file @
71fe8e0
...
...
@@ -131,6 +131,7 @@ const formatCartGoods = (cartGoods, isAdvanceCart, inValid, isOffShelves, analys
imgCover
:
it
.
goods_images
?
helpers
.
image
(
it
.
goods_images
,
64
,
88
)
:
''
,
productColor
:
it
.
factory_goods_name
,
productSize
:
it
.
size_name
,
skuTitle
:
it
.
sku_title
,
productPrice
:
transPrice
(
it
.
sales_price
),
productNum
:
Number
(
it
.
buy_number
),
storageNum
:
Number
(
it
.
storage_number
),
...
...
apps/cart/models/cart-service.js
View file @
71fe8e0
...
...
@@ -346,6 +346,7 @@ module.exports = class extends global.yoho.BaseModel {
result
.
isCollect
=
propOrigin
(
'is_collect'
);
result
.
colors
=
skuData
.
skuGoods
;
result
.
skuTitle
=
propOrigin
(
'skuTitle'
);
return
result
;
}
...
...
apps/cart/views/action/order-ensure.hbs
View file @
71fe8e0
...
...
@@ -160,7 +160,7 @@
</td>
<td
class=
"border-top color-size"
>
颜色:
<span
class=
"color"
>
{{
factory_goods_name
}}
</span>
尺码
:
<span
class=
"size"
>
{{
size_name
}}
</span>
{{
sku_title
}}
:
<span
class=
"size"
>
{{
size_name
}}
</span>
</td>
<td
class=
"border-top price"
>
<p
class=
"red"
>
¥
{{
round
productPrice
2
}}
</p>
...
...
apps/home/models/orders-service.js
View file @
71fe8e0
...
...
@@ -423,6 +423,7 @@ module.exports = class extends global.yoho.BaseModel {
newGood
.
name
=
good
.
product_name
;
newGood
.
color
=
good
.
factory_color_name
;
newGood
.
size
=
good
.
size_name
;
newGood
.
skuTitle
=
good
.
sku_title
;
newGood
.
price
=
that
.
transPrice
(
good
.
sales_price
);
// 默认显示销售价
newGood
.
isVipPrice
=
good
.
discount_tag
===
'V'
;
newGood
.
isStuPrice
=
good
.
discount_tag
===
'S'
;
...
...
@@ -859,6 +860,7 @@ module.exports = class extends global.yoho.BaseModel {
name
:
good
.
product_name
,
color
:
good
.
factory_color_name
,
size
:
good
.
size_name
,
skuTitle
:
good
.
sku_title
,
price
:
that
.
transPrice
(
good
.
sales_price
),
// 默认显示销售价
isVipPrice
:
good
.
discount_tag
===
'V'
,
isStuPrice
:
good
.
discount_tag
===
'S'
,
...
...
apps/home/models/returns.js
View file @
71fe8e0
...
...
@@ -56,6 +56,7 @@ module.exports = class extends global.yoho.BaseModel {
name
:
value
.
product_name
||
''
,
color
:
value
.
color_name
,
size
:
value
.
size_name
,
skuTitle
:
value
.
sku_title
||
'尺码'
,
yoho_coin_cut_num
:
value
.
yoho_coin_cut_num
,
real_pay_price
:
transPrice
(
value
.
real_pay_price
),
price
:
transPrice
(
value
.
sales_price
),
...
...
@@ -81,7 +82,8 @@ module.exports = class extends global.yoho.BaseModel {
name
:
good
.
product_name
,
goods_type
:
good
.
goods_type
,
color
:
good
.
color_name
,
size
:
good
.
size_name
size
:
good
.
size_name
,
skuTitle
:
good
.
sku_title
||
'尺码'
});
});
...
...
@@ -209,6 +211,7 @@ module.exports = class extends global.yoho.BaseModel {
name
:
value
.
product_name
,
color
:
value
.
factory_color_name
,
size
:
value
.
size_name
,
skuTitle
:
value
.
sku_title
||
'尺码'
,
price
:
transPrice
(
value
.
last_price
),
skn
:
value
.
product_skn
,
skc
:
value
.
product_skc
,
...
...
@@ -568,6 +571,7 @@ module.exports = class extends global.yoho.BaseModel {
name
:
value
.
product_name
,
color
:
value
.
color_name
,
size
:
value
.
size_name
,
skuTitle
:
value
.
sku_title
||
'尺码'
,
price
:
value
.
last_price
,
skn
:
value
.
product_skn
,
skc
:
value
.
product_skc
,
...
...
apps/home/views/action/home/orders/order-detail.hbs
View file @
71fe8e0
...
...
@@ -250,7 +250,7 @@
{{/if}}
{{#if
size
}}
尺码
:
{{
size
}}
{{
skuTitle
}}
:
{{
size
}}
{{/if}}
{{#if
date
}}
...
...
apps/home/views/action/returns/returns-apply.hbs
View file @
71fe8e0
...
...
@@ -57,7 +57,7 @@
</td>
<td
class=
"return-goods-info"
>
<a
href=
"
{{
href
}}
"
>
{{
name
}}
</a>
<span
style=
"display: block;"
>
颜色:
{{
color
}}
尺码
:
{{
size
}}
</span>
<span
style=
"display: block;"
>
颜色:
{{
color
}}
{{
skuTitle
}}
:
{{
size
}}
</span>
{{#if
specialNoticeBo
}}
<div>
<div
class=
"special-tip"
>
...
...
@@ -115,9 +115,9 @@
{{/
colorSize
}}
</p>
<p>
尺码
要换成:
{{
skuTitle
}}
要换成:
<select
class=
"exchange-size"
data-sku=
"
{{
sku
}}
"
data-skc=
"
{{
skc
}}
"
{{#if
isLimitSkn
}}
disabled
{{/if}}
>
<option
value=
"0"
>
请选择
尺码
</option>
<option
value=
"0"
>
请选择
{{
skuTitle
}}
</option>
</select>
</p>
</td>
...
...
@@ -220,7 +220,7 @@
</td>
<td
class=
"return-goods-info"
>
<a
href=
"
{{
href
}}
"
>
{{
name
}}
</a>
<span>
颜色:
{{
color
}}
尺码
:
{{
size
}}
</span>
<span>
颜色:
{{
color
}}
{{
skuTitle
}}
:
{{
size
}}
</span>
{{#if
specialNoticeBo
}}
<div>
<div
class=
"special-tip"
>
...
...
apps/home/views/action/returns/returns-detail.hbs
View file @
71fe8e0
...
...
@@ -119,7 +119,7 @@
<p
class=
"name-color-size"
>
<a
class=
"name"
href=
"
{{
href
}}
"
target=
"_blank"
>
{{
name
}}
</a>
颜色:
{{
color
}}
尺码
:
{{
size
}}
颜色:
{{
color
}}
{{
skuTitle
}}
:
{{
size
}}
{{>
home
/
orders
/
order-goods-tags
}}
</p>
</td>
...
...
apps/home/views/action/returns/returns.hbs
View file @
71fe8e0
...
...
@@ -49,7 +49,7 @@
{{/if}}
{{#if
size
}}
尺码
:
{{
size
}}
{{
skuTitle
}}
:
{{
size
}}
{{/if}}
</span>
</div>
...
...
apps/home/views/partial/home/orders/order-block.hbs
View file @
71fe8e0
...
...
@@ -50,7 +50,7 @@
{{/if}}
{{#if
size
}}
尺码
:
{{
size
}}
{{
skuTitle
}}
:
{{
size
}}
{{/if}}
{{#if
arrivalDate
}}
...
...
mix/mix/cart/cart-item.hbs
View file @
71fe8e0
...
...
@@ -47,7 +47,7 @@
<em
class=
"
{{#
unless
isOffShelve
}}
pay-pro-detail
{{/
unless
}}
"
>
<span>
<b
title=
"
{{
productColor
}}
"
>
颜色:
{{
productColor
}}
</b>
尺码
:
{{
productSize
}}
<i
class=
"iconfont"
>

</i>
{{
skuTitle
}}
:
{{
productSize
}}
<i
class=
"iconfont"
>

</i>
</span>
</em>
{{#
and
isAdvance
preSellDate
}}
...
...
public/hbs/cart/select-color-panel.hbs
View file @
71fe8e0
...
...
@@ -17,7 +17,7 @@
</div>
</div>
<div
class=
"dl choose-size"
>
<div
class=
"dd"
>
尺码
:
</div>
<div
class=
"dd"
>
{{
skuTitle
}}
:
</div>
{{#
each
colors
}}
<div
class=
"size-row
{{#
unless
active
}}
hide
{{/
unless
}}
"
>
<div
class=
"choose-size-detail"
>
...
...
public/js/cart/cart-api.js
View file @
71fe8e0
...
...
@@ -359,7 +359,8 @@ function parseProductInfo(productInfo, defaultInfo) {
colors
:
filterSet
,
defaultColor
:
defaultColor
,
defaultSize
:
defaultSize
,
defaultImg
:
defaultImg
defaultImg
:
defaultImg
,
skuTitle
:
productInfo
.
skuTitle
};
}
...
...
Please
register
or
login
to post a comment