fe / yohobuy-node · Commits

Go to a project

Authored by htoooth
Commit 4cddba4ee2db740a8aa6f993e2048fb2643e440f 1 parent d94fd094

refactor

Inline Side-by-side
Showing 2 changed files with 200 additions and 190 deletions
  1 +'use strict';
  2 +
  3 +const headerModel = require('../../../doraemon/models/header');
  4 +const msgModel = require('../models/message');
  5 +const helpers = global.yoho.helpers;
  6 +const _ = require('lodash');
  7 +
  8 +const homeNav = (req) => {
  9 + return [
  10 + {
  11 + title: '交易管理',
  12 + subNav: [
  13 + {name: '我的订单', href: '/home/orders', catchs: ['/home/orders', '/home/index', '/home/orders/detail']},
  14 + {name: '我的收藏', href: '/home/favorite', catchs: ['/home/favorite/reduction']},
  15 + {name: '我的有货币', href: '/home/currency'},
  16 + {name: '我的红包', href: '/home/redenvelopes'},
  17 + {name: '我的优惠券', href: '/home/coupons'},
  18 + {name: '我的VIP', href: '/home/vip'}
  19 + ]
  20 + },
  21 + {
  22 + title: '服务中心',
  23 + subNav: [
  24 + {name: '我的退/换货', href: '/home/returns'},
  25 + {name: '我的咨询', href: '/home/consult'},
  26 + {name: '我的评论', href: '/home/comment'},
  27 +
  28 + // {name: '我的投诉', href: '/home/complaints'},
  29 + {name: '我的信息', href: '/home/message', count: 0},
  30 + {
  31 + name: '在线客服',
  32 + href: _.get(req.app.locals.pc, 'clientService.new', false) ?
  33 + '/service/client' : 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409',
  34 + isBlank: true
  35 + }
  36 + ]
  37 + },
  38 + {
  39 + title: '个人信息管理',
  40 + subNav: [
  41 + {name: '编辑个人资料', href: '/home/user'},
  42 + {name: '账号安全', href: '/home/account', catchs: [
  43 + '/home/account/userpwd',
  44 + '/home/account/email',
  45 + '/home/account/mobile',
  46 + '/home/account/checkverifycode',
  47 + '/home/account/checkpassword',
  48 + '/home/account/verifypassword',
  49 + '/home/account/modifypwd',
  50 + '/home/account/sendemail',
  51 + '/home/account/checkemail',
  52 + '/home/account/modifyemail',
  53 + '/home/account/sendemailsuccess',
  54 + '/home/account/mailresult',
  55 + '/home/account/checkmobile',
  56 + '/home/account/checkmobilemsg',
  57 + '/home/account/sendmobilemsg',
  58 + '/home/account/modifymobile'
  59 + ]},
  60 + {name: '地址管理', href: '/home/address'},
  61 + {name: '兑换礼品卡', href: '/home/gift'}
  62 + ]
  63 + }
  64 + ];
  65 +};
  66 +
  67 +const getActiveNav = (req, count)=>{
  68 +
  69 + let mHomeNav = _.cloneDeep(homeNav(req));
  70 + let activeNav = null;
  71 +
  72 + mHomeNav = mHomeNav.map((item) => {
  73 + item.subNav = item.subNav.map((nav) => {
  74 +
  75 + let curMatchPath = req.originalUrl;
  76 +
  77 + if (!nav.matchQuery && curMatchPath.indexOf('?') >= 0) { // 严格的路径匹配，包含后面的参数
  78 + curMatchPath = curMatchPath.substr(0, curMatchPath.indexOf('?'));
  79 + }
  80 +
  81 + if (curMatchPath === nav.href) {
  82 + nav.active = true;
  83 + }
  84 +
  85 + if (nav.name === '我的信息') {
  86 + nav.count = +count;
  87 + }
  88 +
  89 + if (nav.catchs) {
  90 + let index = nav.catchs.indexOf(curMatchPath);
  91 +
  92 + if (index > -1) {
  93 + nav.active = true;
  94 + nav.curHref = nav.catchs[index];
  95 + }
  96 + }
  97 +
  98 + if (nav.active) {
  99 + activeNav = nav;
  100 + }
  101 +
  102 + nav.href = nav.href.indexOf('http://') > -1 ? nav.href : helpers.urlFormat(nav.href);
  103 + return nav;
  104 + });
  105 + return item;
  106 + });
  107 +
  108 + return {
  109 + homeNav: mHomeNav,
  110 + activeNav: activeNav
  111 + };
  112 +};
  113 +
  114 +const getHomeNav = (req, res, next) => {
  115 + msgModel.unreadTotal(req.user.uid).then(result => {
  116 + let navs = getActiveNav(req, _.get(result, 'data.total', 0));
  117 + let activeNav = navs.activeNav;
  118 + let bread = [{href: helpers.urlFormat('/'), name: 'YOHO!BUY 有货首页'}];
  119 +
  120 + if (activeNav) {
  121 + bread.push({
  122 + name: '个人中心',
  123 + href: helpers.urlFormat('/home')
  124 + });
  125 +
  126 + bread.push({
  127 + name: activeNav.name
  128 + });
  129 +
  130 + // 订单详情
  131 + if (activeNav.curHref === '/home/orders/detail') {
  132 + Object.assign(_.last(bread), {
  133 + href: helpers.urlFormat('/home/orders')
  134 + });
  135 + bread.push({
  136 + name: '订单详情'
  137 + });
  138 + }
  139 + } else {
  140 + bread.push({
  141 + name: '个人中心'
  142 + });
  143 + }
  144 +
  145 + res.locals.path = bread; // [{href: helpers.urlFormat('/'), name: 'YOHO!BUY 有货首页'}, {name: '个人中心'}];
  146 + res.locals.homeNav = navs.homeNav;
  147 + res.locals.userThumb = '//img10.static.yhbimg.com/headimg/' +
  148 + '2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif?imageView/2/w/100/h/100';
  149 + next();
  150 + });
  151 +};
  152 +
  153 +const getCommonHeader = (req, res, next) => {
  154 + let channel = req.query.channel ? req.query.channel : 'boys';
  155 +
  156 + headerModel.requestHeaderData(channel).then((result)=>{
  157 + _.merge(res.locals, result);
  158 + next();
  159 + });
  160 +};
  161 +
  162 +module.exports = {
  163 + homeNav,
  164 + getActiveNav,
  165 + getHomeNav,
  166 + getCommonHeader
  167 +};
