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

@@ -305,7 +305,7 @@
     <script type="text/html" id="tmpl-my-login-new">
       <div class="myyoho-info-header clearfix">
         \{\{# head_ico \}\}
-        <div class="myyoho-photo" style="display:none;"><img src="" alt="" data-url ="\{\{it.head_ico\}\}"></div>
+        <div class="myyoho-photo" ><img src="" alt="" data-url ="\{\{it.head_ico\}\}"></div>
         \{\{/ head_ico\}\}
         <h3 class="user-email"><a href="<?php print QConfigs_Site_Config::$site_url?>/home?t=\{\{random\}\}">\{\{profile_name\}\}</a></h3>
         <h3 class="user-level">

@@ -92,20 +92,18 @@
                     {{/ default}}
                 </ul>
 
-                {{#unless hideMore}}
-                    <div class="brand-opt">
-                        {{#if showMore}}
-                            <span id="brand-more" class="brand-more">
-                                <em>更多</em>
-                                <i class="iconfont">&#xe600;</i>
-                            </span>
-                        {{/if}}
-
-                        {{#if showMulti}}
-                            <span id="brand-multi" class="multi-select">多选 +</span>
-                        {{/if}}
-                    </div>
-                {{/unless}}
+                <div class="brand-opt">
+                    {{#if showMore}}
+                        <span id="brand-more" class="brand-more">
+                            <em>更多</em>
+                            <i class="iconfont">&#xe600;</i>
+                        </span>
+                    {{/if}}
+
+                    {{#if showMulti}}
+                        <span id="brand-multi" class="multi-select">多选 +</span>
+                    {{/if}}
+                </div>
 
                 <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}}">
-                                                    <span class="iconfont checkbox" data-id="{{id}}">&#xe613;</span>
+                                                    {{#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>

@@ -319,26 +319,26 @@ function JsonPCallBack(data) {
 
     if (+data.code === 200) {
         if (typeof data.data === 'object') {
-            if(data.data.url !== ''){
-              topbanner = '<a target="_blank" href="' + data.data.url + '" class="page-top-banner"' +
-                'style="height:36px;border:none;background-image:url(' + window.unescape(data.data.src) + ');' +
-                'background-position: center;display:block;background-size:contain">&nbsp;</a>';
-            }else{
-              topbanner = '<div class="noticewrapper">' +
-                 '<div class="noticecontainer">' +
-                 '<h1 class="noticetitle">关于系统升级的公告</h1>' +
-                 '<div class="noticecontent">' +
-                 '<p class="tips">尊敬的顾客:</p>' +
-                 '<p class="detail">您好！为了向您提供更优质的服务，目前系统正在升级，请耐心等待。</p>' +
-                 '<p class="detail">' +
-                 '系统升级期间，部分地区用户体验会有暂时中断，如遇紧急事宜，欢迎垂询客服热线：400-889-9646 09:00-22:30(周一至周日)。稍后系统将恢复正常' +
-                 '</p>' +
-                 '<p class="detail">使用，欢迎您继续光顾YOHO!BUY有货！带来不便之处深表歉意，请您谅解！</p>' +
-                 '</div>' +
-                 '</div>' +
-                 '</div>';
-            } 
-            $('body').prepend(topbanner);  
+            if (data.data.url !== '') {
+                topbanner = '<a target="_blank" href="' + data.data.url + '" class="page-top-banner"' +
+                    'style="height:36px;border:none;background-image:url(' + window.unescape(data.data.src) + ');' +
+                    'background-position: center;display:block;background-size:contain">&nbsp;</a>';
+            } else {
+                topbanner = '<div class="noticewrapper">' +
+                    '<div class="noticecontainer">' +
+                    '<h1 class="noticetitle">关于系统升级的公告</h1>' +
+                    '<div class="noticecontent">' +
+                    '<p class="tips">尊敬的顾客:</p>' +
+                    '<p class="detail">您好！为了向您提供更优质的服务，目前系统正在升级，请耐心等待。</p>' +
+                    '<p class="detail">' +
+                    '系统升级期间，部分地区用户体验会有暂时中断，如遇紧急事宜，欢迎垂询客服热线：400-889-9646 09:00-22:30(周一至周日)。稍后系统将恢复正常' +
+                    '</p>' +
+                    '<p class="detail">使用，欢迎您继续光顾YOHO!BUY有货！带来不便之处深表歉意，请您谅解！</p>' +
+                    '</div>' +
+                    '</div>' +
+                    '</div>';
+            }
+            $('body').prepend(topbanner);
         }
     }
 }

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