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
Plain Diff
Browse Files
Authored by
陈轩
8 years ago
Commit
1beed23f7e8e3ebeed919f17fc1a11746ec7a4a1
2 parents
2d1c622c
7beaf572
Merge branch 'release/5.3' of
http://git.yoho.cn/fe/yohobuywap-node
into release/5.3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
apps/cart/views/action/order-ensure.hbs
doraemon/views/partial/me/order/good.hbs → doraemon/views/partial/home/order/good.hbs
doraemon/views/partial/me/order/jit-more.hbs → doraemon/views/partial/home/order/jit-more.hbs
doraemon/views/partial/me/order/order.hbs → doraemon/views/partial/home/order/order.hbs
doraemon/views/partial/me/order/orders.hbs → doraemon/views/partial/home/order/orders.hbs
apps/cart/views/action/order-ensure.hbs
View file @
1beed23
...
...
@@ -78,11 +78,11 @@
</section>
{{#if
isJit
}}
{{>
me
/
order
/
jit-more
}}
{{>
ho
me
/
order
/
jit-more
}}
{{/if}}
<section
class=
"block goods-bottom"
>
{{#
each
goods
}}
{{>
me
/
order
/
good
}}
{{>
ho
me
/
order
/
good
}}
{{/
each
}}
<div
class=
"goods-num"
>
共
{{
num
}}
件商品 合计
<span>
{{
goodsPrice
}}
</span></div>
</section>
...
...
@@ -168,7 +168,7 @@
实付金额
<span>
¥
{{
round
price
2
}}
</span>
</div>
{{#if
returnYohoCoin
}}
<div
class=
"yoho-coin"
>
共返有货币:
{{
yohoCoinNum
}}
个
...
...
doraemon/views/partial/me/order/good.hbs → doraemon/views/partial/
ho
me/order/good.hbs
View file @
1beed23
doraemon/views/partial/me/order/jit-more.hbs → doraemon/views/partial/
ho
me/order/jit-more.hbs
View file @
1beed23
doraemon/views/partial/me/order/order.hbs → doraemon/views/partial/
ho
me/order/order.hbs
View file @
1beed23
...
...
@@ -5,7 +5,7 @@
</header>
<section
class=
"order-goods"
>
{{#
goods
}}
{{>
me
/
order
/
good
}}
{{>
ho
me
/
order
/
good
}}
{{/
goods
}}
</section>
<footer
class=
"footer"
>
...
...
@@ -63,6 +63,6 @@
</a>
</div>
{{/if}}
{{/if}}
</div>
\ No newline at end of file
</div>
...
...
doraemon/views/partial/me/order/orders.hbs → doraemon/views/partial/
ho
me/order/orders.hbs
View file @
1beed23
...
...
@@ -6,6 +6,6 @@
</div>
{{^}}
{{#
each
orders
}}
{{>
me
/
order
/
order
}}
{{>
ho
me
/
order
/
order
}}
{{/
each
}}
{{/if}}
\ No newline at end of file
{{/if}}
...
...
Please
register
or
login
to post a comment