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
9afb4a28e873056ebe9f8e3232cb9c5db43d9e5c
1 parent
ee9a160b
update for re add goods to cart
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
66 additions
and
5 deletions
apps/me/controllers/order.js
apps/me/models/order.js
apps/me/router.js
apps/me/views/partial/order/table-body.hbs
config/response-code.js
public/js/me/order.page.js
public/js/me/order/readd-order.js
apps/me/controllers/order.js
View file @
9afb4a2
...
...
@@ -121,6 +121,16 @@ const editOrder = (req, res) => {
});
};
const
reAddCart
=
(
req
,
res
)
=>
{
const
uid
=
global
.
yoho
.
uid
||
'7394907'
;
const
code
=
req
.
query
.
orderCode
;
orderModel
.
reAddCart
(
uid
,
code
).
then
(
result
=>
{
res
.
json
(
result
);
});
};
module
.
exports
=
{
index
:
index
,
detail
:
detail
,
...
...
@@ -130,5 +140,6 @@ module.exports = {
deleteOrder
:
deleteOrder
,
editOrder
:
editOrder
,
getExpressInfo
:
getExpressInfo
,
getCancelOrderReason
:
getCancelOrderReason
getCancelOrderReason
:
getCancelOrderReason
,
reAddCart
:
reAddCart
};
...
...
apps/me/models/order.js
View file @
9afb4a2
...
...
@@ -100,8 +100,8 @@ const statusMap = {
},
4
:
{
value
:
2
,
valueStr
:
'已发货'
,
step
:
2
,
valueStr
:
'待收货'
,
step
:
3
,
showGetBtn
:
true
,
btns
:
btnMap
.
complete
},
...
...
@@ -433,6 +433,16 @@ const editOrder = data => {
});
};
const
reAddCart
=
(
uid
,
code
)
=>
{
return
api
.
get
(
''
,
{
method
:
'app.Shopping.readd'
,
uid
:
uid
,
order_code
:
code
},
{
cache
:
true
});
};
module
.
exports
=
{
getOrderData
:
getOrderData
,
getOrderDetail
:
getOrderDetail
,
...
...
@@ -440,5 +450,6 @@ module.exports = {
getCancelOrderReason
:
getCancelOrderReason
,
deleteOrder
:
deleteOrder
,
editOrder
:
editOrder
,
getExpressInfo
:
getExpressInfo
getExpressInfo
:
getExpressInfo
,
reAddCart
:
reAddCart
};
...
...
apps/me/router.js
View file @
9afb4a2
...
...
@@ -24,6 +24,7 @@ router.get('/cancelOrder', order.cancelOrder);
router
.
get
(
'/getCancelOrderReason'
,
order
.
getCancelOrderReason
);
router
.
get
(
'/getExpressInfo'
,
order
.
getExpressInfo
);
router
.
get
(
'/editOrder'
,
order
.
editOrder
);
router
.
get
(
'/reAdd'
,
order
.
reAddCart
);
// 个人中心首页/收货地址
router
.
get
(
'/address'
,
address
.
index
);
...
...
apps/me/views/partial/order/table-body.hbs
View file @
9afb4a2
...
...
@@ -43,7 +43,7 @@
{{/if}}
<div
class=
"buy-operation
{{#
unless
showBuyBtn
}}
hide
{{/
unless
}}
"
>
<span
class=
"btn black"
>
再次购买
</span>
<span
class=
"btn black
buy
"
>
再次购买
</span>
<p
class=
"subtext delete"
>
删除订单
</p>
</div>
...
...
config/response-code.js
0 → 100644
View file @
9afb4a2
module
.
exports
=
{
success
:
200
,
notModified
:
304
,
notFound
:
404
,
badRequest
:
400
,
internalError
:
500
};
...
...
public/js/me/order.page.js
View file @
9afb4a2
...
...
@@ -11,6 +11,8 @@ var expressTpl = require('../../tpl/me/express.hbs');
var
cancelOrder
=
require
(
'./order/cancel-order'
);
var
reOrder
=
require
(
'./order/readd-order'
);
// 更新表格
var
tableOperation
=
{
$header
:
$
(
'.table.column-category'
),
...
...
@@ -168,6 +170,14 @@ function getCurrentPage() {
return
page
;
}
function
bindBuyEvent
()
{
$
(
'.buy-operation .buy'
).
off
(
'click'
).
on
(
'click'
,
function
()
{
var
code
=
$
(
this
).
closest
(
'.order'
).
data
(
'code'
);
reOrder
(
code
);
});
}
function
updateTableContent
(
$el
)
{
var
type
=
getCurrentTabType
();
var
page
=
getCurrentPage
();
...
...
@@ -177,6 +187,7 @@ function updateTableContent($el) {
$el
.
find
(
'.pay-operation'
).
remove
();
$el
.
find
(
'.buy-operation'
).
removeClass
(
'hide'
);
setOrderTotal
();
bindBuyEvent
();
}
else
{
type
=
typeMap
[
type
];
getOrderList
(
type
,
page
);
...
...
@@ -334,11 +345,13 @@ function bindExpressEvent() {
});
}
function
bindEvent
()
{
bindPaginationClick
();
bindDeleteEvent
();
bindCancelEvent
();
bindExpressEvent
();
bindBuyEvent
();
}
bindEvent
();
...
...
public/js/me/order/readd-order.js
0 → 100644
View file @
9afb4a2
var
dialog
=
require
(
'../../plugins/dialog'
);
var
_alert
=
dialog
.
Alert
;
module
.
exports
=
function
(
code
)
{
$
.
ajax
({
url
:
'/me/reAdd'
,
data
:
{
orderCode
:
code
}
}).
done
(
function
(
result
)
{
if
(
result
.
code
===
200
)
{
location
.
href
=
'/shopping/cart'
;
}
else
{
new
_alert
(
'出错了,请重试!'
).
show
();
}
});
};
...
...
Please
register
or
login
to post a comment