From 9e555eb4898857bc39c834aa989ee83516035129 Mon Sep 17 00:00:00 2001
From: yyq <kingcoon@163.com>
Date: Mon, 29 Jan 2018 14:40:13 +0800
Subject: [PATCH] fix channel
---
apps/channel/controllers/index.js | 6 +++++-
apps/channel/models/index.js | 2 +-
apps/channel/router.js | 8 +++-----
config/common.js | 2 +-
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/apps/channel/controllers/index.js b/apps/channel/controllers/index.js
index a5db190..67d326f 100644
--- a/apps/channel/controllers/index.js
+++ b/apps/channel/controllers/index.js
@@ -100,7 +100,11 @@ exports.hasNewUserFloor = (req, res, next) => {
// 频道页301重定向
exports.redirect = (goUrl) => {
- return function(req, res) {
+ return function(req, res, next) {
+ if (req.path === goUrl) {
+ return next();
+ }
+
res.redirect(301, goUrl);
};
};
diff --git a/apps/channel/models/index.js b/apps/channel/models/index.js
index 556ed67..66362b5 100644
--- a/apps/channel/models/index.js
+++ b/apps/channel/models/index.js
@@ -108,7 +108,7 @@ module.exports = class extends global.yoho.BaseModel {
floorData.newUserFloor.hasSwitch = proList.length > 5 ? true : false;
_.forEach(proList, value => {
- value.thumb = helpers.image(value.goods_list[0].images_url, 185, 247);
+ value.thumb = helpers.image(_.get(value, 'goods_list[0].images_url'), 185, 247);
value.for_newuser = true;
value.url = helpers.getUrlBySkc(value.product_skn);
});
diff --git a/apps/channel/router.js b/apps/channel/router.js
index 8c5aadd..ac9a5e2 100644
--- a/apps/channel/router.js
+++ b/apps/channel/router.js
@@ -17,11 +17,9 @@ const sitemap = require('../3party/controllers/sitemap');
// 频道页路由
router.get('/', channelController.index);
router.get('/woman', channelController.redirect('/girls/'));
-router.get('/girls', channelController.redirect('/girls/'));
-router.get('/girls/', channelController.index);
-router.get('/kids', channelController.redirect('/kids/'));
-router.get('/kids/', channelController.index);
-router.get('/lifestyle', channelController.redirect('/lifestyle/'));
+router.get('/girls', channelController.redirect('/girls/'), channelController.index);
+router.get('/kids', channelController.redirect('/kids/'), channelController.index);
+router.get('/lifestyle', channelController.redirect('/lifestyle/'), channelController.index);
router.get('/lifestyle/', channelController.index);
router.get('/japanKorean', channelController.japanKorean);
router.get('/channel/isNewUserAjax', channelController.hasNewUserFloor);
diff --git a/config/common.js b/config/common.js
index b72f22f..ce38ead 100644
--- a/config/common.js
+++ b/config/common.js
@@ -110,7 +110,7 @@ module.exports = {
port: '4444' // influxdb port
},
console: {
- level: 'debug',
+ level: 'info',
colorize: 'all',
prettyPrint: true
}
--
libgit2 0.24.0