heyang 3 роки тому
батько
коміт
f01e617ac2

+ 8 - 26
microserviceUserH5/static/js/vender/move.js

@@ -15,7 +15,6 @@ var sliderData = (function(cb){
   var distance = 0;
   var startTranslate;
   var isSlide = false;
-  var slideing = false;
   var SlideNumber = 1;
   
   function touchstart(e){
@@ -24,26 +23,6 @@ var sliderData = (function(cb){
     startTranslate = translateX;
     isSlide = true;
     SlideNumber++;
-    if(SlideNumber>2){
-      if (translateX > startTranslate) {
-        // 向左划
-        if (distance > width / 3 || distance > 40) {
-          newTranslateX = startTranslate + width;
-        } else {
-          newTranslateX = startTranslate
-        }
-      } else if(SlideNumber>2) {
-        // 向右划
-        if (Math.abs(distance) > width / 3 || Math.abs(distance) > 40) {
-          newTranslateX = startTranslate - width;
-        } else {
-          newTranslateX = startTranslate
-        }
-      }
-      SlideNumber = 1;
-      translateX = newTranslateX;
-      document.getElementById("slider-list").style.transform = "translateX("+translateX/100+"rem)";
-    }
   }
   
   function touchmove(e){
@@ -61,18 +40,21 @@ var sliderData = (function(cb){
     translateX = currentX - startX + startTranslate;
   
     document.getElementById("slider-list").style.transform = "translateX("+translateX/100+"rem)";
-    slideing = true;
   }
   function touchend(){
-    if (slideing && SlideNumber>2) return //正在滑动 又开始滑动
     if (!isSlide || sliderNumber == 0) return
+    if (SlideNumber>2 && Math.abs(distance) < 10){ //正在滑动 又开始滑动
+      translateX = -(+width/100)*(parseInt(pageNum));
+      document.getElementById("slider-list").style.transform = "translateX("+translateX/100+"rem)";
+      return
+    }
     var duration = +new Date() - startTime
     if (translateX > startTranslate) {
       // 向左划
       if (distance > width / 3 || (distance > 40 && duration < 600)) {
         newTranslateX = startTranslate + width;
       } else {
-        newTranslateX = startTranslate
+        newTranslateX = startTranslate;
       }
       if(pageNum == Math.abs(newTranslateX / width) + 1){
         pageNum = Math.abs(newTranslateX / width) //解决cb中pageNum不是最新的
@@ -82,8 +64,9 @@ var sliderData = (function(cb){
       // 向右划
       if (Math.abs(distance) > width / 3 || (Math.abs(distance) > 40 && duration < 600)) {
         newTranslateX = startTranslate - width;
+        document.getElementsByClassName("rest-tip")[0].innerText = `${translateX}`
       } else {
-        newTranslateX = startTranslate
+        newTranslateX = startTranslate;
       }
       if(pageNum == Math.abs(newTranslateX / width) - 1){
         pageNum = Math.abs(newTranslateX / width) //解决cb中pageNum不是最新的
@@ -96,7 +79,6 @@ var sliderData = (function(cb){
     pageNum = Math.abs(newTranslateX / width)
     document.getElementById("slider-list").style.transform = "translateX("+translateX/100+"rem)"
     lineMove();
-    slideing = false;
     SlideNumber = 1;
   }
   //点击左耳朵

+ 2 - 0
microserviceUserH5/vcloud/doubleChristmasActivity.html

@@ -562,6 +562,8 @@
 							$('.schedule-child-line').eq(0).css('width',`${36/sliderNumber}px`);
 						    $('.page').eq(0).text(`${pageNum + 1}/${sliderNumber}页`);
 							if(sliderNumber === 1){
+							   $('.left-ear').eq(0).css('display','none');
+							   $('.right-ear').eq(0).css('display','none');
 							   $('.page-row').eq(0).css('display','none');
 							   $('.distribution-reward-btn').eq(0).css('margin-top','20px');
 							}