Authored by 梁志锋

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	package.json
... ... @@ -52,7 +52,7 @@ const _processPublicData = (req, title, page, backUrl) => {
* @return {[type]}
*/
let index = (req, res, next) => {
let refer = req.get('Referer') || '';
let refer = req.get('Referer') || `${global.yoho.config.siteUrl}/${req.cookies._Channel || ''}`;
let reqPath = req.baseUrl + req.path;
let backUrl = refer.indexOf(reqPath) === -1 ? refer : '';
... ... @@ -60,7 +60,9 @@ let index = (req, res, next) => {
return next();
}
backUrl && res.cookie('saleRefer', backUrl);
backUrl && res.cookie('saleRefer', backUrl, {
domain: 'm.yohobuy.com'
});
backUrl = backUrl || req.cookies.saleRefer;
let params = _processPublicData(req, 'SALE', 'sale', backUrl);
... ...
{
"name": "m-yohobuy-node",
"version": "1.0.4",
"version": "4.8.0",
"private": true,
"description": "A New Yohobuy Project With Express",
"repository": {
... ...
... ... @@ -7,7 +7,7 @@
display: inline-block;
width: 275px;
height: 160px;
border-radius: 8px;
border-radius: 10px;
background-size: 100%;
background-repeat: no-repeat;
background-position: center;
... ...
... ... @@ -24,12 +24,12 @@
.arrow {
position: absolute;
top: -16px;
top: -14px;
right: 30px;
width: 0;
height: 0;
border-style: solid;
border-width: 0 10px 16px;
border-width: 0 14px 16px;
border-color: transparent transparent #000;
}
... ...