合并冲突

@@ -11,7 +11,7 @@ exports.index = (req, res, next) => {
             living: result[1],
             living: result[1],
             pre: result[2],
             pre: result[2],
             record: result[3],
             record: result[3],
-            constent: result[4]
+            content: result[4]
         });
         });
     }).catch(next);
     }).catch(next);
 };
 };

 <div class="yoho-live yoho-page">
 <div class="yoho-live yoho-page">
     {{#content}}
     {{#content}}
         {{! 头部banner}}
         {{! 头部banner}}
+        {{#if focus}}
         {{> resources/banner-top}}
         {{> resources/banner-top}}
+        {{/if}}
     {{/content}}
     {{/content}}
 
 
     <div class="live-rec">
     <div class="live-rec">

+var Swiper = require('yoho-swiper');
+
+$('.swiper-container').each(function() {
+    if ($(this).find('.swiper-slide').length > 1) {
+        new Swiper($(this).get(0), {
+            lazyLoading: true,
+            lazyLoadingInPrevNext: true,
+            loop: true,
+            autoplay: 3000,
+            autoplayDisableOnInteraction: true,
+            paginationClickable: true,
+            pagination: $(this).closest('.banner-top').find('.pagination-inner').get(0)
+        });
+    }
+});