Merge branch 'develop'

@@ -129,8 +129,8 @@ class SearchData
             's_t_asc' => 'shelve_time:asc',
             's_t_asc' => 'shelve_time:asc',
             's_p_asc' => 'sales_price:asc',
             's_p_asc' => 'sales_price:asc',
             's_p_desc' => 'sales_price:desc',
             's_p_desc' => 'sales_price:desc',
-            's_d_desc' => 'discount:desc',
-            's_d_asc' => 'discount:asc',
+            'p_d_desc' => 'discount:desc',
+            'p_d_asc' => 'discount:asc',
             'skn_desc' => 'product_skn:desc',
             'skn_desc' => 'product_skn:desc',
             'skn_asc' => 'product_skn:asc',
             'skn_asc' => 'product_skn:asc',
             'activities_desc' => 'activities.order_by:desc',
             'activities_desc' => 'activities.order_by:desc',

@@ -72,7 +72,7 @@ if ($('.swiper-container .swiper-slide').length > 1) {
         autoplay: 3000,
         autoplay: 3000,
         autoplayDisableOnInteraction: false,
         autoplayDisableOnInteraction: false,
         paginationClickable: true,
         paginationClickable: true,
-        pagination: '.swiper-pagination'
+        pagination: '.banner-top .pagination-inner'
     });
     });
 }
 }
 
 

@@ -84,7 +84,7 @@ if ($('.swiper-container .swiper-slide').length > 1) {
         autoplay: 3000,
         autoplay: 3000,
         autoplayDisableOnInteraction: false,
         autoplayDisableOnInteraction: false,
         paginationClickable: true,
         paginationClickable: true,
-        pagination: '.swiper-pagination'
+        pagination: '.banner-top .pagination-inner'
     });
     });
 }
 }