Merge branch 'master' into release/5.1

@@ -15,7 +15,7 @@ const helpers = global.yoho.helpers;
 
 // 新品到着
 const newGoods = (req, res, next) => {
-    let channel = req.cookies._Channel;
+    let channel = req.yoho.channel;
 
     newModel.getNewFocus(channel).then((result) => {
         res.render('new/new', {

@@ -1247,7 +1247,7 @@ const _detailDataPkg = (origin, ua) => {
     });
 
   // 品牌信息
-    if (origin.brand) {
+    if (origin.brand_info) {
         let extra = `?productSkn=${origin.product_skn}&brandId=${origin.brand_info.brand_id}`;
 
         dest.preferenceUrl = `/product/detail/preference${extra}`;