chenchao / YOHOBUYPC · Commits

Go to a project

Authored by hf
Commit bdae6198d7e5deae0c849ed7d0ef7aaa80270d8f 1 parent 276e4228

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

Inline Side-by-side
Showing 11 changed files with 17 additions and 19 deletions
@@ -23,18 +23,17 @@ class Yohobuy @@ -23,18 +23,17 @@ class Yohobuy
23 // const SERVICE_URL = 'http://service.api.yohobuy.com/'; 23 // const SERVICE_URL = 'http://service.api.yohobuy.com/';
24 // const YOHOBUY_URL = 'http://www.yohobuy.com/'; 24 // const YOHOBUY_URL = 'http://www.yohobuy.com/';
25 25
26 -// const API_URL = 'http://apih5.yoho.cn/';  
27 -// const API_URL2 = 'http://apih5.yoho.cn/';  
28 -// const SERVICE_URL = 'http://serviceh5.yoho.cn/'; 26 + const API_URL = 'http://apih5.yoho.cn/';
  27 + const API_URL2 = 'http://apih5.yoho.cn/';
  28 + const SERVICE_URL = 'http://serviceh5.yoho.cn/';
  29 + const YOHOBUY_URL = 'http://www.yohobuy.com/';
  30 + const API_OLD = 'http://api2.open.yohobuy.com/';
  31 +
  32 + /* 测试环境 */
  33 +// const API_URL = 'http://testapi.yoho.cn:28078/';
  34 +// const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
29 // const YOHOBUY_URL = 'http://www.yohobuy.com/'; 35 // const YOHOBUY_URL = 'http://www.yohobuy.com/';
30 -// const API_OLD = 'http://api2.open.yohobuy.com/';  
31 -  
32 -// /* 测试环境 */  
33 - // const API_URL = 'http://192.168.102.205:8080/gateway/'; // 先临时使用网关  
34 - const API_URL = 'http://testapi.yoho.cn:28078/';  
35 - const SERVICE_URL = 'http://testservice.yoho.cn:28077/';  
36 - const YOHOBUY_URL = 'http://www.yohobuy.com/';  
37 - const API_OLD = 'http://test2.open.yohobuy.com/'; 36 +// const API_OLD = 'http://test2.open.yohobuy.com/';
38 37
39 /* 预览环境 */ 38 /* 预览环境 */
40 // const API_URL = 'http://preapi.yoho.cn/'; 39 // const API_URL = 'http://preapi.yoho.cn/';
@@ -58,7 +57,7 @@ class Yohobuy @@ -58,7 +57,7 @@ class Yohobuy
58 'android' => 'fd4ad5fcfa0de589ef238c0e7331b585', 57 'android' => 'fd4ad5fcfa0de589ef238c0e7331b585',
59 'iphone' => 'a85bb0674e08986c6b115d5e3a4884fa', 58 'iphone' => 'a85bb0674e08986c6b115d5e3a4884fa',
60 'ipad' => 'ad9fcda2e679cf9229e37feae2cdcf80', 59 'ipad' => 'ad9fcda2e679cf9229e37feae2cdcf80',
61 - 'web' => '0ed29744ed318fd28d2c07985d3ba633', 60 + 'web' => '0ed29744ed318fd28d2c07985d3ba633',
62 ); 61 );
63 62
64 /** 63 /**
@@ -74,8 +73,7 @@ class Yohobuy @@ -74,8 +73,7 @@ class Yohobuy
74 elseif (strstr($_SERVER['HTTP_USER_AGENT'], 'iPad')) { 73 elseif (strstr($_SERVER['HTTP_USER_AGENT'], 'iPad')) {
75 74
76 return 'ipad'; 75 return 'ipad';
77 - }  
78 - elseif (stristr($_SERVER['HTTP_USER_AGENT'], 'android')) { 76 + } elseif (stristr($_SERVER['HTTP_USER_AGENT'], 'android')) {
79 return 'android'; 77 return 'android';
80 } 78 }
81 // 其它 79 // 其它
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
1 { 1 {
2 "name": "yohobuy", 2 "name": "yohobuy",
3 - "version": "1.3.3", 3 + "version": "1.3.3.a",
4 "description": "yohobuy statics", 4 "description": "yohobuy statics",
5 "keywords": [], 5 "keywords": [],
6 "homepage": "", 6 "homepage": "",
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.3.3" 53 +application.version = "1.3.3.a"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.3.3" 53 +application.version = "1.3.3.a"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.3.3" 53 +application.version = "1.3.3.a"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.3.3" 53 +application.version = "1.3.3.a"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"