code review by fei.hong: do merge zhen.zhang and kai.bi default no use yoho coin

@@ -23,18 +23,17 @@ class Yohobuy
 //     const SERVICE_URL = 'http://service.api.yohobuy.com/';
 //     const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
-//    const API_URL = 'http://apih5.yoho.cn/';
-//    const API_URL2 = 'http://apih5.yoho.cn/';
-//    const SERVICE_URL = 'http://serviceh5.yoho.cn/';
+    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/';
+//    const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
 //    const YOHOBUY_URL = 'http://www.yohobuy.com/';
-//    const API_OLD = 'http://api2.open.yohobuy.com/';
-
-//    /* 测试环境 */
-    //       const API_URL = 'http://192.168.102.205:8080/gateway/'; // 先临时使用网关
-      const API_URL = 'http://testapi.yoho.cn:28078/';
-      const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
-      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/';
@@ -58,7 +57,7 @@ class Yohobuy
         'android' => 'fd4ad5fcfa0de589ef238c0e7331b585',
         'iphone' => 'a85bb0674e08986c6b115d5e3a4884fa',
         'ipad' => 'ad9fcda2e679cf9229e37feae2cdcf80',
-         'web' => '0ed29744ed318fd28d2c07985d3ba633',
+        'web' => '0ed29744ed318fd28d2c07985d3ba633',
     );
 
     /**
@@ -74,8 +73,7 @@ class Yohobuy
         elseif (strstr($_SERVER['HTTP_USER_AGENT'], 'iPad')) {
 
             return 'ipad';
-        }
-        elseif (stristr($_SERVER['HTTP_USER_AGENT'], 'android')) {
+        } elseif (stristr($_SERVER['HTTP_USER_AGENT'], 'android')) {
             return 'android';
         }
         // 其它

 {
   "name": "yohobuy",
-  "version": "1.3.3",
+  "version": "1.3.3.a",
   "description": "yohobuy statics",
   "keywords": [],
   "homepage": "",

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "1.3.3"
+application.version = "1.3.3.a"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "1.3.3"
+application.version = "1.3.3.a"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "1.3.3"
+application.version = "1.3.3.a"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "1.3.3"
+application.version = "1.3.3.a"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"