Merge branch 'release/4.8' of http://git.yoho.cn/fe/YOHOBUYPC into release/4.8

@@ -235,7 +235,7 @@ $shopCart.on('click', '.icon-minus, .icon-add', function() {
 // 最近浏览翻页
 // 最近浏览翻页
 $histroy.on('click', '.pagenext, .pageprev', function() {
 $histroy.on('click', '.pagenext, .pageprev', function() {
     if ($(this).hasClass('pagenext')) {
     if ($(this).hasClass('pagenext')) {
-        if (pageNum !== 6) {
+        if (pageNum !== 5) {
             pageNum++;
             pageNum++;
         } else {
         } else {
             pageNum = 1;
             pageNum = 1;

@@ -483,10 +483,6 @@ class CartModel
                     $end = 23;
                     $end = 23;
                     break;
                     break;
                 case 5:
                 case 5:
-                    $begin = 18;
-                    $end = 23;
-                    break;
-                case 6:
                     $begin = 24;
                     $begin = 24;
                     $end = 30;
                     $end = 30;
                     break;
                     break;
@@ -520,7 +516,7 @@ class CartModel
             }
             }
 
 
             // 到达第六页，没有下一页
             // 到达第六页，没有下一页
-            if ($page == 6) {
+            if ($page == 5) {
                 $result['data']['hasNext'] = false;
                 $result['data']['hasNext'] = false;
             }
             }
 
 

@@ -188,7 +188,7 @@ class IndexController extends WebAction
             $udid = $uid . $this->getUdid();
             $udid = $uid . $this->getUdid();
             $page = $this->get('page', 1);
             $page = $this->get('page', 1);
 
 
-            if ($page === '7') {
+            if ($page === '6') {
                 $page = 1;
                 $page = 1;
             }
             }