Merge branch 'xiaxs' into '1a86cad6'

update

See merge request !21

src/pages/progress.vue

@@ -37,6 +37,7 @@
 
         <!-- 轮播图 -->
         <div class="carousel">
+            <img src="../../static/images/progress/carousel.png" style="position: relative; top: -45px;" />
             <!-- <div class="swiper-container swiper-container-horizontal">
                 <div class="swiper-wrapper" style="transition-duration: 0ms; transform: translate3d(-3300px, 0px, 0px);">
                     <div class="swiper-slide">