Authored by hf

fixes bug to brand list favorite

@@ -402,7 +402,7 @@ if ($brandHeader.length > 0) { @@ -402,7 +402,7 @@ if ($brandHeader.length > 0) {
402 success: function(data) { 402 success: function(data) {
403 if (data.code === 200) { 403 if (data.code === 200) {
404 $this.toggleClass('coled'); 404 $this.toggleClass('coled');
405 - } else if (data.code === 400 || data.code === 412) { 405 + } else if (data.code === 400) {
406 location.href = data.data;//未登录跳转登录页 406 location.href = data.data;//未登录跳转登录页
407 } else { 407 } else {
408 tip.show(data.message); 408 tip.show(data.message);
@@ -25,7 +25,7 @@ class OptController extends AbstractAction @@ -25,7 +25,7 @@ class OptController extends AbstractAction
25 */ 25 */
26 public function favoriteBrandAction() 26 public function favoriteBrandAction()
27 { 27 {
28 - $result = array('code' => 401, 'message' => '未登录', 'data' => false); 28 + $result = array('code' => 401, 'message' => '参数不正确', 'data' => false);
29 29
30 do { 30 do {
31 /* 判断是否是AJAX请求 */ 31 /* 判断是否是AJAX请求 */
@@ -42,6 +42,8 @@ class OptController extends AbstractAction @@ -42,6 +42,8 @@ class OptController extends AbstractAction
42 /* 判断用户是否登录 */ 42 /* 判断用户是否登录 */
43 $uid = $this->getUdid(); 43 $uid = $this->getUdid();
44 if (!$uid) { 44 if (!$uid) {
  45 + $referer = $this->server('HTTP_REFERER', SITE_MAIN);
  46 + $result = array('code' => 400, 'message' => '未登录', 'data' => Helpers::url('/signin.html', array('refer' => $referer)));
45 break; 47 break;
46 } 48 }
47 49
@@ -55,14 +57,9 @@ class OptController extends AbstractAction @@ -55,14 +57,9 @@ class OptController extends AbstractAction
55 /* 收藏 */ 57 /* 收藏 */
56 $result = BrandData::favorite($id, $uid); 58 $result = BrandData::favorite($id, $uid);
57 if (!isset($result['code'])) { 59 if (!isset($result['code'])) {
  60 + $result = array('code' => 401, 'message' => '参数不正确', 'data' => false);
58 break; 61 break;
59 } 62 }
60 -  
61 - /* 未登录的情况,加跳转链接 */  
62 - if ($result['code'] == 412 || $result['code'] == 400) {  
63 - $referer = $this->server('HTTP_REFERER', SITE_MAIN);  
64 - $result['data'] = Helpers::url('/signin.html', array('refer' => $referer));  
65 - }  
66 } while (false); 63 } while (false);
67 64
68 $this->echoJson($result); 65 $this->echoJson($result);
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
  5 +
4 [redis] 6 [redis]
5 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
  5 +
4 [redis] 6 [redis]
5 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  
3 -slave.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
  4 +memcached.session=127.0.0.1:11212,127.0.0.1:11213
  5 +
4 [redis] 6 [redis]
5 servers.hosts = 127.0.0.1:6379 7 servers.hosts = 127.0.0.1:6379