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
biao
9 years ago
Commit
a39e12ee2926611d7b5e8a3d131f6bf9819f5faa
1 parent
540d231c
update for JIT
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
96 additions
and
0 deletions
apps/me/router.js
apps/me/views/partial/order/detail/goods-list.hbs
public/js/me/order-detail.page.js
public/scss/me/order/_detail.css
apps/me/router.js
View file @
a39e12e
...
...
@@ -9,6 +9,8 @@
const
router
=
require
(
'express'
).
Router
();
// eslint-disable-line
const
cRoot
=
'./controllers'
;
// const auth = require(`${global.middleware}/auth`);
// 订单
const
order
=
require
(
`
$
{
cRoot
}
/order`
)
;
const
address
=
require
(
`
$
{
cRoot
}
/address`
)
;
...
...
apps/me/views/partial/order/detail/goods-list.hbs
View file @
a39e12e
<div
class=
"goods-list info-box"
>
<h4
class=
"status-title"
>
商品清单
</h4>
{{#
isY
isMultiPackage
}}
<div
class=
"multi-package-row"
>
温馨提示:您购买的商品
<em
class=
"blue"
>
分属不同仓库
</em>
,需要调拨,将被拆分成多个包裹送达
<span
class=
"iconfont show-package"
>

</span>
<div
class=
"package-list hide"
>
<div
class=
"package-up-icon"
></div>
{{#
each
packageList
}}
<div
class=
"package-item"
>
<p
class=
"package-title bold"
>
包裹
{{
math
@index
'+'
1
}}
:
{{#if
@first
}}
总仓发货
{{^}}
异地调拨
{{/if}}
</p>
<ul
class=
"package-goods clearfix"
>
{{#
each
goodsList
}}
<li
class=
"left"
>
<img
class=
"lazy package-goods-img"
data-original=
"
{{
image
goodsImages
100
134
}}
"
>
</li>
{{/
each
}}
</ul>
<p
class=
"package-shipping"
>
运费:¥
{{
shoppingCost
}}
元(原价
{{
shoppingOrigCost
}}
元,优惠
{{
shoppingCutCost
}}
元)
</p>
</div>
{{/
each
}}
</div>
</div>
{{/
isY
}}
<div
class=
"table"
>
<ul
class=
"header"
>
<li
class=
"first"
>
商品信息
</li>
...
...
public/js/me/order-detail.page.js
View file @
a39e12e
...
...
@@ -42,3 +42,8 @@ if ($('.left-time').length) {
countDown
.
showSec
=
true
;
countDown
.
start
();
}
$
(
'.show-package'
).
on
(
'click'
,
function
()
{
$
(
this
).
next
(
'.package-list'
).
toggleClass
(
'hide'
);
});
...
...
public/scss/me/order/_detail.css
View file @
a39e12e
.multi-package-row
{
position
:
relative
;
height
:
40px
;
font-size
:
14px
;
line-height
:
40px
;
text-align
:
center
;
background
:
#f4fbff
;
margin-bottom
:
$
space
;
border
:
1px
solid
$
borderColor
;
.show-package
{
font-size
:
16px
;
cursor
:
pointer
;
}
.package-up-icon
{
position
:
absolute
;
width
:
10px
;
height
:
7px
;
background
:
url(/shopping/package-up.png)
;
top
:
-7px
;
left
:
282px
;
+
.package-item
.package-title
{
border-top
:
none
;
}
}
.package-list
{
position
:
absolute
;
background
:
#fff
;
border
:
2px
solid
#bbb
;
width
:
586px
;
right
:
36px
;
padding
:
0
50px
;
}
.package-title
,
.package-shipping
{
text-align
:
left
;
margin-left
:
10px
;
}
.package-title
{
border-top
:
1px
solid
#eee
;
line-height
:
55px
;
}
.package-shipping
{
color
:
#595959
;
margin-top
:
20px
;
margin-bottom
:
30px
;
}
.package-goods
li
{
width
:
120px
;
}
.package-goods-img
{
display
:
block
;
width
:
100px
;
height
:
134px
;
margin
:
0
auto
;
}
}
.order-status
{
$
basicHeight
:
90px
;
border-top
:
1px
solid
$
borderColor
;
...
...
Please
register
or
login
to post a comment