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
f0fef5fbfe83e3b385a0ae4b0b13effc0e011533
1 parent
9b257c82
detail jit tip
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
12 deletions
apps/home/models/orders-service.js
apps/home/views/action/home/orders/order-detail.hbs
public/js/home/orders.page.js
public/scss/home/_order-detail.css
apps/home/models/orders-service.js
View file @
f0fef5f
...
...
@@ -755,6 +755,7 @@ const _getOrderDetail = co(function * (uid, orderId) {
detail
.
operation
=
_getOrderDetailOp
(
orderDetail
.
order_cde
,
orderDetail
.
payment
,
+
orderDetail
.
status
,
orderDetail
.
is_cancel
,
orderDetail
.
payment_status
,
orderDetail
.
payment_type
,
orderDetail
.
order_type
,
orderDetail
.
attribute
,
orderDetail
.
refund_status
);
detail
.
packageTitle
=
orderDetail
.
package_title
;
detail
.
packages
=
_getPackageInfo
(
orderDetail
);
...
...
apps/home/views/action/home/orders/order-detail.hbs
View file @
f0fef5f
...
...
@@ -161,7 +161,7 @@
{{#if
packages
}}
<div
id=
"differentOrder"
class=
"differentOrder"
>
<p
class=
"warn"
>
温馨提示:您购买的商品
<span
class=
"red"
>
分属不同仓库
</span>
,
需要品牌商调货
,
<span
class=
"red"
>
预计3-5天内发货给您
</span>
温馨提示:您购买的商品
<span
class=
"red"
>
分属不同仓库
</span>
,
{{
packageTitle
}}
,
<span
class=
"red"
>
预计3-5天内发货给您
</span>
<span
class=
"why"
></span>
</p>
<div
id=
"differentBag"
class=
"differentBag"
>
...
...
public/js/home/orders.page.js
View file @
f0fef5f
...
...
@@ -12,6 +12,7 @@ require('./orders/order-block');
$
(
'.why'
).
click
(
function
()
{
$
(
'#differentBag'
).
show
();
$
(
this
).
addClass
(
'on'
);
return
false
;
});
...
...
@@ -20,6 +21,7 @@ $('#differentBag').click(function() {
});
$
(
document
).
click
(
function
()
{
$
(
'#differentBag'
).
hide
();
$
(
'.why'
).
removeClass
(
'on'
);
});
...
...
public/scss/home/_order-detail.css
View file @
f0fef5f
...
...
@@ -201,22 +201,22 @@
height
:
20px
;
display
:
inline-block
;
vertical-align
:
middle
;
&.
on
:
after
{
content
:
""
;
position
:
absolute
;
width
:
0
;
height
:
0
;
border-bottom
:
10px
solid
#000000
;
border-left
:
10px
solid
transparent
;
border-right
:
10px
solid
transparent
;
top
:
30px
;
margin-left
:
-12px
;
}
}
.why
:hover
{
cursor
:
pointer
;
}
}
.differentBag
:before
{
content
:
""
;
position
:
absolute
;
width
:
0
;
height
:
0
;
border-bottom
:
10px
solid
#000000
;
border-left
:
10px
solid
transparent
;
border-right
:
10px
solid
transparent
;
top
:
-10px
;
right
:
136px
;
}
.differentBag
{
display
:
none
;
position
:
absolute
;
...
...
Please
register
or
login
to post a comment