heyang 3 yıl önce
ebeveyn
işleme
8080ba7320

+ 6 - 2
microserviceUserH5/static/js/vender/move.js

@@ -50,6 +50,10 @@ var sliderData = (function(cb){
       } else {
         newTranslateX = startTranslate
       }
+      if(pageNum == Math.abs(newTranslateX / width) + 1){
+        pageNum = Math.abs(newTranslateX / width)
+        cb();
+      }
     } else {
       // 向右划
       if (Math.abs(distance) > width / 3 || (Math.abs(distance) > 40 && duration < 600)) {
@@ -57,8 +61,8 @@ var sliderData = (function(cb){
       } else {
         newTranslateX = startTranslate
       }
-      pageNum = Math.abs(newTranslateX / width)
-      if(Math.abs(distance) > 40){
+      if(pageNum == Math.abs(newTranslateX / width) - 1){
+        pageNum = Math.abs(newTranslateX / width)
         cb();
       }
     }

+ 10 - 5
microserviceUserH5/vcloud/doubleChristmasActivity.html

@@ -169,7 +169,7 @@
 		url = url.split('/');
 		var topVal = -0.5;
 		let obj = {};
-		var baseUrl = 'https://per.cs.se.androidscloud.com'
+		// var baseUrl = 'https://per.cs.se.androidscloud.com'
 		var loc = window.location.search,
 			n1 = loc.length,//地址的总长度
 			n2 = loc.indexOf("="),//取得=号的位置
@@ -477,9 +477,9 @@
 		// 活动获取用户云机列表,分页
 		function getLists(){
 			const sliderLen = Array.from($('.slider-item')).length;
-			if(sliderLen != 0 && sliderLen >= sliderNumber){
-				return
-			}
+			// if(sliderLen != 0 && sliderLen >= sliderNumber){
+			// 	return
+			// }
 			$.ajax({
 				url: baseUrl + '/api/user/v1/activity/getUserCardPage',
 				type: 'get',
@@ -546,7 +546,12 @@
 
 							}
 							let sliderItemDom = `<div class="slider-item">${str}</div>`;
-							$('#slider-list').append(sliderItemDom);
+						    let val = $('.slider-item').eq(pageNum).text();
+							if(val){
+								$('.slider-item').eq(pageNum).replaceWith(sliderItemDom);
+							}else{
+							    $('#slider-list').append(sliderItemDom);
+							}
 							$('.left-ear').eq(0).css('display','block');
 							$('.right-ear').eq(0).css('display','block');
 							$('.distribution-reward-btn').eq(0).css('display','block');