Merge branch 'gray' into 'master'

Gray



See merge request !78

@@ -27,7 +27,7 @@ module.exports = {
     getBrandList: (req, res, next) => {
     getBrandList: (req, res, next) => {
 
 
         brandModel.getBrandListData({
         brandModel.getBrandListData({
-            channel: req.query.channel || req.cookies._Channel || 'men'
+            channel: req.query.channel
         }).then(result => {
         }).then(result => {
             res.json(result);
             res.json(result);
         }).catch(next);
         }).catch(next);

@@ -28,7 +28,7 @@ module.exports = {
     getBrandListOriginData(params) {
     getBrandListOriginData(params) {
         return api.get('', {
         return api.get('', {
             method: 'app.brand.allBrandList',
             method: 'app.brand.allBrandList',
-            yh_channel: yhChannel[params.channel].channel
+            yh_channel: params.channel ? yhChannel[params.channel].channel : ''
         }, {
         }, {
             code: 200,
             code: 200,
             cache: true
             cache: true

 {
 {
   "name": "yohoblk-wap",
   "name": "yohoblk-wap",
-  "version": "2.0.37",
+  "version": "2.0.38",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -22,7 +22,7 @@
         data() {
         data() {
             return {
             return {
                 page: 'brand',
                 page: 'brand',
-                channel: detaultChannel,
+                channel: qs.channel,
                 contentCode: contentCode.brand[detaultChannel]
                 contentCode: contentCode.brand[detaultChannel]
             };
             };
         },
         },