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

@@ -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>

@@ -92,7 +92,6 @@
                     {{/ default}}
                 </ul>
 
-                {{#unless hideMore}}
                 <div class="brand-opt">
                     {{#if showMore}}
                         <span id="brand-more" class="brand-more">
@@ -105,7 +104,6 @@
                         <span id="brand-multi" class="multi-select">多选 +</span>
                     {{/if}}
                 </div>
-                {{/unless}}
 
                 <div class="brand-panel hide">
                     <div class="panel-head clearfix">
@@ -225,7 +223,11 @@
                                         {{#each sub}}
                                             <li class="attr {{#if checked}}checked{{/if}}">
                                                 <a href="{{href}}">
+                                                    {{#if checked}}
+                                                        <span class="iconfont checkbox checked" data-id="{{id}}">&#xe612;</span>
+                                                    {{^}}
                                                         <span class="iconfont checkbox" data-id="{{id}}">&#xe613;</span>
+                                                    {{/if}}
                                                     <span>{{name}}</span>
                                                 </a>
                                             </li>

@@ -37,7 +37,7 @@
         {{/if}}
     </div>
     <div class="good-detail-text">
-        <a href="{{url}}" target="_blank">{{name}}</a>
+        <a href="{{url}}" target="_blank">{{{name}}}</a>
         <p class="price">
             {{# marketPrice}}
                 <span class="market-price">¥{{.}}</span>

@@ -7,10 +7,10 @@
     <script id="latest-walk-tpl" type="text/html">
         \{{# latestWalk}}
             <div class="good">
-                <a href="\{{href}}">
+                <a href="\{{href}}" target="_blank">
                     <img class="lazy" data-original="\{{img}}">
                 </a>
-                <a class="name" href="\{{href}}">\{{name}}</a>
+                <a class="name" href="\{{href}}" target="_blank">\{{name}}</a>
                 <p class="price">
                     <span class="market-price">\{{marketPrice}}</span>
                     <span class="sale-price">\{{salePrice}}</span>

@@ -122,7 +122,7 @@
         z-index: 3;
         visibility: hidden;
         background: image-url('product/senior-up.png') no-repeat;
-        background-position-x: 50%;
+        background-position: 50% 0;
     }
 
     .sort-sub-wrap {
@@ -279,6 +279,8 @@
         margin-left: 10px;
         outline: none;
         border: none;
+        font-size: 12px;
+        cursor: pointer;
     }
 
     .color-block {
@@ -356,7 +358,7 @@
         margin-left: -11px;
         visibility: hidden;
         background: image-url('product/senior-up.png') no-repeat;
-        background-position-x: 50%;
+        background-position: 50% 0;
     }
 
     .checkbox {