作者 王毅

合并分支 'Branch_wy' 到 'master'

Branch wy



查看合并请求 !6
@@ -146,10 +146,11 @@ @@ -146,10 +146,11 @@
146 color: #727171; 146 color: #727171;
147 line-height: 30px; 147 line-height: 30px;
148 } 148 }
  149 +
149 .swiper-container { 150 .swiper-container {
150 - width: 600px;  
151 - height: 300px;  
152 -} 151 + width: 850px;
  152 + margin: 60px auto;
  153 + }
153 </style> 154 </style>
154 </head> 155 </head>
155 156
@@ -395,22 +396,26 @@ @@ -395,22 +396,26 @@
395 </div> 396 </div>
396 397
397 <div class="contant"> 398 <div class="contant">
398 - <div class="swiper-container"> 399 + <div class="swiper-container swiper-container-horizontal">
399 <div class="swiper-wrapper"> 400 <div class="swiper-wrapper">
400 - <div class="swiper-slide">Slide 1</div>  
401 - <div class="swiper-slide">Slide 2</div>  
402 - <div class="swiper-slide">Slide 3</div> 401 + <div class="swiper-slide swiper-slide-active" style="height:236px; ">
  402 + <img src="../images/60.png" alt="" />
403 </div> 403 </div>
404 - <!-- 如果需要分页器 -->  
405 - <div class="swiper-pagination"></div>  
406 404
407 - <!-- 如果需要导航按钮 -->  
408 - <div class="swiper-button-prev"></div>  
409 - <div class="swiper-button-next"></div>  
410 -  
411 - <!-- 如果需要滚动条 -->  
412 - <div class="swiper-scrollbar"></div>  
413 -</div> 405 + <div class="swiper-slide swiper-slide-next" style="height:236px;">
  406 + <img src="../images/60.png" alt="" />
  407 + </div>
  408 + <div class="swiper-slide" style="height:236px;">
  409 + <img src="../images/60.png" alt="" />
  410 + </div>
  411 + </div>
  412 + <!-- Add Pagination -->
  413 + <div class="swiper-pagination swiper-pagination-clickable swiper-pagination-bullets">
  414 + <span class="swiper-pagination-bullet swiper-pagination-bullet-active"></span
  415 + ><span class="swiper-pagination-bullet"></span
  416 + ><span class="swiper-pagination-bullet"></span>
  417 + </div>
  418 + </div>
414 <div class="contant_img"> 419 <div class="contant_img">
415 <img src="../images/58.png" alt="" srcset="" /> 420 <img src="../images/58.png" alt="" srcset="" />
416 </div> 421 </div>
@@ -508,17 +513,17 @@ @@ -508,17 +513,17 @@
508 $(this).addClass("navbtnActive"); // 添加当前元素的样式 513 $(this).addClass("navbtnActive"); // 添加当前元素的样式
509 }); 514 });
510 }); 515 });
511 - var swiper = new Swiper(".swiper-container", {  
512 - pagination: ".swiper-pagination",  
513 - paginationClickable: true  
514 - }); 516 + // var swiper = new Swiper(".swiper-container", {
  517 + // pagination: ".swiper-pagination",
  518 + // paginationClickable: true
  519 + // });
515 520
516 - var swiper = new Swiper(".swiper-container1", {  
517 - pagination: ".swiper-pagination",  
518 - slidesPerView: 3,  
519 - paginationClickable: true,  
520 - spaceBetween: 30  
521 - }); 521 + // var swiper = new Swiper(".swiper-container1", {
  522 + // pagination: ".swiper-pagination",
  523 + // slidesPerView: 3,
  524 + // paginationClickable: true,
  525 + // spaceBetween: 30
  526 + // });
522 527
523 $(".content-word-left").on("click", "h4", function() { 528 $(".content-word-left").on("click", "h4", function() {
524 $(this) 529 $(this)
@@ -531,6 +536,12 @@ @@ -531,6 +536,12 @@
531 .siblings() 536 .siblings()
532 .removeClass("active"); 537 .removeClass("active");
533 }); 538 });
  539 + var swiper = new Swiper(".swiper-container", {
  540 + pagination: ".swiper-pagination",
  541 + slidesPerView: 3,
  542 + paginationClickable: true,
  543 + spaceBetween: 40
  544 + });
534 </script> 545 </script>
535 </body> 546 </body>
536 547