Authored by 张丽霞

为你优选调整至product目录下

1 -/**  
2 - * sub app preference  
3 - * @author: lixia.zhang@yoho.cn<lixia.zhang@yoho.cn>  
4 - * @date: 2016/07/01  
5 - */  
6 -  
7 -var express = require('express'),  
8 - path = require('path'),  
9 - hbs = require('express-handlebars');  
10 -  
11 -var app = express();  
12 -  
13 -// set view engin  
14 -var doraemon = path.join(__dirname, '../../doraemon/views'); // parent view root  
15 -  
16 -app.on('mount', function(parent) {  
17 - delete parent.locals.settings; // 不继承父 App 的设置  
18 - Object.assign(app.locals, parent.locals);  
19 -});  
20 -  
21 -app.set('views', path.join(__dirname, 'views/action'));  
22 -app.engine('.hbs', hbs({  
23 - extname: '.hbs',  
24 - defaultLayout: 'layout',  
25 - layoutsDir: doraemon,  
26 - partialsDir: ['./views/partial', `${doraemon}/partial`],  
27 - helpers: global.yoho.helpers  
28 -}));  
29 -  
30 -// router  
31 -app.use(require('./router'));  
32 -  
33 -module.exports = app;  
1 -/**  
2 - * router of sub app preference  
3 - * @author: lixia.zhang@yoho.cn<lixia.zhang@yoho.cn>  
4 - * @date: 2016/07/01  
5 - */  
6 -  
7 -'use strict';  
8 -  
9 -const express = require('express');  
10 -const router = express.Router(); // eslint-disable-line  
11 -const cRoot = './controllers';  
12 -  
13 -// Your controller here  
14 -const preference = require(`${cRoot}/preference`);  
15 -  
16 -// routers  
17 -  
18 -router.get('/', preference.index);  
19 -  
20 -module.exports = router;  
1 'use strict'; 1 'use strict';
2 2
3 const mRoot = '../models'; 3 const mRoot = '../models';
4 -const couponModel = require(`${mRoot}/preference`); // 领取优惠券 model 4 +const recommendForYouModel = require(`${mRoot}/recommend-for-you`); // 领取优惠券 model
5 5
6 exports.index = (req, res, next) => { 6 exports.index = (req, res, next) => {
7 var renderData = { 7 var renderData = {
@@ -20,7 +20,7 @@ exports.index = (req, res, next) => { @@ -20,7 +20,7 @@ exports.index = (req, res, next) => {
20 20
21 // 测试假数据 21 // 测试假数据
22 // res.render('coupon', renderData); // 渲染页面 22 // res.render('coupon', renderData); // 渲染页面
23 - couponModel.getPreference({ 23 + recommendForYouModel.getPreference({
24 yh_channel: yhChannel, 24 yh_channel: yhChannel,
25 udid: udid, 25 udid: udid,
26 limit: limit, 26 limit: limit,
@@ -30,13 +30,11 @@ exports.index = (req, res, next) => { @@ -30,13 +30,11 @@ exports.index = (req, res, next) => {
30 30
31 if (preferenceData.code === 200) { 31 if (preferenceData.code === 200) {
32 // 获取信息成功 32 // 获取信息成功
33 - console.log(preferenceData);  
34 - console.log('哈哈哈哈哈哈啊哈哈哈哈哈哈哈哈');  
35 } 33 }
36 - res.render('preference', { 34 + res.render('recommend-for-you/index', {
37 result: preferenceData, 35 result: preferenceData,
38 - module: 'preference',  
39 - page: 'index' 36 + module: 'product',
  37 + page: 'recommend'
40 }); 38 });
41 }).catch(next); 39 }).catch(next);
42 }; 40 };
@@ -21,6 +21,9 @@ const sale = require(`${cRoot}/sale`); @@ -21,6 +21,9 @@ const sale = require(`${cRoot}/sale`);
21 // outlet controller 21 // outlet controller
22 const outlet = require(`${cRoot}/outlet`); 22 const outlet = require(`${cRoot}/outlet`);
23 23
  24 +// recommend-for-you controller
  25 +const recommendForYou = require(`${cRoot}/recommend-for-you`);
  26 +
24 // routers 27 // routers
25 28
26 // /pro_136349_455445/HEARTSOFARMianMaShuJiaoXiuXianKuPS1684.html 29 // /pro_136349_455445/HEARTSOFARMianMaShuJiaoXiuXianKuPS1684.html
@@ -46,4 +49,6 @@ router.get('/outlet/activity', outlet.activityDetail); @@ -46,4 +49,6 @@ router.get('/outlet/activity', outlet.activityDetail);
46 49
47 router.get('/outlet/activityinfo', outlet.activityList); 50 router.get('/outlet/activityinfo', outlet.activityList);
48 51
  52 +router.get('/recommendforyou', recommendForYou.index);
  53 +
49 module.exports = router; 54 module.exports = router;
@@ -16,6 +16,4 @@ module.exports = app => { @@ -16,6 +16,4 @@ module.exports = app => {
16 app.use('/guang', require('./apps/guang')); 16 app.use('/guang', require('./apps/guang'));
17 app.use('/passport', require('./apps/passport')); 17 app.use('/passport', require('./apps/passport'));
18 app.use('/activity', require('./apps/activity')); 18 app.use('/activity', require('./apps/activity'));
19 -  
20 - app.use('/newPreference', require('./apps/preference'));  
21 }; 19 };