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;
     }
     }
 
 
 }
 }

@@ -12,7 +12,9 @@ var orderId = $('#order-detail').data('id');
 
 
 var optHammer;
 var optHammer;
 
 
-lazyLoad();
+lazyLoad({
+    try_again_css: 'order-failure'
+});
 
 
 //订单删除
 //订单删除
 optHammer = new Hammer(document.getElementsByClassName('opt')[0]);
 optHammer = new Hammer(document.getElementsByClassName('opt')[0]);

@@ -58,13 +58,17 @@ function getOrders(option) {
 
 
                 if (opt.page === 1) {
                 if (opt.page === 1) {
                     $curContainer.html(data);
                     $curContainer.html(data);
-                    lazyLoad($curContainer.find('.lazy'));
+                    lazyLoad($curContainer.find('.lazy'), {
+                        try_again_css: 'order-failure'
+                    });
                 } else {
                 } else {
                     num = $curContainer.children('.order').length;
                     num = $curContainer.children('.order').length;
                     $curContainer.append(data);
                     $curContainer.append(data);
 
 
                     //lazyload
                     //lazyload
-                    lazyLoad($curContainer.children('.order:gt(' + (num - 1) + ')').find('.lazy'));
+                    lazyLoad($curContainer.children('.order:gt(' + (num - 1) + ')').find('.lazy'), {
+                        try_again_css: 'order-failure'
+                    });
                 }
                 }
 
 
                 window.rePosFooter(); //重新计算底部位置
                 window.rePosFooter(); //重新计算底部位置
@@ -78,7 +82,9 @@ function getOrders(option) {
     });
     });
 }
 }
 
 
-lazyLoad();
+lazyLoad({
+    try_again_css: 'order-failure'
+});
 
 
 //初始化导航
 //初始化导航
 (function() {
 (function() {

@@ -21,7 +21,7 @@
       "yoho.iswiper": "3.0.1",
       "yoho.iswiper": "3.0.1",
       "iscroll": "5.1.2",
       "iscroll": "5.1.2",
       "import-style": "1.0.0",
       "import-style": "1.0.0",
-      "yoho.lazyload": "1.1.2",
+      "yoho.lazyload": "1.1.3",
       "yoho.handlebars": "3.0.3",
       "yoho.handlebars": "3.0.3",
       "yoho.hammer": "2.0.4"
       "yoho.hammer": "2.0.4"
     },
     },

+.order-failure {
+    background-image: image-url('lazy-failure/order-good.jpg');
+    background-size: 100%;
+}

@@ -143,6 +143,7 @@ a {
 @import "layout/footer";
 @import "layout/footer";
 @import "layout/footer_tab";
 @import "layout/footer_tab";
 @import "good";
 @import "good";
+@import "lazy-failure";
 @import "filter";
 @import "filter";
 @import "loading";
 @import "loading";
 @import "passport/index";
 @import "passport/index";

@@ -48,8 +48,7 @@ $basicBtnC:#eb0313;
                     //padding: pxToRem(20px) pxToRem(12px);
                     //padding: pxToRem(20px) pxToRem(12px);
                     padding: pxToRem(6px) 3%;
                     padding: pxToRem(6px) 3%;
                     width: 49.9%;
                     width: 49.9%;
-                    border-bottom: pxToRem(4px) solid #fff;
-                    border-right: pxToRem(4px) solid #fff;
+                    border: 1px solid #fff;
                     font-size: pxToRem(24px);
                     font-size: pxToRem(24px);
                     background-color: $tableCellC;
                     background-color: $tableCellC;
                     word-wrap: break-word;
                     word-wrap: break-word;
@@ -69,8 +68,7 @@ $basicBtnC:#eb0313;
                     width: 49.9%;
                     width: 49.9%;
                     background-color: $tableCellC;
                     background-color: $tableCellC;
                     box-sizing: border-box;
                     box-sizing: border-box;
-                    border-bottom: 1px solid #fff;
-                    border-right: 1px solid #fff;
+                    border: 1px solid #fff;
                     width: 49.9%;
                     width: 49.9%;
                     height: 100%;
                     height: 100%;
                     float: left;
                     float: left;

@@ -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 === '') {