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

@@ -7,3 +7,5 @@ compile/
 assets/
 assets/
 script/nginx/logs
 script/nginx/logs
 npm-debug.log
 npm-debug.log
+composer.lock
+vendor/

@@ -11,7 +11,7 @@
         {
         {
             "name": "fei.hong",
             "name": "fei.hong",
             "email": "fei.hong@yoho.cn",
             "email": "fei.hong@yoho.cn",
-            "homepage": "www.yoho.cn"
+            "homepage": "http://www.yoho.cn"
         }
         }
     ],
     ],
     "require": {
     "require": {

--Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05
++Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2

@@ -56,10 +56,12 @@ var $listNav = $('#list-nav'),
     $pre, //纪录进入筛选前的active项
     $pre, //纪录进入筛选前的active项
     searching;
     searching;
 
 
-swiper = new Swiper('.swiper-container', {
-    lazyLoading: true,
-    pagination: '.swiper-pagination'
-});
+if ($('.swiper-container .swiper-slide').length > 1) {
+    swiper = new Swiper('.swiper-container', {
+        lazyLoading: true,
+        pagination: '.swiper-pagination'
+    });
+}
 
 
 /**
 /**
  * 筛选注册的回调，筛选子项点击后逻辑
  * 筛选注册的回调，筛选子项点击后逻辑
@@ -214,7 +216,7 @@ filter.registerCbFn(search);
 //3.筛选无active时点击展开筛选面板
 //3.筛选无active时点击展开筛选面板
 //4.筛选有active时点击隐藏筛选面板并恢复点击筛选前active项的active状态
 //4.筛选有active时点击隐藏筛选面板并恢复点击筛选前active项的active状态
 //5.当前active为筛选并且点击其他项时，隐藏筛选面板
 //5.当前active为筛选并且点击其他项时，隐藏筛选面板
-$listNav.delegate('li', 'tap', function() {
+$listNav.delegate('li', 'touchstart', function() {
     var $this = $(this),
     var $this = $(this),
         nav,
         nav,
         navType,
         navType,
@@ -308,8 +310,8 @@ $(window).scroll(function() {
     //当scroll到1/4$goodsContainer高度后继续请求下一页数据
     //当scroll到1/4$goodsContainer高度后继续请求下一页数据
     if ($(window).scrollTop() + winH >
     if ($(window).scrollTop() + winH >
         $(document).height() - 0.25 * $goodsContainer.height()) {
         $(document).height() - 0.25 * $goodsContainer.height()) {
-        if ($pre != undefined) {
+        if ($pre !== undefined) {
             search();
             search();
         }
         }
     }
     }
-});
+});

@@ -59,10 +59,12 @@ var $listNav = $('#list-nav'),
 $pgc.addClass('hide');
 $pgc.addClass('hide');
 $dgc.addClass('hide');
 $dgc.addClass('hide');
 
 
-swiper = new Swiper('.swiper-container', {
-    lazyLoading: true,
-    pagination: '.swiper-pagination'
-});
+if ($('.swiper-container .swiper-slide').length > 1) {
+    swiper = new Swiper('.swiper-container', {
+        lazyLoading: true,
+        pagination: '.swiper-pagination'
+    });
+}
 
 
 /**
 /**
  * 筛选注册的回调，筛选子项点击后逻辑
  * 筛选注册的回调，筛选子项点击后逻辑

@@ -17,7 +17,7 @@
                 margin: 0 (9rem / $pxConvertRem);
                 margin: 0 (9rem / $pxConvertRem);
                 border-radius: 50%;
                 border-radius: 50%;
             }
             }
-            span.swiper-active-switch {
+            span.swiper-pagination-bullet-active {
                 opacity: 1;
                 opacity: 1;
             }
             }
         }
         }

@@ -17,14 +17,15 @@
         overflow: hidden;
         overflow: hidden;
 
 
         .brand-logo {
         .brand-logo {
-            width: 100%;
+            display: table-cell;
+            width: 3.95rem;
             height: 128rem / $pxConvertRem;
             height: 128rem / $pxConvertRem;
             line-height: 128rem / $pxConvertRem;
             line-height: 128rem / $pxConvertRem;
             text-align: center;
             text-align: center;
             font-size: 0;
             font-size: 0;
+            vertical-align: middle;
 
 
             img {
             img {
-                vertical-align: middle;
                 max-width: 100%;
                 max-width: 100%;
                 max-height: 100%;
                 max-height: 100%;
             }
             }
@@ -68,13 +69,13 @@
 .brands-swiper {
 .brands-swiper {
     background: #fff;
     background: #fff;
     width: 100%;
     width: 100%;
-    height: 140rem / $pxConvertRem;
+    height: 180rem / $pxConvertRem;
     margin-bottom: 28rem / $pxConvertRem;
     margin-bottom: 28rem / $pxConvertRem;
     overflow: hidden;
     overflow: hidden;
 
 
     .brands-list {
     .brands-list {
         position: relative;
         position: relative;
-        height: 140rem / $pxConvertRem;
+        height: 180rem / $pxConvertRem;
 
 
         li {
         li {
             float: left;
             float: left;
@@ -85,11 +86,12 @@
             
             
             a {
             a {
                 position: relative;
                 position: relative;
-                display: block;
+                display: table-cell;
                 width: 100%;
                 width: 100%;
-                height: 100%;
+                height: 140rem / $pxConvertRem;
                 line-height: 140rem / $pxConvertRem;
                 line-height: 140rem / $pxConvertRem;
                 font-size: 0;
                 font-size: 0;
+                vertical-align: middle;
             }
             }
 
 
             img {
             img {
@@ -102,7 +104,8 @@
                 position: absolute;
                 position: absolute;
                 left: 8rem / $pxConvertRem;
                 left: 8rem / $pxConvertRem;
                 right: 8rem / $pxConvertRem;
                 right: 8rem / $pxConvertRem;
-                bottom: 8rem / $pxConvertRem;
+                bottom: -32rem / $pxConvertRem;
+                width: 100%;
                 height: 28rem / $pxConvertRem;
                 height: 28rem / $pxConvertRem;
                 line-height: 28rem / $pxConvertRem;
                 line-height: 28rem / $pxConvertRem;
                 text-align: center;
                 text-align: center;