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

@@ -247,6 +247,9 @@ class ListProcess
 
 
     private static function priceRange($data)
     private static function priceRange($data)
     {
     {
+	    // 首先对价格进行排序
+	    ksort($data, SORT_NUMERIC);
+
         $result = array(
         $result = array(
             'title' => '价格',
             'title' => '价格',
             'name' => '所有价格',
             'name' => '所有价格',

@@ -112,7 +112,6 @@ function loadData($parent, url, page) {
             } else {
             } else {
                 return;
                 return;
             }
             }
-            window.rePosFooter();
 
 
             //},1000);
             //},1000);
         }
         }

@@ -18,6 +18,8 @@ var introUrl = $('#introUrl').val(),
 var sizeSwiper,
 var sizeSwiper,
     refSwiper;
     refSwiper;
 
 
+var UA = navigator.userAgent.toLowerCase().toString();
+
 //判断是否要显示向左滑动提示
 //判断是否要显示向左滑动提示
 function hiddenTips($ele) {
 function hiddenTips($ele) {
     var offsetContainer,
     var offsetContainer,
@@ -69,7 +71,9 @@ function search() {
 
 
             hiddenTips($('#size-swiper-container'));
             hiddenTips($('#size-swiper-container'));
             hiddenTips($('#reference-swiper-container'));
             hiddenTips($('#reference-swiper-container'));
-
+            if (UA.indexOf('mqqbrowser') > 0) {
+                $('.detail > div').removeClass('column').addClass('oldbox');
+            }
             searching = false;
             searching = false;
             end = true;
             end = true;
             loading.hideLoadingMask();
             loading.hideLoadingMask();

@@ -16,7 +16,7 @@ var goodsDiscountEl = document.getElementById('goodsDiscount'),
     goodsDiscountHammer = goodsDiscountEl && new Hammer(goodsDiscountEl);
     goodsDiscountHammer = goodsDiscountEl && new Hammer(goodsDiscountEl);
 
 
 var $cart = $('.cart-bar');
 var $cart = $('.cart-bar');
-var UA = navigator.userAgent.toLowerCase().toString();
+
 
 
 require('./desc');
 require('./desc');
 require('./comments-consults');
 require('./comments-consults');
@@ -82,7 +82,6 @@ $.ajax({
     }
     }
 });
 });
 
 
-if (UA.indexOf('mqqbrowser') > -1) {
-    $('.detail > div').removeClass('column').addClass('oldbox');
-}
+
+
 require('./like');
 require('./like');

@@ -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 = $this->get('discount', null);
+            $p_d = '0.1,0.3';
             $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);