Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

@@ -28,7 +28,8 @@ const handleBrandList = origin => {
             brands.push({
             brands.push({
                 name: subValue.brand_name,
                 name: subValue.brand_name,
                 link: '/brand/' + subValue.brand_domain,
                 link: '/brand/' + subValue.brand_domain,
-                logo: subValue.brand_ico
+                logo: subValue.brand_ico,
+                domain: subValue.brand_domain
             });
             });
         });
         });
 
 

@@ -9,7 +9,7 @@ const channelDict = require(utilsPath).channelDict;
 // Notice: 如果 没有 channel，则不设 gender
 // Notice: 如果 没有 channel，则不设 gender
 exports.channelGender = (req, res, next) => {
 exports.channelGender = (req, res, next) => {
     if (!req.query.hasOwnProperty('gender')) {
     if (!req.query.hasOwnProperty('gender')) {
-        const channel = channelDict(req.cookies._Channel);
+        const channel = channelDict(req.yoho.channel);
 
 
         channel && (req.query.gender = channel);
         channel && (req.query.gender = channel);
     }
     }

@@ -4,7 +4,7 @@
             <div class="index"><a href="#{{item.index}}" name="{{item.index}}">{{item.index}}</a></div>
             <div class="index"><a href="#{{item.index}}" name="{{item.index}}">{{item.index}}</a></div>
             <div class="brand-big-box clearfix">
             <div class="brand-big-box clearfix">
                 <div class="brand-box" v-for="brand in item.brands">
                 <div class="brand-box" v-for="brand in item.brands">
-                    <a href="{{brand.link}}">
+                    <a href="{{brand.domain | brandUrl}}">
                         <div class="brand-logo">
                         <div class="brand-logo">
                             <img v-lazy="brand.logo | resize 150 150" alt="{{brand.name}}">
                             <img v-lazy="brand.logo | resize 150 150" alt="{{brand.name}}">
                         </div>
                         </div>

@@ -9,7 +9,7 @@
             <ul class="filter-cates">
             <ul class="filter-cates">
                 <li class="filter-cate" 
                 <li class="filter-cate" 
                     v-for="classify in itemArr" 
                     v-for="classify in itemArr" 
-                    v-if="config[classify] && showCate(classify, config[classify])" 
+                    v-if="showItem(classify)" 
                     @click="entrySub(classify)"
                     @click="entrySub(classify)"
                 >
                 >
                     <i class="icon icon-right right"></i>
                     <i class="icon icon-right right"></i>
@@ -64,6 +64,15 @@
             }
             }
         },
         },
         methods: {
         methods: {
+            showItem: function(item) {
+                let config = this.config;
+                
+                if (!config || !config[item] || !this.showCate(item, config[item])) {
+                    return false;
+                }
+                return true;
+            },
+
             // 只显示 可选值 大于 1的 筛选项
             // 只显示 可选值 大于 1的 筛选项
             // groupSort 特殊处理
             // groupSort 特殊处理
             showCate: function(cateName, cateVals) {
             showCate: function(cateName, cateVals) {

@@ -86,6 +86,7 @@
                             tip('登录失败');
                             tip('登录失败');
                         });
                         });
                     }
                     }
+                    tip(result.message);
 
 
                     if (misc && misc.code === 200) {
                     if (misc && misc.code === 200) {
                         this.isFavorite = misc.data.isFavor === 'Y';
                         this.isFavorite = misc.data.isFavor === 'Y';

@@ -33,6 +33,8 @@ const _procProductImg = (product, genderVal) => {
  * 商品搜索商品数据处理
  * 商品搜索商品数据处理
  */
  */
 module.exports = (list, options) => {
 module.exports = (list, options) => {
+    options = options || {};
+
     const pruductList = [];
     const pruductList = [];
 
 
     if (!options.gender) {
     if (!options.gender) {