Merge remote-tracking branch 'origin/marywood-plus' into marywood-plus

pages/school/school3.vue

@@ -85,34 +85,35 @@
       </div>
       <div class="h5-content">
         <div class="h5-title">玛丽伍德大学介绍</div>
-        <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-img1.png" alt="">
+        <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-img1.png" alt="" />
         <div class="h5-title m-t-10">专业介绍</div>
-        <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-img2.png" alt="">
+        <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-img2.png" alt="" />
         <div class="h5-title m-t-10">合作院校</div>
-        <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-img3.png" alt="">
+        <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-img3.png" alt="" />
         <div class="h5-title m-t-10">申请条件</div>
         <div class="h5-list">
-          <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-img4.png" alt="">
-          <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-img5.png" alt="">
-          <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-img6.png" alt="">
+          <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-img4.png" alt="" />
+          <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-img5.png" alt="" />
+          <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-img6.png" alt="" />
         </div>
         <div class="h5-title m-t-10">学制安排</div>
         <div class="img-list">
-          <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-nimg1.png" alt="">
-          <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-nimg2.png" alt="">
-          <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-nimg3.png" alt="">
-          <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-nimg4.png" alt="">
+          <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-nimg1.png" alt="" />
+          <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-nimg2.png" alt="" />
+          <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-nimg3.png" alt="" />
+          <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-nimg4.png" alt="" />
         </div>
         <div class="h5-title m-t-10">课程设置</div>
-        <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-img7.png" alt="">
+        <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-img7.png" alt="" />
         <div class="h5-title m-t-10">校园风光</div>
         <div class="swiper-content" @mouseenter="swiperStop" @mouseleave="swiperStart">
-          <div v-swiper:mySwiper="swiperOption" ref="mySwiper">
+          <div v-swiper:mySwiper="swiperOption2" ref="mySwiper">
             <div class="swiper-wrapper">
               <div class="swiper-slide" v-for="(item, index) in listDataH5" :key="index">
                 <img :src="item.web_img_uri" />
               </div>
             </div>
+            <div class="swiper-pagination"></div>
           </div>
         </div>
       </div>
@@ -120,6 +121,7 @@
   </div>
 </template>
 <script>
+import 'swiper/css/swiper.css'
 export default {
   layout: 'normal',
   data() {
@@ -156,6 +158,25 @@ export default {
             _this.swiper.slideNext()
           }
         }
+      },
+      swiperOption2: {
+        observer: true,
+        observeParents: true,
+        speed: 400,
+        autoplay: true,
+        delay: 3000,
+        loop: true,
+        slidesPerView: 'auto',
+        centeredSlides: true,
+        spaceBetween: 20,
+        pagination: {
+          el: '.swiper-pagination'
+        },
+        on: {
+          init() {
+            _this.swiper.slideNext()
+          }
+        }
       }
       // frameParams: {
       //   banner: 'https://webapp-pub.ezijing.com/project/marywood/mary_banner_nx4.jpg',
@@ -374,47 +395,51 @@ export default {
   }
 }
 .is-h5 {
-  .banner{
-    img{
+  .banner {
+    img {
       width: 100%;
       display: block;
     }
   }
-  .h5-content{
-    padding: 0 .15rem;
-    img{
+  .h5-content {
+    padding: 0 0.15rem;
+    img {
       width: 100%;
       display: block;
     }
-    .h5-title{
-      font-size: .14rem;
+    .h5-title {
+      font-size: 0.14rem;
       font-weight: bold;
       color: #424242;
-      line-height: .36rem;
-      &.m-t-10{
-        margin-top: .1rem;
+      line-height: 0.36rem;
+      &.m-t-10 {
+        margin-top: 0.1rem;
       }
-        
     }
-    .h5-list{
+    .h5-list {
       display: flex;
-      justify-content: space-between;     
-      img{
+      justify-content: space-between;
+      img {
         width: 1.08rem;
         display: block;
       }
     }
-    .img-list{
+    .img-list {
       overflow-x: scroll;
       display: flex;
-      img{
+      img {
         width: 1.46rem;
-        margin-right: .05rem;
+        margin-right: 0.05rem;
       }
     }
-    .swiper-content{
-      padding-bottom: .5rem;
+    .swiper-content {
+      padding-bottom: 0.5rem;
     }
   }
 }
+::v-deep{
+  .swiper-pagination-bullet-active{
+    background: #fff;
+  }
+}
 </style>