Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/web-list

@@ -475,65 +475,7 @@ class WebAction extends Controller_Abstract
         $header = array(
         $header = array(
             'navbars'=> \Index\HomeModel::getNavBars($channel),
             'navbars'=> \Index\HomeModel::getNavBars($channel),
             'gobytype'=> 'gobuy'.$channel,
             'gobytype'=> 'gobuy'.$channel,
-            'searchcate'=>'searchcate'.$channel,
-             'myyoho' => array(
-                'email'=>'hhh@126.com',
-                'viptype'=>'普通会员',
-                'currentscore' => 495,
-                'totalscore' => 600,
-                'cardtype' => '银卡',
-                'infolist' =>  array(
-                    array(
-                        'name' =>'待处理的订单',
-                        'link' =>'',
-                        'num' => '0'
-                    ),
-                    array(
-                        'name' =>'我的收藏',
-                        'link' =>'',
-                        'num' => '1'
-                    ),
-                    array(
-                        'name' =>'我的优惠券',
-                        'link' =>'',
-                        'num' => '2'
-                    ),
-                    array(
-                        'name' =>'我的YOHO币',
-                        'link' =>'',
-                        'num' => '1'
-                    ),
-                    array(
-                        'name' =>'我的退货换货',
-                        'link' =>'',
-                        'num' => '1'
-                    )
-                ),
-                'updlink' => ''
-            ),
-            'gobuy'=> array(
-                'gobuynum' =>3
-            ),
-            'breadcrumbnav'=> array(
-                array(
-                    'notend'=>array(
-                        'link' => 'http=>//www.baidu.com',
-                        'name' => 'BOYS首页'
-                    ) 
-                ),
-                array(
-                    'notend'=>array(
-                    'link' => 'http=>//www.baidu.com',
-                    'name' => '上衣'
-                    ) 
-                ),
-                array(
-                    'isend'=>array(
-                    'link' => 'http=>//www.baidu.com',
-                    'name' => '衬衫'
-                    ) 
-                )
-            )
+            'searchcate'=>'searchcate'.$channel
         );
         );
         $this->_view->assign('headerdata', $header);
         $this->_view->assign('headerdata', $header);
     }
     }

@@ -36,10 +36,10 @@ class HomeModel
     // 男首首页
     // 男首首页
     const CODE_BOYS_CHANNEL = 'c15bf0cbfbd4893fd70c869c991f6d3d';
     const CODE_BOYS_CHANNEL = 'c15bf0cbfbd4893fd70c869c991f6d3d';
     // 女首首页
     // 女首首页
-    const CODE_GIRLS_CHANNEL = '4d897f3b8eec0c465db0125e5b1f9edf';
+    const CODE_GIRLS_CHANNEL = 'a519ba44ef3a85cf3c05e405c6ba8e53';//'4d897f3b8eec0c465db0125e5b1f9edf';
  // 'a519ba44ef3a85cf3c05e405c6ba8e53';
  // 'a519ba44ef3a85cf3c05e405c6ba8e53';
     // 潮童首页
     // 潮童首页
-    const CODE_KIDS_CHANNEL = '331994d6fa8dc87f92a26dd45c0aa071';
+    const CODE_KIDS_CHANNEL = 'a7741b94e8bb9d56d0d36e00c05956f7';//'331994d6fa8dc87f92a26dd45c0aa071';
  // 'a7741b94e8bb9d56d0d36e00c05956f7';
  // 'a7741b94e8bb9d56d0d36e00c05956f7';
                                                                   
                                                                   
     // 创意生活新
     // 创意生活新