Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yoho-blk
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
1
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
xuqi
9 years ago
Commit
b47f8e99d79d836590f3f263098ad5ea87a275ca
1 parent
e1b51aac
gift goods
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
3 deletions
apps/shopping/models/order.js
apps/shopping/views/action/order.hbs
package.json
public/scss/shopping/_order.css
apps/shopping/models/order.js
View file @
b47f8e9
...
...
@@ -45,6 +45,11 @@ const index = uid => {
`
/
product
/
pro_$
{
theGoods
.
product_id
}
_$
{
theGoods
.
goods_id
}
_$
{
theGoods
.
cn_alphabet
}.
html
`
);
// TODO:format brand url
// 处理商品是否是赠品
if
(
theGoods
.
goods_type
===
'gift'
)
{
theGoods
.
isGift
=
true
;
}
});
theData
.
yoho_coin
*=
100
;
// 有货币稀释
...
...
apps/shopping/views/action/order.hbs
View file @
b47f8e9
...
...
@@ -44,7 +44,7 @@
</a>
</p>
{{#
with
shopping_cart_data
}}
{{#i
f
is_multi_package
}}
{{#
i
sY
is_multi_package
}}
<div
class=
"multi-package-row"
>
温馨提示:您购买的商品
<em
class=
"blue"
>
分属不同仓库
</em>
,需要调拨,将被拆分成多个包裹送达
<span
class=
"iconfont show-package"
>

</span>
...
...
@@ -65,7 +65,7 @@
{{/
each
}}
</div>
</div>
{{/i
f
}}
{{/
i
sY
}}
{{/
with
}}
<div
class=
"content"
>
<p
class=
"order-table-head clearfix"
>
...
...
@@ -79,6 +79,10 @@
<li
class=
"order-goods clearfix"
>
<a
class=
"goods-img inline-block"
href=
"
{{
link
}}
"
>
<img
class=
"lazy"
data-original=
"
{{
image
goods_images
100
148
}}
"
>
{{#if
isGift
}}
<span
class=
"gift-tag"
>
赠品
</span>
{{/if}}
</a>
<p
class=
"brand-and-name inline-block"
>
<a
class=
"brand-name"
href=
"
{{
brandUrl
}}
"
>
{{
brandName
}}
</a>
...
...
package.json
View file @
b47f8e9
...
...
@@ -59,7 +59,7 @@
"uuid"
:
"^2.0.2"
,
"winston"
:
"^2.2.0"
,
"winston-daily-rotate-file"
:
"^1.1.4"
,
"yoho-node-lib"
:
"0.0.1
8
"
"yoho-node-lib"
:
"0.0.1
9
"
},
"devDependencies"
:
{
"autoprefixer"
:
"^6.3.6"
,
...
...
public/scss/shopping/_order.css
View file @
b47f8e9
...
...
@@ -231,6 +231,7 @@
/* [表格内容]商品图片 */
.goods-img
{
position
:
relative
;
width
:
180px
;
padding
:
0
40px
;
...
...
@@ -238,6 +239,19 @@
width
:
100px
;
height
:
148px
;
}
.gift-tag
{
position
:
absolute
;
bottom
:
0
;
left
:
40px
;
right
:
40px
;
height
:
25px
;
color
:
#fff
;
background
:
#379ed6
;
font-size
:
12px
;
text-align
:
center
;
line-height
:
25px
;
}
}
/* [表格内容]品牌和商品名称 */
...
...
Please
register
or
login
to post a comment