'channel-get'

@@ -318,11 +318,11 @@ class ShopProcess
 
 
                 $goodsCover = $val['goods_list'][0]['images_url'];
                 $goodsCover = $val['goods_list'][0]['images_url'];
 
 
-                if (self::$channel === 1) {
+                if (self::$channel == 1) {
                     $goodsCover = empty($defaultGoods['cover_1']) ? $defaultGoods['images_url'] : $defaultGoods['cover_1'];
                     $goodsCover = empty($defaultGoods['cover_1']) ? $defaultGoods['images_url'] : $defaultGoods['cover_1'];
                 }
                 }
 
 
-                if (self::$channel === 2) {
+                if (self::$channel == 2) {
                     $goodsCover = empty($defaultGoods['cover_2']) ? $defaultGoods['images_url'] : $defaultGoods['cover_2'];
                     $goodsCover = empty($defaultGoods['cover_2']) ? $defaultGoods['images_url'] : $defaultGoods['cover_2'];
                 }
                 }
 
 

@@ -424,7 +424,8 @@ class ListModel
             return array('goBrand' => $data['shopInfo']['data']);
             return array('goBrand' => $data['shopInfo']['data']);
         }
         }
         //店铺分类
         //店铺分类
-        $channel = Helpers::getChannelByCookie();
+        $channel = empty($_GET['yh_channel']) ? Helpers::getChannelByCookie() : $_GET['yh_channel'];
+
         $data['shopCategory'] = ListData::getShopCategory($shopId, $channel);
         $data['shopCategory'] = ListData::getShopCategory($shopId, $channel);
         //组织楼层数据
         //组织楼层数据
         $result = ShopProcess::formShopData($data, $shopId, $appVersion, $channel); // tar add 160826 add $channel
         $result = ShopProcess::formShopData($data, $shopId, $appVersion, $channel); // tar add 160826 add $channel

@@ -488,7 +488,7 @@ class IndexController extends AbstractAction
         /* tar add 160826 */
         /* tar add 160826 */
         $data['shopIdForFilter'] = $shopId;
         $data['shopIdForFilter'] = $shopId;
         $data['gender'] = $this->get('gender');
         $data['gender'] = $this->get('gender');
-        $data['channel'] = $this->get('channel') ? $this->get('channel') : Helpers::getChannelByCookie();
+        $data['channel'] = $this->get('yh_channel') ? $this->get('yh_channel') : Helpers::getChannelByCookie();
 
 
         $this->_view->display('shop', array(
         $this->_view->display('shop', array(
             'shopIndex' => $data,
             'shopIndex' => $data,