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

@@ -284,7 +284,7 @@ class AbstractAction extends Controller_Abstract
     protected function getUid($useSession = false)
     protected function getUid($useSession = false)
     {
     {
         // @todo
         // @todo
-        $useSession = false;
+        // $useSession = false;
         
         
         if (!$this->_uid) {
         if (!$this->_uid) {
             $cookie = $this->getCookie('_UID');
             $cookie = $this->getCookie('_UID');

@@ -76,15 +76,4 @@ class LoginData
         return Yohobuy::get(Yohobuy::API_URL, $param);
         return Yohobuy::get(Yohobuy::API_URL, $param);
     }
     }
 
 
-    /**
-     * 登出SESSION会话
-     * 
-     * @param string $token 会话
-     * @return array
-     */
-    public static function signoutSession($token)
-    {
-        return Yohobuy::get( Helpers::logoutSession($token) );
-    }
-
 }
 }

@@ -42,7 +42,7 @@ class ListProcess
         $products = array();
         $products = array();
 
 
         foreach ($data as $value) {
         foreach ($data as $value) {
-            $products[] = Helpers::formatProduct($value, true, true, true);
+            $products[] = Helpers::formatProduct($value, true, true, true, 235, 314);
         }
         }
 
 
         return $products;
         return $products;

@@ -607,7 +607,7 @@ class Helpers
     public static function syncUserSession($uid, $refer = '', $callback = 'call')
     public static function syncUserSession($uid, $refer = '', $callback = 'call')
     {
     {
         return 'http://mapi.yohobuy.com/Passport/session/index?callback=' . $callback
         return 'http://mapi.yohobuy.com/Passport/session/index?callback=' . $callback
-                . '&sign=' . md5($uid . 'Js8Yn0!EwPM45-ws') . '&uid=' . $uid . '&go=' . $refer;
+                . '&sign=' . md5(md5($uid . 'Js8Yn0!EwPM45-ws')) . '&uid=' . $uid . '&go=' . $refer;
     }
     }
 
 
     /**
     /**
@@ -620,10 +620,10 @@ class Helpers
      * @param string $callback 回调方法名
      * @param string $callback 回调方法名
      * @return string
      * @return string
      */
      */
-    public static function logoutSession($token, $callback = 'call')
+    public static function logoutSession($token, $refer = '', $callback = 'call')
     {
     {
         return 'http://mapi.yohobuy.com/Passport/session/logout?callback=' . $callback
         return 'http://mapi.yohobuy.com/Passport/session/logout?callback=' . $callback
-                . '&sign=' . md5('Js8Yn0!EwPM45-ws') . '&token=' . $token;
+                . '&sign=' . md5(md5('Js8Yn0!EwPM45-ws')) . '&token=' . $token . '&go=' . $refer;
     }
     }
 
 
 }
 }

@@ -201,7 +201,7 @@ class UserModel
                 $datas[] = $product;
                 $datas[] = $product;
             }
             }
             !empty($datas) && $result['hasFavProduct'] = $datas;
             !empty($datas) && $result['hasFavProduct'] = $datas;
-        } else if ($page > 1 && isset($favProduct['code']) && $favProduct['code'] === 500) {
+        } else if ($page > 1 && (!$favProduct || (isset($favProduct['code']) && $favProduct['code'] === 500))) {
             $result['end'] = true;
             $result['end'] = true;
         }
         }
 
 
@@ -259,7 +259,7 @@ class UserModel
                 $datas[] = $brand;
                 $datas[] = $brand;
             }
             }
             !empty($datas) && $result['hasFavBrand'] = $datas;
             !empty($datas) && $result['hasFavBrand'] = $datas;
-        } else if ($page > 1 && isset($favBrand['code']) && $favBrand['code'] === 500) {
+        } else if ($page > 1 && (!$favBrand || (isset($favBrand['code']) && $favBrand['code'] === 500))) {
             $result['end'] = true;
             $result['end'] = true;
         }
         }
 
 

@@ -213,7 +213,7 @@ class ListModel
         }
         }
 
 
         // 调用接口查询数据
         // 调用接口查询数据
-        $brandLogo = BrandData::getBrandLogoByDomain($domain); 
+        $brandLogo = BrandData::getBrandLogoByDomain($domain);
         // 处理返回的数据
         // 处理返回的数据
         if (isset($brandLogo['data'])) {
         if (isset($brandLogo['data'])) {
             $result = array(
             $result = array(

@@ -78,7 +78,7 @@ class LoginController extends AbstractAction
         $refer = $this->server('HTTP_REFERER', SITE_MAIN);
         $refer = $this->server('HTTP_REFERER', SITE_MAIN);
         $token = $this->get('token');
         $token = $this->get('token');
         if (!empty($token)) {
         if (!empty($token)) {
-            LoginData::signoutSession($token);
+            $this->go( Helpers::logoutSession($token, $refer) );
         }
         }
 
 
         $this->go($refer);
         $this->go($refer);

@@ -217,7 +217,7 @@ class IndexController extends AbstractAction
 
 
         // 右下角的购物车链接
         // 右下角的购物车链接
         $data['goodList']['cartUrl'] = Helpers::url('/cart/index/index', null);
         $data['goodList']['cartUrl'] = Helpers::url('/cart/index/index', null);
-        //$data['goodList'] += $condition;
+        $data['goodList'] += $condition;
         $data['pageFooter'] = true;
         $data['pageFooter'] = true;
 
 
         if ($title === '') {
         if ($title === '') {