Merge branch 'release/4.5' of http://git.yoho.cn/fe/YOHOBUYWAP into release/4.5

@@ -44,6 +44,7 @@ var $clearHistory = $('#clear-history');
 var writeSearch = require('./write-search');
 
 var ranToken = writeSearch.getRanToken();
+var ranToken2 = writeSearch.getRanToken2();
 
 var chHammer;
 
@@ -339,7 +340,8 @@ if ($('.brand-search-page').length > 0) {
         var html = '',
             history,
             historys, i,
-            brand, url, locate;
+            localHistory,
+            brand,url;
 
         if (localStorage) {
             historys = localStorage.getItem('historys-brand');
@@ -352,9 +354,10 @@ if ($('.brand-search-page').length > 0) {
                     if (history === '') {
                         continue;
                     }
-                    locate = history.indexOf('http://');
-                    brand = history.substr(0, locate);
-                    url = history.substr(locate, history.length - locate);
+                    localHistory = history.split(ranToken2);
+
+                    brand = localHistory[0];
+                    url = localHistory[1];
 
                     html += '<li><a href="' + url + '">' + brand + '</li>';
                     $historySearch.removeClass('hide');

@@ -5,6 +5,7 @@
  */
 
 var ranToken = ' ??++ ';
+var ranToken2 = ' ???+++ ';
 var $ = require('jquery');
 
 //获取分隔符
@@ -12,6 +13,10 @@ function getRanToken() {
     return ranToken;
 }
 
+function getRanToken2() {
+    return ranToken2;
+}
+
 /**
  * 增加单条记录
  */
@@ -32,7 +37,7 @@ function bindWirteLocal($brandList) {
     $brandList.on('click', 'p , li', function(e) {
         var brandName, brandId, brandDomain, url;
         var a = $(this).find('a');
-        var query = a.attr('brandName') + a.attr('href'),
+        var query = a.attr('brandName') + ranToken2 + a.attr('href'),
             historys;
 
         brandName = a.attr('brandName');
@@ -45,7 +50,7 @@ function bindWirteLocal($brandList) {
 
         e.preventDefault();
 
-        if ($('.net-search').length > 0) {
+        if ($('.net-history').length > 0) {
             addHistory(brandName, brandId, brandDomain);
             location.href = url;
             return;
@@ -78,5 +83,6 @@ function bindWirteLocal($brandList) {
 
 
 exports.getRanToken = getRanToken;
+exports.getRanToken2 = getRanToken2;
 
 exports.bindWirteLocal = bindWirteLocal;
\ No newline at end of file

@@ -52,3 +52,9 @@
     display: block;
     opacity: 0.3;
 }
+
+.yoho-channel-page {
+    .brands-list .brands-title {
+        display: none;
+    }
+}

@@ -177,6 +177,8 @@
         .clear-icon{
             float: right;
             color: #b8b8b8;
+            border: none;
+            background: white;
         }
 
         span{

@@ -17,17 +17,19 @@
 <div class="search-brand-page">
     <div class="search-items">
         {{#if history}}
-        <div class="history-search net-search">
-            <h3><span class="iconfont">&#xe64a;</span>最近搜索
-                <button id="clear-history" class="clear-icon iconfont">&#xe64c;</button>
-            </h3>
-            <ul class="history clearfix">
-                {{# history}}
-                <li>
-                    <a href="{{url}}" brandName="{{name}}" brandId="{{brandId}}" brandDomain="{{brandDomain}}">{{name}}</a>
-                </li>
-                {{/ history}}
-            </ul>
+        <div class="net-history">
+            <div class="history-search net-search">
+                <h3><span class="iconfont">&#xe64a;</span>最近搜索
+                    <button id="clear-history" class="clear-icon iconfont">&#xe64c;</button>
+                </h3>
+                <ul class="history clearfix">
+                    {{# history}}
+                    <li>
+                        <a href="{{url}}" brandName="{{name}}" brandId="{{brandId}}" brandDomain="{{brandDomain}}">{{name}}</a>
+                    </li>
+                    {{/ history}}
+                </ul>
+            </div>
         </div>
         {{else}}
             <div class="history-search local-search hide">

 {{> layout/header}}
-<div class="mobile-wrap boys-wrap yoho-page">
+<div class="mobile-wrap boys-wrap yoho-channel-page yoho-page">
     {{! 首页header}}
     {{# homeHeader}}
         {{> home/home_header}}

@@ -223,7 +223,7 @@ class BrandModel
             }
             foreach ($hot['data'] as $key => $val) {
                 $result[]  = array(
-                    'id' => isset($val['brandId']) ? $val['brandId'] : '',
+                    'brandId' => isset($val['brandId']) ? $val['brandId'] : '',
                     'brandDomain' => isset($val['brandDomain']) ? $val['brandDomain'] : '',
                     'name' => isset($val['brandName']) ? $val['brandName'] : '',
                     'url' => isset($val['brandDomain']) ? Helpers::url('', '', $val['brandDomain']) : '',