Merge branch 'hotfix/shopBetter' of git.yoho.cn:fe/YOHOBUYWAP into hotfix/shopBetter

@@ -300,7 +300,7 @@ function search(opt) {
 
     $.ajax({
         type: 'GET',
-        url: '/index/search/search',
+        url: location.protocol + '//m.yohobuy.com/index/search/search',
         data: setting,
         success: function(data) {
             var noResult = '<p class="no-result">未找到相关搜索结果</p>',

@@ -180,7 +180,7 @@ function getParam(req) {
 function newData(callback) {
     var req = {};
 
-    req.url = '/index/search/search';
+    req.url = location.protocol + '//m.yohobuy.com/index/search/search';
     req.data = {
         type: 'newest',
         order: '1',
@@ -205,7 +205,7 @@ function newData(callback) {
 function hotData(callback) {
     var req = {};
 
-    req.url = '/index/search/search';
+    req.url = location.protocol + '//m.yohobuy.com/index/search/search';
     req.data = {
         type: 'hot',
         order: '1',
@@ -333,7 +333,7 @@ function scrollHandler() {
                 type: 'shop_id',
                 id: shopId,
                 brand: brand,
-                url: '/index/search/search',
+                url: location.protocol + '//m.yohobuy.com/index/search/search',
                 nextPage: true
             });
         }
@@ -504,7 +504,7 @@ function search(opt) {
     }
 
     if (!opt.url) {
-        opt.url = '/index/search/search';
+        opt.url = location.protocol + '//m.yohobuy.com/index/search/search';
     }
 
     if (!opt.nextPage) {
@@ -820,7 +820,7 @@ $subNav.on('touchend touchcancel', function(e) {
                 type: 'shop_id',
                 id: shopId,
                 brand: brand,
-                url: '/index/search/search',
+                url: location.protocol + '//m.yohobuy.com/index/search/search',
                 nextPage: false
             });
         }

@@ -6,7 +6,6 @@
             <div id="nav-top">
                 {{> layout/page_header}}
                 <!-- tar modifield 160826  -->
-                <input type="hidden" name="channel" value="{{channel}}">
                 <input type="hidden" name="app_version" value="{{appVersion}}">
                 <input type="hidden" name="shop_id" value="{{shopId}}">
                 <input type="hidden" name="brand" value="{{brand}}">
@@ -19,7 +18,6 @@
                         <form id="search-form" action={{url}} method="get">
                             <i class="search-icon iconfont">&#xe60f;</i>
                             <input type="text" placeholder="搜索店铺内潮品" name="query" class="buriedpoint">
-                            <input type="hidden" name="channel" value="{{channel}}">
                             <input type="hidden" name="shop_id" value="{{shopId}}">
                             <input type="hidden" name="coverChannel" value="{{coverChannel}}">
                             <i class="clear-input iconfont hide">&#xe626;</i>

@@ -487,15 +487,12 @@ class IndexController extends AbstractAction
 
         /* tar add 160826 */
         $data['gender'] = $this->get('gender');
-        $data['channel'] = $this->get('yh_channel') ? $this->get('yh_channel') : Helpers::getChannelByCookie();
-
         //接受APP传来的封面频道参数
         $coverChannel = Helpers::getYhHhannel($this->get('yh_channel', ''));
 
         $filter = Product\SearchModel::filter(array(
             'shop_id' => $shopId,
             'gender' => empty($data['gender']) ? '' : $data['gender'],
-            'channel' => empty($data['channel']) ? '' : $data['channel'],
             'brand' => empty($data['brand']) ? '' : $data['brand']
         ));
         $data['filter'] = isset($filter['filter']) ? $filter['filter'] : array();
@@ -504,7 +501,6 @@ class IndexController extends AbstractAction
         $goods = \Product\SearchModel::search(array(
             'shop' => $shopId,
             'gender' => empty($data['gender']) ? '' : $data['gender'],
-            'channel' => empty($data['channel']) ? '' : $data['channel'],
             'brand' => empty($data['brand']) ? '' : $data['brand'],
             'coverChannel' => $coverChannel
         ));
@@ -517,7 +513,6 @@ class IndexController extends AbstractAction
                 'url' => Helpers::url('/product/index/category', array('shop_id' => $shopId))
             ),
             'gender' => $data['gender'],
-            'channel' => $data['channel'],
             'coverChannel' => $coverChannel,
             'appVersion' => !empty($appVersion)
         ));