Merge remote-tracking branch 'origin/master'

components/home/Carousel.vue

@@ -31,6 +31,8 @@
         swiperOption: {
           autoplay: 6000,
           pagination: '.swiper-pagination',
+          // 解决点击分页器后图片就不能轮播的问题
+          autoplayDisableOnInteraction: false,
           paginationClickable: true,
           mousewheelControl: false,
           effect: 'fade',

components/provider/Carousel.vue

@@ -26,6 +26,8 @@
           loop: true,
           effect: 'fade',
           lazyLoading: true,
+          // 解决点击分页器后图片就不能轮播的问题
+          autoplayDisableOnInteraction: false,
           pagination: '.swiper-pagination',
           paginationClickable: true,
           paginationElement: 'li',