@@ -8,11 +8,8 @@ @@ -8,11 +8,8 @@
8 const express = require('express'); 8 const express = require('express');
9 const router = express.Router(); // eslint-disable-line 9 const router = express.Router(); // eslint-disable-line
10 const cRoot = './controllers'; 10 const cRoot = './controllers';
11 -const headerModel = require('../../doraemon/models/header');  
12 -const msgModel = require('./models/message');  
13 -const _ = require('lodash');  
14 -const helpers = global.yoho.helpers;  
15 11
  12 +const tabsMiddleware = require(`${cRoot}/general-tabs`);
16 const indexController = require(`${cRoot}/index`); 13 const indexController = require(`${cRoot}/index`);
17 const commentController = require(`${cRoot}/comment`); 14 const commentController = require(`${cRoot}/comment`);
18 15
@@ -42,183 +39,30 @@ const AddressController = require(`${cRoot}/address`); @@ -42,183 +39,30 @@ const AddressController = require(`${cRoot}/address`);
42 39
43 const giftController = require(`${cRoot}/gift`); 40 const giftController = require(`${cRoot}/gift`);
44 41
45 -const homeNav = (req) => {  
46 - return [  
47 - {  
48 - title: '交易管理',  
49 - subNav: [  
50 - {name: '我的订单', href: '/home/orders', catchs: ['/home/orders', '/home/index', '/home/orders/detail']},  
51 - {name: '我的收藏', href: '/home/favorite', catchs: ['/home/favorite/reduction']},  
52 - {name: '我的有货币', href: '/home/currency'},  
53 - {name: '我的红包', href: '/home/redenvelopes'},  
54 - {name: '我的优惠券', href: '/home/coupons'},  
55 - {name: '我的VIP', href: '/home/vip'}  
56 - ]  
57 - },  
58 - {  
59 - title: '服务中心',  
60 - subNav: [  
61 - {name: '我的退/换货', href: '/home/returns'},  
62 - {name: '我的咨询', href: '/home/consult'},  
63 - {name: '我的评论', href: '/home/comment'},  
64 -  
65 - // {name: '我的投诉', href: '/home/complaints'},  
66 - {name: '我的信息', href: '/home/message', count: 0},  
67 - {  
68 - name: '在线客服',  
69 - href: _.get(req.app.locals.pc, 'clientService.new', false) ?  
70 - '/service/client' : 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409',  
71 - isBlank: true  
72 - }  
73 - ]  
74 - },  
75 - {  
76 - title: '个人信息管理',  
77 - subNav: [  
78 - {name: '编辑个人资料', href: '/home/user'},  
79 - {name: '账号安全', href: '/home/account', catchs: [  
80 - '/home/account/userpwd',  
81 - '/home/account/email',  
82 - '/home/account/mobile',  
83 - '/home/account/checkverifycode',  
84 - '/home/account/checkpassword',  
85 - '/home/account/verifypassword',  
86 - '/home/account/modifypwd',  
87 - '/home/account/sendemail',  
88 - '/home/account/checkemail',  
89 - '/home/account/modifyemail',  
90 - '/home/account/sendemailsuccess',  
91 - '/home/account/mailresult',  
92 - '/home/account/checkmobile',  
93 - '/home/account/checkmobilemsg',  
94 - '/home/account/sendmobilemsg',  
95 - '/home/account/modifymobile'  
96 - ]},  
97 - {name: '地址管理', href: '/home/address'},  
98 - {name: '兑换礼品卡', href: '/home/gift'}  
99 - ]  
100 - }  
101 - ];  
102 -};  
103 -  
104 -const getActiveNav = (req, count)=>{  
105 -  
106 - let mHomeNav = _.cloneDeep(homeNav(req));  
107 - let activeNav = null;  
108 -  
109 - mHomeNav = mHomeNav.map((item) => {  
110 - item.subNav = item.subNav.map((nav) => {  
111 -  
112 - let curMatchPath = req.originalUrl;  
113 -  
114 - if (!nav.matchQuery && curMatchPath.indexOf('?') >= 0) { // 严格的路径匹配，包含后面的参数  
115 - curMatchPath = curMatchPath.substr(0, curMatchPath.indexOf('?'));  
116 - }  
117 -  
118 - if (curMatchPath === nav.href) {  
119 - nav.active = true;  
120 - }  
121 -  
122 - if (nav.name === '我的信息') {  
123 - nav.count = +count;  
124 - }  
125 -  
126 - if (nav.catchs) {  
127 - let index = nav.catchs.indexOf(curMatchPath);  
128 -  
129 - if (index > -1) {  
130 - nav.active = true;  
131 - nav.curHref = nav.catchs[index];  
132 - }  
133 - }  
134 -  
135 - if (nav.active) {  
136 - activeNav = nav;  
137 - }  
138 -  
139 - nav.href = nav.href.indexOf('http://') > -1 ? nav.href : helpers.urlFormat(nav.href);  
140 - return nav;  
141 - });  
142 - return item;  
143 - });  
144 -  
145 - return {  
146 - homeNav: mHomeNav,  
147 - activeNav: activeNav  
148 - };  
149 -};  
150 -  
151 -const getHomeNav = (req, res, next) => {  
152 - msgModel.unreadTotal(req.user.uid).then(result => {  
153 - let navs = getActiveNav(req, _.get(result, 'data.total', 0));  
154 - let activeNav = navs.activeNav;  
155 - let bread = [{href: helpers.urlFormat('/'), name: 'YOHO!BUY 有货首页'}];  
156 -  
157 - if (activeNav) {  
158 - bread.push({  
159 - name: '个人中心',  
160 - href: helpers.urlFormat('/home')  
161 - });  
162 -  
163 - bread.push({  
164 - name: activeNav.name  
165 - });  
166 -  
167 - // 订单详情  
168 - if (activeNav.curHref === '/home/orders/detail') {  
169 - Object.assign(_.last(bread), {  
170 - href: helpers.urlFormat('/home/orders')  
171 - });  
172 - bread.push({  
173 - name: '订单详情'  
174 - });  
175 - }  
176 - } else {  
177 - bread.push({  
178 - name: '个人中心'  
179 - });  
180 - }  
181 -  
182 - res.locals.path = bread; // [{href: helpers.urlFormat('/'), name: 'YOHO!BUY 有货首页'}, {name: '个人中心'}];  
183 - res.locals.homeNav = navs.homeNav;  
184 - res.locals.userThumb = '//img10.static.yhbimg.com/headimg/' +  
185 - '2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif?imageView/2/w/100/h/100';  
186 - next();  
187 - });  
188 -};  
189 -  
190 -const getCommonHeader = (req, res, next) => {  
191 - let channel = req.query.channel ? req.query.channel : 'boys';  
192 -  
193 - headerModel.requestHeaderData(channel).then((result)=>{  
194 - _.merge(res.locals, result);  
195 - next();  
196 - });  
197 -};  
198 42
199 // 首页 43 // 首页
200 -router.get(['/index', '/'], [getHomeNav, getCommonHeader], indexController.index); 44 +router.get(['/index', '/'], [tabsMiddleware.getHomeNav, tabsMiddleware.getCommonHeader], indexController.index);
201 45
202 // 查看二维码 46 // 查看二维码
203 -router.get('/QRcode', [getHomeNav, getCommonHeader], personalController.QRcode); 47 +router.get('/QRcode', [tabsMiddleware.getHomeNav, tabsMiddleware.getCommonHeader], personalController.QRcode);
204 48
205 49
206 // 我的评论 50 // 我的评论
207 -router.get('/comment', [getCommonHeader, getHomeNav], commentController.index); 51 +router.get('/comment', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], commentController.index);
208 router.post('/comment/saveComment', commentController.saveComment); 52 router.post('/comment/saveComment', commentController.saveComment);
209 -router.get('/comment/order', [getCommonHeader, getHomeNav], commentController.commentList4Order); 53 +router.get('/comment/order', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], commentController.commentList4Order);
210 54
211 // 我的咨询 55 // 我的咨询
212 -// router.get('/consult', [getCommonHeader, getHomeNav], consultController.index); 56 +// router.get('/consult', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], consultController.index);
213 57
214 // 我的投诉 58 // 我的投诉
215 -// router.get('/complaints', [getCommonHeader, getHomeNav], complaintsController.index); 59 +// router.get('/complaints', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], complaintsController.index);
216 // router.post('/complaints/submit', complaintsController.submit); 60 // router.post('/complaints/submit', complaintsController.submit);
217 // router.post('/complaints/cancel', complaintsController.cancel); 61 // router.post('/complaints/cancel', complaintsController.cancel);
218 62
219 // 我的消息 63 // 我的消息
220 -router.get('/message', [getCommonHeader, getHomeNav], messageController.index);  
221 -router.get('/message/detail', [getCommonHeader, getHomeNav], messageController.detail); 64 +router.get('/message', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], messageController.index);
  65 +router.get('/message/detail', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], messageController.detail);
