Authored by 徐炜

Merge branch 'release/wap-optim' into 'master'

个人中心-订单详情页指定model、page参数

个人中心 订单详情页和有货币页res.render时指定model、page参数。

See merge request !122
... ... @@ -17,6 +17,8 @@ const myCurrency = (req, res, next) => {
myCurrencyModel.myCurrency(uid, contentCode).then(result => {
res.render('currency-new', {
module: 'home',
page: 'mycurrency',
pageHeader: _.assign(headerModel.setNav({
navTitle: '有货币'
}), {
... ... @@ -38,8 +40,9 @@ const currencyDetail = (req, res, next) => {
let limit = 10;
myCurrencyModel.currencyDetailIndex(uid, page, limit).then(result => {
res.render('currency-detail', {
module: 'home',
page: 'currencyDetail',
pageHeader: _.assign(headerModel.setNav({
navTitle: '有货币明细'
}), {
... ...
... ... @@ -21,6 +21,8 @@ const orderDetailData = (req, res, next) => {
orderDetailModel.orderDetailData(uid, orderCode).then(result => {
result.serviceUrl = serviceUrl;
res.render('orderDetail', {
module: 'home',
page: 'orderdetail',
pageHeader: headerModel.setNav({
navTitle: '订单详情',
navBtn: false
... ...