Authored by 沈志敏

fix bug

... ... @@ -23,6 +23,7 @@ const memcached = require('connect-memcached');
const pkg = require('./package.json');
const devtools = require('./doraemon/middleware/devtools');
const uuid = require('uuid');
const app = express();
const MemcachedStore = memcached(session);
... ... @@ -82,6 +83,9 @@ app.use((req, res, next) => {
req.user = {}; // 全局的用户数据
req.yoho = {}; // req和res绑定yoho对象,用于传递全局数据, 如req.yoho.channel等
if (!req.sessionID) {
req.sessionID = uuid.v4();
}
next();
});
... ...
... ... @@ -7,25 +7,6 @@
const homeModel = require('../models/index');
const helpers = global.yoho.helpers;
const _ = require('lodash');
const md5 = require('md5');
const requestIp = require('request-ip');
/**
* 获取客户端唯一标识
* @return string
*/
const getUdid = (req, res) => {
let udid = req.cookies.udid;
if (!udid) {
udid = md5(req.ip || requestIp.getClientIp(req));
if (res && res.cookie) {
res.cookie('udid', udid);
}
}
return udid;
};
/**
* 个人中心主页
... ... @@ -235,7 +216,7 @@ const component = {
message: 'not login'
});
} else {
homeModel.recordNum(req.user.uid, getUdid(req, res)).then(result => {
homeModel.recordNum(req.user.uid, req.sessionID).then(result => {
res.json(result);
}).catch(next);
}
... ... @@ -250,7 +231,7 @@ const component = {
message: 'not login'
});
} else {
homeModel.addRecords(req.user.uid, getUdid(req, res), browserSkn).then(result => {
homeModel.addRecords(req.user.uid, req.sessionID, browserSkn).then(result => {
res.cookie('_browseskn', '', {
maxAge: 0,
domain: '.yohoblk.com'
... ...
... ... @@ -4,9 +4,7 @@
* @date: 2016/12/6
*/
'use strict';
const requestIp = require('request-ip');
const preferModel = require('../models/prefer');
const md5 = require('md5');
const _channel = (channel) => {
let yhChannel = 1;
... ... @@ -29,23 +27,6 @@ const _channel = (channel) => {
};
/**
* 获取客户端唯一标识
* @return string
*/
const getUdid = (req, res) => {
let udid = req.cookies.udid;
if (!udid) {
udid = md5(req.ip || requestIp.getClientIp(req));
if (res && res.cookie) {
res.cookie('udid', udid);
}
}
return udid;
};
/**
* 个人中心主页
*/
const component = {
... ... @@ -58,7 +39,7 @@ const component = {
list(req, res, next) {
let params = {
yh_channel: _channel(req.query.channel || req.cookies._Channel || 'men'),
udid: getUdid(req, res)
udid: req.sessionID
};
preferModel.getlist(params).then((result) => {
... ...
... ... @@ -92,7 +92,6 @@
"webpack-stream": "^3.1.0",
"yoho-cookie": "1.2.0",
"yoho-qs": "1.0.1",
"yoho-store": "^1.3.20",
"request-ip": "^1.2.3"
"yoho-store": "^1.3.20"
}
}
... ...
... ... @@ -48,13 +48,17 @@
}
},
created() {
const skns = {};
const limit = 50;
let page = 0;
this.floor.forEach(item => {
this.productSkn.push(item.id);
// 去除重复 skn
if (!skns[item.id]) {
skns[item.id] = 1;
}
});
this.productSkn = Object.keys(skns);
this.getProducts(this.productSkn.slice(page, limit));
bus.$on('list.paging', () => {
... ...