修复冲突问题

@@ -24,7 +24,7 @@
             <div class="resource-collage-buy-prd-list-c" data-prd-list-length="{{data.prdList.length}}" data-prd-speed="{{speed}}">
                 {{!-- <div class="collage-buy-title">{{../template_intro}}</div> --}}
                 <div class="collage-buy-title">今日必拼</div>
-                <div class="swiper-container">
+                <div class="swiper-container1 swiper-container">
                     <div class="swiper-wrapper">
                         {{#each data.prdList}}
                             <div class="swiper-slide" data-product-skn="{{productSkn}}"

@@ -417,7 +417,7 @@ class Group extends Page {
         let speed = list.data('prd-speed');
 
         if (list.data('prd-list-length') > 0) {
-            new Swiper('.swiper-container', {
+            new Swiper('.swiper-container1', {
                 slidesPerView: 3,
                 spaceBetween: 10,
                 slidesPerGroup: 3,

@@ -14,7 +14,7 @@
         padding-left: 20px;
     }
 
-    .swiper-container {
+    .swiper-container1 {
         margin-left: 20px;
         margin-right: 20px;
         padding-top: 20px;