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
36bc214b32822b39ddb6b839ba654bef828edf08
1 parent
cc77c089
update for left time is 0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
apps/me/models/order.js
apps/me/views/partial/order/table-body.hbs
public/scss/channel/_editorial.css
apps/me/models/order.js
View file @
36bc214
...
...
@@ -314,6 +314,10 @@ const _getUserOrder = (uid, type, page) => {
item
.
isRefundOrder
=
ot
===
7
;
if
(
parseInt
(
item
.
payLefttime
,
10
)
!==
0
)
{
item
.
showLeftTime
=
true
;
}
if
(
item
.
isCancel
===
'Y'
)
{
item
.
showBuyBtn
=
true
;
item
.
statusStr
=
'已取消'
;
...
...
@@ -511,7 +515,8 @@ const getOrderDetail = (uid, code) => {
detail
.
createTime
=
_convertUnixTime
(
detail
.
createTime
);
if
(
detail
.
isCancel
===
'N'
&&
st
===
0
)
{
st
===
0
&&
parseInt
(
detail
.
payLefttime
,
10
)
!==
0
)
{
detail
.
showLeftTime
=
true
;
}
...
...
apps/me/views/partial/order/table-body.hbs
View file @
36bc214
...
...
@@ -22,7 +22,9 @@
{{#if
showPayButton
}}
<div
class=
"pay-operation"
>
{{#if
isOnlinePaid
}}
{{#if
showLeftTime
}}
<span
class=
"iconfont hide-when-invalid"
>

</span><p
class=
"left-time"
data-left=
"
{{
payLefttime
}}
"
></p>
{{/if}}
<a
href=
"
{{
payUrl
}}
"
>
<span
class=
"btn red hide-when-invalid"
>
立即付款
</span>
</a>
...
...
public/scss/channel/_editorial.css
View file @
36bc214
...
...
@@ -19,7 +19,7 @@
position
:
relative
;
&.bottom-space
{
margin-bottom
:
15
px
;
margin-bottom
:
20
px
;
}
&
.right-space
{
...
...
@@ -49,7 +49,7 @@
img
{
width
:
$
bigImgWidth
;
height
:
calc
(
$
smallImgHeight
*
2
+$
space
+
4
px
);
height
:
calc
(
$
smallImgHeight
*
2
+$
space
+
10
px
);
}
}
...
...
Please
register
or
login
to post a comment