fe / YOHOBUYWAP · Commits

Go to a project

Authored by 梁志锋
Commit 9e047f883e25560e96beb19d958a5a40735a81e5 1 parent 5ec94a36

merge https 分支

Inline Side-by-side
Showing 13 changed files with 24 additions and 24 deletions
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <link rel="dns-prefetch" href="//static.yohobuy.com"> 26 <link rel="dns-prefetch" href="//static.yohobuy.com">
27 <link rel="dns-prefetch" href="//img12.static.yhbimg.com"> 27 <link rel="dns-prefetch" href="//img12.static.yhbimg.com">
28 <link rel="dns-prefetch" href="//img13.static.yhbimg.com"> 28 <link rel="dns-prefetch" href="//img13.static.yhbimg.com">
29 -<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.13/index.css"> 29 +<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.15/index.css">
30 <link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png"> 30 <link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
31 <link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)"> 31 <link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
32 <link rel="apple-touch-startup-image" sizes="320x460" href="//static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)"> 32 <link rel="apple-touch-startup-image" sizes="320x460" href="//static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
@@ -47,8 +47,8 @@ @@ -47,8 +47,8 @@
47 47
48 48
49 49
50 - <script src="//cdn.yoho.cn/myohobuy/1.3.13/lib.js"></script>  
51 -<script src="//cdn.yoho.cn/myohobuy/1.3.13/index.js"></script> 50 + <script src="//cdn.yoho.cn/myohobuy/1.3.15/lib.js"></script>
  51 +<script src="//cdn.yoho.cn/myohobuy/1.3.15/index.js"></script>
52 <script> 52 <script>
53 seajs.use('js/common'); 53 seajs.use('js/common');
54 </script> 54 </script>
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <link rel="dns-prefetch" href="//static.yohobuy.com"> 26 <link rel="dns-prefetch" href="//static.yohobuy.com">
27 <link rel="dns-prefetch" href="//img12.static.yhbimg.com"> 27 <link rel="dns-prefetch" href="//img12.static.yhbimg.com">
28 <link rel="dns-prefetch" href="//img13.static.yhbimg.com"> 28 <link rel="dns-prefetch" href="//img13.static.yhbimg.com">
29 -<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.13/index.css"> 29 +<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.15/index.css">
30 <link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png"> 30 <link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
31 <link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)"> 31 <link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
32 <link rel="apple-touch-startup-image" sizes="320x460" href="//static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)"> 32 <link rel="apple-touch-startup-image" sizes="320x460" href="//static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
@@ -65,8 +65,8 @@ @@ -65,8 +65,8 @@
65 65
66 66
67 67
68 - <script src="//cdn.yoho.cn/myohobuy/1.3.13/lib.js"></script>  
69 -<script src="//cdn.yoho.cn/myohobuy/1.3.13/index.js"></script> 68 + <script src="//cdn.yoho.cn/myohobuy/1.3.15/lib.js"></script>
  69 +<script src="//cdn.yoho.cn/myohobuy/1.3.15/index.js"></script>
70 <script> 70 <script>
71 seajs.use('js/common'); 71 seajs.use('js/common');
72 </script> 72 </script>
1 { 1 {
2 "name": "yohobuy", 2 "name": "yohobuy",
3 - "version": "1.3.14", 3 + "version": "1.3.15",
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.14" 53 +application.version = "1.3.15"
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.14" 53 +application.version = "1.3.15"
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.14" 53 +application.version = "1.3.15"
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.14" 53 +application.version = "1.3.15"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
1 [memcached] 1 [memcached]
2 -master.hosts=192.168.166.16:12111,192.168.166.17:12111  
3 -slave.hosts=192.168.166.16:12112,192.168.166.17:12112  
4 -session.hosts=192.168.166.16:12111,192.168.166.17:12111 2 +master.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
  3 +slave.hosts=172.31.22.1:12112,172.31.20.56:12112,172.31.31.146:12112
  4 +session.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
5 5
6 [redis] 6 [redis]
7 servers.hosts=127.0.0.1:6379 7 servers.hosts=127.0.0.1:6379
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 2
3 use Yaf\Application; 3 use Yaf\Application;
4 4
5 -define('SITE_MAIN', '//m.dev.yohobuy.com'); // 网站主域名  
6 -define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名 5 +define('SITE_MAIN', 'http://m.dev.yohobuy.com'); // 网站主域名
  6 +define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域 7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
8 define('SUB_DOMAIN', '.dev.yohobuy.com'); // 子域名后缀 8 define('SUB_DOMAIN', '.dev.yohobuy.com'); // 子域名后缀
9 define('USE_CACHE', false); // 缓存的开关 9 define('USE_CACHE', false); // 缓存的开关
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 2
3 use Yaf\Application; 3 use Yaf\Application;
4 4
5 -define('SITE_MAIN', '//m.yohobuy.com'); // 网站主域名  
6 -define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名 5 +define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
  6 +define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域 7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
8 define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀 8 define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
9 define('USE_CACHE', true); // 缓存的开关 9 define('USE_CACHE', true); // 缓存的开关
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 2
3 use Yaf\Application; 3 use Yaf\Application;
4 4
5 -define('SITE_MAIN', '//m.yohobuy.com'); // 网站主域名  
6 -define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名 5 +define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
  6 +define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
7 define('COOKIE_DOMAIN', '.m.yohobuy.com'); // COOKIE作用域 7 define('COOKIE_DOMAIN', '.m.yohobuy.com'); // COOKIE作用域
8 define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀 8 define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
9 define('USE_CACHE', false); // 缓存的开关 9 define('USE_CACHE', false); // 缓存的开关
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 2
3 use Yaf\Application; 3 use Yaf\Application;
4 4
5 -define('SITE_MAIN', '//m.yohobuy.com'); // 网站主域名  
6 -define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名 5 +define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
  6 +define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域 7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
8 define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀 8 define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
9 define('USE_CACHE', false); // 缓存的开关 9 define('USE_CACHE', false); // 缓存的开关
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 2
3 use Yaf\Application; 3 use Yaf\Application;
4 4
5 -define('SITE_MAIN', '//m.yohobuy.com'); // 网站主域名  
6 -define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名 5 +define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
  6 +define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域 7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
8 define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀 8 define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
9 define('USE_CACHE', true); // 缓存的开关 9 define('USE_CACHE', true); // 缓存的开关