Merge branch 'release/5.2' into gray

@@ -15,7 +15,7 @@
         <div class="field">
         <div class="field">
             <label for="identityCardNo">身份证号：</label>
             <label for="identityCardNo">身份证号：</label>
 
 
-            <input id="identityCardNo" name="identityCardNo" type="text" placeholder="请填写身份证号" maxlength="18"/>
+            <input id="identityCardNo" name="identityCardNo" type="tel" placeholder="请填写身份证号" maxlength="18"/>
             <div class="clearfix"></div>
             <div class="clearfix"></div>
         </div>
         </div>
 
 

@@ -184,7 +184,7 @@ const search = (req, res, next) => {
 
 
     params.isApp = req.yoho.isApp;
     params.isApp = req.yoho.isApp;
     searchModel.getSearchData(params).then((result) => {
     searchModel.getSearchData(params).then((result) => {
-        if (result.list.length > 0) {
+        if (result.list && result.list.length > 0) {
             res.render('search/page', {
             res.render('search/page', {
                 layout: false,
                 layout: false,
                 new: result.list,
                 new: result.list,

-<div class="banner-center banner-center-swiper">
-    {{#if singleOne}}
-        {{#data}}
+{{#if singleOne}}
+{{#data}}
     <div class="banner-list">
     <div class="banner-list">
         <a href="{{url}}">
         <a href="{{url}}">
             <img src="{{image src 640 200}}" alt="">
             <img src="{{image src 640 200}}" alt="">
         </a>
         </a>
     </div>
     </div>
-        {{/data}}
-    {{else}}
+{{/data}}
+{{else}}
+<div class="banner-center banner-center-swiper">
     <ul class="banner-list swiper-wrapper clearfix">
     <ul class="banner-list swiper-wrapper clearfix">
         {{#data}}
         {{#data}}
         <li class="swiper-slide">
         <li class="swiper-slide">
@@ -17,9 +17,9 @@
         </li>
         </li>
         {{/data}}
         {{/data}}
     </ul>
     </ul>
-    {{/if}}
     <div class="swiper-pagination" {{#unless singleOne}}style="display:block"{{/unless}}>
     <div class="swiper-pagination" {{#unless singleOne}}style="display:block"{{/unless}}>
         <div class="pagination-inner">
         <div class="pagination-inner">
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>
+{{/if}}

+{{#if banner_image.[1]}}
 <div class="banner-center banner-center-swiper" style="border: 0;">
 <div class="banner-center banner-center-swiper" style="border: 0;">
-    {{#if banner_image.[1]}}
     <ul class="banner-list swiper-wrapper clearfix">
     <ul class="banner-list swiper-wrapper clearfix">
         {{#banner_image}}
         {{#banner_image}}
         <li class="swiper-slide">
         <li class="swiper-slide">
@@ -9,17 +9,17 @@
         </li>
         </li>
         {{/banner_image}}
         {{/banner_image}}
     </ul>
     </ul>
-    {{else}}
-    {{#banner_image}}
-    <div class="banner-list">
-        <a href="{{url}}">
-            <img src="{{image src 640 200}}" alt="">
-        </a>
-    </div>
-    {{/banner_image}}
-    {{/if}}
     <div class="swiper-pagination" {{#if banner_image.[1]}}style="display:block"{{/if}}>
     <div class="swiper-pagination" {{#if banner_image.[1]}}style="display:block"{{/if}}>
         <div class="pagination-inner">
         <div class="pagination-inner">
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>
+{{else}}
+{{#banner_image}}
+<div class="banner-list single-one">
+    <a href="{{url}}">
+        <img src="{{image src 640 200}}" alt="">
+    </a>
+</div>
+{{/banner_image}}
+{{/if}}

@@ -112,16 +112,22 @@ if ($('.banner-swiper').find('li').size() > 1) {
 }
 }
 
 
 // single_image的轮播
 // single_image的轮播
-if ($('.banner-center-swiper').find('li').size() > 1) {
+
+
+$('.banner-center-swiper').each(function() {
+    if ($(this).find('li').size() > 1) {
         new Swiper('.banner-center-swiper', {
         new Swiper('.banner-center-swiper', {
             loop: true,
             loop: true,
             autoplay: 3000,
             autoplay: 3000,
             autoplayDisableOnInteraction: false,
             autoplayDisableOnInteraction: false,
             paginationClickable: true,
             paginationClickable: true,
             slideElement: 'li',
             slideElement: 'li',
-        pagination: '.banner-center .pagination-inner'
+            pagination: '.banner-center .pagination-inner',
         });
         });
-}
+    } else {
+        $(this).unbind();
+    }
+});
 
 
 // 热门品牌滑动
 // 热门品牌滑动
 new Swiper('.brands-swiper', {
 new Swiper('.brands-swiper', {
@@ -245,6 +251,7 @@ var checkShop = function() {
     $('.recom-shop').each(function() {
     $('.recom-shop').each(function() {
         shopIds.push($(this).attr('shopId'));
         shopIds.push($(this).attr('shopId'));
     });
     });
+    shopIds.length &&
     $.ajax({
     $.ajax({
         type: 'POST',
         type: 'POST',
         url: '/channel/shopRecom',
         url: '/channel/shopRecom',

@@ -2,6 +2,8 @@
     position: relative;
     position: relative;
     height: 200px;
     height: 200px;
     overflow: hidden;
     overflow: hidden;
+    margin-bottom: -2PX;
+    z-index: 2;
 
 
     img {
     img {
         display: block;
         display: block;
@@ -75,3 +77,8 @@
         }
         }
     }
     }
 }
 }
+
+.single-one {
+    margin-bottom: -2PX;
+    z-index: 2;
+}

 .banner-top {
 .banner-top {
     position: relative;
     position: relative;
+    margin-bottom: -2PX;
 
 
     .swiper-pagination {
     .swiper-pagination {
         position: absolute;
         position: absolute;