wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by ccbikai
Commit ff2a00bfe84e9fb00e871f95930b3582d50d744f 2 parents f2be23ec abda4f17

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

Inline Side-by-side
Showing 8 changed files with 12 additions and 8 deletions
@@ -91,7 +91,7 @@ class IndexController extends AbstractAction @@ -91,7 +91,7 @@ class IndexController extends AbstractAction
91 $brandId = 0; 91 $brandId = 0;
92 if (isset($brandIds[0])) { 92 if (isset($brandIds[0])) {
93 $brandId = $brandIds[0]; 93 $brandId = $brandIds[0];
94 - } 94 + }
95 95
96 // 当前的登录用户UID 96 // 当前的登录用户UID
97 $uid = $this->getUid(); 97 $uid = $this->getUid();
@@ -114,6 +114,10 @@ class IndexController extends AbstractAction @@ -114,6 +114,10 @@ class IndexController extends AbstractAction
114 'gender' => FILTER_DEFAULT, 114 'gender' => FILTER_DEFAULT,
115 'p_d' => FILTER_DEFAULT,), false); 115 'p_d' => FILTER_DEFAULT,), false);
116 $condition['brand'] = $brandId; 116 $condition['brand'] = $brandId;
  117 +
  118 + if ($brandId === 0) {
  119 + $condition['query'] = $domain;
  120 + }
117 121
118 if (isset($condition['gender'])) { 122 if (isset($condition['gender'])) {
119 $condition['gender'] = rawurldecode($condition['gender']); 123 $condition['gender'] = rawurldecode($condition['gender']);
@@ -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.0.5" 53 +application.version = "1.0.6"
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.0.5" 53 +application.version = "1.0.6"
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.0.5" 53 +application.version = "1.0.6"
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.0.5" 53 +application.version = "1.0.6"
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 = 127.0.0.1:11212,127.0.0.1:11213 2 master.hosts = 127.0.0.1:11212,127.0.0.1:11213
3 slave.hosts = 127.0.0.1:11212,127.0.0.1:11213 3 slave.hosts = 127.0.0.1:11212,127.0.0.1:11213
4 -memcached.session = 127.0.0.1:11212,127.0.0.1:11213 4 +session.hosts = 127.0.0.1:11212,127.0.0.1:11213
5 5
6 [redis] 6 [redis]
7 servers.hosts = 192.168.1.168:6379 7 servers.hosts = 192.168.1.168:6379
1 [memcached] 1 [memcached]
2 master.hosts=10.170.182.9:12111,10.172.169.31:12111,10.173.8.214:12111 2 master.hosts=10.170.182.9:12111,10.172.169.31:12111,10.173.8.214:12111
3 slave.hosts=10.170.182.9:12112,10.172.169.31:12112,10.173.8.214:12112 3 slave.hosts=10.170.182.9:12112,10.172.169.31:12112,10.173.8.214:12112
4 -memcached.session=10.170.182.9:12111,10.172.169.31:12111,10.173.8.214:12111 4 +session.hosts=10.170.182.9:12111,10.172.169.31:12111,10.173.8.214:12111
5 5
6 [redis] 6 [redis]
7 servers.hosts=127.0.0.1:6379 7 servers.hosts=127.0.0.1:6379
1 [memcached] 1 [memcached]
2 master.hosts=127.0.0.1:11212,127.0.0.1:11213 2 master.hosts=127.0.0.1:11212,127.0.0.1:11213
3 slave.hosts=127.0.0.1:11212,127.0.0.1:11213 3 slave.hosts=127.0.0.1:11212,127.0.0.1:11213
4 -memcached.session=127.0.0.1:11212,127.0.0.1:11213 4 +session.hosts=127.0.0.1:11212,127.0.0.1:11213
5 5
6 [redis] 6 [redis]
7 servers.hosts = 127.0.0.1:6379 7 servers.hosts = 127.0.0.1:6379