merge beta/wap

@@ -31,10 +31,10 @@ class Yohobuy
     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 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/';