222 router.get('/message/del', messageController.delMsg); 66 router.get('/message/del', messageController.delMsg);
223 router.get('/message/read', messageController.readMsg); 67 router.get('/message/read', messageController.readMsg);
224 router.get('/message/pickCoupon', messageController.pickCoupon); 68 router.get('/message/pickCoupon', messageController.pickCoupon);
@@ -231,30 +75,29 @@ router.get('/message/pickCoupon', messageController.pickCoupon); @@ -231,30 +75,29 @@ router.get('/message/pickCoupon', messageController.pickCoupon);
231 // router.get('/exchange/detail', returnsController.refundDetail); 75 // router.get('/exchange/detail', returnsController.refundDetail);
232 // router.get('/returns/success', returnsController.index); 76 // router.get('/returns/success', returnsController.index);
233 77
234 -// router.get('/index', [getCommonHeader, getHomeNav], IndexController.index); 78 +// router.get('/index', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], IndexController.index);
235 79
236 /* 我的YOHO币 */ 80 /* 我的YOHO币 */
237 -router.get('/currency', [getCommonHeader, getHomeNav], currencyController.index); 81 +router.get('/currency', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], currencyController.index);
238 82
239 /* 我的红包 */ 83 /* 我的红包 */
240 -router.get('/redenvelopes', [getCommonHeader, getHomeNav], redenvelopesController.index); 84 +router.get('/redenvelopes', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], redenvelopesController.index);
241 85
242 /* 我的VIP */ 86 /* 我的VIP */
243 -router.get('/vip', [getCommonHeader, getHomeNav], vipController.index); 87 +router.get('/vip', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], vipController.index);
244 88
245 /* 我的优惠卷 */ 89 /* 我的优惠卷 */
246 -router.get('/coupons', [getCommonHeader, getHomeNav], couponsController.index);  
247 -// router.get('/vip', VipController.index); 90 +router.get('/coupons', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], couponsController.index);
248 91
249 /********************************* 我的收藏开始 *****************************************/ 92 /********************************* 我的收藏开始 *****************************************/
250 // 我的收藏 93 // 我的收藏
251 -router.get('/favorite', [getCommonHeader, getHomeNav], favoriteController.index); 94 +router.get('/favorite', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], favoriteController.index);
252 95
253 // 品牌页新品到着 96 // 品牌页新品到着
254 router.get('/favorite/newproduct', favoriteController.newProduct); 97 router.get('/favorite/newproduct', favoriteController.newProduct);
255 98
256 // 降价提醒 99 // 降价提醒
257 -router.get('/favorite/reduction', [getCommonHeader, getHomeNav], favoriteController.reduction); 100 +router.get('/favorite/reduction', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], favoriteController.reduction);
258 101
259 // 设置降价提醒 102 // 设置降价提醒
260 router.get('/favorite/notice', favoriteController.notice); 103 router.get('/favorite/notice', favoriteController.notice);
@@ -268,7 +111,7 @@ router.get('/favorite/cancel', favoriteController.cancel); @@ -268,7 +111,7 @@ router.get('/favorite/cancel', favoriteController.cancel);
268 /********************************* 我的收藏结束 *****************************************/ 111 /********************************* 我的收藏结束 *****************************************/
269 112
270 /********************************* 我的订单开始 *****************************************/ 113 /********************************* 我的订单开始 *****************************************/
271 -router.get('/orders', [getCommonHeader, getHomeNav], ordersController.index); 114 +router.get('/orders', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], ordersController.index);
272 115
273 // 重新加入购物车 116 // 重新加入购物车
274 router.post('/orders/readd', ordersController.reBuy); 117 router.post('/orders/readd', ordersController.reBuy);
@@ -286,7 +129,7 @@ router.post('/orders/confirmOrder', ordersController.confirm); @@ -286,7 +129,7 @@ router.post('/orders/confirmOrder', ordersController.confirm);
286 router.post('/orders/cancelOrder', ordersController.cancel); 129 router.post('/orders/cancelOrder', ordersController.cancel);
287 130
288 // 订单详情 131 // 订单详情
289 -router.get('/orders/detail', [getCommonHeader, getHomeNav], ordersController.detail); 132 +router.get('/orders/detail', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], ordersController.detail);
290 133
291 // 物流信息 134 // 物流信息
292 router.get('/orders/express', ordersController.express); 135 router.get('/orders/express', ordersController.express);
@@ -296,7 +139,7 @@ router.get('/orders/express', ordersController.express); @@ -296,7 +139,7 @@ router.get('/orders/express', ordersController.express);
296 139
297 // router.get('/coupons', CouponsController.index); 140 // router.get('/coupons', CouponsController.index);
298 141
299 -router.get('/user', [getCommonHeader, getHomeNav], UserController.index); 142 +router.get('/user', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], UserController.index);
300 143
301 router.post('/user/edituserinfo', UserController.editUserInfo); 144 router.post('/user/edituserinfo', UserController.editUserInfo);
302 145
@@ -340,31 +183,31 @@ router.get('/bind/renren/callback', bindController.renren.callback); @@ -340,31 +183,31 @@ router.get('/bind/renren/callback', bindController.renren.callback);
340 router.post('/cancelbind/:type', bindController.cancelBind); 183 router.post('/cancelbind/:type', bindController.cancelBind);
341 184
342 // 账号安全 185 // 账号安全
343 -router.get('/account', [getCommonHeader, getHomeNav], AccountController.index); 186 +router.get('/account', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], AccountController.index);
344 187
345 -router.get('/account/userpwd', [getCommonHeader, getHomeNav], AccountController.userPwd); 188 +router.get('/account/userpwd', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], AccountController.userPwd);
346 189
347 -router.get('/account/email', [getCommonHeader, getHomeNav], AccountController.userEmail); 190 +router.get('/account/email', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], AccountController.userEmail);
348 191
349 -router.get('/account/mobile', [getCommonHeader, getHomeNav], AccountController.userMobile); 192 +router.get('/account/mobile', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], AccountController.userMobile);
350 193
351 -router.post('/account/checkverifycode', [getCommonHeader, getHomeNav], AccountController.checkVerifyCode); 194 +router.post('/account/checkverifycode', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], AccountController.checkVerifyCode);
352 195
353 -router.post('/account/checkpassword', [getCommonHeader, getHomeNav], AccountController.checkPassword); 196 +router.post('/account/checkpassword', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], AccountController.checkPassword);
354 197
355 -router.post('/account/verifypassword', [getCommonHeader, getHomeNav], AccountController.verifyPassword); 198 +router.post('/account/verifypassword', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], AccountController.verifyPassword);
356 199
357 -router.post('/account/modifypwd', [getCommonHeader, getHomeNav], AccountController.modifyPwd); 200 +router.post('/account/modifypwd', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], AccountController.modifyPwd);
358 201
359 router.post('/account/sendemail', AccountController.sendEmail); 202 router.post('/account/sendemail', AccountController.sendEmail);
360 203
361 -router.post('/account/checkemail', [getCommonHeader, getHomeNav], AccountController.checkEmail); 204 +router.post('/account/checkemail', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], AccountController.checkEmail);
362 205
363 -router.post('/account/modifyemail', [getCommonHeader, getHomeNav], AccountController.modifyEmail); 206 +router.post('/account/modifyemail', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], AccountController.modifyEmail);
364 207
365 -router.get('/account/sendemailsuccess', [getCommonHeader, getHomeNav], AccountController.sendEmailSuccess); 208 +router.get('/account/sendemailsuccess', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], AccountController.sendEmailSuccess);
366 209
367 -router.get('/account/mailresult', [getCommonHeader, getHomeNav], AccountController.mailResult); 210 +router.get('/account/mailresult', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], AccountController.mailResult);
368 211
369 router.post('/account/checkmobile', AccountController.checkMobile); 212 router.post('/account/checkmobile', AccountController.checkMobile);
370 213
@@ -376,7 +219,7 @@ router.post('/account/modifymobile', AccountController.modifyMobile); @@ -376,7 +219,7 @@ router.post('/account/modifymobile', AccountController.modifyMobile);
376 219
377 // 地址管理 220 // 地址管理
378 221
379 -router.get('/address', [getCommonHeader, getHomeNav], AddressController.index); 222 +router.get('/address', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], AddressController.index);
380 223
381 router.get('/address/area', UserController.getProviceList); 224 router.get('/address/area', UserController.getProviceList);
382 225
@@ -390,7 +233,7 @@ router.get('/address/defaultAddress', AddressController.defaultAddress); @@ -390,7 +233,7 @@ router.get('/address/defaultAddress', AddressController.defaultAddress);
390 233
391 // 兑换礼品卡 234 // 兑换礼品卡
392 235
393 -router.get('/gift', [getCommonHeader, getHomeNav], giftController.index); 236 +router.get('/gift', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], giftController.index);
394 237
395 router.post('/gift/exchange', giftController.exchange); 238 router.post('/gift/exchange', giftController.exchange);
396 239