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

@@ -7,6 +7,7 @@ use LibModels\Web\Product\BrandData;
 use LibModels\Web\Product\SearchData;
 use LibModels\Web\Product\SearchData;
 use Api\Yohobuy;
 use Api\Yohobuy;
 use Api\Sign;
 use Api\Sign;
+use Index\HomeModel;
 /**
 /**
  * 搜索辅助类
  * 搜索辅助类
  */
  */
@@ -31,7 +32,7 @@ class HelperSearch
     private static function setListNav()
     private static function setListNav()
     {
     {
         $options = self::$options;
         $options = self::$options;
-        $cookieChannel = isset($_COOKIE['_Channel']) ? $_COOKIE['_Channel'] : 'boys';
+        $channel = HomeModel::getSwitchChannel();
         if (isset($options['brandName']) && !empty($options['brandName'])) {
         if (isset($options['brandName']) && !empty($options['brandName'])) {
             $initNav = $options['brandNameEn'] . $options['brandNameCn'];
             $initNav = $options['brandNameEn'] . $options['brandNameCn'];
         }else{
         }else{
@@ -39,7 +40,7 @@ class HelperSearch
         }
         }
         self::$listNav[0] = array(
         self::$listNav[0] = array(
             'href' => '',
             'href' => '',
-            'name' => strtoupper($cookieChannel).'首页'
+            'name' => strtoupper($channel).'首页'
         );
         );
         self::$listNav[1] = array(
         self::$listNav[1] = array(
             'href' => '',
             'href' => '',

@@ -219,9 +219,9 @@ $yohoPage.on('touchstart', '.tap-hightlight', function() {
     $(this).removeClass('highlight');
     $(this).removeClass('highlight');
 });
 });
 
 
-// $('.nav-home').on('touchstart', function() {
-//     $('.homebuttom').toggleClass('none');
-// });
+$('.nav-home').on('touchstart', function() {
+    $('.homebuttom').toggleClass('none');
+});
 
 
 (function() {
 (function() {
     var lastTime = 0,
     var lastTime = 0,

@@ -144,6 +144,9 @@
             overflow: hidden;
             overflow: hidden;
             float: left;
             float: left;
             text-align: center;
             text-align: center;
+            a{
+                 color: #fff;
+            }
             i{
             i{
                 width: 100%;
                 width: 100%;
                 height: 40%;
                 height: 40%;

@@ -97,7 +97,7 @@
             float: left;
             float: left;
             color: #fff;
             color: #fff;
             font-size: pxToRem(28px);
             font-size: pxToRem(28px);
-            width: pxToRem(320px);
+            width: pxToRem(212px);
             // width: pxToRem(213px); 三栏宽度
             // width: pxToRem(213px); 三栏宽度
 
 
             &.highlight {
             &.highlight {

@@ -28,14 +28,10 @@
                 {{#isLogin}}{{brand_favorite_total}}{{/isLogin}}
                 {{#isLogin}}{{brand_favorite_total}}{{/isLogin}}
                 <p>收藏的品牌</p>
                 <p>收藏的品牌</p>
             </a>
             </a>
-            {{!
             <a class="link-item tap-hightlight" href="/home/record">
             <a class="link-item tap-hightlight" href="/home/record">
-                <!-- product_browse -->
-
+                {{#isLogin}}{{product_browse}}{{/isLogin}}
                 <p>浏览记录</p>
                 <p>浏览记录</p>
             </a>
             </a>
-            }}
-
         </div>
         </div>
         <div class="my-order">
         <div class="my-order">
             <a class="order-title"  href="/home/orders">
             <a class="order-title"  href="/home/orders">

@@ -38,4 +38,13 @@
 		{{/ logisticDetail}}
 		{{/ logisticDetail}}
 	</div>
 	</div>
 </div>
 </div>
+<div class="banner">
+    {{#banner}}
+    <a href="{{url}}">
+        <img src="{{img}}" alt="img">
+    </a>
+    {{/banner}}
+</div>
+
+{{> home/maybe_like}}
 {{> layout/footer}}
 {{> layout/footer}}

@@ -4,7 +4,7 @@
     <a href="{{#if backUrl}}{{backUrl}}{{^}}javascript:history.go(-1);{{/if}}" class="iconfont nav-back">&#xe610;</a>
     <a href="{{#if backUrl}}{{backUrl}}{{^}}javascript:history.go(-1);{{/if}}" class="iconfont nav-back">&#xe610;</a>
     {{/navBack}}
     {{/navBack}}
     {{#navHome}}
     {{#navHome}}
-    <a href="{{.}}" class="iconfont nav-home">&#xe611;</a>
+    <span class="iconfont nav-home">&#xe62d;</span>
     {{/navHome}}
     {{/navHome}}
     {{#currencyPage}}
     {{#currencyPage}}
     <a href="/home/helpDetail?code=20151230-102233&caption=YOHO币介绍" class="iconfont nav-home">&#xe639;</a>
     <a href="/home/helpDetail?code=20151230-102233&caption=YOHO币介绍" class="iconfont nav-home">&#xe639;</a>
@@ -18,32 +18,34 @@
     {{#navTitle}}
     {{#navTitle}}
     <p class="nav-title">{{.}}</p>
     <p class="nav-title">{{.}}</p>
     {{/navTitle}}
     {{/navTitle}}
-    {{# navBtn}}
-    <span class="nav-btn">{{.}}</span>
-    {{!--
-    <i class="iconfont nav-home">&#xe638;</i>
-    <div class="homebuttom none">
-        <ul>
-            <li>
+</header>    
+<div class="homebuttom none">
+    <ul>
+        <li>
+            <a href="/">
                 <i class="iconfont">&#xe62a;</i>
                 <i class="iconfont">&#xe62a;</i>
                 <span>首页</span>
                 <span>首页</span>
-            </li>
-            <li>
+            </a>
+        </li>
+        <li>
+            <a href="cate">
                 <i class="iconfont">&#xe62d;</i>
                 <i class="iconfont">&#xe62d;</i>
                 <span>分类</span>
                 <span>分类</span>
-            </li>
-            <li>
+            </a>
+        </li>
+        <li>
+            <a href="cart/index/index">
                 <i class="iconfont">&#xe62c;</i>
                 <i class="iconfont">&#xe62c;</i>
                 <span>购物车</span>
                 <span>购物车</span>
-            </li>
-            <li>
+            </a>
+        </li>
+        <li>
+            <a href="/home">
                 <i class="iconfont">&#xe62b;</i>
                 <i class="iconfont">&#xe62b;</i>
                 <span>我的</span>
                 <span>我的</span>
-            </li>
-        </ul>
-    </div>
-    --}}
-    {{/ navBtn}}
-</header>
+            </a>
+        </li>
+    </ul>
+</div>
 
 
 {{/pageHeader}}
 {{/pageHeader}}

@@ -79,6 +79,10 @@ var $ = require('yoho.jquery'),
                     var brandTpl,
                     var brandTpl,
                         brandHtml;
                         brandHtml;
 
 
+                    if (!data || data.length === 0) {
+                        return;
+                    }
+
                     that._createHelper();
                     that._createHelper();
                     brandHtml = '\{{#brandList logoBrand}}' +
                     brandHtml = '\{{#brandList logoBrand}}' +
                         '<a href="\{{href}}" target="_blank"><img class="lazy" data-original="\{{img}}" alt=""></a>' +
                         '<a href="\{{href}}" target="_blank"><img class="lazy" data-original="\{{img}}" alt=""></a>' +

@@ -174,6 +174,9 @@ $('.va').keyup(function() {
         } else if (v.length < 6 || v.length > 20) {
         } else if (v.length < 6 || v.length > 20) {
             $(this).addClass('error');
             $(this).addClass('error');
             $pwdErr.removeClass('hide').find('em').text('密码只支持6-20位');
             $pwdErr.removeClass('hide').find('em').text('密码只支持6-20位');
+        } else if (/^([a-zA-Z0-9\-\+_!@\#$%\^&\*\(\)\:\;\.=\[\]\\\',\?]){6,20}$/.test(v)) {
+            $(this).addClass('error');
+            $pwdErr.removeClass('hide').find('em').text('密码不能包含特殊字符');
         } else {
         } else {
             $pwdErr.addClass('hide');
             $pwdErr.addClass('hide');
             if ($repwd.val() !== '') {
             if ($repwd.val() !== '') {

@@ -11,7 +11,7 @@ $('#brand-favor').on('click', function() {
         uid = window.getUid();
         uid = window.getUid();
 
 
     if (!uid) {
     if (!uid) {
-        location.href = '/signin.html?refer=' + location.href;
+        location.href = '/signin.html?refer=' + encodeURIComponent(location.href);
         return;
         return;
     }
     }
 
 

@@ -174,6 +174,11 @@ $(document).on('hover', '.good-select-color li', function() {
 $goodInfoMain.on('click', '.col-btn', function() {
 $goodInfoMain.on('click', '.col-btn', function() {
     var $this = $(this);
     var $this = $(this);
 
 
+    if (!window.getUid()) {
+        location.href = '/signin.html?refer=' + encodeURIComponent(location.href);
+        return;
+    }
+
     $.ajax({
     $.ajax({
         type: 'POST',
         type: 'POST',
         url: '/product/list/changeFavorite',
         url: '/product/list/changeFavorite',