comment

@@ -7,6 +7,8 @@
 var express = require('express'),
     path = require('path');
 
+const auth = require(`${global.middleware}/auth`);
+
 var app = express();
 
 // set view engin
@@ -27,6 +29,6 @@ app.use(global.yoho.hbs({
 }));
 
 // router
-app.use(require('./router'));
+app.use(auth, require('./router'));
 
 module.exports = app;

@@ -11,7 +11,6 @@ const cRoot = './controllers';
 const headerModel = require('../../doraemon/models/header');
 const _ = require('lodash');
 const helpers = global.yoho.helpers;
-const config = global.yoho.config;
 
 const commentController = require(`${cRoot}/comment`);
 
@@ -68,21 +67,21 @@ const getActiveNav = (req)=>{
 
     return mHomeNav.map((item) => {
         item.subNav = item.subNav.map((nav) => {
+
+            let curMatchPath = req.originalUrl;
+
+            if (!nav.matchQuery && curMatchPath.indexOf('?') >= 0) { // 严格的路径匹配，包含后面的参数
+                curMatchPath = curMatchPath.substr(0, curMatchPath.indexOf('?'));
+            }
+
             if (nav.catchs) {
-                if (nav.catchs.indexOf(req.originalUrl) > -1) {
+                if (nav.catchs.indexOf(curMatchPath) > -1) {
                     nav.active = true;
                 }
             } else {
-                if (nav.matchQuery) {    // 严格的路径匹配，包含后面的参数
-                    if (req.originalUrl === nav.href) {
-                        nav.active = true;
-                    }
-                } else {
-                    if (req.originalUrl.substr(0, req.originalUrl.indexOf('?')) === nav.href) {
-                        nav.active = true;
-                    }
+                if (curMatchPath === nav.href) {
+                    nav.active = true;
                 }
-
             }
 
             nav.href = nav.href.indexOf('http://') > -1 ? nav.href : helpers.urlFormat(nav.href);
@@ -95,8 +94,8 @@ const getActiveNav = (req)=>{
 const getHomeNav = (req, res, next) => {
     res.locals.path = [{href: helpers.urlFormat('/'), name: 'YOHO!BUY 有货首页'}, {name: '个人中心'}];
     res.locals.homeNav = getActiveNav(req);
-    res.locals.userThumb = `//img10.static.yhbimg.com/headimg/
-    2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif?imageView/2/w/100/h/100`;
+    res.locals.userThumb = '//img10.static.yhbimg.com/headimg/' +
+                           '2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif?imageView/2/w/100/h/100';
     next();
 };
 const getCommonHeader = (req, res, next) => {
@@ -107,27 +106,9 @@ const getCommonHeader = (req, res, next) => {
         next();
     });
 };
-const sessionEffective = (req, res, next) => {
-    let refer = req.cookies.refer;
-
-    if (req.user.uid) {
-        next();
-        return;
-    }
-
-    if (refer) {
-        refer = decodeURI(req.cookies.refer);
-    } else {
-        refer = config.siteUrl;
-    }
-
-    res.redirect(helpers.urlFormat('/signin.html', {
-        refer: refer
-    }));
-};
 
 // 查看二维码
-router.get('/QRcode', sessionEffective, [getHomeNav, getCommonHeader], personalController.QRcode);
+router.get('/QRcode', [getHomeNav, getCommonHeader], personalController.QRcode);
 
 
 // 我的评论

@@ -33,6 +33,7 @@ var resetForm = function($f) {
     resetImg($f.find('.img-preview'));
 };
 
+require('../common');
 require('../common/ajaxfileupload');
 
 $('.comment-add').on('click', '.btn-submit', function() {

@@ -9,8 +9,7 @@
         .path-icon {
             float: left;
             display: block;
-            background: resolve(sprite.home.png);
-            background-position: -22px -24px;
+            background: resolve(home/home-icon.png);
             width: 15px;
             height: 15px;
             margin-right: 10px;