Merge remote-tracking branch 'origin/develop'

@@ -243,6 +243,4 @@ function scrollHandler() {
 }
 }
 
 
 //srcoll to load more
 //srcoll to load more
-$(window).scroll(function() {
-    window.requestAnimationFrame(scrollHandler);
-});
+$(window).scroll(scrollHandler);

@@ -72,7 +72,7 @@
             width: pxToRem(472px);
             width: pxToRem(472px);
             height: pxToRem(88px);
             height: pxToRem(88px);
             line-height: pxToRem(88px);
             line-height: pxToRem(88px);
-            margin: pxToRem(125px) auto 0 auto;
+            margin: pxToRem(80px) auto 0 auto;
             background: #444;
             background: #444;
             text-align: center;
             text-align: center;
             color: #fff;
             color: #fff;

@@ -114,7 +114,7 @@
         &.no-login {
         &.no-login {
             padding: 0;
             padding: 0;
             height: pxToRem(88px);
             height: pxToRem(88px);
-            .link-item {
+            .link-item p {
                 font-size: pxToRem(32px);
                 font-size: pxToRem(32px);
                 line-height: pxToRem(88px);
                 line-height: pxToRem(88px);
             }
             }

@@ -23,6 +23,7 @@
             overflow: hidden;
             overflow: hidden;
         }
         }
         .user-name {
         .user-name {
+            float: left;
             max-width: 240rem / $pxConvertRem;
             max-width: 240rem / $pxConvertRem;
             text-overflow:ellipsis; 
             text-overflow:ellipsis; 
             white-space:nowrap; 
             white-space:nowrap; 

@@ -177,7 +177,7 @@ class NewsaleController extends AbstractAction
             $color = $this->get('color', null);
             $color = $this->get('color', null);
             $size = $this->get('size', null);
             $size = $this->get('size', null);
             $price = $this->get('price', null);
             $price = $this->get('price', null);
-            $p_d = '0.1,0.3';
+            $p_d = $this->get('discount', null);
             $dayLimit = $this->get('dayLimit', null);
             $dayLimit = $this->get('dayLimit', null);
             $limit = $this->get('limit', 60);
             $limit = $this->get('limit', 60);
             $page = $this->get('page', 1);
             $page = $this->get('page', 1);