Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/web-list

@@ -441,9 +441,12 @@ class Process
                 && ($data[$key + 2]['template_name'] == 'floor' || 
                     $data[$key + 2]['template_name'] == 'app_icon_list')) 
             {
+                //slider颜色
+                $sliderColor = array('girls' => '#8ae6e0','kids'=>'#7AD3F8','lifestyle'=>'#4e433d', 'boys'=>'');
                 $result = array(
                     'preferenceBrands' => array(
                         'name' => '',
+                        'sliderColor'=> $sliderColor[$type],
                         'imgBrand' => array(),
                         'brandUrl' => ''
                     )

 {{> index/floor-header}}
 <div class="preference-brand imgopacity">
-    <div class="img-slider-wrapper clearfix">
+    <div class="img-slider-wrapper clearfix" style="background-color:{{sliderColor}};">
         <div class="img-brand-switch">
             <a class="prev iconfont" href="javascript:;">&#xe60f;</a>
             <a class="next iconfont" href="javascript:;">&#xe60e;</a>

@@ -773,7 +773,8 @@ function actionTipPic() {
     var $img = '';
     var $title = '';
     var $link = '';
-
+    var link = '';
+    
     $(document).on('mouseenter', '.sub-nav-item', function() {
         $contentcode = $(this).find('.showdetail').attr('data-code');
         if ($contentcode) {
@@ -790,6 +791,8 @@ function actionTipPic() {
             }
         }
     });
+    link = $('.first-nav-list .cur').find('a').attr('href');
+    $('.main-link').attr('href', link);
 }