brand opt

@@ -274,7 +274,7 @@ if ($brandItem.length > 0) {
 function removeHistory() {
 function removeHistory() {
     $.ajax({
     $.ajax({
         type: 'GET',
         type: 'GET',
-        url: '/category/brand/delBrandHistory',
+        url: '/brands/delBrandHistory',
         data: '',
         data: '',
         success: function(data) {
         success: function(data) {
         },
         },

@@ -18,8 +18,8 @@ function getRanToken() {
 function addHistory(brandName, brandId, brandDomain) {
 function addHistory(brandName, brandId, brandDomain) {
     $.ajax({
     $.ajax({
         type: 'GET',
         type: 'GET',
-        url: '/category/brand/addBrandSearch',
-        data: 'brandName=' + brandName + 'brandId=' + brandId + 'brandDomain=' + brandDomain,
+        url: '/brands/addBrandSearch',
+        data: 'brandName=' + brandName + '&brandId=' + brandId + '&brandDomain=' + brandDomain,
         success: function(data) {
         success: function(data) {
         },
         },
         error: function() {
         error: function() {

@@ -16,10 +16,10 @@
 
 
 <div class="search-brand-page">
 <div class="search-brand-page">
     <div class="search-items">
     <div class="search-items">
-        {{#if historySearch}}
-        <div class="history-search net-search hide">
+        {{#if history}}
+        <div class="history-search net-search">
             <h3><span class="iconfont">&#xe64a;</span>最近搜索
             <h3><span class="iconfont">&#xe64a;</span>最近搜索
-                <button id="clear-history" class="clear-icon iconfont hide">&#xe64c;</button>
+                <button id="clear-history" class="clear-icon iconfont">&#xe64c;</button>
             </h3>
             </h3>
             <ul class="history clearfix">
             <ul class="history clearfix">
                 {{# history}}
                 {{# history}}

@@ -163,7 +163,7 @@ class BrandModel
                     $list['isNew'] = ($row['is_show_new'] === 'Y') ? true : false;
                     $list['isNew'] = ($row['is_show_new'] === 'Y') ? true : false;
                     $list['url'] = Helpers::url('', null, $row['brand_domain']);
                     $list['url'] = Helpers::url('', null, $row['brand_domain']);
                     $list['brandId'] = $row['id'];
                     $list['brandId'] = $row['id'];
-                    $list['brandDomain'] = Helpers::url('', null, $row['brand_domain']);
+                    $list['brandDomain'] = $row['brand_domain'];
                     $build[] = $list;
                     $build[] = $list;
                 }
                 }
                 $result[$char] = $build;
                 $result[$char] = $build;
@@ -189,14 +189,14 @@ class BrandModel
                 break;
                 break;
             }
             }
             foreach ($list['data'] as $key => $val) {
             foreach ($list['data'] as $key => $val) {
-                $result[]  = array(
-                    'url' => isset($val['brandDomain']) ? Helpers::url('', '', $val['brandDomain']) : 'test',
-                    'id' => $val['id'],
-                    'name' => $val['brandName']
+                $result[$val['brandDomain']]  = array(
+                    'url' => isset($val['brandDomain']) ? Helpers::url('', '', $val['brandDomain']) : '',
+                    'id' => $val['brandId'],
+                    'name' => $val['searchTerms']
                 );
                 );
             }
             }
         } while(false);
         } while(false);
-
+        $result = array_values($result);
         return $result;
         return $result;
     }
     }
 
 
@@ -215,9 +215,9 @@ class BrandModel
             }
             }
             foreach ($hot['data'] as $key => $val) {
             foreach ($hot['data'] as $key => $val) {
                 $result[]  = array(
                 $result[]  = array(
-                    'url' => isset($val['brandDomain']) ? Helpers::url('', '', $val['brandDomain']) : 'test',
-                    'id' => $val['id'],
-                    'name' => $val['brandName']
+                    'url' => isset($val['brandDomain']) ? Helpers::url('', '', $val['brandDomain']) : '',
+                    'id' => isset($val['brandId']) ? $val['brandId'] : '',
+                    'name' => isset($val['brandName']) ? $val['brandName'] : ''
                 );
                 );
             }
             }
         } while(false);
         } while(false);

@@ -66,7 +66,7 @@ class BrandController extends AbstractAction
         $data = BrandModel::getBrandForSearch($channel);
         $data = BrandModel::getBrandForSearch($channel);
         //品牌搜索记录
         //品牌搜索记录
         if (!empty($uid)) {
         if (!empty($uid)) {
-            $data['historySearch']['history'] = BrandModel::branchSearchHistory($uid);
+            $data['history'] = BrandModel::branchSearchHistory($uid);
         }
         }
         //热搜品牌
         //热搜品牌
         $data['hot'] = BrandModel::branchSearchHot();
         $data['hot'] = BrandModel::branchSearchHot();
@@ -82,11 +82,11 @@ class BrandController extends AbstractAction
     {
     {
         $result = array();
         $result = array();
         $uid = $this->getUid();
         $uid = $this->getUid();
-        $brandName = $this->get('brandNme');
+        $brandName = $this->get('brandName');
         $brandDomain = $this->get('brandDomain');
         $brandDomain = $this->get('brandDomain');
         $brandId = $this->get('brandId');
         $brandId = $this->get('brandId');
         do {
         do {
-            if (!$this->isAjax() || empty($brandId) || empty($uid) || empty($brandDomain) || empty($brandName)) {
+            if (empty($brandId) || empty($uid) || empty($brandDomain) || empty($brandName)) {
                 break;
                 break;
             }
             }
             $records = time().'_'.$brandName.'_'.$brandDomain.'_'.$brandId;
             $records = time().'_'.$brandName.'_'.$brandDomain.'_'.$brandId;

@@ -82,6 +82,20 @@ routes.brandsearch.route.module = Category
 routes.brandsearch.route.controller = Brand
 routes.brandsearch.route.controller = Brand
 routes.brandsearch.route.action = Search
 routes.brandsearch.route.action = Search
 
 
+; 添加品牌搜索
+routes.addbrandsearch.type = "rewrite"
+routes.addbrandsearch.match = "/brands/addBrandSearch"
+routes.addbrandsearch.route.module = Category
+routes.addbrandsearch.route.controller = Brand
+routes.addbrandsearch.route.action = addBrandSearch
+
+; 清空
+routes.delbrandsearch.type = "rewrite"
+routes.delbrandsearch.match = "/brands/delBrandHistory"
+routes.delbrandsearch.route.module = Category
+routes.delbrandsearch.route.controller = Brand
+routes.delbrandsearch.route.action = delBrandHistory
+
 ; 新品到着(NEW)
 ; 新品到着(NEW)
 routes.productnew.type = "rewrite"
 routes.productnew.type = "rewrite"
 routes.productnew.match = "/product/new$"
 routes.productnew.match = "/product/new$"