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

@@ -476,7 +476,7 @@ class HelperSearch
 
 
         sort($filter['ageLevel']);
         sort($filter['ageLevel']);
         foreach ($filter['ageLevel'] as $key => $val) {
         foreach ($filter['ageLevel'] as $key => $val) {
-            if ($val['id'] == $params['ageLevel']) {
+            if (intval($val['id']) === $ageLevel) {
                 self::$selected['ageLevel'] = array(
                 self::$selected['ageLevel'] = array(
                     'name' => $val['name'],
                     'name' => $val['name'],
                     'href' => self::buildUrl($params)
                     'href' => self::buildUrl($params)

@@ -235,7 +235,11 @@ $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')) {
-        pageNum++;
+        if (pageNum !== 5) {
+            pageNum++;
+        } else {
+            pageNum = 1;
+        }
     } else {
     } else {
         --pageNum > 0 || (pageNum = 1);
         --pageNum > 0 || (pageNum = 1);
     }
     }

@@ -868,6 +868,7 @@ $invoiceCheck.click(function(){
     if ($invoiceCheck.hasClass('active')) {
     if ($invoiceCheck.hasClass('active')) {
         $invoiceCheck.removeAttr('checked');
         $invoiceCheck.removeAttr('checked');
         $invoiceCheck.removeClass('active');
         $invoiceCheck.removeClass('active');
+        $('.section-play .invoice-content').addClass('hide');
     }
     }
 
 
     if ($invoiceCheck.attr('checked')) {
     if ($invoiceCheck.attr('checked')) {
@@ -975,12 +976,14 @@ $eReceiptBtn.click(function(){
     $eReceiptBtn.addClass('receipt-type-selected');
     $eReceiptBtn.addClass('receipt-type-selected');
     $paperReceiptBtn.removeClass('receipt-type-selected');
     $paperReceiptBtn.removeClass('receipt-type-selected');
     $('.e-receipt-desc').removeClass('hide');
     $('.e-receipt-desc').removeClass('hide');
+    $('.invoice-phone').removeClass('hide');
 });
 });
 
 
 $paperReceiptBtn.click(function(){
 $paperReceiptBtn.click(function(){
     $paperReceiptBtn.addClass('receipt-type-selected');
     $paperReceiptBtn.addClass('receipt-type-selected');
     $eReceiptBtn.removeClass('receipt-type-selected');
     $eReceiptBtn.removeClass('receipt-type-selected');
     $('.e-receipt-desc').addClass('hide');
     $('.e-receipt-desc').addClass('hide');
+    $('.invoice-phone').addClass('hide');
 });
 });
 
 
 $('.invoice-title').change(function(){
 $('.invoice-title').change(function(){

@@ -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;
@@ -518,6 +514,17 @@ class CartModel
                 $result['data']['hasPrev'] = false;
                 $result['data']['hasPrev'] = false;
                 $result['data']['hasNext'] = false;
                 $result['data']['hasNext'] = false;
             }
             }
+
+            // 到达第六页，没有下一页
+            if ($page == 5) {
+                $result['data']['hasNext'] = false;
+            }
+
+            // 第-页，没有上一页
+            if ($page == 1) {
+                $result['data']['hasPrev'] = false;
+            }
+
         } while (false);
         } while (false);
 
 
         return $result;
         return $result;

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