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

@@ -11,8 +11,9 @@ var $ = require('jquery'),
 
 
 var swiper,
 var swiper,
     $fixTitleBar,
     $fixTitleBar,
-    $brandList = $('.brand-list');
-var $icon = $('.search-icon');
+    $brandList = $('.brand-list'),
+    $icon = $('.search-icon'),
+    hotBrandsSwiper;
 
 
 var searchH = $('.newbrand-search').outerHeight(),
 var searchH = $('.newbrand-search').outerHeight(),
     headerH = $('.yoho-header').outerHeight(),
     headerH = $('.yoho-header').outerHeight(),
@@ -23,6 +24,14 @@ var brandsData,
     $keyword,
     $keyword,
     clearTextHammer;
     clearTextHammer;
 
 
+//热门品牌滑动
+hotBrandsSwiper = new Swiper('.brands-swiper', {
+    grabCursor: true,
+    slidesPerView: 'auto',
+    wrapperClass: 'brands-list',
+    slideElement: 'li'
+});
+
 swiper = new Swiper('.swiper-container', {
 swiper = new Swiper('.swiper-container', {
     lazyLoading: true,
     lazyLoading: true,
     loop: true,
     loop: true,
@@ -37,12 +46,16 @@ $('.yoho-header').css({
     top: 0
     top: 0
 });
 });
 
 
+if ($('.banner-top').length > 0) {
+    $('.hot-brands').css('padding-top', '0');
+}
+
 $fixTitleBar = $('<div class="title-bar fixed-title-bar"><h2></h2></div>');
 $fixTitleBar = $('<div class="title-bar fixed-title-bar"><h2></h2></div>');
 $fixTitleBar.css({
 $fixTitleBar.css({
     position: 'fixed',
     position: 'fixed',
     top: brandSwipe
     top: brandSwipe
 }).hide();
 }).hide();
-minBrandListTop = brandSwipe + $('.hot-brand').outerHeight() + $('.banner-top').outerHeight();
+minBrandListTop = brandSwipe + $('.hot-brands').outerHeight() + $('.banner-top').outerHeight();
 $brandList.last().append($fixTitleBar);
 $brandList.last().append($fixTitleBar);
 
 
 function scrollHandler() {
 function scrollHandler() {

@@ -5,12 +5,14 @@
  */
  */
  var $ = require('jquery'),
  var $ = require('jquery'),
     Swiper = require('yoho.iswiper'),
     Swiper = require('yoho.iswiper'),
+    Hammer = require('yoho.hammer'),
     lazyLoad = require('yoho.lazyload');
     lazyLoad = require('yoho.lazyload');
 
 
 var goodsSwiper,
 var goodsSwiper,
     $discountFolder = $('.goodsDiscount .discount-folder'),
     $discountFolder = $('.goodsDiscount .discount-folder'),
     $discountArrow = $('.goodsDiscount .first-item span');
     $discountArrow = $('.goodsDiscount .first-item span');
 
 
+var goodsDiscountHammer = new Hammer(document.getElementById('goodsDiscount'));
 
 
 require('./desc');
 require('./desc');
 require('./comments-consults');
 require('./comments-consults');
@@ -38,7 +40,7 @@ if (0 === $('.goodsDiscount .discount-folder').children().length) {
 }
 }
 
 
 //goods-discount下拉按钮点击事件
 //goods-discount下拉按钮点击事件
-$('.goodsDiscount').on('touchend', function(e) {
+goodsDiscountHammer.on('tap', function(e) {
     if ($discountFolder.is(':hidden')) {
     if ($discountFolder.is(':hidden')) {
         $discountArrow.removeClass('icon-down').addClass('icon-up').html('');
         $discountArrow.removeClass('icon-down').addClass('icon-up').html('');
         $discountFolder.slideDown();
         $discountFolder.slideDown();
@@ -46,7 +48,7 @@ $('.goodsDiscount').on('touchend', function(e) {
         $discountArrow.removeClass('icon-up').addClass('icon-down').html('');
         $discountArrow.removeClass('icon-up').addClass('icon-down').html('');
         $discountFolder.slideUp();
         $discountFolder.slideUp();
     }
     }
-
     return false;
     return false;
 });
 });
+
 require('./like');
 require('./like');

@@ -12,8 +12,46 @@ var page = 1,
     notab = 0,
     notab = 0,
     sort = '',
     sort = '',
     id = '',
     id = '',
+    hotrankNav,
     noResult = '<p class="no-result">未找到相关搜索结果</p>';
     noResult = '<p class="no-result">未找到相关搜索结果</p>';
 
 
+// var renderRank = {
+//         errMsg: '<p class="no-result">未找到相关搜索结果</p>',
+//         navSelector: '.goods-nav',
+//         rankSelector: '#hotRank',
+//         navHTML: null,
+//         data: null,
+//         inited: 0,
+//         setData: function(data) {
+//             this.data = data;
+//         },
+//         showDataEmptyMsg: function() {
+//             $(this.rankSelector).append(this.errMsg);
+//         },
+//         isDataEmpty: function() {
+//             if (this.data.indexOf('>') === -1) {
+//                 return true;
+//             } else {
+//                 return false;
+//             }
+//         },
+//         appendData: function() {
+//             if (!this.inited) {
+//                 this.inited = 1;
+//             }
+//             $(this.rankSelector).append(this.data);
+//         },
+//         render: function(data) {
+//             this.setData(data);
+//             if (!this.isDataEmpty()) {
+//                 this.appendData();
+//             } else {
+//                 this.showDataEmptyMsg();
+//             }
+//         }
+
+//     };
+
 function hotrank(page, sort, tabId, notab) {
 function hotrank(page, sort, tabId, notab) {
     loading.showLoadingMask();
     loading.showLoadingMask();
     $.ajax({
     $.ajax({
@@ -26,15 +64,47 @@ function hotrank(page, sort, tabId, notab) {
             notab: notab
             notab: notab
         },
         },
         success: function(data) {
         success: function(data) {
-            console.log(data);
-            if (page === 1) {
-                $('.rank-main').remove();
-            }
-            if (data === ' ' && $('.rank-main ul li').length < 1) {
-                $('#hotRank').html(noResult);
+
+            // if (page === 1) {
+            //     $('.no-result').remove();
+            //     $('.rank-main').remove();
+            // }
+
+            // if (notab === 1) {
+            //     if (data === ' ' && $('.rank-main').length < 1) {
+            //         var hotrankNav = $('.goods-nav').prop("outerHTML");
+
+            //         $('#hotRank').html(hotrankNav + noResult);
+            //     } else {
+            //         $('#hotRank').append(data);
+            //     }
+            // } else {
+            //     if (data === ' ') {
+            //         $('#hotRank').html(noResult);
+            //     } else {
+            //         $('#hotRank').append(data);
+            //     }
+            // }
+            if (data === ' ') {
+                if ($('.rank-main').length < 1 && $('.goods-nav').length < 1) {
+                    $('#hotRank').html(noResult);
+                } else {
+                    if (page === 1) {
+                        hotrankNav = $('.goods-nav').prop('outerHTML');
+
+                        $('#hotRank').html(hotrankNav + noResult);
+                    }
+                }
             } else {
             } else {
+                $('.no-result').remove();
+                $('.rank-main').remove();
                 $('#hotRank').append(data);
                 $('#hotRank').append(data);
             }
             }
+
+            // renderRank.render(data);
+
+
+
             lazyLoad($('img.lazy'));
             lazyLoad($('img.lazy'));
             $('.rank-main ul li:gt(2)').find('.item-content i').removeClass('top');
             $('.rank-main ul li:gt(2)').find('.item-content i').removeClass('top');
             winH = $(window).height();
             winH = $(window).height();
@@ -83,7 +153,11 @@ hotnav.on('tap', function(e) {
         id = target.getAttribute('data-id') ? target.getAttribute('data-id') : '';
         id = target.getAttribute('data-id') ? target.getAttribute('data-id') : '';
         sort = target.getAttribute('data-sort') ? target.getAttribute('data-sort') : '';
         sort = target.getAttribute('data-sort') ? target.getAttribute('data-sort') : '';
         page = 1;
         page = 1;
+
+        // notab = renderRank.inited;
         notab = 1;
         notab = 1;
+
+
         hotrank(page, sort, id, notab);
         hotrank(page, sort, id, notab);
     }
     }
 });
 });

@@ -75,6 +75,10 @@
         background-color:#f8f8f8;
         background-color:#f8f8f8;
     }
     }
 
 
+    .hot-brands {
+        padding-top: 178rem / $pxConvertRem;
+    }
+
     .hot-brand {
     .hot-brand {
         margin: (30rem / $pxConvertRem) 0 0;
         margin: (30rem / $pxConvertRem) 0 0;
 
 

@@ -64,7 +64,7 @@
     {{/vipLevel}}
     {{/vipLevel}}
 
 
     {{# goodsDiscount}}
     {{# goodsDiscount}}
-    <div class="goodsDiscount">
+    <div class="goodsDiscount" id="goodsDiscount">
         {{# list}}
         {{# list}}
         {{#if @first}}
         {{#if @first}}
         {{#if text}}
         {{#if text}}

@@ -602,9 +602,8 @@ class HomeController extends AbstractAction
         //显示网站导航头部信息
         //显示网站导航头部信息
         $this->setNavHeader('会员等级');
         $this->setNavHeader('会员等级');
 
 
-        $gender = Helpers::getGenderByCookie();
         $channel = Helpers::getChannelByCookie();
         $channel = Helpers::getChannelByCookie();
-        $data = GradeModel::getGrade($gender, $channel, $this->_uid);
+        $data = GradeModel::getGrade($channel, $this->_uid);
         $data['pageFooter'] = true;
         $data['pageFooter'] = true;
 
 
         $this->_view->display('vip-grade', $data);
         $this->_view->display('vip-grade', $data);

@@ -237,7 +237,7 @@ class UserModel
                 $product = array();
                 $product = array();
                 foreach ($val['new_product'] as $one) {
                 foreach ($val['new_product'] as $one) {
                     $product = array();
                     $product = array();
-	                $product['link'] = isset($val['goodsId']) ? Helpers::url('/product/pro_' . $val['product_id'] . '_' . $val['goodsId'] . '/' . $val['cnAlphabet'] . '.html') : '';
+	                $product['link'] = isset($val['goodsList'][0]) ? Helpers::url('/product/pro_' . $val['product_id'] . '_' . $val['goodsList'][0]['id'] . '/' . $val['cnAlphabet'] . '.html') : '';
                     $product['imgUrl'] = (isset($one['default_images']) && !empty($one['default_images'])) ? Images::getImageUrl($one['default_images'], 235, 314) : '';
                     $product['imgUrl'] = (isset($one['default_images']) && !empty($one['default_images'])) ? Images::getImageUrl($one['default_images'], 235, 314) : '';
                     $product['price'] = !empty($one['market_price']) ? '¥' . $one['market_price'] : 0;
                     $product['price'] = !empty($one['market_price']) ? '¥' . $one['market_price'] : 0;
                     $product['discount'] = !empty($one['sales_price']) ? '¥' . $one['sales_price'] : 0;
                     $product['discount'] = !empty($one['sales_price']) ? '¥' . $one['sales_price'] : 0;

@@ -23,16 +23,16 @@ class NewsaleModel
     /* 男生频道取新品到着及折扣专区数据的位置码 */
     /* 男生频道取新品到着及折扣专区数据的位置码 */
 
 
     const CODE_TOP_NEW_BOYS = '3cf2c1be5217fbab6009ce83959e1e12';
     const CODE_TOP_NEW_BOYS = '3cf2c1be5217fbab6009ce83959e1e12';
-    const CODE_TOP_SALE_BOYS = '153180b9a88c0b565848850c523bb637';
+    const CODE_TOP_SALE_BOYS = 'e9c9be32d72e2906d404a72ee24cb523';
     /* 女生频道取新品到着及折扣专区数据的位置码 */
     /* 女生频道取新品到着及折扣专区数据的位置码 */
     const CODE_TOP_NEW_GIRLS = '1cf7f9f10e2a2670e73d05c568793ad9';
     const CODE_TOP_NEW_GIRLS = '1cf7f9f10e2a2670e73d05c568793ad9';
-    const CODE_TOP_SALE_GIRLS = '0b2d133419a0f7c381306fd3522365e1';
+    const CODE_TOP_SALE_GIRLS = '785c0e6aab746949073c4ffb9d5106ac';
     /* 潮童频道取新品到着及折扣专区数据的位置码 */
     /* 潮童频道取新品到着及折扣专区数据的位置码 */
     const CODE_TOP_NEW_KIDS = '57457adececa6c748b29c90cad0ae940';
     const CODE_TOP_NEW_KIDS = '57457adececa6c748b29c90cad0ae940';
-    const CODE_TOP_SALE_KIDS = 'de23648d28ee1e8a3f087a9dbac506f8';
+    const CODE_TOP_SALE_KIDS = 'ad1bb67a6007819c86f737d74172fd2e';
     /* 创意生活频道取新品到着及折扣专区数据的位置码 */
     /* 创意生活频道取新品到着及折扣专区数据的位置码 */
     const CODE_TOP_NEW_LIFESTYLE = '04953a61cbf1db426a681e55d496d2fe';
     const CODE_TOP_NEW_LIFESTYLE = '04953a61cbf1db426a681e55d496d2fe';
-    const CODE_TOP_SALE_LIFESTYLE = '01269e498ff5b07756e0733ec0e88c75';
+    const CODE_TOP_SALE_LIFESTYLE = '8132c7db3adbeb7b0d0002de9691c753';
 
 
     /**
     /**
      * 获取新品到着的焦点图资源数据
      * 获取新品到着的焦点图资源数据