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
9d86970b6c065510d76812b76c2cae85767d27e5
1 parent
d4a8e22b
fix order list issue
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
5 deletions
apps/me/controllers/order.js
apps/me/views/partial/order/table-body.hbs
public/js/me/order.page.js
public/scss/me/order/_table.css
apps/me/controllers/order.js
View file @
9d86970
...
...
@@ -65,6 +65,7 @@ const getOrderList = (req, res) => {
page
:
'order'
,
isMe
:
true
,
orderList
:
result
.
order
.
orderList
,
paginationOpts
:
result
.
order
.
paginationOpts
,
orderData
:
result
.
order
.
orderData
});
});
...
...
apps/me/views/partial/order/table-body.hbs
View file @
9d86970
...
...
@@ -7,7 +7,7 @@
{{>
order
/
goods-box
}}
<div
class=
"common-column special-border"
>
<p
class=
"bold"
>
¥
{{
amount
}}
</p>
<p
class=
"subtext"
>
{{
paymentTypeStr
}}
</p>
<p
class=
"subtext
no-pointer
"
>
{{
paymentTypeStr
}}
</p>
{{#if
isRefundOrder
}}
<p
class=
"subtext refund-tag"
>
换货订单
</p>
{{/if}}
...
...
public/js/me/order.page.js
View file @
9d86970
...
...
@@ -19,7 +19,6 @@ var confirmReceive = require('./order/confirm-receive');
// 订单剩余时间显示及倒计时
var
countDown
=
require
(
'./order/countdown'
);
require
(
'../common/foreach-polyfill'
);
// 更新表格
var
tableOperation
=
{
...
...
@@ -41,6 +40,8 @@ var typeMap = {
delivering
:
3
};
require
(
'../common/foreach-polyfill'
);
// 个人中心共用代码加载
require
(
'./me'
);
...
...
@@ -150,9 +151,9 @@ function updateTableContent($el) {
// 绑定分页点击事件
function
bindPaginationClick
()
{
$
(
'.blk-pagination
li
'
).
off
(
'click'
).
on
(
'click'
,
function
(
e
)
{
$
(
'.blk-pagination
a
'
).
off
(
'click'
).
on
(
'click'
,
function
(
e
)
{
var
$this
=
$
(
this
);
var
page
=
$this
.
find
(
'a'
).
attr
(
'href'
).
split
(
'='
)[
1
];
var
page
=
$this
.
attr
(
'href'
).
split
(
'='
)[
1
];
var
type
=
getCurrentTabType
();
e
.
preventDefault
();
...
...
public/scss/me/order/_table.css
View file @
9d86970
...
...
@@ -14,6 +14,10 @@
margin
:
$
space
0
;
}
.no-pointer
{
cursor
:
auto
!important
;
}
.refund-tag
{
width
:
55%
;
padding
:
5px
0
;
...
...
@@ -122,7 +126,7 @@
.iconfont
{
font-weight
:
normal
;
color
:
#000
000
;
color
:
#000
;
}
&
.last
{
...
...
Please
register
or
login
to post a comment