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
yyq
8 years ago
Commit
b956b09389e99259535e7ffbe6be0b6fe4db3a79
1 parent
a32d092c
ensure jit tip
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
14 deletions
apps/cart/views/action/order-ensure2016.hbs
public/img/sprite.cart.png
public/js/cart/ensure.page.js
public/scss/cart/_order-ensure2016.css
apps/cart/views/action/order-ensure2016.hbs
View file @
b956b09
...
...
@@ -75,10 +75,9 @@
{{#
with
shoppingCartData
}}
{{#
isY
is_multi_package
}}
<div
class=
"multi-package-row"
>
温馨提示:您购买的商品
<em
class=
"red"
>
分属不同仓库
</em>
,
需要品牌商调货
,
<em
class=
"red"
>
预计3-5天内发货给您
</em>
温馨提示:您购买的商品
<em
class=
"red"
>
分属不同仓库
</em>
,
{{
..
/
package_title
}}
,
<em
class=
"red"
>
预计3-5天内发货给您
</em>
<span
class=
"show-package"
></span>
<div
class=
"package-list hide"
>
<div
class=
"package-up-icon"
></div>
{{#
each
..
/
package_list
}}
<div
class=
"package-item"
>
<p
class=
"package-title bold"
>
包裹
{{
math
@index
'+'
1
}}
:
{{#
isEqual
supplier_id
'0'
}}
总仓发货
{{^}}
异地调拨
<em
class=
"red"
>
预计3-5天内发货给您
</em>
{{/
isEqual
}}
</p>
...
...
public/img/sprite.cart.png
View file @
b956b09
608 Bytes
|
W:
|
H:
42.6 KB
|
W:
|
H:
2-up
Swipe
Onion skin
public/js/cart/ensure.page.js
View file @
b956b09
...
...
@@ -385,6 +385,7 @@ multiPackage = {
this
.
$el
.
on
(
'click'
,
'.show-package'
,
function
(
e
)
{
that
.
$pkgList
.
toggleClass
(
'hide'
);
$
(
this
).
toggleClass
(
'on'
);
e
.
stopPropagation
();
}).
on
(
'click'
,
'.toggle-icon'
,
function
()
{
...
...
@@ -400,7 +401,7 @@ multiPackage = {
return
;
}
that
.
$pkgList
.
addClass
(
'hide'
);
that
.
$pkgList
.
addClass
(
'hide'
)
.
prev
().
removeClass
(
'on'
)
;
});
},
pkgPageControl
:
function
(
$el
,
flag
)
{
...
...
public/scss/cart/_order-ensure2016.css
View file @
b956b09
...
...
@@ -530,19 +530,17 @@
background
:
url(/cart/help-mark.png)
;
cursor
:
pointer
;
vertical-align
:
text-bottom
;
}
.package-up-icon
{
width
:
18px
;
height
:
9px
;
background
:
url(/cart/jit-top-row.png)
;
position
:
absolute
;
top
:
-9px
;
left
:
258px
;
&.
on
:
after
{
content
:
''
;
width
:
18px
;
height
:
9px
;
background
:
url(/cart/jit-top-row.png)
;
position
:
absolute
;
top
:
32px
;
margin-left
:
-9px
;
z-index
:
10
;
+
.package-item
{
border-top
:
0
;
margin-top
:
18px
;
}
}
...
...
@@ -560,6 +558,11 @@
position
:
relative
;
border-top
:
1px
solid
$
borderColor
;
&:first-child
{
border-top
:
0
;
margin-top
:
18px
;
}
.toggle-btns
{
display
:
none
;
}
...
...
Please
register
or
login
to post a comment