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

@@ -482,7 +482,7 @@ class WebAction extends Controller_Abstract
             'gobytype'=> 'gobuy'.$channel,
             'searchcate'=>'searchcate'.$channel,
             'header'=> true,
-            'apiDomain'=>''
+            'apiDomain'=> $apiDomain
         );
         $this->_view->assign('headerdata', $header);
     }

@@ -56,7 +56,7 @@ class SearchData extends \LibModels\Wap\Product\SearchData
                     return 'http://101.200.31.165/yohosearch/shops.json';
                 }
                 return 'http://101.200.31.165/yohosearch/search.json';
-            case 'test':
+            case 'testing':
             case 'developer':
             default:
                 if ($type == 'sort') {

@@ -1027,13 +1027,13 @@ class HelperSearch
                 'order' => 'p_d_asc'
             )));
             $active = '';
-            $desc = true;
+            $desc = '';
         }
         else if (self::$params['order'] == 'p_d_asc') {
             $url = self::buildUrl(array_merge($params, array(
                 'order' => 'p_d_desc'
             )));
-            $desc = false;
+            $desc = true;
             $active = true;
         }
         else {

@@ -34,21 +34,21 @@ class HomeModel
     const COOKIE_NAME_LIFESTYLE = 'lifestyle';
     
     //release:                                  test:
-       //boys:79372627eee75d73afe7f9bac91e5ce6, c15bf0cbfbd4893fd70c869c991f6d3d
-       //girls: 75215008957605c05e8cd375eac4f817, a519ba44ef3a85cf3c05e405c6ba8e53
-       //kids:d71f4b27f2a7229fbb31a4bc490a6f36,a7741b94e8bb9d56d0d36e00c05956f7
-       //lifestyle:8a341ca7eacc069ba80f02dec80eaf34,1b053fd044834f5c86d5eb15fb237af9
+   //boys:79372627eee75d73afe7f9bac91e5ce6, c15bf0cbfbd4893fd70c869c991f6d3d
+   //girls: 75215008957605c05e8cd375eac4f817, a519ba44ef3a85cf3c05e405c6ba8e53
+   //kids:d71f4b27f2a7229fbb31a4bc490a6f36,a7741b94e8bb9d56d0d36e00c05956f7
+   //lifestyle:8a341ca7eacc069ba80f02dec80eaf34,1b053fd044834f5c86d5eb15fb237af9
        
     // 男首首页
-    const CODE_BOYS_CHANNEL = '79372627eee75d73afe7f9bac91e5ce6';//'c15bf0cbfbd4893fd70c869c991f6d3d';
+    const CODE_BOYS_CHANNEL = (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? '79372627eee75d73afe7f9bac91e5ce6': 'c15bf0cbfbd4893fd70c869c991f6d3d';
     // 女首首页
-    const CODE_GIRLS_CHANNEL = '75215008957605c05e8cd375eac4f817';//'a519ba44ef3a85cf3c05e405c6ba8e53';
+    const CODE_GIRLS_CHANNEL = (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? '75215008957605c05e8cd375eac4f817': 'a519ba44ef3a85cf3c05e405c6ba8e53';
 
     // 潮童首页
-    const CODE_KIDS_CHANNEL = 'd71f4b27f2a7229fbb31a4bc490a6f36';//'a7741b94e8bb9d56d0d36e00c05956f7';
+    const CODE_KIDS_CHANNEL = (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? 'd71f4b27f2a7229fbb31a4bc490a6f36':'a7741b94e8bb9d56d0d36e00c05956f7';
                                             
     // 创意生活新
-    const CODE_LIFESTYLE_CHANNEL = '8a341ca7eacc069ba80f02dec80eaf34';//'8a341ca7eacc069ba80f02dec80eaf34';
+    const CODE_LIFESTYLE_CHANNEL = (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? '8a341ca7eacc069ba80f02dec80eaf34': '8a341ca7eacc069ba80f02dec80eaf34';
     
     // 创意生活
     const CODE_LIFESTYLE_CHANNEL_1 = '380c38155fd8beee10913a3f5b462da6';