Merge remote-tracking branch 'origin/beta/wap' into beta/wap

@@ -24,17 +24,17 @@ class Yohobuy
 //    const YOHOBUY_URL = 'http://www.yohobuy.com/';
 //    const YOHOBUY_URL = 'http://www.yohobuy.com/';
    
    
     //java API
     //java API
-    const API_URL = 'http://apih5.yoho.cn/';
-    const API_URL2 = 'http://apih5.yoho.cn/';
-    const SERVICE_URL = 'http://serviceh5.yoho.cn/';
-    const YOHOBUY_URL = 'http://www.yohobuy.com/';
-    const API_OLD = 'http://api2.open.yohobuy.com/';
+//    const API_URL = 'http://apih5.yoho.cn/';
+//    const API_URL2 = 'http://apih5.yoho.cn/';
+//    const SERVICE_URL = 'http://serviceh5.yoho.cn/';
+//    const YOHOBUY_URL = 'http://www.yohobuy.com/';
+//    const API_OLD = 'http://api2.open.yohobuy.com/';
     
     
     /* 测试环境 */
     /* 测试环境 */
-    /** const API_URL = 'http://testapi.yoho.cn:28078/'; // 'http://192.168.102.205:8080/gateway/'
+    const API_URL = 'http://testapi.yoho.cn:28078/'; // 'http://192.168.102.205:8080/gateway/'
      const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
      const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
      const YOHOBUY_URL = 'http://www.yohobuy.com/';
      const YOHOBUY_URL = 'http://www.yohobuy.com/';
-     const API_OLD = 'http://test2.open.yohobuy.com/';**/
+     const API_OLD = 'http://test2.open.yohobuy.com/';
 
 
     /* 预览环境 */
     /* 预览环境 */
 //     const API_URL = 'http://preapi.yoho.cn/';
 //     const API_URL = 'http://preapi.yoho.cn/';

@@ -115,7 +115,7 @@ class UserModel
         // 处理个人中心页面优选新品数据
         // 处理个人中心页面优选新品数据
         if (!empty($preferenceData['data'])) {
         if (!empty($preferenceData['data'])) {
             foreach ($preferenceData['data'] as $value) {
             foreach ($preferenceData['data'] as $value) {
-                $value = Helpers::formatProduct($value, false, true, true, 299, 388, false, false);
+                $value = Helpers::formatProduct($value, false, true, true, 299, 388, false);
                 if (false !== $value) {
                 if (false !== $value) {
                     $result['recommendList'][] = $value;
                     $result['recommendList'][] = $value;
                 }
                 }

@@ -220,7 +220,7 @@ class IndexController extends AbstractAction
         $data['goodList'] += $condition;
         $data['goodList'] += $condition;
         $data['pageFooter'] = true;
         $data['pageFooter'] = true;
 
 
-        if ($title === '') {
+        if (empty($title)) {
             $title = $domain;
             $title = $domain;
         }
         }
         $this->setTitle($title);
         $this->setTitle($title);