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

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

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