我的咨询

@@ -11,7 +11,7 @@ const cRoot = './controllers';
 const headerModel = require('../../doraemon/models/header');
 const _ = require('lodash');
 const helpers = global.yoho.helpers;
-const config = global.yoho.config;
+// const config = global.yoho.config;
 
 const commentController = require(`${cRoot}/comment`);
 const consultController = require(`${cRoot}/consult`);
@@ -19,16 +19,16 @@ const returnsController = require(`${cRoot}/returns`);
 const IndexController = require(`${cRoot}/Index`);
 const CurrencyController = require(`${cRoot}/Currency`);
 const personalController = require(`${cRoot}/qrcode`);
-const RedenvelopesController=require(`${cRoot}/Redenvelopes`);
-const VipController=require(`${cRoot}/vip`);
-const FavoriteController=require(`${cRoot}/Favorite`);
-const CouponsController=require(`${cRoot}/coupons`);
+const RedenvelopesController = require(`${cRoot}/Redenvelopes`);
+const VipController = require(`${cRoot}/vip`);
+const FavoriteController = require(`${cRoot}/Favorite`);
+const CouponsController = require(`${cRoot}/coupons`);
 
 const homeNav = [
     {
         title: '交易管理',
         subNav: [
-                    {name: '我的订单', href: '/home/orders',catchs:['/home/orders','/home/index']},
+                    {name: '我的订单', href: '/home/orders', catchs: ['/home/orders', '/home/index']},
                     {name: '我的收藏', href: '/home/favorite'},
                     {name: '我的YOHO币', href: '/home/currency'},
                     {name: '我的红包', href: '/home/redenvelopes'},
@@ -58,26 +58,25 @@ const homeNav = [
     }
 ];
 
-const getActiveNav=(req)=>{
-    return homeNav.map((item,index)=>{
-        item.subNav=item.subNav.map((nav)=>{
-            if(nav.catchs){
-                console.log(nav.catchs);
-                if(nav.catchs.indexOf(req.originalUrl)>-1){
-                    nav.active=true;
+const getActiveNav = (req)=>{
+    return homeNav.map((item) => {
+        item.subNav = item.subNav.map((nav) => {
+            if (nav.catchs) {
+                if (nav.catchs.indexOf(req.originalUrl) > -1) {
+                    nav.active = true;
                 }
-            }else{
-                if(req.originalUrl===nav.href){
-                    nav.active=true;
+            } else {
+                if (req.originalUrl === nav.href) {
+                    nav.active = true;
                 }
             }
 
-            nav.href=nav.href.indexOf("http://")>-1?nav.href:helpers.urlFormat(nav.href);
+            nav.href = nav.href.indexOf('http://') > -1 ? nav.href : helpers.urlFormat(nav.href);
             return nav;
         });
         return item;
     });
-}
+};
 
 const getHomeNav = (req, res, next) => {
     res.locals.path = [{href: helpers.urlFormat('/'), name: 'YOHO!BUY 有货首页'}, {name: '个人中心'}];
@@ -88,31 +87,33 @@ const getHomeNav = (req, res, next) => {
 };
 const getCommonHeader = (req, res, next) => {
     let channel = req.query.channel ? req.query.channel : 'boys';
-    headerModel.requestHeaderData(channel).then((result)=>{
+
+    headerModel.requestHeaderData(channel).then((result) => {
         _.merge(res.locals, result);
         next();
     });
 };
-const sessionEffective = (req, res, next) => {
-    let refer = req.cookies.refer;
 
-    if (req.user.uid) {
-        next();
-        return;
-    }
+// const sessionEffective = (req, res, next) => {
+//     let refer = req.cookies.refer;
 
-    if (refer) {
-        refer = decodeURI(req.cookies.refer);
-    } else {
-        refer = config.siteUrl;
-    }
+//     if (req.user.uid) {
+//         next();
+//         return;
+//     }
 
-    res.redirect(helpers.urlFormat('/signin.html', {
-        refer: refer
-    }));
+//     if (refer) {
+//         refer = decodeURI(req.cookies.refer);
+//     } else {
+//         refer = config.siteUrl;
+//     }
 
-    // next();
-};
+//     res.redirect(helpers.urlFormat('/signin.html', {
+//         refer: refer
+//     }));
+
+//     // next();
+// };
 
 // 查看二维码
 router.get('/QRcode', [getCommonHeader, getHomeNav], personalController.QRcode);
@@ -124,7 +125,7 @@ router.get('/comment', commentController.index);
 router.post('/comment/saveComment', commentController.saveComment);
 
 // 我的咨询
-router.get('/consult', consultController.index);
+router.get('/consult', [getCommonHeader, getHomeNav], consultController.index);
 
 // 我的退/换货
 router.get('/returns', returnsController.index);
@@ -137,13 +138,15 @@ router.get('/returns', returnsController.index);
 router.get('/index', [getCommonHeader, getHomeNav], IndexController.index);
 
 router.get('/currency', CurrencyController.index);
-/*我的红包*/
-router.get('/redenvelopes',RedenvelopesController.index);
-/*我的VIP*/
-router.get('/vip',VipController.index);
 
-router.get('/favorite',FavoriteController.index);
+/* 我的红包*/
+router.get('/redenvelopes', RedenvelopesController.index);
+
+/* 我的VIP*/
+router.get('/vip', VipController.index);
+
+router.get('/favorite', FavoriteController.index);
 
-router.get('/coupons',CouponsController.index);
+router.get('/coupons', CouponsController.index);
 
 module.exports = router;