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) => { @@ -17,6 +17,8 @@ const myCurrency = (req, res, next) => {
17 myCurrencyModel.myCurrency(uid, contentCode).then(result => { 17 myCurrencyModel.myCurrency(uid, contentCode).then(result => {
18 18
19 res.render('currency-new', { 19 res.render('currency-new', {
  20 + module: 'home',
  21 + page: 'mycurrency',
20 pageHeader: _.assign(headerModel.setNav({ 22 pageHeader: _.assign(headerModel.setNav({
21 navTitle: '有货币' 23 navTitle: '有货币'
22 }), { 24 }), {
@@ -38,8 +40,9 @@ const currencyDetail = (req, res, next) => { @@ -38,8 +40,9 @@ const currencyDetail = (req, res, next) => {
38 let limit = 10; 40 let limit = 10;
39 41
40 myCurrencyModel.currencyDetailIndex(uid, page, limit).then(result => { 42 myCurrencyModel.currencyDetailIndex(uid, page, limit).then(result => {
41 -  
42 res.render('currency-detail', { 43 res.render('currency-detail', {
  44 + module: 'home',
  45 + page: 'currencyDetail',
43 pageHeader: _.assign(headerModel.setNav({ 46 pageHeader: _.assign(headerModel.setNav({
44 navTitle: '有货币明细' 47 navTitle: '有货币明细'
45 }), { 48 }), {
@@ -21,6 +21,8 @@ const orderDetailData = (req, res, next) => { @@ -21,6 +21,8 @@ const orderDetailData = (req, res, next) => {
21 orderDetailModel.orderDetailData(uid, orderCode).then(result => { 21 orderDetailModel.orderDetailData(uid, orderCode).then(result => {
22 result.serviceUrl = serviceUrl; 22 result.serviceUrl = serviceUrl;
23 res.render('orderDetail', { 23 res.render('orderDetail', {
  24 + module: 'home',
  25 + page: 'orderdetail',
24 pageHeader: headerModel.setNav({ 26 pageHeader: headerModel.setNav({
25 navTitle: '订单详情', 27 navTitle: '订单详情',
26 navBtn: false 28 navBtn: false